From 0a7d27429892745f866cbbae88391f320347fc9f Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 9 Apr 2018 10:36:21 +1000 Subject: [PATCH 001/129] Use autoload with default gem path --- lib/fog/openstack.rb | 58 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index fa1c28925..e81c36e3b 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -9,103 +9,103 @@ module Fog module Baremetal - autoload :OpenStack, File.expand_path('../baremetal/openstack', __FILE__) + autoload :OpenStack, 'fog/baremetal/openstack' end module Compute - autoload :OpenStack, File.expand_path('../compute/openstack', __FILE__) + autoload :OpenStack, 'fog/compute/openstack' end module ContainerInfra - autoload :OpenStack, File.expand_path('../container_infra/openstack', __FILE__) + autoload :OpenStack, 'fog/container_infra/openstack' end module DNS - autoload :OpenStack, File.expand_path('../dns/openstack', __FILE__) + autoload :OpenStack, 'fog/dns/openstack' class OpenStack - autoload :V1, File.expand_path('../dns/openstack/v1', __FILE__) - autoload :V2, File.expand_path('../dns/openstack/v2', __FILE__) + autoload :V1, 'fog/dns/openstack/v1' + autoload :V2, 'fog/dns/openstack/v2' end end module Event - autoload :OpenStack, File.expand_path('../event/openstack', __FILE__) + autoload :OpenStack, 'fog/event/openstack' end module Identity - autoload :OpenStack, File.expand_path('../identity/openstack', __FILE__) + autoload :OpenStack, 'fog/identity/openstack' class OpenStack - autoload :V2, File.expand_path('../identity/openstack/v2', __FILE__) - autoload :V3, File.expand_path('../identity/openstack/v3', __FILE__) + autoload :V2, 'fog/identity/openstack/v2' + autoload :V3, 'fog/identity/openstack/v3' end end module Image - autoload :OpenStack, File.expand_path('../image/openstack', __FILE__) + autoload :OpenStack, 'fog/image/openstack' class OpenStack - autoload :V1, File.expand_path('../image/openstack/v1', __FILE__) - autoload :V2, File.expand_path('../image/openstack/v2', __FILE__) + autoload :V1, 'fog/image/openstack/v1' + autoload :V2, 'fog/image/openstack/v2' end end module Introspection - autoload :OpenStack, File.expand_path('../introspection/openstack', __FILE__) + autoload :OpenStack, 'fog/introspection/openstack' end module KeyManager - autoload :OpenStack, File.expand_path('../key_manager/openstack', __FILE__) + autoload :OpenStack, 'fog/key_manager/openstack' end module Metering - autoload :OpenStack, File.expand_path('../metering/openstack', __FILE__) + autoload :OpenStack, 'fog/metering/openstack' end module Metric - autoload :OpenStack, File.expand_path('../metric/openstack', __FILE__) + autoload :OpenStack, 'fog/metric/openstack' end module Monitoring - autoload :OpenStack, File.expand_path('../monitoring/openstack', __FILE__) + autoload :OpenStack, 'fog/monitoring/openstack' end module Network - autoload :OpenStack, File.expand_path('../network/openstack', __FILE__) + autoload :OpenStack, 'fog/network/openstack' end module NFV - autoload :OpenStack, File.expand_path('../nfv/openstack', __FILE__) + autoload :OpenStack, 'fog/nfv/openstack' end module Orchestration - autoload :OpenStack, File.expand_path('../orchestration/openstack', __FILE__) - autoload :Util, File.expand_path('../orchestration/util/recursive_hot_file_loader', __FILE__) + autoload :OpenStack, 'fog/orchestration/openstack' + autoload :Util, 'fog/orchestration/util/recursive_hot_file_loader' end module SharedFileSystem - autoload :OpenStack, File.expand_path('../shared_file_system/openstack', __FILE__) + autoload :OpenStack, 'fog/shared_file_system/openstack' end module Storage - autoload :OpenStack, File.expand_path('../storage/openstack', __FILE__) + autoload :OpenStack, 'fog/storage/openstack' end module Volume - autoload :OpenStack, File.expand_path('../volume/openstack', __FILE__) + autoload :OpenStack, 'fog/volume/openstack' class OpenStack - autoload :V1, File.expand_path('../volume/openstack/v1', __FILE__) - autoload :V2, File.expand_path('../volume/openstack/v2', __FILE__) + autoload :V1, 'fog/volume/openstack/v1' + autoload :V2, 'fog/volume/openstack/v2' end end module Workflow - autoload :OpenStack, File.expand_path('../workflow/openstack', __FILE__) + autoload :OpenStack, 'fog/workflow/openstack' class OpenStack - autoload :V2, File.expand_path('../workflow/openstack/v2', __FILE__) + autoload :V2, 'fog/workflow/openstack/v2' end end From dc635a68a92c62d20adedb0e8dd5f34baa385eb7 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 9 Apr 2018 10:46:17 +1000 Subject: [PATCH 002/129] Update .rubocop.yml Replace no longer used `Style/TrailingCommaInLiteral` cop with `Style/TrailingCommaInArrayLiteral` and `Style/TrailingCommaInHashLiteral` --- .rubocop.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.rubocop.yml b/.rubocop.yml index 56de825ac..88a89eedb 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -100,7 +100,9 @@ StringLiterals: Enabled: false StringLiteralsInInterpolation: Enabled: false -TrailingCommaInLiteral: +TrailingCommaInArrayLiteral: + Enabled: false +TrailingCommaInHashLiteral: Enabled: false WhileUntilModifier: Enabled: false From 19fff350b3d5af3f7108da7bbc4bc8b8463aebfa Mon Sep 17 00:00:00 2001 From: TommyLike Date: Thu, 12 Apr 2018 14:29:03 +0800 Subject: [PATCH 003/129] Remove redundant slash Remove redundant slash in get_server_volumes.rb file --- lib/fog/compute/openstack/requests/get_server_volumes.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/compute/openstack/requests/get_server_volumes.rb b/lib/fog/compute/openstack/requests/get_server_volumes.rb index 814e88050..0f2117dfb 100644 --- a/lib/fog/compute/openstack/requests/get_server_volumes.rb +++ b/lib/fog/compute/openstack/requests/get_server_volumes.rb @@ -6,7 +6,7 @@ def get_server_volumes(server_id) request( :expects => 200, :method => 'GET', - :path => "/servers/#{server_id}/os-volume_attachments" + :path => "servers/#{server_id}/os-volume_attachments" ) end end From 5e2f15b744a55f545943af2392bea86475271a79 Mon Sep 17 00:00:00 2001 From: DM Date: Tue, 24 Apr 2018 04:40:50 +0300 Subject: [PATCH 004/129] Storage: Set cache-control header for a file --- lib/fog/storage/openstack/models/file.rb | 2 ++ test/models/storage/file_tests.rb | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/lib/fog/storage/openstack/models/file.rb b/lib/fog/storage/openstack/models/file.rb index 23cb7d4b3..1650a27f8 100644 --- a/lib/fog/storage/openstack/models/file.rb +++ b/lib/fog/storage/openstack/models/file.rb @@ -7,6 +7,7 @@ class File < Fog::OpenStack::Model identity :key, :aliases => 'name' attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin'] + attribute :cache_control, :aliases => ['Cache-Control'] attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer attribute :content_type, :aliases => ['content_type', 'Content-Type'] attribute :content_disposition, :aliases => ['content_disposition', 'Content-Disposition'] @@ -108,6 +109,7 @@ def public_url def save(options = {}) requires :directory, :key + options['Cache-Control'] = cache_control if cache_control options['Content-Type'] = content_type if content_type options['Content-Disposition'] = content_disposition if content_disposition options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin diff --git a/test/models/storage/file_tests.rb b/test/models/storage/file_tests.rb index e6a57f9c4..f5c1398c3 100644 --- a/test/models/storage/file_tests.rb +++ b/test/models/storage/file_tests.rb @@ -74,6 +74,25 @@ def clear_metadata end end + describe "#cache_control" do + before do + @instance = @directory.files.create( + :key => 'meta-test', + :body => lorem_file, + :cache_control => 'public, max-age=31536000' + ) + end + + after do + clear_metadata + @instance.save + end + + it "sets Cache-Control on create" do + object_attributes(@instance)["Cache-Control"].must_equal "public, max-age=31536000" + end + end + describe "#content_disposition" do before do @instance = @directory.files.create( From f8e25408c6e198a3d9646d029df03c5bbfcb40db Mon Sep 17 00:00:00 2001 From: Melvin Hillsman Date: Fri, 27 Apr 2018 22:53:23 -0500 Subject: [PATCH 005/129] Add configuration for OpenLab Signed-off-by: Melvin Hillsman --- .zuul.yaml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 .zuul.yaml diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 000000000..d5915008b --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,35 @@ +- project: + check: + jobs: + - fog-openstack-unittest-test + - fog-openstack-unittest-spec + +- job: + name: fog-openstack-unittest-test + parent: init-test + description: | + fog-openstack unittest test tests + run: playbooks/fog-openstack-unittest-test/run.yaml + vars: + rvm: + 2.2.0 + 2.3.0 + 2.3.1 + 2.4.2 + jruby-head + nodeset: ubuntu-xenial + +- job: + name: fog-openstack-unittest-spec + parent: init-test + description: | + fog-openstack unittest spec tests + run: playbooks/fog-openstack-unittest-spec/run.yaml + vars: + rvm: + 2.2.0 + 2.3.0 + 2.3.1 + 2.4.2 + jruby-head + nodeset: ubuntu-xenial From 0c371ecba0db233225e2feff6ed8116275ad1420 Mon Sep 17 00:00:00 2001 From: Melvin Hillsman Date: Fri, 27 Apr 2018 23:05:47 -0500 Subject: [PATCH 006/129] Add playbooks directory with job definitions Signed-off-by: Melvin Hillsman Depends-On: https://github.com/fog/fog-openstack/pull/392 --- playbooks/.gitkeep | 0 .../fog-openstack-unittest-spec/run.yaml | 52 +++++++++++++++++++ .../fog-openstack-unittest-test/run.yaml | 52 +++++++++++++++++++ 3 files changed, 104 insertions(+) create mode 100644 playbooks/.gitkeep create mode 100644 playbooks/fog-openstack-unittest-spec/run.yaml create mode 100644 playbooks/fog-openstack-unittest-test/run.yaml diff --git a/playbooks/.gitkeep b/playbooks/.gitkeep new file mode 100644 index 000000000..e69de29bb diff --git a/playbooks/fog-openstack-unittest-spec/run.yaml b/playbooks/fog-openstack-unittest-spec/run.yaml new file mode 100644 index 000000000..c42b7f077 --- /dev/null +++ b/playbooks/fog-openstack-unittest-spec/run.yaml @@ -0,0 +1,52 @@ +- hosts: all + become: yes + tasks: + - name: Run unittest spec tests + shell: + cmd: | + set -e + set -o pipefail + set -x + apt-get install ruby ruby-dev -y + gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + curl -L https://get.rvm.io | bash -s stable + source /usr/local/rvm/scripts/rvm > /dev/null 2>&1 + for version in {{ rvm }};do + if [ "$version" == "jruby-head" ]; then + continue + fi + rvm install ${version} --disable-binary > /dev/null 2>&1 + rvm use ${version} > /dev/null 2>&1 + echo "Running tests based on Ruby ${version}..." + ruby --version + gem install bundler + gem update bundler + bundle install --jobs=3 --retry=3 + bundle exec rake spec TESTOPTS="--verbose" + done + executable: /bin/bash + chdir: '{{ zuul.project.src_dir }}' + environment: + JRUBY_OPTS: '--debug' + ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3 + + - name: Run unittest spec tests for jruby-head + shell: + cmd: | + set -e + set -o pipefail + set -x + rvm install jruby-head --disable-binary + rvm use jruby-head + echo "Running tests based on Ruby jruby-head... + ruby --version + gem install bundler + gem update bundler + bundle install --jobs=3 --retry=3 + bundle exec rake spec TESTOPTS="--verbose" + executable: /bin/bash + chdir: '{{ zuul.project.src_dir }}' + environment: + JRUBY_OPTS: '--debug' + ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3 + ignore_errors: true diff --git a/playbooks/fog-openstack-unittest-test/run.yaml b/playbooks/fog-openstack-unittest-test/run.yaml new file mode 100644 index 000000000..97c6a38dc --- /dev/null +++ b/playbooks/fog-openstack-unittest-test/run.yaml @@ -0,0 +1,52 @@ +- hosts: all + become: yes + tasks: + - name: Run unittest tests + shell: + cmd: | + set -e + set -o pipefail + set -x + apt-get install ruby ruby-dev -y + gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + curl -L https://get.rvm.io | bash -s stable + source /usr/local/rvm/scripts/rvm > /dev/null 2>&1 + for version in {{ rvm }};do + if [ "$version" == "jruby-head" ]; then + continue + fi + rvm install ${version} --disable-binary > /dev/null 2>&1 + rvm use ${version} > /dev/null 2>&1 + echo "Running tests based on Ruby ${version}..." + ruby --version + gem install bundler + gem update bundler + bundle install --jobs=3 --retry=3 + bundle exec rake test TESTOPTS="--verbose" + done + executable: /bin/bash + chdir: '{{ zuul.project.src_dir }}' + environment: + JRUBY_OPTS: '--debug' + ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3 + + - name: Run unittest tests for jruby-head + shell: + cmd: | + set -e + set -o pipefail + set -x + rvm install jruby-head --disable-binary + rvm use jruby-head + echo "Running tests based on Ruby jruby-head... + ruby --version + gem install bundler + gem update bundler + bundle install --jobs=3 --retry=3 + bundle exec rake test TESTOPTS="--verbose" + executable: /bin/bash + chdir: '{{ zuul.project.src_dir }}' + environment: + JRUBY_OPTS: '--debug' + ANSIBLE_PYTHON_INTERPRETER: /usr/bin/python3 + ignore_errors: true From 2cdedf6696739389036855f61a6bdccdb77b112b Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 18 Jun 2018 15:32:48 +1000 Subject: [PATCH 007/129] No comments at end of blocks --- .../openstack/requests/create_chassis.rb | 8 ++++---- .../baremetal/openstack/requests/create_node.rb | 8 ++++---- .../baremetal/openstack/requests/create_port.rb | 8 ++++---- .../baremetal/openstack/requests/get_chassis.rb | 12 ++++++------ .../baremetal/openstack/requests/get_driver.rb | 12 ++++++------ .../openstack/requests/get_driver_properties.rb | 12 ++++++------ lib/fog/baremetal/openstack/requests/get_node.rb | 12 ++++++------ lib/fog/baremetal/openstack/requests/get_port.rb | 12 ++++++------ .../baremetal/openstack/requests/list_chassis.rb | 12 ++++++------ .../openstack/requests/list_chassis_detailed.rb | 12 ++++++------ .../baremetal/openstack/requests/list_drivers.rb | 12 ++++++------ .../baremetal/openstack/requests/list_nodes.rb | 12 ++++++------ .../openstack/requests/list_nodes_detailed.rb | 12 ++++++------ .../baremetal/openstack/requests/list_ports.rb | 12 ++++++------ .../openstack/requests/list_ports_detailed.rb | 12 ++++++------ .../openstack/requests/patch_chassis.rb | 8 ++++---- .../baremetal/openstack/requests/patch_node.rb | 8 ++++---- .../baremetal/openstack/requests/patch_port.rb | 8 ++++---- .../openstack/requests/set_node_maintenance.rb | 8 ++++---- .../openstack/requests/set_node_power_state.rb | 8 ++++---- .../requests/set_node_provision_state.rb | 8 ++++---- .../openstack/requests/unset_node_maintenance.rb | 8 ++++---- lib/fog/compute/openstack/models/network.rb | 8 ++++---- lib/fog/compute/openstack/models/networks.rb | 8 ++++---- lib/fog/compute/openstack/models/server_group.rb | 8 ++++---- .../compute/openstack/models/server_groups.rb | 8 ++++---- lib/fog/compute/openstack/models/tenant.rb | 8 ++++---- lib/fog/compute/openstack/models/tenants.rb | 8 ++++---- .../openstack/requests/add_aggregate_host.rb | 8 ++++---- .../compute/openstack/requests/add_fixed_ip.rb | 14 +++++++------- .../openstack/requests/allocate_address.rb | 6 +++--- .../openstack/requests/boot_from_snapshot.rb | 6 +++--- .../openstack/requests/create_aggregate.rb | 8 ++++---- .../compute/openstack/requests/create_flavor.rb | 8 ++++---- .../openstack/requests/create_flavor_metadata.rb | 8 ++++---- .../openstack/requests/create_key_pair.rb | 8 ++++---- .../openstack/requests/create_security_group.rb | 8 ++++---- .../requests/create_security_group_rule.rb | 8 ++++---- .../openstack/requests/delete_aggregate.rb | 8 ++++---- .../compute/openstack/requests/delete_flavor.rb | 8 ++++---- .../openstack/requests/delete_key_pair.rb | 8 ++++---- .../openstack/requests/delete_security_group.rb | 8 ++++---- .../requests/delete_security_group_rule.rb | 8 ++++---- .../compute/openstack/requests/delete_service.rb | 8 ++++---- .../openstack/requests/disable_service.rb | 8 ++++---- .../requests/disable_service_log_reason.rb | 8 ++++---- .../compute/openstack/requests/enable_service.rb | 8 ++++---- .../compute/openstack/requests/get_address.rb | 8 ++++---- .../compute/openstack/requests/get_aggregate.rb | 8 ++++---- .../openstack/requests/get_flavor_metadata.rb | 8 ++++---- .../openstack/requests/get_host_details.rb | 8 ++++---- .../openstack/requests/get_security_group.rb | 8 ++++---- .../requests/get_security_group_rule.rb | 8 ++++---- .../openstack/requests/get_vnc_console.rb | 14 +++++++------- .../openstack/requests/list_aggregates.rb | 8 ++++---- .../openstack/requests/list_all_addresses.rb | 8 ++++---- lib/fog/compute/openstack/requests/list_hosts.rb | 8 ++++---- .../compute/openstack/requests/list_key_pairs.rb | 8 ++++---- .../openstack/requests/list_security_groups.rb | 8 ++++---- .../compute/openstack/requests/list_services.rb | 8 ++++---- .../compute/openstack/requests/list_tenants.rb | 8 ++++---- .../compute/openstack/requests/pause_server.rb | 14 +++++++------- .../openstack/requests/release_address.rb | 2 +- .../openstack/requests/remove_aggregate_host.rb | 8 ++++---- .../openstack/requests/remove_fixed_ip.rb | 14 +++++++------- .../compute/openstack/requests/rescue_server.rb | 14 +++++++------- .../compute/openstack/requests/resume_server.rb | 14 +++++++------- .../compute/openstack/requests/server_actions.rb | 14 +++++++------- .../openstack/requests/server_diagnostics.rb | 14 +++++++------- lib/fog/compute/openstack/requests/set_tenant.rb | 6 +++--- .../openstack/requests/shelve_offload_server.rb | 14 +++++++------- .../compute/openstack/requests/shelve_server.rb | 14 +++++++------- .../compute/openstack/requests/start_server.rb | 14 +++++++------- .../compute/openstack/requests/stop_server.rb | 14 +++++++------- .../compute/openstack/requests/suspend_server.rb | 14 +++++++------- .../compute/openstack/requests/unpause_server.rb | 14 +++++++------- .../openstack/requests/unshelve_server.rb | 14 +++++++------- .../openstack/requests/update_aggregate.rb | 8 ++++---- .../requests/update_aggregate_metadata.rb | 8 ++++---- lib/fog/identity/openstack/v2/models/role.rb | 10 +++++----- lib/fog/identity/openstack/v2/models/roles.rb | 8 ++++---- lib/fog/identity/openstack/v2/models/tenant.rb | 10 +++++----- lib/fog/identity/openstack/v2/models/tenants.rb | 10 +++++----- lib/fog/identity/openstack/v2/models/user.rb | 10 +++++----- lib/fog/identity/openstack/v2/models/users.rb | 10 +++++----- .../openstack/v2/requests/add_user_to_tenant.rb | 12 ++++++------ .../v2/requests/create_ec2_credential.rb | 2 +- .../openstack/v2/requests/create_role.rb | 2 +- .../openstack/v2/requests/create_tenant.rb | 16 ++++++++-------- .../openstack/v2/requests/create_user.rb | 2 +- .../openstack/v2/requests/create_user_role.rb | 2 +- .../v2/requests/delete_ec2_credential.rb | 2 +- .../openstack/v2/requests/delete_role.rb | 2 +- .../openstack/v2/requests/delete_tenant.rb | 16 ++++++++-------- .../openstack/v2/requests/delete_user.rb | 2 +- .../openstack/v2/requests/delete_user_role.rb | 2 +- .../openstack/v2/requests/get_ec2_credential.rb | 2 +- .../identity/openstack/v2/requests/get_role.rb | 10 +++++----- .../identity/openstack/v2/requests/get_tenant.rb | 14 +++++++------- .../openstack/v2/requests/get_tenants_by_id.rb | 2 +- .../openstack/v2/requests/get_tenants_by_name.rb | 2 +- .../openstack/v2/requests/get_user_by_id.rb | 2 +- .../openstack/v2/requests/get_user_by_name.rb | 2 +- .../v2/requests/list_ec2_credentials.rb | 2 +- .../v2/requests/list_endpoints_for_token.rb | 2 +- .../identity/openstack/v2/requests/list_roles.rb | 2 +- .../v2/requests/list_roles_for_user_on_tenant.rb | 16 ++++++++-------- .../openstack/v2/requests/list_tenants.rb | 14 +++++++------- .../v2/requests/list_user_global_roles.rb | 2 +- .../identity/openstack/v2/requests/list_users.rb | 12 ++++++------ .../v2/requests/remove_user_from_tenant.rb | 12 ++++++------ .../identity/openstack/v2/requests/set_tenant.rb | 8 ++++---- .../openstack/v2/requests/update_tenant.rb | 16 ++++++++-------- .../openstack/v2/requests/update_user.rb | 2 +- .../openstack/v1/requests/add_member_to_image.rb | 14 +++++++------- lib/fog/image/openstack/v1/requests/get_image.rb | 12 ++++++------ .../openstack/v1/requests/get_image_by_id.rb | 12 ++++++------ .../openstack/v1/requests/get_image_members.rb | 12 ++++++------ .../openstack/v1/requests/get_shared_images.rb | 12 ++++++------ .../openstack/v1/requests/list_public_images.rb | 12 ++++++------ .../v1/requests/list_public_images_detailed.rb | 12 ++++++------ .../v1/requests/remove_member_from_image.rb | 12 ++++++------ .../image/openstack/v1/requests/set_tenant.rb | 6 +++--- .../v1/requests/update_image_members.rb | 10 +++++----- .../openstack/v2/requests/add_member_to_image.rb | 12 ++++++------ .../openstack/v2/requests/add_tag_to_image.rb | 12 ++++++------ .../openstack/v2/requests/download_image.rb | 12 ++++++------ lib/fog/image/openstack/v2/requests/get_image.rb | 12 ++++++------ .../openstack/v2/requests/get_image_by_id.rb | 12 ++++++------ .../openstack/v2/requests/get_image_members.rb | 12 ++++++------ .../openstack/v2/requests/get_member_details.rb | 12 ++++++------ .../openstack/v2/requests/get_shared_images.rb | 12 ++++++------ .../image/openstack/v2/requests/list_images.rb | 12 ++++++------ .../v2/requests/remove_member_from_image.rb | 12 ++++++------ .../v2/requests/remove_tag_from_image.rb | 12 ++++++------ .../image/openstack/v2/requests/set_tenant.rb | 6 +++--- .../openstack/v2/requests/update_image_member.rb | 10 +++++----- .../openstack/requests/add_role_to_plan.rb | 12 ++++++------ .../planning/openstack/requests/create_plan.rb | 12 ++++++------ .../planning/openstack/requests/delete_plan.rb | 12 ++++++------ lib/fog/planning/openstack/requests/get_plan.rb | 12 ++++++------ .../openstack/requests/get_plan_templates.rb | 12 ++++++------ .../planning/openstack/requests/list_plans.rb | 12 ++++++------ .../planning/openstack/requests/list_roles.rb | 12 ++++++------ .../planning/openstack/requests/patch_plan.rb | 12 ++++++------ .../openstack/requests/remove_role_from_plan.rb | 12 ++++++------ lib/fog/volume/openstack/requests/set_tenant.rb | 6 +++--- 147 files changed, 687 insertions(+), 687 deletions(-) diff --git a/lib/fog/baremetal/openstack/requests/create_chassis.rb b/lib/fog/baremetal/openstack/requests/create_chassis.rb index ddadb3ad4..88d213b6b 100644 --- a/lib/fog/baremetal/openstack/requests/create_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/create_chassis.rb @@ -38,7 +38,7 @@ def create_chassis(_attributes) response.body = data[:chassis_collection].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/create_node.rb b/lib/fog/baremetal/openstack/requests/create_node.rb index fb0027168..3f81ece30 100644 --- a/lib/fog/baremetal/openstack/requests/create_node.rb +++ b/lib/fog/baremetal/openstack/requests/create_node.rb @@ -48,7 +48,7 @@ def create_node(_attributes) response.body = data[:nodes].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/create_port.rb b/lib/fog/baremetal/openstack/requests/create_port.rb index 8c76adf17..5bc678cb1 100644 --- a/lib/fog/baremetal/openstack/requests/create_port.rb +++ b/lib/fog/baremetal/openstack/requests/create_port.rb @@ -40,7 +40,7 @@ def create_port(_attributes) response.body = data[:ports].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/get_chassis.rb b/lib/fog/baremetal/openstack/requests/get_chassis.rb index 62f832478..88fa41d3d 100644 --- a/lib/fog/baremetal/openstack/requests/get_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/get_chassis.rb @@ -9,7 +9,7 @@ def get_chassis(chassis_uuid) :path => "chassis/#{chassis_uuid}" ) end - end # class Real + end class Mock def get_chassis(_chassis_uuid) @@ -17,8 +17,8 @@ def get_chassis(_chassis_uuid) response.status = [200, 204][rand(2)] response.body = data[:chassis_collection].first response - end # def get_chassis - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/get_driver.rb b/lib/fog/baremetal/openstack/requests/get_driver.rb index 328007210..48f95940d 100644 --- a/lib/fog/baremetal/openstack/requests/get_driver.rb +++ b/lib/fog/baremetal/openstack/requests/get_driver.rb @@ -9,7 +9,7 @@ def get_driver(driver_name) :path => "drivers/#{driver_name}" ) end - end # class Real + end class Mock def get_driver(_driver_name) @@ -17,8 +17,8 @@ def get_driver(_driver_name) response.status = [200, 204][rand(2)] response.body = data[:drivers].first response - end # def get_driver - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/get_driver_properties.rb b/lib/fog/baremetal/openstack/requests/get_driver_properties.rb index 9fe2d583b..3404d53da 100644 --- a/lib/fog/baremetal/openstack/requests/get_driver_properties.rb +++ b/lib/fog/baremetal/openstack/requests/get_driver_properties.rb @@ -11,7 +11,7 @@ def get_driver_properties(driver_name) :path => "drivers/properties" ) end - end # class Real + end class Mock def get_driver_properties(_driver_name) @@ -33,8 +33,8 @@ def get_driver_properties(_driver_name) "ipmi_bridging" => "bridging_type." } response - end # def get_driver_properties - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/get_node.rb b/lib/fog/baremetal/openstack/requests/get_node.rb index c260f65af..444909b87 100644 --- a/lib/fog/baremetal/openstack/requests/get_node.rb +++ b/lib/fog/baremetal/openstack/requests/get_node.rb @@ -9,7 +9,7 @@ def get_node(node_id) :path => "nodes/#{node_id}" ) end - end # class Real + end class Mock def get_node(_node_id) @@ -17,8 +17,8 @@ def get_node(_node_id) response.status = [200, 204][rand(2)] response.body = data[:nodes].first response - end # def get_node - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/get_port.rb b/lib/fog/baremetal/openstack/requests/get_port.rb index d67418b6e..27c2fccb2 100644 --- a/lib/fog/baremetal/openstack/requests/get_port.rb +++ b/lib/fog/baremetal/openstack/requests/get_port.rb @@ -9,7 +9,7 @@ def get_port(port_id) :path => "ports/#{port_id}" ) end - end # class Real + end class Mock def get_port(_port_id) @@ -17,8 +17,8 @@ def get_port(_port_id) response.status = [200, 204][rand(2)] response.body = data[:ports].first response - end # def get_port - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_chassis.rb b/lib/fog/baremetal/openstack/requests/list_chassis.rb index a6a6d2593..d9e583f7f 100644 --- a/lib/fog/baremetal/openstack/requests/list_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/list_chassis.rb @@ -10,7 +10,7 @@ def list_chassis(options = {}) :query => options ) end - end # class Real + end class Mock def list_chassis(_parameters = nil) @@ -35,8 +35,8 @@ def list_chassis(_parameters = nil) ] } response - end # def list_chassis - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb b/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb index 8e76b01cf..cd59e91e4 100644 --- a/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb +++ b/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb @@ -10,7 +10,7 @@ def list_chassis_detailed(options = {}) :query => options ) end - end # class Real + end class Mock def list_chassis_detailed(_options = {}) @@ -18,8 +18,8 @@ def list_chassis_detailed(_options = {}) response.status = [200, 204][rand(2)] response.body = {"chassis" => data[:chassis_collection]} response - end # def list_chassis_detailed - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_drivers.rb b/lib/fog/baremetal/openstack/requests/list_drivers.rb index c0754af49..c26ac48da 100644 --- a/lib/fog/baremetal/openstack/requests/list_drivers.rb +++ b/lib/fog/baremetal/openstack/requests/list_drivers.rb @@ -10,7 +10,7 @@ def list_drivers(options = {}) :query => options ) end - end # class Real + end class Mock def list_drivers(_options = {}) @@ -18,8 +18,8 @@ def list_drivers(_options = {}) response.status = [200, 204][rand(2)] response.body = {"drivers" => data[:drivers]} response - end # def list_drivers - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_nodes.rb b/lib/fog/baremetal/openstack/requests/list_nodes.rb index 7ad59ab66..b3b8013ce 100644 --- a/lib/fog/baremetal/openstack/requests/list_nodes.rb +++ b/lib/fog/baremetal/openstack/requests/list_nodes.rb @@ -10,7 +10,7 @@ def list_nodes(options = {}) :query => options ) end - end # class Real + end class Mock def list_nodes(_options = {}) @@ -27,8 +27,8 @@ def list_nodes(_options = {}) }] } response - end # def list_nodes - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb b/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb index cd2988c19..0ab63c487 100644 --- a/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb +++ b/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb @@ -10,7 +10,7 @@ def list_nodes_detailed(options = {}) :query => options ) end - end # class Real + end class Mock def list_nodes_detailed(_options = {}) @@ -18,8 +18,8 @@ def list_nodes_detailed(_options = {}) response.status = [200, 204][rand(2)] response.body = {"nodes" => data[:nodes]} response - end # def list_nodes - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_ports.rb b/lib/fog/baremetal/openstack/requests/list_ports.rb index 95c6bff28..e31765644 100644 --- a/lib/fog/baremetal/openstack/requests/list_ports.rb +++ b/lib/fog/baremetal/openstack/requests/list_ports.rb @@ -10,7 +10,7 @@ def list_ports(options = {}) :query => options ) end - end # class Real + end class Mock def list_ports(_options = {}) @@ -35,8 +35,8 @@ def list_ports(_options = {}) ] } response - end # def list_ports - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb b/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb index 2143252e3..31216effa 100644 --- a/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb +++ b/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb @@ -10,7 +10,7 @@ def list_ports_detailed(options = {}) :query => options ) end - end # class Real + end class Mock def list_ports_detailed(_options = {}) @@ -18,8 +18,8 @@ def list_ports_detailed(_options = {}) response.status = [200, 204][rand(2)] response.body = {"ports" => data[:ports]} response - end # def list_ports - end # class Mock - end # class OpenStack - end # module Baremetal -end # module Fog + end + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/patch_chassis.rb b/lib/fog/baremetal/openstack/requests/patch_chassis.rb index 2ace72721..a21904e44 100644 --- a/lib/fog/baremetal/openstack/requests/patch_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/patch_chassis.rb @@ -35,7 +35,7 @@ def patch_chassis(_chassis_uuid, _patch) response.body = data[:chassis_collection].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/patch_node.rb b/lib/fog/baremetal/openstack/requests/patch_node.rb index 41ef8cc17..ba2143780 100644 --- a/lib/fog/baremetal/openstack/requests/patch_node.rb +++ b/lib/fog/baremetal/openstack/requests/patch_node.rb @@ -35,7 +35,7 @@ def patch_node(_node_uuid, _patch) response.body = data[:nodes].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/patch_port.rb b/lib/fog/baremetal/openstack/requests/patch_port.rb index 433344684..0a162aa30 100644 --- a/lib/fog/baremetal/openstack/requests/patch_port.rb +++ b/lib/fog/baremetal/openstack/requests/patch_port.rb @@ -35,7 +35,7 @@ def patch_port(_port_uuid, _patch) response.body = data[:ports].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb b/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb index 8458f7724..fdcd584e5 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb +++ b/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb @@ -24,7 +24,7 @@ def set_node_maintenance(_node_uuid, _parameters = nil) } response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/set_node_power_state.rb b/lib/fog/baremetal/openstack/requests/set_node_power_state.rb index 8e2ec7e22..360aed009 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_power_state.rb +++ b/lib/fog/baremetal/openstack/requests/set_node_power_state.rb @@ -29,7 +29,7 @@ def set_node_power_state(_node_id, _power_state) response.body = data[:nodes].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb b/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb index 923562062..64328c7d6 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb +++ b/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb @@ -32,7 +32,7 @@ def set_node_provision_state(_node_id, _provision_state) response.body = data[:nodes].first response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb b/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb index 0f3c08b8e..a996d3098 100644 --- a/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb +++ b/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb @@ -24,7 +24,7 @@ def unset_node_maintenance(_node_uuid, _parameters = nil) } response end - end # mock - end # openstack - end # baremetal -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/models/network.rb b/lib/fog/compute/openstack/models/network.rb index 907063569..f6d866ee2 100644 --- a/lib/fog/compute/openstack/models/network.rb +++ b/lib/fog/compute/openstack/models/network.rb @@ -7,7 +7,7 @@ class Network < Fog::OpenStack::Model identity :id attribute :name attribute :addresses - end # class Network - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/models/networks.rb b/lib/fog/compute/openstack/models/networks.rb index ae2e7f3f0..06c57ae6c 100644 --- a/lib/fog/compute/openstack/models/networks.rb +++ b/lib/fog/compute/openstack/models/networks.rb @@ -24,7 +24,7 @@ def all # TODO: convert to load_response? load(networks) end - end # class Networks - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/models/server_group.rb b/lib/fog/compute/openstack/models/server_group.rb index df3ce4e54..8514e1ad5 100644 --- a/lib/fog/compute/openstack/models/server_group.rb +++ b/lib/fog/compute/openstack/models/server_group.rb @@ -16,7 +16,7 @@ def self.validate_server_group_policy(policy) unless VALID_SERVER_GROUP_POLICIES.include? policy true end - end # class ServerGroup - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/models/server_groups.rb b/lib/fog/compute/openstack/models/server_groups.rb index ac9ba8ff2..8b5d8ddca 100644 --- a/lib/fog/compute/openstack/models/server_groups.rb +++ b/lib/fog/compute/openstack/models/server_groups.rb @@ -22,7 +22,7 @@ def get(server_group_id) def create(*args) new(service.create_server_group(*args).body['server_group']) end - end # class ServerGroups - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/models/tenant.rb b/lib/fog/compute/openstack/models/tenant.rb index 77ae3ce4d..2f6c50438 100644 --- a/lib/fog/compute/openstack/models/tenant.rb +++ b/lib/fog/compute/openstack/models/tenant.rb @@ -18,7 +18,7 @@ def usage(start_date, end_date) requires :id service.get_usage(id, start_date, end_date).body['tenant_usage'] end - end # class Tenant - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/models/tenants.rb b/lib/fog/compute/openstack/models/tenants.rb index 03c724ecb..15d8645fb 100644 --- a/lib/fog/compute/openstack/models/tenants.rb +++ b/lib/fog/compute/openstack/models/tenants.rb @@ -18,7 +18,7 @@ def usages(start_date = nil, end_date = nil, details = false) def get(id) find { |tenant| tenant.id == id } end - end # class Tenants - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/add_aggregate_host.rb b/lib/fog/compute/openstack/requests/add_aggregate_host.rb index 0f419a2a4..8b54bce0c 100644 --- a/lib/fog/compute/openstack/requests/add_aggregate_host.rb +++ b/lib/fog/compute/openstack/requests/add_aggregate_host.rb @@ -24,7 +24,7 @@ def add_aggregate_host(_uuid, _host_uuid) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/add_fixed_ip.rb b/lib/fog/compute/openstack/requests/add_fixed_ip.rb index dbfa443d5..db4fa8461 100644 --- a/lib/fog/compute/openstack/requests/add_fixed_ip.rb +++ b/lib/fog/compute/openstack/requests/add_fixed_ip.rb @@ -16,14 +16,14 @@ def add_fixed_ip(server_id, network_id) } } server_action(server_id, body).status == 202 - end # def add_fixed_ip - end # class Real + end + end class Mock def add_fixed_ip(_server_id, _network_id) true - end # def add_fixed_ip - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/allocate_address.rb b/lib/fog/compute/openstack/requests/allocate_address.rb index 061617852..fdae56401 100644 --- a/lib/fog/compute/openstack/requests/allocate_address.rb +++ b/lib/fog/compute/openstack/requests/allocate_address.rb @@ -33,7 +33,7 @@ def allocate_address(_pool = nil) } response end - end # mock - end # openstack - end # compute + end + end + end end diff --git a/lib/fog/compute/openstack/requests/boot_from_snapshot.rb b/lib/fog/compute/openstack/requests/boot_from_snapshot.rb index bc25a81e2..a5e3b0231 100644 --- a/lib/fog/compute/openstack/requests/boot_from_snapshot.rb +++ b/lib/fog/compute/openstack/requests/boot_from_snapshot.rb @@ -36,6 +36,6 @@ def boot_from_snapshot(name, image_ref, flavor_ref, options = {}) ) end end - end # class OpenStack - end # module Compute -end # module Fog + end + end +end diff --git a/lib/fog/compute/openstack/requests/create_aggregate.rb b/lib/fog/compute/openstack/requests/create_aggregate.rb index 35dafe305..a1efdc594 100644 --- a/lib/fog/compute/openstack/requests/create_aggregate.rb +++ b/lib/fog/compute/openstack/requests/create_aggregate.rb @@ -36,7 +36,7 @@ def create_aggregate(_name, _options = {}) response.body = {'aggregate' => data[:aggregates].first} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/create_flavor.rb b/lib/fog/compute/openstack/requests/create_flavor.rb index 17bff4c0d..4b2938613 100644 --- a/lib/fog/compute/openstack/requests/create_flavor.rb +++ b/lib/fog/compute/openstack/requests/create_flavor.rb @@ -79,7 +79,7 @@ def create_flavor(attributes) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/create_flavor_metadata.rb b/lib/fog/compute/openstack/requests/create_flavor_metadata.rb index 4636ce0d1..acdbe91e4 100644 --- a/lib/fog/compute/openstack/requests/create_flavor_metadata.rb +++ b/lib/fog/compute/openstack/requests/create_flavor_metadata.rb @@ -31,7 +31,7 @@ def create_flavor_metadata(_flavor_ref, _metadata) }} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/create_key_pair.rb b/lib/fog/compute/openstack/requests/create_key_pair.rb index 38d349fbe..9ac2fa1b6 100644 --- a/lib/fog/compute/openstack/requests/create_key_pair.rb +++ b/lib/fog/compute/openstack/requests/create_key_pair.rb @@ -41,7 +41,7 @@ def create_key_pair(key_name, _public_key = nil) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/create_security_group.rb b/lib/fog/compute/openstack/requests/create_security_group.rb index 25f86116b..70fb8de42 100644 --- a/lib/fog/compute/openstack/requests/create_security_group.rb +++ b/lib/fog/compute/openstack/requests/create_security_group.rb @@ -45,7 +45,7 @@ def create_security_group(name, description) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/create_security_group_rule.rb b/lib/fog/compute/openstack/requests/create_security_group_rule.rb index 9e3848571..7a9908dbb 100644 --- a/lib/fog/compute/openstack/requests/create_security_group_rule.rb +++ b/lib/fog/compute/openstack/requests/create_security_group_rule.rb @@ -51,7 +51,7 @@ def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/delete_aggregate.rb b/lib/fog/compute/openstack/requests/delete_aggregate.rb index 626d5ccd1..e878ec6ee 100644 --- a/lib/fog/compute/openstack/requests/delete_aggregate.rb +++ b/lib/fog/compute/openstack/requests/delete_aggregate.rb @@ -22,7 +22,7 @@ def delete_aggregate(_uuid) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/delete_flavor.rb b/lib/fog/compute/openstack/requests/delete_flavor.rb index 2588a878f..260c800c4 100644 --- a/lib/fog/compute/openstack/requests/delete_flavor.rb +++ b/lib/fog/compute/openstack/requests/delete_flavor.rb @@ -22,7 +22,7 @@ def delete_flavor(_flavor_id) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/delete_key_pair.rb b/lib/fog/compute/openstack/requests/delete_key_pair.rb index 365100478..61293f3c9 100644 --- a/lib/fog/compute/openstack/requests/delete_key_pair.rb +++ b/lib/fog/compute/openstack/requests/delete_key_pair.rb @@ -23,7 +23,7 @@ def delete_key_pair(_key_name) response.body = {} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/delete_security_group.rb b/lib/fog/compute/openstack/requests/delete_security_group.rb index 4d13e7365..f25801011 100644 --- a/lib/fog/compute/openstack/requests/delete_security_group.rb +++ b/lib/fog/compute/openstack/requests/delete_security_group.rb @@ -25,7 +25,7 @@ def delete_security_group(security_group_id) response.body = {} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/delete_security_group_rule.rb b/lib/fog/compute/openstack/requests/delete_security_group_rule.rb index beeb5ea33..c6bf309ad 100644 --- a/lib/fog/compute/openstack/requests/delete_security_group_rule.rb +++ b/lib/fog/compute/openstack/requests/delete_security_group_rule.rb @@ -25,7 +25,7 @@ def delete_security_group_rule(security_group_rule_id) response.body = {} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/delete_service.rb b/lib/fog/compute/openstack/requests/delete_service.rb index 85158d5ba..24cfa4887 100644 --- a/lib/fog/compute/openstack/requests/delete_service.rb +++ b/lib/fog/compute/openstack/requests/delete_service.rb @@ -26,7 +26,7 @@ def delete_service(_host, _binary, _optional_params = nil) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/disable_service.rb b/lib/fog/compute/openstack/requests/disable_service.rb index 38ed64dc2..6dea8df79 100644 --- a/lib/fog/compute/openstack/requests/disable_service.rb +++ b/lib/fog/compute/openstack/requests/disable_service.rb @@ -31,7 +31,7 @@ def disable_service(_host, _binary, _optional_params = nil) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/disable_service_log_reason.rb b/lib/fog/compute/openstack/requests/disable_service_log_reason.rb index a644faeee..e462c5e6a 100644 --- a/lib/fog/compute/openstack/requests/disable_service_log_reason.rb +++ b/lib/fog/compute/openstack/requests/disable_service_log_reason.rb @@ -32,7 +32,7 @@ def disable_service_log_reason(_host, _binary, _disabled_reason, _optional_param } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/enable_service.rb b/lib/fog/compute/openstack/requests/enable_service.rb index 75018b745..bbdec5dba 100644 --- a/lib/fog/compute/openstack/requests/enable_service.rb +++ b/lib/fog/compute/openstack/requests/enable_service.rb @@ -31,7 +31,7 @@ def enable_service(_host, _binary, _optional_params = nil) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_address.rb b/lib/fog/compute/openstack/requests/get_address.rb index e36b422b2..19debb1fa 100644 --- a/lib/fog/compute/openstack/requests/get_address.rb +++ b/lib/fog/compute/openstack/requests/get_address.rb @@ -32,7 +32,7 @@ def get_address(_address_id) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_aggregate.rb b/lib/fog/compute/openstack/requests/get_aggregate.rb index a48e27708..5dba4fde4 100644 --- a/lib/fog/compute/openstack/requests/get_aggregate.rb +++ b/lib/fog/compute/openstack/requests/get_aggregate.rb @@ -19,7 +19,7 @@ def get_aggregate(_uuid) response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_flavor_metadata.rb b/lib/fog/compute/openstack/requests/get_flavor_metadata.rb index b3b4eafd7..e54f4337d 100644 --- a/lib/fog/compute/openstack/requests/get_flavor_metadata.rb +++ b/lib/fog/compute/openstack/requests/get_flavor_metadata.rb @@ -20,7 +20,7 @@ def get_flavor_metadata(_flavor_ref) }} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_host_details.rb b/lib/fog/compute/openstack/requests/get_host_details.rb index 1425b06b7..ca43d14b1 100644 --- a/lib/fog/compute/openstack/requests/get_host_details.rb +++ b/lib/fog/compute/openstack/requests/get_host_details.rb @@ -54,7 +54,7 @@ def get_host_details(_host) ]} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_security_group.rb b/lib/fog/compute/openstack/requests/get_security_group.rb index 60fc858d2..e82139a8f 100644 --- a/lib/fog/compute/openstack/requests/get_security_group.rb +++ b/lib/fog/compute/openstack/requests/get_security_group.rb @@ -31,7 +31,7 @@ def get_security_group(security_group_id) end response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_security_group_rule.rb b/lib/fog/compute/openstack/requests/get_security_group_rule.rb index a093afad9..738eec005 100644 --- a/lib/fog/compute/openstack/requests/get_security_group_rule.rb +++ b/lib/fog/compute/openstack/requests/get_security_group_rule.rb @@ -32,7 +32,7 @@ def get_security_group_rule(security_group_rule_id) end response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/get_vnc_console.rb b/lib/fog/compute/openstack/requests/get_vnc_console.rb index b0b7b573c..1073de830 100644 --- a/lib/fog/compute/openstack/requests/get_vnc_console.rb +++ b/lib/fog/compute/openstack/requests/get_vnc_console.rb @@ -19,8 +19,8 @@ def get_vnc_console(server_id, console_type) } } server_action(server_id, body) - end # def get_vnc_console - end # class Real + end + end class Mock def get_vnc_console(_server_id, _console_type) @@ -33,8 +33,8 @@ def get_vnc_console(_server_id, _console_type) } } response - end # def get_vnc_console - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_aggregates.rb b/lib/fog/compute/openstack/requests/list_aggregates.rb index eaa3e8fbd..2e4dcee21 100644 --- a/lib/fog/compute/openstack/requests/list_aggregates.rb +++ b/lib/fog/compute/openstack/requests/list_aggregates.rb @@ -31,7 +31,7 @@ def list_aggregates(_options = {}) response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_all_addresses.rb b/lib/fog/compute/openstack/requests/list_all_addresses.rb index f0de607cc..9c77b74ff 100644 --- a/lib/fog/compute/openstack/requests/list_all_addresses.rb +++ b/lib/fog/compute/openstack/requests/list_all_addresses.rb @@ -56,7 +56,7 @@ def list_all_addresses(_options = {}) } response end - end # mock - end # openstack - end # Compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_hosts.rb b/lib/fog/compute/openstack/requests/list_hosts.rb index 6591d087d..0f7c4d50b 100644 --- a/lib/fog/compute/openstack/requests/list_hosts.rb +++ b/lib/fog/compute/openstack/requests/list_hosts.rb @@ -21,7 +21,7 @@ def list_hosts(_options = {}) ]} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_key_pairs.rb b/lib/fog/compute/openstack/requests/list_key_pairs.rb index abb0c6092..99861421c 100644 --- a/lib/fog/compute/openstack/requests/list_key_pairs.rb +++ b/lib/fog/compute/openstack/requests/list_key_pairs.rb @@ -33,7 +33,7 @@ def list_key_pairs(_options = {}) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_security_groups.rb b/lib/fog/compute/openstack/requests/list_security_groups.rb index fa6d5f82b..1c0dc2a34 100644 --- a/lib/fog/compute/openstack/requests/list_security_groups.rb +++ b/lib/fog/compute/openstack/requests/list_security_groups.rb @@ -61,7 +61,7 @@ def list_security_groups(options = {}) :status => 200 ) end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_services.rb b/lib/fog/compute/openstack/requests/list_services.rb index 3c4c52a57..74156035e 100644 --- a/lib/fog/compute/openstack/requests/list_services.rb +++ b/lib/fog/compute/openstack/requests/list_services.rb @@ -60,7 +60,7 @@ def list_services(_parameters = nil) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/list_tenants.rb b/lib/fog/compute/openstack/requests/list_tenants.rb index c9cd957f5..59a0714cb 100644 --- a/lib/fog/compute/openstack/requests/list_tenants.rb +++ b/lib/fog/compute/openstack/requests/list_tenants.rb @@ -37,7 +37,7 @@ def list_tenants } response end - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/pause_server.rb b/lib/fog/compute/openstack/requests/pause_server.rb index 0b5bdbd75..a5b8bab7f 100644 --- a/lib/fog/compute/openstack/requests/pause_server.rb +++ b/lib/fog/compute/openstack/requests/pause_server.rb @@ -11,14 +11,14 @@ class Real def pause_server(server_id) body = {'pause' => nil} server_action(server_id, body).status == 202 - end # def pause_server - end # class Real + end + end class Mock def pause_server(_server_id) true - end # def pause_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/release_address.rb b/lib/fog/compute/openstack/requests/release_address.rb index 839f0b721..9b7b68fdb 100644 --- a/lib/fog/compute/openstack/requests/release_address.rb +++ b/lib/fog/compute/openstack/requests/release_address.rb @@ -23,7 +23,7 @@ def release_address(_address_id) response.body = {} response end - end # mock + end end end end diff --git a/lib/fog/compute/openstack/requests/remove_aggregate_host.rb b/lib/fog/compute/openstack/requests/remove_aggregate_host.rb index 7f64b2602..8a0879f91 100644 --- a/lib/fog/compute/openstack/requests/remove_aggregate_host.rb +++ b/lib/fog/compute/openstack/requests/remove_aggregate_host.rb @@ -24,7 +24,7 @@ def remove_aggregate_host(_uuid, _host_uuid) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/remove_fixed_ip.rb b/lib/fog/compute/openstack/requests/remove_fixed_ip.rb index 4cf64c92c..ea1024145 100644 --- a/lib/fog/compute/openstack/requests/remove_fixed_ip.rb +++ b/lib/fog/compute/openstack/requests/remove_fixed_ip.rb @@ -16,14 +16,14 @@ def remove_fixed_ip(server_id, address) } } server_action(server_id, body).status == 202 - end # def remove_fixed_ip - end # class Real + end + end class Mock def remove_fixed_ip(_server_id, _address) true - end # def remove_fixed_ip - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/rescue_server.rb b/lib/fog/compute/openstack/requests/rescue_server.rb index 96f1418fc..936926e1e 100644 --- a/lib/fog/compute/openstack/requests/rescue_server.rb +++ b/lib/fog/compute/openstack/requests/rescue_server.rb @@ -11,14 +11,14 @@ class Real def rescue_server(server_id) body = {'rescue' => nil} server_action(server_id, body) == 202 - end # def rescue_server - end # class Real + end + end class Mock def rescue_server(_server_id) true - end # def rescue_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/resume_server.rb b/lib/fog/compute/openstack/requests/resume_server.rb index 423a472b9..44274d381 100644 --- a/lib/fog/compute/openstack/requests/resume_server.rb +++ b/lib/fog/compute/openstack/requests/resume_server.rb @@ -11,14 +11,14 @@ class Real def resume_server(server_id) body = {'resume' => nil} server_action(server_id, body).status == 202 - end # def resume_server - end # class Real + end + end class Mock def resume_server(_server_id) true - end # def resume_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/server_actions.rb b/lib/fog/compute/openstack/requests/server_actions.rb index 27737797e..6eb119c50 100644 --- a/lib/fog/compute/openstack/requests/server_actions.rb +++ b/lib/fog/compute/openstack/requests/server_actions.rb @@ -14,8 +14,8 @@ def server_actions(server_id) :method => 'GET', :path => "servers/#{server_id}/os-instance-actions" ).body['instanceActions'] - end # def server_actions - end # class Real + end + end class Mock def server_actions(server_id) @@ -31,8 +31,8 @@ def server_actions(server_id) 'project_id' => '9d5d0b877cf449fdae078659cfa12e86' }] response - end # def server_actions - end # class Mock - end # class OpenStack - end # module Compute -end # moduel Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/server_diagnostics.rb b/lib/fog/compute/openstack/requests/server_diagnostics.rb index f6770a5be..d6e6c52a7 100644 --- a/lib/fog/compute/openstack/requests/server_diagnostics.rb +++ b/lib/fog/compute/openstack/requests/server_diagnostics.rb @@ -13,13 +13,13 @@ def server_diagnostics(server_id) :method => 'GET', :path => "servers/#{server_id}/diagnostics" ) - end # def server_diagnostics - end # class Real + end + end class Mock def server_diagnostics(server_id) - end # def server_diagnostics - end # class Real - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/set_tenant.rb b/lib/fog/compute/openstack/requests/set_tenant.rb index 31549128f..620d74c7e 100644 --- a/lib/fog/compute/openstack/requests/set_tenant.rb +++ b/lib/fog/compute/openstack/requests/set_tenant.rb @@ -14,6 +14,6 @@ def set_tenant(_tenant) true end end - end # class OpenStack - end # module Compute -end # module Fog + end + end +end diff --git a/lib/fog/compute/openstack/requests/shelve_offload_server.rb b/lib/fog/compute/openstack/requests/shelve_offload_server.rb index 8efbecf4e..045ebfe4d 100644 --- a/lib/fog/compute/openstack/requests/shelve_offload_server.rb +++ b/lib/fog/compute/openstack/requests/shelve_offload_server.rb @@ -11,14 +11,14 @@ class Real def shelve_offload_server(server_id) body = {'shelveOffload' => nil} server_action(server_id, body).status == 202 - end # def shelve_off_load_server - end # class Real + end + end class Mock def shelve_offload_server(_server_id) true - end # def shelve_off_load_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/shelve_server.rb b/lib/fog/compute/openstack/requests/shelve_server.rb index 290945428..7ba422f98 100644 --- a/lib/fog/compute/openstack/requests/shelve_server.rb +++ b/lib/fog/compute/openstack/requests/shelve_server.rb @@ -11,14 +11,14 @@ class Real def shelve_server(server_id) body = {'shelve' => nil} server_action(server_id, body).status == 202 - end # def shelve_server - end # class Real + end + end class Mock def shelve_server(_server_id) true - end # def shelve_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/start_server.rb b/lib/fog/compute/openstack/requests/start_server.rb index 42420143c..1d1286e58 100644 --- a/lib/fog/compute/openstack/requests/start_server.rb +++ b/lib/fog/compute/openstack/requests/start_server.rb @@ -11,14 +11,14 @@ class Real def start_server(server_id) body = {'os-start' => nil} server_action(server_id, body).status == 202 - end # def start_server - end # class Real + end + end class Mock def start_server(_server_id) true - end # def start_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/stop_server.rb b/lib/fog/compute/openstack/requests/stop_server.rb index fe83fc1b3..7addb0bf0 100644 --- a/lib/fog/compute/openstack/requests/stop_server.rb +++ b/lib/fog/compute/openstack/requests/stop_server.rb @@ -11,14 +11,14 @@ class Real def stop_server(server_id) body = {'os-stop' => nil} server_action(server_id, body).status == 202 - end # def stop_server - end # class Real + end + end class Mock def stop_server(_server_id) true - end # def stop_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/suspend_server.rb b/lib/fog/compute/openstack/requests/suspend_server.rb index ec0ea2c2a..780b1a5a1 100644 --- a/lib/fog/compute/openstack/requests/suspend_server.rb +++ b/lib/fog/compute/openstack/requests/suspend_server.rb @@ -11,14 +11,14 @@ class Real def suspend_server(server_id) body = {'suspend' => nil} server_action(server_id, body).status == 202 - end # def suspend_server - end # class Real + end + end class Mock def suspend_server(_server_id) true - end # def suspend_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/unpause_server.rb b/lib/fog/compute/openstack/requests/unpause_server.rb index 49663dbe7..d60c11d20 100644 --- a/lib/fog/compute/openstack/requests/unpause_server.rb +++ b/lib/fog/compute/openstack/requests/unpause_server.rb @@ -11,14 +11,14 @@ class Real def unpause_server(server_id) body = {'unpause' => nil} server_action(server_id, body).status == 202 - end # def unpause_server - end # class Real + end + end class Mock def unpause_server(_server_id) true - end # def unpause_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/unshelve_server.rb b/lib/fog/compute/openstack/requests/unshelve_server.rb index fef29ecf2..c5b80b0bb 100644 --- a/lib/fog/compute/openstack/requests/unshelve_server.rb +++ b/lib/fog/compute/openstack/requests/unshelve_server.rb @@ -11,14 +11,14 @@ class Real def unshelve_server(server_id) body = {'unshelve' => nil} server_action(server_id, body).status == 202 - end # def unshelve_server - end # class Real + end + end class Mock def unshelve_server(_server_id) true - end # def unshelve_server - end # class Mock - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/update_aggregate.rb b/lib/fog/compute/openstack/requests/update_aggregate.rb index de4c00b35..ab63235c1 100644 --- a/lib/fog/compute/openstack/requests/update_aggregate.rb +++ b/lib/fog/compute/openstack/requests/update_aggregate.rb @@ -31,7 +31,7 @@ def update_aggregate(_uuid, _options = {}) response.body = {'aggregate' => data[:aggregates].first} response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb b/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb index f217bcc13..08b65638e 100644 --- a/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb +++ b/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb @@ -24,7 +24,7 @@ def update_aggregate_metadata(_uuid, _metadata = {}) } response end - end # mock - end # openstack - end # compute -end # fog + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/models/role.rb b/lib/fog/identity/openstack/v2/models/role.rb index 3cfe7d3b9..683d701f3 100644 --- a/lib/fog/identity/openstack/v2/models/role.rb +++ b/lib/fog/identity/openstack/v2/models/role.rb @@ -46,8 +46,8 @@ def add_remove_to_user(user, tenant, ops) def get_id(model_or_string) model_or_string.kind_of?(String) ? id : model_or_string.id end - end # class Role - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/models/roles.rb b/lib/fog/identity/openstack/v2/models/roles.rb index 808bbf914..893cbe266 100644 --- a/lib/fog/identity/openstack/v2/models/roles.rb +++ b/lib/fog/identity/openstack/v2/models/roles.rb @@ -16,7 +16,7 @@ def get(id) service.get_role(id) end end - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/models/tenant.rb b/lib/fog/identity/openstack/v2/models/tenant.rb index d6565b89e..c24c7e022 100644 --- a/lib/fog/identity/openstack/v2/models/tenant.rb +++ b/lib/fog/identity/openstack/v2/models/tenant.rb @@ -56,8 +56,8 @@ def grant_user_role(user_id, role_id) def revoke_user_role(user_id, role_id) service.remove_user_from_tenant(id, user_id, role_id) end - end # class Tenant - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/models/tenants.rb b/lib/fog/identity/openstack/v2/models/tenants.rb index 79d2a75be..e74a16bb5 100644 --- a/lib/fog/identity/openstack/v2/models/tenants.rb +++ b/lib/fog/identity/openstack/v2/models/tenants.rb @@ -25,8 +25,8 @@ def destroy(id) tenant = find_by_id(id) tenant.destroy end - end # class Tenants - end # class V2 - end # class OpenStack - end # module Compute -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/models/user.rb b/lib/fog/identity/openstack/v2/models/user.rb index b7b5f5c53..da35cb819 100644 --- a/lib/fog/identity/openstack/v2/models/user.rb +++ b/lib/fog/identity/openstack/v2/models/user.rb @@ -62,8 +62,8 @@ def roles(tenant_id = self.tenant_id) [] end end - end # class User - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/models/users.rb b/lib/fog/identity/openstack/v2/models/users.rb index c59506bf3..40c17d228 100644 --- a/lib/fog/identity/openstack/v2/models/users.rb +++ b/lib/fog/identity/openstack/v2/models/users.rb @@ -38,8 +38,8 @@ def destroy(id) user = find_by_id(id) user.destroy end - end # class Users - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb b/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb index 38f6bd51b..3926b7e1e 100644 --- a/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb @@ -10,7 +10,7 @@ def add_user_to_tenant(tenant_id, user_id, role_id) :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end - end # class Real + end class Mock def add_user_to_tenant(tenant_id, user_id, role_id) @@ -28,9 +28,9 @@ def add_user_to_tenant(tenant_id, user_id, role_id) } } response - end # def add_user_to_tenant - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity + end + end + end + end + end end diff --git a/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb b/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb index 5e8550f40..ee014ae26 100644 --- a/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb @@ -53,7 +53,7 @@ def create_ec2_credential(user_id, tenant_id) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/create_role.rb b/lib/fog/identity/openstack/v2/requests/create_role.rb index 23ccb1c20..dcf1bf80f 100644 --- a/lib/fog/identity/openstack/v2/requests/create_role.rb +++ b/lib/fog/identity/openstack/v2/requests/create_role.rb @@ -32,7 +32,7 @@ def create_role(name) ) end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/create_tenant.rb b/lib/fog/identity/openstack/v2/requests/create_tenant.rb index c6a9ff09d..ee1a49860 100644 --- a/lib/fog/identity/openstack/v2/requests/create_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/create_tenant.rb @@ -10,8 +10,8 @@ def create_tenant(attributes) :path => "tenants", :body => Fog::JSON.encode('tenant' => attributes) ) - end # def create_tenant - end # class Real + end + end class Mock def create_tenant(attributes) @@ -26,9 +26,9 @@ def create_tenant(attributes) } } response - end # def create_tenant - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/create_user.rb b/lib/fog/identity/openstack/v2/requests/create_user.rb index 947eb6c54..7f13f337c 100644 --- a/lib/fog/identity/openstack/v2/requests/create_user.rb +++ b/lib/fog/identity/openstack/v2/requests/create_user.rb @@ -39,7 +39,7 @@ def create_user(name, _password, email, tenantId = nil, enabled = true) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/create_user_role.rb b/lib/fog/identity/openstack/v2/requests/create_user_role.rb index 62dc2e07c..b56f2fc22 100644 --- a/lib/fog/identity/openstack/v2/requests/create_user_role.rb +++ b/lib/fog/identity/openstack/v2/requests/create_user_role.rb @@ -20,7 +20,7 @@ def create_user_role(_tenant_id, _user_id, role_id) ) end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb b/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb index 5fcd30ef2..b487feee1 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb @@ -37,7 +37,7 @@ def delete_ec2_credential(user_id, access) rescue end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_role.rb b/lib/fog/identity/openstack/v2/requests/delete_role.rb index 71ba712dd..28d36ee24 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_role.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_role.rb @@ -24,7 +24,7 @@ def delete_role(role_id) end end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_tenant.rb b/lib/fog/identity/openstack/v2/requests/delete_tenant.rb index 3184e10a6..c7410624b 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_tenant.rb @@ -9,8 +9,8 @@ def delete_tenant(id) :method => 'DELETE', :path => "tenants/#{id}" ) - end # def create_tenant - end # class Real + end + end class Mock def delete_tenant(_attributes) @@ -25,9 +25,9 @@ def delete_tenant(_attributes) } } response - end # def create_tenant - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/delete_user.rb b/lib/fog/identity/openstack/v2/requests/delete_user.rb index ad21fea27..1413c7655 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_user.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_user.rb @@ -25,7 +25,7 @@ def delete_user(user_id) raise Fog::Identity::OpenStack::NotFound end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_user_role.rb b/lib/fog/identity/openstack/v2/requests/delete_user_role.rb index 408262431..a9f9a45d7 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_user_role.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_user_role.rb @@ -19,7 +19,7 @@ def delete_user_role(_tenant_id, _user_id, _role_id) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb b/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb index 38b45fea5..e7eed8295 100644 --- a/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb @@ -44,7 +44,7 @@ def get_ec2_credential(user_id, access) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_role.rb b/lib/fog/identity/openstack/v2/requests/get_role.rb index 0602e712b..4ec42ef01 100644 --- a/lib/fog/identity/openstack/v2/requests/get_role.rb +++ b/lib/fog/identity/openstack/v2/requests/get_role.rb @@ -23,8 +23,8 @@ def get_role(id) raise Fog::Identity::OpenStack::NotFound end end - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/get_tenant.rb b/lib/fog/identity/openstack/v2/requests/get_tenant.rb index 55b08971c..0a57bd7f8 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/get_tenant.rb @@ -10,7 +10,7 @@ def get_tenant(id) :path => "tenants/#{id}" ) end - end # class Real + end class Mock def get_tenant(id) @@ -25,9 +25,9 @@ def get_tenant(id) } } response - end # def list_tenants - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb b/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb index dba735ca4..7018ceaba 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb +++ b/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb @@ -14,7 +14,7 @@ def get_tenants_by_id(tenant_id) class Mock end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb b/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb index bdb35e7a5..c03b29d7d 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb +++ b/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb @@ -14,7 +14,7 @@ def get_tenants_by_name(name) class Mock end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb b/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb index 4a9ddb65b..72bf390e9 100644 --- a/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb +++ b/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb @@ -28,7 +28,7 @@ def get_user_by_id(user_id) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb b/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb index 60c3f4032..d283d9167 100644 --- a/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb +++ b/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb @@ -23,7 +23,7 @@ def get_user_by_name(name) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb b/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb index 7cc90711c..e830a8222 100644 --- a/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb +++ b/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb @@ -55,7 +55,7 @@ def list_ec2_credentials(options = {}) response end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb b/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb index edc344b6a..7d4c410c5 100644 --- a/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb +++ b/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb @@ -14,7 +14,7 @@ def list_endpoints_for_token(token_id) class Mock end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/list_roles.rb b/lib/fog/identity/openstack/v2/requests/list_roles.rb index b9b8181d3..99332ebd3 100644 --- a/lib/fog/identity/openstack/v2/requests/list_roles.rb +++ b/lib/fog/identity/openstack/v2/requests/list_roles.rb @@ -28,7 +28,7 @@ def list_roles(_options = {}) ) end end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb b/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb index 824413d6f..504b63d5c 100644 --- a/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb @@ -9,8 +9,8 @@ def list_roles_for_user_on_tenant(tenant_id, user_id) :method => 'GET', :path => "tenants/#{tenant_id}/users/#{user_id}/roles" ) - end # def list_roles_for_user_on_tenant - end # class Real + end + end class Mock def list_roles_for_user_on_tenant(tenant_id, user_id) @@ -24,9 +24,9 @@ def list_roles_for_user_on_tenant(tenant_id, user_id) :body => {'roles' => roles}, :status => 200 ) - end # def list_roles_for_user_on_tenant - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/list_tenants.rb b/lib/fog/identity/openstack/v2/requests/list_tenants.rb index 4333ae826..015549631 100644 --- a/lib/fog/identity/openstack/v2/requests/list_tenants.rb +++ b/lib/fog/identity/openstack/v2/requests/list_tenants.rb @@ -21,7 +21,7 @@ def list_tenants(options = nil, marker = nil) :query => params ) end - end # class Real + end class Mock def list_tenants(_options = nil, _marker = nil) @@ -45,9 +45,9 @@ def list_tenants(_options = nil, _marker = nil) }, :status => [200, 204][rand(2)] ) - end # def list_tenants - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb b/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb index 378a7d354..c8f618b1d 100644 --- a/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb +++ b/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb @@ -14,7 +14,7 @@ def list_user_global_roles(user_id) class Mock end - end # class V2 + end end end end diff --git a/lib/fog/identity/openstack/v2/requests/list_users.rb b/lib/fog/identity/openstack/v2/requests/list_users.rb index 01d3c523d..e57efdc71 100644 --- a/lib/fog/identity/openstack/v2/requests/list_users.rb +++ b/lib/fog/identity/openstack/v2/requests/list_users.rb @@ -21,7 +21,7 @@ def list_users(options = {}) :query => query ) end - end # class Real + end class Mock def list_users(options = {}) @@ -40,8 +40,8 @@ def list_users(options = {}) :status => 200 ) end - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb b/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb index 41177837a..d68ad4f54 100644 --- a/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb @@ -10,13 +10,13 @@ def remove_user_from_tenant(tenant_id, user_id, role_id) :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end - end # class Real + end class Mock def remove_user_from_tenant(tenant_id, user_id, role_id) - end # def remove_user_from_tenant - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity + end + end + end + end + end end diff --git a/lib/fog/identity/openstack/v2/requests/set_tenant.rb b/lib/fog/identity/openstack/v2/requests/set_tenant.rb index 935b79af8..4beb72e84 100644 --- a/lib/fog/identity/openstack/v2/requests/set_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/set_tenant.rb @@ -15,7 +15,7 @@ def set_tenant(_tenant) true end end - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/update_tenant.rb b/lib/fog/identity/openstack/v2/requests/update_tenant.rb index 01eadfc1a..e24a8d90d 100644 --- a/lib/fog/identity/openstack/v2/requests/update_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/update_tenant.rb @@ -10,8 +10,8 @@ def update_tenant(id, attributes) :path => "tenants/#{id}", :body => Fog::JSON.encode('tenant' => attributes) ) - end # def create_tenant - end # class Real + end + end class Mock def update_tenant(_id, attributes) @@ -22,9 +22,9 @@ def update_tenant(_id, attributes) 'tenant' => attributes } response - end # def create_tenant - end # class Mock - end # class V2 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/identity/openstack/v2/requests/update_user.rb b/lib/fog/identity/openstack/v2/requests/update_user.rb index 67dfb4b9d..67709eb43 100644 --- a/lib/fog/identity/openstack/v2/requests/update_user.rb +++ b/lib/fog/identity/openstack/v2/requests/update_user.rb @@ -28,7 +28,7 @@ def update_user(user_id, options) end end end - end # class V2 + end end end end diff --git a/lib/fog/image/openstack/v1/requests/add_member_to_image.rb b/lib/fog/image/openstack/v1/requests/add_member_to_image.rb index f4550208a..f6bbb33f0 100644 --- a/lib/fog/image/openstack/v1/requests/add_member_to_image.rb +++ b/lib/fog/image/openstack/v1/requests/add_member_to_image.rb @@ -10,16 +10,16 @@ def add_member_to_image(image_id, tenant_id) :path => "images/#{image_id}/members/#{tenant_id}" ) end - end # class Real + end class Mock def add_member_to_image(_image_id, _tenant_id) response = Excon::Response.new response.status = [200, 204][rand(2)] response - end # def list_tenants - end # class Mock - end # class V1 - end # class OpenStack - end # module Identity -end # module Fog + end + end + end + end + end +end diff --git a/lib/fog/image/openstack/v1/requests/get_image.rb b/lib/fog/image/openstack/v1/requests/get_image.rb index 44a1a2cc7..69db152ac 100644 --- a/lib/fog/image/openstack/v1/requests/get_image.rb +++ b/lib/fog/image/openstack/v1/requests/get_image.rb @@ -10,7 +10,7 @@ def get_image(image_id) :path => "images/#{image_id}" ) end - end # class Real + end class Mock def get_image(_image_id) @@ -39,9 +39,9 @@ def get_image(_image_id) "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e"} response.body = "" response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/get_image_by_id.rb b/lib/fog/image/openstack/v1/requests/get_image_by_id.rb index 51b028283..9c2c32e92 100644 --- a/lib/fog/image/openstack/v1/requests/get_image_by_id.rb +++ b/lib/fog/image/openstack/v1/requests/get_image_by_id.rb @@ -10,7 +10,7 @@ def get_image_by_id(image_id) :path => "images/#{image_id}" ) end - end # class Real + end class Mock def get_image_by_id(image_id) @@ -36,9 +36,9 @@ def get_image_by_id(image_id) } response.body = {} response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/get_image_members.rb b/lib/fog/image/openstack/v1/requests/get_image_members.rb index 01c238537..55f4917c4 100644 --- a/lib/fog/image/openstack/v1/requests/get_image_members.rb +++ b/lib/fog/image/openstack/v1/requests/get_image_members.rb @@ -10,7 +10,7 @@ def get_image_members(image_id) :path => "images/#{image_id}/members" ) end - end # class Real + end class Mock def get_image_members(_image_id) @@ -23,9 +23,9 @@ def get_image_members(_image_id) ] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/get_shared_images.rb b/lib/fog/image/openstack/v1/requests/get_shared_images.rb index e4b2cf117..82a4bec92 100644 --- a/lib/fog/image/openstack/v1/requests/get_shared_images.rb +++ b/lib/fog/image/openstack/v1/requests/get_shared_images.rb @@ -10,7 +10,7 @@ def get_shared_images(tenant_id) :path => "shared-images/#{tenant_id}" ) end - end # class Real + end class Mock def get_shared_images(_tenant_id) @@ -23,9 +23,9 @@ def get_shared_images(_tenant_id) ] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/list_public_images.rb b/lib/fog/image/openstack/v1/requests/list_public_images.rb index 4dc5e530c..3e48e1557 100644 --- a/lib/fog/image/openstack/v1/requests/list_public_images.rb +++ b/lib/fog/image/openstack/v1/requests/list_public_images.rb @@ -11,7 +11,7 @@ def list_public_images(options = {}) :query => options ) end - end # class Real + end class Mock def list_public_images(_options = {}) @@ -28,9 +28,9 @@ def list_public_images(_options = {}) }] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb b/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb index f582374b8..3e3423553 100644 --- a/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb +++ b/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb @@ -21,7 +21,7 @@ def list_public_images_detailed(options = {}, query_deprecated = nil) :query => query ) end - end # class Real + end class Mock def list_public_images_detailed(_options = {}, _query_deprecated = nil) @@ -29,9 +29,9 @@ def list_public_images_detailed(_options = {}, _query_deprecated = nil) response.status = [200, 204][rand(2)] response.body = {'images' => data[:images].values} response - end # def list_public_images_detailed - end # class Mock - end # class OpenStack + end + end + end end - end # module Image -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb b/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb index ec9220ff4..c23bae900 100644 --- a/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb +++ b/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb @@ -10,16 +10,16 @@ def remove_member_from_image(image_id, member_id) :path => "images/#{image_id}/members/#{member_id}" ) end - end # class Real + end class Mock def remove_member_from_image(_image_id, _member_id) response = Excon::Response.new response.status = [200, 204][rand(2)] response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/set_tenant.rb b/lib/fog/image/openstack/v1/requests/set_tenant.rb index 718140d1d..a65b20c12 100644 --- a/lib/fog/image/openstack/v1/requests/set_tenant.rb +++ b/lib/fog/image/openstack/v1/requests/set_tenant.rb @@ -15,7 +15,7 @@ def set_tenant(_tenant) true end end - end # class OpenStack + end end - end # module Image -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v1/requests/update_image_members.rb b/lib/fog/image/openstack/v1/requests/update_image_members.rb index f77b9e35c..3a2129ccd 100644 --- a/lib/fog/image/openstack/v1/requests/update_image_members.rb +++ b/lib/fog/image/openstack/v1/requests/update_image_members.rb @@ -18,7 +18,7 @@ def update_image_members(image_id, members) :path => "images/#{image_id}/members" ) end - end # class Real + end class Mock def update_image_members(_image_id, _members) @@ -32,8 +32,8 @@ def update_image_members(_image_id, _members) } response end - end # class Mock - end # class OpenStack + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/add_member_to_image.rb b/lib/fog/image/openstack/v2/requests/add_member_to_image.rb index a8a97aad0..1d867a234 100644 --- a/lib/fog/image/openstack/v2/requests/add_member_to_image.rb +++ b/lib/fog/image/openstack/v2/requests/add_member_to_image.rb @@ -11,16 +11,16 @@ def add_member_to_image(image_id, tenant_id) :body => Fog::JSON.encode(:member => tenant_id) ) end - end # class Real + end class Mock def add_member_to_image(_image_id, _tenant_id) response = Excon::Response.new response.status = 200 response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb b/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb index 7b5e3f76b..f22e6bdfb 100644 --- a/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb +++ b/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb @@ -10,16 +10,16 @@ def add_tag_to_image(image_id, tag) :path => "images/#{image_id}/tags/#{tag}" ) end - end # class Real + end class Mock def add_tag_to_image(_image_id, _tag) response = Excon::Response.new response.status = 204 response - end # def add_tag_to_image - end # class Mock - end # class OpenStack + end + end + end end - end # module Image -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/download_image.rb b/lib/fog/image/openstack/v2/requests/download_image.rb index 387614d8e..eb0d306cc 100644 --- a/lib/fog/image/openstack/v2/requests/download_image.rb +++ b/lib/fog/image/openstack/v2/requests/download_image.rb @@ -13,7 +13,7 @@ def download_image(image_id, _content_range = nil, params) # TODO: implement con request_hash[:response_block] = params[:response_block] if params[:response_block] request(request_hash).body end - end # class Real + end class Mock def download_image(_image_id, _content_range = nil) @@ -21,9 +21,9 @@ def download_image(_image_id, _content_range = nil) response.status = [200, 204][rand(2)] response.body = "" response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/get_image.rb b/lib/fog/image/openstack/v2/requests/get_image.rb index ad2a288d6..0c84793f3 100644 --- a/lib/fog/image/openstack/v2/requests/get_image.rb +++ b/lib/fog/image/openstack/v2/requests/get_image.rb @@ -10,7 +10,7 @@ def get_image(image_id) :path => "images/#{image_id}" ) end - end # class Real + end class Mock def get_image(_image_id) @@ -39,9 +39,9 @@ def get_image(_image_id) "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e"} response.body = "" response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/get_image_by_id.rb b/lib/fog/image/openstack/v2/requests/get_image_by_id.rb index 208d4fd54..ef7dbcbb7 100644 --- a/lib/fog/image/openstack/v2/requests/get_image_by_id.rb +++ b/lib/fog/image/openstack/v2/requests/get_image_by_id.rb @@ -10,7 +10,7 @@ def get_image_by_id(image_id) :path => "images/#{image_id}" ) end - end # class Real + end class Mock def get_image_by_id(_image_id) @@ -27,9 +27,9 @@ def get_image_by_id(_image_id) }] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/get_image_members.rb b/lib/fog/image/openstack/v2/requests/get_image_members.rb index d961f1e66..37fa276ba 100644 --- a/lib/fog/image/openstack/v2/requests/get_image_members.rb +++ b/lib/fog/image/openstack/v2/requests/get_image_members.rb @@ -10,7 +10,7 @@ def get_image_members(image_id) :path => "images/#{image_id}/members" ) end - end # class Real + end class Mock def get_image_members(_image_id) @@ -23,9 +23,9 @@ def get_image_members(_image_id) ] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/get_member_details.rb b/lib/fog/image/openstack/v2/requests/get_member_details.rb index 77b97f35e..88bda499c 100644 --- a/lib/fog/image/openstack/v2/requests/get_member_details.rb +++ b/lib/fog/image/openstack/v2/requests/get_member_details.rb @@ -10,7 +10,7 @@ def get_member_details(image_id, member_id) :path => "images/#{image_id}/members/#{member_id}" ).body end - end # class Real + end class Mock def get_member_details(_image_id, _member_id) @@ -25,9 +25,9 @@ def get_member_details(_image_id, _member_id) :schema => "/v2/schemas/member" } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/get_shared_images.rb b/lib/fog/image/openstack/v2/requests/get_shared_images.rb index 184c575fd..8812a5686 100644 --- a/lib/fog/image/openstack/v2/requests/get_shared_images.rb +++ b/lib/fog/image/openstack/v2/requests/get_shared_images.rb @@ -10,7 +10,7 @@ def get_shared_images(tenant_id) :path => "shared-images/#{tenant_id}" ) end - end # class Real + end class Mock def get_shared_images(_tenant_id) @@ -23,9 +23,9 @@ def get_shared_images(_tenant_id) ] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/list_images.rb b/lib/fog/image/openstack/v2/requests/list_images.rb index 647817424..cd95d7a5f 100644 --- a/lib/fog/image/openstack/v2/requests/list_images.rb +++ b/lib/fog/image/openstack/v2/requests/list_images.rb @@ -11,7 +11,7 @@ def list_images(options = {}) :query => options ) end - end # class Real + end class Mock def list_images(_options = {}) @@ -28,9 +28,9 @@ def list_images(_options = {}) }] } response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb b/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb index af2c98b0a..a9b7fba3a 100644 --- a/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb +++ b/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb @@ -10,16 +10,16 @@ def remove_member_from_image(image_id, member_id) :path => "images/#{image_id}/members/#{member_id}" ) end - end # class Real + end class Mock def remove_member_from_image(_image_id, _member_id) response = Excon::Response.new response.status = [200, 204][rand(2)] response - end # def list_tenants - end # class Mock - end # class OpenStack + end + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb b/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb index 4c0af27c0..32a22f3b3 100644 --- a/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb +++ b/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb @@ -10,16 +10,16 @@ def remove_tag_from_image(image_id, tag) :path => "images/#{image_id}/tags/#{tag}" ) end - end # class Real + end class Mock def remove_tag_from_image(_image_id, _tag) response = Excon::Response.new response.status = 204 response - end # def remove_tag_from_image - end # class Mock - end # class OpenStack + end + end + end end - end # module Image -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/set_tenant.rb b/lib/fog/image/openstack/v2/requests/set_tenant.rb index 2ee9ebc72..56f1445b7 100644 --- a/lib/fog/image/openstack/v2/requests/set_tenant.rb +++ b/lib/fog/image/openstack/v2/requests/set_tenant.rb @@ -15,7 +15,7 @@ def set_tenant(_tenant) true end end - end # class OpenStack + end end - end # module Compute -end # module Fog + end +end diff --git a/lib/fog/image/openstack/v2/requests/update_image_member.rb b/lib/fog/image/openstack/v2/requests/update_image_member.rb index 592480f7d..eefc31a20 100644 --- a/lib/fog/image/openstack/v2/requests/update_image_member.rb +++ b/lib/fog/image/openstack/v2/requests/update_image_member.rb @@ -11,7 +11,7 @@ def update_image_member(image_id, member) :path => "images/#{image_id}/members/#{member['member_id']}" ) end - end # class Real + end class Mock def update_image_members(image_id, member) @@ -27,8 +27,8 @@ def update_image_members(image_id, member) } response end - end # class Mock - end # class OpenStack + end + end end - end # module Identity -end # module Fog + end +end diff --git a/lib/fog/planning/openstack/requests/add_role_to_plan.rb b/lib/fog/planning/openstack/requests/add_role_to_plan.rb index 826e0c1bb..751e75f70 100644 --- a/lib/fog/planning/openstack/requests/add_role_to_plan.rb +++ b/lib/fog/planning/openstack/requests/add_role_to_plan.rb @@ -10,7 +10,7 @@ def add_role_to_plan(plan_uuid, role_uuid) :body => Fog::JSON.encode('uuid' => role_uuid) ) end - end # class Real + end class Mock def add_role_to_plan(_plan_uuid, _role_uuid) @@ -33,8 +33,8 @@ def add_role_to_plan(_plan_uuid, _role_uuid) "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response - end # def add_role_to_plans - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/create_plan.rb b/lib/fog/planning/openstack/requests/create_plan.rb index 63c561d7d..793910399 100644 --- a/lib/fog/planning/openstack/requests/create_plan.rb +++ b/lib/fog/planning/openstack/requests/create_plan.rb @@ -10,7 +10,7 @@ def create_plan(parameters) :body => Fog::JSON.encode(parameters) ) end - end # class Real + end class Mock def create_plan(_parameters) @@ -26,8 +26,8 @@ def create_plan(_parameters) "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response - end # def create_plans - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/delete_plan.rb b/lib/fog/planning/openstack/requests/delete_plan.rb index def5954ed..9c2d9cd5e 100644 --- a/lib/fog/planning/openstack/requests/delete_plan.rb +++ b/lib/fog/planning/openstack/requests/delete_plan.rb @@ -9,15 +9,15 @@ def delete_plan(plan_uuid) :path => "plans/#{plan_uuid}" ) end - end # class Real + end class Mock def delete_plan(_plan_uuid) response = Excon::Response.new response.status = 204 response - end # def delete_plans - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/get_plan.rb b/lib/fog/planning/openstack/requests/get_plan.rb index 72850f771..b77dfbde9 100644 --- a/lib/fog/planning/openstack/requests/get_plan.rb +++ b/lib/fog/planning/openstack/requests/get_plan.rb @@ -9,7 +9,7 @@ def get_plan(plan_uuid) :path => "plans/#{plan_uuid}" ) end - end # class Real + end class Mock def get_plan(_parameters = nil) @@ -51,8 +51,8 @@ def get_plan(_parameters = nil) "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response - end # def get_plan - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/get_plan_templates.rb b/lib/fog/planning/openstack/requests/get_plan_templates.rb index 189f701f6..a518e59e7 100644 --- a/lib/fog/planning/openstack/requests/get_plan_templates.rb +++ b/lib/fog/planning/openstack/requests/get_plan_templates.rb @@ -9,7 +9,7 @@ def get_plan_templates(plan_uuid) :path => "plans/#{plan_uuid}/templates" ) end - end # class Real + end class Mock def get_plan_templates(_plan_uuid) @@ -21,8 +21,8 @@ def get_plan_templates(_plan_uuid) "provider-compute-1.yaml" => "... content of template file ..." } response - end # def get_plan_templates - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/list_plans.rb b/lib/fog/planning/openstack/requests/list_plans.rb index a340ec231..41dbf54c8 100644 --- a/lib/fog/planning/openstack/requests/list_plans.rb +++ b/lib/fog/planning/openstack/requests/list_plans.rb @@ -10,7 +10,7 @@ def list_plans(options = {}) :query => options ) end - end # class Real + end class Mock def list_plans(_options = {}) @@ -54,8 +54,8 @@ def list_plans(_options = {}) } ] response - end # def list_plans - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/list_roles.rb b/lib/fog/planning/openstack/requests/list_roles.rb index 5c66fffbc..9a30aedea 100644 --- a/lib/fog/planning/openstack/requests/list_roles.rb +++ b/lib/fog/planning/openstack/requests/list_roles.rb @@ -10,7 +10,7 @@ def list_roles(options = {}) :query => options ) end - end # class Real + end class Mock def list_roles(_options = {}) @@ -25,8 +25,8 @@ def list_roles(_options = {}) } ] response - end # def list_nodes - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/patch_plan.rb b/lib/fog/planning/openstack/requests/patch_plan.rb index 6b3c42bf5..796f66711 100644 --- a/lib/fog/planning/openstack/requests/patch_plan.rb +++ b/lib/fog/planning/openstack/requests/patch_plan.rb @@ -10,7 +10,7 @@ def patch_plan(plan_uuid, parameters) :body => Fog::JSON.encode(parameters) ) end - end # class Real + end class Mock def patch_plan(_plan_uuid, _parameters) @@ -44,8 +44,8 @@ def patch_plan(_plan_uuid, _parameters) "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response - end # def patch_plans - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/planning/openstack/requests/remove_role_from_plan.rb b/lib/fog/planning/openstack/requests/remove_role_from_plan.rb index fdb7e8a88..b4d2f91b4 100644 --- a/lib/fog/planning/openstack/requests/remove_role_from_plan.rb +++ b/lib/fog/planning/openstack/requests/remove_role_from_plan.rb @@ -9,7 +9,7 @@ def remove_role_from_plan(plan_uuid, role_uuid) :path => "plans/#{plan_uuid}/roles/#{role_uuid}" ) end - end # class Real + end class Mock def remove_role_from_plan(_plan_uuid, _role_uuid) @@ -25,8 +25,8 @@ def remove_role_from_plan(_plan_uuid, _role_uuid) "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response - end # def remove_role_from_plan - end # class Mock - end # class Planning - end # module Openstack -end # module Fog + end + end + end + end +end diff --git a/lib/fog/volume/openstack/requests/set_tenant.rb b/lib/fog/volume/openstack/requests/set_tenant.rb index 869586b85..6a04e8c45 100644 --- a/lib/fog/volume/openstack/requests/set_tenant.rb +++ b/lib/fog/volume/openstack/requests/set_tenant.rb @@ -14,6 +14,6 @@ def set_tenant(_tenant) true end end - end # class OpenStack - end # module Volume -end # module Fog + end + end +end From 11c00bf0b65a3c4771ccd3a06d83f1b9ae0956ff Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 18 Jun 2018 16:11:09 +1000 Subject: [PATCH 008/129] Replaces Openstack with OpenStack where needed --- README.md | 6 ++--- docs/planning.md | 6 ++--- examples/planning/basics.rb | 2 +- fog-openstack.gemspec | 2 +- lib/fog/openstack/version.rb | 2 +- lib/fog/planning/openstack.rb | 4 ++-- lib/fog/planning/openstack/models/plan.rb | 2 +- lib/fog/planning/openstack/models/plans.rb | 4 ++-- lib/fog/planning/openstack/models/role.rb | 2 +- lib/fog/planning/openstack/models/roles.rb | 4 ++-- .../openstack/requests/add_role_to_plan.rb | 2 +- .../openstack/requests/create_plan.rb | 2 +- .../openstack/requests/delete_plan.rb | 2 +- .../planning/openstack/requests/get_plan.rb | 2 +- .../openstack/requests/get_plan_templates.rb | 2 +- .../planning/openstack/requests/list_plans.rb | 2 +- .../planning/openstack/requests/list_roles.rb | 2 +- .../planning/openstack/requests/patch_plan.rb | 2 +- .../requests/remove_role_from_plan.rb | 2 +- test/models/planning/plan_tests.rb | 8 +++---- test/models/planning/plans_tests.rb | 4 ++-- test/models/planning/role_tests.rb | 6 ++--- test/requests/planning/plan_tests.rb | 22 +++++++++---------- test/requests/planning/role_tests.rb | 4 ++-- 24 files changed, 48 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index 378321538..fe7d28e4a 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Fog::Openstack +# Fog::OpenStack [![Gem Version](https://badge.fury.io/rb/fog-openstack.svg)](http://badge.fury.io/rb/fog-openstack) [![Build Status](https://travis-ci.org/fog/fog-openstack.svg?branch=master)](https://travis-ci.org/fog/fog-openstack) [![Dependency Status](https://gemnasium.com/fog/fog-openstack.svg)](https://gemnasium.com/fog/fog-openstack) [![Coverage Status](https://coveralls.io/repos/github/fog/fog-openstack/badge.svg?branch=master)](https://coveralls.io/github/fog/fog-openstack?branch=master) [![Code Climate](https://codeclimate.com/github/fog/fog-openstack.svg)](https://codeclimate.com/github/fog/fog-openstack) [![Join the chat at https://gitter.im/fog/fog-openstack](https://badges.gitter.im/fog/fog-openstack.svg)](https://gitter.im/fog/fog-openstack?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) @@ -95,7 +95,7 @@ p compute.images # +# > # ] # > ``` @@ -401,7 +401,7 @@ identity.domains # description="", # enabled=true, # name="Default", -# > +# > # ] # > ``` diff --git a/docs/planning.md b/docs/planning.md index aecae9114..7afec01d0 100644 --- a/docs/planning.md +++ b/docs/planning.md @@ -31,7 +31,7 @@ require 'fog/openstack' Next, create a connection to Tuskar: ```ruby -service = Fog::Openstack.new({ +service = Fog::OpenStack.new({ :service => :planning, # OpenStack Fog service :openstack_username => USERNAME, # Your OpenStack Username :openstack_api_key => PASSWORD, # Your OpenStack Password @@ -48,7 +48,7 @@ Fog provides both a **model** and **request** abstraction. The request abstracti ### Request Layer -The `Fog::Openstack[:planning]` object supports a number of methods that wrap individual HTTP requests to the Tuskar API. +The `Fog::OpenStack[:planning]` object supports a number of methods that wrap individual HTTP requests to the Tuskar API. To see a list of requests supported by the planning service: @@ -170,7 +170,7 @@ This will return hash similar to: ``` [//]: # (TODO: Specify URL to rubydoc.info when OpenStack Planning service is part of release and pages are built) -To learn more about `Fog::Openstack[:planning]` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about `Fog::OpenStack[:planning]` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer diff --git a/examples/planning/basics.rb b/examples/planning/basics.rb index 9486167c4..2364ff96a 100644 --- a/examples/planning/basics.rb +++ b/examples/planning/basics.rb @@ -8,7 +8,7 @@ password = 'secret' tenant = 'My Compute Tenant' # String -planning ||= ::Fog::Openstack.new( +planning ||= ::Fog::OpenStack.new( :service => :planning, :openstack_api_key => password, :openstack_username => username, diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 552654089..56257d52c 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -5,7 +5,7 @@ require 'fog/openstack/version' Gem::Specification.new do |spec| spec.name = "fog-openstack" - spec.version = Fog::Openstack::VERSION + spec.version = Fog::OpenStack::VERSION spec.authors = ["Matt Darby"] spec.email = ["matt.darby@rackspace.com"] diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index ed9d30b48..63ac9fece 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack VERSION = "0.1.24" end end diff --git a/lib/fog/planning/openstack.rb b/lib/fog/planning/openstack.rb index 19f13f485..145897946 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/planning/openstack.rb @@ -1,7 +1,7 @@ module Fog - module Openstack + module OpenStack class Planning < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -136,7 +136,7 @@ def self.new(attributes) service = attributes.delete(:service).to_s.downcase.to_sym if services.include?(service) require "fog/#{service}/openstack" - return Fog::Openstack.const_get(service.to_s.capitalize).new(attributes) + return Fog::OpenStack.const_get(service.to_s.capitalize).new(attributes) end raise ArgumentError, "Openstack has no #{service} service" end diff --git a/lib/fog/planning/openstack/models/plan.rb b/lib/fog/planning/openstack/models/plan.rb index db68ef3f0..088368c25 100644 --- a/lib/fog/planning/openstack/models/plan.rb +++ b/lib/fog/planning/openstack/models/plan.rb @@ -1,7 +1,7 @@ require 'fog/openstack/models/model' module Fog - module Openstack + module OpenStack class Planning class Plan < Fog::OpenStack::Model MASTER_TEMPLATE_NAME = 'plan.yaml'.freeze diff --git a/lib/fog/planning/openstack/models/plans.rb b/lib/fog/planning/openstack/models/plans.rb index 72346c240..dec602896 100644 --- a/lib/fog/planning/openstack/models/plans.rb +++ b/lib/fog/planning/openstack/models/plans.rb @@ -2,10 +2,10 @@ require 'fog/planning/openstack/models/plan' module Fog - module Openstack + module OpenStack class Planning class Plans < Fog::OpenStack::Collection - model Fog::Openstack::Planning::Plan + model Fog::OpenStack::Planning::Plan def all(options = {}) load_response(service.list_plans(options)) diff --git a/lib/fog/planning/openstack/models/role.rb b/lib/fog/planning/openstack/models/role.rb index 016797f0d..f7345ceea 100644 --- a/lib/fog/planning/openstack/models/role.rb +++ b/lib/fog/planning/openstack/models/role.rb @@ -1,7 +1,7 @@ require 'fog/openstack/models/model' module Fog - module Openstack + module OpenStack class Planning class Role < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/planning/openstack/models/roles.rb b/lib/fog/planning/openstack/models/roles.rb index 69ee3d305..19dffd8bf 100644 --- a/lib/fog/planning/openstack/models/roles.rb +++ b/lib/fog/planning/openstack/models/roles.rb @@ -2,10 +2,10 @@ require 'fog/planning/openstack/models/role' module Fog - module Openstack + module OpenStack class Planning class Roles < Fog::OpenStack::Collection - model Fog::Openstack::Planning::Role + model Fog::OpenStack::Planning::Role def all(options = {}) load_response(service.list_roles(options)) diff --git a/lib/fog/planning/openstack/requests/add_role_to_plan.rb b/lib/fog/planning/openstack/requests/add_role_to_plan.rb index 826e0c1bb..fd847731b 100644 --- a/lib/fog/planning/openstack/requests/add_role_to_plan.rb +++ b/lib/fog/planning/openstack/requests/add_role_to_plan.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def add_role_to_plan(plan_uuid, role_uuid) diff --git a/lib/fog/planning/openstack/requests/create_plan.rb b/lib/fog/planning/openstack/requests/create_plan.rb index 63c561d7d..641187c24 100644 --- a/lib/fog/planning/openstack/requests/create_plan.rb +++ b/lib/fog/planning/openstack/requests/create_plan.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def create_plan(parameters) diff --git a/lib/fog/planning/openstack/requests/delete_plan.rb b/lib/fog/planning/openstack/requests/delete_plan.rb index def5954ed..e24309509 100644 --- a/lib/fog/planning/openstack/requests/delete_plan.rb +++ b/lib/fog/planning/openstack/requests/delete_plan.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def delete_plan(plan_uuid) diff --git a/lib/fog/planning/openstack/requests/get_plan.rb b/lib/fog/planning/openstack/requests/get_plan.rb index 72850f771..19192ba2d 100644 --- a/lib/fog/planning/openstack/requests/get_plan.rb +++ b/lib/fog/planning/openstack/requests/get_plan.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def get_plan(plan_uuid) diff --git a/lib/fog/planning/openstack/requests/get_plan_templates.rb b/lib/fog/planning/openstack/requests/get_plan_templates.rb index 189f701f6..2d03b2177 100644 --- a/lib/fog/planning/openstack/requests/get_plan_templates.rb +++ b/lib/fog/planning/openstack/requests/get_plan_templates.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def get_plan_templates(plan_uuid) diff --git a/lib/fog/planning/openstack/requests/list_plans.rb b/lib/fog/planning/openstack/requests/list_plans.rb index a340ec231..4c6cfd55c 100644 --- a/lib/fog/planning/openstack/requests/list_plans.rb +++ b/lib/fog/planning/openstack/requests/list_plans.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def list_plans(options = {}) diff --git a/lib/fog/planning/openstack/requests/list_roles.rb b/lib/fog/planning/openstack/requests/list_roles.rb index 5c66fffbc..352ffa9e5 100644 --- a/lib/fog/planning/openstack/requests/list_roles.rb +++ b/lib/fog/planning/openstack/requests/list_roles.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def list_roles(options = {}) diff --git a/lib/fog/planning/openstack/requests/patch_plan.rb b/lib/fog/planning/openstack/requests/patch_plan.rb index 6b3c42bf5..a8769bb20 100644 --- a/lib/fog/planning/openstack/requests/patch_plan.rb +++ b/lib/fog/planning/openstack/requests/patch_plan.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def patch_plan(plan_uuid, parameters) diff --git a/lib/fog/planning/openstack/requests/remove_role_from_plan.rb b/lib/fog/planning/openstack/requests/remove_role_from_plan.rb index fdb7e8a88..7c60d8555 100644 --- a/lib/fog/planning/openstack/requests/remove_role_from_plan.rb +++ b/lib/fog/planning/openstack/requests/remove_role_from_plan.rb @@ -1,5 +1,5 @@ module Fog - module Openstack + module OpenStack class Planning class Real def remove_role_from_plan(plan_uuid, role_uuid) diff --git a/test/models/planning/plan_tests.rb b/test/models/planning/plan_tests.rb index 957c7ae6b..bada3ea61 100644 --- a/test/models/planning/plan_tests.rb +++ b/test/models/planning/plan_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Openstack[:planning] | plan" do +describe "Fog::OpenStack[:planning] | plan" do describe "success" do before do - @planning = Fog::Openstack[:planning] + @planning = Fog::OpenStack[:planning] @instance = @planning.plans.first @role = @planning.list_roles.body.first end @@ -45,7 +45,7 @@ end it "#save" do - @instance.save.must_be_kind_of Fog::Openstack::Planning::Plan + @instance.save.must_be_kind_of Fog::OpenStack::Planning::Plan end it "#update" do @@ -57,7 +57,7 @@ end it "#create" do - @instance.create.must_be_kind_of Fog::Openstack::Planning::Plan + @instance.create.must_be_kind_of Fog::OpenStack::Planning::Plan end end end diff --git a/test/models/planning/plans_tests.rb b/test/models/planning/plans_tests.rb index 0ce9233d8..c87d8f7d9 100644 --- a/test/models/planning/plans_tests.rb +++ b/test/models/planning/plans_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Openstack[:planning] | plans" do +describe "Fog::OpenStack[:planning] | plans" do describe "success" do before do - @planning = Fog::Openstack[:planning] + @planning = Fog::OpenStack[:planning] @instance = @planning.plans.all.first end diff --git a/test/models/planning/role_tests.rb b/test/models/planning/role_tests.rb index af121f0b9..8ed226937 100644 --- a/test/models/planning/role_tests.rb +++ b/test/models/planning/role_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -describe "Fog::Openstack[:planning] | plan" do +describe "Fog::OpenStack[:planning] | plan" do describe "success" do before do - @instance = Fog::Openstack[:planning].roles.first - @plan = Fog::Openstack[:planning].list_plans.body.first + @instance = Fog::OpenStack[:planning].roles.first + @plan = Fog::OpenStack[:planning].list_plans.body.first end it "#add_role" do diff --git a/test/requests/planning/plan_tests.rb b/test/requests/planning/plan_tests.rb index 55f6eab07..83c987834 100644 --- a/test/requests/planning/plan_tests.rb +++ b/test/requests/planning/plan_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Openstack[:planning] | Planning plan requests" do +describe "Fog::OpenStack[:planning] | Planning plan requests" do before do @plan_format = { "created_at" => Fog::Nullable::String, @@ -14,9 +14,9 @@ } @plan_templates_format = Hash - @plans = Fog::Openstack[:planning].list_plans.body + @plans = Fog::OpenStack[:planning].list_plans.body @instance = @plans.first - @role_instance = Fog::Openstack[:planning].list_roles.body.first + @role_instance = Fog::OpenStack[:planning].list_roles.body.first end describe "success" do @@ -25,11 +25,11 @@ end it "#get_plan" do - Fog::Openstack[:planning].get_plan(@instance['uuid']).body.must_match_schema(@plan_format) + Fog::OpenStack[:planning].get_plan(@instance['uuid']).body.must_match_schema(@plan_format) end it "#delete_plan" do - Fog::Openstack[:planning].delete_plan(@instance['uuid']).status.must_equal 204 + Fog::OpenStack[:planning].delete_plan(@instance['uuid']).status.must_equal 204 end it "#create_plan" do @@ -37,19 +37,19 @@ :name => 'test-plan-name', :description => 'test-plan-desc', } - @instance = Fog::Openstack[:planning].create_plan(plan_attributes).body + @instance = Fog::OpenStack[:planning].create_plan(plan_attributes).body @instance.must_match_schema(@plan_format) end it "#add_role_to_plan" do - Fog::Openstack[:planning].add_role_to_plan( + Fog::OpenStack[:planning].add_role_to_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end it "#patch_plan" do - parameters = Fog::Openstack[:planning].get_plan(@instance['uuid']). + parameters = Fog::OpenStack[:planning].get_plan(@instance['uuid']). body['parameters'][0..1] plan_parameters = parameters.collect do |parameter| { @@ -57,17 +57,17 @@ "value" => "test-#{parameter['name']}-value", } end - Fog::Openstack[:planning].patch_plan(@instance['uuid'], plan_parameters).body. + Fog::OpenStack[:planning].patch_plan(@instance['uuid'], plan_parameters).body. must_match_schema(@plan_format) end it "#get_plan_templates" do - Fog::Openstack[:planning].get_plan_templates(@instance['uuid']).body. + Fog::OpenStack[:planning].get_plan_templates(@instance['uuid']).body. must_match_schema(@plan_templates_format) end it "#remove_role_from_plan" do - Fog::Openstack[:planning].remove_role_from_plan( + Fog::OpenStack[:planning].remove_role_from_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end diff --git a/test/requests/planning/role_tests.rb b/test/requests/planning/role_tests.rb index 76abed861..56d790e46 100644 --- a/test/requests/planning/role_tests.rb +++ b/test/requests/planning/role_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Openstack[:planning] | Planning role requests" do +describe "Fog::OpenStack[:planning] | Planning role requests" do before do @role_format = { 'description' => Fog::Nullable::String, @@ -12,7 +12,7 @@ describe "success" do it "#list_roles" do - Fog::Openstack[:planning].list_roles.body.must_match_schema([@role_format]) + Fog::OpenStack[:planning].list_roles.body.must_match_schema([@role_format]) end end end From 2c0572054f0c2888e9e510f2cab0318a1fd856fd Mon Sep 17 00:00:00 2001 From: Marco Borelli Date: Mon, 18 Jun 2018 18:45:50 +0200 Subject: [PATCH 009/129] Docs: fix an anchor link --- docs/storage.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/storage.md b/docs/storage.md index 5ad99d6e9..fb1706a75 100644 --- a/docs/storage.md +++ b/docs/storage.md @@ -257,7 +257,7 @@ To upload a file into a directory: file = directory.files.create :key => 'space.jpg', :body => File.open "space.jpg" ``` -**Note**: For files larger than 5 GB please refer to the [Upload Large Files](#upload_large_files) section. +**Note**: For files larger than 5 GB please refer to the [Upload Large Files](#upload-large-files) section. ### Additional Parameters From a6a19dd869b02c232a40d58536439995273f1c90 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 18 Jun 2018 11:29:33 +1000 Subject: [PATCH 010/129] Bump ruby, fog-core --- .ruby-version | 1 - .travis.yml | 8 ++++---- .zuul.yaml | 16 ++++++++-------- fog-openstack.gemspec | 4 ++-- lib/fog/compute/openstack/models/server.rb | 2 +- lib/fog/image/openstack/v2/models/image.rb | 17 +++++++++++++++++ lib/fog/network/openstack/models/network.rb | 17 +++++++++++++++++ spec/identity_v3_spec.rb | 2 +- spec/monitoring_spec.rb | 8 ++++---- spec/volume_spec.rb | 4 ++-- 10 files changed, 56 insertions(+), 23 deletions(-) delete mode 100644 .ruby-version diff --git a/.ruby-version b/.ruby-version deleted file mode 100644 index eca07e4c1..000000000 --- a/.ruby-version +++ /dev/null @@ -1 +0,0 @@ -2.1.2 diff --git a/.travis.yml b/.travis.yml index ccb5b43f7..055b2b249 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,13 @@ env: matrix: fast_finish: true include: - - rvm: 2.2.0 + - rvm: 2.2.10 gemfile: Gemfile - - rvm: 2.3.0 + - rvm: 2.3.7 gemfile: Gemfile - - rvm: 2.3.1 + - rvm: 2.4.4 gemfile: Gemfile - - rvm: 2.4.2 + - rvm: 2.5.1 gemfile: Gemfile - rvm: jruby-head gemfile: Gemfile diff --git a/.zuul.yaml b/.zuul.yaml index d5915008b..201fb1969 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -12,10 +12,10 @@ run: playbooks/fog-openstack-unittest-test/run.yaml vars: rvm: - 2.2.0 - 2.3.0 - 2.3.1 - 2.4.2 + 2.2.10 + 2.3.7 + 2.4.4 + 2.5.1 jruby-head nodeset: ubuntu-xenial @@ -27,9 +27,9 @@ run: playbooks/fog-openstack-unittest-spec/run.yaml vars: rvm: - 2.2.0 - 2.3.0 - 2.3.1 - 2.4.2 + 2.2.10 + 2.3.7 + 2.4.4 + 2.5.1 jruby-head nodeset: ubuntu-xenial diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 56257d52c..28b184d21 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -19,9 +19,9 @@ Gem::Specification.new do |spec| spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) } spec.require_paths = ["lib"] - spec.required_ruby_version = '>= 2.1.0' + spec.required_ruby_version = '>= 2.2.0' - spec.add_dependency 'fog-core', '~> 1.40' + spec.add_dependency 'fog-core', '~> 2.1' spec.add_dependency 'fog-json', '>= 1.0' spec.add_dependency 'ipaddress', '>= 0.8' diff --git a/lib/fog/compute/openstack/models/server.rb b/lib/fog/compute/openstack/models/server.rb index 84fe810e5..c0d698af7 100644 --- a/lib/fog/compute/openstack/models/server.rb +++ b/lib/fog/compute/openstack/models/server.rb @@ -82,7 +82,7 @@ def metadata def metadata=(new_metadata = {}) return unless new_metadata metas = [] - new_metadata.each_pair { |k, v| metas << {"key" => k, "value" => v} } + new_metadata.each { |k, v| metas << {"key" => k, "value" => v} } @metadata = metadata.load(metas) end diff --git a/lib/fog/image/openstack/v2/models/image.rb b/lib/fog/image/openstack/v2/models/image.rb index 3870fc74a..01839ec10 100644 --- a/lib/fog/image/openstack/v2/models/image.rb +++ b/lib/fog/image/openstack/v2/models/image.rb @@ -41,6 +41,23 @@ class Image < Fog::OpenStack::Model attribute :instance_uuid attribute :user_id + # Overload super class since behaviour as changed since fog-core 1.40.0 + # https://github.com/fog/fog-core/issues/236 + def reload + requires :identity + + object = collection.get(identity) + + return unless object + + merge_attributes(object.attributes) + merge_attributes(object.all_associations) + + self + rescue Excon::Errors::SocketError + nil + end + def method_missing(method_sym, *arguments, &block) if attributes.key?(method_sym) attributes[method_sym] diff --git a/lib/fog/network/openstack/models/network.rb b/lib/fog/network/openstack/models/network.rb index 41d9e2e1c..0bdac376d 100644 --- a/lib/fog/network/openstack/models/network.rb +++ b/lib/fog/network/openstack/models/network.rb @@ -17,6 +17,23 @@ class Network < Fog::OpenStack::Model attribute :provider_segmentation_id, :aliases => 'provider:segmentation_id' attribute :router_external, :aliases => 'router:external' + # Overload super class since behaviour as changed since fog-core 1.40.0 + # https://github.com/fog/fog-core/issues/236 + def reload + requires :identity + + object = collection.get(identity) + + return unless object + + merge_attributes(object.attributes) + merge_attributes(object.all_associations) + + self + rescue Excon::Errors::SocketError + nil + end + def subnets service.subnets.select { |s| s.network_id == id } end diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index a8a30e011..697fbeabf 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -677,7 +677,7 @@ booboo_parents[booboo_parent_id].length.must_equal 1 booboo_grandparent_id = booboo_parents[booboo_parent_id].keys.first booboo_grandparent_id.must_equal foobar_id - booboo_parents[booboo_parent_id][booboo_grandparent_id].must_equal nil + assert_nil booboo_parents[booboo_parent_id][booboo_grandparent_id] # Get the parents of booboo, as a list of objects booboo_parents = @service.projects.find_by_id(booboo_id, :parents_as_list).parents diff --git a/spec/monitoring_spec.rb b/spec/monitoring_spec.rb index ff9c00e03..473fe2203 100644 --- a/spec/monitoring_spec.rb +++ b/spec/monitoring_spec.rb @@ -72,9 +72,9 @@ # failure cases proc { @service.metrics.create(:name => "this won't be created due to insufficient args") }. - must_raise Fog::Monitoring::OpenStack::ArgumentError + must_raise ArgumentError proc { @service.metrics.create(:name => "this wont't be created due to invalid timestamp", :timestamp => 1234) }. - must_raise Fog::Monitoring::OpenStack::ArgumentError + must_raise ArgumentError end end @@ -143,7 +143,7 @@ # failure cases proc { @service.notification_methods.create(:name => "this won't be created due to insufficient args") }. - must_raise Fog::Monitoring::OpenStack::ArgumentError + must_raise ArgumentError proc { @service.notification_methods.find_by_id('bogus_id') }.must_raise Fog::Monitoring::OpenStack::NotFound ensure @@ -220,7 +220,7 @@ # failure cases proc { @service.alarm_definitions.create(:name => "this won't be created due to insufficient args") }. - must_raise Fog::Monitoring::OpenStack::ArgumentError + must_raise ArgumentError ensure alarm_definition.destroy if alarm_definition diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index bf515e482..855659629 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -294,7 +294,7 @@ def cleanup_test_object(collection, id) ) # check that recipient cannot see the transfer object - other_service.transfers.get(transfer.id).must_equal nil + assert_nil other_service.transfers.get(transfer.id) other_service.transfers.all(:name => transfer_name).length.must_equal 0 # # check that recipient cannot see the volume before transfer @@ -334,7 +334,7 @@ def cleanup_test_object(collection, id) # check that the transfer object is gone on both sides [@service, other_service].each do |service| - service.transfers.get(transfer.id).must_equal nil + assert_nil service.transfers.get(transfer.id) service.transfers.all(:name => transfer_name).length.must_equal 0 end ensure From 8a4b2297f7115431a6580649ba25101047df1bdd Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 21 Jun 2018 10:39:23 +1000 Subject: [PATCH 011/129] Reverse to fog-core 1.45.0 --- fog-openstack.gemspec | 2 +- lib/fog/image/openstack/v2/models/image.rb | 17 ----------------- lib/fog/network/openstack/models/network.rb | 17 ----------------- 3 files changed, 1 insertion(+), 35 deletions(-) diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 28b184d21..806017eaf 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.2.0' - spec.add_dependency 'fog-core', '~> 2.1' + spec.add_dependency 'fog-core', '~> 1.45.0' spec.add_dependency 'fog-json', '>= 1.0' spec.add_dependency 'ipaddress', '>= 0.8' diff --git a/lib/fog/image/openstack/v2/models/image.rb b/lib/fog/image/openstack/v2/models/image.rb index 01839ec10..3870fc74a 100644 --- a/lib/fog/image/openstack/v2/models/image.rb +++ b/lib/fog/image/openstack/v2/models/image.rb @@ -41,23 +41,6 @@ class Image < Fog::OpenStack::Model attribute :instance_uuid attribute :user_id - # Overload super class since behaviour as changed since fog-core 1.40.0 - # https://github.com/fog/fog-core/issues/236 - def reload - requires :identity - - object = collection.get(identity) - - return unless object - - merge_attributes(object.attributes) - merge_attributes(object.all_associations) - - self - rescue Excon::Errors::SocketError - nil - end - def method_missing(method_sym, *arguments, &block) if attributes.key?(method_sym) attributes[method_sym] diff --git a/lib/fog/network/openstack/models/network.rb b/lib/fog/network/openstack/models/network.rb index 0bdac376d..41d9e2e1c 100644 --- a/lib/fog/network/openstack/models/network.rb +++ b/lib/fog/network/openstack/models/network.rb @@ -17,23 +17,6 @@ class Network < Fog::OpenStack::Model attribute :provider_segmentation_id, :aliases => 'provider:segmentation_id' attribute :router_external, :aliases => 'router:external' - # Overload super class since behaviour as changed since fog-core 1.40.0 - # https://github.com/fog/fog-core/issues/236 - def reload - requires :identity - - object = collection.get(identity) - - return unless object - - merge_attributes(object.attributes) - merge_attributes(object.all_associations) - - self - rescue Excon::Errors::SocketError - nil - end - def subnets service.subnets.select { |s| s.network_id == id } end From 5922c91ee0233af655b42d0f82308cd5ac013122 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 21 Jun 2018 11:09:21 +1000 Subject: [PATCH 012/129] Moved autoload to allow reopening --- lib/fog/dns/openstack.rb | 3 +++ lib/fog/identity/openstack.rb | 3 +++ lib/fog/image/openstack.rb | 3 +++ lib/fog/openstack.rb | 32 ++++++-------------------------- lib/fog/volume/openstack.rb | 3 +++ 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/lib/fog/dns/openstack.rb b/lib/fog/dns/openstack.rb index 707602f8e..0007a5d63 100644 --- a/lib/fog/dns/openstack.rb +++ b/lib/fog/dns/openstack.rb @@ -1,6 +1,9 @@ module Fog module DNS class OpenStack < Fog::Service + autoload :V1, 'fog/dns/openstack/v1' + autoload :V2, 'fog/dns/openstack/v2' + # Fog::DNS::OpenStack.new() will return a Fog::DNS::OpenStack::V2 or a Fog::DNS::OpenStack::V1, # choosing the latest available def self.new(args = {}) diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index ee57c7f2c..350fe92db 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -3,6 +3,9 @@ module Fog module Identity class OpenStack < Fog::Service + autoload :V2, 'fog/identity/openstack/v2' + autoload :V3, 'fog/identity/openstack/v3' + requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, :openstack_tenant, diff --git a/lib/fog/image/openstack.rb b/lib/fog/image/openstack.rb index d0fa23c30..3aa4ed518 100644 --- a/lib/fog/image/openstack.rb +++ b/lib/fog/image/openstack.rb @@ -3,6 +3,9 @@ module Fog module Image class OpenStack < Fog::Service + autoload :V1, 'fog/image/openstack/v1' + autoload :V2, 'fog/image/openstack/v2' + # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V1, # choosing the latest available def self.new(args = {}) diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index e81c36e3b..c12dc4ac3 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -1,12 +1,6 @@ -require 'fog/openstack/version' require 'fog/core' require 'fog/json' -require 'fog/openstack/core' -require 'fog/openstack/errors' - -require 'fog/planning/openstack' - module Fog module Baremetal autoload :OpenStack, 'fog/baremetal/openstack' @@ -22,11 +16,6 @@ module ContainerInfra module DNS autoload :OpenStack, 'fog/dns/openstack' - - class OpenStack - autoload :V1, 'fog/dns/openstack/v1' - autoload :V2, 'fog/dns/openstack/v2' - end end module Event @@ -35,20 +24,10 @@ module Event module Identity autoload :OpenStack, 'fog/identity/openstack' - - class OpenStack - autoload :V2, 'fog/identity/openstack/v2' - autoload :V3, 'fog/identity/openstack/v3' - end end module Image autoload :OpenStack, 'fog/image/openstack' - - class OpenStack - autoload :V1, 'fog/image/openstack/v1' - autoload :V2, 'fog/image/openstack/v2' - end end module Introspection @@ -94,11 +73,6 @@ module Storage module Volume autoload :OpenStack, 'fog/volume/openstack' - - class OpenStack - autoload :V1, 'fog/volume/openstack/v1' - autoload :V2, 'fog/volume/openstack/v2' - end end module Workflow @@ -110,6 +84,12 @@ class OpenStack end module OpenStack + autoload :VERSION, 'fog/openstack/version' + + autoload :Core, 'fog/openstack/core' + autoload :Errors, 'fog/openstack/errors' + autoload :Planning, 'fog/planning/openstack' + extend Fog::Provider service(:baremetal, 'Baremetal') diff --git a/lib/fog/volume/openstack.rb b/lib/fog/volume/openstack.rb index 9b3a7fafe..d96e913c0 100644 --- a/lib/fog/volume/openstack.rb +++ b/lib/fog/volume/openstack.rb @@ -3,6 +3,9 @@ module Fog module Volume class OpenStack < Fog::Service + autoload :V1, 'fog/volume/openstack/v1' + autoload :V2, 'fog/volume/openstack/v2' + @@recognizes = [:openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, :openstack_tenant, :openstack_tenant_id, From 6c751d66c49460d3953b7a48f03af225144454bb Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 21 Jun 2018 11:39:05 +1000 Subject: [PATCH 013/129] Rake: reduce double definition; Default launch --- Rakefile | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/Rakefile b/Rakefile index 9bd17bf18..bb2c8e97e 100644 --- a/Rakefile +++ b/Rakefile @@ -4,27 +4,24 @@ require 'rake/testtask' RuboCop::RakeTask.new -task :default => :test +task :default => ['tests:unit', 'tests:spec'] -desc 'Run fog-openstack unit tests with Minitest' -task :test do - mock = ENV['FOG_MOCK'] || 'true' - sh("export FOG_MOCK=#{mock} && bundle exec rake tests:unit") -end +task :test => 'tests:unit' -desc 'Run fog-openstack spec/ tests (VCR)' task :spec => "tests:spec" namespace :tests do - desc "Run fog-openstack test/" + desc 'Run fog-openstack tests with Minitest' Rake::TestTask.new do |t| + ENV['FOG_MOCK']= ENV['FOG_MOCK'].nil? ? 'true' : ENV['FOG_MOCK'] + t.name = 'unit' t.libs.push [ "lib", "test" ] t.test_files = FileList['test/**/*.rb'] t.verbose = true end - desc "Run fog-openstack spec/" + desc 'Run fog-openstack tests with RSpec and VCR' Rake::TestTask.new do |t| t.name = 'spec' t.libs.push [ "lib", "spec" ] From bf083780999ba667a9f0aad92af23b62ab0e01ed Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 21 Jun 2018 11:54:32 +1000 Subject: [PATCH 014/129] Tests: replace skip by conditional for fog-mocking --- spec/identity_v3_spec.rb | 2 - test/helpers/collection_helper.rb | 27 +- test/helpers/model_helper.rb | 10 +- test/models/identity/ec2_credentials_tests.rb | 18 +- test/models/identity/tenants_tests.rb | 20 +- test/models/identity/users_tests.rb | 27 +- test/requests/compute/flavor_tests.rb | 47 +-- test/requests/compute/image_tests.rb | 25 +- test/requests/compute/server_tests.rb | 27 +- test/requests/network/network_tests.rb | 35 +- .../stack_files_util_helper_tests.rb | 14 +- .../orchestration/stack_files_util_tests.rb | 15 +- test/requests/storage/container_tests.rb | 65 ++-- test/requests/storage/large_object_tests.rb | 318 ++++++++++-------- test/requests/storage/object_tests.rb | 278 ++++++++------- 15 files changed, 510 insertions(+), 418 deletions(-) diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index 697fbeabf..d9e23a716 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -446,7 +446,6 @@ it "Manipulates roles on domain groups" do VCR.use_cassette('idv3_domain_group_roles_mutation') do skip "Manipulates roles on domain groups to be fixed" -=begin begin # Create a domain called foobar foobar_domain = @service.domains.create(:name => 'd-foobar') @@ -508,7 +507,6 @@ foobar_domain.update(:enabled => false) if foobar_domain foobar_domain.destroy if foobar_domain end -=end end end diff --git a/test/helpers/collection_helper.rb b/test/helpers/collection_helper.rb index bd7e12f82..79275134c 100644 --- a/test/helpers/collection_helper.rb +++ b/test/helpers/collection_helper.rb @@ -9,28 +9,32 @@ def collection_tests(collection, params = {}) end it "#new(#{params.inspect})" do - skip if Fog.mocking? - collection.new(params).must_equal 200 + unless Fog.mocking? + collection.new(params).must_equal 200 + end end it "#create(#{params.inspect})" do - skip if Fog.mocking? - @instance.must_be_kind_of Fog::Network::OpenStack::SecurityGroup + unless Fog.mocking? + @instance.must_be_kind_of Fog::Network::OpenStack::SecurityGroup + end end - # FIXME: work around for timing issue on AWS describe_instances mocks + # FIXME: work around for timing issue on AWS describe_instances mocks if Fog.mocking? && @instance.respond_to?(:ready?) @instance.wait_for { ready? } end it "#all" do - skip if Fog.mocking? - collection.all.must_be_kind_of Fog::Network::OpenStack::SecurityGroups + unless Fog.mocking? + collection.all.must_be_kind_of Fog::Network::OpenStack::SecurityGroups + end end it "#get(#{@identity})" do - skip if Fog.mocking? - collection.get(@identity).must_be_kind_of Fog::Network::OpenStack::SecurityGroup + unless Fog.mocking? + collection.get(@identity).must_be_kind_of Fog::Network::OpenStack::SecurityGroup + end end unless Fog.mocking? @@ -90,8 +94,9 @@ def collection_tests(collection, params = {}) end it "#get(@identity" do - skip if Fog.mocking? - collection.get(@identity).must_equal nil + unless Fog.mocking? + collection.get(@identity).must_equal nil + end end end end diff --git a/test/helpers/model_helper.rb b/test/helpers/model_helper.rb index c9dad9eb9..35cf25a56 100644 --- a/test/helpers/model_helper.rb +++ b/test/helpers/model_helper.rb @@ -9,13 +9,15 @@ def model_tests(collection, params = {}) end it "#save" do - skip if Fog.mocking? - @instance.save.must_equal true + unless Fog.mocking? + @instance.save.must_equal true + end end it "#destroy" do - skip if Fog.mocking? - @instance.destroy.must_equal 200 + unless Fog.mocking? + @instance.destroy.must_equal 200 + end end end end diff --git a/test/models/identity/ec2_credentials_tests.rb b/test/models/identity/ec2_credentials_tests.rb index f1e486c4e..5fca9b037 100644 --- a/test/models/identity/ec2_credentials_tests.rb +++ b/test/models/identity/ec2_credentials_tests.rb @@ -44,17 +44,19 @@ describe "fails" do it "#find_by_access_key" do - skip if Fog.mocking? - proc do - @user.ec2_credentials.find_by_access_key('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + @user.ec2_credentials.find_by_access_key('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end it "#destroy" do - skip if Fog.mocking? - proc do - @user.ec2_credentials.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + @user.ec2_credentials.destroy('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end end end diff --git a/test/models/identity/tenants_tests.rb b/test/models/identity/tenants_tests.rb index eda4b71e8..1ef9417f5 100644 --- a/test/models/identity/tenants_tests.rb +++ b/test/models/identity/tenants_tests.rb @@ -19,19 +19,19 @@ describe "failure" do it "#find_by_id" do - skip if Fog.mocking? - - proc do - @identity.tenants.find_by_id('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + @identity.tenants.find_by_id('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end it "#destroy" do - skip if Fog.mocking? - - proc do - @identity.tenants.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + @identity.tenants.destroy('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end end end diff --git a/test/models/identity/users_tests.rb b/test/models/identity/users_tests.rb index 2087121ec..79df091bc 100644 --- a/test/models/identity/users_tests.rb +++ b/test/models/identity/users_tests.rb @@ -31,24 +31,27 @@ describe "fails" do it "#find_by_id" do - skip if Fog.mocking? - proc do - Fog::Identity[:openstack].users.find_by_id('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Identity[:openstack].users.find_by_id('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end it "#find_by_name" do - skip if Fog.mocking? - proc do - Fog::Identity[:openstack].users.find_by_name('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Identity[:openstack].users.find_by_name('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end it "#destroy" do - skip if Fog.mocking? - proc do - Fog::Identity[:openstack].users.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Identity[:openstack].users.destroy('fake') + end.must_raise(Fog::Identity::OpenStack::NotFound) + end end end end diff --git a/test/requests/compute/flavor_tests.rb b/test/requests/compute/flavor_tests.rb index a1c1488fe..171fe10cf 100644 --- a/test/requests/compute/flavor_tests.rb +++ b/test/requests/compute/flavor_tests.rb @@ -93,39 +93,44 @@ end it "add_flavor_access(1234, 1)" do - skip if Fog.mocking? - proc do - @compute.add_flavor_access(1234, 1).body - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + @compute.add_flavor_access(1234, 1).body + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "remove_flavor_access(1234, 1)" do - skip if Fog.mocking? - proc do - @compute.remove_flavor_access(1234, 1).body - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + @compute.remove_flavor_access(1234, 1).body + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "list_tenants_with_flavor_access(1234)" do - skip if Fog.mocking? - proc do - @compute.list_tenants_with_flavor_access(1234) - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + @compute.list_tenants_with_flavor_access(1234) + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "get_flavor_metadata(flavor_ref)" do - skip if Fog.mocking? - proc do - @compute.get_flavor_metadata("1234").body - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + @compute.get_flavor_metadata("1234").body + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "create_flavor_metadata(flavor_ref)" do - skip if Fog.mocking? - proc do - metadata = {:cpu_arch => 'x86_64'} - @compute.create_flavor_metadata("1234", metadata).body - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + metadata = {:cpu_arch => 'x86_64'} + @compute.create_flavor_metadata("1234", metadata).body + end.must_raise Fog::Compute::OpenStack::NotFound + end end end end diff --git a/test/requests/compute/image_tests.rb b/test/requests/compute/image_tests.rb index ed8b45143..b2d21675f 100644 --- a/test/requests/compute/image_tests.rb +++ b/test/requests/compute/image_tests.rb @@ -30,9 +30,10 @@ end it "#get_image_details(#{@image_id})" do - skip if Fog.mocking? - @compute.get_image_details(@image_id).body['image']. - must_match_schema(@image_format) + unless Fog.mocking? + @compute.get_image_details(@image_id).body['image']. + must_match_schema(@image_format) + end end it "#list_images" do @@ -54,17 +55,19 @@ describe "failure" do it "#delete_image(0)" do - skip if Fog.mocking? - proc do - @compute.delete_image(0) - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + @compute.delete_image(0) + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "#get_image_details(0)" do - skip if Fog.mocking? - proc do - @compute.get_image_details(0) - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + @compute.get_image_details(0) + end.must_raise Fog::Compute::OpenStack::NotFound + end end end end diff --git a/test/requests/compute/server_tests.rb b/test/requests/compute/server_tests.rb index 1ebe90b6c..3f57e4515 100644 --- a/test/requests/compute/server_tests.rb +++ b/test/requests/compute/server_tests.rb @@ -357,24 +357,27 @@ def compute end it "#reboot_server(0)" do - skip if Fog.mocking? - proc do - self.class.compute.reboot_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + self.class.compute.reboot_server(0) + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "#start_server(0)" do - skip if Fog.mocking? - proc do - self.class.compute.start_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + self.class.compute.start_server(0) + end.must_raise Fog::Compute::OpenStack::NotFound + end end it "#stop_server(0)" do - skip if Fog.mocking? - proc do - self.class.compute.stop_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + unless Fog.mocking? + proc do + self.class.compute.stop_server(0) + end.must_raise Fog::Compute::OpenStack::NotFound + end end end end diff --git a/test/requests/network/network_tests.rb b/test/requests/network/network_tests.rb index f5e895a8b..dc486084a 100644 --- a/test/requests/network/network_tests.rb +++ b/test/requests/network/network_tests.rb @@ -101,23 +101,24 @@ describe "failure" do it "#create_network+provider extensions" do - skip if Fog.mocking? - proc do - attributes = { - :name => 'net_name', - :shared => false, - :admin_state_up => true, - :tenant_id => 'tenant_id', - :router_external => true, - # local, gre, vlan. Depends on the provider. - # May rise an exception if the network_type isn't valid: - # QuantumError: "Invalid input for operation: provider:physical_network" - :provider_network_type => 'foobar', - :provider_segmentation_id => 22, - } - - network.create_network(attributes) - end.must_raise Excon::Errors::BadRequest + unless Fog.mocking? + proc do + attributes = { + :name => 'net_name', + :shared => false, + :admin_state_up => true, + :tenant_id => 'tenant_id', + :router_external => true, + # local, gre, vlan. Depends on the provider. + # May rise an exception if the network_type isn't valid: + # QuantumError: "Invalid input for operation: provider:physical_network" + :provider_network_type => 'foobar', + :provider_segmentation_id => 22, + } + + network.create_network(attributes) + end.must_raise Excon::Errors::BadRequest + end end it "#get_network" do diff --git a/test/requests/orchestration/stack_files_util_helper_tests.rb b/test/requests/orchestration/stack_files_util_helper_tests.rb index 04afefaf0..c520ec20e 100644 --- a/test/requests/orchestration/stack_files_util_helper_tests.rb +++ b/test/requests/orchestration/stack_files_util_helper_tests.rb @@ -36,15 +36,17 @@ end it "#read_uri_remote" do - skip if Fog.mocking? - content = @file_resolver.send(:read_uri, "https://www.google.com/robots.txt") - assert_includes(content, "Disallow:") + unless Fog.mocking? + content = @file_resolver.send(:read_uri, "https://www.google.com/robots.txt") + assert_includes(content, "Disallow:") + end end it "#read_uri_404" do - skip if Fog.mocking? - assert_raises OpenURI::HTTPError do - @file_resolver.send(:read_uri, "https://www.google.com/NOOP") + unless Fog.mocking? + assert_raises OpenURI::HTTPError do + @file_resolver.send(:read_uri, "https://www.google.com/NOOP") + end end end diff --git a/test/requests/orchestration/stack_files_util_tests.rb b/test/requests/orchestration/stack_files_util_tests.rb index b5d8f20f5..ca727e704 100644 --- a/test/requests/orchestration/stack_files_util_tests.rb +++ b/test/requests/orchestration/stack_files_util_tests.rb @@ -71,13 +71,14 @@ def travis? end it "#get_file_contents_http_template" do - skip if Fog.mocking? - test_cases = @data["get_file_contents_http_template"].map do |testcase| - [testcase['input'], testcase['expected']] - end.compact - test_cases.each do |data, expected| - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) - assert_equal_set(file_resolver.files.keys, expected) + unless Fog.mocking? + test_cases = @data["get_file_contents_http_template"].map do |testcase| + [testcase['input'], testcase['expected']] + end.compact + test_cases.each do |data, expected| + file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + assert_equal_set(file_resolver.files.keys, expected) + end end end diff --git a/test/requests/storage/container_tests.rb b/test/requests/storage/container_tests.rb index c1db06ba6..3a4603d55 100644 --- a/test/requests/storage/container_tests.rb +++ b/test/requests/storage/container_tests.rb @@ -29,8 +29,9 @@ def cleanup_container describe "success" do it "#put_container('fogcontainertests')" do - skip if Fog.mocking? - @storage.put_container('fogcontainertests').status.must_equal 201 + unless Fog.mocking? + @storage.put_container('fogcontainertests').status.must_equal 201 + end end describe "using container" do @@ -45,55 +46,63 @@ def cleanup_container end it "#get_container('fogcontainertests')" do - skip if Fog.mocking? - @storage.get_container('fogcontainertests').body.must_match_schema(@container_format) + unless Fog.mocking? + @storage.get_container('fogcontainertests').body.must_match_schema(@container_format) + end end it "#get_containers" do - skip if Fog.mocking? - @storage.get_containers.body.must_match_schema(@containers_format) + unless Fog.mocking? + @storage.get_containers.body.must_match_schema(@containers_format) + end end it "#head_container('fogcontainertests')" do - skip if Fog.mocking? - resp = @storage.head_container('fogcontainertests') - resp.status.must_equal 204 - resp.headers['X-Container-Object-Count'].to_i.must_equal 0 + unless Fog.mocking? + resp = @storage.head_container('fogcontainertests') + resp.status.must_equal 204 + resp.headers['X-Container-Object-Count'].to_i.must_equal 0 + end end it "#head_containers" do - skip if Fog.mocking? - resp = @storage.head_containers - resp.status.must_equal 204 - resp.headers['X-Account-Container-Count'].to_i.must_equal 1 + unless Fog.mocking? + resp = @storage.head_containers + resp.status.must_equal 204 + resp.headers['X-Account-Container-Count'].to_i.must_equal 1 + end end it "#delete_container('fogcontainertests')" do - skip if Fog.mocking? - @storage.delete_container('fogcontainertests').status.must_equal 204 + unless Fog.mocking? + @storage.delete_container('fogcontainertests').status.must_equal 204 + end end end end describe "failure" do it "#get_container('fognoncontainer')" do - skip if Fog.mocking? - proc do - @storage.get_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + unless Fog.mocking? + proc do + @storage.get_container('fognoncontainer') + end.must_raise Fog::Storage::OpenStack::NotFound + end end it "#head_container('fognoncontainer')" do - skip if Fog.mocking? - proc do - @storage.head_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + unless Fog.mocking? + proc do + @storage.head_container('fognoncontainer') + end.must_raise Fog::Storage::OpenStack::NotFound + end end it "#delete_container('fognoncontainer')" do - skip if Fog.mocking? - proc do - @storage.delete_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + unless Fog.mocking? + proc do + @storage.delete_container('fognoncontainer') + end.must_raise Fog::Storage::OpenStack::NotFound + end end end end diff --git a/test/requests/storage/large_object_tests.rb b/test/requests/storage/large_object_tests.rb index adb26ac56..b78eca059 100644 --- a/test/requests/storage/large_object_tests.rb +++ b/test/requests/storage/large_object_tests.rb @@ -60,14 +60,16 @@ describe "dynamic large object requests" do it "#put_object_manifest alias" do - skip if Fog.mocking? - @storage.put_object_manifest(@directory.identity, 'fog_large_object') + unless Fog.mocking? + @storage.put_object_manifest(@directory.identity, 'fog_large_object') + end end describe "using default X-Object-Manifest header" do it "#put_dynamic_obj_manifest" do - skip if Fog.mocking? - @storage.put_dynamic_obj_manifest(@directory.identity, 'fog_large_object') + unless Fog.mocking? + @storage.put_dynamic_obj_manifest(@directory.identity, 'fog_large_object') + end end describe "with large object" do @@ -81,30 +83,37 @@ end it "#get_object streams all segments matching the default prefix" do - skip if Fog.mocking? - expected = @segments[:a][:data] + @segments[:b][:data] + @segments[:c][:data] - @storage.get_object(@directory.identity, 'fog_large_object').body.must_equal expected + unless Fog.mocking? + expected = @segments[:a][:data] + @segments[:b][:data] + @segments[:c][:data] + @storage.get_object(@directory.identity, 'fog_large_object').body.must_equal expected + end end # When the manifest object name is equal to the segment prefix, # OpenStack treats it as if it's the first segment. # So you must prepend the manifest object's Etag - Digest::MD5.hexdigest('') it "#head_object returns Etag that includes manifest object in calculation" do - skip if Fog.mocking? - etags = ['d41d8cd98f00b204e9800998ecf8427e', - @segments[:a][:etag], @segments[:b][:etag], @segments[:c][:etag]] - # returned in quotes "\"2577f38428e895c50de6ea78ccc7da2a"\" - expected = %("#{Digest::MD5.hexdigest(etags.join)}") - @storage.head_object(@directory.identity, 'fog_large_object').headers['Etag'].must_equal expected + unless Fog.mocking? + etags = [ + 'd41d8cd98f00b204e9800998ecf8427e', + @segments[:a][:etag], + @segments[:b][:etag], + @segments[:c][:etag] + ] + # returned in quotes "\"2577f38428e895c50de6ea78ccc7da2a"\" + expected = %("#{Digest::MD5.hexdigest(etags.join)}") + @storage.head_object(@directory.identity, 'fog_large_object').headers['Etag'].must_equal expected + end end end end describe "specifying X-Object-Manifest segment prefix" do it "#put_dynamic_obj_manifest" do - skip if Fog.mocking? - options = {'X-Object-Manifest' => "#{@directory.identity}/fog_large_object/"} - @storage.put_dynamic_obj_manifest(@directory.identity, 'fog_large_object', options) + unless Fog.mocking? + options = {'X-Object-Manifest' => "#{@directory.identity}/fog_large_object/"} + @storage.put_dynamic_obj_manifest(@directory.identity, 'fog_large_object', options) + end end describe "with large object" do before do @@ -115,18 +124,20 @@ end it "#get_object streams segments only matching the specified prefix" do - skip if Fog.mocking? - expected = @segments[:a][:data] + @segments[:b][:data] - resp = @storage.get_object(@directory.identity, 'fog_large_object') - resp.body.must_equal expected + unless Fog.mocking? + expected = @segments[:a][:data] + @segments[:b][:data] + resp = @storage.get_object(@directory.identity, 'fog_large_object') + resp.body.must_equal expected + end end it "#head_object returns Etag that does not include manifest object in calculation" do - skip if Fog.mocking? - etags = [@segments[:a][:etag], @segments[:b][:etag]] - # returned in quotes "\"0f035ed3cc38aa0ef46dda3478fad44d"\" - expected = %("#{Digest::MD5.hexdigest(etags.join)}") - @storage.head_object(@directory.identity, 'fog_large_object').headers['Etag'].must_equal expected + unless Fog.mocking? + etags = [@segments[:a][:etag], @segments[:b][:etag]] + # returned in quotes "\"0f035ed3cc38aa0ef46dda3478fad44d"\" + expected = %("#{Digest::MD5.hexdigest(etags.join)}") + @storage.head_object(@directory.identity, 'fog_large_object').headers['Etag'].must_equal expected + end end end end @@ -139,9 +150,10 @@ end end it "#get_object" do - skip if Fog.mocking? - expected = @segments[:a][:data] + @segments[:b][:data] - @storage.get_object(@directory2.identity, 'fog_large_object').body.must_equal expected + unless Fog.mocking? + expected = @segments[:a][:data] + @segments[:b][:data] + @storage.get_object(@directory2.identity, 'fog_large_object').body.must_equal expected + end end end end @@ -167,36 +179,39 @@ end it "#head_object" do - skip if Fog.mocking? - etags = [@segments[:a][:etag], @segments[:c][:etag]] - # "\"ad7e633a12e8a4915b45e6dd1d4b0b4b\"" - etag = %("#{Digest::MD5.hexdigest(etags.join)}") - content_length = @segments[:a][:size] + @segments[:c][:size] - response = @storage.head_object(@directory.identity, 'fog_large_object') - - response.headers['Etag'].must_equal etag - response.headers['Content-Length'].to_i.must_equal content_length - response.headers['X-Static-Large-Object'].must_equal 'True' + unless Fog.mocking? + etags = [@segments[:a][:etag], @segments[:c][:etag]] + # "\"ad7e633a12e8a4915b45e6dd1d4b0b4b\"" + etag = %("#{Digest::MD5.hexdigest(etags.join)}") + content_length = @segments[:a][:size] + @segments[:c][:size] + response = @storage.head_object(@directory.identity, 'fog_large_object') + + response.headers['Etag'].must_equal etag + response.headers['Content-Length'].to_i.must_equal content_length + response.headers['X-Static-Large-Object'].must_equal 'True' + end end it "#get_object" do - skip if Fog.mocking? - expected = @segments[:a][:data] + @segments[:c][:data] - resp = @storage.get_object(@directory.identity, 'fog_large_object') - resp.body.must_equal expected + unless Fog.mocking? + expected = @segments[:a][:data] + @segments[:c][:data] + resp = @storage.get_object(@directory.identity, 'fog_large_object') + resp.body.must_equal expected + end end describe "#delete_static_large_object" do it "deletes manifest and segments" do - skip if Fog.mocking? - expected = { - 'Number Not Found' => 0, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 3, - 'Response Body' => '' - } - @storage.delete_static_large_object(@directory.identity, 'fog_large_object').body.must_equal expected + unless Fog.mocking? + expected = { + 'Number Not Found' => 0, + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 3, + 'Response Body' => '' + } + @storage.delete_static_large_object(@directory.identity, 'fog_large_object').body.must_equal expected + end end end end @@ -221,36 +236,39 @@ end it "#head_object" do - skip if Fog.mocking? - etags = [@segments[:b][:etag], @segments[:d][:etag]] - # "\"9801a4cc4472896a1e975d03f0d2c3f8\"" - etag = %("#{Digest::MD5.hexdigest(etags.join)}") - content_length = (@segments[:b][:size] + @segments[:d][:size]) - response = @storage.head_object(@directory2.identity, 'fog_large_object') - - response.headers['Etag'].must_equal etag - response.headers['Content-Length'].to_i.must_equal content_length - response.headers['X-Static-Large-Object'].must_equal 'True' + unless Fog.mocking? + etags = [@segments[:b][:etag], @segments[:d][:etag]] + # "\"9801a4cc4472896a1e975d03f0d2c3f8\"" + etag = %("#{Digest::MD5.hexdigest(etags.join)}") + content_length = (@segments[:b][:size] + @segments[:d][:size]) + response = @storage.head_object(@directory2.identity, 'fog_large_object') + + response.headers['Etag'].must_equal etag + response.headers['Content-Length'].to_i.must_equal content_length + response.headers['X-Static-Large-Object'].must_equal 'True' + end end it "#get_object" do - skip if Fog.mocking? - expected = @segments[:b][:data] + @segments[:d][:data] - resp = @storage.get_object(@directory2.identity, 'fog_large_object') - resp.body.must_equal expected + unless Fog.mocking? + expected = @segments[:b][:data] + @segments[:d][:data] + resp = @storage.get_object(@directory2.identity, 'fog_large_object') + resp.body.must_equal expected + end end it "#delete_static_large_object" do - skip if Fog.mocking? - expected = { - 'Number Not Found' => 0, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 3, - 'Response Body' => '' - } - resp = @storage.delete_static_large_object(@directory2.identity, 'fog_large_object') - resp.body.must_equal expected + unless Fog.mocking? + expected = { + 'Number Not Found' => 0, + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 3, + 'Response Body' => '' + } + resp = @storage.delete_static_large_object(@directory2.identity, 'fog_large_object') + resp.body.must_equal expected + end end end end @@ -259,34 +277,37 @@ describe "failure" do describe "dynamic large object requests" do it "#put_dynamic_obj_manifest with missing container" do - skip if Fog.mocking? - proc do - @storage.put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object') - end.must_raise Fog::Storage::OpenStack::NotFound + unless Fog.mocking? + proc do + @storage.put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object') + end.must_raise Fog::Storage::OpenStack::NotFound + end end end describe "static large object requests" do it "#put_static_obj_manifest with missing container" do - skip if Fog.mocking? - proc do - @storage.put_static_obj_manifest('fognoncontainer', 'fog_large_object', []) - end.must_raise Fog::Storage::OpenStack::NotFound + unless Fog.mocking? + proc do + @storage.put_static_obj_manifest('fognoncontainer', 'fog_large_object', []) + end.must_raise Fog::Storage::OpenStack::NotFound + end end it "#put_static_obj_manifest with missing object" do - skip if Fog.mocking? - segments = [{ - :path => "#{@segments[:c][:container]}/#{@segments[:c][:name]}", - :etag => @segments[:c][:etag], - :size_bytes => @segments[:c][:size] - }] - expected = {'Errors' => [[segments[0][:path], '404 Not Found']]} - - err = proc do - @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) - end.must_raise Excon::Errors::BadRequest - Fog::JSON.decode(err.response.body).must_equal expected + unless Fog.mocking? + segments = [{ + :path => "#{@segments[:c][:container]}/#{@segments[:c][:name]}", + :etag => @segments[:c][:etag], + :size_bytes => @segments[:c][:size] + }] + expected = {'Errors' => [[segments[0][:path], '404 Not Found']]} + + err = proc do + @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) + end.must_raise Excon::Errors::BadRequest + Fog::JSON.decode(err.response.body).must_equal expected + end end describe "with segments" do @@ -299,36 +320,38 @@ end it "#put_static_obj_manifest with invalid etag" do - skip if Fog.mocking? + unless Fog.mocking? - segments = [{ - :path => "#{@segments[:a][:container]}/#{@segments[:a][:name]}", - :etag => @segments[:b][:etag], - :size_bytes => @segments[:a][:size] - }] - expected = {'Errors' => [[segments[0][:path], 'Etag Mismatch']]} + segments = [{ + :path => "#{@segments[:a][:container]}/#{@segments[:a][:name]}", + :etag => @segments[:b][:etag], + :size_bytes => @segments[:a][:size] + }] + expected = {'Errors' => [[segments[0][:path], 'Etag Mismatch']]} - err = proc do - @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) - end.must_raise Excon::Errors::BadRequest + err = proc do + @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) + end.must_raise Excon::Errors::BadRequest - Fog::JSON.decode(err.response.body).must_equal expected + Fog::JSON.decode(err.response.body).must_equal expected + end end it "#put_static_obj_manifest with invalid byte_size" do - skip if Fog.mocking? - segments = [{ - :path => "#{@segments[:a][:container]}/#{@segments[:a][:name]}", - :etag => @segments[:a][:etag], - :size_bytes => @segments[:b][:size] - }] - expected = {'Errors' => [[segments[0][:path], 'Size Mismatch']]} - - err = proc do - @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) - end.must_raise Excon::Errors::BadRequest + unless Fog.mocking? + segments = [{ + :path => "#{@segments[:a][:container]}/#{@segments[:a][:name]}", + :etag => @segments[:a][:etag], + :size_bytes => @segments[:b][:size] + }] + expected = {'Errors' => [[segments[0][:path], 'Size Mismatch']]} + + err = proc do + @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) + end.must_raise Excon::Errors::BadRequest - Fog::JSON.decode(err.response.body).must_equal expected + Fog::JSON.decode(err.response.body).must_equal expected + end end describe "#delete_static_large_object with missing segment" do @@ -352,44 +375,47 @@ end it "deletes manifest and segment :a, and reports missing segment :b" do - skip if Fog.mocking? - expected = { - 'Number Not Found' => 1, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 2, - 'Response Body' => '' - } - @storage.delete_static_large_object(@directory.identity, 'fog_large_object').body.must_equal expected + unless Fog.mocking? + expected = { + 'Number Not Found' => 1, + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 2, + 'Response Body' => '' + } + @storage.delete_static_large_object(@directory.identity, 'fog_large_object').body.must_equal expected + end end end end it "#delete_static_large_object with missing container" do - skip if Fog.mocking? - expected = { - 'Number Not Found' => 1, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 0, - 'Response Body' => '' - } + unless Fog.mocking? + expected = { + 'Number Not Found' => 1, + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 0, + 'Response Body' => '' + } - resp = @storage.delete_static_large_object('fognoncontainer', 'fog_large_object') - resp.body.must_equal expected + resp = @storage.delete_static_large_object('fognoncontainer', 'fog_large_object') + resp.body.must_equal expected + end end it "#delete_static_large_object with missing manifest" do - skip if Fog.mocking? - expected = { - 'Number Not Found' => 1, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 0, - 'Response Body' => '' - } + unless Fog.mocking? + expected = { + 'Number Not Found' => 1, + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 0, + 'Response Body' => '' + } - @storage.delete_static_large_object(@directory.identity, 'fog_non_object').body.must_equal expected + @storage.delete_static_large_object(@directory.identity, 'fog_non_object').body.must_equal expected + end end end end diff --git a/test/requests/storage/object_tests.rb b/test/requests/storage/object_tests.rb index 42dcaf16d..b50e4c144 100644 --- a/test/requests/storage/object_tests.rb +++ b/test/requests/storage/object_tests.rb @@ -44,73 +44,86 @@ def override_path(path) end it "#get_object('fogobjectests', 'fog_object')" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') - resp.body.must_equal lorem_file.read + unless Fog.mocking? + resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') + resp.body.must_equal lorem_file.read + end end it "#get_object('fogobjecttests', 'fog_object', &block)" do - skip if Fog.mocking? - data = '' - Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| - data << chunk + unless Fog.mocking? + data = '' + Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| + data << chunk + end + data.must_equal lorem_file.read end - data.must_equal lorem_file.read end it "#public_url('fogobjectests', 'fog_object')" do - skip if Fog.mocking? - url = Fog::Storage[:openstack].directories.first.files.first.public_url - url.end_with?('/fogobjecttests/fog_object').must_equal true + unless Fog.mocking? + url = Fog::Storage[:openstack].directories.first.files.first.public_url + url.end_with?('/fogobjecttests/fog_object').must_equal true + end end it "#public_url('fogobjectests')" do - skip if Fog.mocking? - url = Fog::Storage[:openstack].directories.first.public_url - url.end_with?('/fogobjecttests').must_equal true + unless Fog.mocking? + url = Fog::Storage[:openstack].directories.first.public_url + url.end_with?('/fogobjecttests').must_equal true + end end it "#head_object('fogobjectests', 'fog_object')" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') - resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' + unless Fog.mocking? + resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') + resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' + end end it "#post_object('fogobjecttests', 'fog_object')" do - skip if Fog.mocking? - Fog::Storage[:openstack].post_object('fogobjecttests', 'fog_object', - 'X-Object-Meta-test-header' => 'fog-test-value') - resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') - resp.headers.must_include 'X-Object-Meta-Test-Header' - resp.headers['X-Object-Meta-Test-Header'].must_equal 'fog-test-value' + unless Fog.mocking? + Fog::Storage[:openstack].post_object( + 'fogobjecttests', + 'fog_object', + 'X-Object-Meta-test-header' => 'fog-test-value' + ) + resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') + resp.headers.must_include 'X-Object-Meta-Test-Header' + resp.headers['X-Object-Meta-Test-Header'].must_equal 'fog-test-value' + end end it "#delete_object('fogobjecttests', 'fog_object')" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object') - resp.status.must_equal 204 + unless Fog.mocking? + resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object') + resp.status.must_equal 204 + end end it "#get_object_http_url('directory.identity', 'fog_object', expiration timestamp)" do - skip if Fog.mocking? - ts = Time.at(1_395_343_213) - url_s = Fog::Storage[:openstack].get_object_http_url(@directory.identity, 'fog_object', ts) - test_temp_url(url_s, ts, 'http') + unless Fog.mocking? + ts = Time.at(1_395_343_213) + url_s = Fog::Storage[:openstack].get_object_http_url(@directory.identity, 'fog_object', ts) + test_temp_url(url_s, ts, 'http') + end end it "#get_object_https_url('directory.identity', 'fog_object', expiration timestamp)" do - skip if Fog.mocking? - ts = Time.at(1_395_343_213) - url_s = Fog::Storage[:openstack].get_object_https_url(@directory.identity, 'fog_object', ts) - test_temp_url(url_s, ts, 'https') + unless Fog.mocking? + ts = Time.at(1_395_343_213) + url_s = Fog::Storage[:openstack].get_object_https_url(@directory.identity, 'fog_object', ts) + test_temp_url(url_s, ts, 'https') + end end it "#get_object_https_url_numeric('directory.identity', 'fog_object', expiration_timestamp)" do - skip if Fog.mocking? - ts = Time.at(1500000000) - fog = Fog::Storage.new(provider: :openstack, openstack_temp_url_key: '12345') - url_s = fog.get_object_https_url(@directory.identity, 'fog_object', ts) - test_temp_url(url_s, ts, 'https') + unless Fog.mocking? + ts = Time.at(1_500_000_000) + fog = Fog::Storage.new(:provider => :openstack, :openstack_temp_url_key => '12345') + url_s = fog.get_object_https_url(@directory.identity, 'fog_object', ts) + test_temp_url(url_s, ts, 'https') + end end end @@ -138,15 +151,17 @@ def override_path(path) end it "#get_object" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_block_object') - resp.body.must_equal lorem_file.read + unless Fog.mocking? + resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_block_object') + resp.body.must_equal lorem_file.read + end end it "#delete_object" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object') - resp.status.must_equal 204 + unless Fog.mocking? + resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object') + resp.status.must_equal 204 + end end end end @@ -170,128 +185,145 @@ def override_path(path) end after do - skip if Fog.mocking? - dir2 = Fog::Storage[:openstack].directories.get('fogobjecttests2') - if !dir2.nil? - dir2.files.each(&:destroy) - dir2.destroy + unless Fog.mocking? + dir2 = Fog::Storage[:openstack].directories.get('fogobjecttests2') + unless dir2.nil? + dir2.files.each(&:destroy) + dir2.destroy + end end end it "#delete_multiple_objects" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( - 'fogobjecttests', %w[fog_object fog_object2]) - resp.body.must_equal @expected + unless Fog.mocking? + resp = Fog::Storage[:openstack].delete_multiple_objects( + 'fogobjecttests', %w[fog_object fog_object2] + ) + resp.body.must_equal @expected + end end it "deletes object and container" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( - nil, - ['fogobjecttests2/fog_object', 'fogobjecttests2'] - ) - resp.body.must_equal @expected + unless Fog.mocking? + resp = Fog::Storage[:openstack].delete_multiple_objects( + nil, + ['fogobjecttests2/fog_object', 'fogobjecttests2'] + ) + resp.body.must_equal @expected + end end end end describe "failure" do it "#get_object('fogobjecttests', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end it "#get_object('fognoncontainer', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].get_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].get_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end it "#head_object('fogobjecttests', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end it "#head_object('fognoncontainer', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].head_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].head_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end it "#post_object('fognoncontainer', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].post_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].post_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end it "#delete_object('fogobjecttests', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end it "#delete_object('fognoncontainer', 'fog_non_object')" do - skip if Fog.mocking? - proc do - Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + unless Fog.mocking? + proc do + Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) + end end describe "#delete_multiple_objects" do before do - skip if Fog.mocking? - @expected = { - "Number Not Found" => 2, - "Response Status" => "200 OK", - "Errors" => [], - "Number Deleted" => 0, - "Response Body" => "" - } + unless Fog.mocking? + @expected = { + "Number Not Found" => 2, + "Response Status" => "200 OK", + "Errors" => [], + "Number Deleted" => 0, + "Response Body" => "" + } + end end it "reports missing objects" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( - 'fogobjecttests', %w[fog_non_object fog_non_object2]) - resp.body.must_equal @expected + unless Fog.mocking? + resp = Fog::Storage[:openstack].delete_multiple_objects( + 'fogobjecttests', %w[fog_non_object fog_non_object2] + ) + resp.body.must_equal @expected + end end it "reports missing container" do - skip if Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( - 'fognoncontainer', %w[fog_non_object fog_non_object2]) - resp.body.must_equal @expected + unless Fog.mocking? + resp = Fog::Storage[:openstack].delete_multiple_objects( + 'fognoncontainer', %w[fog_non_object fog_non_object2] + ) + resp.body.must_equal @expected + end end it "deleting non-empty container" do - skip if Fog.mocking? - file = lorem_file - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) - file.close - resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' - - expected = { - "Number Not Found" => 0, - "Response Status" => "400 Bad Request", - "Errors" => [['fogobjecttests', '409 Conflict']], - "Number Deleted" => 0, - "Response Body" => "" - } - - resp = Fog::Storage[:openstack].delete_multiple_objects( - nil, - %w[fogobjecttests] - ) - resp.body.must_equal expected + unless Fog.mocking? + file = lorem_file + resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) + file.close + resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' + + expected = { + "Number Not Found" => 0, + "Response Status" => "400 Bad Request", + "Errors" => [['fogobjecttests', '409 Conflict']], + "Number Deleted" => 0, + "Response Body" => "" + } + + resp = Fog::Storage[:openstack].delete_multiple_objects( + nil, + %w[fogobjecttests] + ) + resp.body.must_equal expected + end end end end From a9c9c1d5f020ccb31982d5fdec8b5c6b5ac2b826 Mon Sep 17 00:00:00 2001 From: Melvin Hillsman Date: Fri, 22 Jun 2018 02:06:51 -0500 Subject: [PATCH 015/129] Add additional key servers and keys Jobs are failing due to timeout retrieving keys Signed-off-by: Melvin Hillsman --- playbooks/fog-openstack-unittest-spec/run.yaml | 9 +++++++-- playbooks/fog-openstack-unittest-test/run.yaml | 9 +++++++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/playbooks/fog-openstack-unittest-spec/run.yaml b/playbooks/fog-openstack-unittest-spec/run.yaml index c42b7f077..7f3d4261f 100644 --- a/playbooks/fog-openstack-unittest-spec/run.yaml +++ b/playbooks/fog-openstack-unittest-spec/run.yaml @@ -8,10 +8,15 @@ set -o pipefail set -x apt-get install ruby ruby-dev -y - gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + for key in 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB; do + gpg --keyserver keys.gnupg.net --keyserver-options timeout=5 --recv-keys "$key" || \ + gpg --keyserver pgp.mit.edu --keyserver-options timeout=5 --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --keyserver-options timeout=5 --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=5 --recv-keys "$key" + done curl -L https://get.rvm.io | bash -s stable source /usr/local/rvm/scripts/rvm > /dev/null 2>&1 - for version in {{ rvm }};do + for version in {{ rvm }}; do if [ "$version" == "jruby-head" ]; then continue fi diff --git a/playbooks/fog-openstack-unittest-test/run.yaml b/playbooks/fog-openstack-unittest-test/run.yaml index 97c6a38dc..d01685084 100644 --- a/playbooks/fog-openstack-unittest-test/run.yaml +++ b/playbooks/fog-openstack-unittest-test/run.yaml @@ -8,10 +8,15 @@ set -o pipefail set -x apt-get install ruby ruby-dev -y - gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 + for key in 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB; do + gpg --keyserver keys.gnupg.net --keyserver-options timeout=5 --recv-keys "$key" || \ + gpg --keyserver pgp.mit.edu --keyserver-options timeout=5 --recv-keys "$key" || \ + gpg --keyserver keyserver.pgp.com --keyserver-options timeout=5 --recv-keys "$key" || \ + gpg --keyserver ha.pool.sks-keyservers.net --keyserver-options timeout=5 --recv-keys "$key" + done curl -L https://get.rvm.io | bash -s stable source /usr/local/rvm/scripts/rvm > /dev/null 2>&1 - for version in {{ rvm }};do + for version in {{ rvm }}; do if [ "$version" == "jruby-head" ]; then continue fi From 73f1b0050d65d8ce166dfbd86db731cd3f790fa0 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Sat, 23 Jun 2018 07:08:08 +1000 Subject: [PATCH 016/129] v0.1.26 --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 63ac9fece..94a4e9099 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = "0.1.24" + VERSION = '0.1.26'.freeze end end From fc1fe97b71c9422dff6240bdaef5612f3dabdf58 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 4 Jul 2018 17:27:18 +1000 Subject: [PATCH 017/129] Compute: Add remote console --- lib/fog/compute/openstack.rb | 5 +- .../openstack/requests/get_vnc_console.rb | 11 +++- .../openstack/requests/remote_consoles.rb | 54 +++++++++++++++++++ 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 lib/fog/compute/openstack/requests/remote_consoles.rb diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index f5be99854..6aa2b4f59 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -116,6 +116,9 @@ class OpenStack < Fog::Service request :migrate_server request :evacuate_server + # Server Remote Consoles + request :remote_consoles + # Service CRUD request :list_services request :enable_service @@ -338,7 +341,7 @@ def self.data "port_state" => "ACTIVE" } ] - } + } end end diff --git a/lib/fog/compute/openstack/requests/get_vnc_console.rb b/lib/fog/compute/openstack/requests/get_vnc_console.rb index 1073de830..01e4c3f71 100644 --- a/lib/fog/compute/openstack/requests/get_vnc_console.rb +++ b/lib/fog/compute/openstack/requests/get_vnc_console.rb @@ -3,6 +3,7 @@ module Compute class OpenStack class Real # Get a vnc console for an instance. + # For microversion < 2.6 as it has been replaced with remote-consoles # # === Parameters # * server_id <~String> - The ID of the server. @@ -13,12 +14,20 @@ class Real # * url <~String> # * type <~String> def get_vnc_console(server_id, console_type) + fixed_microversion = nil + if microversion_newer_than?('2.5') + fixed_microversion = @microversion + @microversion = '2.5' + end + body = { 'os-getVNCConsole' => { 'type' => console_type } } - server_action(server_id, body) + result = server_action(server_id, body) + @microversion = fixed_microversion if fixed_microversion + result end end diff --git a/lib/fog/compute/openstack/requests/remote_consoles.rb b/lib/fog/compute/openstack/requests/remote_consoles.rb new file mode 100644 index 000000000..3c869acd0 --- /dev/null +++ b/lib/fog/compute/openstack/requests/remote_consoles.rb @@ -0,0 +1,54 @@ +module Fog + module Compute + class OpenStack + class Real + # Get a vnc console for an instance. + # For microversion >= 2.6 + # + # === Parameters + # * server_id <~String> - The ID of the server. + # * protocol <~String> - The protocol of remote console. The valid values are vnc, spice, rdp, serial and mks. + # The protocol mks is added since Microversion 2.8. + # * type <~String> - The type of remote console. The valid values are novnc, xvpvnc, rdp-html5, spice-html5, + # serial, and webmks. The type webmks is added since Microversion 2.8. + # === Returns + # * response <~Excon::Response>: + # * body <~Hash>: + # * url <~String> + # * type <~String> + # * protocol <~String> + def remote_consoles(server_id, protocol, type) + if microversion_newer_than?('2.6') + body = { + 'remote_console' => { + 'protocol' => protocol, 'type' => type + } + } + + request( + :body => Fog::JSON.encode(body), + :expects => 200, + :method => 'POST', + :path => "servers/#{server_id}/remote-consoles" + ) + end + end + end + + class Mock + def remote_consoles(_server_id, _protocol, _type) + response = Excon::Response.new + response.status = 200 + response.body = { + "remote_console" => { + "url" => "http://192.168.27.100:6080/vnc_auto.html?token=e629bcbf-6f9e-4276-9ea1-d6eb0e618da5", + "type" => "novnc", + "protocol" => "vnc" + } + } + response + end + end + end + end +end From 1b0b62e434eac3dd1cc26d665be73439a09a87ab Mon Sep 17 00:00:00 2001 From: Andrei Veselov Date: Mon, 9 Jul 2018 14:45:21 +0200 Subject: [PATCH 018/129] Assign user_id when create key_pair --- lib/fog/compute/openstack/requests/create_key_pair.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fog/compute/openstack/requests/create_key_pair.rb b/lib/fog/compute/openstack/requests/create_key_pair.rb index 9ac2fa1b6..b94d6a338 100644 --- a/lib/fog/compute/openstack/requests/create_key_pair.rb +++ b/lib/fog/compute/openstack/requests/create_key_pair.rb @@ -2,7 +2,7 @@ module Fog module Compute class OpenStack class Real - def create_key_pair(key_name, public_key = nil) + def create_key_pair(key_name, public_key = nil, user_id = nil) data = { 'keypair' => { 'name' => key_name @@ -10,6 +10,7 @@ def create_key_pair(key_name, public_key = nil) } data['keypair']['public_key'] = public_key unless public_key.nil? + data['keypair']['user_id'] = user_id unless user_id.nil? request( :body => Fog::JSON.encode(data), From 6fe9325a77cce89218f56078b061f7d9303ad5f5 Mon Sep 17 00:00:00 2001 From: Andrei Veselov Date: Mon, 9 Jul 2018 14:47:31 +0200 Subject: [PATCH 019/129] Assign user_id when delete key_pair --- lib/fog/compute/openstack/requests/delete_key_pair.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/fog/compute/openstack/requests/delete_key_pair.rb b/lib/fog/compute/openstack/requests/delete_key_pair.rb index 61293f3c9..7b5e8568c 100644 --- a/lib/fog/compute/openstack/requests/delete_key_pair.rb +++ b/lib/fog/compute/openstack/requests/delete_key_pair.rb @@ -2,7 +2,9 @@ module Fog module Compute class OpenStack class Real - def delete_key_pair(key_name) + def delete_key_pair(key_name, user_id = nil) + options = {} + options[:user_id] = user_id unless user_id.nil? request( :expects => [202, 204], :method => 'DELETE', From a959127cae758a331cea41c0483475358c19c4a6 Mon Sep 17 00:00:00 2001 From: Andrei Veselov Date: Mon, 9 Jul 2018 14:49:28 +0200 Subject: [PATCH 020/129] Update save method with user_id argument --- lib/fog/compute/openstack/models/key_pair.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/compute/openstack/models/key_pair.rb b/lib/fog/compute/openstack/models/key_pair.rb index e395ed390..6cc30481f 100644 --- a/lib/fog/compute/openstack/models/key_pair.rb +++ b/lib/fog/compute/openstack/models/key_pair.rb @@ -25,9 +25,9 @@ def save requires :name data = if public_key - service.create_key_pair(name, public_key).body['keypair'] + service.create_key_pair(name, public_key, user_id).body['keypair'] else - service.create_key_pair(name).body['keypair'] + service.create_key_pair(name, nil, user_id).body['keypair'] end new_attributes = data.reject { |key, _value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key) } merge_attributes(new_attributes) From c4ccd3319726c935b406eaf32cf339999fa89380 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 10 Jul 2018 21:02:59 +1000 Subject: [PATCH 021/129] v0.1.27 --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 94a4e9099..bbfc6d8e9 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.1.26'.freeze + VERSION = '0.1.27'.freeze end end From 62727a0694bfba7aaa0b0ec453be80ea0b76db29 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 17 Jul 2018 16:57:54 +1000 Subject: [PATCH 022/129] Adds path for connections --- lib/fog/openstack.rb | 4 +++- spec/fixtures/openstack/shared_file_system/common_setup.yml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index c12dc4ac3..278270268 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -586,7 +586,9 @@ def self.map_endpoint_type type def self.get_version(supported_versions, uri, auth_token, connection_options = {}) version_cache = "#{uri}#{supported_versions}" return @version[version_cache] if @version && @version[version_cache] - connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options) + connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}#{uri.path}/", + false, + connection_options) response = connection.request( :expects => [200, 204, 300], :headers => {'Content-Type' => 'application/json', diff --git a/spec/fixtures/openstack/shared_file_system/common_setup.yml b/spec/fixtures/openstack/shared_file_system/common_setup.yml index 2036009d2..0bb378d00 100644 --- a/spec/fixtures/openstack/shared_file_system/common_setup.yml +++ b/spec/fixtures/openstack/shared_file_system/common_setup.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: https://devstack.openstack.stack:8786/ + uri: https://devstack.openstack.stack:8786/v2/c60a441e54cd435896a357026aa4050a/ body: encoding: US-ASCII string: '' From 6685fa58c1cc98562bd3b92158927049fb748907 Mon Sep 17 00:00:00 2001 From: Sam Lucidi Date: Tue, 7 Aug 2018 15:58:41 -0400 Subject: [PATCH 023/129] Don't try to automatically set IDs for new flavors --- lib/fog/compute/openstack/requests/create_flavor.rb | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/lib/fog/compute/openstack/requests/create_flavor.rb b/lib/fog/compute/openstack/requests/create_flavor.rb index 4b2938613..7d7b9bbe0 100644 --- a/lib/fog/compute/openstack/requests/create_flavor.rb +++ b/lib/fog/compute/openstack/requests/create_flavor.rb @@ -10,16 +10,6 @@ class Real # swap = Swap space in MB # rxtx_factor = RX/TX factor def create_flavor(attributes) - # Get last flavor id - flavor_ids = [] - flavors = list_flavors_detail.body['flavors'] + list_flavors_detail(:is_public => false).body['flavors'] - flavors.each do |flavor| - flavor_ids << flavor['id'].to_i - end - - # Set flavor id - attributes[:flavor_id] = attributes[:flavor_id] || (!flavor_ids.empty? ? flavor_ids.sort.last + 1 : 1) - data = { 'flavor' => { 'name' => attributes[:name], From ddd327f569d4613b98888ba6d54146a1ea4e2e39 Mon Sep 17 00:00:00 2001 From: TommyLike Date: Mon, 13 Aug 2018 10:34:36 +0800 Subject: [PATCH 024/129] Support version in 'extract_version_from_body' Support version in 'extract_version_from_body' --- lib/fog/openstack.rb | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index c12dc4ac3..88c05c3de 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -602,10 +602,17 @@ def self.get_version(supported_versions, uri, auth_token, connection_options = { end def self.extract_version_from_body(body, supported_versions) - return nil if body['versions'].empty? - versions = body['versions'].kind_of?(Array) ? body['versions'] : body['versions']['values'] + versions = [] + unless body['versions'].nil? || body['versions'].empty? + versions = body['versions'].kind_of?(Array) ? body['versions'] : body['versions']['values'] + end + # Some version API would return single endpoint rather than endpoints list, try to get it via 'version'. + unless body['version'].nil? or versions.length != 0 + versions = [body['version']] + end version = nil - # order is important, preffered status should be first + + # order is important, preferred status should be first %w(CURRENT stable SUPPORTED DEPRECATED).each do |status| version = versions.find { |x| x['id'].match(supported_versions) && (x['status'] == status) } break if version From df012e1637de7cae139583be34c5600de871973b Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 13 Aug 2018 23:45:48 +1000 Subject: [PATCH 025/129] Allow to use identity v2 with an option instead of path --- lib/fog/identity/openstack.rb | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index 350fe92db..d8287b2a9 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -17,22 +17,23 @@ class OpenStack < Fog::Service :current_user, :current_user_id, :current_tenant, :openstack_cache_ttl, :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches - # Fog::Identity::OpenStack.new() will return a Fog::Identity::OpenStack::V3 by default def self.new(args = {}) - version = '3' - url = Fog.credentials[:openstack_auth_url] || args[:openstack_auth_url] - if url - uri = URI(url) - version = '2.0' if uri.path =~ /v2\.0/ + if args[:openstack_identity_legacy_version] + version = '2.0' + else + url = Fog.credentials[:openstack_auth_url] || args[:openstack_auth_url] + if url + uri = URI(url) + version = '2.0' if uri.path =~ /v2\.0/ + end end - service = case version - when '2.0' - Fog::Identity::OpenStack::V2.new(args) - else - Fog::Identity::OpenStack::V3.new(args) - end - service + case version + when '2.0' + Fog::Identity::OpenStack::V2.new(args) + else + Fog::Identity::OpenStack::V3.new(args) + end end class Mock From 09babf0538f709d57517bf5e103ac24c29d7fac8 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 20 Aug 2018 15:56:15 +1000 Subject: [PATCH 026/129] Fix attributes to be created as Symbol not String --- lib/fog/image/openstack/v2/models/image.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/image/openstack/v2/models/image.rb b/lib/fog/image/openstack/v2/models/image.rb index 3870fc74a..7b4f54ad6 100644 --- a/lib/fog/image/openstack/v2/models/image.rb +++ b/lib/fog/image/openstack/v2/models/image.rb @@ -47,7 +47,7 @@ def method_missing(method_sym, *arguments, &block) elsif attributes.key?(method_sym.to_s) attributes[method_sym.to_s] elsif method_sym.to_s.end_with?('=') - attributes[method_sym.to_s.gsub(/=$/, '')] = arguments[0] + attributes[method_sym.to_s.gsub(/=$/, '').to_sym] = arguments[0] else super end From 267c9e49c1a289c31d855053d5f1d3f732377f76 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 22 Aug 2018 09:30:30 +1000 Subject: [PATCH 027/129] gitignore test/lorem.txt --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 5ab2a8080..fd17499cc 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ gemfiles/Gemfile-1.9.lock .DS_Store .idea/ vendor/bundle +test/.lorem.txt From fdae00f6693703f11c6043f9b347127c2ac9e00c Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 22 Aug 2018 09:34:16 +1000 Subject: [PATCH 028/129] Adds pry-byebug to development tools --- fog-openstack.gemspec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 806017eaf..e751c9ec3 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -29,10 +29,11 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'coveralls' spec.add_development_dependency "mime-types" spec.add_development_dependency "mime-types-data" + spec.add_development_dependency 'minitest' + spec.add_development_dependency 'pry-byebug' spec.add_development_dependency 'rake', '~> 10.0' spec.add_development_dependency 'rubocop' spec.add_development_dependency 'shindo', '~> 0.3' - spec.add_development_dependency 'minitest' spec.add_development_dependency 'vcr' spec.add_development_dependency 'webmock', '~> 1.24.6' end From 833a84312810a7bf4761fe8cc872af2961d4a40a Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 10 Aug 2018 23:45:46 +1000 Subject: [PATCH 029/129] New authentication and catalog structure --- Rakefile | 14 +- lib/fog/openstack/auth/catalog.rb | 65 +++++ lib/fog/openstack/auth/catalog/v2.rb | 25 ++ lib/fog/openstack/auth/catalog/v3.rb | 25 ++ lib/fog/openstack/auth/name.rb | 66 +++++ lib/fog/openstack/auth/token.rb | 72 +++++ lib/fog/openstack/auth/token/v2.rb | 71 +++++ lib/fog/openstack/auth/token/v3.rb | 102 +++++++ unit/auth/catalog_test.rb | 200 ++++++++++++++ unit/auth/name_test.rb | 116 ++++++++ unit/auth/token_test.rb | 382 +++++++++++++++++++++++++++ unit/auth_helper.rb | 52 ++++ unit/test_helper.rb | 6 + 13 files changed, 1194 insertions(+), 2 deletions(-) create mode 100644 lib/fog/openstack/auth/catalog.rb create mode 100644 lib/fog/openstack/auth/catalog/v2.rb create mode 100644 lib/fog/openstack/auth/catalog/v3.rb create mode 100644 lib/fog/openstack/auth/name.rb create mode 100644 lib/fog/openstack/auth/token.rb create mode 100644 lib/fog/openstack/auth/token/v2.rb create mode 100644 lib/fog/openstack/auth/token/v3.rb create mode 100644 unit/auth/catalog_test.rb create mode 100644 unit/auth/name_test.rb create mode 100644 unit/auth/token_test.rb create mode 100644 unit/auth_helper.rb create mode 100644 unit/test_helper.rb diff --git a/Rakefile b/Rakefile index bb2c8e97e..fc86a0807 100644 --- a/Rakefile +++ b/Rakefile @@ -4,12 +4,14 @@ require 'rake/testtask' RuboCop::RakeTask.new -task :default => ['tests:unit', 'tests:spec'] +task :default => ['tests:unit', 'tests:spec', 'tests:test'] -task :test => 'tests:unit' +task :unit => 'tests:unit' task :spec => "tests:spec" +task :test => 'tests:test' + namespace :tests do desc 'Run fog-openstack tests with Minitest' Rake::TestTask.new do |t| @@ -28,4 +30,12 @@ namespace :tests do t.pattern = 'spec/**/*_spec.rb' t.verbose = true end + + desc 'Run fog-openstack unit tests' + Rake::TestTask.new do |t| + t.name = 'test' + t.libs.push [ "lib", "unit" ] + t.pattern = 'unit/**/*_test.rb' + t.verbose = true + end end diff --git a/lib/fog/openstack/auth/catalog.rb b/lib/fog/openstack/auth/catalog.rb new file mode 100644 index 000000000..207fc7de4 --- /dev/null +++ b/lib/fog/openstack/auth/catalog.rb @@ -0,0 +1,65 @@ +module Fog + module OpenStack + module Auth + module Catalog + attr_reader :payload + + class CatalogError < RuntimeError; end + class EndpointError < RuntimeError; end + class ServiceTypeError < RuntimeError; end + + def initialize(payload) + @payload = payload + end + + def get_endpoint_url(names, interfaces, region = nil) + #TODO: Inject OpenStack Service Types Authority + names_list = if names.is_a?(String) + [names] + else + names + end + entries = get_by_type(names_list) + raise ServiceTypeError, 'No endpoint match' if entries.empty? + + interfaces_list = if interfaces.is_a?(String) + [interfaces] + else + interfaces + end + + list = [] + interfaces_list.each do |interface| + val = get_endpoint(entries, interface, region) + list << val if val + end + + raise EndpointError, 'No endpoint found' if list.empty? + list[0] + end + + private + + def get_by_type(names) + raise CatalogError, 'Empty content' unless @payload + @payload.select do |e| + names.include?(e['type']) + end + end + + def get_endpoint(entries, interface, region) + list = [] + entries.each do |type| + if type['endpoints'] + type['endpoints'].each do |endpoint| + list << endpoint_url(endpoint, interface) if endpoint_match(endpoint, interface, region) + end + end + end + raise EndpointError, 'Multiple endpoints found' if list.size > 1 + list[0] + end + end + end + end +end diff --git a/lib/fog/openstack/auth/catalog/v2.rb b/lib/fog/openstack/auth/catalog/v2.rb new file mode 100644 index 000000000..dc1ee23f1 --- /dev/null +++ b/lib/fog/openstack/auth/catalog/v2.rb @@ -0,0 +1,25 @@ +require 'fog/openstack/auth/catalog' + +module Fog + module OpenStack + module Auth + module Catalog + class V2 + include Fog::OpenStack::Auth::Catalog + + def endpoint_match(endpoint, interface, region) + if region + return true if endpoint['region'] == region && endpoint["#{interface}URL"] + else + return true if endpoint["#{interface}URL"] + end + end + + def endpoint_url(endpoint, interface) + return endpoint["#{interface}URL"] + end + end + end + end + end +end diff --git a/lib/fog/openstack/auth/catalog/v3.rb b/lib/fog/openstack/auth/catalog/v3.rb new file mode 100644 index 000000000..c4756cb1b --- /dev/null +++ b/lib/fog/openstack/auth/catalog/v3.rb @@ -0,0 +1,25 @@ +require 'fog/openstack/auth/catalog' + +module Fog + module OpenStack + module Auth + module Catalog + class V3 + include Fog::OpenStack::Auth::Catalog + + def endpoint_match(endpoint, interface, region) + if region + return true if endpoint['interface'] == interface && endpoint['region'] == region + else + return true if endpoint['interface'] == interface + end + end + + def endpoint_url(endpoint, _) + endpoint['url'] + end + end + end + end + end +end diff --git a/lib/fog/openstack/auth/name.rb b/lib/fog/openstack/auth/name.rb new file mode 100644 index 000000000..7c3345b60 --- /dev/null +++ b/lib/fog/openstack/auth/name.rb @@ -0,0 +1,66 @@ +module Fog + module OpenStack + module Auth + + class CredentialsError < RuntimeError; end + + module Domain + attr_accessor :domain + + + def identity + data = {} + if !id.nil? + data.merge!(to_h(:id)) + elsif !name.nil? && !domain.nil? + data.merge!(to_h(:name)) + data.merge!({ :domain => @domain.identity }) + else + raise Fog::OpenStack::Auth::CredentialsError, "#{self.class}: An Id, or a name with its domain, must be provided" + end + data + end + end + + + class Name < Struct.new(:id, :name) + def identity + return to_h(:id) unless id.nil? + return to_h(:name) unless name.nil? + raise Fog::OpenStack::Auth::CredentialsError, "#{self.class}: No available id or name" + end + + def to_h(var) + { var => self.send(var) } + end + end + + class DomainScope < Name + def identity + { :domain => super } + end + end + + class ProjectScope < Name + include Fog::OpenStack::Auth::Domain + + def identity + { :project => super } + end + end + + class User < Name + include Fog::OpenStack::Auth::Domain + + attr_accessor :password + + def identity + data = super + raise CredentialsError, "#{self.class}: No password available" if password.nil? + data.merge!(to_h(:password)) + { :user => data } + end + end + end + end +end diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb new file mode 100644 index 000000000..16dd1e0fc --- /dev/null +++ b/lib/fog/openstack/auth/token.rb @@ -0,0 +1,72 @@ +require 'fog/openstack/auth/token/v2' +require 'fog/openstack/auth/token/v3' +require 'fog/openstack/auth/catalog/v2' +require 'fog/openstack/auth/catalog/v3' + +module Fog + module OpenStack + module Auth + module Token + attr_reader :catalog, :expires, :tenant, :token, :user, :data + + SSL_VERIFY_MODE = true + + class ExpiryError < RuntimeError; end + class StandardError < RuntimeError; end + class URLError < RuntimeError; end + + def self.build(auth) + if auth[:openstack_tenant_id] || auth[:openstack_tenant] + Fog::OpenStack::Auth::Token::V2.new(auth) + else + Fog::OpenStack::Auth::Token::V3.new(auth) + end + end + + def initialize(auth) + raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty? + @creds = { + :data => set_credentials(auth), + :ssl_verify_mode => auth[:ssl_verify_mode].nil? ? SSL_VERIFY_MODE : auth[:ssl_verify_mode], + :uri => URI.parse(auth[:openstack_auth_url]) + } + response = authenticate(@creds) + set(response) + end + + def get + set(authenticate(@creds)) if expired? + @token + end + + private + + def authenticate(creds) + connection_options = {} + connection = Fog::Core::Connection.new(creds[:uri].to_s, false, connection_options) + + request = { + :expects => [200,201], + :headers => {'Content-Type' => 'application/json'}, + :body => Fog::JSON.encode(creds[:data]), + :method => 'POST', + :path => creds[:uri].path + path + } + + response = connection.request(request) + end + + def expired? + if @expires.nil? || @expires.empty? + raise ExpiryError, 'Missing token expiration data' + end + Time.parse(@expires) < Time.now.utc + end + + def refresh + raise StandardError, "__method__ not implemented yet!" + end + end + end + end +end diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb new file mode 100644 index 000000000..3b3fb017f --- /dev/null +++ b/lib/fog/openstack/auth/token/v2.rb @@ -0,0 +1,71 @@ +require 'fog/openstack/auth/token' +require 'fog/openstack/auth/name' + +module Fog + module OpenStack + module Auth + module Token + + class CredentialsError < RuntimeError; end + + class V2 + include Fog::OpenStack::Auth::Token + attr_reader :tenant + + def credentials + if @token + identity = { 'token': { 'id': @token } } + else + raise CredentialsError, "#{self.class}: User name is required" if @user.name.nil? + raise CredentialsError, "#{self.class}: User password is required" if @user.password.nil? + identity = { 'passwordCredentials': user_credentials } + end + + if @tenant.id + identity.merge!('tenantId': @tenant.id) + elsif @tenant.name + identity.merge!('tenantName': @tenant.name) + else + raise CredentialsError, "#{self.class}: No tenant available" + end + + { 'auth': identity } + end + + def path + '/v2.0/tokens' + end + + def user_credentials + { + 'username': @user.name, + 'password': @user.password + } + end + + def set(response) + @data = Fog::JSON.decode(response.body) + @token = @data['access']['token']['id'] + @expires = @data['access']['token']['expires'] + @tenant = @data['access']['token']['tenant'] + @user = @data['access']['user'] + catalog = @data['access']['serviceCatalog'] + @catalog = Fog::OpenStack::Auth::Catalog::V2.new(catalog) if catalog + end + + def set_credentials(auth) + if auth[:openstack_auth_token] + @token = auth[:openstack_auth_token] + else + @user = Fog::OpenStack::Auth::User.new(auth[:openstack_userid], auth[:openstack_username]) + @user.password = auth[:openstack_api_key] + end + + @tenant = Fog::OpenStack::Auth::Name.new(auth[:openstack_tenant_id], auth[:openstack_tenant]) + credentials + end + end + end + end + end +end diff --git a/lib/fog/openstack/auth/token/v3.rb b/lib/fog/openstack/auth/token/v3.rb new file mode 100644 index 000000000..eb545104e --- /dev/null +++ b/lib/fog/openstack/auth/token/v3.rb @@ -0,0 +1,102 @@ +require 'fog/openstack/auth/token' +require 'fog/openstack/auth/name' + +module Fog + module OpenStack + module Auth + module Token + class V3 + include Fog::OpenStack::Auth::Token + attr_reader :domain, :project + + # Default Domain ID + DOMAIN_ID = 'default' + + def credentials + if @token + identity = { + 'methods': ['token'], + 'token': { 'id': @token } + } + else + identity = { + 'methods': ['password'], + 'password': @user.identity + } + end + if scope + { + 'auth': { + 'identity': identity, + 'scope': scope + } + } + else + { 'auth': { 'identity': identity } } + end + end + + def path + '/v3/auth/tokens' + end + + def scope + return @project.identity if @project + return @domain.identity if @domain + end + + def set(response) + @data = Fog::JSON.decode(response.body) + @token = response.headers['x-subject-token'] + @expires = @data['token']['expires_at'] + @tenant = @data['token']['project'] + @user = @data['token']['user'] + catalog = @data['token']['catalog'] + if catalog + @catalog = Fog::OpenStack::Auth::Catalog::V3.new(catalog) + end + end + + def set_credentials(auth) + if auth[:openstack_project_id] || auth[:openstack_project_name] + # project scoped + @project = Fog::OpenStack::Auth::ProjectScope.new(auth[:openstack_project_id], auth[:openstack_project_name]) + + if auth[:openstack_project_domain_id] || auth[:openstack_project_domain_name] + @project.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_project_domain_id], auth[:openstack_project_domain_name]) + else + if auth[:openstack_domain_id] || auth[:openstack_domain_name] + @project.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_domain_id], auth[:openstack_domain_name]) + else + @project.domain = Fog::OpenStack::Auth::Name.new(DOMAIN_ID, nil) + end + end + elsif auth[:openstack_domain_id] || auth[:openstack_domain_name] + # domain scoped + @domain = Fog::OpenStack::Auth::DomainScope.new(auth[:openstack_domain_id], auth[:openstack_domain_name]) + end + + if auth[:openstack_auth_token] + @token = auth[:openstack_auth_token] + else + @user = Fog::OpenStack::Auth::User.new(auth[:openstack_userid], auth[:openstack_username]) + @user.password = auth[:openstack_api_key] + + if auth[:openstack_user_domain_id] || auth[:openstack_user_domain_name] + @user.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_user_domain_id], auth[:openstack_user_domain_name]) + else + if auth[:openstack_domain_id] || auth[:openstack_domain_name] + @user.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_domain_id], auth[:openstack_domain_name]) + else + @user.domain = Fog::OpenStack::Auth::Name.new(DOMAIN_ID, nil) + end + end + end + + credentials + end + end + end + end + end +end diff --git a/unit/auth/catalog_test.rb b/unit/auth/catalog_test.rb new file mode 100644 index 000000000..e64e7971b --- /dev/null +++ b/unit/auth/catalog_test.rb @@ -0,0 +1,200 @@ +require 'test_helper' + +describe Fog::OpenStack::Auth::Catalog::V3 do + let(:payload) do + [{"endpoints"=> + [{"region_id"=>"regionOne", + "url"=>"http://localhost:9696", + "region"=>"regionOne", + "interface"=>"internal", + "id"=>"id_endpoint1_internal"}, + {"region_id"=>"regionOne", + "url"=>"http://localhost:9696", + "region"=>"regionOne", + "interface"=>"public", + "id"=>"id_endpoint1_public"}, + {"region_id"=>"regionOne", + "url"=>"http://localhost:9696", + "region"=>"regionOne", + "interface"=>"admin", + "id"=>"id_endpoint1_admin"}], + "type"=>"network", + "id"=>"id1", + "name"=>"neutron"}, + {"endpoints"=> + [{"region_id"=>"regionOne", + "url"=>"http://localhost:9292", + "region"=>"regionOne", + "interface"=>"internal", + "id"=>"id_endpoint1_internal"}, + {"region_id"=>"regionOne", + "url"=>"http://localhost:9292", + "region"=>"regionOne", + "interface"=>"public", + "id"=>"id_endpoint1_public"}, + {"region_id"=>"regionOne", + "url"=>"http://localhost:9292", + "region"=>"regionOne", + "interface"=>"admin", + "id"=>"id_endpoint1_admin"}], + "type"=>"image", + "id"=>"id2", + "name"=>"glance"}, + {"endpoints"=> + [{"region_id"=>"regionOne", + "url"=>"http://localhost:5000", + "region"=>"regionOne", + "interface"=>"internal", + "id"=>"id_endpoint1_internal"}, + {"region_id"=>"regionOne", + "url"=>"http://localhost:5000", + "region"=>"regionOne", + "interface"=>"public", + "id"=>"id_endpoint1_public"}, + {"region_id"=>"regionOne", + "url"=>"http://localhost:35357", + "region"=>"regionOne", + "interface"=>"admin", + "id"=>"id_endpoint1_admin"}], + "type"=>"identity", + "id"=>"id3", + "name"=>"keystone"}, + {"endpoints"=> + [{"region_id"=>"regionOne", + "url"=>"http://localhost2:5000", + "region"=>"regionTwo", + "interface"=>"internal", + "id"=>"id_endpoint1_internal"}, + {"region_id"=>"regionTwo", + "url"=>"http://localhost2:5000", + "region"=>"regionTwo", + "interface"=>"public", + "id"=>"id_endpoint1_public"}, + {"region_id"=>"regionTwo", + "url"=>"http://localhost2:35357", + "region"=>"regionTwo", + "interface"=>"admin", + "id"=>"id_endpoint1_admin"}], + "type"=>"identity", + "id"=>"id3", + "name"=>"keystone"}] + end + + describe '#get_endpoint_url' do + it 'with matching name, interface and region' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + catalog.get_endpoint_url('identity', 'admin', 'regionTwo').must_equal 'http://localhost2:35357' + end + + it 'with matching name and interface using avail region' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + catalog.get_endpoint_url('network', ['dummy', 'admin']).must_equal 'http://localhost:9696' + end + + it 'with matching name and interface list' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + catalog.get_endpoint_url('network', ['dummy', 'admin']).must_equal 'http://localhost:9696' + end + + it 'with matching name and interface and several regions available' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + proc do + catalog.get_endpoint_url('identity', 'admin') + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError + end + + it 'with unmatched name for service type' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + proc do + catalog.get_endpoint_url('service', 'public') + end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError + end + + it 'with unmatched region' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + proc do + catalog.get_endpoint_url('identity', 'admin', 'regionOther') + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError + end + + it 'with unmatched interface' do + catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) + proc do + catalog.get_endpoint_url('identity', 'private') + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError + end + end +end + +describe Fog::OpenStack::Auth::Catalog::V2 do + let(:payload) do + [{ 'endpoints' => + [{ 'adminURL' => 'http://localhost', + 'region' => 'regionOne', + 'internalURL' => 'http://localhost:8888/v2.0', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], + 'endpoints_links' => [], + 'type' => 'identity', + 'name' => 'keystone' }, + { 'endpoints' => + [{ 'adminURL' => 'http://localhost', + 'region' => 'regionTwo', + 'internalURL' => 'http://localhost:9999/v2.0', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], + 'endpoints_links' => [], + 'type' => 'identity', + 'name' => 'keystone' }, + { 'endpoints' => + [{ 'adminURL' => 'http://localhost', + 'region' => 'regionOne', + 'internalURL' => 'http://localhost:7777/v1.0', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], + 'endpoints_links' => [], + 'type' => 'compute', + 'name' => 'nova' } + ] + end + + describe '#get_endpoint_url' do + it 'match name, interface and region' do + catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) + catalog.get_endpoint_url('identity', 'internal', 'regionTwo').must_equal 'http://localhost:9999/v2.0' + end + + it 'match name, interface and unique region available' do + catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) + catalog.get_endpoint_url('compute', 'internal').must_equal 'http://localhost:7777/v1.0' + end + + it 'fails when multiple region match' do + catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) + proc do + catalog.get_endpoint_url('identity', 'admin') + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError + end + + it 'with unmatched arguments' do + catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) + proc do + catalog.get_endpoint_url('test', 'unknown', 'regionOther') + end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError + end + + it 'with unmatched region' do + catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) + proc do + catalog.get_endpoint_url('identity', 'admin', 'regionOther') + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError + end + + it 'with unmatched interface' do + catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) + proc do + catalog.get_endpoint_url('identity', 'private','regionTwo') + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError + end + end +end diff --git a/unit/auth/name_test.rb b/unit/auth/name_test.rb new file mode 100644 index 000000000..1b0504109 --- /dev/null +++ b/unit/auth/name_test.rb @@ -0,0 +1,116 @@ +require 'test_helper' +require 'fog/openstack/auth/name' + +describe Fog::OpenStack::Auth::Name do + describe 'creates' do + it 'when id and name are provided' do + name = Fog::OpenStack::Auth::Name.new('default', 'Default') + name.id.must_equal 'default' + name.name.must_equal 'Default' + end + + it 'when id is null' do + name = Fog::OpenStack::Auth::Name.new(nil, 'Default') + name.id.must_be_nil + name.name.must_equal 'Default' + end + + name = Fog::OpenStack::Auth::Name.new(nil, nil) + it 'when name is null' do + name = Fog::OpenStack::Auth::Name.new('default', nil) + name.id.must_equal 'default' + name.name.must_be_nil + end + + it 'when both id and name is null' do + name = Fog::OpenStack::Auth::Name.new(nil, nil) + name.name.must_be_nil + end + end + + describe '#to_h' do + it 'returns the hash of provided attribute' do + name = Fog::OpenStack::Auth::Name.new('default', 'Default') + name.to_h(:id).must_equal ({:id => 'default'}) + name.to_h(:name).must_equal ({:name => 'Default'}) + end + end +end + +describe Fog::OpenStack::Auth::User do + describe '#password' do + it 'set/get password' do + user = Fog::OpenStack::Auth::User.new('user_id', 'User') + user.password = 'secret' + user.identity.must_equal ({:user=>{:id=>'user_id', :password=>'secret'}}) + end + end + + describe '#identity' do + describe 'succesful' do + it "with user id and user name" do + user = Fog::OpenStack::Auth::User.new('user_id', 'User') + user.password = 'secret' + user.identity.must_equal ({:user=>{:id=>'user_id', :password=>'secret'}}) + end + + it 'with user name and user domain name' do + user = Fog::OpenStack::Auth::User.new(nil, 'User') + user.password = 'secret' + user.domain = Fog::OpenStack::Auth::Name.new('default', nil) + user.identity.must_equal ({:user=>{:name=>'User', :domain=>{:id=>'default'}, :password=>'secret'}}) + end + + it 'with user name and domain name' do + user = Fog::OpenStack::Auth::User.new(nil, 'User') + user.password = 'secret' + user.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default') + user.identity.must_equal ({:user=>{:name=>'User', :domain=>{:name=>'Default'}, :password=>'secret'}}) + end + end + + describe 'raises an error' do + it 'raises an error when password is missing' do + proc do + user = Fog::OpenStack::Auth::User.new('user_id', 'User') + user.identity + end.must_raise Fog::OpenStack::Auth::CredentialsError + end + + it 'with only user name and no domain' do + proc do + user = Fog::OpenStack::Auth::User.new(nil, 'User') + user.identity + end.must_raise Fog::OpenStack::Auth::CredentialsError + end + end + end +end + +describe Fog::OpenStack::Auth::ProjectScope do + describe '#identity' do + it "when id is provided it doesn't require domain" do + project = Fog::OpenStack::Auth::ProjectScope.new('project_id', 'Project') + project.identity.must_equal ({:project=>{:id=>'project_id'}}) + end + + it 'when id is nul and name is provided it uses domain id' do + project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') + project.domain = Fog::OpenStack::Auth::Name.new('default', nil) + project.identity.must_equal ({:project=>{:name=>'Project', :domain=>{:id=>'default'}}}) + end + + it 'when id is nul and name is provided it uses domain name' do + project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') + project.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default') + project.identity.must_equal ({:project=>{:name=>'Project', :domain=>{:name=>'Default'}}}) + end + + it 'raises an error with no project id and no domain are provided' do + proc do + project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') + project.identity + end.must_raise Fog::OpenStack::Auth::CredentialsError + end + end +end diff --git a/unit/auth/token_test.rb b/unit/auth/token_test.rb new file mode 100644 index 000000000..813df96ce --- /dev/null +++ b/unit/auth/token_test.rb @@ -0,0 +1,382 @@ +require 'test_helper' +require 'auth_helper' + +describe Fog::OpenStack::Auth::Token do + describe 'V3' do + describe '#new' do + it 'fails when missing credentials' do + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {'x-subject-token'=>'token_data'}) + proc do + token = Fog::OpenStack::Auth::Token.build({}) + end.must_raise Fog::OpenStack::Auth::Token::URLError + end + + describe 'using the password method' do + describe 'with a project scope' do + it 'authenticates using a project id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_userid => 'user_id', + :openstack_api_key => 'secret', + :openstack_project_id => 'project_id', + :ssl_verify_mode => false + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data_v3'}) + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data_v3' + end + + it 'authenticates using a project name and a project domain id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_userid => 'user_id', + :openstack_api_key => 'secret', + :openstack_project_name => 'project', + :openstack_project_domain_id => 'project_domain_id' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"project_domain_id\"}}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + + it 'authenticates using a project name and a project domain name' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_username => 'user', + :openstack_user_domain_name => 'user_domain', + :openstack_api_key => 'secret', + :openstack_project_name => 'project', + :openstack_project_domain_name => 'project_domain' + } + + stub_request(:post, "http://localhost/identity/v3/auth/tokens"). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"name\":\"project_domain\"}}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + end + + describe 'with a domain scope' do + it 'authenticates using a domain id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_userid => 'user_id', + :openstack_api_key => 'secret', + :openstack_domain_id => 'domain_id' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + + it 'authenticates using a domain name' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_userid => 'user_id', + :openstack_api_key => 'secret', + :openstack_domain_name => 'domain' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + end + + describe 'unscoped' do + it 'authenticates' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_userid => 'user_id', + :openstack_api_key => 'secret', + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + end + end + + describe 'using the token method' do + describe 'unscoped' do + it 'authenticates using a project id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token', + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + end + + describe 'with a project scope' do + it 'authenticates using a project id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token', + :openstack_project_id => 'project_id' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + + it 'authenticates using a project name and a project domain id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token', + :openstack_project_name => 'project', + :openstack_project_domain_id => 'domain_id' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + end + + describe 'with a domain scope' do + it 'authenticates using a domain id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token', + :openstack_domain_id => 'domain_id' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + + it 'authenticates using a domain name' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token', + :openstack_domain_name => 'domain' + } + + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal 'token_data' + end + end + end + end + + describe 'when authenticated' do + let(:authv3_creds) do + { + :openstack_auth_url => 'http://localhost/identity', + :openstack_username => 'admin', + :openstack_api_key => 'secret', + :openstack_project_name => 'admin', + :openstack_project_domain_id => 'default' + } + end + + describe '#get' do + it 'when token has not expired' do + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token.stub :expired?, false do + token.get.must_equal 'token_data' + end + end + + it 'when token has expired' do + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token.stub :expired?, true do + token.get.must_equal 'token_data' + end + end + end + + it '#catalog' do + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token.catalog.payload.must_equal ['catalog_data'] + end + + it '#get_endpoint_url' do + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token.catalog.get_endpoint_url(%w(identity), 'public', 'regionOne').must_equal 'http://localhost' + end + end + end + + describe 'V2' do + describe '#new' do + it 'fails when missing credentials' do + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) + + proc do + Fog::OpenStack::Auth::Token.build({}) + end.must_raise Fog::OpenStack::Auth::Token::URLError + end + + describe 'using the password method' do + it 'authenticates using the tenant name' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_username => 'user', + :openstack_api_key => 'secret', + :openstack_tenant => 'tenant', + } + + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantName\":\"tenant\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' + end + + it 'authenticates using the tenant id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_username => 'user', + :openstack_api_key => 'secret', + :openstack_tenant_id => 'tenant_id', + } + + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantId\":\"tenant_id\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' + end + end + + describe 'using the token method' do + it 'authenticates using the tenant name' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token_id', + :openstack_tenant => 'tenant', + } + + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(auth) + token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' + end + + it 'authenticates using the tenant id' do + auth = { + :openstack_auth_url => 'http://localhost/identity', + :openstack_auth_token => 'token_id', + :openstack_tenant_id => 'tenant_id', + } + + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(auth) + end + end + end + + describe 'when authenticated' do + let(:authv2_creds) do + { + :openstack_auth_url => 'http://localhost/identity', + :openstack_username => 'admin', + :openstack_api_key => 'secret', + :openstack_tenant => 'admin' + } + end + + describe '#get' do + it 'when token has not expired' do + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token.stub :expired?, false do + token.get.must_equal 'token_not_expired' + end + end + + it 'when token has expired' do + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token.stub :expired?, true do + token.get.must_equal 'token_expired' + end + end + end + + it '#catalog' do + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {}) + + token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token.catalog.payload.must_equal ['catalog_data'] + end + + it '#get_endpoint_url' do + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + + token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token.catalog.get_endpoint_url(%w(identity), 'public', 'regionOne').must_equal 'http://localhost' + end + end + end +end diff --git a/unit/auth_helper.rb b/unit/auth_helper.rb new file mode 100644 index 000000000..69119cf85 --- /dev/null +++ b/unit/auth_helper.rb @@ -0,0 +1,52 @@ +def auth_response_v3(type, name) + { 'token' => + { 'methods' => ['password'], + 'roles' => [{ 'id' => 'id_roles', 'name' => 'admin' }], + 'expires_at' => '2017-11-29T07:45:29.908554Z', + 'project' => { 'domain' => { 'id' => 'default', 'name' => 'Default' }, 'id' => 'project_id', 'name' => 'admin' }, + 'catalog' => + [{ 'endpoints' => + [{ 'region_id' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', + 'interface' => 'internal', + 'id' => 'id_endpoint_internal' }, + { 'region_id' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', + 'interface' => 'public', + 'id' => 'id_endpoint_public' }, + { 'region_id' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', + 'interface' => 'admin', + 'id' => 'id_endpoint_admin' }], + 'type' => type, + 'id' => 'id_endpoints', + 'name' => name }], + 'user' => { 'domain' => { 'id' => 'default', 'name' => 'Default' }, 'id' => 'id_user', 'name' => 'admin' }, + 'audit_ids' => ['id_audits'], + 'issued_at' => '2017-11-29T06:45:29.908578Z' } } +end + +def auth_response_v2(type, name) + { 'access' => + { 'token' => + { 'issued_at' => '2017-12-05T10:44:31.454741Z', + 'expires' => '2017-12-05T11:44:31Z', + 'id' => '4ae647d3a5294690a3c29bc658e17e26', + 'tenant' => { 'description' => 'admin tenant', 'enabled' => true, 'id' => 'tenant_id', 'name' => 'admin' }, + 'audit_ids' => ['Ye0Rq1HzTk2ggUAg8nDGbQ'] }, + 'serviceCatalog' => + [{ 'endpoints' => + [{ 'adminURL' => 'http://localhost', + 'region' => 'regionOne', + 'internalURL' => 'http://localhost', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], + 'endpoints_links' => [], + 'type' => type, + 'name' => name }], + 'user' => { 'username' => 'admin', 'roles_links' => [], 'id' => 'user_id', 'roles' => [{ 'name' => 'admin' }], 'name' => 'admin' }, + 'metadata' => { 'is_admin' => 0, 'roles' => ['role_id'] } } } +end diff --git a/unit/test_helper.rb b/unit/test_helper.rb new file mode 100644 index 000000000..6b12ae3ad --- /dev/null +++ b/unit/test_helper.rb @@ -0,0 +1,6 @@ +require 'minitest/autorun' +require 'webmock/minitest' + +require 'fog/core' +require 'fog/json' +require 'fog/openstack/auth/token' From cfca6a734f6b4467b1c7efa98b497462040c3a5d Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 13 Aug 2018 20:06:46 +1000 Subject: [PATCH 030/129] Refactors bootstraping --- lib/fog/baremetal/openstack.rb | 28 +- lib/fog/compute/openstack.rb | 26 +- .../openstack/requests/list_tenants.rb | 1 + lib/fog/container_infra/openstack.rb | 29 +- lib/fog/dns/openstack/v1.rb | 22 +- lib/fog/dns/openstack/v2.rb | 27 +- lib/fog/event/openstack.rb | 29 +- lib/fog/identity/openstack.rb | 47 +- lib/fog/identity/openstack/v2.rb | 6 +- lib/fog/identity/openstack/v3.rb | 14 +- lib/fog/image/openstack/v1.rb | 27 +- lib/fog/image/openstack/v2.rb | 27 +- lib/fog/introspection/openstack.rb | 23 +- lib/fog/key_manager/openstack.rb | 52 +- lib/fog/metering/openstack.rb | 29 +- lib/fog/metric/openstack.rb | 31 +- lib/fog/monitoring/openstack.rb | 15 +- lib/fog/network/openstack.rb | 29 +- .../network/openstack/requests/set_tenant.rb | 1 - lib/fog/nfv/openstack.rb | 28 +- lib/fog/openstack.rb | 443 ++---------------- lib/fog/openstack/core.rb | 53 ++- lib/fog/orchestration/openstack.rb | 18 +- lib/fog/planning/openstack.rb | 32 +- lib/fog/shared_file_system/openstack.rb | 32 +- lib/fog/storage/openstack.rb | 2 +- lib/fog/volume/openstack/v1.rb | 27 +- lib/fog/volume/openstack/v2.rb | 27 +- lib/fog/workflow/openstack/v2.rb | 23 +- .../openstack/dns_v2/common_setup.yml | 9 +- .../openstack/identity_v3/authv3_a.yml | 4 +- .../openstack/identity_v3/authv3_b.yml | 4 +- .../openstack/identity_v3/authv3_c.yml | 95 +++- .../openstack/identity_v3/authv3_project.yml | 4 +- .../openstack/identity_v3/authv3_token.yml | 22 +- .../openstack/identity_v3/authv3_unscoped.yml | 24 +- .../identity_v3/authv3_unscoped_reauth.yml | 16 +- .../openstack/identity_v3/common_setup.yml | 10 +- .../openstack/image_v1/common_setup.yml | 6 +- .../openstack/image_v2/common_setup.yml | 6 +- .../openstack/monitoring/common_setup.yml | 4 +- .../openstack/network/common_setup.yml | 22 +- .../openstack/network/token_expiration.yml | 2 +- .../shared_file_system/common_setup.yml | 2 +- .../openstack/volume/common_setup.yml | 28 +- .../volume/volume_transfer_and_accept.yml | 54 +-- .../volume/volume_transfer_and_delete.yml | 34 +- .../openstack/volume_v1/common_setup.yml | 15 +- .../volume_v1/volume_transfer_and_accept.yml | 52 +- .../openstack/volume_v2/common_setup.yml | 22 +- .../volume_v2/volume_transfer_and_accept.yml | 54 +-- .../volume_v2/volume_transfer_and_delete.yml | 32 +- spec/identity_v3_spec.rb | 25 +- spec/network_spec.rb | 2 +- spec/shared_context.rb | 31 +- spec/volume_spec.rb | 93 ++-- test/authenticate_tests.rb | 14 +- test/microversion_test.rb | 14 +- 58 files changed, 587 insertions(+), 1261 deletions(-) diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/baremetal/openstack.rb index b2322b9fa..32988e6b5 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/baremetal/openstack.rb @@ -248,35 +248,15 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(baremetal).collect(&:freeze).freeze + # NOTE: uncommenting this should be treated as api-change! # def self.not_found_class # Fog::Baremetal::OpenStack::NotFound # end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['baremetal'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - private - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = "/" + Fog::OpenStack.get_supported_version(SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options) - end + def default_path_prefix + 'v1' end end end diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index 6aa2b4f59..663a44fe5 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -379,33 +379,21 @@ def reset_data class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(compute).collect(&:freeze).freeze + def self.not_found_class Fog::Compute::OpenStack::NotFound end + def default_path_prefix + 'v2.1' + end + def initialize(options = {}) @supported_versions = SUPPORTED_VERSIONS @supported_microversion = SUPPORTED_MICROVERSION @microversion_key = 'X-OpenStack-Nova-API-Version' - - initialize_identity options - - @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity' - - @openstack_service_type = options[:openstack_service_type] || %w(nova compute) - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - - unless @path =~ %r{/(v2|v2\.0|v2\.1)} - raise Fog::OpenStack::Errors::ServiceUnavailable, - "OpenStack compute binding only supports version v2 and v2.1" - end - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + super end end end diff --git a/lib/fog/compute/openstack/requests/list_tenants.rb b/lib/fog/compute/openstack/requests/list_tenants.rb index 59a0714cb..cd249f491 100644 --- a/lib/fog/compute/openstack/requests/list_tenants.rb +++ b/lib/fog/compute/openstack/requests/list_tenants.rb @@ -3,6 +3,7 @@ module Compute class OpenStack class Real def list_tenants + # TODO: replace with standard request (this is the only place using @identity_connection) response = @identity_connection.request(:expects => [200, 204], :headers => {'Content-Type' => 'application/json', 'Accept' => 'application/json', diff --git a/lib/fog/container_infra/openstack.rb b/lib/fog/container_infra/openstack.rb index 770660a4f..7509db355 100644 --- a/lib/fog/container_infra/openstack.rb +++ b/lib/fog/container_infra/openstack.rb @@ -122,41 +122,20 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(container-infra).collect(&:freeze).freeze + def self.not_found_class Fog::ContainerInfra::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['container-infra'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_path_prefix + 'v1' end def request(options = {}) options[:headers] = {'OpenStack-API-Version' => "container-infra #{SUPPORTED_MICROVERSION}"} super(options) end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end - end end end end diff --git a/lib/fog/dns/openstack/v1.rb b/lib/fog/dns/openstack/v1.rb index 3481d828a..45278d777 100644 --- a/lib/fog/dns/openstack/v1.rb +++ b/lib/fog/dns/openstack/v1.rb @@ -98,28 +98,14 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(dns).collect(&:freeze).freeze + def self.not_found_class Fog::DNS::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['dns'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - # version explicitly set to allow usage also in 'DEPRECATED' mitaka version, - # where f.i. quota modification was not possible at the time of creation - @path = '/v1' unless @path =~ /v1/ + def default_path_prefix + 'v1' end end end diff --git a/lib/fog/dns/openstack/v2.rb b/lib/fog/dns/openstack/v2.rb index 82401a7d2..3f8c8148f 100644 --- a/lib/fog/dns/openstack/v2.rb +++ b/lib/fog/dns/openstack/v2.rb @@ -307,33 +307,14 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(dns).collect(&:freeze).freeze + def self.not_found_class Fog::DNS::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['dns'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}/", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end + def default_path_prefix + 'v2' end end end diff --git a/lib/fog/event/openstack.rb b/lib/fog/event/openstack.rb index 11f5410db..ef1b98caa 100644 --- a/lib/fog/event/openstack.rb +++ b/lib/fog/event/openstack.rb @@ -84,35 +84,14 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(event).collect(&:freeze).freeze + def self.not_found_class Fog::Event::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['event'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = "/" + Fog::OpenStack.get_supported_version( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end + def default_path_prefix + 'v2' end end end diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index d8287b2a9..8827c7353 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -48,39 +48,10 @@ def initialize(options = {}) class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE_V3 = %w(identity_v3 identityv3 identity).collect(&:freeze).freeze - DEFAULT_SERVICE_TYPE = %w(identity).collect(&:freeze).freeze - def self.not_found_class Fog::Identity::OpenStack::NotFound end - def initialize(options = {}) - if options.respond_to?(:config_service?) && options.config_service? - configure(options) - return - end - - initialize_identity(options) - - @openstack_service_type = options[:openstack_service_type] || default_service_type(options) - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - initialize_endpoint_path_matches(options) - - authenticate - - if options[:openstack_identity_prefix] - @path = "/#{options[:openstack_identity_prefix]}/#{@path}" - end - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - def config_service? true end @@ -89,23 +60,11 @@ def config self end - private - - def default_service_type(options) - unless options[:openstack_identity_prefix] - if @openstack_auth_uri.path =~ %r{/v3} || - (options[:openstack_endpoint_path_matches] && options[:openstack_endpoint_path_matches] =~ '/v3') - return DEFAULT_SERVICE_TYPE_V3 - end - end - DEFAULT_SERVICE_TYPE + def default_endpoint_type + 'admin' end - def initialize_endpoint_path_matches(options) - if options[:openstack_endpoint_path_matches] - @openstack_endpoint_path_matches = options[:openstack_endpoint_path_matches] - end - end + private def configure(source) source.instance_variables.each do |v| diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/identity/openstack/v2.rb index 6529a9300..7e93a9591 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/identity/openstack/v2.rb @@ -169,10 +169,10 @@ def credentials end class Real < Fog::Identity::OpenStack::Real - private + DEFAULT_SERVICE_TYPE = %w(identity_v2 identityv2 identity).collect(&:freeze).freeze - def default_service_type(_) - DEFAULT_SERVICE_TYPE + def default_path_prefix + 'v2.0' end end end diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/identity/openstack/v3.rb index 39a7d0294..f438ad9e5 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/identity/openstack/v3.rb @@ -142,18 +142,10 @@ def self.get_api_version(uri, connection_options = {}) end class Real < Fog::Identity::OpenStack::Real - private + DEFAULT_SERVICE_TYPE = %w(identity_v3 identityv3 identity).collect(&:freeze).freeze - def default_service_type(_) - DEFAULT_SERVICE_TYPE_V3 - end - - def initialize_endpoint_path_matches(options) - if options[:openstack_endpoint_path_matches] - @openstack_endpoint_path_matches = options[:openstack_endpoint_path_matches] - else - @openstack_endpoint_path_matches = %r{/v3} unless options[:openstack_identity_prefix] - end + def default_path_prefix + 'v3' end end end diff --git a/lib/fog/image/openstack/v1.rb b/lib/fog/image/openstack/v1.rb index 78fd1f334..2e9be91cd 100644 --- a/lib/fog/image/openstack/v1.rb +++ b/lib/fog/image/openstack/v1.rb @@ -98,33 +98,18 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(image).collect(&:freeze).freeze + def self.not_found_class Fog::Image::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['image'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_endpoint_type + 'admin' end - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options) - end + def default_path_prefix + 'v1' end end end diff --git a/lib/fog/image/openstack/v2.rb b/lib/fog/image/openstack/v2.rb index e874a96fd..100861897 100644 --- a/lib/fog/image/openstack/v2.rb +++ b/lib/fog/image/openstack/v2.rb @@ -106,33 +106,18 @@ class Upload # Exists for image_v2_upload_spec "describe" class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(image).collect(&:freeze).freeze + def self.not_found_class Fog::Image::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['image'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_endpoint_type + 'admin' end - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options) - end + def default_path_prefix + 'v2' end end end diff --git a/lib/fog/introspection/openstack.rb b/lib/fog/introspection/openstack.rb index 085ed8de5..03102bc6b 100644 --- a/lib/fog/introspection/openstack.rb +++ b/lib/fog/introspection/openstack.rb @@ -73,29 +73,14 @@ def reset_data class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(baremetal-introspection).collect(&:freeze).freeze + def self.not_found_class Fog::Introspection::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['baremetal-introspection'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = "/v1" - end + def default_path_prefix + 'v1' end end end diff --git a/lib/fog/key_manager/openstack.rb b/lib/fog/key_manager/openstack.rb index 84c9a55fb..04565a207 100644 --- a/lib/fog/key_manager/openstack.rb +++ b/lib/fog/key_manager/openstack.rb @@ -92,59 +92,15 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(key-manager).collect(&:freeze).freeze + def self.not_found_class Fog::KeyManager::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['key-manager'] - @openstack_service_name = options[:openstack_service_name] - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - @path.sub!(%r{/$}, '') - unless @path.match(SUPPORTED_VERSIONS) - @path = supported_version(SUPPORTED_VERSIONS, @openstack_management_uri, @auth_token, @connection_options) - end + def default_path_prefix + 'v1' end - - def supported_version(supported_versions, uri, auth_token, connection_options = {}) - connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}", false, connection_options) - response = connection.request({ :expects => [200, 204, 300], - :headers => {'Content-Type' => 'application/json', - 'Accept' => 'application/json', - 'X-Auth-Token' => auth_token}, - :method => 'GET' - }) - - body = Fog::JSON.decode(response.body) - version = nil - - versions = body.fetch('versions',{}).fetch('values',[]) - versions.each do |v| - if v.fetch('id', "").match(supported_versions) && - ['current', 'supported', 'stable'].include?(v.fetch('status','').downcase) - version = v['id'] - end - end - - if !version || version.empty? - raise Fog::OpenStack::Errors::ServiceUnavailable.new( - "OpenStack service only supports API versions #{supported_versions.inspect}") - end - - version - end - end end end diff --git a/lib/fog/metering/openstack.rb b/lib/fog/metering/openstack.rb index 2e5705c47..154d2e092 100644 --- a/lib/fog/metering/openstack.rb +++ b/lib/fog/metering/openstack.rb @@ -96,35 +96,18 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(metering).collect(&:freeze).freeze + def self.not_found_class Fog::Metering::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['metering'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_endpoint_type + 'admin' end - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = "/" + Fog::OpenStack.get_supported_version( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end + def default_path_prefix + 'v2' end end end diff --git a/lib/fog/metric/openstack.rb b/lib/fog/metric/openstack.rb index 5b88e4ee1..4717ae132 100644 --- a/lib/fog/metric/openstack.rb +++ b/lib/fog/metric/openstack.rb @@ -90,35 +90,14 @@ def credentials class Real include Fog::OpenStack::Core - def self.not_found_class - Fog::Metric::OpenStack::NotFound - end - - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['metric'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL' + DEFAULT_SERVICE_TYPE = %w(metric).collect(&:freeze).freeze - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_path_prefix + 'v1' end - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end + def self.not_found_class + Fog::Metric::OpenStack::NotFound end end end diff --git a/lib/fog/monitoring/openstack.rb b/lib/fog/monitoring/openstack.rb index 0436b4109..47a651140 100644 --- a/lib/fog/monitoring/openstack.rb +++ b/lib/fog/monitoring/openstack.rb @@ -74,22 +74,11 @@ class OpenStack < Fog::Service class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(monitoring).collect(&:freeze).freeze + def self.not_found_class Fog::Monitoring::OpenStack::NotFound end - - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['monitoring'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end end end end diff --git a/lib/fog/network/openstack.rb b/lib/fog/network/openstack.rb index ad653831c..a92f5b9fb 100644 --- a/lib/fog/network/openstack.rb +++ b/lib/fog/network/openstack.rb @@ -3,8 +3,6 @@ module Fog module Network class OpenStack < Fog::Service - SUPPORTED_VERSIONS = /v2(\.0)*/ - requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -445,33 +443,14 @@ def reset_data class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(network).collect(&:freeze).freeze + def self.not_found_class Fog::Network::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['network'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - @path.sub!(%r{/$}, '') - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options) - end + def default_path_prefix + 'v2.0' end end end diff --git a/lib/fog/network/openstack/requests/set_tenant.rb b/lib/fog/network/openstack/requests/set_tenant.rb index 4427abdb1..81dba7308 100644 --- a/lib/fog/network/openstack/requests/set_tenant.rb +++ b/lib/fog/network/openstack/requests/set_tenant.rb @@ -6,7 +6,6 @@ def set_tenant(tenant) @openstack_must_reauthenticate = true @openstack_tenant = tenant.to_s authenticate - set_api_path end end diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/nfv/openstack.rb index c340cc7e2..be5d8cfb3 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/nfv/openstack.rb @@ -98,34 +98,14 @@ def reset_data class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(servicevm).collect(&:freeze).freeze + def self.not_found_class Fog::NFV::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['servicevm'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = "/" + Fog::OpenStack.get_supported_version( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end + def default_path_prefix + 'v1.0' end end end diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index 6e708d5ef..035e0b83a 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -84,6 +84,8 @@ class OpenStack end module OpenStack + require 'fog/openstack/auth/token' + autoload :VERSION, 'fog/openstack/version' autoload :Core, 'fog/openstack/core' @@ -124,423 +126,50 @@ def self.clear_token_cache end def self.authenticate(options, connection_options = {}) - case options[:openstack_auth_uri].path - when /v1(\.\d+)?/ - authenticate_v1(options, connection_options) - when /v2(\.\d+)?/ - authenticate_v2(options, connection_options) - when /v3(\.\d+)?/ - authenticate_v3(options, connection_options) - else - authenticate_v2(options, connection_options) - end - end - - # legacy v1.0 style auth - def self.authenticate_v1(options, connection_options = {}) - uri = options[:openstack_auth_uri] - connection = Fog::Core::Connection.new(uri.to_s, false, connection_options) - @openstack_api_key = options[:openstack_api_key] - @openstack_username = options[:openstack_username] - - response = connection.request({ - :expects => [200, 204], - :headers => { - 'X-Auth-Key' => @openstack_api_key, - 'X-Auth-User' => @openstack_username - }, - :method => 'GET', - :path => (uri.path and not uri.path.empty?) ? uri.path : 'v1.0' - }) - - return { - :token => response.headers['X-Auth-Token'], - :server_management_url => response.headers['X-Server-Management-Url'] || response.headers['X-Storage-Url'], - :identity_public_endpoint => response.headers['X-Keystone'] - } - end - - # Keystone Style Auth - def self.authenticate_v2(options, connection_options = {}) - uri = options[:openstack_auth_uri] - tenant_name = options[:openstack_tenant] - service_type = options[:openstack_service_type] - service_name = options[:openstack_service_name] - identity_service_type = options[:openstack_identity_service_type] - endpoint_type = (options[:openstack_endpoint_type] || 'publicURL').to_s - openstack_region = options[:openstack_region] - - body = retrieve_tokens_v2(options, connection_options) - service = get_service(body, service_type, service_name) - - options[:unscoped_token] = body['access']['token']['id'] - - unless service - unless tenant_name - response = Fog::Core::Connection.new( - "#{uri.scheme}://#{uri.host}:#{uri.port}/v2.0/tenants", false, connection_options).request({ - :expects => [200, 204], - :headers => {'Content-Type' => 'application/json', - 'Accept' => 'application/json', - 'X-Auth-Token' => body['access']['token']['id']}, - :method => 'GET' - }) - - body = Fog::JSON.decode(response.body) - if body['tenants'].empty? - raise Fog::Errors::NotFound.new('No Tenant Found') - else - options[:openstack_tenant] = body['tenants'].first['name'] - end - end - - body = retrieve_tokens_v2(options, connection_options) - service = get_service(body, service_type, service_name) - - end - - unless service - available = body['access']['serviceCatalog'].map { |endpoint| - endpoint['type'] - }.sort.join ', ' - - missing = service_type.join ', ' - - message = "Could not find service #{missing}. Have #{available}" - - raise Fog::Errors::NotFound, message - end - - service['endpoints'] = service['endpoints'].select do |endpoint| - endpoint['region'] == openstack_region - end if openstack_region - - if service['endpoints'].empty? - raise Fog::Errors::NotFound.new("No endpoints available for region '#{openstack_region}'") - end if openstack_region + # TODO: connection_options - regions = service["endpoints"].map{ |e| e['region'] }.uniq - if regions.count > 1 - raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions.join(',')}'") + if options[:openstack_endpoint_type] =~ /URL/ + options[:openstack_endpoint_type].gsub!(/URL/, '') end - identity_service = get_service(body, identity_service_type) if identity_service_type - tenant = body['access']['token']['tenant'] - user = body['access']['user'] - - management_url = service['endpoints'].find{|s| s[endpoint_type]}[endpoint_type] - identity_url = identity_service['endpoints'].find{|s| s['publicURL']}['publicURL'] if identity_service - - { - :user => user, - :tenant => tenant, - :identity_public_endpoint => identity_url, - :server_management_url => management_url, - :token => body['access']['token']['id'], - :expires => body['access']['token']['expires'], - :current_user_id => body['access']['user']['id'], - :unscoped_token => options[:unscoped_token] - } - end + token = Fog::OpenStack::Auth::Token.build(options) - # Keystone Style Auth - def self.authenticate_v3(options, connection_options = {}) - uri = options[:openstack_auth_uri] - project_name = options[:openstack_project_name] - service_type = options[:openstack_service_type] - service_name = options[:openstack_service_name] identity_service_type = options[:openstack_identity_service_type] - endpoint_type = map_endpoint_type(options[:openstack_endpoint_type] || 'publicURL') - openstack_region = options[:openstack_region] - - token, body = retrieve_tokens_v3 options, connection_options - - service = get_service_v3(body, service_type, service_name, openstack_region, options) - - options[:unscoped_token] = token - - unless service - unless project_name - request_body = { - :expects => [200], - :headers => {'Content-Type' => 'application/json', - 'Accept' => 'application/json', - 'X-Auth-Token' => token}, - :method => 'GET' - } - user_id = body['token']['user']['id'] - project_uri = uri.clone - project_uri.path = uri.path.sub('/auth/tokens', "/users/#{user_id}/projects") - project_uri_param = "#{project_uri.scheme}://#{project_uri.host}:#{project_uri.port}#{project_uri.path}" - response = Fog::Core::Connection.new(project_uri_param, false, connection_options).request(request_body) - - projects_body = Fog::JSON.decode(response.body) - if projects_body['projects'].empty? - options[:openstack_domain_id] = body['token']['user']['domain']['id'] - else - options[:openstack_project_id] = projects_body['projects'].first['id'] - options[:openstack_project_name] = projects_body['projects'].first['name'] - options[:openstack_domain_id] = projects_body['projects'].first['domain_id'] - end - end - - token, body = retrieve_tokens_v3(options, connection_options) - service = get_service_v3(body, service_type, service_name, openstack_region, options) - end - # If no identity endpoint is found, try the auth uri (slicing /auth/tokens) - # It covers the case where identityv3 endpoint is not present in the catalog but we have to use it - unless service - if service_type.include? "identity" - identity_uri = uri.to_s.sub('/auth/tokens', '') - response = Fog::Core::Connection.new(identity_uri, false, connection_options).request({:method => 'GET'}) - if response.status == 200 - service = { - "endpoints" => [{ - "url" => identity_uri, - "region" => openstack_region, - "interface" => endpoint_type - }], - "type" => service_type, - "name" => service_name - } - end - end + #TODO: remove as not seemed used + if identity_service_type + identity_url = nil end - unless service - available_services = body['token']['catalog'].map { |service| - service['type'] - }.sort.join ', ' - - available_regions = body['token']['catalog'].map { |service| - service['endpoints'].map { |endpoint| - endpoint['region'] - }.uniq - }.uniq.sort.join ', ' - - missing = service_type.join ', ' - - message = "Could not find service #{missing}#{(' in region '+openstack_region) if openstack_region}."+ - " Have #{available_services}#{(' in regions '+available_regions) if openstack_region}" - - raise Fog::Errors::NotFound, message - end - - service['endpoints'] = service['endpoints'].select do |endpoint| - endpoint['region'] == openstack_region && endpoint['interface'] == endpoint_type - end if openstack_region - - if service['endpoints'].empty? - raise Fog::Errors::NotFound.new("No endpoints available for region '#{openstack_region}'") - end if openstack_region - - regions = service["endpoints"].map { |e| e['region'] }.uniq - if regions.count > 1 - raise Fog::Errors::NotFound.new("Multiple regions available choose one of these '#{regions.join(',')}'") - end - - identity_service = get_service_v3(body, identity_service_type, nil, nil, :openstack_endpoint_path_matches => /\/v3/) if identity_service_type - - management_url = service['endpoints'].find { |e| e['interface']==endpoint_type }['url'] - identity_url = identity_service['endpoints'].find { |e| e['interface']=='public' }['url'] if identity_service + endpoint_type = options[:openstack_endpoint_type] + region = options[:openstack_region] + service_type = options[:openstack_service_type] - if body['token']['project'] - tenant = body['token']['project'] - elsif body['token']['user']['project'] - tenant = body['token']['user']['project'] + if token.catalog + management_url = token.catalog.get_endpoint_url(service_type, endpoint_type, region) + else + management_url = options[:openstack_auth_url] end return { - :user => body['token']['user']['name'], - :tenant => tenant, - :identity_public_endpoint => identity_url, - :server_management_url => management_url, - :token => token, - :expires => body['token']['expires_at'], - :current_user_id => body['token']['user']['id'], - :unscoped_token => options[:unscoped_token] - } - end - - def self.get_service(body, service_type=[], service_name=nil) - if not body['access'].nil? - body['access']['serviceCatalog'].find do |s| - if service_name.nil? or service_name.empty? - service_type.include?(s['type']) - else - service_type.include?(s['type']) and s['name'] == service_name - end - end - elsif not body['token']['catalog'].nil? - body['token']['catalog'].find do |s| - if service_name.nil? or service_name.empty? - service_type.include?(s['type']) - else - service_type.include?(s['type']) and s['name'] == service_name - end - end + :user => token.user['name'], + :current_user_id => token.user['id'], + :tenant => token.tenant, - end - end + :identity_public_endpoint => identity_url, + :openstack_management_url => management_url, - def self.retrieve_tokens_v2(options, connection_options = {}) - api_key = options[:openstack_api_key].to_s - username = options[:openstack_username].to_s - tenant_name = options[:openstack_tenant].to_s - auth_token = options[:openstack_auth_token] || options[:unscoped_token] - uri = options[:openstack_auth_uri] - omit_default_port = options[:openstack_auth_omit_default_port] - - identity_v2_connection = Fog::Core::Connection.new(uri.to_s, false, connection_options) - request_body = {:auth => Hash.new} - - if auth_token - request_body[:auth][:token] = { - :id => auth_token - } - else - request_body[:auth][:passwordCredentials] = { - :username => username, - :password => api_key - } - end - request_body[:auth][:tenantName] = tenant_name if tenant_name - - request = { - :expects => [200, 204], - :headers => {'Content-Type' => 'application/json'}, - :body => Fog::JSON.encode(request_body), - :method => 'POST', - :path => (uri.path and not uri.path.empty?) ? uri.path : 'v2.0' + :token => token.token, + :expires => token.expires, + :unscoped_token => token.token, } - request[:omit_default_port] = omit_default_port unless omit_default_port.nil? - - response = identity_v2_connection.request(request) - - Fog::JSON.decode(response.body) - end - - def self.retrieve_tokens_v3(options, connection_options = {}) - - api_key = options[:openstack_api_key].to_s - username = options[:openstack_username].to_s - userid = options[:openstack_userid] - domain_id = options[:openstack_domain_id] - domain_name = options[:openstack_domain_name] - project_domain = options[:openstack_project_domain] - project_domain_id = options[:openstack_project_domain_id] - user_domain = options[:openstack_user_domain] - user_domain_id = options[:openstack_user_domain_id] - project_name = options[:openstack_project_name] - project_id = options[:openstack_project_id] - auth_token = options[:openstack_auth_token] || options[:unscoped_token] - uri = options[:openstack_auth_uri] - omit_default_port = options[:openstack_auth_omit_default_port] - cache_ttl = options[:openstack_cache_ttl] || 0 - - connection = Fog::Core::Connection.new(uri.to_s, false, connection_options) - request_body = {:auth => {}} - - scope = {} - - if project_name || project_id - scope[:project] = if project_id.nil? then - if project_domain || project_domain_id - {:name => project_name, :domain => project_domain_id.nil? ? {:name => project_domain} : {:id => project_domain_id}} - else - {:name => project_name, :domain => domain_id.nil? ? {:name => domain_name} : {:id => domain_id}} - end - else - {:id => project_id} - end - elsif domain_name || domain_id - scope[:domain] = domain_id.nil? ? {:name => domain_name} : {:id => domain_id} - else - # unscoped token - end - - if auth_token - request_body[:auth][:identity] = { - :methods => %w{token}, - :token => { - :id => auth_token - } - } - else - request_body[:auth][:identity] = { - :methods => %w{password}, - :password => { - :user => { - :password => api_key - } - } - } - - if userid - request_body[:auth][:identity][:password][:user][:id] = userid - else - if user_domain || user_domain_id - request_body[:auth][:identity][:password][:user].merge! :domain => user_domain_id.nil? ? {:name => user_domain} : {:id => user_domain_id} - elsif domain_name || domain_id - request_body[:auth][:identity][:password][:user].merge! :domain => domain_id.nil? ? {:name => domain_name} : {:id => domain_id} - end - request_body[:auth][:identity][:password][:user][:name] = username - end - - end - request_body[:auth][:scope] = scope unless scope.empty? - - path = (uri.path and not uri.path.empty?) ? uri.path : 'v3' - - response, expires = Fog::OpenStack.token_cache[{:body => request_body, :path => path}] if cache_ttl > 0 - - unless response && expires > Time.now - request = { - :expects => [201], - :headers => {'Content-Type' => 'application/json'}, - :body => Fog::JSON.encode(request_body), - :method => 'POST', - :path => path - } - request[:omit_default_port] = omit_default_port unless omit_default_port.nil? - - response = connection.request(request) - if cache_ttl > 0 - cache = Fog::OpenStack.token_cache - cache[{:body => request_body, :path => path}] = response, Time.now + cache_ttl - Fog::OpenStack.token_cache = cache - end - end - - [response.headers["X-Subject-Token"], Fog::JSON.decode(response.body)] - end - - def self.get_service_v3(hash, service_type=[], service_name=nil, region=nil, options={}) - - # Find all services matching any of the types in service_type, filtered by service_name if it's non-nil - services = hash['token']['catalog'].find_all do |s| - if service_name.nil? or service_name.empty? - service_type.include?(s['type']) - else - service_type.include?(s['type']) and s['name'] == service_name - end - end if hash['token']['catalog'] - - # Filter the found services by region (if specified) and whether the endpoint path matches the given regex (e.g. /\/v3/) - services.find do |s| - s['endpoints'].any? { |ep| endpoint_region?(ep, region) && endpoint_path_match?(ep, options[:openstack_endpoint_path_matches])} - end if services - end def self.endpoint_region?(endpoint, region) region.nil? || endpoint['region'] == region end - def self.endpoint_path_match?(endpoint, match_regex) - match_regex.nil? || URI(endpoint['url']).path =~ match_regex - end + #TODO: Remove endpoint_path_matches def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {}) supported_version = get_version(supported_versions, uri, auth_token, connection_options) @@ -571,24 +200,16 @@ def self.escape(str, extra_exclude_chars = '') end end - def self.map_endpoint_type type - case type - when "publicURL" - "public" - when "internalURL" - "internal" - when "adminURL" - "admin" - end - - end - def self.get_version(supported_versions, uri, auth_token, connection_options = {}) version_cache = "#{uri}#{supported_versions}" return @version[version_cache] if @version && @version[version_cache] - connection = Fog::Core::Connection.new("#{uri.scheme}://#{uri.host}:#{uri.port}#{uri.path}/", - false, - connection_options) + + # Clear version suffix from path + # This is needed because when catalog endpoint is not top level + # or '/' to allow version discovery + path = uri.path.gsub(/\/v([1-9]+\d*)(\.[1-9]+\d*)*.*$/, '/') + url = "#{uri.scheme}://#{uri.host}:#{uri.port}#{path}" + connection = Fog::Core::Connection.new(url, false, connection_options) response = connection.request( :expects => [200, 204, 300], :headers => {'Content-Type' => 'application/json', diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 3b62ad514..4eb8b17fd 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -27,7 +27,6 @@ def initialize_identity(options) options.select { |x| x.to_s.start_with? 'openstack' }.each do |openstack_param, value| instance_variable_set "@#{openstack_param}".to_sym, value end - @auth_token ||= options[:openstack_auth_token] @openstack_identity_public_endpoint = options[:openstack_identity_endpoint] @@ -87,7 +86,6 @@ def request(params, parse_json = true) if error.response.body != 'Bad username or password' && @openstack_can_reauthenticate && !retried @openstack_must_reauthenticate = true authenticate - set_api_path retried = true retry # bad credentials or token renewal not possible @@ -111,10 +109,6 @@ def request(params, parse_json = true) response end - def set_api_path - # if the service supports multiple versions, do the selection here - end - def set_microversion @microversion_key ||= 'Openstack-API-Version'.freeze @microversion_service_type ||= @openstack_service_type.first @@ -172,12 +166,51 @@ def openstack_options options end + def initialize(options = {}) + setup(options) + authenticate + @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) + end + + def api_path_prefix + path = '' + if @openstack_management_uri && @openstack_management_uri.path != '/' + path = @openstack_management_uri.path + end + unless default_path_prefix.empty? + path << '/' + default_path_prefix + end + path + end + + def default_endpoint_type + 'public' + end + + def default_path_prefix + '' + end + + def setup(options) + if options.respond_to?(:config_service?) && options.config_service? + configure(options) + return + end + + initialize_identity(options) + @openstack_service_type = options[:openstack_service_type] || self.class::DEFAULT_SERVICE_TYPE + @openstack_endpoint_type = options[:openstack_endpoint_type] || default_endpoint_type + @connection_options = options[:connection_options] || {} + @persistent = options[:persistent] || false + end + def authenticate if !@openstack_management_url || @openstack_must_reauthenticate options = openstack_options options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token + options[:openstack_service_type] = @openstack_service_type credentials = Fog::OpenStack.authenticate(options, @connection_options) @@ -187,19 +220,20 @@ def authenticate @openstack_must_reauthenticate = false @auth_token = credentials[:token] - @openstack_management_url = credentials[:server_management_url] + @openstack_management_url = credentials[:openstack_management_url] @unscoped_token = credentials[:unscoped_token] else @auth_token = @openstack_auth_token end + @openstack_management_uri = URI.parse(@openstack_management_url) + #TODO: Remove @host = @openstack_management_uri.host - @path = @openstack_management_uri.path - @path.sub!(%r{/$}, '') @port = @openstack_management_uri.port @scheme = @openstack_management_uri.scheme + # TODO: Remove - Not use but list_tenants # Not all implementations have identity service in the catalog if @openstack_identity_public_endpoint || @openstack_management_url @identity_connection = Fog::Core::Connection.new( @@ -210,6 +244,7 @@ def authenticate # both need to be set in service's initialize for microversions to work set_microversion if @supported_microversion && @supported_versions + @path = api_path_prefix true end diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/orchestration/openstack.rb index 31541fb66..6d1dcf594 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/orchestration/openstack.rb @@ -131,25 +131,11 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(orchestration).collect(&:freeze).freeze + def self.not_found_class Fog::Orchestration::OpenStack::NotFound end - - def initialize(options = {}) - initialize_identity options - - @openstack_identity_service_type = options[:openstack_identity_service_type] || 'identity' - - @openstack_service_type = options[:openstack_service_type] || ['orchestration'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end end end end diff --git a/lib/fog/planning/openstack.rb b/lib/fog/planning/openstack.rb index 145897946..8242d5d5d 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/planning/openstack.rb @@ -97,32 +97,20 @@ def credentials class Real include Fog::OpenStack::Core - # NOTE: uncommenting this should be treated as api-change! - # def self.not_found_class - # Fog::Planning::OpenStack::NotFound - # end - - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['management'] # currently Tuskar is configured as 'management' service in Keystone - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - - @connection_options = options[:connection_options] || {} + DEFAULT_SERVICE_TYPE = %w(management).collect(&:freeze).freeze - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_endpoint_type + 'admin' end - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = "/v2" - end + def default_path_prefix + 'v2' end + + # NOTE: uncommenting this should be treated as api-change! + # def self.not_found_class + # Fog::Planning::OpenStack::NotFound + # end end end diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/shared_file_system/openstack.rb index 80111164e..0ba40da12 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/shared_file_system/openstack.rb @@ -347,41 +347,27 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(sharev2).collect(&:freeze).freeze + def self.not_found_class Fog::SharedFileSystem::OpenStack::NotFound end + def action_prefix + microversion_newer_than?('2.6') ? '' : 'os-' + end + def initialize(options = {}) @supported_versions = SUPPORTED_VERSIONS @supported_microversion = SUPPORTED_MICROVERSION @fixed_microversion = options[:openstack_shared_file_system_microversion] @microversion_key = 'X-Openstack-Manila-Api-Version'.freeze - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['sharev2'] - @openstack_service_name = options[:openstack_service_name] - @connection_options = options[:connection_options] || {} - + setup(options) authenticate - set_api_path set_microversion - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(@supported_versions) - @path = Fog::OpenStack.get_supported_version_path(@supported_versions, - @openstack_management_uri, - @auth_token, - @connection_options) - end - end - - def action_prefix - microversion_newer_than?('2.6') ? '' : 'os-' + @path = api_path_prefix + @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) end end end diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index 0f0bb2a6c..4f674c7cf 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -123,7 +123,7 @@ def initialize(options = {}) authenticate @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) end # Change the current account while re-using the auth token. diff --git a/lib/fog/volume/openstack/v1.rb b/lib/fog/volume/openstack/v1.rb index 13c0c1ff6..6c189a6ec 100644 --- a/lib/fog/volume/openstack/v1.rb +++ b/lib/fog/volume/openstack/v1.rb @@ -148,33 +148,14 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(volume).collect(&:freeze).freeze + def self.not_found_class Fog::Volume::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['volume'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options) - end + def default_endtpoint_type + 'admin' end end end diff --git a/lib/fog/volume/openstack/v2.rb b/lib/fog/volume/openstack/v2.rb index fd2aa33af..482049484 100644 --- a/lib/fog/volume/openstack/v2.rb +++ b/lib/fog/volume/openstack/v2.rb @@ -150,33 +150,14 @@ def credentials class Real include Fog::OpenStack::Core + DEFAULT_SERVICE_TYPE = %w(volumev2).collect(&:freeze).freeze + def self.not_found_class Fog::Volume::OpenStack::NotFound end - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['volumev2'] - @openstack_service_name = options[:openstack_service_name] - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL' - - @connection_options = options[:connection_options] || {} - - authenticate - set_api_path - - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) - end - - def set_api_path - unless @path.match(SUPPORTED_VERSIONS) - @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options) - end + def default_endtpoint_type + 'admin' end end end diff --git a/lib/fog/workflow/openstack/v2.rb b/lib/fog/workflow/openstack/v2.rb index 6fd32ce86..4b06f22b4 100644 --- a/lib/fog/workflow/openstack/v2.rb +++ b/lib/fog/workflow/openstack/v2.rb @@ -99,27 +99,10 @@ def reset_data class Real include Fog::OpenStack::Core - def initialize(options = {}) - initialize_identity options - - @openstack_service_type = options[:openstack_service_type] || ['workflowv2'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - - authenticate - - unless @path.match(SUPPORTED_VERSIONS) - @path = "/" + Fog::OpenStack.get_supported_version( - SUPPORTED_VERSIONS, - @openstack_management_uri, - @auth_token, - @connection_options - ) - end + DEFAULT_SERVICE_TYPE = %w(workflowv2).collect(&:freeze).freeze - @persistent = options[:persistent] || false - @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options) + def default_path_prefix + 'v2' end def request(params) diff --git a/spec/fixtures/openstack/dns_v2/common_setup.yml b/spec/fixtures/openstack/dns_v2/common_setup.yml index 9640756f2..23350e70e 100644 --- a/spec/fixtures/openstack/dns_v2/common_setup.yml +++ b/spec/fixtures/openstack/dns_v2/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.40.0 @@ -101,11 +101,10 @@ http_interactions: "f92bf0dad1e941d09d9a08cb50362510"}, {"url": "http://devstack.openstack.stack:8774/v2/c60a441e54cd435896a357026aa4050a", "interface": "admin", "region": "RegionOne", "region_id": "RegionOne", "id": "da09586d8bb44903a53efcebe67841d9"}], "type": "compute", "id": "45b131798dc240c4b5d75e024dffc5b5", "name": "nova"}, - {"endpoints": [{"url": "https://devstack.openstack.stack:5000/v3", "interface": + {"endpoints": [{"url": "https://devstack.openstack.stack:5000", "interface": "public", "region": "RegionOne", "region_id": "RegionOne", "id": "7859f84c67d740b294c9a607d03c2991"}, - {"url": "http://devstack.openstack.stack:5000/v3", - "interface": "internal", "region": "RegionOne", "region_id": "RegionOne", "id": - "a2cff5bcad944eb4a10c06e6c05140eb"}, {"url": "devstack.openstack.stack:5000/v3", + {"url": "http://devstack.openstack.stack:5000", "interface": "internal", "region": "RegionOne", "region_id": "RegionOne", + "id": "a2cff5bcad944eb4a10c06e6c05140eb"}, {"url": "devstack.openstack.stack:5000", "interface": "admin", "region": "RegionOne", "region_id": "RegionOne", "id": "5973c23918b8460886140c5ed6a5411b"}], "type": "identity", "id": "70c56d9a4833404e823ba1195a0f1a63", "name": "keystone"}, {"endpoints": [{"url": "https://devstack.openstack.stack:8786/v1/c60a441e54cd435896a357026aa4050a", diff --git a/spec/fixtures/openstack/identity_v3/authv3_a.yml b/spec/fixtures/openstack/identity_v3/authv3_a.yml index 67662998d..4ec3933fb 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_a.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_a.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","id":"205e0e39a2534743b517ed0aa2fbcda7"}}},"scope":{"domain":{"id":"default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"id":"205e0e39a2534743b517ed0aa2fbcda7","password":"password"}}},"scope":{"domain":{"id":"default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -87,6 +87,6 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["ySKiB4frRTSad2LVXZzW4A"], "issued_at": "2016-05-03T13:51:40.683240Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:40 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/authv3_b.yml b/spec/fixtures/openstack/identity_v3/authv3_b.yml index c52f78ff6..3c09e6375 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_b.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_b.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"id":"default"},"name":"admin"}}},"scope":{"domain":{"id":"default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"id":"default"},"password":"password"}}},"scope":{"domain":{"id":"default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -87,6 +87,6 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["PrGGifm4T2Kb19ArNesIYg"], "issued_at": "2016-05-03T13:51:40.963563Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:41 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/authv3_c.yml b/spec/fixtures/openstack/identity_v3/authv3_c.yml index 9887e38f8..b7667376a 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_c.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_c.yml @@ -36,7 +36,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["o6QhbDFHSDOh82Q15z0OMQ"], "issued_at": "2016-05-03T13:51:41.228725Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:41 GMT - request: method: get @@ -86,8 +86,97 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:41 GMT +- request: + method: post + uri: http://devstack.openstack.stack:5000/v3/auth/tokens + body: + encoding: UTF-8 + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"id":"default"},"password":"password"}}}}}' + headers: + User-Agent: + - fog-core/1.38.0 + Content-Type: + - application/json + response: + status: + code: 201 + message: '' + headers: + Date: + - Tue, 03 May 2016 13:51:40 GMT + Server: + - Apache/2.4.7 (Ubuntu) + X-Subject-Token: + - 7f72291092a647578b115b853d129693 + Vary: + - X-Auth-Token + X-Openstack-Request-Id: + - req-7fffa2b1-97bb-4605-80ac-623452cb6ee7 + Content-Length: + - '4597' + Content-Type: + - application/json + body: + encoding: UTF-8 + string: '{"token": {"domain": {"id": "default", "name": "Default"}, "methods": + ["password"], "roles": [{"id": "5929fb4077c3415c9850e66f2c2be16b", "name": + "admin"}], "expires_at": "2016-05-03T14:51:40.395145Z", "catalog": [{"endpoints": + [], "type": "volumev2", "id": "1766683b2f9f4ef2acf7f9e4e359fb9a", "name": + "cinderv2"}, {"endpoints": [], "type": "metering", "id": "18dbb2f0ddeb45b99d11ed0568f153ab", + "name": "ceilometer"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", + "region": "RegionOne", "interface": "admin", "id": "6f44eb5bf4e646f9a7afebb1f32501f1"}, + {"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", + "region": "RegionOne", "interface": "public", "id": "9bb4f1c83833484e9d53ce2b57d6308b"}, + {"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", + "region": "RegionOne", "interface": "internal", "id": "e62f1c8709554031ace717700c431635"}], + "type": "metering", "id": "261a2c1f467c4b148f38822ae9f179a3", "name": "ceilometer"}, + {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", + "region": "RegionOne", "interface": "admin", "id": "634d57ce5d534c808afb24127b7ac355"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + "RegionOne", "interface": "public", "id": "8a7a2620740c4c2fb6fabf15746c101f"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + "RegionOne", "interface": "internal", "id": "b53b60875b214e7f925f96d3a2a57464"}], + "type": "identity", "id": "311850187e5a47108ac9b43ec5346658", "name": "keystone"}, + {"endpoints": [], "type": "compute", "id": "3fd114ff2cff43be8bd3ecc5bc117ec8", + "name": "nova"}, {"endpoints": [], "type": "volume", "id": "4a6033d57e30494a9577358d90d08123", + "name": "cinder"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", + "region": "RegionOne", "interface": "internal", "id": "54546c7c383a4d6abc2b93c94d75e2f7"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region": "RegionOne", + "interface": "admin", "id": "b253dd3d3f7d43d8ab35ad97c68440c3"}, {"region_id": + "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region": "RegionOne", "interface": + "public", "id": "e7287110f01248d49cef8447d0f8d2cb"}], "type": "ec2", "id": + "5eff43878c134ae7a5f405cf0d191aff", "name": "ec2"}, {"endpoints": [{"region_id": + "RegionOne", "url": "http://i056593.dev.mo.sap.corp:8080/v2.0", "region": + "RegionOne", "interface": "internal", "id": "11d18be7930947f696db531c9bbdf245"}, + {"region_id": "RegionOne", "url": "http://i056593.dev.mo.sap.corp:8080/v2.0", + "region": "RegionOne", "interface": "admin", "id": "a603e6ffd0804c4f82a8770d71dede64"}, + {"region_id": "RegionOne", "url": "http://i056593.dev.mo.sap.corp:8080/v2.0", + "region": "RegionOne", "interface": "public", "id": "cf084db111ad4818a4f94080e0ed7819"}], + "type": "monitoring", "id": "73e3bfb0b1b944f0ace3a078baad1fcc", "name": "Monitoring"}, + {"endpoints": [], "type": "compute_legacy", "id": "92e80becd6d8462b8f51fb227eb11999", + "name": "nova_legacy"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", + "region": "RegionOne", "interface": "admin", "id": "acebdcb3418045b9a62ed295349327c3"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region": "RegionOne", + "interface": "public", "id": "b3b24c2c4ef44ff48049caff79149091"}, {"region_id": + "RegionOne", "url": "http://devstack.openstack.stack:9292", "region": "RegionOne", "interface": + "internal", "id": "b9d30173e66148baa3ab2dc2df33cb5e"}], "type": "image", "id": + "b936e5bfd38e4a3b97fcb8d08840881f", "name": "glance"}, {"endpoints": [{"region_id": + "RegionOne", "url": "http://devstack.openstack.stack:9696/", "region": "RegionOne", "interface": + "admin", "id": "1a6718d75cd94e24993a27d275442a17"}, {"region_id": "RegionOne", + "url": "http://devstack.openstack.stack:9696/", "region": "RegionOne", "interface": "public", + "id": "5cfedecf28a54bd38031380dd0c255b1"}, {"region_id": "RegionOne", "url": + "http://devstack.openstack.stack:9696/", "region": "RegionOne", "interface": "internal", + "id": "e1be91e12d5646a8830c32146a3ed1aa"}], "type": "network", "id": "c626cfc79ed34e3699c2d96c58d105cd", + "name": "neutron"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8090", + "region": "RegionOne", "interface": "admin", "id": "b91bd1a6c34b4973b3d48f94516358bc"}], + "type": "object-store", "id": "e6a92b95728740ea9bda0c348a89f0f1", "name": + "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, + "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["lLjqZsXsSj-Qs4FlZPGp7A"], + "issued_at": "2016-05-03T13:51:40.395192Z"}}' + http_version: + recorded_at: Tue, 03 May 2016 13:51:40 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens @@ -204,6 +293,6 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["PsB1SYm9TTGlMQtekTJgTQ", "o6QhbDFHSDOh82Q15z0OMQ"], "issued_at": "2016-05-03T13:51:41.793474Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:41 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/authv3_project.yml b/spec/fixtures/openstack/identity_v3/authv3_project.yml index 66b5b6916..05671fc74 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_project.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_project.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -119,4 +119,4 @@ http_interactions: "issued_at": "2016-05-03T13:51:44.110379Z"}}' http_version: recorded_at: Tue, 03 May 2016 13:51:44 GMT -recorded_with: VCR 3.0.1 \ No newline at end of file +recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/authv3_token.yml b/spec/fixtures/openstack/identity_v3/authv3_token.yml index 05968d8d1..c3799602a 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_token.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_token.yml @@ -47,7 +47,7 @@ http_interactions: string: '{"user": {"name": "foobar_385", "links": {"self": "http://devstack.openstack.stack:35357/v3/users/304d38f9e15c4603b70326120db88a7d"}, "domain_id": "default", "enabled": true, "email": "foobar_demo@example.com", "id": "304d38f9e15c4603b70326120db88a7d"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:54 GMT - request: method: post @@ -96,7 +96,7 @@ http_interactions: string: '{"role": {"id": "d121bd07dec845f29915ae2956249e34", "links": {"self": "http://devstack.openstack.stack:35357/v3/roles/d121bd07dec845f29915ae2956249e34"}, "name": "foobar_role390"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:54 GMT - request: method: put @@ -141,14 +141,14 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:54 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"s3cret!","domain":{"id":"default"},"name":"foobar_385"}}},"scope":{"domain":{"id":"default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"foobar_385","domain":{"id":"default"},"password":"s3cret!"}}},"scope":{"domain":{"id":"default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -230,7 +230,7 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "304d38f9e15c4603b70326120db88a7d", "name": "foobar_385"}, "audit_ids": ["oQ8CEopyS3mQECayU-uUow"], "issued_at": "2016-05-03T13:51:54.629230Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:54 GMT - request: method: post @@ -268,7 +268,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "304d38f9e15c4603b70326120db88a7d", "name": "foobar_385"}, "audit_ids": ["4ALKzx4mQtW74Rmu30d2AQ", "oQ8CEopyS3mQECayU-uUow"], "issued_at": "2016-05-03T13:51:54.844344Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:55 GMT - request: method: get @@ -306,7 +306,7 @@ http_interactions: encoding: UTF-8 string: '{"links": {"self": "http://devstack.openstack.stack:5000/v3/users/304d38f9e15c4603b70326120db88a7d/projects", "previous": null, "next": null}, "projects": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:55 GMT - request: method: post @@ -395,7 +395,7 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "304d38f9e15c4603b70326120db88a7d", "name": "foobar_385"}, "audit_ids": ["jxnOeLmfQgKVzWBXzZcadg", "oQ8CEopyS3mQECayU-uUow"], "issued_at": "2016-05-03T13:51:55.299668Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:55 GMT - request: method: post @@ -429,7 +429,7 @@ http_interactions: encoding: UTF-8 string: '{"error": {"message": "Could not find token: blahblahblah", "code": 404, "title": "Not Found"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:55 GMT - request: method: delete @@ -474,7 +474,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:55 GMT - request: method: delete @@ -519,6 +519,6 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:56 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/authv3_unscoped.yml b/spec/fixtures/openstack/identity_v3/authv3_unscoped.yml index 91ef13766..f377ec9ef 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_unscoped.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_unscoped.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","id":"205e0e39a2534743b517ed0aa2fbcda7"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"id":"205e0e39a2534743b517ed0aa2fbcda7","password":"password"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -36,7 +36,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["cwY5czMmQkibEsb8A0lv0A"], "issued_at": "2016-05-03T13:51:44.372950Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:44 GMT - request: method: get @@ -86,14 +86,14 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:44 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["token"],"token":{"id":"3b6732fff35e40fe9049353b0e74b232"}},"scope":{"project":{"id":"2ab82e30d7984631874def67813dffd8"}}}}' + string: '{"auth":{"identity":{"methods":["token"],"token":{"id":"3b6732fff35e40fe9049353b0e74b232"}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -204,7 +204,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["ZsheSCPqQDS8SU8craebdw", "cwY5czMmQkibEsb8A0lv0A"], "issued_at": "2016-05-03T13:51:44.919243Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:45 GMT - request: method: post @@ -323,11 +323,11 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["YAOBOIILR5utqw2fWLIAyg", "cwY5czMmQkibEsb8A0lv0A"], "issued_at": "2016-05-03T13:51:45.320480Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:45 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/auth/tokens + uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: US-ASCII string: '' @@ -460,11 +460,11 @@ http_interactions: "name": "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["YAOBOIILR5utqw2fWLIAyg", "cwY5czMmQkibEsb8A0lv0A"], "issued_at": "2016-05-03T13:51:45.320480Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:45 GMT - request: method: head - uri: http://devstack.openstack.stack:35357/v3/auth/tokens + uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: US-ASCII string: '' @@ -511,11 +511,11 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:45 GMT - request: method: head - uri: http://devstack.openstack.stack:35357/v3/auth/tokens + uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: US-ASCII string: '' @@ -560,6 +560,6 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:46 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/authv3_unscoped_reauth.yml b/spec/fixtures/openstack/identity_v3/authv3_unscoped_reauth.yml index 9e6b1467f..42f13a2a5 100644 --- a/spec/fixtures/openstack/identity_v3/authv3_unscoped_reauth.yml +++ b/spec/fixtures/openstack/identity_v3/authv3_unscoped_reauth.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","id":"205e0e39a2534743b517ed0aa2fbcda7"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"id":"205e0e39a2534743b517ed0aa2fbcda7","password":"password"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -36,7 +36,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["YxQtGxUZTQ-RgN0xxM0GgA"], "issued_at": "2016-05-03T13:51:42.252030Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:42 GMT - request: method: get @@ -86,14 +86,14 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:42 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["token"],"token":{"id":"1c3698c7eea04d6a9034fb943580226f"}},"scope":{"project":{"id":"2ab82e30d7984631874def67813dffd8"}}}}' + string: '{"auth":{"identity":{"methods":["token"],"token":{"id":"1c3698c7eea04d6a9034fb943580226f"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -204,7 +204,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["msgDgd78Rlez9VGQ_4-xDg", "YxQtGxUZTQ-RgN0xxM0GgA"], "issued_at": "2016-05-03T13:51:42.862185Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:43 GMT - request: method: post @@ -242,7 +242,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["KFI6dlbEQn6wKAqgLCxp0w", "YxQtGxUZTQ-RgN0xxM0GgA"], "issued_at": "2016-05-03T13:51:43.146591Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:43 GMT - request: method: get @@ -292,7 +292,7 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:43 GMT - request: method: post @@ -410,6 +410,6 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["ANs3zM_qTTeQEzoWbLh_kQ", "YxQtGxUZTQ-RgN0xxM0GgA"], "issued_at": "2016-05-03T13:51:43.763668Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:43 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/identity_v3/common_setup.yml b/spec/fixtures/openstack/identity_v3/common_setup.yml index 33668750a..50241d687 100644 --- a/spec/fixtures/openstack/identity_v3/common_setup.yml +++ b/spec/fixtures/openstack/identity_v3/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -44,11 +44,11 @@ http_interactions: {"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", "region": "RegionOne", "interface": "internal", "id": "e62f1c8709554031ace717700c431635"}], "type": "metering", "id": "261a2c1f467c4b148f38822ae9f179a3", "name": "ceilometer"}, - {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", + {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357", "region": "RegionOne", "interface": "admin", "id": "634d57ce5d534c808afb24127b7ac355"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "public", "id": "8a7a2620740c4c2fb6fabf15746c101f"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "internal", "id": "b53b60875b214e7f925f96d3a2a57464"}], "type": "identity", "id": "311850187e5a47108ac9b43ec5346658", "name": "keystone"}, {"endpoints": [], "type": "compute", "id": "3fd114ff2cff43be8bd3ecc5bc117ec8", @@ -87,6 +87,6 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["lLjqZsXsSj-Qs4FlZPGp7A"], "issued_at": "2016-05-03T13:51:40.395192Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:51:40 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/image_v1/common_setup.yml b/spec/fixtures/openstack/image_v1/common_setup.yml index 928cb68ed..d05c0b4d9 100644 --- a/spec/fixtures/openstack/image_v1/common_setup.yml +++ b/spec/fixtures/openstack/image_v1/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -87,7 +87,7 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["Nvg8MsIeQjWU68Vg_3U_JA"], "issued_at": "2016-05-03T14:00:03.863306Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:00:04 GMT - request: method: get @@ -136,6 +136,6 @@ http_interactions: "id": "v1.1", "links": [{"href": "http://devstack.openstack.stack:9292/v1/", "rel": "self"}]}, {"status": "SUPPORTED", "id": "v1.0", "links": [{"href": "http://devstack.openstack.stack:9292/v1/", "rel": "self"}]}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:00:04 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/image_v2/common_setup.yml b/spec/fixtures/openstack/image_v2/common_setup.yml index a4b347b19..f230b1952 100644 --- a/spec/fixtures/openstack/image_v2/common_setup.yml +++ b/spec/fixtures/openstack/image_v2/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -72,7 +72,7 @@ http_interactions: "name": "nova"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "b5c55585b3fb43868ffe84ef2e197b3a", "name": "admin"}, "audit_ids": ["-a5pa574Ry27YoJJHhWdeA"], "issued_at": "2016-05-03T14:00:45.703534Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:00:45 GMT - request: method: get @@ -115,6 +115,6 @@ http_interactions: "id": "v1.1", "links": [{"href": "http://devstack.openstack.stack:9292/v1/", "rel": "self"}]}, {"status": "SUPPORTED", "id": "v1.0", "links": [{"href": "http://devstack.openstack.stack:9292/v1/", "rel": "self"}]}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:00:46 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/monitoring/common_setup.yml b/spec/fixtures/openstack/monitoring/common_setup.yml index d8ec175c3..fe222d19c 100644 --- a/spec/fixtures/openstack/monitoring/common_setup.yml +++ b/spec/fixtures/openstack/monitoring/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -243,5 +243,5 @@ http_interactions: "issued_at": "2016-05-03T14:00:45.703534Z" } }' - http_version: + http_version: recorded_at: Fri, 20 May 2016 15:16:07 GMT diff --git a/spec/fixtures/openstack/network/common_setup.yml b/spec/fixtures/openstack/network/common_setup.yml index 8ad34995e..3ee0a5417 100644 --- a/spec/fixtures/openstack/network/common_setup.yml +++ b/spec/fixtures/openstack/network/common_setup.yml @@ -37,7 +37,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -82,11 +82,11 @@ http_interactions: "3383f3f70d5844fa929196ac42f740ee", "name": "neutron"}, {"endpoints": [], "type": "compute_legacy", "id": "43fc06691cf3403e9f52306dc155c44b", "name": "nova_legacy"}, {"endpoints": [], "type": "compute", "id": "82a87e6c324c41228b2387d701b56572", - "name": "nova"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", + "name": "nova"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "internal", "id": "2f46da49aa854fec81889bb74f53782a"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357", "region": "RegionOne", "interface": "admin", "id": "6c2384bcf3fb4460811caf75f06aacb9"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "public", "id": "e31e8a4680b047a6adc7eaeec5b2c2c8"}], "type": "identity", "id": "d30ec3e1840b4e5abbc91d29341ba4cd", "name": "keystone"}, {"endpoints": [], "type": "volumev2", "id": "dd17c542cd954c4da3563375c61b6ab5", @@ -101,7 +101,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -158,11 +158,11 @@ http_interactions: {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8774/v2.1/dc4b3b173ee8467e9e2ae99e5c321d0c", "region": "RegionOne", "interface": "public", "id": "fa1f5b65b32c4fb38cca2ce9e1fe09e3"}], "type": "compute", "id": "82a87e6c324c41228b2387d701b56572", "name": "nova"}, - {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", + {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "internal", "id": "2f46da49aa854fec81889bb74f53782a"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357", "region": "RegionOne", "interface": "admin", "id": "6c2384bcf3fb4460811caf75f06aacb9"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "public", "id": "e31e8a4680b047a6adc7eaeec5b2c2c8"}], "type": "identity", "id": "d30ec3e1840b4e5abbc91d29341ba4cd", "name": "keystone"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/dc4b3b173ee8467e9e2ae99e5c321d0c", @@ -247,11 +247,11 @@ http_interactions: {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8774/v2.1/dc4b3b173ee8467e9e2ae99e5c321d0c", "region": "RegionOne", "interface": "public", "id": "fa1f5b65b32c4fb38cca2ce9e1fe09e3"}], "type": "compute", "id": "82a87e6c324c41228b2387d701b56572", "name": "nova"}, - {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", + {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "internal", "id": "2f46da49aa854fec81889bb74f53782a"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:35357", "region": "RegionOne", "interface": "admin", "id": "6c2384bcf3fb4460811caf75f06aacb9"}, - {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000/v3", "region": + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:5000", "region": "RegionOne", "interface": "public", "id": "e31e8a4680b047a6adc7eaeec5b2c2c8"}], "type": "identity", "id": "d30ec3e1840b4e5abbc91d29341ba4cd", "name": "keystone"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/dc4b3b173ee8467e9e2ae99e5c321d0c", diff --git a/spec/fixtures/openstack/network/token_expiration.yml b/spec/fixtures/openstack/network/token_expiration.yml index 5da6cc637..c8a8cd5b2 100644 --- a/spec/fixtures/openstack/network/token_expiration.yml +++ b/spec/fixtures/openstack/network/token_expiration.yml @@ -221,7 +221,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.40.0 diff --git a/spec/fixtures/openstack/shared_file_system/common_setup.yml b/spec/fixtures/openstack/shared_file_system/common_setup.yml index 0bb378d00..ec1e0c37b 100644 --- a/spec/fixtures/openstack/shared_file_system/common_setup.yml +++ b/spec/fixtures/openstack/shared_file_system/common_setup.yml @@ -51,7 +51,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"admin","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.40.0 diff --git a/spec/fixtures/openstack/volume/common_setup.yml b/spec/fixtures/openstack/volume/common_setup.yml index 913f86e49..4cbd8f798 100644 --- a/spec/fixtures/openstack/volume/common_setup.yml +++ b/spec/fixtures/openstack/volume/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -35,8 +35,14 @@ http_interactions: string: '{"token": {"domain": {"id": "default", "name": "Default"}, "methods": ["password"], "roles": [{"id": "5929fb4077c3415c9850e66f2c2be16b", "name": "admin"}], "expires_at": "2016-05-03T15:15:26.798576Z", "catalog": [{"endpoints": - [], "type": "volumev2", "id": "1766683b2f9f4ef2acf7f9e4e359fb9a", "name": - "cinderv2"}, {"endpoints": [], "type": "metering", "id": "18dbb2f0ddeb45b99d11ed0568f153ab", + [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "public", "id": "0e40a16fd8ad4045ae738b749818818e"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "internal", "id": "1ebe166449b34147ac4df07e492571d9"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "admin", "id": "b2ae2902e8104f05b5fd2def27a4537a"}], + "type": "volumev2", "id": "1766683b2f9f4ef2acf7f9e4e359fb9a", "name": "cinderv2"}, + {"endpoints": [], "type": "metering", "id": "18dbb2f0ddeb45b99d11ed0568f153ab", "name": "ceilometer"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", "region": "RegionOne", "interface": "admin", "id": "6f44eb5bf4e646f9a7afebb1f32501f1"}, {"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", @@ -52,8 +58,14 @@ http_interactions: "RegionOne", "interface": "internal", "id": "b53b60875b214e7f925f96d3a2a57464"}], "type": "identity", "id": "311850187e5a47108ac9b43ec5346658", "name": "keystone"}, {"endpoints": [], "type": "compute", "id": "3fd114ff2cff43be8bd3ecc5bc117ec8", - "name": "nova"}, {"endpoints": [], "type": "volume", "id": "4a6033d57e30494a9577358d90d08123", - "name": "cinder"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", + "name": "nova"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "internal", "id": "bb95738666b94144802d02b313a3520d"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "admin", "id": "d7f48b18a887467ca02c943704dcbd91"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "public", "id": "e81eef3261494c4299a972a8c7bf669e"}], + "type": "volume", "id": "4a6033d57e30494a9577358d90d08123", "name": "cinder"}, + {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region": "RegionOne", "interface": "internal", "id": "54546c7c383a4d6abc2b93c94d75e2f7"}, {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region": "RegionOne", "interface": "admin", "id": "b253dd3d3f7d43d8ab35ad97c68440c3"}, {"region_id": @@ -87,7 +99,7 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["Q83qG8BnQoqBQOASiAEeOg"], "issued_at": "2016-05-03T14:15:26.798646Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:26 GMT - request: method: get @@ -137,7 +149,7 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:27 GMT - request: method: post @@ -255,6 +267,6 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["Jfdc6MavRUqhPNKeduIlIQ", "Q83qG8BnQoqBQOASiAEeOg"], "issued_at": "2016-05-03T14:15:27.329140Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:27 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume/volume_transfer_and_accept.yml b/spec/fixtures/openstack/volume/volume_transfer_and_accept.yml index 0b1661bad..7767d9065 100644 --- a/spec/fixtures/openstack/volume/volume_transfer_and_accept.yml +++ b/spec/fixtures/openstack/volume/volume_transfer_and_accept.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:56 GMT - request: method: post @@ -97,7 +97,7 @@ http_interactions: "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "cbd02b79-0df4-4a30-9bd6-aa3eaa1baf10", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:57 GMT - request: method: get @@ -154,7 +154,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:57 GMT - request: method: get @@ -211,7 +211,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:58 GMT - request: method: get @@ -256,7 +256,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:58 GMT - request: method: post @@ -305,7 +305,7 @@ http_interactions: "rel": "bookmark"}], "created_at": "2016-05-03T14:15:59.154375", "volume_id": "cbd02b79-0df4-4a30-9bd6-aa3eaa1baf10", "id": "a21de056-6aa6-4848-94ee-8756ad2d7502", "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:59 GMT - request: method: get @@ -354,7 +354,7 @@ http_interactions: "links": [{"href": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/os-volume-transfer/a21de056-6aa6-4848-94ee-8756ad2d7502", "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/os-volume-transfer/a21de056-6aa6-4848-94ee-8756ad2d7502", "rel": "bookmark"}], "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:59 GMT - request: method: get @@ -403,14 +403,14 @@ http_interactions: "links": [{"href": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/os-volume-transfer/a21de056-6aa6-4848-94ee-8756ad2d7502", "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/os-volume-transfer/a21de056-6aa6-4848-94ee-8756ad2d7502", "rel": "bookmark"}], "name": "fog-testtransfer-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:59 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"demo"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"demo","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -521,7 +521,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "d66fbe28f45a405a87fd32bb30f7c42e", "name": "demo"}, "audit_ids": ["w0zAjAb7SdS8JqbsoPq1IQ"], "issued_at": "2016-05-03T14:15:59.714509Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:59 GMT - request: method: get @@ -567,7 +567,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer a21de056-6aa6-4848-94ee-8756ad2d7502 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:00 GMT - request: method: get @@ -612,7 +612,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:00 GMT - request: method: post @@ -658,7 +658,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "TransferNotFound: Transfer ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:00 GMT - request: method: post @@ -704,7 +704,7 @@ http_interactions: encoding: UTF-8 string: '{"badRequest": {"message": "Invalid auth key: Attempt to transfer a21de056-6aa6-4848-94ee-8756ad2d7502 with invalid auth key.", "code": 400}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:00 GMT - request: method: post @@ -752,7 +752,7 @@ http_interactions: "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/a5db6ff5a6274dd589b6a05945d7f34d/os-volume-transfer/a21de056-6aa6-4848-94ee-8756ad2d7502", "rel": "bookmark"}], "id": "a21de056-6aa6-4848-94ee-8756ad2d7502", "name": "fog-testtransfer-1", "volume_id": "cbd02b79-0df4-4a30-9bd6-aa3eaa1baf10"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:01 GMT - request: method: get @@ -805,7 +805,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:01 GMT - request: method: get @@ -851,7 +851,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer a21de056-6aa6-4848-94ee-8756ad2d7502 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:01 GMT - request: method: get @@ -896,7 +896,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:01 GMT - request: method: get @@ -942,7 +942,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer a21de056-6aa6-4848-94ee-8756ad2d7502 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:01 GMT - request: method: get @@ -987,7 +987,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:02 GMT - request: method: get @@ -1040,7 +1040,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:02 GMT - request: method: get @@ -1093,7 +1093,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:02 GMT - request: method: delete @@ -1136,7 +1136,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:02 GMT - request: method: get @@ -1189,7 +1189,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:03 GMT - request: method: get @@ -1242,7 +1242,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:04 GMT - request: method: get @@ -1295,7 +1295,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:56.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:07 GMT - request: method: get @@ -1341,6 +1341,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Volume cbd02b79-0df4-4a30-9bd6-aa3eaa1baf10 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:11 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume/volume_transfer_and_delete.yml b/spec/fixtures/openstack/volume/volume_transfer_and_delete.yml index b5eb68a31..afb70673e 100644 --- a/spec/fixtures/openstack/volume/volume_transfer_and_delete.yml +++ b/spec/fixtures/openstack/volume/volume_transfer_and_delete.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:11 GMT - request: method: post @@ -97,7 +97,7 @@ http_interactions: "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "8f3fd916-39c6-4ae1-8e43-683077b2a6af", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:11 GMT - request: method: get @@ -154,7 +154,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:12 GMT - request: method: get @@ -211,7 +211,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:13 GMT - request: method: get @@ -256,7 +256,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:13 GMT - request: method: post @@ -305,14 +305,14 @@ http_interactions: "rel": "bookmark"}], "created_at": "2016-05-03T14:16:13.969010", "volume_id": "8f3fd916-39c6-4ae1-8e43-683077b2a6af", "id": "e5ad5e93-1875-46eb-a55d-e45960b222e9", "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:14 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"demo"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"demo","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -423,7 +423,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "d66fbe28f45a405a87fd32bb30f7c42e", "name": "demo"}, "audit_ids": ["ZfdPzHNGQKONDTijEgoiMg"], "issued_at": "2016-05-03T14:16:14.377018Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:14 GMT - request: method: delete @@ -466,7 +466,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:15 GMT - request: method: post @@ -512,7 +512,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "TransferNotFound: Transfer e5ad5e93-1875-46eb-a55d-e45960b222e9 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:15 GMT - request: method: get @@ -569,7 +569,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:15 GMT - request: method: get @@ -626,7 +626,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:15 GMT - request: method: delete @@ -669,7 +669,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:16 GMT - request: method: get @@ -726,7 +726,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:16 GMT - request: method: get @@ -783,7 +783,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:17 GMT - request: method: get @@ -840,7 +840,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:16:11.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:20 GMT - request: method: get @@ -886,6 +886,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Volume 8f3fd916-39c6-4ae1-8e43-683077b2a6af could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:16:24 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v1/common_setup.yml b/spec/fixtures/openstack/volume_v1/common_setup.yml index 588356a93..92d19ca7c 100644 --- a/spec/fixtures/openstack/volume_v1/common_setup.yml +++ b/spec/fixtures/openstack/volume_v1/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -52,7 +52,12 @@ http_interactions: "RegionOne", "interface": "internal", "id": "b53b60875b214e7f925f96d3a2a57464"}], "type": "identity", "id": "311850187e5a47108ac9b43ec5346658", "name": "keystone"}, {"endpoints": [], "type": "compute", "id": "3fd114ff2cff43be8bd3ecc5bc117ec8", - "name": "nova"}, {"endpoints": [], "type": "volume", "id": "4a6033d57e30494a9577358d90d08123", + "name": "nova"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "internal", "id": "bb95738666b94144802d02b313a3520d"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "admin", "id": "d7f48b18a887467ca02c943704dcbd91"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "public", "id": "e81eef3261494c4299a972a8c7bf669e"}], "type": "volume", "id": "4a6033d57e30494a9577358d90d08123", "name": "cinder"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region": "RegionOne", "interface": "internal", "id": "54546c7c383a4d6abc2b93c94d75e2f7"}, {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8773/", "region": "RegionOne", @@ -87,7 +92,7 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["1umUxRY-SWuMC0EQT_ltlg"], "issued_at": "2016-05-03T14:17:50.468300Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:50 GMT - request: method: get @@ -137,7 +142,7 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:50 GMT - request: method: post @@ -255,6 +260,6 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["ScPTyF3ySNGmLX96vGdc9Q", "1umUxRY-SWuMC0EQT_ltlg"], "issued_at": "2016-05-03T14:17:50.971765Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:51 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v1/volume_transfer_and_accept.yml b/spec/fixtures/openstack/volume_v1/volume_transfer_and_accept.yml index b54395c83..f0e40af2d 100644 --- a/spec/fixtures/openstack/volume_v1/volume_transfer_and_accept.yml +++ b/spec/fixtures/openstack/volume_v1/volume_transfer_and_accept.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:27 GMT - request: method: post @@ -93,7 +93,7 @@ http_interactions: "display_description": null, "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:28 GMT - request: method: get @@ -146,7 +146,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:28 GMT - request: method: get @@ -199,7 +199,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:30 GMT - request: method: get @@ -244,7 +244,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:30 GMT - request: method: post @@ -293,7 +293,7 @@ http_interactions: "rel": "bookmark"}], "created_at": "2016-05-03T14:18:30.668765", "volume_id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "id": "6e60dc20-a85d-439a-80c8-fda70774c69a", "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:31 GMT - request: method: get @@ -342,7 +342,7 @@ http_interactions: "links": [{"href": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8/os-volume-transfer/6e60dc20-a85d-439a-80c8-fda70774c69a", "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/os-volume-transfer/6e60dc20-a85d-439a-80c8-fda70774c69a", "rel": "bookmark"}], "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:31 GMT - request: method: get @@ -391,14 +391,14 @@ http_interactions: "links": [{"href": "http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8/os-volume-transfer/6e60dc20-a85d-439a-80c8-fda70774c69a", "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/os-volume-transfer/6e60dc20-a85d-439a-80c8-fda70774c69a", "rel": "bookmark"}], "name": "fog-testtransfer-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:31 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"demo"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"demo","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -509,7 +509,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "d66fbe28f45a405a87fd32bb30f7c42e", "name": "demo"}, "audit_ids": ["DY2OJyj_SZ2pLhOEOyC_3w"], "issued_at": "2016-05-03T14:18:31.429160Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:31 GMT - request: method: get @@ -555,7 +555,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer 6e60dc20-a85d-439a-80c8-fda70774c69a could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:31 GMT - request: method: get @@ -600,7 +600,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:31 GMT - request: method: post @@ -646,7 +646,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "TransferNotFound: Transfer ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:32 GMT - request: method: post @@ -692,7 +692,7 @@ http_interactions: encoding: UTF-8 string: '{"badRequest": {"message": "Invalid auth key: Attempt to transfer 6e60dc20-a85d-439a-80c8-fda70774c69a with invalid auth key.", "code": 400}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:32 GMT - request: method: post @@ -740,7 +740,7 @@ http_interactions: "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/a5db6ff5a6274dd589b6a05945d7f34d/os-volume-transfer/6e60dc20-a85d-439a-80c8-fda70774c69a", "rel": "bookmark"}], "id": "6e60dc20-a85d-439a-80c8-fda70774c69a", "name": "fog-testtransfer-1", "volume_id": "42a23191-d56f-4235-8d95-3d3f69de3d67"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:33 GMT - request: method: get @@ -791,7 +791,7 @@ http_interactions: null, "display_description": null, "os-volume-replication:extended_status": null, "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:33 GMT - request: method: get @@ -837,7 +837,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer 6e60dc20-a85d-439a-80c8-fda70774c69a could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:33 GMT - request: method: get @@ -882,7 +882,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:33 GMT - request: method: get @@ -928,7 +928,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer 6e60dc20-a85d-439a-80c8-fda70774c69a could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:33 GMT - request: method: get @@ -973,7 +973,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:33 GMT - request: method: get @@ -1024,7 +1024,7 @@ http_interactions: null, "display_description": null, "os-volume-replication:extended_status": null, "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:34 GMT - request: method: get @@ -1075,7 +1075,7 @@ http_interactions: null, "display_description": null, "os-volume-replication:extended_status": null, "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:34 GMT - request: method: delete @@ -1118,7 +1118,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:34 GMT - request: method: get @@ -1169,7 +1169,7 @@ http_interactions: null, "display_description": null, "os-volume-replication:extended_status": null, "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:35 GMT - request: method: get @@ -1220,7 +1220,7 @@ http_interactions: null, "display_description": null, "os-volume-replication:extended_status": null, "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "42a23191-d56f-4235-8d95-3d3f69de3d67", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:36 GMT - request: method: get @@ -1266,6 +1266,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "The resource could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:38 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v2/common_setup.yml b/spec/fixtures/openstack/volume_v2/common_setup.yml index b9c43bb80..c6f83a3a0 100644 --- a/spec/fixtures/openstack/volume_v2/common_setup.yml +++ b/spec/fixtures/openstack/volume_v2/common_setup.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"admin"}}},"scope":{"domain":{"name":"Default"}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"admin","domain":{"name":"Default"},"password":"password"}}},"scope":{"domain":{"name":"Default"}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -34,10 +34,16 @@ http_interactions: encoding: UTF-8 string: '{"token": {"domain": {"id": "default", "name": "Default"}, "methods": ["password"], "roles": [{"id": "5929fb4077c3415c9850e66f2c2be16b", "name": - "admin"}], "expires_at": "2016-05-03T15:21:21.043888Z", "catalog": [{"endpoints": - [], "type": "volumev2", "id": "1766683b2f9f4ef2acf7f9e4e359fb9a", "name": - "cinderv2"}, {"endpoints": [], "type": "metering", "id": "18dbb2f0ddeb45b99d11ed0568f153ab", - "name": "ceilometer"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", + "admin"}], "expires_at": "2016-05-03T15:21:21.043888Z", "catalog": [{"endpoints": [ + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "public", "id": "0e40a16fd8ad4045ae738b749818818e"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "internal", "id": "1ebe166449b34147ac4df07e492571d9"}, + {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8", + "region": "RegionOne", "interface": "admin", "id": "b2ae2902e8104f05b5fd2def27a4537a"}], + "type": "volumev2", "id": "1766683b2f9f4ef2acf7f9e4e359fb9a", "name": "cinderv2"},{"endpoints": [], + "type": "metering", "id": "18dbb2f0ddeb45b99d11ed0568f153ab", "name": "ceilometer"}, {"endpoints": [ + {"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", "region": "RegionOne", "interface": "admin", "id": "6f44eb5bf4e646f9a7afebb1f32501f1"}, {"region_id": "RegionOne", "url": "http://mo-edbdf14f1.mo.sap.corp:8777/", "region": "RegionOne", "interface": "public", "id": "9bb4f1c83833484e9d53ce2b57d6308b"}, @@ -87,7 +93,7 @@ http_interactions: "swift"}], "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["MEijdNGQQxWAfU2QVIgrog"], "issued_at": "2016-05-03T14:21:21.043966Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:21 GMT - request: method: get @@ -137,7 +143,7 @@ http_interactions: "", "links": {"self": "http://devstack.openstack.stack:5000/v3/projects/f17a4813648d4b0bb82124ca1f5f1fd0"}, "enabled": true, "id": "f17a4813648d4b0bb82124ca1f5f1fd0", "parent_id": null, "domain_id": "default", "name": "admin"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:21 GMT - request: method: post @@ -255,6 +261,6 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "205e0e39a2534743b517ed0aa2fbcda7", "name": "admin"}, "audit_ids": ["6alLvao6R12RiK-Jqyf5Xw", "MEijdNGQQxWAfU2QVIgrog"], "issued_at": "2016-05-03T14:21:21.540436Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:21 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v2/volume_transfer_and_accept.yml b/spec/fixtures/openstack/volume_v2/volume_transfer_and_accept.yml index 352310a8f..c614b90b0 100644 --- a/spec/fixtures/openstack/volume_v2/volume_transfer_and_accept.yml +++ b/spec/fixtures/openstack/volume_v2/volume_transfer_and_accept.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:47 GMT - request: method: post @@ -97,7 +97,7 @@ http_interactions: "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "ba63f1f8-39b6-4207-a605-4d4cfcd7ae75", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:47 GMT - request: method: get @@ -154,7 +154,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:48 GMT - request: method: get @@ -211,7 +211,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:49 GMT - request: method: get @@ -256,7 +256,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:49 GMT - request: method: post @@ -305,7 +305,7 @@ http_interactions: "rel": "bookmark"}], "created_at": "2016-05-03T14:21:49.945270", "volume_id": "ba63f1f8-39b6-4207-a605-4d4cfcd7ae75", "id": "25ce8e00-36e5-447d-9a5c-93b778e855fe", "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:50 GMT - request: method: get @@ -354,7 +354,7 @@ http_interactions: "links": [{"href": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/os-volume-transfer/25ce8e00-36e5-447d-9a5c-93b778e855fe", "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/os-volume-transfer/25ce8e00-36e5-447d-9a5c-93b778e855fe", "rel": "bookmark"}], "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:50 GMT - request: method: get @@ -403,14 +403,14 @@ http_interactions: "links": [{"href": "http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/os-volume-transfer/25ce8e00-36e5-447d-9a5c-93b778e855fe", "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/os-volume-transfer/25ce8e00-36e5-447d-9a5c-93b778e855fe", "rel": "bookmark"}], "name": "fog-testtransfer-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:50 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"demo"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"demo","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -521,7 +521,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "d66fbe28f45a405a87fd32bb30f7c42e", "name": "demo"}, "audit_ids": ["Iz4MtjrGSw2GGH3EFCEOsQ"], "issued_at": "2016-05-03T14:21:50.551942Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:50 GMT - request: method: get @@ -567,7 +567,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer 25ce8e00-36e5-447d-9a5c-93b778e855fe could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:50 GMT - request: method: get @@ -612,7 +612,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:50 GMT - request: method: post @@ -658,7 +658,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "TransferNotFound: Transfer ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:51 GMT - request: method: post @@ -704,7 +704,7 @@ http_interactions: encoding: UTF-8 string: '{"badRequest": {"message": "Invalid auth key: Attempt to transfer 25ce8e00-36e5-447d-9a5c-93b778e855fe with invalid auth key.", "code": 400}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:51 GMT - request: method: post @@ -752,7 +752,7 @@ http_interactions: "rel": "self"}, {"href": "http://devstack.openstack.stack:8776/a5db6ff5a6274dd589b6a05945d7f34d/os-volume-transfer/25ce8e00-36e5-447d-9a5c-93b778e855fe", "rel": "bookmark"}], "id": "25ce8e00-36e5-447d-9a5c-93b778e855fe", "name": "fog-testtransfer-1", "volume_id": "ba63f1f8-39b6-4207-a605-4d4cfcd7ae75"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:51 GMT - request: method: get @@ -805,7 +805,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:52 GMT - request: method: get @@ -851,7 +851,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer 25ce8e00-36e5-447d-9a5c-93b778e855fe could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:52 GMT - request: method: get @@ -896,7 +896,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:52 GMT - request: method: get @@ -942,7 +942,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Transfer 25ce8e00-36e5-447d-9a5c-93b778e855fe could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:52 GMT - request: method: get @@ -987,7 +987,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:52 GMT - request: method: get @@ -1040,7 +1040,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:53 GMT - request: method: get @@ -1093,7 +1093,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:53 GMT - request: method: delete @@ -1136,7 +1136,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:53 GMT - request: method: get @@ -1189,7 +1189,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:54 GMT - request: method: get @@ -1242,7 +1242,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:55 GMT - request: method: get @@ -1295,7 +1295,7 @@ http_interactions: "description": null, "multiattach": false, "source_volid": null, "consistencygroup_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:47.000000", "os-volume-replication:driver_data": null, "replication_status": "disabled"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:57 GMT - request: method: get @@ -1341,6 +1341,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Volume ba63f1f8-39b6-4207-a605-4d4cfcd7ae75 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:01 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v2/volume_transfer_and_delete.yml b/spec/fixtures/openstack/volume_v2/volume_transfer_and_delete.yml index 5fb06844e..f8fc36e99 100644 --- a/spec/fixtures/openstack/volume_v2/volume_transfer_and_delete.yml +++ b/spec/fixtures/openstack/volume_v2/volume_transfer_and_delete.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:02 GMT - request: method: post @@ -97,7 +97,7 @@ http_interactions: "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "ba81402e-55ff-42cd-ba12-3bce34c1dbcd", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:02 GMT - request: method: get @@ -154,7 +154,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:22:02.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:03 GMT - request: method: get @@ -211,7 +211,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:22:02.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:04 GMT - request: method: get @@ -256,7 +256,7 @@ http_interactions: body: encoding: UTF-8 string: '{"transfers": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:04 GMT - request: method: post @@ -305,14 +305,14 @@ http_interactions: "rel": "bookmark"}], "created_at": "2016-05-03T14:22:04.917297", "volume_id": "ba81402e-55ff-42cd-ba12-3bce34c1dbcd", "id": "6d55169a-e4dc-45d8-99c9-6a640105f7af", "name": "fog-testtransfer-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:05 GMT - request: method: post uri: http://devstack.openstack.stack:5000/v3/auth/tokens body: encoding: UTF-8 - string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"password":"password","domain":{"name":"Default"},"name":"demo"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' + string: '{"auth":{"identity":{"methods":["password"],"password":{"user":{"name":"demo","domain":{"name":"Default"},"password":"password"}}},"scope":{"project":{"name":"demo","domain":{"name":"Default"}}}}}' headers: User-Agent: - fog-core/1.38.0 @@ -423,7 +423,7 @@ http_interactions: "extras": {}, "user": {"domain": {"id": "default", "name": "Default"}, "id": "d66fbe28f45a405a87fd32bb30f7c42e", "name": "demo"}, "audit_ids": ["ncT95PyFSCSW3DTap6lfBQ"], "issued_at": "2016-05-03T14:22:05.363375Z"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:05 GMT - request: method: delete @@ -466,7 +466,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:05 GMT - request: method: post @@ -512,7 +512,7 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "TransferNotFound: Transfer 6d55169a-e4dc-45d8-99c9-6a640105f7af could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:06 GMT - request: method: get @@ -569,7 +569,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:22:02.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:06 GMT - request: method: get @@ -626,7 +626,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:22:02.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:07 GMT - request: method: delete @@ -669,7 +669,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:07 GMT - request: method: get @@ -726,7 +726,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:22:02.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:07 GMT - request: method: get @@ -783,7 +783,7 @@ http_interactions: null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:22:02.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:09 GMT - request: method: get @@ -829,6 +829,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Volume ba81402e-55ff-42cd-ba12-3bce34c1dbcd could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:22:11 GMT recorded_with: VCR 3.0.1 diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index d9e23a716..c4dbee7da 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -18,7 +18,7 @@ :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) end end @@ -30,7 +30,7 @@ :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) end end @@ -42,7 +42,7 @@ :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) end end @@ -56,7 +56,7 @@ VCR.use_cassette('idv3_other_region') do @fog = Fog::Identity::OpenStack::V3.new( :openstack_region => @openstack_vcr.region_other, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens", + :openstack_auth_url => @os_auth_url, :openstack_userid => @openstack_vcr.user_id, :openstack_api_key => @openstack_vcr.password ) @@ -70,13 +70,13 @@ :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) auth_params = { :provider => "openstack", :openstack_auth_token => id_v3.credentials[:openstack_auth_token], - :openstack_auth_url => "#{@os_auth_url}/auth/tokens", + :openstack_auth_url => @os_auth_url, :openstack_region => @openstack_vcr.region } @fog2 = Fog::Identity::OpenStack::V3.new(auth_params) @@ -95,29 +95,27 @@ :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) end end it 'get an unscoped token, then use it to get a scoped token' do VCR.use_cassette('authv3_unscoped') do - skip 'get an unscoped token, then use it to get a scoped token to be fixed' id_v3 = Fog::Identity::OpenStack::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) # Exchange it for a project-scoped token auth = Fog::Identity::OpenStack::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, - :openstack_tenant => @openstack_vcr.username, :openstack_auth_token => id_v3.credentials[:openstack_auth_token], :openstack_region => @openstack_vcr.region, - :openstack_auth_url => "#{@os_auth_url}/auth/tokens" + :openstack_auth_url => @os_auth_url ) token = auth.credentials[:openstack_auth_token] @@ -301,7 +299,7 @@ it 'authenticates with a token' do VCR.use_cassette('authv3_token') do # Setup - get a non-admin token to check by using username/password authentication to start with - auth_url = "#{@os_auth_url}/auth/tokens" + auth_url = @os_auth_url begin @@ -443,6 +441,7 @@ end end end + it "Manipulates roles on domain groups" do VCR.use_cassette('idv3_domain_group_roles_mutation') do skip "Manipulates roles on domain groups to be fixed" @@ -463,7 +462,6 @@ # User has no roles initially foobar_user.roles.length.must_equal 0 - # Create a role and add it to the domain group foobar_role = @service.roles.all.select { |role| role.name == 'foobar_role' }.first foobar_role.destroy if foobar_role @@ -478,6 +476,7 @@ foobar_group.add_user foobar_user.id foobar_user.check_role(foobar_role.id).must_equal false # Still false in absolute assignment terms assignments = @service.role_assignments.all(:user_id => foobar_user.id, :effective => true) + assignments.length.must_equal 1 assignments.first.role['id'].must_equal foobar_role.id assignments.first.user['id'].must_equal foobar_user.id diff --git a/spec/network_spec.rb b/spec/network_spec.rb index 08224f489..cabd1d4fa 100644 --- a/spec/network_spec.rb +++ b/spec/network_spec.rb @@ -13,7 +13,7 @@ openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Identity::OpenStack::V3 + :service_class => Fog::Identity::OpenStack::V3, ) @identity_service = openstack_vcr.service end diff --git a/spec/shared_context.rb b/spec/shared_context.rb index bd05b3158..2ff68f657 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -40,6 +40,10 @@ def initialize(options) @vcr_directory = options[:vcr_directory] # must_be_kind_of Class @service_class = options[:service_class] + + # v3 by default (nil) + @identity_version = options[:identity] == 'v2' ? 'v2' : 'v3' + # will be used as condition @with_project_scope = options[:project_scoped] # will be used as condition @@ -51,20 +55,7 @@ def initialize(options) Fog.interval = 0 # use an auth URL that matches our VCR recordings (IdentityV2 for most # services, but IdentityV3 test obviously needs IdentityV3 auth URL) - @os_auth_url = if [Fog::Identity::OpenStack::V3, - Fog::Volume::OpenStack, - Fog::Volume::OpenStack::V1, - Fog::Volume::OpenStack::V2, - Fog::Image::OpenStack, - Fog::Image::OpenStack::V1, - Fog::Network::OpenStack, - Fog::DNS::OpenStack, - Fog::SharedFileSystem::OpenStack, - Fog::Monitoring::OpenStack].include? @service_class - 'http://devstack.openstack.stack:5000/v3' - else - 'http://devstack.openstack.stack:5000/v2.0' - end + @os_auth_url = 'http://devstack.openstack.stack:5000' else # when an auth URL is given, we talk to a real OpenStack @os_auth_url = ENV['OS_AUTH_URL'] @@ -99,7 +90,7 @@ def initialize(options) @username = 'admin' # keep in sync with the token obtained in the "common_setup.yml" @token = '5c28403cf669414d8ee179f1e7f205ee' - @interface = 'adminURL' + @interface = 'admin' @domain_id = 'default' @domain_name = 'Default' @project_name = 'admin' @@ -117,9 +108,11 @@ def initialize(options) @project_name = ENV['OS_PROJECT_NAME'] || options[:project_name] || @project_name end - if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3') - connection_options = { - :openstack_auth_url => "#{@os_auth_url}/auth/tokens", + # TODO: remove + # if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3') + if @identity_version == 'v3' + connection_options = { + :openstack_auth_url => @os_auth_url, :openstack_region => @region, :openstack_domain_name => @domain_name, :openstack_endpoint_type => @interface, @@ -129,7 +122,7 @@ def initialize(options) connection_options[:openstack_service_type] = [ENV['OS_AUTH_SERVICE']] if ENV['OS_AUTH_SERVICE'] else connection_options = { - :openstack_auth_url => "#{@os_auth_url}/tokens", + :openstack_auth_url => @os_auth_url, :openstack_region => @region, :openstack_tenant => @project_name, :openstack_cache_ttl => 0 diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 855659629..9fa9d90c6 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -281,61 +281,60 @@ def cleanup_test_object(collection, id) transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name transfer.volume_id.must_equal volume.id - # to accept the transfer, we need a second connection to a different project puts 'Checking object visibility from different projects...' if ENV['DEBUG_VERBOSE'] other_service = service_class.new( - :openstack_auth_url => "#{@os_auth_url}/auth/tokens", + :openstack_auth_url => @os_auth_url, :openstack_region => ENV['OS_REGION_NAME'] || 'RegionOne', :openstack_api_key => ENV['OS_PASSWORD_OTHER'] || 'password', :openstack_username => ENV['OS_USERNAME_OTHER'] || 'demo', :openstack_domain_name => ENV['OS_USER_DOMAIN_NAME'] || 'Default', :openstack_project_name => ENV['OS_PROJECT_NAME_OTHER'] || 'demo' - ) - - # check that recipient cannot see the transfer object - assert_nil other_service.transfers.get(transfer.id) - other_service.transfers.all(:name => transfer_name).length.must_equal 0 - - # # check that recipient cannot see the volume before transfer - # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound - # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 - - # The recipient can inexplicably see the volume even before the - # transfer, so to confirm that the transfer happens, we record its tenant ID. - volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID - source_tenant_id = volume.tenant_id - - # check that accept_transfer fails without valid transfer ID and auth key - bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR - proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound - proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest - - # accept transfer - puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] - transfer = other_service.transfers.accept(transfer.id, auth_key) - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer - - transfer.id.must_equal transfer_id - transfer.name.must_equal transfer_name - - # check that recipient can see the volume - volume = other_service.volumes.get(volume.id) - volume.must_be_kind_of Fog::Volume::OpenStack::Volume - - # # check that sender cannot see the volume anymore - # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound - # @service.volumes.all(@name_param => volume_name).length.must_equal 0 - - # As noted above, both users seem to be able to see the volume at all times. - # Check change of ownership by looking at the tenant_id, instead. - volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID - volume.tenant_id.wont_equal(source_tenant_id) + ) - # check that the transfer object is gone on both sides - [@service, other_service].each do |service| - assert_nil service.transfers.get(transfer.id) - service.transfers.all(:name => transfer_name).length.must_equal 0 + # check that recipient cannot see the transfer object + assert_nil other_service.transfers.get(transfer.id) + other_service.transfers.all(:name => transfer_name).length.must_equal 0 + + # # check that recipient cannot see the volume before transfer + # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 + + # The recipient can inexplicably see the volume even before the + # transfer, so to confirm that the transfer happens, we record its tenant ID. + volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID + source_tenant_id = volume.tenant_id + + # check that accept_transfer fails without valid transfer ID and auth key + bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR + proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound + proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest + + # accept transfer + puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] + transfer = other_service.transfers.accept(transfer.id, auth_key) + transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + + transfer.id.must_equal transfer_id + transfer.name.must_equal transfer_name + + # check that recipient can see the volume + volume = other_service.volumes.get(volume.id) + volume.must_be_kind_of Fog::Volume::OpenStack::Volume + + # # check that sender cannot see the volume anymore + # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # @service.volumes.all(@name_param => volume_name).length.must_equal 0 + + # As noted above, both users seem to be able to see the volume at all times. + # Check change of ownership by looking at the tenant_id, instead. + volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID + volume.tenant_id.wont_equal(source_tenant_id) + + # check that the transfer object is gone on both sides + [@service, other_service].each do |service| + assert_nil service.transfers.get(transfer.id) + service.transfers.all(:name => transfer_name).length.must_equal 0 end ensure # cleanup volume @@ -368,7 +367,7 @@ def cleanup_test_object(collection, id) # to try to accept the transfer, we need a second connection to a different project other_service = service_class.new( - :openstack_auth_url => "#{@os_auth_url}/auth/tokens", + :openstack_auth_url => @os_auth_url, :openstack_region => ENV['OS_REGION_NAME'] || 'RegionOne', :openstack_api_key => ENV['OS_PASSWORD_OTHER'] || 'password', :openstack_username => ENV['OS_USERNAME_OTHER'] || 'demo', diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index 0196d82bc..e63a74860 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -121,14 +121,15 @@ end it "v2 missing service" do + skip 'adapt after new bootstrap refactor' Excon.stub( {:method => 'POST', :path => "/v2.0/tokens"}, {:status => 200, :body => Fog::JSON.encode(@body)} ) proc do - Fog::OpenStack.authenticate_v2( - :openstack_auth_uri => URI('http://example/v2.0/tokens'), + Fog::OpenStack.authenticate( + :openstack_auth_uri => URI('http://example'), :openstack_tenant => 'admin', :openstack_service_type => %w[network] ) @@ -136,22 +137,23 @@ end it "v2 missing storage service" do + skip 'adapt after new bootstrap refactor' Excon.stub( {:method => 'POST', :path => "/v2.0/tokens"}, {:status => 200, :body => Fog::JSON.encode(@body)} ) proc do - Fog::OpenStack.authenticate_v2( - :openstack_auth_uri => URI('http://example/v2.0/tokens'), + Fog::OpenStack.authenticate( + :openstack_auth_uri => URI('http://example'), :openstack_tenant => 'admin', :openstack_service_type => 'object-store' ) end.must_raise NoMethodError, "undefined method `join' for \"object-store\":String" proc do - Fog::OpenStack.authenticate_v2( - :openstack_auth_uri => URI('http://example/v2.0/tokens'), + Fog::OpenStack.authenticate( + :openstack_auth_uri => URI('http://example'), :openstack_tenant => 'admin', :openstack_service_type => %w[object-store] ) diff --git a/test/microversion_test.rb b/test/microversion_test.rb index a4025ea63..8cc4d00dd 100644 --- a/test/microversion_test.rb +++ b/test/microversion_test.rb @@ -2,12 +2,13 @@ describe "when microversion" do before do - @microversion_tester = TestMicroVersion.new + @microversion_tester = Object.new + @microversion_tester = extend(Fog::OpenStack::Core) end describe "is nil" do it "should not appear in headers" do - merged_headers = @microversion_tester.headers({}) + merged_headers = @microversion_tester.send(:headers, {}) merged_headers.key?("X-Test-Header").must_equal false end end @@ -16,7 +17,7 @@ it "should appear in headers with proper value" do @microversion_tester.instance_variable_set(:@microversion, "2.15") @microversion_tester.instance_variable_set(:@microversion_key, "X-Test-Header") - merged_headers = @microversion_tester.headers({}) + merged_headers = @microversion_tester.send(:headers, {}) merged_headers.key?("X-Test-Header").must_equal true merged_headers["X-Test-Header"].must_equal "2.15" end @@ -26,13 +27,8 @@ it "should not appear in headers" do @microversion_tester.instance_variable_set(:@microversion, "") @microversion_tester.instance_variable_set(:@microversion_key, "X-Test-Header") - merged_headers = @microversion_tester.headers({}) + merged_headers = @microversion_tester.send(:headers, {}) merged_headers.key?("X-Test-Header").must_equal false end end - - class TestMicroVersion - include Fog::OpenStack::Core - public :headers - end end From 7afa48159c16420b52d890581e4691d55772e9f4 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 14 Aug 2018 11:37:56 +1000 Subject: [PATCH 031/129] Cleanup: identity_public_endpoint and compute/list_tenants --- lib/fog/compute/openstack.rb | 5 --- .../openstack/requests/list_tenants.rb | 44 ------------------- lib/fog/openstack.rb | 34 +++++--------- lib/fog/openstack/core.rb | 16 ------- lib/fog/orchestration/openstack.rb | 7 +-- test/authenticate_tests.rb | 1 - test/requests/compute/quota_tests.rb | 2 +- test/requests/compute/tenant_tests.rb | 2 +- test/requests/network/quota_tests.rb | 2 +- test/requests/volume/quota_tests.rb | 2 +- 10 files changed, 17 insertions(+), 98 deletions(-) delete mode 100644 lib/fog/compute/openstack/requests/list_tenants.rb diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index 663a44fe5..654af8a4c 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -197,7 +197,6 @@ class OpenStack < Fog::Service request :delete_key_pair # Tenant - request :list_tenants request :set_tenant request :get_limits @@ -361,10 +360,6 @@ def initialize(options = {}) management_url.port = 8774 management_url.path = '/v1.1/1' @openstack_management_url = management_url.to_s - - identity_public_endpoint = URI.parse(options[:openstack_auth_url]) - identity_public_endpoint.port = 5000 - @openstack_identity_public_endpoint = identity_public_endpoint.to_s end def data diff --git a/lib/fog/compute/openstack/requests/list_tenants.rb b/lib/fog/compute/openstack/requests/list_tenants.rb deleted file mode 100644 index cd249f491..000000000 --- a/lib/fog/compute/openstack/requests/list_tenants.rb +++ /dev/null @@ -1,44 +0,0 @@ -module Fog - module Compute - class OpenStack - class Real - def list_tenants - # TODO: replace with standard request (this is the only place using @identity_connection) - response = @identity_connection.request(:expects => [200, 204], - :headers => {'Content-Type' => 'application/json', - 'Accept' => 'application/json', - 'X-Auth-Token' => @auth_token}, - :method => 'GET', - :path => '/v2.0/tenants') - response.body = Fog::JSON.decode(response.body) - response - end - end - - class Mock - def list_tenants - response = Excon::Response.new - response.status = [200, 204][rand(2)] - response.body = { - 'tenants_links' => [], - 'tenants' => [ - {'id' => '1', - 'description' => 'Has access to everything', - 'enabled' => true, - 'name' => 'admin'}, - {'id' => '2', - 'description' => 'Normal tenant', - 'enabled' => true, - 'name' => 'default'}, - {'id' => '3', - 'description' => 'Disabled tenant', - 'enabled' => false, - 'name' => 'disabled'} - ] - } - response - end - end - end - end -end diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index 035e0b83a..e0445cf21 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -134,34 +134,24 @@ def self.authenticate(options, connection_options = {}) token = Fog::OpenStack::Auth::Token.build(options) - identity_service_type = options[:openstack_identity_service_type] - - #TODO: remove as not seemed used - if identity_service_type - identity_url = nil - end - endpoint_type = options[:openstack_endpoint_type] region = options[:openstack_region] service_type = options[:openstack_service_type] - if token.catalog - management_url = token.catalog.get_endpoint_url(service_type, endpoint_type, region) - else - management_url = options[:openstack_auth_url] - end + management_url = if token.catalog + token.catalog.get_endpoint_url(service_type, endpoint_type, region) + else + options[:openstack_auth_url] + end return { - :user => token.user['name'], - :current_user_id => token.user['id'], - :tenant => token.tenant, - - :identity_public_endpoint => identity_url, - :openstack_management_url => management_url, - - :token => token.token, - :expires => token.expires, - :unscoped_token => token.token, + :user => token.user['name'], + :current_user_id => token.user['id'], + :tenant => token.tenant, + :openstack_management_url => management_url, + :token => token.token, + :expires => token.expires, + :unscoped_token => token.token, } end diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 4eb8b17fd..9086beaf0 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -28,7 +28,6 @@ def initialize_identity(options) instance_variable_set "@#{openstack_param}".to_sym, value end @auth_token ||= options[:openstack_auth_token] - @openstack_identity_public_endpoint = options[:openstack_identity_endpoint] @openstack_auth_uri = URI.parse(options[:openstack_auth_url]) @openstack_must_reauthenticate = false @@ -59,7 +58,6 @@ def credentials :provider => 'openstack', :openstack_auth_url => @openstack_auth_uri.to_s, :openstack_auth_token => @auth_token, - :openstack_identity_endpoint => @openstack_identity_public_endpoint, :current_user => @current_user, :current_user_id => @current_user_id, :current_tenant => @current_tenant, @@ -228,20 +226,6 @@ def authenticate @openstack_management_uri = URI.parse(@openstack_management_url) - #TODO: Remove - @host = @openstack_management_uri.host - @port = @openstack_management_uri.port - @scheme = @openstack_management_uri.scheme - - # TODO: Remove - Not use but list_tenants - # Not all implementations have identity service in the catalog - if @openstack_identity_public_endpoint || @openstack_management_url - @identity_connection = Fog::Core::Connection.new( - @openstack_identity_public_endpoint || @openstack_management_url, - false, @connection_options - ) - end - # both need to be set in service's initialize for microversions to work set_microversion if @supported_microversion && @supported_versions @path = api_path_prefix diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/orchestration/openstack.rb index 6d1dcf594..284100098 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/orchestration/openstack.rb @@ -105,10 +105,6 @@ def initialize(options = {}) management_url.port = 8774 management_url.path = '/v1' @openstack_management_url = management_url.to_s - - identity_public_endpoint = URI.parse(options[:openstack_auth_url]) - identity_public_endpoint.port = 5000 - @openstack_identity_public_endpoint = identity_public_endpoint.to_s end def data @@ -123,8 +119,7 @@ def credentials {:provider => 'openstack', :openstack_auth_url => @openstack_auth_uri.to_s, :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url, - :openstack_identity_endpoint => @openstack_identity_public_endpoint} + :openstack_management_url => @openstack_management_url} end end diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index e63a74860..e82e2e3d9 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -84,7 +84,6 @@ expected = { :user => @body['access']['user'], :tenant => @body['access']['token']['tenant'], - :identity_public_endpoint => nil, :server_management_url => @body['access']['serviceCatalog']. first['endpoints'].first['publicURL'], :token => @token, diff --git a/test/requests/compute/quota_tests.rb b/test/requests/compute/quota_tests.rb index ca385f116..472663036 100644 --- a/test/requests/compute/quota_tests.rb +++ b/test/requests/compute/quota_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Compute[:openstack] | quota requests" do before do - @tenant_id = Fog::Compute[:openstack].list_tenants.body['tenants'].first['id'] + @tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id'] @quota_set_format = { 'key_pairs' => Integer, 'metadata_items' => Integer, diff --git a/test/requests/compute/tenant_tests.rb b/test/requests/compute/tenant_tests.rb index 449edc27e..5eea1fa0f 100644 --- a/test/requests/compute/tenant_tests.rb +++ b/test/requests/compute/tenant_tests.rb @@ -12,7 +12,7 @@ describe "success" do it "#list_tenants" do - Fog::Compute[:openstack].list_tenants.body. + Fog::Identity[:openstack].list_tenants.body. must_match_schema('tenants_links' => Array, 'tenants' => [@tenant_format]) end diff --git a/test/requests/network/quota_tests.rb b/test/requests/network/quota_tests.rb index c0c796919..11f224f46 100644 --- a/test/requests/network/quota_tests.rb +++ b/test/requests/network/quota_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Network[:openstack] | quota requests" do before do - @tenant_id = Fog::Compute[:openstack].list_tenants.body['tenants'].first['id'] + @tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id'] @quota_format = { 'subnet' => Fog::Nullable::Integer, 'router' => Fog::Nullable::Integer, diff --git a/test/requests/volume/quota_tests.rb b/test/requests/volume/quota_tests.rb index 5b7690012..d734b8b73 100644 --- a/test/requests/volume/quota_tests.rb +++ b/test/requests/volume/quota_tests.rb @@ -3,7 +3,7 @@ describe "Fog::Volume[:openstack] | quota requests" do before do @volume = Fog::Volume[:openstack] - @tenant_id = Fog::Compute[:openstack].list_tenants.body['tenants'].first['id'] + @tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id'] @quota_set_format = { 'volumes' => Fog::Nullable::Integer, 'gigabytes' => Fog::Nullable::Integer, From 6044f23b7fde21e019cdf0bbed9f3ec503e7f9c2 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 14 Aug 2018 14:41:27 +1000 Subject: [PATCH 032/129] authentication is done by fog/openstack/auth --- lib/fog/openstack.rb | 30 ------------------------------ lib/fog/openstack/core.rb | 31 ++++++++++++++++++++++++------- 2 files changed, 24 insertions(+), 37 deletions(-) diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index e0445cf21..b14399454 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -125,36 +125,6 @@ def self.clear_token_cache Fog::OpenStack.token_cache = {} end - def self.authenticate(options, connection_options = {}) - # TODO: connection_options - - if options[:openstack_endpoint_type] =~ /URL/ - options[:openstack_endpoint_type].gsub!(/URL/, '') - end - - token = Fog::OpenStack::Auth::Token.build(options) - - endpoint_type = options[:openstack_endpoint_type] - region = options[:openstack_region] - service_type = options[:openstack_service_type] - - management_url = if token.catalog - token.catalog.get_endpoint_url(service_type, endpoint_type, region) - else - options[:openstack_auth_url] - end - - return { - :user => token.user['name'], - :current_user_id => token.user['id'], - :tenant => token.tenant, - :openstack_management_url => management_url, - :token => token.token, - :expires => token.expires, - :unscoped_token => token.token, - } - end - def self.endpoint_region?(endpoint, region) region.nil? || endpoint['region'] == region end diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 9086beaf0..746112c75 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -210,16 +210,33 @@ def authenticate options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token options[:openstack_service_type] = @openstack_service_type - credentials = Fog::OpenStack.authenticate(options, @connection_options) + if options[:openstack_endpoint_type] =~ /URL/ + options[:openstack_endpoint_type].gsub!(/URL/, '') + end + + token = Fog::OpenStack::Auth::Token.build(options) + + endpoint_type = options[:openstack_endpoint_type] + region = options[:openstack_region] + service_type = options[:openstack_service_type] + + management_url = if token.catalog + token.catalog.get_endpoint_url(service_type, endpoint_type, region) + else + options[:openstack_auth_url] + end + + @current_user = token.user['name'] + @current_user_id = token.user['id'] + @current_tenant = token.tenant + + @expires = token.expires - @current_user = credentials[:user] - @current_user_id = credentials[:current_user_id] - @current_tenant = credentials[:tenant] + @auth_token = token.token + @openstack_management_url = management_url + @unscoped_token = token.token @openstack_must_reauthenticate = false - @auth_token = credentials[:token] - @openstack_management_url = credentials[:openstack_management_url] - @unscoped_token = credentials[:unscoped_token] else @auth_token = @openstack_auth_token end From 67e5204b7470d37bd6c58aa869a5b8d4f21888fd Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 14 Aug 2018 19:30:56 +1000 Subject: [PATCH 033/129] options consolidaton; default_service_type as method --- fog-openstack.gemspec | 1 + lib/fog/baremetal/openstack.rb | 4 +- lib/fog/compute/openstack.rb | 8 +-- lib/fog/container_infra/openstack.rb | 6 +- lib/fog/dns/openstack/v1.rb | 6 +- lib/fog/dns/openstack/v2.rb | 6 +- lib/fog/event/openstack.rb | 6 +- lib/fog/identity/openstack.rb | 3 +- lib/fog/identity/openstack/v2.rb | 8 ++- lib/fog/identity/openstack/v3.rb | 8 ++- lib/fog/image/openstack/v1.rb | 6 +- lib/fog/image/openstack/v2.rb | 6 +- lib/fog/introspection/openstack.rb | 8 +-- lib/fog/key_manager/openstack.rb | 6 +- lib/fog/metering/openstack.rb | 6 +- lib/fog/metric/openstack.rb | 6 +- lib/fog/monitoring/openstack.rb | 6 +- lib/fog/network/openstack.rb | 8 +-- lib/fog/nfv/openstack.rb | 8 +-- lib/fog/openstack.rb | 2 - lib/fog/openstack/core.rb | 96 +++++++++++-------------- lib/fog/orchestration/openstack.rb | 6 +- lib/fog/planning/openstack.rb | 6 +- lib/fog/shared_file_system/openstack.rb | 6 +- lib/fog/storage/openstack.rb | 1 - lib/fog/volume/openstack/v1.rb | 6 +- lib/fog/volume/openstack/v2.rb | 6 +- lib/fog/workflow/openstack/v2.rb | 8 +-- 28 files changed, 135 insertions(+), 118 deletions(-) diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index e751c9ec3..d21642736 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -36,4 +36,5 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'shindo', '~> 0.3' spec.add_development_dependency 'vcr' spec.add_development_dependency 'webmock', '~> 1.24.6' + spec.add_development_dependency 'pry-byebug' end diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/baremetal/openstack.rb index 32988e6b5..adb4717d8 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/baremetal/openstack.rb @@ -248,7 +248,9 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(baremetal).collect(&:freeze).freeze + def default_service_type + %w(baremetal) + end # NOTE: uncommenting this should be treated as api-change! # def self.not_found_class diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index 654af8a4c..147a61bed 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -354,8 +354,6 @@ def initialize(options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86400).iso8601 - initialize_identity options - management_url = URI.parse(options[:openstack_auth_url]) management_url.port = 8774 management_url.path = '/v1.1/1' @@ -374,8 +372,6 @@ def reset_data class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(compute).collect(&:freeze).freeze - def self.not_found_class Fog::Compute::OpenStack::NotFound end @@ -384,6 +380,10 @@ def default_path_prefix 'v2.1' end + def default_service_type + %w(compute) + end + def initialize(options = {}) @supported_versions = SUPPORTED_VERSIONS @supported_microversion = SUPPORTED_MICROVERSION diff --git a/lib/fog/container_infra/openstack.rb b/lib/fog/container_infra/openstack.rb index 7509db355..b3ed3b9c3 100644 --- a/lib/fog/container_infra/openstack.rb +++ b/lib/fog/container_infra/openstack.rb @@ -122,8 +122,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(container-infra).collect(&:freeze).freeze - def self.not_found_class Fog::ContainerInfra::OpenStack::NotFound end @@ -132,6 +130,10 @@ def default_path_prefix 'v1' end + def default_service_type + %w(container-infra) + end + def request(options = {}) options[:headers] = {'OpenStack-API-Version' => "container-infra #{SUPPORTED_MICROVERSION}"} super(options) diff --git a/lib/fog/dns/openstack/v1.rb b/lib/fog/dns/openstack/v1.rb index 45278d777..c53d6faa7 100644 --- a/lib/fog/dns/openstack/v1.rb +++ b/lib/fog/dns/openstack/v1.rb @@ -98,8 +98,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(dns).collect(&:freeze).freeze - def self.not_found_class Fog::DNS::OpenStack::NotFound end @@ -107,6 +105,10 @@ def self.not_found_class def default_path_prefix 'v1' end + + def default_service_type + %w(dns) + end end end end diff --git a/lib/fog/dns/openstack/v2.rb b/lib/fog/dns/openstack/v2.rb index 3f8c8148f..88582a740 100644 --- a/lib/fog/dns/openstack/v2.rb +++ b/lib/fog/dns/openstack/v2.rb @@ -307,8 +307,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(dns).collect(&:freeze).freeze - def self.not_found_class Fog::DNS::OpenStack::NotFound end @@ -316,6 +314,10 @@ def self.not_found_class def default_path_prefix 'v2' end + + def default_service_type + %w(dns) + end end end end diff --git a/lib/fog/event/openstack.rb b/lib/fog/event/openstack.rb index ef1b98caa..ec658d01b 100644 --- a/lib/fog/event/openstack.rb +++ b/lib/fog/event/openstack.rb @@ -84,8 +84,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(event).collect(&:freeze).freeze - def self.not_found_class Fog::Event::OpenStack::NotFound end @@ -93,6 +91,10 @@ def self.not_found_class def default_path_prefix 'v2' end + + def default_service_type + %w(event) + end end end end diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index 8827c7353..a721d79f9 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -15,8 +15,7 @@ class OpenStack < Fog::Service :openstack_user_domain_id, :openstack_project_domain_id, :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username, :current_user, :current_user_id, :current_tenant, :openstack_cache_ttl, - :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches - + :provider, :openstack_identity_prefix def self.new(args = {}) if args[:openstack_identity_legacy_version] version = '2.0' diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/identity/openstack/v2.rb index 7e93a9591..d73f8c8e5 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/identity/openstack/v2.rb @@ -14,7 +14,7 @@ class V2 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_endpoint_path_matches + :openstack_identity_prefix model_path 'fog/identity/openstack/v2/models' model :tenant @@ -169,11 +169,13 @@ def credentials end class Real < Fog::Identity::OpenStack::Real - DEFAULT_SERVICE_TYPE = %w(identity_v2 identityv2 identity).collect(&:freeze).freeze - def default_path_prefix 'v2.0' end + + def default_service_type + %w(identity_v2 identityv2 identity) + end end end end diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/identity/openstack/v3.rb index f438ad9e5..f642fb9ea 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/identity/openstack/v3.rb @@ -13,7 +13,7 @@ class V3 < Fog::Service :openstack_user_domain_id, :openstack_project_domain_id, :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username, :current_user, :current_user_id, :current_tenant, - :provider, :openstack_identity_prefix, :openstack_endpoint_path_matches, :openstack_cache_ttl + :provider, :openstack_identity_prefix, :openstack_cache_ttl model_path 'fog/identity/openstack/v3/models' model :domain @@ -142,11 +142,13 @@ def self.get_api_version(uri, connection_options = {}) end class Real < Fog::Identity::OpenStack::Real - DEFAULT_SERVICE_TYPE = %w(identity_v3 identityv3 identity).collect(&:freeze).freeze - def default_path_prefix 'v3' end + + def default_service_type + %w(identity_v3 identityv3 identity) + end end end end diff --git a/lib/fog/image/openstack/v1.rb b/lib/fog/image/openstack/v1.rb index 2e9be91cd..d61a88433 100644 --- a/lib/fog/image/openstack/v1.rb +++ b/lib/fog/image/openstack/v1.rb @@ -98,8 +98,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(image).collect(&:freeze).freeze - def self.not_found_class Fog::Image::OpenStack::NotFound end @@ -111,6 +109,10 @@ def default_endpoint_type def default_path_prefix 'v1' end + + def default_service_type + %w(image) + end end end end diff --git a/lib/fog/image/openstack/v2.rb b/lib/fog/image/openstack/v2.rb index 100861897..675c89759 100644 --- a/lib/fog/image/openstack/v2.rb +++ b/lib/fog/image/openstack/v2.rb @@ -106,8 +106,6 @@ class Upload # Exists for image_v2_upload_spec "describe" class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(image).collect(&:freeze).freeze - def self.not_found_class Fog::Image::OpenStack::NotFound end @@ -119,6 +117,10 @@ def default_endpoint_type def default_path_prefix 'v2' end + + def default_service_type + %w(image) + end end end end diff --git a/lib/fog/introspection/openstack.rb b/lib/fog/introspection/openstack.rb index 03102bc6b..1f9e9d81b 100644 --- a/lib/fog/introspection/openstack.rb +++ b/lib/fog/introspection/openstack.rb @@ -57,8 +57,6 @@ def self.reset def initialize(options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86_400).iso8601 - - initialize_identity options end def data @@ -73,8 +71,6 @@ def reset_data class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(baremetal-introspection).collect(&:freeze).freeze - def self.not_found_class Fog::Introspection::OpenStack::NotFound end @@ -82,6 +78,10 @@ def self.not_found_class def default_path_prefix 'v1' end + + def default_service_type + %w(baremetal-introspection) + end end end end diff --git a/lib/fog/key_manager/openstack.rb b/lib/fog/key_manager/openstack.rb index 04565a207..a47724b97 100644 --- a/lib/fog/key_manager/openstack.rb +++ b/lib/fog/key_manager/openstack.rb @@ -92,8 +92,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(key-manager).collect(&:freeze).freeze - def self.not_found_class Fog::KeyManager::OpenStack::NotFound end @@ -101,6 +99,10 @@ def self.not_found_class def default_path_prefix 'v1' end + + def default_service_type + %w(key-manager) + end end end end diff --git a/lib/fog/metering/openstack.rb b/lib/fog/metering/openstack.rb index 154d2e092..44608a4b5 100644 --- a/lib/fog/metering/openstack.rb +++ b/lib/fog/metering/openstack.rb @@ -96,8 +96,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(metering).collect(&:freeze).freeze - def self.not_found_class Fog::Metering::OpenStack::NotFound end @@ -109,6 +107,10 @@ def default_endpoint_type def default_path_prefix 'v2' end + + def default_service_type + %w(metering) + end end end end diff --git a/lib/fog/metric/openstack.rb b/lib/fog/metric/openstack.rb index 4717ae132..ada1583de 100644 --- a/lib/fog/metric/openstack.rb +++ b/lib/fog/metric/openstack.rb @@ -90,8 +90,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(metric).collect(&:freeze).freeze - def default_path_prefix 'v1' end @@ -99,6 +97,10 @@ def default_path_prefix def self.not_found_class Fog::Metric::OpenStack::NotFound end + + def default_service_type + %w(metric) + end end end end diff --git a/lib/fog/monitoring/openstack.rb b/lib/fog/monitoring/openstack.rb index 47a651140..876d4a5cd 100644 --- a/lib/fog/monitoring/openstack.rb +++ b/lib/fog/monitoring/openstack.rb @@ -74,11 +74,13 @@ class OpenStack < Fog::Service class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(monitoring).collect(&:freeze).freeze - def self.not_found_class Fog::Monitoring::OpenStack::NotFound end + + def default_service_type + %w(monitoring) + end end end end diff --git a/lib/fog/network/openstack.rb b/lib/fog/network/openstack.rb index a92f5b9fb..6f889a9e6 100644 --- a/lib/fog/network/openstack.rb +++ b/lib/fog/network/openstack.rb @@ -427,8 +427,6 @@ def self.reset def initialize(options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86400).iso8601 - - initialize_identity options end def data @@ -443,8 +441,6 @@ def reset_data class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(network).collect(&:freeze).freeze - def self.not_found_class Fog::Network::OpenStack::NotFound end @@ -452,6 +448,10 @@ def self.not_found_class def default_path_prefix 'v2.0' end + + def default_service_type + %w(network) + end end end end diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/nfv/openstack.rb index be5d8cfb3..67f962d96 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/nfv/openstack.rb @@ -82,8 +82,6 @@ def self.reset def initialize(options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86_400).iso8601 - - initialize_identity options end def data @@ -98,8 +96,6 @@ def reset_data class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(servicevm).collect(&:freeze).freeze - def self.not_found_class Fog::NFV::OpenStack::NotFound end @@ -107,6 +103,10 @@ def self.not_found_class def default_path_prefix 'v1.0' end + + def default_service_type + %w(servicevm) + end end end end diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index b14399454..19cf6eb8d 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -129,8 +129,6 @@ def self.endpoint_region?(endpoint, region) region.nil? || endpoint['region'] == region end - #TODO: Remove endpoint_path_matches - def self.get_supported_version(supported_versions, uri, auth_token, connection_options = {}) supported_version = get_version(supported_versions, uri, auth_token, connection_options) version = supported_version['id'] if supported_version diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 746112c75..5a27c973a 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -22,37 +22,6 @@ def self.not_found_class Fog::Compute::OpenStack::NotFound end - def initialize_identity(options) - # Create @openstack_* instance variables from all :openstack_* options - options.select { |x| x.to_s.start_with? 'openstack' }.each do |openstack_param, value| - instance_variable_set "@#{openstack_param}".to_sym, value - end - @auth_token ||= options[:openstack_auth_token] - - @openstack_auth_uri = URI.parse(options[:openstack_auth_url]) - @openstack_must_reauthenticate = false - @openstack_endpoint_type = options[:openstack_endpoint_type] || 'publicURL' - - @openstack_cache_ttl = options[:openstack_cache_ttl] || 0 - - if @auth_token - @openstack_can_reauthenticate = false - else - missing_credentials = [] - - missing_credentials << :openstack_api_key unless @openstack_api_key - unless @openstack_username || @openstack_userid - missing_credentials << 'openstack_username or openstack_userid' - end - raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty? - @openstack_can_reauthenticate = true - end - - @current_user = options[:current_user] - @current_user_id = options[:current_user_id] - @current_tenant = options[:current_tenant] - end - def credentials options = { :provider => 'openstack', @@ -70,6 +39,12 @@ def reload @connection.reset end + def initialize(options = {}) + setup(options) + authenticate + @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) + end + private def request(params, parse_json = true) @@ -164,12 +139,6 @@ def openstack_options options end - def initialize(options = {}) - setup(options) - authenticate - @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) - end - def api_path_prefix path = '' if @openstack_management_uri && @openstack_management_uri.path != '/' @@ -195,35 +164,50 @@ def setup(options) return end - initialize_identity(options) - @openstack_service_type = options[:openstack_service_type] || self.class::DEFAULT_SERVICE_TYPE + # Create @openstack_* instance variables from all :openstack_* options + options.select { |x| x.to_s.start_with? 'openstack' }.each do |openstack_param, value| + instance_variable_set "@#{openstack_param}".to_sym, value + end + + @auth_token ||= options[:openstack_auth_token] + @openstack_must_reauthenticate = false + @openstack_endpoint_type = options[:openstack_endpoint_type] || 'public' + @openstack_cache_ttl = options[:openstack_cache_ttl] || 0 + + if @auth_token + @openstack_can_reauthenticate = false + else + missing_credentials = [] + + missing_credentials << :openstack_api_key unless @openstack_api_key + unless @openstack_username || @openstack_userid + missing_credentials << 'openstack_username or openstack_userid' + end + raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty? + @openstack_can_reauthenticate = true + end + + @current_user = options[:current_user] + @current_user_id = options[:current_user_id] + @current_tenant = options[:current_tenant] + + @openstack_service_type = options[:openstack_service_type] || default_service_type #self.class::DEFAULT_SERVICE_TYPE @openstack_endpoint_type = options[:openstack_endpoint_type] || default_endpoint_type - @connection_options = options[:connection_options] || {} + @openstack_endpoint_type.gsub!(/URL/, '') + @connection_options = options[:connection_options] || {} @persistent = options[:persistent] || false end def authenticate if !@openstack_management_url || @openstack_must_reauthenticate + # options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token - options = openstack_options - - options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token - options[:openstack_service_type] = @openstack_service_type - - if options[:openstack_endpoint_type] =~ /URL/ - options[:openstack_endpoint_type].gsub!(/URL/, '') - end - - token = Fog::OpenStack::Auth::Token.build(options) - - endpoint_type = options[:openstack_endpoint_type] - region = options[:openstack_region] - service_type = options[:openstack_service_type] + token = Fog::OpenStack::Auth::Token.build(openstack_options) management_url = if token.catalog - token.catalog.get_endpoint_url(service_type, endpoint_type, region) + token.catalog.get_endpoint_url(@openstack_service_type, @openstack_endpoint_type, @openstack_region) else - options[:openstack_auth_url] + @openstack_auth_url end @current_user = token.user['name'] diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/orchestration/openstack.rb index 284100098..61115eae9 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/orchestration/openstack.rb @@ -126,11 +126,13 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(orchestration).collect(&:freeze).freeze - def self.not_found_class Fog::Orchestration::OpenStack::NotFound end + + def default_service_type + %w(orchestration) + end end end end diff --git a/lib/fog/planning/openstack.rb b/lib/fog/planning/openstack.rb index 8242d5d5d..5e8b36222 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/planning/openstack.rb @@ -97,8 +97,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(management).collect(&:freeze).freeze - def default_endpoint_type 'admin' end @@ -107,6 +105,10 @@ def default_path_prefix 'v2' end + def default_service_type + %w(management) + end + # NOTE: uncommenting this should be treated as api-change! # def self.not_found_class # Fog::Planning::OpenStack::NotFound diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/shared_file_system/openstack.rb index 0ba40da12..70ac093b4 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/shared_file_system/openstack.rb @@ -347,8 +347,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(sharev2).collect(&:freeze).freeze - def self.not_found_class Fog::SharedFileSystem::OpenStack::NotFound end @@ -357,6 +355,10 @@ def action_prefix microversion_newer_than?('2.6') ? '' : 'os-' end + def default_service_type + %w(sharev2) + end + def initialize(options = {}) @supported_versions = SUPPORTED_VERSIONS @supported_microversion = SUPPORTED_MICROVERSION diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index 4f674c7cf..a7b40a950 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -114,7 +114,6 @@ def self.not_found_class def initialize(options = {}) require_mime_types - initialize_identity options @openstack_service_type = options[:openstack_service_type] || ['object-store'] @openstack_service_name = options[:openstack_service_name] diff --git a/lib/fog/volume/openstack/v1.rb b/lib/fog/volume/openstack/v1.rb index 6c189a6ec..ad6805516 100644 --- a/lib/fog/volume/openstack/v1.rb +++ b/lib/fog/volume/openstack/v1.rb @@ -148,8 +148,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(volume).collect(&:freeze).freeze - def self.not_found_class Fog::Volume::OpenStack::NotFound end @@ -157,6 +155,10 @@ def self.not_found_class def default_endtpoint_type 'admin' end + + def default_service_type + %w(volume) + end end end end diff --git a/lib/fog/volume/openstack/v2.rb b/lib/fog/volume/openstack/v2.rb index 482049484..d2701543e 100644 --- a/lib/fog/volume/openstack/v2.rb +++ b/lib/fog/volume/openstack/v2.rb @@ -150,8 +150,6 @@ def credentials class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(volumev2).collect(&:freeze).freeze - def self.not_found_class Fog::Volume::OpenStack::NotFound end @@ -159,6 +157,10 @@ def self.not_found_class def default_endtpoint_type 'admin' end + + def default_service_type + %w(volumev2) + end end end end diff --git a/lib/fog/workflow/openstack/v2.rb b/lib/fog/workflow/openstack/v2.rb index 4b06f22b4..2fb8bd75d 100644 --- a/lib/fog/workflow/openstack/v2.rb +++ b/lib/fog/workflow/openstack/v2.rb @@ -83,8 +83,6 @@ def self.reset def initialize(options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86_400).iso8601 - - initialize_identity options end def data @@ -99,12 +97,14 @@ def reset_data class Real include Fog::OpenStack::Core - DEFAULT_SERVICE_TYPE = %w(workflowv2).collect(&:freeze).freeze - def default_path_prefix 'v2' end + def default_service_type + %w(workflowv2) + end + def request(params) response = @connection.request( params.merge( From fdc750686fd82008642de811dc5c7ab0e6a4686a Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 11:53:04 +1000 Subject: [PATCH 034/129] not default prefix for nova --- lib/fog/compute/openstack.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index 147a61bed..04066e197 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -376,10 +376,6 @@ def self.not_found_class Fog::Compute::OpenStack::NotFound end - def default_path_prefix - 'v2.1' - end - def default_service_type %w(compute) end From cd8c12392643bb4b40f3fa5244a2b7efe2767982 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 12:41:37 +1000 Subject: [PATCH 035/129] remove ssl_verify_mode not needed for Excon --- lib/fog/openstack/auth/token.rb | 3 --- unit/auth/token_test.rb | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb index 16dd1e0fc..12e441d4c 100644 --- a/lib/fog/openstack/auth/token.rb +++ b/lib/fog/openstack/auth/token.rb @@ -9,8 +9,6 @@ module Auth module Token attr_reader :catalog, :expires, :tenant, :token, :user, :data - SSL_VERIFY_MODE = true - class ExpiryError < RuntimeError; end class StandardError < RuntimeError; end class URLError < RuntimeError; end @@ -27,7 +25,6 @@ def initialize(auth) raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty? @creds = { :data => set_credentials(auth), - :ssl_verify_mode => auth[:ssl_verify_mode].nil? ? SSL_VERIFY_MODE : auth[:ssl_verify_mode], :uri => URI.parse(auth[:openstack_auth_url]) } response = authenticate(@creds) diff --git a/unit/auth/token_test.rb b/unit/auth/token_test.rb index 813df96ce..ac67afbf6 100644 --- a/unit/auth/token_test.rb +++ b/unit/auth/token_test.rb @@ -19,8 +19,7 @@ :openstack_auth_url => 'http://localhost/identity', :openstack_userid => 'user_id', :openstack_api_key => 'secret', - :openstack_project_id => 'project_id', - :ssl_verify_mode => false + :openstack_project_id => 'project_id' } stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). From 33afcc1bd1bd56875d3d624e93034e016f6e48a7 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 16:56:31 +1000 Subject: [PATCH 036/129] Swift: using new bootstrap too --- lib/fog/storage/openstack.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index a7b40a950..7f0073390 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -112,16 +112,15 @@ def self.not_found_class Fog::Storage::OpenStack::NotFound end + def default_service_type + %w(object-store) + end + def initialize(options = {}) require_mime_types - @openstack_service_type = options[:openstack_service_type] || ['object-store'] - @openstack_service_name = options[:openstack_service_name] - - @connection_options = options[:connection_options] || {} - + setup(options) authenticate - @persistent = options[:persistent] || false @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) end From f379dab660a46bbde3c969b6411734c214167f39 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 20:46:17 +1000 Subject: [PATCH 037/129] Use super for shared_file_system and storage too --- lib/fog/shared_file_system/openstack.rb | 7 +------ lib/fog/storage/openstack.rb | 5 +---- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/shared_file_system/openstack.rb index 70ac093b4..9f4655cca 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/shared_file_system/openstack.rb @@ -364,12 +364,7 @@ def initialize(options = {}) @supported_microversion = SUPPORTED_MICROVERSION @fixed_microversion = options[:openstack_shared_file_system_microversion] @microversion_key = 'X-Openstack-Manila-Api-Version'.freeze - - setup(options) - authenticate - set_microversion - @path = api_path_prefix - @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) + super end end end diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index 7f0073390..2f6b21f42 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -118,10 +118,7 @@ def default_service_type def initialize(options = {}) require_mime_types - - setup(options) - authenticate - @connection = Fog::Core::Connection.new(@openstack_management_url, @persistent, @connection_options) + super end # Change the current account while re-using the auth token. From a75e5cb20f51db077b6a754710b2dd195f5800e5 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 22:00:43 +1000 Subject: [PATCH 038/129] Fog::OpenStack::Core.authenticate: final cleanup --- lib/fog/openstack/core.rb | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 5a27c973a..d64fc3f99 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -200,26 +200,22 @@ def setup(options) def authenticate if !@openstack_management_url || @openstack_must_reauthenticate - # options[:openstack_auth_token] = @openstack_must_reauthenticate ? nil : @openstack_auth_token + @openstack_auth_token = nil if @openstack_must_reauthenticate token = Fog::OpenStack::Auth::Token.build(openstack_options) - management_url = if token.catalog - token.catalog.get_endpoint_url(@openstack_service_type, @openstack_endpoint_type, @openstack_region) - else - @openstack_auth_url - end + @openstack_management_url = if token.catalog + token.catalog.get_endpoint_url(@openstack_service_type, @openstack_endpoint_type, @openstack_region) + else + @openstack_auth_url + end @current_user = token.user['name'] @current_user_id = token.user['id'] @current_tenant = token.tenant - @expires = token.expires - @auth_token = token.token - @openstack_management_url = management_url @unscoped_token = token.token - @openstack_must_reauthenticate = false else @auth_token = @openstack_auth_token From f9884adddd42620dfff9edb0b2c1932e7669d5d0 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 22:31:44 +1000 Subject: [PATCH 039/129] Readjust some authenticate tests --- test/authenticate_tests.rb | 82 +++++++++++++++----------------------- 1 file changed, 33 insertions(+), 49 deletions(-) diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index e82e2e3d9..6ea5c58a7 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -120,43 +120,44 @@ end it "v2 missing service" do - skip 'adapt after new bootstrap refactor' Excon.stub( {:method => 'POST', :path => "/v2.0/tokens"}, {:status => 200, :body => Fog::JSON.encode(@body)} ) + service = Object.new + service.extend(Fog::OpenStack::Core) + service.send(:setup, + :openstack_auth_url => 'http://example', + :openstack_tenant => 'admin', + :openstack_service_type => %w[network], + :openstack_api_key => 'secret', + :openstack_username => 'user' + ) proc do - Fog::OpenStack.authenticate( - :openstack_auth_uri => URI('http://example'), - :openstack_tenant => 'admin', - :openstack_service_type => %w[network] - ) - end.must_raise Fog::Errors::NotFound, 'Could not find service network. Have compute, image' + service.send(:authenticate) + end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError end it "v2 missing storage service" do - skip 'adapt after new bootstrap refactor' Excon.stub( {:method => 'POST', :path => "/v2.0/tokens"}, {:status => 200, :body => Fog::JSON.encode(@body)} ) - proc do - Fog::OpenStack.authenticate( - :openstack_auth_uri => URI('http://example'), - :openstack_tenant => 'admin', - :openstack_service_type => 'object-store' - ) - end.must_raise NoMethodError, "undefined method `join' for \"object-store\":String" + service = Object.new + service.extend(Fog::OpenStack::Core) + service.send(:setup, + :openstack_auth_url => 'http://example', + :openstack_tenant => 'admin', + :openstack_api_key => 'secret', + :openstack_username => 'user', + :openstack_service_type => 'object-store' + ) proc do - Fog::OpenStack.authenticate( - :openstack_auth_uri => URI('http://example'), - :openstack_tenant => 'admin', - :openstack_service_type => %w[object-store] - ) - end.must_raise Fog::Errors::NotFound, "Could not find service object-store. Have compute, image" + service.send(:authenticate) + end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError end it "v2 auth with two compute services" do @@ -182,36 +183,19 @@ {:status => 200, :body => Fog::JSON.encode(body_clone)} ) - assert("http://example2:8774/v2/#{@tenant_token}") do - Fog::OpenStack.authenticate_v2( - :openstack_auth_uri => URI('http://example/v2.0/tokens'), - :openstack_tenant => 'admin', - :openstack_service_type => %w[compute], - :openstack_service_name => 'nova2')[:server_management_url] - end - end - - it "legacy v1 auth" do - headers = { - "X-Storage-Url" => "https://swift.myhost.com/v1/AUTH_tenant", - "X-Auth-Token" => "AUTH_yui193bdc00c1c46c5858788yuio0e1e2p", - "X-Trans-Id" => "iu99nm9999f9b999c9b999dad9cd999e99", - "Content-Length" => "0", - "Date" => "Wed, 07 Aug 2013 11:11:11 GMT" - } - - Excon.stub( - {:method => 'GET', :path => "/auth/v1.0"}, - {:status => 200, :body => "", :headers => headers} + service = Object.new + service.extend(Fog::OpenStack::Core) + service.send(:setup, + :openstack_auth_url => 'http://example', + :openstack_tenant => 'admin', + :openstack_api_key => 'secret', + :openstack_username => 'user', + :openstack_service_type => 'compute' ) - assert("https://swift.myhost.com/v1/AUTH_tenant") do - Fog::OpenStack.authenticate_v1( - :openstack_auth_uri => URI('https://swift.myhost.com/auth/v1.0'), - :openstack_username => 'tenant:dev', - :openstack_api_key => 'secret_key', - :openstack_service_type => %w[storage])[:server_management_url] - end + proc do + service.send(:authenticate) + end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError, 'Multiple endpoints found' end after do From 6e78243d8bad868a377441eb6fea4d9d12e52fef Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 15 Aug 2018 23:18:27 +1000 Subject: [PATCH 040/129] tests: rename jobs and beautify --- Rakefile | 12 +- fog-openstack.gemspec | 1 - lib/fog/openstack/auth/catalog.rb | 21 +-- lib/fog/openstack/auth/catalog/v2.rb | 10 +- lib/fog/openstack/auth/catalog/v3.rb | 8 +- lib/fog/openstack/auth/name.rb | 19 +- lib/fog/openstack/auth/token.rb | 8 +- lib/fog/openstack/auth/token/v2.rb | 17 +- lib/fog/openstack/auth/token/v3.rb | 92 ++++++---- lib/fog/openstack/core.rb | 42 +++-- unit/auth/catalog_test.rb | 264 ++++++++++++++++----------- unit/auth/name_test.rb | 19 +- unit/auth/token_test.rb | 237 +++++++++++++++++------- unit/auth_helper.rb | 142 +++++++++----- 14 files changed, 552 insertions(+), 340 deletions(-) diff --git a/Rakefile b/Rakefile index fc86a0807..4b5a25bfd 100644 --- a/Rakefile +++ b/Rakefile @@ -4,20 +4,20 @@ require 'rake/testtask' RuboCop::RakeTask.new -task :default => ['tests:unit', 'tests:spec', 'tests:test'] +task :default => ['tests:mock', 'tests:spec', 'tests:unit'] -task :unit => 'tests:unit' +task :mock => 'tests:mock' task :spec => "tests:spec" -task :test => 'tests:test' +task :unit => 'tests:unit' namespace :tests do - desc 'Run fog-openstack tests with Minitest' + desc 'Run fog-openstack tests with Mock class' Rake::TestTask.new do |t| ENV['FOG_MOCK']= ENV['FOG_MOCK'].nil? ? 'true' : ENV['FOG_MOCK'] - t.name = 'unit' + t.name = 'mock' t.libs.push [ "lib", "test" ] t.test_files = FileList['test/**/*.rb'] t.verbose = true @@ -33,7 +33,7 @@ namespace :tests do desc 'Run fog-openstack unit tests' Rake::TestTask.new do |t| - t.name = 'test' + t.name = 'unit' t.libs.push [ "lib", "unit" ] t.pattern = 'unit/**/*_test.rb' t.verbose = true diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index d21642736..e751c9ec3 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -36,5 +36,4 @@ Gem::Specification.new do |spec| spec.add_development_dependency 'shindo', '~> 0.3' spec.add_development_dependency 'vcr' spec.add_development_dependency 'webmock', '~> 1.24.6' - spec.add_development_dependency 'pry-byebug' end diff --git a/lib/fog/openstack/auth/catalog.rb b/lib/fog/openstack/auth/catalog.rb index 207fc7de4..41100e008 100644 --- a/lib/fog/openstack/auth/catalog.rb +++ b/lib/fog/openstack/auth/catalog.rb @@ -13,16 +13,16 @@ def initialize(payload) end def get_endpoint_url(names, interfaces, region = nil) - #TODO: Inject OpenStack Service Types Authority - names_list = if names.is_a?(String) - [names] - else - names - end + # TODO: Inject OpenStack Service Types Authority + names_list = if names.kind_of?(String) + [names] + else + names + end entries = get_by_type(names_list) raise ServiceTypeError, 'No endpoint match' if entries.empty? - interfaces_list = if interfaces.is_a?(String) + interfaces_list = if interfaces.kind_of?(String) [interfaces] else interfaces @@ -50,10 +50,9 @@ def get_by_type(names) def get_endpoint(entries, interface, region) list = [] entries.each do |type| - if type['endpoints'] - type['endpoints'].each do |endpoint| - list << endpoint_url(endpoint, interface) if endpoint_match(endpoint, interface, region) - end + next unless type.key?('endpoints') + type['endpoints'].each do |endpoint| + list << endpoint_url(endpoint, interface) if endpoint_match?(endpoint, interface, region) end end raise EndpointError, 'Multiple endpoints found' if list.size > 1 diff --git a/lib/fog/openstack/auth/catalog/v2.rb b/lib/fog/openstack/auth/catalog/v2.rb index dc1ee23f1..7cdeab41a 100644 --- a/lib/fog/openstack/auth/catalog/v2.rb +++ b/lib/fog/openstack/auth/catalog/v2.rb @@ -7,16 +7,14 @@ module Catalog class V2 include Fog::OpenStack::Auth::Catalog - def endpoint_match(endpoint, interface, region) - if region - return true if endpoint['region'] == region && endpoint["#{interface}URL"] - else - return true if endpoint["#{interface}URL"] + def endpoint_match?(endpoint, interface, region) + if endpoint.key?("#{interface}URL") + true unless !region.nil? && endpoint['region'] != region end end def endpoint_url(endpoint, interface) - return endpoint["#{interface}URL"] + endpoint["#{interface}URL"] end end end diff --git a/lib/fog/openstack/auth/catalog/v3.rb b/lib/fog/openstack/auth/catalog/v3.rb index c4756cb1b..aac581a82 100644 --- a/lib/fog/openstack/auth/catalog/v3.rb +++ b/lib/fog/openstack/auth/catalog/v3.rb @@ -7,11 +7,9 @@ module Catalog class V3 include Fog::OpenStack::Auth::Catalog - def endpoint_match(endpoint, interface, region) - if region - return true if endpoint['interface'] == interface && endpoint['region'] == region - else - return true if endpoint['interface'] == interface + def endpoint_match?(endpoint, interface, region) + if endpoint['interface'] == interface + true unless !region.nil? && endpoint['region'] != region end end diff --git a/lib/fog/openstack/auth/name.rb b/lib/fog/openstack/auth/name.rb index 7c3345b60..638f44545 100644 --- a/lib/fog/openstack/auth/name.rb +++ b/lib/fog/openstack/auth/name.rb @@ -1,29 +1,28 @@ module Fog module OpenStack module Auth - class CredentialsError < RuntimeError; end module Domain attr_accessor :domain - def identity data = {} if !id.nil? data.merge!(to_h(:id)) elsif !name.nil? && !domain.nil? data.merge!(to_h(:name)) - data.merge!({ :domain => @domain.identity }) + data[:domain] = @domain.identity else - raise Fog::OpenStack::Auth::CredentialsError, "#{self.class}: An Id, or a name with its domain, must be provided" + raise Fog::OpenStack::Auth::CredentialsError, + "#{self.class}: An Id, or a name with its domain, must be provided" end data end end - - class Name < Struct.new(:id, :name) + Name = Struct.new(:id, :name) + class Name def identity return to_h(:id) unless id.nil? return to_h(:name) unless name.nil? @@ -31,13 +30,13 @@ def identity end def to_h(var) - { var => self.send(var) } + {var => send(var)} end end class DomainScope < Name def identity - { :domain => super } + {:domain => super} end end @@ -45,7 +44,7 @@ class ProjectScope < Name include Fog::OpenStack::Auth::Domain def identity - { :project => super } + {:project => super} end end @@ -58,7 +57,7 @@ def identity data = super raise CredentialsError, "#{self.class}: No password available" if password.nil? data.merge!(to_h(:password)) - { :user => data } + {:user => data} end end end diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb index 12e441d4c..e1a33ac4b 100644 --- a/lib/fog/openstack/auth/token.rb +++ b/lib/fog/openstack/auth/token.rb @@ -24,8 +24,8 @@ def self.build(auth) def initialize(auth) raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty? @creds = { - :data => set_credentials(auth), - :uri => URI.parse(auth[:openstack_auth_url]) + :data => build_credentials(auth), + :uri => URI.parse(auth[:openstack_auth_url]) } response = authenticate(@creds) set(response) @@ -43,14 +43,14 @@ def authenticate(creds) connection = Fog::Core::Connection.new(creds[:uri].to_s, false, connection_options) request = { - :expects => [200,201], + :expects => [200, 201], :headers => {'Content-Type' => 'application/json'}, :body => Fog::JSON.encode(creds[:data]), :method => 'POST', :path => creds[:uri].path + path } - response = connection.request(request) + connection.request(request) end def expired? diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb index 3b3fb017f..22da6bc9a 100644 --- a/lib/fog/openstack/auth/token/v2.rb +++ b/lib/fog/openstack/auth/token/v2.rb @@ -5,7 +5,6 @@ module Fog module OpenStack module Auth module Token - class CredentialsError < RuntimeError; end class V2 @@ -14,22 +13,22 @@ class V2 def credentials if @token - identity = { 'token': { 'id': @token } } + identity = {'token' => {'id' => @token}} else raise CredentialsError, "#{self.class}: User name is required" if @user.name.nil? raise CredentialsError, "#{self.class}: User password is required" if @user.password.nil? - identity = { 'passwordCredentials': user_credentials } + identity = {'passwordCredentials' => user_credentials} end if @tenant.id - identity.merge!('tenantId': @tenant.id) + identity['tenantId'] = @tenant.id elsif @tenant.name - identity.merge!('tenantName': @tenant.name) + identity['tenantName'] = @tenant.name else raise CredentialsError, "#{self.class}: No tenant available" end - { 'auth': identity } + {'auth' => identity} end def path @@ -38,8 +37,8 @@ def path def user_credentials { - 'username': @user.name, - 'password': @user.password + 'username' => @user.name, + 'password' => @user.password } end @@ -53,7 +52,7 @@ def set(response) @catalog = Fog::OpenStack::Auth::Catalog::V2.new(catalog) if catalog end - def set_credentials(auth) + def build_credentials(auth) if auth[:openstack_auth_token] @token = auth[:openstack_auth_token] else diff --git a/lib/fog/openstack/auth/token/v3.rb b/lib/fog/openstack/auth/token/v3.rb index eb545104e..8dd99c8e7 100644 --- a/lib/fog/openstack/auth/token/v3.rb +++ b/lib/fog/openstack/auth/token/v3.rb @@ -10,29 +10,30 @@ class V3 attr_reader :domain, :project # Default Domain ID - DOMAIN_ID = 'default' + DOMAIN_ID = 'default'.freeze def credentials - if @token - identity = { - 'methods': ['token'], - 'token': { 'id': @token } - } - else - identity = { - 'methods': ['password'], - 'password': @user.identity - } - end + identity = if @token + { + 'methods' => ['token'], + 'token' => {'id' => @token} + } + else + { + 'methods' => ['password'], + 'password' => @user.identity + } + end + if scope { - 'auth': { - 'identity': identity, - 'scope': scope + 'auth' => { + 'identity' => identity, + 'scope' => scope } } else - { 'auth': { 'identity': identity } } + {'auth' => {'identity' => identity}} end end @@ -57,23 +58,32 @@ def set(response) end end - def set_credentials(auth) + def build_credentials(auth) if auth[:openstack_project_id] || auth[:openstack_project_name] # project scoped - @project = Fog::OpenStack::Auth::ProjectScope.new(auth[:openstack_project_id], auth[:openstack_project_name]) - - if auth[:openstack_project_domain_id] || auth[:openstack_project_domain_name] - @project.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_project_domain_id], auth[:openstack_project_domain_name]) - else - if auth[:openstack_domain_id] || auth[:openstack_domain_name] - @project.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_domain_id], auth[:openstack_domain_name]) - else - @project.domain = Fog::OpenStack::Auth::Name.new(DOMAIN_ID, nil) - end - end + @project = Fog::OpenStack::Auth::ProjectScope.new( + auth[:openstack_project_id], + auth[:openstack_project_name] + ) + @project.domain = if auth[:openstack_project_domain_id] || auth[:openstack_project_domain_name] + Fog::OpenStack::Auth::Name.new( + auth[:openstack_project_domain_id], + auth[:openstack_project_domain_name] + ) + elsif auth[:openstack_domain_id] || auth[:openstack_domain_name] + Fog::OpenStack::Auth::Name.new( + auth[:openstack_domain_id], + auth[:openstack_domain_name] + ) + else + Fog::OpenStack::Auth::Name.new(DOMAIN_ID, nil) + end elsif auth[:openstack_domain_id] || auth[:openstack_domain_name] - # domain scoped - @domain = Fog::OpenStack::Auth::DomainScope.new(auth[:openstack_domain_id], auth[:openstack_domain_name]) + # domain scoped + @domain = Fog::OpenStack::Auth::DomainScope.new( + auth[:openstack_domain_id], + auth[:openstack_domain_name] + ) end if auth[:openstack_auth_token] @@ -82,15 +92,19 @@ def set_credentials(auth) @user = Fog::OpenStack::Auth::User.new(auth[:openstack_userid], auth[:openstack_username]) @user.password = auth[:openstack_api_key] - if auth[:openstack_user_domain_id] || auth[:openstack_user_domain_name] - @user.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_user_domain_id], auth[:openstack_user_domain_name]) - else - if auth[:openstack_domain_id] || auth[:openstack_domain_name] - @user.domain = Fog::OpenStack::Auth::Name.new(auth[:openstack_domain_id], auth[:openstack_domain_name]) - else - @user.domain = Fog::OpenStack::Auth::Name.new(DOMAIN_ID, nil) - end - end + @user.domain = if auth[:openstack_user_domain_id] || auth[:openstack_user_domain_name] + Fog::OpenStack::Auth::Name.new( + auth[:openstack_user_domain_id], + auth[:openstack_user_domain_name] + ) + elsif auth[:openstack_domain_id] || auth[:openstack_domain_name] + Fog::OpenStack::Auth::Name.new( + auth[:openstack_domain_id], + auth[:openstack_domain_name] + ) + else + Fog::OpenStack::Auth::Name.new(DOMAIN_ID, nil) + end end credentials diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index d64fc3f99..c44ae2d0a 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -24,13 +24,13 @@ def self.not_found_class def credentials options = { - :provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :current_user => @current_user, - :current_user_id => @current_user_id, - :current_tenant => @current_tenant, - :unscoped_token => @unscoped_token + :provider => 'openstack', + :openstack_auth_url => @openstack_auth_uri.to_s, + :openstack_auth_token => @auth_token, + :current_user => @current_user, + :current_user_id => @current_user_id, + :current_tenant => @current_tenant, + :unscoped_token => @unscoped_token } openstack_options.merge options end @@ -50,10 +50,12 @@ def initialize(options = {}) def request(params, parse_json = true) retried = false begin - response = @connection.request(params.merge( - :headers => headers(params.delete(:headers)), - :path => "#{@path}/#{params[:path]}" - )) + response = @connection.request( + params.merge( + :headers => headers(params.delete(:headers)), + :path => "#{@path}/#{params[:path]}" + ) + ) rescue Excon::Errors::Unauthorized => error # token expiration and token renewal possible if error.response.body != 'Bad username or password' && @openstack_can_reauthenticate && !retried @@ -183,7 +185,9 @@ def setup(options) unless @openstack_username || @openstack_userid missing_credentials << 'openstack_username or openstack_userid' end - raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" unless missing_credentials.empty? + unless missing_credentials.empty? + raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" + end @openstack_can_reauthenticate = true end @@ -191,7 +195,7 @@ def setup(options) @current_user_id = options[:current_user_id] @current_tenant = options[:current_tenant] - @openstack_service_type = options[:openstack_service_type] || default_service_type #self.class::DEFAULT_SERVICE_TYPE + @openstack_service_type = options[:openstack_service_type] || default_service_type @openstack_endpoint_type = options[:openstack_endpoint_type] || default_endpoint_type @openstack_endpoint_type.gsub!(/URL/, '') @connection_options = options[:connection_options] || {} @@ -205,10 +209,14 @@ def authenticate token = Fog::OpenStack::Auth::Token.build(openstack_options) @openstack_management_url = if token.catalog - token.catalog.get_endpoint_url(@openstack_service_type, @openstack_endpoint_type, @openstack_region) - else - @openstack_auth_url - end + token.catalog.get_endpoint_url( + @openstack_service_type, + @openstack_endpoint_type, + @openstack_region + ) + else + @openstack_auth_url + end @current_user = token.user['name'] @current_user_id = token.user['id'] diff --git a/unit/auth/catalog_test.rb b/unit/auth/catalog_test.rb index e64e7971b..5766f0bd2 100644 --- a/unit/auth/catalog_test.rb +++ b/unit/auth/catalog_test.rb @@ -1,83 +1,123 @@ require 'test_helper' describe Fog::OpenStack::Auth::Catalog::V3 do + CATALOGV3 = [ + { + "endpoints" => [ + { + "region_id" => "regionOne", + "url" => "http://localhost:9696", + "region" => "regionOne", + "interface" => "internal", + "id" => "id_endpoint1_internal" + }, + { + "region_id" => "regionOne", + "url" => "http://localhost:9696", + "region" => "regionOne", + "interface" => "public", + "id" => "id_endpoint1_public" + }, + { + "region_id" => "regionOne", + "url" => "http://localhost:9696", + "region" => "regionOne", + "interface" => "admin", + "id" => "id_endpoint1_admin" + } + ], + "type" => "network", + "id" => "id1", + "name" => "neutron" + }, + { + "endpoints" => [ + { + "region_id" => "regionOne", + "url" => "http://localhost:9292", + "region" => "regionOne", + "interface" => "internal", + "id" => "id_endpoint1_internal" + }, + { + "region_id" => "regionOne", + "url" => "http://localhost:9292", + "region" => "regionOne", + "interface" => "public", + "id" => "id_endpoint1_public" + }, + { + "region_id" => "regionOne", + "url" => "http://localhost:9292", + "region" => "regionOne", + "interface" => "admin", + "id" => "id_endpoint1_admin" + } + ], + "type" => "image", + "id" => "id2", + "name" => "glance" + }, + { + "endpoints" => [ + { + "region_id" => "regionOne", + "url" => "http://localhost:5000", + "region" => "regionOne", + "interface" => "internal", + "id" => "id_endpoint1_internal" + }, + { + "region_id" => "regionOne", + "url" => "http://localhost:5000", + "region" => "regionOne", + "interface" => "public", + "id" => "id_endpoint1_public" + }, + { + "region_id" => "regionOne", + "url" => "http://localhost:35357", + "region" => "regionOne", + "interface" => "admin", + "id" => "id_endpoint1_admin" + } + ], + "type" => "identity", + "id" => "id3", + "name" => "keystone" + }, + { + "endpoints" => [ + { + "region_id" => "regionOne", + "url" => "http://localhost2:5000", + "region" => "regionTwo", + "interface" => "internal", + "id" => "id_endpoint1_internal" + }, + { + "region_id" => "regionTwo", + "url" => "http://localhost2:5000", + "region" => "regionTwo", + "interface" => "public", + "id" => "id_endpoint1_public" + }, + { + "region_id" => "regionTwo", + "url" => "http://localhost2:35357", + "region" => "regionTwo", + "interface" => "admin", + "id" => "id_endpoint1_admin" + } + ], + "type" => "identity", + "id" => "id3", + "name" => "keystone" + } + ].freeze + let(:payload) do - [{"endpoints"=> - [{"region_id"=>"regionOne", - "url"=>"http://localhost:9696", - "region"=>"regionOne", - "interface"=>"internal", - "id"=>"id_endpoint1_internal"}, - {"region_id"=>"regionOne", - "url"=>"http://localhost:9696", - "region"=>"regionOne", - "interface"=>"public", - "id"=>"id_endpoint1_public"}, - {"region_id"=>"regionOne", - "url"=>"http://localhost:9696", - "region"=>"regionOne", - "interface"=>"admin", - "id"=>"id_endpoint1_admin"}], - "type"=>"network", - "id"=>"id1", - "name"=>"neutron"}, - {"endpoints"=> - [{"region_id"=>"regionOne", - "url"=>"http://localhost:9292", - "region"=>"regionOne", - "interface"=>"internal", - "id"=>"id_endpoint1_internal"}, - {"region_id"=>"regionOne", - "url"=>"http://localhost:9292", - "region"=>"regionOne", - "interface"=>"public", - "id"=>"id_endpoint1_public"}, - {"region_id"=>"regionOne", - "url"=>"http://localhost:9292", - "region"=>"regionOne", - "interface"=>"admin", - "id"=>"id_endpoint1_admin"}], - "type"=>"image", - "id"=>"id2", - "name"=>"glance"}, - {"endpoints"=> - [{"region_id"=>"regionOne", - "url"=>"http://localhost:5000", - "region"=>"regionOne", - "interface"=>"internal", - "id"=>"id_endpoint1_internal"}, - {"region_id"=>"regionOne", - "url"=>"http://localhost:5000", - "region"=>"regionOne", - "interface"=>"public", - "id"=>"id_endpoint1_public"}, - {"region_id"=>"regionOne", - "url"=>"http://localhost:35357", - "region"=>"regionOne", - "interface"=>"admin", - "id"=>"id_endpoint1_admin"}], - "type"=>"identity", - "id"=>"id3", - "name"=>"keystone"}, - {"endpoints"=> - [{"region_id"=>"regionOne", - "url"=>"http://localhost2:5000", - "region"=>"regionTwo", - "interface"=>"internal", - "id"=>"id_endpoint1_internal"}, - {"region_id"=>"regionTwo", - "url"=>"http://localhost2:5000", - "region"=>"regionTwo", - "interface"=>"public", - "id"=>"id_endpoint1_public"}, - {"region_id"=>"regionTwo", - "url"=>"http://localhost2:35357", - "region"=>"regionTwo", - "interface"=>"admin", - "id"=>"id_endpoint1_admin"}], - "type"=>"identity", - "id"=>"id3", - "name"=>"keystone"}] + CATALOGV3 end describe '#get_endpoint_url' do @@ -88,12 +128,12 @@ it 'with matching name and interface using avail region' do catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) - catalog.get_endpoint_url('network', ['dummy', 'admin']).must_equal 'http://localhost:9696' + catalog.get_endpoint_url('network', %w[dummy admin]).must_equal 'http://localhost:9696' end it 'with matching name and interface list' do catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) - catalog.get_endpoint_url('network', ['dummy', 'admin']).must_equal 'http://localhost:9696' + catalog.get_endpoint_url('network', %w[dummy admin]).must_equal 'http://localhost:9696' end it 'with matching name and interface and several regions available' do @@ -107,7 +147,7 @@ catalog = Fog::OpenStack::Auth::Catalog::V3.new(payload) proc do catalog.get_endpoint_url('service', 'public') - end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError + end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError end it 'with unmatched region' do @@ -127,35 +167,47 @@ end describe Fog::OpenStack::Auth::Catalog::V2 do - let(:payload) do - [{ 'endpoints' => - [{ 'adminURL' => 'http://localhost', - 'region' => 'regionOne', + CATALOGV2 = [ + { + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionOne', 'internalURL' => 'http://localhost:8888/v2.0', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' }], - 'endpoints_links' => [], - 'type' => 'identity', - 'name' => 'keystone' }, - { 'endpoints' => - [{ 'adminURL' => 'http://localhost', - 'region' => 'regionTwo', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' + }], + 'endpoints_links' => [], + 'type' => 'identity', + 'name' => 'keystone' + }, + { + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionTwo', 'internalURL' => 'http://localhost:9999/v2.0', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' }], - 'endpoints_links' => [], - 'type' => 'identity', - 'name' => 'keystone' }, - { 'endpoints' => - [{ 'adminURL' => 'http://localhost', - 'region' => 'regionOne', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' + }], + 'endpoints_links' => [], + 'type' => 'identity', + 'name' => 'keystone' + }, + { + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionOne', 'internalURL' => 'http://localhost:7777/v1.0', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' }], - 'endpoints_links' => [], - 'type' => 'compute', - 'name' => 'nova' } - ] + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' + }], + 'endpoints_links' => [], + 'type' => 'compute', + 'name' => 'nova' + } + ].freeze + + let(:payload) do + CATALOGV2 end describe '#get_endpoint_url' do @@ -193,7 +245,7 @@ it 'with unmatched interface' do catalog = Fog::OpenStack::Auth::Catalog::V2.new(payload) proc do - catalog.get_endpoint_url('identity', 'private','regionTwo') + catalog.get_endpoint_url('identity', 'private', 'regionTwo') end.must_raise Fog::OpenStack::Auth::Catalog::EndpointError end end diff --git a/unit/auth/name_test.rb b/unit/auth/name_test.rb index 1b0504109..15629d9b9 100644 --- a/unit/auth/name_test.rb +++ b/unit/auth/name_test.rb @@ -15,7 +15,6 @@ name.name.must_equal 'Default' end - name = Fog::OpenStack::Auth::Name.new(nil, nil) it 'when name is null' do name = Fog::OpenStack::Auth::Name.new('default', nil) name.id.must_equal 'default' @@ -31,8 +30,8 @@ describe '#to_h' do it 'returns the hash of provided attribute' do name = Fog::OpenStack::Auth::Name.new('default', 'Default') - name.to_h(:id).must_equal ({:id => 'default'}) - name.to_h(:name).must_equal ({:name => 'Default'}) + name.to_h(:id).must_equal(:id => 'default') + name.to_h(:name).must_equal(:name => 'Default') end end end @@ -42,7 +41,7 @@ it 'set/get password' do user = Fog::OpenStack::Auth::User.new('user_id', 'User') user.password = 'secret' - user.identity.must_equal ({:user=>{:id=>'user_id', :password=>'secret'}}) + user.identity.must_equal(:user => {:id => 'user_id', :password => 'secret'}) end end @@ -51,21 +50,21 @@ it "with user id and user name" do user = Fog::OpenStack::Auth::User.new('user_id', 'User') user.password = 'secret' - user.identity.must_equal ({:user=>{:id=>'user_id', :password=>'secret'}}) + user.identity.must_equal(:user => {:id => 'user_id', :password => 'secret'}) end it 'with user name and user domain name' do user = Fog::OpenStack::Auth::User.new(nil, 'User') user.password = 'secret' user.domain = Fog::OpenStack::Auth::Name.new('default', nil) - user.identity.must_equal ({:user=>{:name=>'User', :domain=>{:id=>'default'}, :password=>'secret'}}) + user.identity.must_equal(:user => {:name => 'User', :domain => {:id => 'default'}, :password => 'secret'}) end it 'with user name and domain name' do user = Fog::OpenStack::Auth::User.new(nil, 'User') user.password = 'secret' user.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default') - user.identity.must_equal ({:user=>{:name=>'User', :domain=>{:name=>'Default'}, :password=>'secret'}}) + user.identity.must_equal(:user => {:name => 'User', :domain => {:name => 'Default'}, :password => 'secret'}) end end @@ -91,19 +90,19 @@ describe '#identity' do it "when id is provided it doesn't require domain" do project = Fog::OpenStack::Auth::ProjectScope.new('project_id', 'Project') - project.identity.must_equal ({:project=>{:id=>'project_id'}}) + project.identity.must_equal(:project => {:id => 'project_id'}) end it 'when id is nul and name is provided it uses domain id' do project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') project.domain = Fog::OpenStack::Auth::Name.new('default', nil) - project.identity.must_equal ({:project=>{:name=>'Project', :domain=>{:id=>'default'}}}) + project.identity.must_equal(:project => {:name => 'Project', :domain => {:id => 'default'}}) end it 'when id is nul and name is provided it uses domain name' do project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') project.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default') - project.identity.must_equal ({:project=>{:name=>'Project', :domain=>{:name=>'Default'}}}) + project.identity.must_equal(:project => {:name => 'Project', :domain => {:name => 'Default'}}) end it 'raises an error with no project id and no domain are provided' do diff --git a/unit/auth/token_test.rb b/unit/auth/token_test.rb index ac67afbf6..9dbf2d897 100644 --- a/unit/auth/token_test.rb +++ b/unit/auth/token_test.rb @@ -5,10 +5,15 @@ describe 'V3' do describe '#new' do it 'fails when missing credentials' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return(:status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + :status => 200, + :body => "{\"token\":{\"catalog\":[]}}", + :headers => {'x-subject-token'=>'token_data'} + ) + proc do - token = Fog::OpenStack::Auth::Token.build({}) + Fog::OpenStack::Auth::Token.build({}) end.must_raise Fog::OpenStack::Auth::Token::URLError end @@ -22,9 +27,15 @@ :openstack_project_id => 'project_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data_v3'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":\ +{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data_v3'} + ) + token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data_v3' end @@ -38,11 +49,17 @@ :openstack_project_domain_id => 'project_domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"project_domain_id\"}}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\ +\"project_domain_id\"}}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' end @@ -56,9 +73,15 @@ :openstack_project_domain_name => 'project_domain' } - stub_request(:post, "http://localhost/identity/v3/auth/tokens"). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"name\":\"project_domain\"}}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, "http://localhost/identity/v3/auth/tokens") + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\ +\"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\"\ +,\"domain\":{\"name\":\"project_domain\"}}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -74,9 +97,14 @@ :openstack_domain_id => 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -90,9 +118,14 @@ :openstack_domain_name => 'domain' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -107,9 +140,14 @@ :openstack_api_key => 'secret', } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\"user_id\",\"password\":\"secret\"}}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -125,9 +163,13 @@ :openstack_auth_token => 'token', } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -142,9 +184,14 @@ :openstack_project_id => 'project_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"project\":{\"id\":\"project_id\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -158,9 +205,14 @@ :openstack_project_domain_id => 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -175,9 +227,14 @@ :openstack_domain_id => 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -190,9 +247,14 @@ :openstack_domain_name => 'domain' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"domain\":{\"name\":\"domain\"}}}}") + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal 'token_data' @@ -214,8 +276,12 @@ describe '#get' do it 'when token has not expired' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + :status => 200, + :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(authv3_creds) token.stub :expired?, false do @@ -224,8 +290,12 @@ end it 'when token has expired' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + :status => 200, + :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(authv3_creds) token.stub :expired?, true do @@ -235,19 +305,27 @@ end it '#catalog' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return(:status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + :status => 200, + :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(authv3_creds) token.catalog.payload.must_equal ['catalog_data'] end it '#get_endpoint_url' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return(:status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v3("identity", "keystone")), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(authv3_creds) - token.catalog.get_endpoint_url(%w(identity), 'public', 'regionOne').must_equal 'http://localhost' + token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost' end end end @@ -255,8 +333,8 @@ describe 'V2' do describe '#new' do it 'fails when missing credentials' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) proc do Fog::OpenStack::Auth::Token.build({}) @@ -272,9 +350,10 @@ :openstack_tenant => 'tenant', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantName\":\"tenant\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ +\"tenantName\":\"tenant\"}}") + .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -288,9 +367,10 @@ :openstack_tenant_id => 'tenant_id', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\"tenantId\":\"tenant_id\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ +\"tenantId\":\"tenant_id\"}}") + .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -305,9 +385,9 @@ :openstack_tenant => 'tenant', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}") + .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -320,11 +400,11 @@ :openstack_tenant_id => 'tenant_id', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}") + .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) - token = Fog::OpenStack::Auth::Token.build(auth) + Fog::OpenStack::Auth::Token.build(auth) end end end @@ -341,8 +421,13 @@ describe '#get' do it 'when token has not expired' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + :status => 200, + :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":\ +[\"catalog_data\"]}}", + :headers => {} + ) token = Fog::OpenStack::Auth::Token.build(authv2_creds) token.stub :expired?, false do @@ -351,8 +436,12 @@ end it 'when token has expired' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + :status => 200, + :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", + :headers => {} + ) token = Fog::OpenStack::Auth::Token.build(authv2_creds) token.stub :expired?, true do @@ -362,19 +451,27 @@ end it '#catalog' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + :status => 200, + :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", + :headers => {} + ) token = Fog::OpenStack::Auth::Token.build(authv2_creds) token.catalog.payload.must_equal ['catalog_data'] end it '#get_endpoint_url' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + :status => 200, + :body => JSON.dump(auth_response_v2('identity', 'keystone')), + :headers => {'x-subject-token'=>'token_data'} + ) token = Fog::OpenStack::Auth::Token.build(authv2_creds) - token.catalog.get_endpoint_url(%w(identity), 'public', 'regionOne').must_equal 'http://localhost' + token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost' end end end diff --git a/unit/auth_helper.rb b/unit/auth_helper.rb index 69119cf85..c015b669b 100644 --- a/unit/auth_helper.rb +++ b/unit/auth_helper.rb @@ -1,52 +1,102 @@ def auth_response_v3(type, name) - { 'token' => - { 'methods' => ['password'], - 'roles' => [{ 'id' => 'id_roles', 'name' => 'admin' }], + { + 'token' => { + 'methods' => ['password'], + 'roles' => [{ + 'id' => 'id_roles', + 'name' => 'admin' + }], 'expires_at' => '2017-11-29T07:45:29.908554Z', - 'project' => { 'domain' => { 'id' => 'default', 'name' => 'Default' }, 'id' => 'project_id', 'name' => 'admin' }, - 'catalog' => - [{ 'endpoints' => - [{ 'region_id' => 'regionOne', - 'url' => 'http://localhost', - 'region' => 'regionOne', - 'interface' => 'internal', - 'id' => 'id_endpoint_internal' }, - { 'region_id' => 'regionOne', - 'url' => 'http://localhost', - 'region' => 'regionOne', - 'interface' => 'public', - 'id' => 'id_endpoint_public' }, - { 'region_id' => 'regionOne', - 'url' => 'http://localhost', - 'region' => 'regionOne', - 'interface' => 'admin', - 'id' => 'id_endpoint_admin' }], - 'type' => type, - 'id' => 'id_endpoints', - 'name' => name }], - 'user' => { 'domain' => { 'id' => 'default', 'name' => 'Default' }, 'id' => 'id_user', 'name' => 'admin' }, - 'audit_ids' => ['id_audits'], - 'issued_at' => '2017-11-29T06:45:29.908578Z' } } + 'project' => { + 'domain' => { + 'id' => 'default', + 'name' => 'Default' + }, + 'id' => 'project_id', + 'name' => 'admin' + }, + 'catalog' => [{ + 'endpoints' => [ + { + 'region_id' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', + 'interface' => 'internal', + 'id' => 'id_endpoint_internal' + }, + { + 'region_id' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', + 'interface' => 'public', + 'id' => 'id_endpoint_public' + }, + { + 'region_id' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', + 'interface' => 'admin', + 'id' => 'id_endpoint_admin' + } + ], + 'type' => type, + 'id' => 'id_endpoints', + 'name' => name + }], + 'user' => { + 'domain' => { + 'id' => 'default', + 'name' => 'Default' + }, + 'id' => 'id_user', + 'name' => 'admin' + }, + 'audit_ids' => ['id_audits'], + 'issued_at' => '2017-11-29T06:45:29.908578Z' + } + } end def auth_response_v2(type, name) - { 'access' => - { 'token' => - { 'issued_at' => '2017-12-05T10:44:31.454741Z', - 'expires' => '2017-12-05T11:44:31Z', - 'id' => '4ae647d3a5294690a3c29bc658e17e26', - 'tenant' => { 'description' => 'admin tenant', 'enabled' => true, 'id' => 'tenant_id', 'name' => 'admin' }, - 'audit_ids' => ['Ye0Rq1HzTk2ggUAg8nDGbQ'] }, - 'serviceCatalog' => - [{ 'endpoints' => - [{ 'adminURL' => 'http://localhost', - 'region' => 'regionOne', - 'internalURL' => 'http://localhost', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' }], - 'endpoints_links' => [], - 'type' => type, - 'name' => name }], - 'user' => { 'username' => 'admin', 'roles_links' => [], 'id' => 'user_id', 'roles' => [{ 'name' => 'admin' }], 'name' => 'admin' }, - 'metadata' => { 'is_admin' => 0, 'roles' => ['role_id'] } } } + { + 'access' => { + 'token' => { + 'issued_at' => '2017-12-05T10:44:31.454741Z', + 'expires' => '2017-12-05T11:44:31Z', + 'id' => '4ae647d3a5294690a3c29bc658e17e26', + 'tenant' => { + 'description' => 'admin tenant', + 'enabled' => true, + 'id' => 'tenant_id', + 'name' => 'admin' + }, + 'audit_ids' => ['Ye0Rq1HzTk2ggUAg8nDGbQ'] + }, + 'serviceCatalog' => [{ + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionOne', + 'internalURL' => 'http://localhost', + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' + }], + 'endpoints_links' => [], + 'type' => type, + 'name' => name + }], + 'user' => { + 'username' => 'admin', + 'roles_links' => [], + 'id' => 'user_id', + 'roles' => [{ + 'name' => 'admin' + }], + 'name' => 'admin' + }, + 'metadata' => { + 'is_admin' => 0, + 'roles' => ['role_id'] + } + } + } end From b1d602d9987868e1a2f18b2fcea7ed8751f06b79 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 16 Aug 2018 16:45:43 +1000 Subject: [PATCH 041/129] fix rubocop including legacy --- lib/fog/baremetal/openstack.rb | 2 +- lib/fog/compute/openstack.rb | 2 +- lib/fog/container_infra/openstack.rb | 2 +- lib/fog/dns/openstack/v1.rb | 2 +- lib/fog/dns/openstack/v2.rb | 2 +- lib/fog/event/openstack.rb | 2 +- lib/fog/identity/openstack/v2.rb | 2 +- lib/fog/identity/openstack/v3.rb | 2 +- lib/fog/image/openstack/v1.rb | 2 +- lib/fog/image/openstack/v2.rb | 2 +- lib/fog/introspection/openstack.rb | 2 +- lib/fog/key_manager/openstack.rb | 2 +- lib/fog/metering/openstack.rb | 2 +- lib/fog/metric/openstack.rb | 2 +- lib/fog/monitoring/openstack.rb | 2 +- lib/fog/network/openstack.rb | 2 +- lib/fog/nfv/openstack.rb | 2 +- lib/fog/openstack.rb | 4 +- lib/fog/orchestration/openstack.rb | 2 +- lib/fog/planning/openstack.rb | 2 +- lib/fog/shared_file_system/openstack.rb | 2 +- lib/fog/storage/openstack.rb | 2 +- lib/fog/volume/openstack/v1.rb | 2 +- lib/fog/volume/openstack/v2.rb | 2 +- lib/fog/workflow/openstack/v2.rb | 2 +- spec/identity_v3_spec.rb | 123 ++++++++++--------- spec/image_v2_spec.rb | 20 +-- spec/image_v2_upload_spec.rb | 18 ++- spec/monitoring_spec.rb | 30 ++--- spec/network_spec.rb | 4 +- spec/shared_context.rb | 4 +- spec/shared_file_system_spec.rb | 1 - spec/volume_spec.rb | 132 +++++++++----------- test/authenticate_tests.rb | 41 +++---- unit/auth/token_test.rb | 154 ++++++++++++------------ 35 files changed, 292 insertions(+), 287 deletions(-) diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/baremetal/openstack.rb index adb4717d8..1fe214fd0 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/baremetal/openstack.rb @@ -249,7 +249,7 @@ class Real include Fog::OpenStack::Core def default_service_type - %w(baremetal) + %w[baremetal] end # NOTE: uncommenting this should be treated as api-change! diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index 04066e197..c8cd2953f 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -377,7 +377,7 @@ def self.not_found_class end def default_service_type - %w(compute) + %w[compute] end def initialize(options = {}) diff --git a/lib/fog/container_infra/openstack.rb b/lib/fog/container_infra/openstack.rb index b3ed3b9c3..0af0edba9 100644 --- a/lib/fog/container_infra/openstack.rb +++ b/lib/fog/container_infra/openstack.rb @@ -131,7 +131,7 @@ def default_path_prefix end def default_service_type - %w(container-infra) + %w[container-infra] end def request(options = {}) diff --git a/lib/fog/dns/openstack/v1.rb b/lib/fog/dns/openstack/v1.rb index c53d6faa7..51a2e4030 100644 --- a/lib/fog/dns/openstack/v1.rb +++ b/lib/fog/dns/openstack/v1.rb @@ -107,7 +107,7 @@ def default_path_prefix end def default_service_type - %w(dns) + %w[dns] end end end diff --git a/lib/fog/dns/openstack/v2.rb b/lib/fog/dns/openstack/v2.rb index 88582a740..7c454198e 100644 --- a/lib/fog/dns/openstack/v2.rb +++ b/lib/fog/dns/openstack/v2.rb @@ -316,7 +316,7 @@ def default_path_prefix end def default_service_type - %w(dns) + %w[dns] end end end diff --git a/lib/fog/event/openstack.rb b/lib/fog/event/openstack.rb index ec658d01b..8fcd9c0ef 100644 --- a/lib/fog/event/openstack.rb +++ b/lib/fog/event/openstack.rb @@ -93,7 +93,7 @@ def default_path_prefix end def default_service_type - %w(event) + %w[event] end end end diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/identity/openstack/v2.rb index d73f8c8e5..8c76ff00c 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/identity/openstack/v2.rb @@ -174,7 +174,7 @@ def default_path_prefix end def default_service_type - %w(identity_v2 identityv2 identity) + %w[identity_v2 identityv2 identity] end end end diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/identity/openstack/v3.rb index f642fb9ea..e3ba5d98d 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/identity/openstack/v3.rb @@ -147,7 +147,7 @@ def default_path_prefix end def default_service_type - %w(identity_v3 identityv3 identity) + %w[identity_v3 identityv3 identity] end end end diff --git a/lib/fog/image/openstack/v1.rb b/lib/fog/image/openstack/v1.rb index d61a88433..8f4db66d6 100644 --- a/lib/fog/image/openstack/v1.rb +++ b/lib/fog/image/openstack/v1.rb @@ -111,7 +111,7 @@ def default_path_prefix end def default_service_type - %w(image) + %w[image] end end end diff --git a/lib/fog/image/openstack/v2.rb b/lib/fog/image/openstack/v2.rb index 675c89759..9672c7ab1 100644 --- a/lib/fog/image/openstack/v2.rb +++ b/lib/fog/image/openstack/v2.rb @@ -119,7 +119,7 @@ def default_path_prefix end def default_service_type - %w(image) + %w[image] end end end diff --git a/lib/fog/introspection/openstack.rb b/lib/fog/introspection/openstack.rb index 1f9e9d81b..648ce0754 100644 --- a/lib/fog/introspection/openstack.rb +++ b/lib/fog/introspection/openstack.rb @@ -80,7 +80,7 @@ def default_path_prefix end def default_service_type - %w(baremetal-introspection) + %w[baremetal-introspection] end end end diff --git a/lib/fog/key_manager/openstack.rb b/lib/fog/key_manager/openstack.rb index a47724b97..533879f8f 100644 --- a/lib/fog/key_manager/openstack.rb +++ b/lib/fog/key_manager/openstack.rb @@ -101,7 +101,7 @@ def default_path_prefix end def default_service_type - %w(key-manager) + %w[key-manager] end end end diff --git a/lib/fog/metering/openstack.rb b/lib/fog/metering/openstack.rb index 44608a4b5..993ab5846 100644 --- a/lib/fog/metering/openstack.rb +++ b/lib/fog/metering/openstack.rb @@ -109,7 +109,7 @@ def default_path_prefix end def default_service_type - %w(metering) + %w[metering] end end end diff --git a/lib/fog/metric/openstack.rb b/lib/fog/metric/openstack.rb index ada1583de..453c754b3 100644 --- a/lib/fog/metric/openstack.rb +++ b/lib/fog/metric/openstack.rb @@ -99,7 +99,7 @@ def self.not_found_class end def default_service_type - %w(metric) + %w[metric] end end end diff --git a/lib/fog/monitoring/openstack.rb b/lib/fog/monitoring/openstack.rb index 876d4a5cd..120ec119c 100644 --- a/lib/fog/monitoring/openstack.rb +++ b/lib/fog/monitoring/openstack.rb @@ -79,7 +79,7 @@ def self.not_found_class end def default_service_type - %w(monitoring) + %w[monitoring] end end end diff --git a/lib/fog/network/openstack.rb b/lib/fog/network/openstack.rb index 6f889a9e6..fb17834ce 100644 --- a/lib/fog/network/openstack.rb +++ b/lib/fog/network/openstack.rb @@ -450,7 +450,7 @@ def default_path_prefix end def default_service_type - %w(network) + %w[network] end end end diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/nfv/openstack.rb index 67f962d96..b74c26119 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/nfv/openstack.rb @@ -105,7 +105,7 @@ def default_path_prefix end def default_service_type - %w(servicevm) + %[wservicevm] end end end diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index 19cf6eb8d..2b5a4cc42 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -162,9 +162,7 @@ def self.get_version(supported_versions, uri, auth_token, connection_options = { version_cache = "#{uri}#{supported_versions}" return @version[version_cache] if @version && @version[version_cache] - # Clear version suffix from path - # This is needed because when catalog endpoint is not top level - # or '/' to allow version discovery + # To allow version discovery we need a "version less" endpoint path = uri.path.gsub(/\/v([1-9]+\d*)(\.[1-9]+\d*)*.*$/, '/') url = "#{uri.scheme}://#{uri.host}:#{uri.port}#{path}" connection = Fog::Core::Connection.new(url, false, connection_options) diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/orchestration/openstack.rb index 61115eae9..34d971d20 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/orchestration/openstack.rb @@ -131,7 +131,7 @@ def self.not_found_class end def default_service_type - %w(orchestration) + %w[orchestration] end end end diff --git a/lib/fog/planning/openstack.rb b/lib/fog/planning/openstack.rb index 5e8b36222..b04c875c0 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/planning/openstack.rb @@ -106,7 +106,7 @@ def default_path_prefix end def default_service_type - %w(management) + %w[management] end # NOTE: uncommenting this should be treated as api-change! diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/shared_file_system/openstack.rb index 9f4655cca..c812db111 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/shared_file_system/openstack.rb @@ -356,7 +356,7 @@ def action_prefix end def default_service_type - %w(sharev2) + %w[sharev2] end def initialize(options = {}) diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index 2f6b21f42..49148dc8c 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -113,7 +113,7 @@ def self.not_found_class end def default_service_type - %w(object-store) + %w[object-store] end def initialize(options = {}) diff --git a/lib/fog/volume/openstack/v1.rb b/lib/fog/volume/openstack/v1.rb index ad6805516..03ed14513 100644 --- a/lib/fog/volume/openstack/v1.rb +++ b/lib/fog/volume/openstack/v1.rb @@ -157,7 +157,7 @@ def default_endtpoint_type end def default_service_type - %w(volume) + %w[volume] end end end diff --git a/lib/fog/volume/openstack/v2.rb b/lib/fog/volume/openstack/v2.rb index d2701543e..64a1de788 100644 --- a/lib/fog/volume/openstack/v2.rb +++ b/lib/fog/volume/openstack/v2.rb @@ -159,7 +159,7 @@ def default_endtpoint_type end def default_service_type - %w(volumev2) + %w[volumev2] end end end diff --git a/lib/fog/workflow/openstack/v2.rb b/lib/fog/workflow/openstack/v2.rb index 2fb8bd75d..fbd829b87 100644 --- a/lib/fog/workflow/openstack/v2.rb +++ b/lib/fog/workflow/openstack/v2.rb @@ -102,7 +102,7 @@ def default_path_prefix end def default_service_type - %w(workflowv2) + %w[workflowv2] end def request(params) diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index c4dbee7da..6faf12dc5 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -53,15 +53,17 @@ end endpoints_in_region = @endpoints_all.select { |endpoint| endpoint.region == @openstack_vcr.region_other } - VCR.use_cassette('idv3_other_region') do - @fog = Fog::Identity::OpenStack::V3.new( - :openstack_region => @openstack_vcr.region_other, - :openstack_auth_url => @os_auth_url, - :openstack_userid => @openstack_vcr.user_id, - :openstack_api_key => @openstack_vcr.password - ) - @fog.wont_equal nil - end unless endpoints_in_region.empty? + unless endpoints_in_region.empty? + VCR.use_cassette('idv3_other_region') do + @fog = Fog::Identity::OpenStack::V3.new( + :openstack_region => @openstack_vcr.region_other, + :openstack_auth_url => @os_auth_url, + :openstack_userid => @openstack_vcr.user_id, + :openstack_api_key => @openstack_vcr.password + ) + @fog.wont_equal nil + end + end end it 'get an unscoped token, then reauthenticate with it' do @@ -131,7 +133,7 @@ it "find specific user, lists users" do VCR.use_cassette('idv3_users') do - proc { nonexistent_user = @service.users.find_by_id 'u-random-blah' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::Identity::OpenStack::NotFound admin_user = @service.users.find_by_name @openstack_vcr.username admin_user.length.must_equal 1 @@ -154,10 +156,12 @@ it 'CRUD users' do VCR.use_cassette('idv3_user_crud') do # Make sure there are no existing users called foobar or baz - ['foobar', 'baz'].each do |username| + %w[foobar baz].each do |username| user = @service.users.find_by_name(username).first - user.update(:enabled => false) if user - user.destroy if user + if user + user.update(:enabled => false) + user.destroy + end end @service.users.find_by_name('foobar').length.must_equal 0 @service.users.find_by_name('baz').length.must_equal 0 @@ -192,7 +196,7 @@ baz_user.destroy # Check that the deletion worked proc { @service.users.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound - @service.users.all.select { |user| ['foobar', 'baz'].include? user.name }.length.must_equal 0 + @service.users.all.select { |user| %w[foobar baz].include? user.name }.length.must_equal 0 @service.users.find_by_name('foobar').length.must_equal 0 @service.users.find_by_name('baz').length.must_equal 0 end @@ -201,8 +205,8 @@ it "CRUD & manipulate groups" do VCR.use_cassette('idv3_group_crud_mutation') do # Make sure there are no existing groups called foobar or baz - @service.groups.all.select { |group| %w(foobar baz).include? group.name }.each(&:destroy) - @service.groups.all.select { |group| %w(foobar baz).include? group.name }.length.must_equal 0 + @service.groups.all.select { |group| %w[foobar baz].include? group.name }.each(&:destroy) + @service.groups.all.select { |group| %w[foobar baz].include? group.name }.length.must_equal 0 # Create a group called foobar foobar_group = @service.groups.create(:name => 'foobar', :description => "Group of Foobar users") @@ -255,7 +259,7 @@ # Delete the group baz_group.destroy proc { @service.groups.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound - @service.groups.all.select { |group| ['foobar', 'baz'].include? group.name }.length.must_equal 0 + @service.groups.all.select { |group| %w[foobar baz].include? group.name }.length.must_equal 0 end end @@ -264,7 +268,7 @@ auth = { :auth => { :identity => { - :methods => %w(password), + :methods => %w[password], :password => { :user => { :id => @openstack_vcr.user_id, @@ -302,7 +306,6 @@ auth_url = @os_auth_url begin - foobar_user = @service.users.create( :name => 'foobar_385', :email => 'foobar_demo@example.com', @@ -339,9 +342,9 @@ end.must_raise Excon::Errors::NotFound ensure # Clean up - foobar_user = @service.users.find_by_name('foobar_385').first unless foobar_user + foobar_user ||= @service.users.find_by_name('foobar_385').first foobar_user.destroy if foobar_user - foobar_role = @service.roles.all.select { |role| role.name == 'foobar_role390' }.first unless foobar_role + foobar_role ||= @service.roles.all.select { |role| role.name == 'foobar_role390' }.first foobar_role.destroy if foobar_role end end @@ -385,15 +388,19 @@ ensure # Delete the domains begin - baz_domain.update(:enabled => false) if baz_domain - baz_domain.destroy if baz_domain - foobar_domain.update(:enabled => false) if foobar_domain - foobar_domain.destroy if foobar_domain + if baz_domain + baz_domain.update(:enabled => false) + baz_domain.destroy + end + if foobar_domain + foobar_domain.update(:enabled => false) + foobar_domain.destroy + end rescue end # Check that the deletion worked proc { @service.domains.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id - ['foobar', 'baz'].each do |domain_name| + %w[foobar baz].each do |domain_name| @service.domains.all(:name => domain_name).length.must_equal 0 end end @@ -434,9 +441,9 @@ foobar_user.revoke_role(foobar_role.id) foobar_user.check_role(foobar_role.id).must_equal false ensure - foobar_user = @service.users.find_by_name('foobar_role_user').first unless foobar_user + foobar_user ||= @service.users.find_by_name('foobar_role_user').first foobar_user.destroy if foobar_user - foobar_role = @service.roles.all.select { |role| role.name == 'foobar_role' }.first unless foobar_role + foobar_role ||= @service.roles.all.select { |role| role.name == 'foobar_role' }.first foobar_role.destroy if foobar_role end end @@ -450,14 +457,14 @@ foobar_domain = @service.domains.create(:name => 'd-foobar') # Create a group in this domain - foobar_group = @service.groups.create(:name => 'g-foobar', + foobar_group = @service.groups.create(:name => 'g-foobar', :description => "Group of Foobar users", - :domain_id => foobar_domain.id) + :domain_id => foobar_domain.id) # Create a user in the domain - foobar_user = @service.users.create(:name => 'u-foobar_foobar', - :email => 'foobar@example.com', - :password => 's3cret!', + foobar_user = @service.users.create(:name => 'u-foobar_foobar', + :email => 'foobar@example.com', + :password => 's3cret!', :domain_id => foobar_domain.id) # User has no roles initially @@ -496,15 +503,17 @@ @service.role_assignments.all(:user_id => foobar_user.id, :effective => true).length.must_equal 0 ensure # Clean up - foobar_user = @service.users.find_by_name('u-foobar_foobar').first unless foobar_user + foobar_user ||= @service.users.find_by_name('u-foobar_foobar').first foobar_user.destroy if foobar_user - foobar_group = @service.groups.all.select { |group| group.name == 'g-foobar' }.first unless foobar_group + foobar_group ||= @service.groups.all.select { |group| group.name == 'g-foobar' }.first foobar_group.destroy if foobar_group - foobar_role = @service.roles.all.select { |role| role.name == 'foobar_role' }.first unless foobar_role - foobar_role.destroy if foobar_role - foobar_domain = @service.domains.all.select { |domain| domain.name == 'd-foobar' }.first unless foobar_domain - foobar_domain.update(:enabled => false) if foobar_domain - foobar_domain.destroy if foobar_domain + foobar_role ||= @service.roles.all.select { |role| role.name == 'foobar_role' }.first + foobar_role.destroyif foobar_role + foobar_domain ||= @service.domains.all.select { |domain| domain.name == 'd-foobar' }.first + if foobar_domain + foobar_domain.update(:enabled => false) + foobar_domain.destroy + end end end end @@ -547,7 +556,7 @@ baz_role = nil # Check that the deletion worked proc { @service.roles.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id - ['foobar23', 'baz23'].each do |role_name| + %w[foobar23 baz23].each do |role_name| @service.roles.all(:name => role_name).length.must_equal 0 end ensure @@ -687,7 +696,7 @@ boo_project.destroy if boo_project baz_project.destroy if baz_project foobar_project.destroy if foobar_project - prj_role = @service.roles.all(:name => 'r-project67').first unless prj_role + prj_role ||= @service.roles.all(:name => 'r-project67').first prj_role.destroy if prj_role # Check that the deletion worked proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id @@ -777,14 +786,15 @@ foobar_project.revoke_role_from_group(baz_role.id, foobar_group.id) foobar_user.projects.length.must_equal 0 foobar_project.check_group_role(foobar_group.id, baz_role.id).must_equal false - ensure # Clean up foobar_user.destroy if foobar_user foobar_group.destroy if foobar_group baz_role.destroy if baz_role - foobar_project.update(:enabled => false) if foobar_project - foobar_project.destroy if foobar_project + if foobar_project + foobar_project.update(:enabled => false) + foobar_project.destroy + end end end end @@ -808,7 +818,7 @@ it "CRUD services" do VCR.use_cassette('idv3_services_crud') do - all_services = @service.services.all + @service.services.all begin # Create a service called foobar @@ -832,7 +842,7 @@ # Check that the deletion worked proc { @service.services.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id - @service.services.all.select { |service| ['foobar', 'baz'].include? service.name }.length.must_equal 0 + @service.services.all.select { |service| %w[foobar baz].include? service.name }.length.must_equal 0 end end end @@ -857,7 +867,7 @@ it "CRUD endpoints" do VCR.use_cassette('idv3_endpoints_crud') do service = @service.services.all.first - all_endpoints = @service.endpoints.all + @service.endpoints.all begin # Create a endpoint called foobar @@ -867,7 +877,9 @@ :url => 'http://example.com/foobar', :enabled => false) foobar_id = foobar_endpoint.id - @service.endpoints.all(:interface => 'internal').select { |endpoint| endpoint.name == 'foobar' }.length.must_equal 1 + @service.endpoints.all(:interface => 'internal').select do |endpoint| + endpoint.name == 'foobar' + end.length.must_equal 1 # Rename it to baz foobar_endpoint.update(:name => 'baz', :url => 'http://example.com/baz') @@ -875,7 +887,9 @@ foobar_endpoint.url.must_equal 'http://example.com/baz' # Read the endpoint freshly and check the name - @service.endpoints.all(:interface => 'internal').select { |endpoint| endpoint.name == 'baz' }.length.must_equal 1 + @service.endpoints.all(:interface => 'internal').select do |endpoint| + endpoint.name == 'baz' + end.length.must_equal 1 baz_endpoint = @service.endpoints.find_by_id foobar_id baz_endpoint.wont_equal nil baz_endpoint.name.must_equal 'baz' @@ -887,7 +901,7 @@ # Check that the deletion worked proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound - @service.endpoints.all.select { |endpoint| ['foobar', 'baz'].include? endpoint.name }.length.must_equal 0 + @service.endpoints.all.select { |endpoint| %w[foobar baz].include? endpoint.name }.length.must_equal 0 end end end @@ -949,9 +963,8 @@ updated_credential.wont_equal nil updated_credential.type.must_equal 'ec2' JSON.parse(updated_credential.blob)['secret'].must_equal new_secret_key - ensure - foobar_user = @service.users.find_by_name('u-foobar_cred').first unless foobar_user + foobar_user ||= @service.users.find_by_name('u-foobar_cred').first foobar_user.destroy if foobar_user # Delete the credential begin @@ -962,7 +975,9 @@ end # Check that the deletion worked - proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::Identity::OpenStack::NotFound if credential_id + if credential_id + proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::Identity::OpenStack::NotFound + end @service.os_credentials.all.select { |credential| credential.type == 'ec2' }.length.must_equal 0 end end diff --git a/spec/image_v2_spec.rb b/spec/image_v2_spec.rb index ead1a8356..90e0b6120 100644 --- a/spec/image_v2_spec.rb +++ b/spec/image_v2_spec.rb @@ -15,7 +15,13 @@ def cleanup_image(image, image_name = nil, image_id = nil) # Delete the image image.destroy if image - image_by_id = @service.images.find_by_id(image_id) rescue false if image_id + if image_id + begin + image_by_id = @service.images.find_by_id(image_id) + rescue + false + end + end image_by_id.destroy if image_by_id if image_name @service.images.all(:name => image_name).each(&:destroy) @@ -52,7 +58,6 @@ def cleanup_image(image, image_name = nil, image_id = nil) images = @service.images.all(:name => image_rename) images.length.must_equal 1 images.first.id.must_equal baz_image.id - ensure cleanup_image baz_image @service.images.all.select { |image| [image_name, image_rename].include? image.name }.each(&:destroy) @@ -79,7 +84,6 @@ def cleanup_image(image, image_name = nil, image_id = nil) get_image = @service.images.find_by_id(identifier) get_image.name.must_equal image_name - ensure cleanup_image foobar_image, image_name, foobar_id end @@ -194,7 +198,6 @@ def cleanup_image(image, image_name = nil, image_id = nil) # Bulk download downloaded_data = foobar_image.download_data downloaded_data.size.must_equal File.size(image_path) - ensure cleanup_image foobar_image, image_name end @@ -242,15 +245,14 @@ def cleanup_image(image, image_name = nil, image_id = nil) foobar_image.add_tag 'tag1' @service.images.find_by_id(foobar_id).tags.must_include 'tag1' - foobar_image.add_tags %w(tag2 tag3 tag4) - @service.images.find_by_id(foobar_id).tags.must_equal %w(tag4 tag1 tag2 tag3) + foobar_image.add_tags %w[tag2 tag3 tag4] + @service.images.find_by_id(foobar_id).tags.must_equal %w[tag4 tag1 tag2 tag3] foobar_image.remove_tag 'tag2' - @service.images.find_by_id(foobar_id).tags.must_equal %w(tag4 tag1 tag3) + @service.images.find_by_id(foobar_id).tags.must_equal %w[tag4 tag1 tag3] - foobar_image.remove_tags %w(tag1 tag3) + foobar_image.remove_tags %w[tag1 tag3] @service.images.find_by_id(foobar_id).tags.must_include 'tag4' - ensure cleanup_image foobar_image, image_name end diff --git a/spec/image_v2_upload_spec.rb b/spec/image_v2_upload_spec.rb index 2ee4cadc1..18763a7dd 100644 --- a/spec/image_v2_upload_spec.rb +++ b/spec/image_v2_upload_spec.rb @@ -2,7 +2,9 @@ describe Fog::Image::OpenStack do it "Upload/download image data using chunked IO" do - if ENV['OS_AUTH_URL'] # We only run this against a live system, because VCR's use of Webmock stops Excon :response_block from working correctly + # We only run this against a live system, + # because VCR's use of Webmock stops Excon :response_block from working correctly + if ENV['OS_AUTH_URL'] @os_auth_url = ENV['OS_AUTH_URL'] @@ -10,14 +12,14 @@ Excon.defaults[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false' # setup the service object - @service = Fog::Image::OpenStack.new( + @service ||= Fog::Image::OpenStack.new( :openstack_auth_url => "#{@os_auth_url}/auth/tokens", :openstack_project_name => ENV.fetch('OS_PROJECT_NAME'), :openstack_username => ENV.fetch('OS_USERNAME'), :openstack_api_key => ENV.fetch('OS_PASSWORD'), :openstack_region => ENV['OS_REGION_NAME'] || 'RegionOne', :openstack_domain_name => ENV['OS_USER_DOMAIN_NAME'] || 'Default' - ) unless @service + ) spec_data_folder = 'spec/fixtures/openstack/image_v2' @@ -25,7 +27,8 @@ #### ## Upload & download data using request/response blocks so we can stream data effectively #### - image_path = "#{spec_data_folder}/minimal.ova" # "no-op" virtual machine image, 80kB .ova file containing 64Mb dynamic disk + # "no-op" virtual machine image, 80kB .ova file containing 64Mb dynamic disk + image_path = "#{spec_data_folder}/minimal.ova" foobar_image = @service.images.create(:name => 'foobar_up2', :container_format => 'ovf', @@ -52,7 +55,6 @@ end foobar_image.download_data(:response_block => read_block) size.must_equal File.size(image_path) - ensure # Delete the image foobar_image.destroy if foobar_image @@ -60,7 +62,11 @@ @service.images.all(:name => 'foobar_up2').each(&:destroy) # Check that the deletion worked - proc { @service.images.find_by_id foobar_id }.must_raise Fog::Image::OpenStack::NotFound if foobar_id + if foobar_id + proc do + @service.images.find_by_id foobar_id + end.must_raise Fog::Image::OpenStack::NotFound + end @service.images.all(:name => 'foobar_up2').length.must_equal 0 end end diff --git a/spec/monitoring_spec.rb b/spec/monitoring_spec.rb index 473fe2203..bf7ee77f8 100644 --- a/spec/monitoring_spec.rb +++ b/spec/monitoring_spec.rb @@ -71,10 +71,13 @@ metrics_name_list.wont_be_empty # failure cases - proc { @service.metrics.create(:name => "this won't be created due to insufficient args") }. - must_raise ArgumentError - proc { @service.metrics.create(:name => "this wont't be created due to invalid timestamp", :timestamp => 1234) }. - must_raise ArgumentError + proc do + @service.metrics.create(:name => "this won't be created due to insufficient args") + end.must_raise ArgumentError + + proc do + @service.metrics.create(:name => "this wont't be created due to invalid timestamp", :timestamp => 1234) + end.must_raise ArgumentError end end @@ -142,13 +145,15 @@ notification_method = nil # failure cases - proc { @service.notification_methods.create(:name => "this won't be created due to insufficient args") }. - must_raise ArgumentError - proc { @service.notification_methods.find_by_id('bogus_id') }.must_raise Fog::Monitoring::OpenStack::NotFound + proc do + @service.notification_methods.create(:name => "this won't be created due to insufficient args") + end.must_raise ArgumentError + proc do + @service.notification_methods.find_by_id('bogus_id') + end.must_raise Fog::Monitoring::OpenStack::NotFound ensure notification_method.destroy if notification_method - end end end @@ -219,13 +224,12 @@ notification_method = nil # failure cases - proc { @service.alarm_definitions.create(:name => "this won't be created due to insufficient args") }. - must_raise ArgumentError - + proc do + @service.alarm_definitions.create(:name => "this won't be created due to insufficient args") + end.must_raise ArgumentError ensure alarm_definition.destroy if alarm_definition notification_method.destroy if notification_method - end end end @@ -308,12 +312,10 @@ alarm_definition = nil notification_method = nil - ensure # cleanup alarm_definition.destroy if alarm_definition notification_method.destroy if notification_method - end end end diff --git a/spec/network_spec.rb b/spec/network_spec.rb index cabd1d4fa..5a8f16888 100644 --- a/spec/network_spec.rb +++ b/spec/network_spec.rb @@ -13,7 +13,7 @@ openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Identity::OpenStack::V3, + :service_class => Fog::Identity::OpenStack::V3 ) @identity_service = openstack_vcr.service end @@ -41,7 +41,7 @@ VCR.use_cassette('rbacs_crud') do begin own_project = @identity_service.projects.select { |p| p.name == @current_project }.first - other_project = @identity_service.projects.select { |p| p.name != @current_project }.first + other_project = @identity_service.projects.reject { |p| p.name == @current_project }.first foonet = @service.networks.create(:name => 'foo-net23', :tenant_id => own_project.id) # create share access for other project diff --git a/spec/shared_context.rb b/spec/shared_context.rb index 2ff68f657..06f4d4c12 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -69,7 +69,7 @@ def initialize(options) if use_recorded config.cassette_library_dir = ENV['SPEC_PATH'] || @vcr_directory config.default_cassette_options = {:record => :none} - config.default_cassette_options.merge! :match_requests_on => [:method, :uri, :body] + config.default_cassette_options.merge! :match_requests_on => %i[method uri body] else config.cassette_library_dir = "spec/debug" config.default_cassette_options = {:record => :all} @@ -111,7 +111,7 @@ def initialize(options) # TODO: remove # if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3') if @identity_version == 'v3' - connection_options = { + connection_options = { :openstack_auth_url => @os_auth_url, :openstack_region => @region, :openstack_domain_name => @domain_name, diff --git a/spec/shared_file_system_spec.rb b/spec/shared_file_system_spec.rb index 0267c06ee..1e00fb1fa 100644 --- a/spec/shared_file_system_spec.rb +++ b/spec/shared_file_system_spec.rb @@ -255,7 +255,6 @@ new_rule.id.must_equal access_rule.id share.revoke_access(access_rule.id) Fog.wait_for { share.access_rules.empty? } - ensure # delete the share(s) @service.shares.all(:name => share_name).each(&:destroy) diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 9fa9d90c6..c2934aab0 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -72,7 +72,7 @@ def cleanup_test_object(collection, id) begin object = collection.get(id) puts "Current status: #{object ? object.status : 'deleted'}" if ENV['DEBUG_VERBOSE'] - object.nil? || (%w(available error).include? object.status.downcase) + object.nil? || (%w[available error].include? object.status.downcase) end end @@ -108,8 +108,7 @@ def cleanup_test_object(collection, id) volume_id = setup_test_object(:type => :volume, @name_param => volume_name, @description_param => volume_description, - :size => volume_size - ).id + :size => volume_size).id @service.volumes.all(@name_param => volume_name).length.must_equal 1 @@ -208,8 +207,7 @@ def cleanup_test_object(collection, id) volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => volume_size_small - ) + :size => volume_size_small) volume.wait_for { ready? && size == volume_size_small } # extend volume @@ -225,8 +223,7 @@ def cleanup_test_object(collection, id) proc do volume.extend(volume_size_small) end.must_raise(Excon::Errors::BadRequest, - /Invalid input received: New size for extend must be greater than current size./ - ) + /Invalid input received: New size for extend must be greater than current size./) ensure # delete volume cleanup_test_object(@service.volumes, volume.nil? ? nil : volume.id) @@ -246,15 +243,13 @@ def cleanup_test_object(collection, id) # create volume object volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1 - ) + :size => 1) volume.wait_for { ready? } # create transfer object transfer = setup_test_object(:type => :transfer, :name => transfer_name, - :volume_id => volume.id - ) + :volume_id => volume.id) # we need to save the auth_key NOW, it's only present in the response # from the create_transfer request auth_key = transfer.auth_key @@ -290,51 +285,51 @@ def cleanup_test_object(collection, id) :openstack_username => ENV['OS_USERNAME_OTHER'] || 'demo', :openstack_domain_name => ENV['OS_USER_DOMAIN_NAME'] || 'Default', :openstack_project_name => ENV['OS_PROJECT_NAME_OTHER'] || 'demo' - ) + ) + + # check that recipient cannot see the transfer object + assert_nil other_service.transfers.get(transfer.id) + other_service.transfers.all(:name => transfer_name).length.must_equal 0 + + # # check that recipient cannot see the volume before transfer + # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 + + # The recipient can inexplicably see the volume even before the + # transfer, so to confirm that the transfer happens, we record its tenant ID. + volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID + source_tenant_id = volume.tenant_id + + # check that accept_transfer fails without valid transfer ID and auth key + bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR + proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound + proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest + + # accept transfer + puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] + transfer = other_service.transfers.accept(transfer.id, auth_key) + transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + + transfer.id.must_equal transfer_id + transfer.name.must_equal transfer_name + + # check that recipient can see the volume + volume = other_service.volumes.get(volume.id) + volume.must_be_kind_of Fog::Volume::OpenStack::Volume - # check that recipient cannot see the transfer object - assert_nil other_service.transfers.get(transfer.id) - other_service.transfers.all(:name => transfer_name).length.must_equal 0 - - # # check that recipient cannot see the volume before transfer - # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound - # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 - - # The recipient can inexplicably see the volume even before the - # transfer, so to confirm that the transfer happens, we record its tenant ID. - volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID - source_tenant_id = volume.tenant_id - - # check that accept_transfer fails without valid transfer ID and auth key - bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR - proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound - proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest - - # accept transfer - puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] - transfer = other_service.transfers.accept(transfer.id, auth_key) - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer - - transfer.id.must_equal transfer_id - transfer.name.must_equal transfer_name - - # check that recipient can see the volume - volume = other_service.volumes.get(volume.id) - volume.must_be_kind_of Fog::Volume::OpenStack::Volume - - # # check that sender cannot see the volume anymore - # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound - # @service.volumes.all(@name_param => volume_name).length.must_equal 0 - - # As noted above, both users seem to be able to see the volume at all times. - # Check change of ownership by looking at the tenant_id, instead. - volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID - volume.tenant_id.wont_equal(source_tenant_id) - - # check that the transfer object is gone on both sides - [@service, other_service].each do |service| - assert_nil service.transfers.get(transfer.id) - service.transfers.all(:name => transfer_name).length.must_equal 0 + # # check that sender cannot see the volume anymore + # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # @service.volumes.all(@name_param => volume_name).length.must_equal 0 + + # As noted above, both users seem to be able to see the volume at all times. + # Check change of ownership by looking at the tenant_id, instead. + volume.tenant_id.must_match(/^[0-9a-f-]+$/) # should look like a UUID + volume.tenant_id.wont_equal(source_tenant_id) + + # check that the transfer object is gone on both sides + [@service, other_service].each do |service| + assert_nil service.transfers.get(transfer.id) + service.transfers.all(:name => transfer_name).length.must_equal 0 end ensure # cleanup volume @@ -351,15 +346,13 @@ def cleanup_test_object(collection, id) # create volume object volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1 - ) + :size => 1) volume.wait_for { ready? } # create transfer object transfer = setup_test_object(:type => :transfer, :name => 'fog-testtransfer-1', - :volume_id => volume.id - ) + :volume_id => volume.id) # we need to save the auth_key NOW, it's only present in the response # from the create_transfer request auth_key = transfer.auth_key @@ -395,16 +388,14 @@ def cleanup_test_object(collection, id) # create volume object volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1 - ) + :size => 1) volume.wait_for { ready? } # create snapshot object snapshot = setup_test_object(:type => :snapshot, @name_param => 'fog-testsnapshot-1', @description_param => 'Test snapshot', - :volume_id => volume.id - ) + :volume_id => volume.id) snapshot_id = snapshot.id # wait for the snapshot to be available @@ -413,7 +404,7 @@ def cleanup_test_object(collection, id) object = @service.snapshots.get(snapshot.id) object.wont_be_nil puts "Current status: #{object ? object.status : 'deleted'}" if ENV['DEBUG_VERBOSE'] - object.nil? || (%w(available error).include? object.status.downcase) + object.nil? || (%w[available error].include? object.status.downcase) end end @@ -455,8 +446,7 @@ def cleanup_test_object(collection, id) @name_param => 'fog-testvolume-1', :size => 1, :metadata => {'some_metadata' => 'this is meta', - 'more_metadata' => 'even more meta'} - ) + 'more_metadata' => 'even more meta'}) volume.wait_for { ready? } updated_volume = @service.volumes.get(volume.id) @@ -493,7 +483,6 @@ def cleanup_test_object(collection, id) check_metadata = updated_volume.metadata check_metadata.size.must_equal 1 check_metadata['newer_metadata'].must_equal 'this is newer' - ensure # cleanup volume cleanup_test_object(@service.volumes, volume.id) if volume @@ -509,16 +498,14 @@ def cleanup_test_object(collection, id) @name_param => 'fog-testvolume-1', :size => 1, :metadata => {'some_metadata' => 'this is meta', - 'more_metadata' => 'even more meta'} - ) + 'more_metadata' => 'even more meta'}) volume.wait_for { ready? } # create snapshot object snapshot = setup_test_object(:type => :snapshot, @name_param => 'fog-testsnapshot-1', @description_param => 'Test snapshot', - :volume_id => volume.id - ) + :volume_id => volume.id) snapshot_id = snapshot.id # wait for the snapshot to be available @@ -527,7 +514,7 @@ def cleanup_test_object(collection, id) object = @service.snapshots.get(snapshot_id) object.wont_be_nil puts "Current status: #{object ? object.status : 'deleted'}" if ENV['DEBUG_VERBOSE'] - object.nil? || (%w(available error).include? object.status.downcase) + object.nil? || (%w[available error].include? object.status.downcase) end end @@ -552,7 +539,6 @@ def cleanup_test_object(collection, id) check_metadata = updated_snapshot.metadata check_metadata.size.must_equal 1 check_metadata['new_snapshot_metadata'].must_equal 'this is new' - ensure # cleanup volume cleanup_test_object(@service.snapshots, snapshot.id) if snapshot diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index 6ea5c58a7..efca2a3c6 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -82,22 +82,21 @@ ) expected = { - :user => @body['access']['user'], - :tenant => @body['access']['token']['tenant'], - :server_management_url => @body['access']['serviceCatalog']. + :user => @body['access']['user'], + :tenant => @body['access']['token']['tenant'], + :server_management_url => @body['access']['serviceCatalog']. first['endpoints'].first['publicURL'], - :token => @token, - :expires => @expires.iso8601, - :current_user_id => @body['access']['user']['id'], - :unscoped_token => @token + :token => @token, + :expires => @expires.iso8601, + :current_user_id => @body['access']['user']['id'], + :unscoped_token => @token } assert(expected) do Fog::OpenStack.authenticate_v2( :openstack_auth_uri => URI('http://example/v2.0/tokens'), :openstack_tenant => 'admin', - :openstack_service_type => %w[compute] - ) + :openstack_service_type => %w[compute]) end end @@ -122,18 +121,17 @@ it "v2 missing service" do Excon.stub( {:method => 'POST', :path => "/v2.0/tokens"}, - {:status => 200, :body => Fog::JSON.encode(@body)} - ) + {:status => 200, :body => Fog::JSON.encode(@body)}) service = Object.new service.extend(Fog::OpenStack::Core) - service.send(:setup, + service.send( + :setup, :openstack_auth_url => 'http://example', :openstack_tenant => 'admin', :openstack_service_type => %w[network], :openstack_api_key => 'secret', - :openstack_username => 'user' - ) + :openstack_username => 'user') proc do service.send(:authenticate) end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError @@ -147,13 +145,13 @@ service = Object.new service.extend(Fog::OpenStack::Core) - service.send(:setup, + service.send( + :setup, :openstack_auth_url => 'http://example', :openstack_tenant => 'admin', :openstack_api_key => 'secret', :openstack_username => 'user', - :openstack_service_type => 'object-store' - ) + :openstack_service_type => 'object-store') proc do service.send(:authenticate) @@ -180,18 +178,17 @@ Excon.stub( {:method => 'POST', :path => "/v2.0/tokens"}, - {:status => 200, :body => Fog::JSON.encode(body_clone)} - ) + {:status => 200, :body => Fog::JSON.encode(body_clone)}) service = Object.new service.extend(Fog::OpenStack::Core) - service.send(:setup, + service.send( + :setup, :openstack_auth_url => 'http://example', :openstack_tenant => 'admin', :openstack_api_key => 'secret', :openstack_username => 'user', - :openstack_service_type => 'compute' - ) + :openstack_service_type => 'compute') proc do service.send(:authenticate) diff --git a/unit/auth/token_test.rb b/unit/auth/token_test.rb index 9dbf2d897..7caf8a9c2 100644 --- a/unit/auth/token_test.rb +++ b/unit/auth/token_test.rb @@ -5,8 +5,8 @@ describe 'V3' do describe '#new' do it 'fails when missing credentials' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return( :status => 200, :body => "{\"token\":{\"catalog\":[]}}", :headers => {'x-subject-token'=>'token_data'} @@ -27,10 +27,10 @@ :openstack_project_id => 'project_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":\ -{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":\ +{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data_v3'} @@ -49,11 +49,11 @@ :openstack_project_domain_id => 'project_domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ \"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\ -\"project_domain_id\"}}}}}") - .to_return( +\"project_domain_id\"}}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -73,11 +73,11 @@ :openstack_project_domain_name => 'project_domain' } - stub_request(:post, "http://localhost/identity/v3/auth/tokens") - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\ + stub_request(:post, "http://localhost/identity/v3/auth/tokens"). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\ \"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\"\ -,\"domain\":{\"name\":\"project_domain\"}}}}}") - .to_return( +,\"domain\":{\"name\":\"project_domain\"}}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -97,10 +97,10 @@ :openstack_domain_id => 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ -\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -118,10 +118,10 @@ :openstack_domain_name => 'domain' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ -\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -140,10 +140,10 @@ :openstack_api_key => 'secret', } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ -\"user_id\",\"password\":\"secret\"}}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -163,9 +163,9 @@ :openstack_auth_token => 'token', } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -184,10 +184,10 @@ :openstack_project_id => 'project_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"project\":{\"id\":\"project_id\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -205,10 +205,10 @@ :openstack_project_domain_id => 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -227,10 +227,10 @@ :openstack_domain_id => 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -247,10 +247,10 @@ :openstack_domain_name => 'domain' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"domain\":{\"name\":\"domain\"}}}}") - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). + to_return( :status => 200, :body => JSON.dump(auth_response_v3('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} @@ -276,8 +276,8 @@ describe '#get' do it 'when token has not expired' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return( :status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'} @@ -290,8 +290,8 @@ end it 'when token has expired' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return( :status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'} @@ -305,8 +305,8 @@ end it '#catalog' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return( :status => 200, :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", :headers => {'x-subject-token'=>'token_data'} @@ -317,8 +317,8 @@ end it '#get_endpoint_url' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). + to_return( :status => 200, :body => JSON.dump(auth_response_v3("identity", "keystone")), :headers => {'x-subject-token'=>'token_data'} @@ -333,8 +333,8 @@ describe 'V2' do describe '#new' do it 'fails when missing credentials' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) proc do Fog::OpenStack::Auth::Token.build({}) @@ -350,10 +350,10 @@ :openstack_tenant => 'tenant', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ -\"tenantName\":\"tenant\"}}") - .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ +\"tenantName\":\"tenant\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -367,10 +367,10 @@ :openstack_tenant_id => 'tenant_id', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ -\"tenantId\":\"tenant_id\"}}") - .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ +\"tenantId\":\"tenant_id\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -385,9 +385,9 @@ :openstack_tenant => 'tenant', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}") - .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) token = Fog::OpenStack::Auth::Token.build(auth) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -400,9 +400,9 @@ :openstack_tenant_id => 'tenant_id', } - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}") - .to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}"). + to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) Fog::OpenStack::Auth::Token.build(auth) end @@ -421,8 +421,8 @@ describe '#get' do it 'when token has not expired' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return( :status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":\ [\"catalog_data\"]}}", @@ -436,8 +436,8 @@ end it 'when token has expired' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return( :status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {} @@ -451,8 +451,8 @@ end it '#catalog' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return( :status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", :headers => {} @@ -463,8 +463,8 @@ end it '#get_endpoint_url' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens') - .to_return( + stub_request(:post, 'http://localhost/identity/v2.0/tokens'). + to_return( :status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {'x-subject-token'=>'token_data'} From fe0c04c19c3b1bb635a226eac0f3868ef37125d4 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 17 Aug 2018 20:54:31 +1000 Subject: [PATCH 042/129] fix after rebase --- spec/fixtures/openstack/shared_file_system/common_setup.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/fixtures/openstack/shared_file_system/common_setup.yml b/spec/fixtures/openstack/shared_file_system/common_setup.yml index ec1e0c37b..f47337dec 100644 --- a/spec/fixtures/openstack/shared_file_system/common_setup.yml +++ b/spec/fixtures/openstack/shared_file_system/common_setup.yml @@ -2,7 +2,7 @@ http_interactions: - request: method: get - uri: https://devstack.openstack.stack:8786/v2/c60a441e54cd435896a357026aa4050a/ + uri: https://devstack.openstack.stack:8786/ body: encoding: US-ASCII string: '' From a7fc03c5d356b4fe2f0103ba58c0be2c79f922ec Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 17 Aug 2018 21:01:02 +1000 Subject: [PATCH 043/129] typo --- lib/fog/nfv/openstack.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/nfv/openstack.rb index b74c26119..8b50d9b22 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/nfv/openstack.rb @@ -105,7 +105,7 @@ def default_path_prefix end def default_service_type - %[wservicevm] + %w[servicevm] end end end From ebfbd6c214e4c471ceaadbd8abd36e8b2ab4b27d Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 21 Aug 2018 17:41:55 +1000 Subject: [PATCH 044/129] identity: version from param not url --- lib/fog/compute/openstack.rb | 2 +- .../requests/create_security_group.rb | 2 +- .../openstack/requests/create_server.rb | 2 +- lib/fog/container_infra/openstack.rb | 2 +- lib/fog/dns/openstack/v1.rb | 2 +- lib/fog/dns/openstack/v2.rb | 2 +- lib/fog/event/openstack.rb | 2 +- lib/fog/identity/openstack.rb | 22 +------------------ lib/fog/identity/openstack/v2.rb | 2 +- lib/fog/identity/openstack/v3.rb | 2 +- lib/fog/image/openstack/v1.rb | 2 +- lib/fog/image/openstack/v2.rb | 2 +- lib/fog/key_manager/openstack.rb | 2 +- lib/fog/metering/openstack.rb | 2 +- lib/fog/metric/openstack.rb | 2 +- lib/fog/monitoring/openstack.rb | 2 +- lib/fog/network/openstack.rb | 2 +- lib/fog/openstack/core.rb | 2 +- lib/fog/orchestration/openstack.rb | 2 +- lib/fog/planning/openstack.rb | 2 +- lib/fog/shared_file_system/openstack.rb | 2 +- lib/fog/storage/openstack.rb | 2 +- lib/fog/volume/openstack.rb | 2 +- test/authenticate_tests.rb | 20 +++++++++-------- test/identity_version_tests.rb | 8 +++---- test/models/identity/ec2_credential_tests.rb | 2 +- test/models/identity/ec2_credentials_tests.rb | 2 +- test/models/identity/role_tests.rb | 2 +- test/models/identity/roles_tests.rb | 3 +-- test/models/identity/tenant_tests.rb | 2 +- test/models/identity/tenants_tests.rb | 2 +- test/models/identity/user_tests.rb | 2 +- test/models/identity/users_tests.rb | 2 +- test/models/network/floating_ip_tests.rb | 1 + test/models/network/floating_ips_tests.rb | 1 + test/models/network/ike_policies_tests.rb | 1 + test/models/network/ike_policy_tests.rb | 1 + test/models/network/ipsec_policies_tests.rb | 1 + test/models/network/ipsec_policy_tests.rb | 1 + .../network/ipsec_site_connection_tests.rb | 1 + .../network/ipsec_site_connections_tests.rb | 1 + .../models/network/lb_health_monitor_tests.rb | 1 + .../network/lb_health_monitors_tests.rb | 2 ++ test/models/network/lb_member_tests.rb | 1 + test/models/network/lb_members_tests.rb | 1 + test/models/network/lb_pool_tests.rb | 1 + test/models/network/lb_pools_tests.rb | 1 + test/models/network/lb_vip_tests.rb | 2 ++ test/models/network/lb_vips_tests.rb | 1 + test/models/network/network_tests.rb | 1 + test/models/network/networks_tests.rb | 1 + test/models/network/port_tests.rb | 1 + test/models/network/ports_tests.rb | 1 + test/models/network/router_tests.rb | 1 + test/models/network/routers_tests.rb | 1 + .../network/security_group_rule_tests.rb | 2 +- .../network/security_group_rules_tests.rb | 2 +- test/models/network/security_group_tests.rb | 2 +- test/models/network/security_groups_tests.rb | 2 +- test/models/network/subnet_pools_tests.rb | 1 + test/models/network/subnet_tests.rb | 1 + test/models/network/subnets_tests.rb | 1 + test/models/network/vpn_service_tests.rb | 1 + test/models/network/vpn_services_tests.rb | 1 + test/requests/compute/quota_tests.rb | 3 ++- test/requests/compute/tenant_tests.rb | 3 ++- .../identity/ec2_credentials_tests.rb | 2 +- test/requests/identity/role_tests.rb | 2 +- test/requests/identity/tenant_tests.rb | 2 +- test/requests/identity/user_tests.rb | 2 +- test/requests/image/image_tests.rb | 2 +- test/requests/network/quota_tests.rb | 3 ++- test/requests/volume/quota_tests.rb | 3 ++- 73 files changed, 92 insertions(+), 78 deletions(-) diff --git a/lib/fog/compute/openstack.rb b/lib/fog/compute/openstack.rb index c8cd2953f..3d2049979 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/compute/openstack.rb @@ -14,7 +14,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version ## MODELS # diff --git a/lib/fog/compute/openstack/requests/create_security_group.rb b/lib/fog/compute/openstack/requests/create_security_group.rb index 70fb8de42..01d7a348a 100644 --- a/lib/fog/compute/openstack/requests/create_security_group.rb +++ b/lib/fog/compute/openstack/requests/create_security_group.rb @@ -21,7 +21,7 @@ def create_security_group(name, description) class Mock def create_security_group(name, description) - Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url]) + Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first security_group_id = Fog::Mock.random_numbers(2).to_i + 1 data[:security_groups][security_group_id.to_s] = { diff --git a/lib/fog/compute/openstack/requests/create_server.rb b/lib/fog/compute/openstack/requests/create_server.rb index e9d962401..c36d3a254 100644 --- a/lib/fog/compute/openstack/requests/create_server.rb +++ b/lib/fog/compute/openstack/requests/create_server.rb @@ -94,7 +94,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) response.status = 202 server_id = Fog::Mock.random_numbers(6).to_s - identity = Fog::Identity::OpenStack.new :openstack_auth_url => credentials[:openstack_auth_url] + identity = Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') user = identity.users.find do |u| u.name == @openstack_username end diff --git a/lib/fog/container_infra/openstack.rb b/lib/fog/container_infra/openstack.rb index 0af0edba9..cc5daa073 100644 --- a/lib/fog/container_infra/openstack.rb +++ b/lib/fog/container_infra/openstack.rb @@ -14,7 +14,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/container_infra/openstack/models' diff --git a/lib/fog/dns/openstack/v1.rb b/lib/fog/dns/openstack/v1.rb index 51a2e4030..f42dda83b 100644 --- a/lib/fog/dns/openstack/v1.rb +++ b/lib/fog/dns/openstack/v1.rb @@ -14,7 +14,7 @@ class V1 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl + :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl request_path 'fog/dns/openstack/v1/requests' diff --git a/lib/fog/dns/openstack/v2.rb b/lib/fog/dns/openstack/v2.rb index 7c454198e..35cf9cfa3 100644 --- a/lib/fog/dns/openstack/v2.rb +++ b/lib/fog/dns/openstack/v2.rb @@ -16,7 +16,7 @@ class V2 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl + :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl model_path 'fog/dns/openstack/v2/models' model :zone diff --git a/lib/fog/event/openstack.rb b/lib/fog/event/openstack.rb index 8fcd9c0ef..5317ecacd 100644 --- a/lib/fog/event/openstack.rb +++ b/lib/fog/event/openstack.rb @@ -13,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/event/openstack/models' diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index a721d79f9..f29f2976a 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -1,31 +1,11 @@ - - module Fog module Identity class OpenStack < Fog::Service autoload :V2, 'fog/identity/openstack/v2' autoload :V3, 'fog/identity/openstack/v3' - requires :openstack_auth_url - recognizes :openstack_auth_token, :openstack_management_url, :persistent, - :openstack_service_type, :openstack_service_name, :openstack_tenant, - :openstack_endpoint_type, :openstack_region, :openstack_domain_id, - :openstack_project_name, :openstack_domain_name, - :openstack_user_domain, :openstack_project_domain, - :openstack_user_domain_id, :openstack_project_domain_id, - :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username, - :current_user, :current_user_id, :current_tenant, :openstack_cache_ttl, - :provider, :openstack_identity_prefix def self.new(args = {}) - if args[:openstack_identity_legacy_version] - version = '2.0' - else - url = Fog.credentials[:openstack_auth_url] || args[:openstack_auth_url] - if url - uri = URI(url) - version = '2.0' if uri.path =~ /v2\.0/ - end - end + version = '2.0' if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i case version when '2.0' diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/identity/openstack/v2.rb index 8c76ff00c..b2343206f 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/identity/openstack/v2.rb @@ -14,7 +14,7 @@ class V2 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/identity/openstack/v2/models' model :tenant diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/identity/openstack/v3.rb index e3ba5d98d..5ae84dfbb 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/identity/openstack/v3.rb @@ -13,7 +13,7 @@ class V3 < Fog::Service :openstack_user_domain_id, :openstack_project_domain_id, :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username, :current_user, :current_user_id, :current_tenant, - :provider, :openstack_identity_prefix, :openstack_cache_ttl + :provider, :openstack_identity_api_version, :openstack_cache_ttl model_path 'fog/identity/openstack/v3/models' model :domain diff --git a/lib/fog/image/openstack/v1.rb b/lib/fog/image/openstack/v1.rb index 8f4db66d6..a08d1e51b 100644 --- a/lib/fog/image/openstack/v1.rb +++ b/lib/fog/image/openstack/v1.rb @@ -16,7 +16,7 @@ class V1 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/image/openstack/v1/models' diff --git a/lib/fog/image/openstack/v2.rb b/lib/fog/image/openstack/v2.rb index 9672c7ab1..b7cdc9f2e 100644 --- a/lib/fog/image/openstack/v2.rb +++ b/lib/fog/image/openstack/v2.rb @@ -16,7 +16,7 @@ class V2 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/image/openstack/v2/models' diff --git a/lib/fog/key_manager/openstack.rb b/lib/fog/key_manager/openstack.rb index 533879f8f..dc56d3f90 100644 --- a/lib/fog/key_manager/openstack.rb +++ b/lib/fog/key_manager/openstack.rb @@ -13,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl + :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl ## MODELS diff --git a/lib/fog/metering/openstack.rb b/lib/fog/metering/openstack.rb index 993ab5846..bd0f84d7f 100644 --- a/lib/fog/metering/openstack.rb +++ b/lib/fog/metering/openstack.rb @@ -15,7 +15,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/metering/openstack/models' diff --git a/lib/fog/metric/openstack.rb b/lib/fog/metric/openstack.rb index 453c754b3..08144e5eb 100644 --- a/lib/fog/metric/openstack.rb +++ b/lib/fog/metric/openstack.rb @@ -13,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/metric/openstack/models' diff --git a/lib/fog/monitoring/openstack.rb b/lib/fog/monitoring/openstack.rb index 120ec119c..bd8141c3c 100644 --- a/lib/fog/monitoring/openstack.rb +++ b/lib/fog/monitoring/openstack.rb @@ -12,7 +12,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_temp_url_key, :openstack_cache_ttl + :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl model_path 'fog/monitoring/openstack/models' model :metric diff --git a/lib/fog/network/openstack.rb b/lib/fog/network/openstack.rb index fb17834ce..f0c1e0f3c 100644 --- a/lib/fog/network/openstack.rb +++ b/lib/fog/network/openstack.rb @@ -13,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version ## MODELS # diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index c44ae2d0a..a0ad1f9c0 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -15,7 +15,7 @@ module Core attr_reader :openstack_user_domain_id attr_reader :openstack_project_id attr_reader :openstack_project_domain_id - attr_reader :openstack_identity_prefix + attr_reader :openstack_identity_api_version # fallback def self.not_found_class diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/orchestration/openstack.rb index 34d971d20..18be8177f 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/orchestration/openstack.rb @@ -13,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version model_path 'fog/orchestration/openstack/models' model :stack diff --git a/lib/fog/planning/openstack.rb b/lib/fog/planning/openstack.rb index b04c875c0..eb5f75cd8 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/planning/openstack.rb @@ -15,7 +15,7 @@ class Planning < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix + :openstack_identity_api_version ## MODELS # diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/shared_file_system/openstack.rb index c812db111..556df1739 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/shared_file_system/openstack.rb @@ -14,7 +14,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_shared_file_system_microversion + :openstack_identity_api_version, :openstack_shared_file_system_microversion model_path 'fog/shared_file_system/openstack/models' model :network diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index 49148dc8c..2263bad46 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -13,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_cache_ttl, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix, :openstack_temp_url_key + :openstack_identity_api_version, :openstack_temp_url_key model_path 'fog/storage/openstack/models' model :directory diff --git a/lib/fog/volume/openstack.rb b/lib/fog/volume/openstack.rb index d96e913c0..fbc961d42 100644 --- a/lib/fog/volume/openstack.rb +++ b/lib/fog/volume/openstack.rb @@ -15,7 +15,7 @@ class OpenStack < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_prefix] + :openstack_identity_api_version] # Fog::Image::OpenStack.new() will return a Fog::Volume::OpenStack::V2 or a Fog::Volume::OpenStack::V1, # choosing the V2 by default, as V1 is deprecated since OpenStack Juno diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index efca2a3c6..0bc9d27ca 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -94,28 +94,30 @@ assert(expected) do Fog::OpenStack.authenticate_v2( - :openstack_auth_uri => URI('http://example/v2.0/tokens'), + :openstack_auth_uri => URI('http://example'), :openstack_tenant => 'admin', :openstack_service_type => %w[compute]) end end it "validates token" do - old_credentials = Fog.credentials - Fog.credentials = {:openstack_auth_url => 'http://openstack:35357/v2.0/tokens'} - identity = Fog::Identity[:openstack] + creds = { + :openstack_auth_url => 'http://openstack:35357', + :openstack_identity_api_version => 'v2.0' + } + identity = Fog::Identity::OpenStack.new(creds) identity.validate_token(@token, @tenant_token) identity.validate_token(@token) - Fog.credentials = old_credentials end it "checks token" do - old_credentials = Fog.credentials - Fog.credentials = {:openstack_auth_url => 'http://openstack:35357/v2.0/tokens'} - identity = Fog::Identity[:openstack] + creds = { + :openstack_auth_url => 'http://openstack:35357', + :openstack_identity_api_version => 'v2.0' + } + identity = Fog::Identity::OpenStack.new(creds) identity.check_token(@token, @tenant_token) identity.check_token(@token) - Fog.credentials = old_credentials end it "v2 missing service" do diff --git a/test/identity_version_tests.rb b/test/identity_version_tests.rb index 8309dd2d7..417b8a918 100644 --- a/test/identity_version_tests.rb +++ b/test/identity_version_tests.rb @@ -7,17 +7,17 @@ end it "v2" do - Fog.credentials = {:openstack_auth_url => 'http://openstack:35357/v2.0/tokens'} + Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::Identity::OpenStack::V2::Mock) do + assert(Fog::Identity::OpenStack::V2::Real) do Fog::Identity[:openstack].class end end it "v3" do - Fog.credentials = {:openstack_auth_url => 'http://openstack:35357/v3/auth/tokens'} + Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::Identity::OpenStack::V3::Mock) do + assert(Fog::Identity::OpenStack::V3::Real) do Fog::Identity[:openstack].class end end diff --git a/test/models/identity/ec2_credential_tests.rb b/test/models/identity/ec2_credential_tests.rb index d735cd416..ed661a8a5 100644 --- a/test/models/identity/ec2_credential_tests.rb +++ b/test/models/identity/ec2_credential_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credential" do before do - identity = Fog::Identity[:openstack] + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/ec2_credentials_tests.rb b/test/models/identity/ec2_credentials_tests.rb index 5fca9b037..0b32d443e 100644 --- a/test/models/identity/ec2_credentials_tests.rb +++ b/test/models/identity/ec2_credentials_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credentials" do before do - identity = Fog::Identity[:openstack] + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/role_tests.rb b/test/models/identity/role_tests.rb index 2b411d46a..c39c8671c 100644 --- a/test/models/identity/role_tests.rb +++ b/test/models/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.roles.new( :name => 'Role Name', :user_id => 1, diff --git a/test/models/identity/roles_tests.rb b/test/models/identity/roles_tests.rb index 9a3f774e8..a3da03888 100644 --- a/test/models/identity/roles_tests.rb +++ b/test/models/identity/roles_tests.rb @@ -2,8 +2,7 @@ describe "Fog::Identity[:openstack] | roles" do before do - @identity = Fog::Identity[:openstack] - + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant = @identity.tenants.create(:name => 'test_user') @user = @identity.users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof') @role = @identity.roles(:user => @user, :tenant => @tenant).create(:name => 'test_role') diff --git a/test/models/identity/tenant_tests.rb b/test/models/identity/tenant_tests.rb index ae758e701..4d04467e6 100644 --- a/test/models/identity/tenant_tests.rb +++ b/test/models/identity/tenant_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | tenant" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') end describe "success" do diff --git a/test/models/identity/tenants_tests.rb b/test/models/identity/tenants_tests.rb index 1ef9417f5..572960e37 100644 --- a/test/models/identity/tenants_tests.rb +++ b/test/models/identity/tenants_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Compute[:openstack] | tenants" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.tenants.create(:name => 'test') end diff --git a/test/models/identity/user_tests.rb b/test/models/identity/user_tests.rb index f7988976c..1d22aac7e 100644 --- a/test/models/identity/user_tests.rb +++ b/test/models/identity/user_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | user" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.new( :name => 'User Name', diff --git a/test/models/identity/users_tests.rb b/test/models/identity/users_tests.rb index 79df091bc..125027076 100644 --- a/test/models/identity/users_tests.rb +++ b/test/models/identity/users_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | users" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.create( :name => 'foobar', diff --git a/test/models/network/floating_ip_tests.rb b/test/models/network/floating_ip_tests.rb index 90d7bab97..e12bd0a7a 100644 --- a/test/models/network/floating_ip_tests.rb +++ b/test/models/network/floating_ip_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | floating_ip" do describe "success" do diff --git a/test/models/network/floating_ips_tests.rb b/test/models/network/floating_ips_tests.rb index fe557de68..c4d08fa8b 100644 --- a/test/models/network/floating_ips_tests.rb +++ b/test/models/network/floating_ips_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | floating_ips" do before do diff --git a/test/models/network/ike_policies_tests.rb b/test/models/network/ike_policies_tests.rb index 305ac9aec..bff516124 100644 --- a/test/models/network/ike_policies_tests.rb +++ b/test/models/network/ike_policies_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ike_policies" do before do diff --git a/test/models/network/ike_policy_tests.rb b/test/models/network/ike_policy_tests.rb index 20804381f..ceeace123 100644 --- a/test/models/network/ike_policy_tests.rb +++ b/test/models/network/ike_policy_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ike_policy" do describe "success" do diff --git a/test/models/network/ipsec_policies_tests.rb b/test/models/network/ipsec_policies_tests.rb index 4227b0005..4c00bcf7f 100644 --- a/test/models/network/ipsec_policies_tests.rb +++ b/test/models/network/ipsec_policies_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ipsec_policies" do before do diff --git a/test/models/network/ipsec_policy_tests.rb b/test/models/network/ipsec_policy_tests.rb index 94aedb62b..f9bd4a353 100644 --- a/test/models/network/ipsec_policy_tests.rb +++ b/test/models/network/ipsec_policy_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ipsec_policy" do describe "success" do diff --git a/test/models/network/ipsec_site_connection_tests.rb b/test/models/network/ipsec_site_connection_tests.rb index 066982de4..79c87f675 100644 --- a/test/models/network/ipsec_site_connection_tests.rb +++ b/test/models/network/ipsec_site_connection_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ipsec_site_connection" do describe "success" do diff --git a/test/models/network/ipsec_site_connections_tests.rb b/test/models/network/ipsec_site_connections_tests.rb index 18b204628..8dae7d416 100644 --- a/test/models/network/ipsec_site_connections_tests.rb +++ b/test/models/network/ipsec_site_connections_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ipsec_site_connections" do before do diff --git a/test/models/network/lb_health_monitor_tests.rb b/test/models/network/lb_health_monitor_tests.rb index 32f50d2db..ae39cc7b4 100644 --- a/test/models/network/lb_health_monitor_tests.rb +++ b/test/models/network/lb_health_monitor_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | lb_health_monitor" do describe "success" do diff --git a/test/models/network/lb_health_monitors_tests.rb b/test/models/network/lb_health_monitors_tests.rb index a6b3dbe67..d0a3af737 100644 --- a/test/models/network/lb_health_monitors_tests.rb +++ b/test/models/network/lb_health_monitors_tests.rb @@ -1,4 +1,6 @@ require "test_helper" +require "helpers/network_helper" + describe "Fog::Network[:openstack] | lb_health_monitors" do before do @lb_health_monitor = network.lb_health_monitors.create( diff --git a/test/models/network/lb_member_tests.rb b/test/models/network/lb_member_tests.rb index 34337bef1..d952f8730 100644 --- a/test/models/network/lb_member_tests.rb +++ b/test/models/network/lb_member_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | lb_member" do describe "success" do diff --git a/test/models/network/lb_members_tests.rb b/test/models/network/lb_members_tests.rb index a287f3989..e47cefa95 100644 --- a/test/models/network/lb_members_tests.rb +++ b/test/models/network/lb_members_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | lb_members" do before do diff --git a/test/models/network/lb_pool_tests.rb b/test/models/network/lb_pool_tests.rb index d31bbdc4e..2c46a6f03 100644 --- a/test/models/network/lb_pool_tests.rb +++ b/test/models/network/lb_pool_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | lb_pool" do describe "success" do diff --git a/test/models/network/lb_pools_tests.rb b/test/models/network/lb_pools_tests.rb index 8db78c217..67ce0e352 100644 --- a/test/models/network/lb_pools_tests.rb +++ b/test/models/network/lb_pools_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | lb_pools" do before do diff --git a/test/models/network/lb_vip_tests.rb b/test/models/network/lb_vip_tests.rb index 91a25c6d9..9553a9142 100644 --- a/test/models/network/lb_vip_tests.rb +++ b/test/models/network/lb_vip_tests.rb @@ -1,4 +1,6 @@ require "test_helper" +require "helpers/network_helper" + describe "Fog::Network[:openstack] | lb_vip" do describe "success" do before do diff --git a/test/models/network/lb_vips_tests.rb b/test/models/network/lb_vips_tests.rb index cee9e14e9..b428477b0 100644 --- a/test/models/network/lb_vips_tests.rb +++ b/test/models/network/lb_vips_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | lb_vips" do before do diff --git a/test/models/network/network_tests.rb b/test/models/network/network_tests.rb index b673620e6..c94ee566f 100644 --- a/test/models/network/network_tests.rb +++ b/test/models/network/network_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | network" do describe "success" do diff --git a/test/models/network/networks_tests.rb b/test/models/network/networks_tests.rb index 4e92c23a9..6f7970f43 100644 --- a/test/models/network/networks_tests.rb +++ b/test/models/network/networks_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | networks" do before do diff --git a/test/models/network/port_tests.rb b/test/models/network/port_tests.rb index ce4dd5cdb..c6db13aef 100644 --- a/test/models/network/port_tests.rb +++ b/test/models/network/port_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | port" do describe "success" do diff --git a/test/models/network/ports_tests.rb b/test/models/network/ports_tests.rb index c83f792d7..94a93479e 100644 --- a/test/models/network/ports_tests.rb +++ b/test/models/network/ports_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | ports" do before do diff --git a/test/models/network/router_tests.rb b/test/models/network/router_tests.rb index 495b9bb93..09f806fdb 100644 --- a/test/models/network/router_tests.rb +++ b/test/models/network/router_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | router" do describe "success" do diff --git a/test/models/network/routers_tests.rb b/test/models/network/routers_tests.rb index 45ebde018..2e81a8a2c 100644 --- a/test/models/network/routers_tests.rb +++ b/test/models/network/routers_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | routers" do before do diff --git a/test/models/network/security_group_rule_tests.rb b/test/models/network/security_group_rule_tests.rb index fafca0dca..c4894bd80 100644 --- a/test/models/network/security_group_rule_tests.rb +++ b/test/models/network/security_group_rule_tests.rb @@ -1,5 +1,5 @@ require "test_helper" - +require "helpers/network_helper" require "helpers/model_helper" describe "Fog::Network[:openstack] | security_group_rule model" do diff --git a/test/models/network/security_group_rules_tests.rb b/test/models/network/security_group_rules_tests.rb index 743746d95..4c34fb69d 100644 --- a/test/models/network/security_group_rules_tests.rb +++ b/test/models/network/security_group_rules_tests.rb @@ -1,5 +1,5 @@ require "test_helper" - +require "helpers/network_helper" require "helpers/collection_helper" describe "Fog::Network[:openstack] | security_group_rules collection" do diff --git a/test/models/network/security_group_tests.rb b/test/models/network/security_group_tests.rb index 58645f92c..25d9b288c 100644 --- a/test/models/network/security_group_tests.rb +++ b/test/models/network/security_group_tests.rb @@ -1,5 +1,5 @@ require "test_helper" - +require "helpers/network_helper" require "helpers/model_helper" describe "Fog::Network[:openstack] | security_group model" do diff --git a/test/models/network/security_groups_tests.rb b/test/models/network/security_groups_tests.rb index 5a422ba66..4f3cff179 100644 --- a/test/models/network/security_groups_tests.rb +++ b/test/models/network/security_groups_tests.rb @@ -1,5 +1,5 @@ require "test_helper" - +require "helpers/network_helper" require "helpers/collection_helper" describe "Fog::Network[:openstack] | security_groups collection" do diff --git a/test/models/network/subnet_pools_tests.rb b/test/models/network/subnet_pools_tests.rb index 61b81608d..d76f6720c 100644 --- a/test/models/network/subnet_pools_tests.rb +++ b/test/models/network/subnet_pools_tests.rb @@ -1,4 +1,5 @@ require 'test_helper' +require "helpers/network_helper" describe 'Fog::Network[:openstack] | subnet_pools' do describe 'success' do diff --git a/test/models/network/subnet_tests.rb b/test/models/network/subnet_tests.rb index 32660f404..64a5b26ea 100644 --- a/test/models/network/subnet_tests.rb +++ b/test/models/network/subnet_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | subnet" do describe "success" do diff --git a/test/models/network/subnets_tests.rb b/test/models/network/subnets_tests.rb index baabe3757..cb7ed4c91 100644 --- a/test/models/network/subnets_tests.rb +++ b/test/models/network/subnets_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | subnets" do describe "success" do diff --git a/test/models/network/vpn_service_tests.rb b/test/models/network/vpn_service_tests.rb index 0e00b9b65..3c80baf72 100644 --- a/test/models/network/vpn_service_tests.rb +++ b/test/models/network/vpn_service_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | vpn_service" do describe "success" do diff --git a/test/models/network/vpn_services_tests.rb b/test/models/network/vpn_services_tests.rb index 8e88a7a00..ceeccf9ab 100644 --- a/test/models/network/vpn_services_tests.rb +++ b/test/models/network/vpn_services_tests.rb @@ -1,4 +1,5 @@ require "test_helper" +require "helpers/network_helper" describe "Fog::Network[:openstack] | vpn_services" do before do diff --git a/test/requests/compute/quota_tests.rb b/test/requests/compute/quota_tests.rb index 472663036..ef0657267 100644 --- a/test/requests/compute/quota_tests.rb +++ b/test/requests/compute/quota_tests.rb @@ -2,7 +2,8 @@ describe "Fog::Compute[:openstack] | quota requests" do before do - @tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id'] + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'key_pairs' => Integer, 'metadata_items' => Integer, diff --git a/test/requests/compute/tenant_tests.rb b/test/requests/compute/tenant_tests.rb index 5eea1fa0f..b6804793d 100644 --- a/test/requests/compute/tenant_tests.rb +++ b/test/requests/compute/tenant_tests.rb @@ -12,7 +12,8 @@ describe "success" do it "#list_tenants" do - Fog::Identity[:openstack].list_tenants.body. + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity.list_tenants.body. must_match_schema('tenants_links' => Array, 'tenants' => [@tenant_format]) end diff --git a/test/requests/identity/ec2_credentials_tests.rb b/test/requests/identity/ec2_credentials_tests.rb index cf040b31b..6b627935b 100644 --- a/test/requests/identity/ec2_credentials_tests.rb +++ b/test/requests/identity/ec2_credentials_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | EC2 credential requests" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @credential_format = { 'access' => String, diff --git a/test/requests/identity/role_tests.rb b/test/requests/identity/role_tests.rb index f40c49184..39a433b8d 100644 --- a/test/requests/identity/role_tests.rb +++ b/test/requests/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role requests" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @role_format = { 'id' => String, diff --git a/test/requests/identity/tenant_tests.rb b/test/requests/identity/tenant_tests.rb index e614b1669..8aa2c7cfe 100644 --- a/test/requests/identity/tenant_tests.rb +++ b/test/requests/identity/tenant_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | tenant requests" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_format = { 'id' => String, diff --git a/test/requests/identity/user_tests.rb b/test/requests/identity/user_tests.rb index 6aaf0ef09..83ce1054b 100644 --- a/test/requests/identity/user_tests.rb +++ b/test/requests/identity/user_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | user requests" do before do - @identity = Fog::Identity[:openstack] + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @user_format = { 'id' => String, diff --git a/test/requests/image/image_tests.rb b/test/requests/image/image_tests.rb index 49ba1ada0..2843448b8 100644 --- a/test/requests/image/image_tests.rb +++ b/test/requests/image/image_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Image[:openstack] | image requests" do before(:all) do - openstack = Fog::Identity[:openstack] + openstack = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @image_attributes = { :name => 'new image', diff --git a/test/requests/network/quota_tests.rb b/test/requests/network/quota_tests.rb index 11f224f46..9c74e578d 100644 --- a/test/requests/network/quota_tests.rb +++ b/test/requests/network/quota_tests.rb @@ -2,7 +2,8 @@ describe "Fog::Network[:openstack] | quota requests" do before do - @tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id'] + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_format = { 'subnet' => Fog::Nullable::Integer, 'router' => Fog::Nullable::Integer, diff --git a/test/requests/volume/quota_tests.rb b/test/requests/volume/quota_tests.rb index d734b8b73..d6e672dea 100644 --- a/test/requests/volume/quota_tests.rb +++ b/test/requests/volume/quota_tests.rb @@ -3,7 +3,8 @@ describe "Fog::Volume[:openstack] | quota requests" do before do @volume = Fog::Volume[:openstack] - @tenant_id = Fog::Identity[:openstack].list_tenants.body['tenants'].first['id'] + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'volumes' => Fog::Nullable::Integer, 'gigabytes' => Fog::Nullable::Integer, From d92fbe0408820d52824fa3a0c4ca7041439aac91 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 28 Aug 2018 19:01:29 +1000 Subject: [PATCH 045/129] Allows openstack_auth_url to use version This offers backward compatibility as before the new boostrapping approach. A deprecation message is added in such case. --- .rubocop.yml | 5 ++++- lib/fog/identity/openstack.rb | 16 +++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/.rubocop.yml b/.rubocop.yml index 88a89eedb..265da2fa4 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -41,7 +41,7 @@ Metrics/BlockLength: - it - model_tests - namespace - - draw + - draw ParameterLists: Severity: refactor PerceivedComplexity: @@ -54,6 +54,9 @@ SingleLineMethods: AllowIfMethodIsEmpty: false SpaceInsideHashLiteralBraces: EnforcedStyle: no_space +Style/RegexpLiteral: + EnforcedStyle: slashes + AllowInnerSlashes: true TrivialAccessors: AllowPredicates: true # diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index f29f2976a..dc5b81ddf 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -5,7 +5,21 @@ class OpenStack < Fog::Service autoload :V3, 'fog/identity/openstack/v3' def self.new(args = {}) - version = '2.0' if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i + version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i + '2.0' + elsif args[:openstack_auth_url] =~ /v3|v2(\.0)*/ + # Deprecated from fog-openstack 0.2.0 + # Will be removed in future after hard deprecation is enforced for a couple of releases + Fog::Logger.deprecation("An authentication URL including a version is deprecated") + case args[:openstack_auth_url] + when /v3/ + args[:openstack_auth_url].gsub!(/\/v3(\/)*.*/, '') + 'v3' + when /v2(\.0)*/ + args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*/, '') + '2.0' + end + end case version when '2.0' From ab169e1d2882f94179aa8b1f506aa86a39779e3c Mon Sep 17 00:00:00 2001 From: Sam Lucidi Date: Tue, 28 Aug 2018 16:38:59 -0400 Subject: [PATCH 046/129] Add optional 'name' parameter to backup restore --- lib/fog/volume/openstack/models/backup.rb | 4 ++-- lib/fog/volume/openstack/requests/restore_backup.rb | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/fog/volume/openstack/models/backup.rb b/lib/fog/volume/openstack/models/backup.rb index f1f529f2c..676a16c78 100644 --- a/lib/fog/volume/openstack/models/backup.rb +++ b/lib/fog/volume/openstack/models/backup.rb @@ -30,9 +30,9 @@ def destroy true end - def restore(volume_id) + def restore(volume_id = nil, name = nil) requires :id - service.restore_backup(id, volume_id) + service.restore_backup(id, volume_id, name) true end diff --git a/lib/fog/volume/openstack/requests/restore_backup.rb b/lib/fog/volume/openstack/requests/restore_backup.rb index a8ac8d6e0..852eeda4f 100644 --- a/lib/fog/volume/openstack/requests/restore_backup.rb +++ b/lib/fog/volume/openstack/requests/restore_backup.rb @@ -2,8 +2,8 @@ module Fog module Volume class OpenStack module Real - def restore_backup(backup_id, volume_id) - data = { 'restore' => { 'volume_id' => volume_id } } + def restore_backup(backup_id, volume_id = nil, name = nil) + data = { 'restore' => { 'volume_id' => volume_id, 'name' => name } } request( :expects => 202, :method => 'POST', From 2eef2bbaa6776e5a7ba89c54cff17267cd413f2b Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 29 Aug 2018 18:21:08 +1000 Subject: [PATCH 047/129] Update restore_backup.rb --- lib/fog/volume/openstack/requests/restore_backup.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/volume/openstack/requests/restore_backup.rb b/lib/fog/volume/openstack/requests/restore_backup.rb index 852eeda4f..d71bd6287 100644 --- a/lib/fog/volume/openstack/requests/restore_backup.rb +++ b/lib/fog/volume/openstack/requests/restore_backup.rb @@ -3,7 +3,7 @@ module Volume class OpenStack module Real def restore_backup(backup_id, volume_id = nil, name = nil) - data = { 'restore' => { 'volume_id' => volume_id, 'name' => name } } + data = {'restore' => {'volume_id' => volume_id, 'name' => name}} request( :expects => 202, :method => 'POST', From 13c681d83cbef35283c03739f2b5a98edc993beb Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 29 Aug 2018 18:28:01 +1000 Subject: [PATCH 048/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index bbfc6d8e9..0fb9529a6 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.1.27'.freeze + VERSION = '0.2.0'.freeze end end From 5a1508210f4bbd8d1212d4a8e3ad1ce0b4293a49 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 29 Aug 2018 23:32:00 +1000 Subject: [PATCH 049/129] Identity: No path prefix when endpoint is versioned --- lib/fog/identity/openstack.rb | 12 +++++++----- lib/fog/identity/openstack/v2.rb | 13 +++++++++++-- lib/fog/identity/openstack/v3.rb | 13 +++++++++++-- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/lib/fog/identity/openstack.rb b/lib/fog/identity/openstack.rb index dc5b81ddf..f657f6be4 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/identity/openstack.rb @@ -12,11 +12,13 @@ def self.new(args = {}) # Will be removed in future after hard deprecation is enforced for a couple of releases Fog::Logger.deprecation("An authentication URL including a version is deprecated") case args[:openstack_auth_url] - when /v3/ - args[:openstack_auth_url].gsub!(/\/v3(\/)*.*/, '') - 'v3' - when /v2(\.0)*/ - args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*/, '') + when /\/v3(\/)*.*$/ + args[:openstack_auth_url].gsub!(/\/v3(\/)*.*$/, '') + args[:no_path_prefix] = true + '3' + when /\/v2(\.0)*(\/)*.*$/ + args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*$/, '') + args[:no_path_prefix] = true '2.0' end end diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/identity/openstack/v2.rb index b2343206f..0eedb7b53 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/identity/openstack/v2.rb @@ -14,7 +14,7 @@ class V2 < Fog::Service :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, - :openstack_identity_api_version + :openstack_identity_api_version, :no_path_prefix model_path 'fog/identity/openstack/v2/models' model :tenant @@ -169,8 +169,17 @@ def credentials end class Real < Fog::Identity::OpenStack::Real + def initialize(args) + @path_prefix = if args[:no_path_prefix] + '' + else + 'v2.0' + end + super + end + def default_path_prefix - 'v2.0' + @path_prefix end def default_service_type diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/identity/openstack/v3.rb index 5ae84dfbb..86d5345fa 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/identity/openstack/v3.rb @@ -13,7 +13,7 @@ class V3 < Fog::Service :openstack_user_domain_id, :openstack_project_domain_id, :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username, :current_user, :current_user_id, :current_tenant, - :provider, :openstack_identity_api_version, :openstack_cache_ttl + :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix model_path 'fog/identity/openstack/v3/models' model :domain @@ -142,8 +142,17 @@ def self.get_api_version(uri, connection_options = {}) end class Real < Fog::Identity::OpenStack::Real + def initialize(args) + @path_prefix = if args[:no_path_prefix] + '' + else + 'v3' + end + super + end + def default_path_prefix - 'v3' + @path_prefix end def default_service_type From 43fe946bafa63ddeb437c2928ade962717332bb5 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 3 Sep 2018 09:14:30 +1000 Subject: [PATCH 050/129] Update version.rb v0.2.1 --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 0fb9529a6..9b385cf73 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.2.0'.freeze + VERSION = '0.2.1'.freeze end end From 0274250d3afe4b4da56878a5df857eb4bf2b56bf Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 10 Sep 2018 13:35:27 +1000 Subject: [PATCH 051/129] Use @openstack_management_uri instead of scheme, host and port instance variables --- lib/fog/storage/openstack.rb | 4 ---- lib/fog/storage/openstack/requests/get_object_https_url.rb | 6 +++--- lib/fog/storage/openstack/requests/public_url.rb | 3 ++- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/lib/fog/storage/openstack.rb b/lib/fog/storage/openstack.rb index 2263bad46..cca6d65a4 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/storage/openstack.rb @@ -77,12 +77,8 @@ def initialize(options = {}) @openstack_management_url = options[:openstack_management_url] || 'http://example:8774/v2/AUTH_1234' @openstack_management_uri = URI.parse(@openstack_management_url) - - @host = @openstack_management_uri.host @path = @openstack_management_uri.path @path.sub!(%r{/$}, '') - @port = @openstack_management_uri.port - @scheme = @openstack_management_uri.scheme end def data diff --git a/lib/fog/storage/openstack/requests/get_object_https_url.rb b/lib/fog/storage/openstack/requests/get_object_https_url.rb index dad3853f7..4f9a418d2 100644 --- a/lib/fog/storage/openstack/requests/get_object_https_url.rb +++ b/lib/fog/storage/openstack/requests/get_object_https_url.rb @@ -38,9 +38,9 @@ def create_temp_url(container, object, expires, method, options = {}) raise ArgumentError, "Insufficient parameters specified." unless container && object && expires && method raise ArgumentError, "Storage must be instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil? - scheme = options[:scheme] || @scheme - host = options[:host] || @host - port = options[:port] || @port + scheme = options[:scheme] || @openstack_management_uri.scheme + host = options[:host] || @openstack_management_uri.host + port = options[:port] || @openstack_management_uri.port # POST not allowed allowed_methods = %w(GET PUT HEAD) diff --git a/lib/fog/storage/openstack/requests/public_url.rb b/lib/fog/storage/openstack/requests/public_url.rb index a4210da23..c95c8d7e3 100644 --- a/lib/fog/storage/openstack/requests/public_url.rb +++ b/lib/fog/storage/openstack/requests/public_url.rb @@ -18,7 +18,8 @@ def public_url(container = nil, object = nil) private def url - "#{@scheme}://#{@host}:#{@port}#{@path}" + "#{@openstack_management_uri.scheme}://#{@openstack_management_uri.host}:"\ + "#{@openstack_management_uri.port}#{@path}" end end From f507a48ee336770caa3dc28b570dfd0cb4a623e6 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 22 Aug 2018 09:08:37 +1000 Subject: [PATCH 052/129] Image Rspec: Avoid using dynamic attribute --- lib/fog/image/openstack/v2/models/image.rb | 2 +- .../openstack/image_v2/image_v2_reload.yml | 38 +++++++++---------- spec/image_v2_spec.rb | 17 ++++----- 3 files changed, 28 insertions(+), 29 deletions(-) diff --git a/lib/fog/image/openstack/v2/models/image.rb b/lib/fog/image/openstack/v2/models/image.rb index 7b4f54ad6..52a7b2768 100644 --- a/lib/fog/image/openstack/v2/models/image.rb +++ b/lib/fog/image/openstack/v2/models/image.rb @@ -190,7 +190,7 @@ def patch_attributes_to_remove(client_attributes, server_attributes) def patch_attributes_to_add(client_attributes, server_attributes) client_attributes.reject do |key, _| - server_attributes.key?(key) + server_attributes.key?(key) || client_attributes[key].nil? end end diff --git a/spec/fixtures/openstack/image_v2/image_v2_reload.yml b/spec/fixtures/openstack/image_v2/image_v2_reload.yml index 3acb967cd..d2ddef066 100644 --- a/spec/fixtures/openstack/image_v2/image_v2_reload.yml +++ b/spec/fixtures/openstack/image_v2/image_v2_reload.yml @@ -5,7 +5,7 @@ http_interactions: uri: http://devstack.openstack.stack:9292/v2/images body: encoding: UTF-8 - string: '{"name":"reloaded_image","reloadable_property":"original"}' + string: '{"name":"reloaded_image_original"}' headers: User-Agent: - fog-core/1.42.0 @@ -34,13 +34,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_original", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:06Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "original", "schema": "/v2/schemas/image"}' + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:06 GMT - request: @@ -75,13 +75,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_original", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:06Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "original", "schema": "/v2/schemas/image"}' + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:06 GMT - request: @@ -116,13 +116,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_original", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:06Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "original", "schema": "/v2/schemas/image"}' + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:06 GMT - request: @@ -130,7 +130,7 @@ http_interactions: uri: http://devstack.openstack.stack:9292/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886 body: encoding: UTF-8 - string: '[{"op":"replace","path":"/reloadable_property","value":"updated"}]' + string: '[{"op":"replace","path":"/name","value":"reloaded_image_updated"}]' headers: User-Agent: - fog-core/1.42.0 @@ -157,13 +157,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_updated", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:07Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "updated", "schema": "/v2/schemas/image"}' + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:07 GMT - request: @@ -198,13 +198,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_updated", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:07Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "updated", "schema": "/v2/schemas/image"}' + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:07 GMT - request: @@ -239,13 +239,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_updated", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:07Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "updated", "schema": "/v2/schemas/image"}' + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:07 GMT - request: @@ -253,7 +253,7 @@ http_interactions: uri: http://devstack.openstack.stack:9292/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886 body: encoding: UTF-8 - string: '[{"op":"replace","path":"/reloadable_property","value":"updated_again"}]' + string: '[{"op":"replace","path":"/name","value":"reloaded_image_updated_again"}]' headers: User-Agent: - fog-core/1.42.0 @@ -280,13 +280,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_updated_again", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:08Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "updated_again", "schema": + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:08 GMT @@ -322,13 +322,13 @@ http_interactions: - close body: encoding: UTF-8 - string: '{"status": "queued", "name": "reloaded_image", "tags": [], "container_format": + string: '{"status": "queued", "name": "reloaded_image_updated_again", "tags": [], "container_format": null, "created_at": "2016-08-25T17:09:06Z", "size": null, "disk_format": null, "locations": [], "visibility": "private", "updated_at": "2016-08-25T17:09:08Z", "self": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "owner": "7b7688e5eecd4d6aa5b5b2cb3e93a778", "protected": false, "min_ram": 0, "file": "/v2/images/bc3cfc5a-0c88-47b6-82c2-c6957c30d886/file", "checksum": null, "id": "bc3cfc5a-0c88-47b6-82c2-c6957c30d886", "min_disk": - 0, "virtual_size": null, "reloadable_property": "updated_again", "schema": + 0, "virtual_size": null, "schema": "/v2/schemas/image"}' http_version: recorded_at: Thu, 25 Aug 2016 17:09:08 GMT diff --git a/spec/image_v2_spec.rb b/spec/image_v2_spec.rb index 90e0b6120..b957f57a1 100644 --- a/spec/image_v2_spec.rb +++ b/spec/image_v2_spec.rb @@ -130,29 +130,28 @@ def cleanup_image(image, image_name = nil, image_id = nil) image_name = 'reloaded_image' begin created_image = @service.images.create( - :name => image_name, - :service => @service, - :reloadable_property => 'original' + :name => image_name + '_original', + :service => @service, ) identifier = created_image.id found_image = @service.images.find_by_id(identifier) # verify an image provided by `create` can be reloaded - found_image.reloadable_property = 'updated' + found_image.name = image_name + '_updated' found_image.save - created_image.reloadable_property.must_equal 'original' + created_image.name.must_equal image_name + '_original', created_image.reload - created_image.reloadable_property.must_equal 'updated' + created_image.name.must_equal image_name + '_updated' # verify an image provided by `find_by_id` can be reloaded - created_image.reloadable_property = 'updated_again' + created_image.name = image_name + '_updated_again' created_image.save - found_image.reloadable_property.must_equal 'updated' + found_image.name.must_equal image_name + '_updated' found_image.reload - found_image.reloadable_property.must_equal 'updated_again' + found_image.name.must_equal image_name + '_updated_again' ensure cleanup_image nil, image_name end From bfb27375e5590e3f2a462c79a96a7b16ca0c421b Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 11 Sep 2018 18:28:17 +1000 Subject: [PATCH 053/129] Keystone is version less --- README.md | 15 ++++++++------- examples/identity/basics.rb | 6 ++++-- examples/identity/basics_v3.rb | 4 +--- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index fe7d28e4a..3d5d60ab9 100644 --- a/README.md +++ b/README.md @@ -42,12 +42,12 @@ Checklist: * All following examples assume that `@connection_params` is a hash of valid connection information for an OpenStack cloud. * The `:openstack_username` and `:openstack_api_key` keys must map to a valid user/password combination in Keystone. * If you don't know what domain your user belongs to, chances are it's the `default` domain. By default, all users are a member of the `default` domain unless otherwise specified. - +* Keystone endpoints are version less. Version 3 is the default as v2.0 is deprecated. Meanwhile Keystone V3 still supports v2.0 for backward compatibility. Therefore passing a tenant instead of a project (along with a domain) makes Keystone provide v2.0 token. Connection parameters: ```ruby @connection_params = { - openstack_auth_url: "http://devstack.test:5000/v3/auth/tokens", + openstack_auth_url: "http://devstack.test:5000", openstack_username: "admin", openstack_api_key: "password", openstack_project_name: "admin", @@ -55,14 +55,15 @@ Connection parameters: } ``` -If you're using Keystone V2, you don't need to supply domain details but ensure the `openstack_auth_url` parameter references the correct endpoint. +If you're using Keystone V2, you don't need to supply domain details but ensure to either provide a tenant name (`openstack_tenant`) +or a tenant id (`openstack_tenant_id`). Alternatively you can use `:openstack_identity_api_version` parameter with 'v2.0'. ```ruby @connection_params = { - openstack_auth_url: "http://devstack.test:5000/v2.0/tokens", - openstack_username: "admin", - openstack_api_key: "password", - openstack_project_name: "admin" + openstack_auth_url: "http://devstack.test:5000", + openstack_username: "admin", + openstack_api_key: "password", + openstack_tenant: "admin" } ``` diff --git a/examples/identity/basics.rb b/examples/identity/basics.rb index d29f282c6..d0efd0f89 100644 --- a/examples/identity/basics.rb +++ b/examples/identity/basics.rb @@ -3,13 +3,15 @@ require 'fog/openstack' require 'pp' -auth_url = "https://example.net/v2.0/tokens" +auth_url = "https://example.net" username = 'admin@example.net' password = 'secret' +tenant = 'admin' keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, :openstack_username => username, - :openstack_api_key => password + :openstack_api_key => password, + :openstack_tenant => tenant # Optional, self-signed certs #:connection_options => { :ssl_verify_peer => false } diff --git a/examples/identity/basics_v3.rb b/examples/identity/basics_v3.rb index d168f546e..5d4492de4 100644 --- a/examples/identity/basics_v3.rb +++ b/examples/identity/basics_v3.rb @@ -3,14 +3,12 @@ require 'fog/openstack' require 'pp' -auth_url = "https://example.net:35357/v3/auth/tokens" +auth_url = "https://example.net:35357" username = 'admin@example.net' password = 'secret' project = 'admin' domain = 'Default' - - keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, :openstack_username => username, :openstack_api_key => password, From dcd1c1470ce14c00a9723562ce15707410ec0300 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 22 Aug 2018 09:08:37 +1000 Subject: [PATCH 054/129] Image Rspec: Avoid using dynamic attribute --- fog-openstack.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index e751c9ec3..0978f95da 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.2.0' - spec.add_dependency 'fog-core', '~> 1.45.0' + spec.add_dependency 'fog-core', '~> 2.1.2' spec.add_dependency 'fog-json', '>= 1.0' spec.add_dependency 'ipaddress', '>= 0.8' From 28242fd79535092279993ac1ce750465dc860f99 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 11 Sep 2018 18:46:57 +1000 Subject: [PATCH 055/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 9b385cf73..fe5c58eb4 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.2.1'.freeze + VERSION = '0.2.2'.freeze end end From e9f63ae1d441b5064df6e1ecbb8e9bdc6f2fc9ab Mon Sep 17 00:00:00 2001 From: Michal Wazgird Date: Tue, 11 Sep 2018 20:19:31 +0200 Subject: [PATCH 056/129] Fix for OVH v2.0 auth. OVH has numeric tenantName and expects it to be a string. Unfortunately fog converts any number string into number. --- lib/fog/openstack/auth/token/v2.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb index 22da6bc9a..d087c3ce1 100644 --- a/lib/fog/openstack/auth/token/v2.rb +++ b/lib/fog/openstack/auth/token/v2.rb @@ -21,9 +21,9 @@ def credentials end if @tenant.id - identity['tenantId'] = @tenant.id + identity['tenantId'] = @tenant.id.to_s elsif @tenant.name - identity['tenantName'] = @tenant.name + identity['tenantName'] = @tenant.name.to_s else raise CredentialsError, "#{self.class}: No tenant available" end From 36cc1c304431335bdbd11d598f0db7ddbcb88190 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 12 Sep 2018 13:29:59 +1000 Subject: [PATCH 057/129] openstack_identity_api_version missing For baremetal, introspection and nvf --- lib/fog/baremetal/openstack.rb | 3 ++- lib/fog/introspection/openstack.rb | 3 ++- lib/fog/nfv/openstack.rb | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/baremetal/openstack.rb index 1fe214fd0..f5dba6584 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/baremetal/openstack.rb @@ -14,7 +14,8 @@ class OpenStack < Fog::Service :openstack_endpoint_type, :openstack_cache_ttl, :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, - :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id + :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, + :openstack_identity_api_version ## MODELS # diff --git a/lib/fog/introspection/openstack.rb b/lib/fog/introspection/openstack.rb index 648ce0754..0bd02278a 100644 --- a/lib/fog/introspection/openstack.rb +++ b/lib/fog/introspection/openstack.rb @@ -14,7 +14,8 @@ class OpenStack < Fog::Service :openstack_endpoint_type, :openstack_cache_ttl, :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, - :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id + :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, + :openstack_identity_api_version ## REQUESTS # diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/nfv/openstack.rb index 8b50d9b22..857cacc19 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/nfv/openstack.rb @@ -14,7 +14,8 @@ class OpenStack < Fog::Service :openstack_endpoint_type, :openstack_project_name, :openstack_project_id, :openstack_project_domain, :openstack_user_domain, :openstack_domain_name, - :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id + :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, + :openstack_identity_api_version ## REQUESTS # From 8d60a027a62f33bd8f07ce90b7ed0a85355a4ca6 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 12 Sep 2018 13:45:13 +1000 Subject: [PATCH 058/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index fe5c58eb4..33d222a5f 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.2.2'.freeze + VERSION = '0.2.3'.freeze end end From a5e7923f92e76e59a7d8bfd7d98c9106c7f2080b Mon Sep 17 00:00:00 2001 From: Nick Kugaevsky Date: Wed, 12 Sep 2018 11:35:00 +0300 Subject: [PATCH 059/129] Fix for servers.com v2.0 auth servers.com OpenStack implementation expects `username` to be a string. Unfortunately fog converts any number string into number. --- lib/fog/openstack/auth/token/v2.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb index d087c3ce1..f5695c903 100644 --- a/lib/fog/openstack/auth/token/v2.rb +++ b/lib/fog/openstack/auth/token/v2.rb @@ -37,7 +37,7 @@ def path def user_credentials { - 'username' => @user.name, + 'username' => @user.name.to_s, 'password' => @user.password } end From 49d68b2d9316ae85d252775a125ba585fd3bc655 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 12 Sep 2018 13:45:13 +1000 Subject: [PATCH 060/129] Identity v2: unscope token fix --- lib/fog/openstack/auth/token.rb | 3 ++- lib/fog/openstack/auth/token/v2.rb | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb index e1a33ac4b..beb60a274 100644 --- a/lib/fog/openstack/auth/token.rb +++ b/lib/fog/openstack/auth/token.rb @@ -14,7 +14,8 @@ class StandardError < RuntimeError; end class URLError < RuntimeError; end def self.build(auth) - if auth[:openstack_tenant_id] || auth[:openstack_tenant] + if auth[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i || + auth[:openstack_tenant_id] || auth[:openstack_tenant] Fog::OpenStack::Auth::Token::V2.new(auth) else Fog::OpenStack::Auth::Token::V3.new(auth) diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb index f5695c903..04a59d48e 100644 --- a/lib/fog/openstack/auth/token/v2.rb +++ b/lib/fog/openstack/auth/token/v2.rb @@ -24,8 +24,6 @@ def credentials identity['tenantId'] = @tenant.id.to_s elsif @tenant.name identity['tenantName'] = @tenant.name.to_s - else - raise CredentialsError, "#{self.class}: No tenant available" end {'auth' => identity} From bce461554d82e33d829c06ebe583db7e55109586 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 13 Sep 2018 10:16:16 +1000 Subject: [PATCH 061/129] Baremetal: no need for version path --- lib/fog/baremetal/openstack.rb | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/baremetal/openstack.rb index f5dba6584..136911c3b 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/baremetal/openstack.rb @@ -249,17 +249,12 @@ def credentials class Real include Fog::OpenStack::Core - def default_service_type - %w[baremetal] + def self.not_found_class + Fog::Baremetal::OpenStack::NotFound end - # NOTE: uncommenting this should be treated as api-change! - # def self.not_found_class - # Fog::Baremetal::OpenStack::NotFound - # end - - def default_path_prefix - 'v1' + def default_service_type + %w[baremetal] end end end From aa7a8beccc45958d69818735b99a25fbc68503cf Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 13 Sep 2018 10:23:59 +1000 Subject: [PATCH 062/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 33d222a5f..b4f0afc77 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.2.3'.freeze + VERSION = '0.2.4'.freeze end end From 8cae54f9cc979e777764180e2be7e9ba160ff3b6 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 7 Sep 2018 14:02:51 +1000 Subject: [PATCH 063/129] network model: remove subnet attribute to support fog-core 2+ --- lib/fog/network/openstack/models/network.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/fog/network/openstack/models/network.rb b/lib/fog/network/openstack/models/network.rb index 41d9e2e1c..36afb31c9 100644 --- a/lib/fog/network/openstack/models/network.rb +++ b/lib/fog/network/openstack/models/network.rb @@ -7,7 +7,6 @@ class Network < Fog::OpenStack::Model identity :id attribute :name - attribute :subnets attribute :shared attribute :status attribute :admin_state_up From b8050b261fc7818683b3d4040f19c00bb72851ce Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 14 Sep 2018 11:24:13 +1000 Subject: [PATCH 064/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index b4f0afc77..cd626ac12 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.2.4'.freeze + VERSION = '0.3.0'.freeze end end From b312b3d35d8772daedb7f9a6525dc0f0bfccd79a Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 17 Sep 2018 10:59:40 +1000 Subject: [PATCH 065/129] Renames Fog::::OpenStack to Fog::OpenStack:: Moves the files accordingly --- README.md | 58 +++++----- docs/compute.md | 70 ++++++------ docs/introspection.md | 4 +- docs/metering.md | 2 +- docs/network.md | 16 +-- docs/orchestration.md | 38 +++---- docs/planning.md | 4 +- docs/shared_file_system.md | 2 +- docs/storage.md | 8 +- docs/workflow.md | 2 +- examples/compute/block_device_mapping_v2.rb | 2 +- examples/container_infra/basics.rb | 2 +- examples/event/basics.rb | 2 +- examples/identity/basics.rb | 6 +- examples/identity/basics_v3.rb | 52 ++++----- examples/image/upload-test-image.rb | 30 ++--- examples/introspection/basics.rb | 4 +- examples/metric/basics.rb | 2 +- examples/network/network_rbac.rb | 4 +- examples/network/network_subnets_routers.rb | 2 +- examples/shared_file_system/basics.rb | 4 +- examples/storage/set-account-quota.rb | 4 +- examples/volume/backups.rb | 4 +- examples/workflow/workflow-examples.rb | 4 +- lib/fog/dns/openstack.rb | 21 ---- lib/fog/image/openstack.rb | 23 ---- lib/fog/openstack.rb | 104 ++++-------------- .../baremetal/baremetal.rb} | 12 +- .../baremetal}/models/chassis.rb | 4 +- .../baremetal}/models/chassis_collection.rb | 8 +- .../baremetal}/models/driver.rb | 4 +- .../baremetal}/models/drivers.rb | 8 +- .../baremetal}/models/node.rb | 4 +- .../baremetal}/models/nodes.rb | 8 +- .../baremetal}/models/port.rb | 4 +- .../baremetal}/models/ports.rb | 8 +- .../baremetal}/requests/create_chassis.rb | 4 +- .../baremetal}/requests/create_node.rb | 4 +- .../baremetal}/requests/create_port.rb | 4 +- .../baremetal}/requests/delete_chassis.rb | 4 +- .../baremetal}/requests/delete_node.rb | 4 +- .../baremetal}/requests/delete_port.rb | 4 +- .../baremetal}/requests/get_chassis.rb | 4 +- .../baremetal}/requests/get_driver.rb | 4 +- .../requests/get_driver_properties.rb | 4 +- .../baremetal}/requests/get_node.rb | 4 +- .../baremetal}/requests/get_port.rb | 4 +- .../baremetal}/requests/list_chassis.rb | 4 +- .../requests/list_chassis_detailed.rb | 4 +- .../baremetal}/requests/list_drivers.rb | 4 +- .../baremetal}/requests/list_nodes.rb | 4 +- .../requests/list_nodes_detailed.rb | 4 +- .../baremetal}/requests/list_ports.rb | 4 +- .../requests/list_ports_detailed.rb | 4 +- .../baremetal}/requests/patch_chassis.rb | 4 +- .../baremetal}/requests/patch_node.rb | 4 +- .../baremetal}/requests/patch_port.rb | 4 +- .../requests/set_node_maintenance.rb | 4 +- .../requests/set_node_power_state.rb | 4 +- .../requests/set_node_provision_state.rb | 4 +- .../requests/unset_node_maintenance.rb | 4 +- .../compute/compute.rb} | 10 +- .../compute}/models/address.rb | 4 +- .../compute}/models/addresses.rb | 10 +- .../compute}/models/aggregate.rb | 4 +- .../compute}/models/aggregates.rb | 8 +- .../compute}/models/availability_zone.rb | 4 +- .../compute}/models/availability_zones.rb | 8 +- .../compute}/models/flavor.rb | 12 +- .../compute}/models/flavors.rb | 10 +- .../compute}/models/host.rb | 8 +- .../compute}/models/hosts.rb | 10 +- .../compute}/models/image.rb | 8 +- .../compute}/models/images.rb | 10 +- .../compute}/models/key_pair.rb | 4 +- .../compute}/models/key_pairs.rb | 10 +- .../compute}/models/metadata.rb | 18 +-- .../compute}/models/metadatum.rb | 6 +- .../compute}/models/network.rb | 4 +- .../compute}/models/networks.rb | 8 +- .../compute}/models/os_interface.rb | 4 +- .../compute}/models/os_interfaces.rb | 8 +- .../compute}/models/security_group.rb | 12 +- .../compute}/models/security_group_rule.rb | 4 +- .../compute}/models/security_group_rules.rb | 10 +- .../compute}/models/security_groups.rb | 10 +- .../compute}/models/server.rb | 10 +- .../compute}/models/server_group.rb | 4 +- .../compute}/models/server_groups.rb | 10 +- .../compute}/models/servers.rb | 20 ++-- .../compute}/models/service.rb | 4 +- .../compute}/models/services.rb | 10 +- .../compute}/models/snapshot.rb | 6 +- .../compute}/models/snapshots.rb | 10 +- .../compute}/models/tenant.rb | 4 +- .../compute}/models/tenants.rb | 8 +- .../compute}/models/volume.rb | 6 +- .../compute}/models/volume_attachment.rb | 4 +- .../compute}/models/volume_attachments.rb | 8 +- .../compute}/models/volumes.rb | 10 +- .../compute}/requests/add_aggregate_host.rb | 4 +- .../compute}/requests/add_fixed_ip.rb | 4 +- .../compute}/requests/add_flavor_access.rb | 4 +- .../compute}/requests/add_security_group.rb | 4 +- .../compute}/requests/allocate_address.rb | 4 +- .../compute}/requests/associate_address.rb | 4 +- .../compute}/requests/attach_volume.rb | 4 +- .../compute}/requests/boot_from_snapshot.rb | 4 +- .../requests/change_server_password.rb | 4 +- .../requests/confirm_resize_server.rb | 4 +- .../compute}/requests/create_aggregate.rb | 4 +- .../compute}/requests/create_flavor.rb | 4 +- .../requests/create_flavor_metadata.rb | 4 +- .../compute}/requests/create_image.rb | 4 +- .../compute}/requests/create_key_pair.rb | 4 +- .../compute}/requests/create_os_interface.rb | 4 +- .../requests/create_security_group.rb | 8 +- .../requests/create_security_group_rule.rb | 4 +- .../compute}/requests/create_server.rb | 10 +- .../compute}/requests/create_server_group.rb | 8 +- .../compute}/requests/create_snapshot.rb | 6 +- .../compute}/requests/create_volume.rb | 4 +- .../compute}/requests/delete_aggregate.rb | 4 +- .../compute}/requests/delete_flavor.rb | 4 +- .../requests/delete_flavor_metadata.rb | 4 +- .../compute}/requests/delete_image.rb | 4 +- .../compute}/requests/delete_key_pair.rb | 4 +- .../compute}/requests/delete_meta.rb | 8 +- .../compute}/requests/delete_metadata.rb | 4 +- .../compute}/requests/delete_os_interface.rb | 4 +- .../requests/delete_security_group.rb | 4 +- .../requests/delete_security_group_rule.rb | 4 +- .../compute}/requests/delete_server.rb | 6 +- .../compute}/requests/delete_server_group.rb | 4 +- .../compute}/requests/delete_service.rb | 4 +- .../compute}/requests/delete_snapshot.rb | 6 +- .../compute}/requests/delete_volume.rb | 6 +- .../compute}/requests/detach_volume.rb | 6 +- .../compute}/requests/disable_service.rb | 4 +- .../requests/disable_service_log_reason.rb | 4 +- .../compute}/requests/disassociate_address.rb | 4 +- .../compute}/requests/enable_service.rb | 4 +- .../compute}/requests/evacuate_server.rb | 4 +- .../compute}/requests/get_address.rb | 4 +- .../compute}/requests/get_aggregate.rb | 4 +- .../compute}/requests/get_console_output.rb | 4 +- .../compute}/requests/get_flavor_details.rb | 6 +- .../compute}/requests/get_flavor_metadata.rb | 4 +- .../compute}/requests/get_host_details.rb | 4 +- .../compute}/requests/get_hypervisor.rb | 4 +- .../requests/get_hypervisor_statistics.rb | 4 +- .../compute}/requests/get_image_details.rb | 6 +- .../compute}/requests/get_key_pair.rb | 4 +- .../compute}/requests/get_limits.rb | 4 +- .../compute}/requests/get_metadata.rb | 4 +- .../compute}/requests/get_os_interface.rb | 4 +- .../compute}/requests/get_quota.rb | 4 +- .../compute}/requests/get_quota_defaults.rb | 4 +- .../compute}/requests/get_security_group.rb | 6 +- .../requests/get_security_group_rule.rb | 6 +- .../compute}/requests/get_server_details.rb | 6 +- .../compute}/requests/get_server_group.rb | 4 +- .../compute}/requests/get_server_password.rb | 6 +- .../compute}/requests/get_server_volumes.rb | 4 +- .../compute}/requests/get_snapshot_details.rb | 6 +- .../compute}/requests/get_usage.rb | 4 +- .../compute}/requests/get_vnc_console.rb | 4 +- .../compute}/requests/get_volume_details.rb | 6 +- .../compute}/requests/list_address_pools.rb | 4 +- .../compute}/requests/list_addresses.rb | 6 +- .../compute}/requests/list_aggregates.rb | 4 +- .../compute}/requests/list_all_addresses.rb | 4 +- .../requests/list_availability_zones.rb | 4 +- .../compute}/requests/list_flavors.rb | 4 +- .../compute}/requests/list_flavors_detail.rb | 4 +- .../compute}/requests/list_hosts.rb | 4 +- .../requests/list_hypervisor_servers.rb | 4 +- .../compute}/requests/list_hypervisors.rb | 4 +- .../requests/list_hypervisors_detail.rb | 4 +- .../compute}/requests/list_images.rb | 4 +- .../compute}/requests/list_images_detail.rb | 4 +- .../compute}/requests/list_key_pairs.rb | 4 +- .../compute}/requests/list_metadata.rb | 4 +- .../compute}/requests/list_os_interfaces.rb | 4 +- .../requests/list_private_addresses.rb | 6 +- .../requests/list_public_addresses.rb | 6 +- .../compute}/requests/list_security_groups.rb | 4 +- .../compute}/requests/list_server_groups.rb | 4 +- .../compute}/requests/list_servers.rb | 4 +- .../compute}/requests/list_servers_detail.rb | 4 +- .../compute}/requests/list_services.rb | 4 +- .../compute}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detail.rb | 4 +- .../list_tenants_with_flavor_access.rb | 4 +- .../compute}/requests/list_usages.rb | 4 +- .../requests/list_volume_attachments.rb | 4 +- .../compute}/requests/list_volumes.rb | 4 +- .../compute}/requests/list_volumes_detail.rb | 4 +- .../compute}/requests/list_zones.rb | 4 +- .../compute}/requests/list_zones_detailed.rb | 4 +- .../compute}/requests/live_migrate_server.rb | 4 +- .../compute}/requests/migrate_server.rb | 4 +- .../compute}/requests/pause_server.rb | 4 +- .../compute}/requests/reboot_server.rb | 4 +- .../compute}/requests/rebuild_server.rb | 4 +- .../compute}/requests/release_address.rb | 4 +- .../compute}/requests/remote_consoles.rb | 4 +- .../requests/remove_aggregate_host.rb | 4 +- .../compute}/requests/remove_fixed_ip.rb | 4 +- .../compute}/requests/remove_flavor_access.rb | 4 +- .../requests/remove_security_group.rb | 4 +- .../compute}/requests/rescue_server.rb | 4 +- .../compute}/requests/reset_server_state.rb | 4 +- .../compute}/requests/resize_server.rb | 4 +- .../compute}/requests/resume_server.rb | 4 +- .../compute}/requests/revert_resize_server.rb | 4 +- .../compute}/requests/server_action.rb | 4 +- .../compute}/requests/server_actions.rb | 4 +- .../compute}/requests/server_diagnostics.rb | 4 +- .../compute}/requests/set_metadata.rb | 8 +- .../compute}/requests/set_tenant.rb | 4 +- .../requests/shelve_offload_server.rb | 4 +- .../compute}/requests/shelve_server.rb | 4 +- .../compute}/requests/start_server.rb | 4 +- .../compute}/requests/stop_server.rb | 4 +- .../compute}/requests/suspend_server.rb | 4 +- .../compute}/requests/unpause_server.rb | 4 +- .../compute}/requests/unshelve_server.rb | 4 +- .../compute}/requests/update_aggregate.rb | 4 +- .../requests/update_aggregate_metadata.rb | 4 +- .../requests/update_flavor_metadata.rb | 4 +- .../compute}/requests/update_meta.rb | 8 +- .../compute}/requests/update_metadata.rb | 8 +- .../compute}/requests/update_quota.rb | 4 +- .../compute}/requests/update_server.rb | 6 +- .../container_infra/container_infra.rb} | 10 +- .../container_infra}/models/base.rb | 10 +- .../container_infra}/models/bay.rb | 6 +- .../container_infra}/models/bay_model.rb | 8 +- .../container_infra}/models/bay_models.rb | 10 +- .../container_infra}/models/bays.rb | 10 +- .../container_infra}/models/certificate.rb | 6 +- .../container_infra}/models/certificates.rb | 10 +- .../container_infra}/models/cluster.rb | 6 +- .../models/cluster_template.rb | 8 +- .../models/cluster_templates.rb | 10 +- .../container_infra}/models/clusters.rb | 10 +- .../container_infra}/requests/create_bay.rb | 4 +- .../requests/create_bay_model.rb | 4 +- .../requests/create_certificate.rb | 4 +- .../requests/create_cluster.rb | 4 +- .../requests/create_cluster_template.rb | 4 +- .../container_infra}/requests/delete_bay.rb | 4 +- .../requests/delete_bay_model.rb | 4 +- .../requests/delete_cluster.rb | 4 +- .../requests/delete_cluster_template.rb | 4 +- .../container_infra}/requests/get_bay.rb | 4 +- .../requests/get_bay_model.rb | 4 +- .../requests/get_certificate.rb | 4 +- .../container_infra}/requests/get_cluster.rb | 4 +- .../requests/get_cluster_template.rb | 4 +- .../requests/list_bay_models.rb | 4 +- .../container_infra}/requests/list_bays.rb | 4 +- .../requests/list_cluster_templates.rb | 4 +- .../requests/list_clusters.rb | 4 +- .../container_infra}/requests/update_bay.rb | 4 +- .../requests/update_bay_model.rb | 4 +- .../requests/update_cluster.rb | 4 +- .../requests/update_cluster_template.rb | 4 +- lib/fog/openstack/core.rb | 2 +- lib/fog/openstack/dns/dns.rb | 21 ++++ .../{dns/openstack => openstack/dns}/v1.rb | 10 +- .../dns}/v1/requests/get_quota.rb | 4 +- .../dns}/v1/requests/list_domains.rb | 4 +- .../dns}/v1/requests/update_quota.rb | 4 +- .../{dns/openstack => openstack/dns}/v2.rb | 12 +- .../dns}/v2/models/pool.rb | 4 +- .../dns}/v2/models/pools.rb | 8 +- .../dns}/v2/models/recordset.rb | 4 +- .../dns}/v2/models/recordsets.rb | 8 +- .../dns}/v2/models/zone.rb | 4 +- .../dns}/v2/models/zone_transfer_accept.rb | 4 +- .../dns}/v2/models/zone_transfer_accepts.rb | 8 +- .../dns}/v2/models/zone_transfer_request.rb | 4 +- .../dns}/v2/models/zone_transfer_requests.rb | 8 +- .../dns}/v2/models/zones.rb | 8 +- .../dns}/v2/requests/create_recordset.rb | 4 +- .../dns}/v2/requests/create_zone.rb | 4 +- .../requests/create_zone_transfer_accept.rb | 6 +- .../requests/create_zone_transfer_request.rb | 4 +- .../dns}/v2/requests/delete_recordset.rb | 6 +- .../dns}/v2/requests/delete_zone.rb | 6 +- .../requests/delete_zone_transfer_request.rb | 4 +- .../dns}/v2/requests/get_pool.rb | 6 +- .../dns}/v2/requests/get_quota.rb | 6 +- .../dns}/v2/requests/get_recordset.rb | 6 +- .../dns}/v2/requests/get_zone.rb | 6 +- .../v2/requests/get_zone_transfer_accept.rb | 4 +- .../v2/requests/get_zone_transfer_request.rb | 4 +- .../dns}/v2/requests/list_pools.rb | 6 +- .../dns}/v2/requests/list_recordsets.rb | 6 +- .../v2/requests/list_zone_transfer_accepts.rb | 4 +- .../requests/list_zone_transfer_requests.rb | 4 +- .../dns}/v2/requests/list_zones.rb | 6 +- .../dns}/v2/requests/update_quota.rb | 6 +- .../dns}/v2/requests/update_recordset.rb | 6 +- .../dns}/v2/requests/update_zone.rb | 6 +- .../requests/update_zone_transfer_request.rb | 4 +- .../openstack.rb => openstack/event/event.rb} | 10 +- .../event}/models/event.rb | 4 +- .../event}/models/events.rb | 10 +- .../event}/requests/get_event.rb | 4 +- .../event}/requests/list_events.rb | 4 +- .../identity/identity.rb} | 14 +-- .../openstack => openstack/identity}/v2.rb | 12 +- .../identity}/v2/models/ec2_credential.rb | 4 +- .../identity}/v2/models/ec2_credentials.rb | 10 +- .../identity}/v2/models/role.rb | 4 +- .../identity}/v2/models/roles.rb | 8 +- .../identity}/v2/models/tenant.rb | 4 +- .../identity}/v2/models/tenants.rb | 10 +- .../identity}/v2/models/user.rb | 4 +- .../identity}/v2/models/users.rb | 12 +- .../v2/requests/add_user_to_tenant.rb | 4 +- .../identity}/v2/requests/check_token.rb | 4 +- .../v2/requests/create_ec2_credential.rb | 4 +- .../identity}/v2/requests/create_role.rb | 4 +- .../identity}/v2/requests/create_tenant.rb | 4 +- .../identity}/v2/requests/create_user.rb | 4 +- .../identity}/v2/requests/create_user_role.rb | 4 +- .../v2/requests/delete_ec2_credential.rb | 6 +- .../identity}/v2/requests/delete_role.rb | 6 +- .../identity}/v2/requests/delete_tenant.rb | 4 +- .../identity}/v2/requests/delete_user.rb | 6 +- .../identity}/v2/requests/delete_user_role.rb | 4 +- .../v2/requests/get_ec2_credential.rb | 6 +- .../identity}/v2/requests/get_role.rb | 6 +- .../identity}/v2/requests/get_tenant.rb | 4 +- .../v2/requests/get_tenants_by_id.rb | 4 +- .../v2/requests/get_tenants_by_name.rb | 4 +- .../identity}/v2/requests/get_user_by_id.rb | 4 +- .../identity}/v2/requests/get_user_by_name.rb | 4 +- .../v2/requests/list_ec2_credentials.rb | 4 +- .../v2/requests/list_endpoints_for_token.rb | 4 +- .../identity}/v2/requests/list_roles.rb | 4 +- .../requests/list_roles_for_user_on_tenant.rb | 4 +- .../identity}/v2/requests/list_tenants.rb | 4 +- .../v2/requests/list_user_global_roles.rb | 4 +- .../identity}/v2/requests/list_users.rb | 4 +- .../v2/requests/remove_user_from_tenant.rb | 4 +- .../identity}/v2/requests/set_tenant.rb | 4 +- .../identity}/v2/requests/update_tenant.rb | 4 +- .../identity}/v2/requests/update_user.rb | 6 +- .../identity}/v2/requests/validate_token.rb | 4 +- .../openstack => openstack/identity}/v3.rb | 12 +- .../identity}/v3/models/domain.rb | 4 +- .../identity}/v3/models/domains.rb | 22 ++-- .../identity}/v3/models/endpoint.rb | 4 +- .../identity}/v3/models/endpoints.rb | 10 +- .../identity}/v3/models/group.rb | 8 +- .../identity}/v3/models/groups.rb | 10 +- .../identity}/v3/models/os_credential.rb | 4 +- .../identity}/v3/models/os_credentials.rb | 10 +- .../identity}/v3/models/policies.rb | 10 +- .../identity}/v3/models/policy.rb | 4 +- .../identity}/v3/models/project.rb | 8 +- .../identity}/v3/models/projects.rb | 22 ++-- .../identity}/v3/models/role.rb | 4 +- .../identity}/v3/models/role_assignment.rb | 4 +- .../identity}/v3/models/role_assignments.rb | 8 +- .../identity}/v3/models/roles.rb | 10 +- .../identity}/v3/models/service.rb | 4 +- .../identity}/v3/models/services.rb | 10 +- .../identity}/v3/models/token.rb | 4 +- .../identity}/v3/models/tokens.rb | 12 +- .../identity}/v3/models/user.rb | 6 +- .../identity}/v3/models/users.rb | 10 +- .../v3/requests/add_user_to_group.rb | 4 +- .../identity}/v3/requests/auth_domains.rb | 4 +- .../identity}/v3/requests/auth_projects.rb | 4 +- .../v3/requests/check_domain_group_role.rb | 4 +- .../v3/requests/check_domain_user_role.rb | 4 +- .../v3/requests/check_project_group_role.rb | 4 +- .../v3/requests/check_project_user_role.rb | 4 +- .../identity}/v3/requests/create_domain.rb | 4 +- .../identity}/v3/requests/create_endpoint.rb | 4 +- .../identity}/v3/requests/create_group.rb | 4 +- .../v3/requests/create_os_credential.rb | 4 +- .../identity}/v3/requests/create_policy.rb | 4 +- .../identity}/v3/requests/create_project.rb | 4 +- .../identity}/v3/requests/create_role.rb | 4 +- .../identity}/v3/requests/create_service.rb | 4 +- .../identity}/v3/requests/create_user.rb | 4 +- .../identity}/v3/requests/delete_domain.rb | 4 +- .../identity}/v3/requests/delete_endpoint.rb | 4 +- .../identity}/v3/requests/delete_group.rb | 4 +- .../v3/requests/delete_os_credential.rb | 4 +- .../identity}/v3/requests/delete_policy.rb | 4 +- .../identity}/v3/requests/delete_project.rb | 4 +- .../identity}/v3/requests/delete_role.rb | 4 +- .../identity}/v3/requests/delete_service.rb | 4 +- .../identity}/v3/requests/delete_user.rb | 4 +- .../identity}/v3/requests/get_domain.rb | 4 +- .../identity}/v3/requests/get_endpoint.rb | 4 +- .../identity}/v3/requests/get_group.rb | 4 +- .../v3/requests/get_os_credential.rb | 4 +- .../identity}/v3/requests/get_policy.rb | 4 +- .../identity}/v3/requests/get_project.rb | 4 +- .../identity}/v3/requests/get_role.rb | 4 +- .../identity}/v3/requests/get_service.rb | 4 +- .../identity}/v3/requests/get_user.rb | 4 +- .../v3/requests/grant_domain_group_role.rb | 4 +- .../v3/requests/grant_domain_user_role.rb | 4 +- .../v3/requests/grant_project_group_role.rb | 4 +- .../v3/requests/grant_project_user_role.rb | 4 +- .../identity}/v3/requests/group_user_check.rb | 4 +- .../v3/requests/list_domain_group_roles.rb | 4 +- .../v3/requests/list_domain_user_roles.rb | 4 +- .../identity}/v3/requests/list_domains.rb | 4 +- .../identity}/v3/requests/list_endpoints.rb | 4 +- .../identity}/v3/requests/list_group_users.rb | 4 +- .../identity}/v3/requests/list_groups.rb | 4 +- .../v3/requests/list_os_credentials.rb | 4 +- .../identity}/v3/requests/list_policies.rb | 4 +- .../v3/requests/list_project_group_roles.rb | 4 +- .../v3/requests/list_project_user_roles.rb | 4 +- .../identity}/v3/requests/list_projects.rb | 4 +- .../v3/requests/list_role_assignments.rb | 4 +- .../identity}/v3/requests/list_roles.rb | 4 +- .../identity}/v3/requests/list_services.rb | 4 +- .../identity}/v3/requests/list_user_groups.rb | 4 +- .../v3/requests/list_user_projects.rb | 4 +- .../identity}/v3/requests/list_users.rb | 4 +- .../v3/requests/remove_user_from_group.rb | 4 +- .../v3/requests/revoke_domain_group_role.rb | 4 +- .../v3/requests/revoke_domain_user_role.rb | 4 +- .../v3/requests/revoke_project_group_role.rb | 4 +- .../v3/requests/revoke_project_user_role.rb | 4 +- .../v3/requests/token_authenticate.rb | 4 +- .../identity}/v3/requests/token_check.rb | 4 +- .../identity}/v3/requests/token_revoke.rb | 4 +- .../identity}/v3/requests/token_validate.rb | 4 +- .../identity}/v3/requests/update_domain.rb | 4 +- .../identity}/v3/requests/update_endpoint.rb | 4 +- .../identity}/v3/requests/update_group.rb | 4 +- .../v3/requests/update_os_credential.rb | 4 +- .../identity}/v3/requests/update_policy.rb | 4 +- .../identity}/v3/requests/update_project.rb | 4 +- .../identity}/v3/requests/update_role.rb | 4 +- .../identity}/v3/requests/update_service.rb | 4 +- .../identity}/v3/requests/update_user.rb | 4 +- lib/fog/openstack/image/image.rb | 23 ++++ .../openstack => openstack/image}/v1.rb | 12 +- .../image}/v1/models/image.rb | 4 +- .../image}/v1/models/images.rb | 10 +- .../image}/v1/requests/add_member_to_image.rb | 4 +- .../image}/v1/requests/create_image.rb | 4 +- .../image}/v1/requests/delete_image.rb | 4 +- .../image}/v1/requests/get_image.rb | 4 +- .../image}/v1/requests/get_image_by_id.rb | 4 +- .../image}/v1/requests/get_image_members.rb | 4 +- .../image}/v1/requests/get_shared_images.rb | 4 +- .../image}/v1/requests/list_public_images.rb | 4 +- .../requests/list_public_images_detailed.rb | 4 +- .../v1/requests/remove_member_from_image.rb | 4 +- .../image}/v1/requests/set_tenant.rb | 4 +- .../image}/v1/requests/update_image.rb | 4 +- .../v1/requests/update_image_members.rb | 4 +- .../openstack => openstack/image}/v2.rb | 12 +- .../image}/v2/models/image.rb | 4 +- .../image}/v2/models/images.rb | 10 +- .../image}/v2/requests/add_member_to_image.rb | 4 +- .../image}/v2/requests/add_tag_to_image.rb | 4 +- .../image}/v2/requests/create_image.rb | 4 +- .../image}/v2/requests/deactivate_image.rb | 4 +- .../image}/v2/requests/delete_image.rb | 4 +- .../image}/v2/requests/download_image.rb | 4 +- .../image}/v2/requests/get_image.rb | 4 +- .../image}/v2/requests/get_image_by_id.rb | 4 +- .../image}/v2/requests/get_image_members.rb | 4 +- .../image}/v2/requests/get_member_details.rb | 4 +- .../image}/v2/requests/get_shared_images.rb | 4 +- .../image}/v2/requests/list_images.rb | 4 +- .../image}/v2/requests/reactivate_image.rb | 4 +- .../v2/requests/remove_member_from_image.rb | 4 +- .../v2/requests/remove_tag_from_image.rb | 4 +- .../image}/v2/requests/set_tenant.rb | 4 +- .../image}/v2/requests/update_image.rb | 4 +- .../image}/v2/requests/update_image_member.rb | 4 +- .../image}/v2/requests/upload_image.rb | 4 +- .../introspection/introspection.rb} | 14 +-- .../introspection}/models/rules.rb | 4 +- .../introspection}/models/rules_collection.rb | 10 +- .../requests/abort_introspection.rb | 4 +- .../requests/create_introspection.rb | 4 +- .../introspection}/requests/create_rules.rb | 4 +- .../introspection}/requests/delete_rules.rb | 4 +- .../requests/delete_rules_all.rb | 4 +- .../requests/get_introspection.rb | 4 +- .../requests/get_introspection_details.rb | 4 +- .../introspection}/requests/get_rules.rb | 4 +- .../introspection}/requests/list_rules.rb | 4 +- .../key_manager/key_manager.rb} | 10 +- .../key_manager}/models/acl.rb | 4 +- .../key_manager}/models/container.rb | 6 +- .../key_manager}/models/containers.rb | 12 +- .../key_manager}/models/secret.rb | 6 +- .../key_manager}/models/secrets.rb | 12 +- .../key_manager}/requests/create_container.rb | 6 +- .../key_manager}/requests/create_secret.rb | 6 +- .../key_manager}/requests/delete_container.rb | 6 +- .../requests/delete_container_acl.rb | 4 +- .../key_manager}/requests/delete_secret.rb | 6 +- .../requests/delete_secret_acl.rb | 4 +- .../key_manager}/requests/get_container.rb | 6 +- .../requests/get_container_acl.rb | 4 +- .../key_manager}/requests/get_secret.rb | 6 +- .../key_manager}/requests/get_secret_acl.rb | 4 +- .../requests/get_secret_metadata.rb | 6 +- .../requests/get_secret_payload.rb | 6 +- .../key_manager}/requests/list_containers.rb | 6 +- .../key_manager}/requests/list_secrets.rb | 6 +- .../requests/replace_container_acl.rb | 4 +- .../requests/replace_secret_acl.rb | 4 +- .../requests/update_container_acl.rb | 4 +- .../requests/update_secret_acl.rb | 4 +- .../metering/metering.rb} | 10 +- .../metering}/models/event.rb | 4 +- .../metering}/models/events.rb | 10 +- .../metering}/models/meter.rb | 0 .../metering}/models/meters.rb | 0 .../metering}/models/resource.rb | 4 +- .../metering}/models/resources.rb | 10 +- .../metering}/requests/get_event.rb | 4 +- .../metering}/requests/get_resource.rb | 4 +- .../metering}/requests/get_samples.rb | 4 +- .../metering}/requests/get_statistics.rb | 4 +- .../metering}/requests/list_events.rb | 4 +- .../metering}/requests/list_meters.rb | 4 +- .../metering}/requests/list_resources.rb | 4 +- .../metric/metric.rb} | 10 +- .../metric}/models/metric.rb | 4 +- .../metric}/models/metrics.rb | 12 +- .../metric}/models/resource.rb | 4 +- .../metric}/models/resources.rb | 10 +- .../metric}/requests/get_metric.rb | 4 +- .../metric}/requests/get_metric_measures.rb | 4 +- .../metric}/requests/get_resource.rb | 4 +- .../requests/get_resource_metric_measures.rb | 4 +- .../metric}/requests/list_metrics.rb | 4 +- .../metric}/requests/list_resources.rb | 4 +- lib/fog/openstack/models/meta_parent.rb | 8 +- .../monitoring}/models/alarm.rb | 4 +- .../monitoring}/models/alarm_count.rb | 4 +- .../monitoring}/models/alarm_counts.rb | 8 +- .../monitoring}/models/alarm_definition.rb | 4 +- .../monitoring}/models/alarm_definitions.rb | 10 +- .../monitoring}/models/alarm_state.rb | 4 +- .../monitoring}/models/alarm_states.rb | 8 +- .../monitoring}/models/alarms.rb | 10 +- .../monitoring}/models/dimension_value.rb | 4 +- .../monitoring}/models/dimension_values.rb | 8 +- .../monitoring}/models/measurement.rb | 4 +- .../monitoring}/models/measurements.rb | 8 +- .../monitoring}/models/metric.rb | 4 +- .../monitoring}/models/metrics.rb | 12 +- .../monitoring}/models/notification_method.rb | 4 +- .../models/notification_methods.rb | 10 +- .../monitoring}/models/statistic.rb | 4 +- .../monitoring}/models/statistics.rb | 8 +- .../monitoring/monitoring.rb} | 10 +- .../requests/create_alarm_definition.rb | 4 +- .../monitoring}/requests/create_metric.rb | 4 +- .../requests/create_metric_array.rb | 4 +- .../requests/create_notification_method.rb | 4 +- .../monitoring}/requests/delete_alarm.rb | 4 +- .../requests/delete_alarm_definition.rb | 4 +- .../requests/delete_notification_method.rb | 4 +- .../monitoring}/requests/find_measurements.rb | 4 +- .../monitoring}/requests/get_alarm.rb | 4 +- .../monitoring}/requests/get_alarm_counts.rb | 4 +- .../requests/get_alarm_definition.rb | 4 +- .../requests/get_notification_method.rb | 4 +- .../requests/list_alarm_definitions.rb | 4 +- ...list_alarm_state_history_for_all_alarms.rb | 4 +- ..._alarm_state_history_for_specific_alarm.rb | 4 +- .../monitoring}/requests/list_alarms.rb | 4 +- .../requests/list_dimension_values.rb | 4 +- .../monitoring}/requests/list_metric_names.rb | 4 +- .../monitoring}/requests/list_metrics.rb | 4 +- .../list_notification_method_types.rb | 4 +- .../requests/list_notification_methods.rb | 4 +- .../monitoring}/requests/list_statistics.rb | 4 +- .../monitoring}/requests/patch_alarm.rb | 4 +- .../requests/patch_alarm_definition.rb | 4 +- .../requests/patch_notification_method.rb | 4 +- .../requests/put_notification_method.rb | 4 +- .../monitoring}/requests/update_alarm.rb | 4 +- .../requests/update_alarm_definition.rb | 4 +- .../network}/models/extension.rb | 4 +- .../network}/models/extensions.rb | 10 +- .../network}/models/floating_ip.rb | 4 +- .../network}/models/floating_ips.rb | 10 +- .../network}/models/ike_policies.rb | 10 +- .../network}/models/ike_policy.rb | 4 +- .../network}/models/ipsec_policies.rb | 10 +- .../network}/models/ipsec_policy.rb | 4 +- .../network}/models/ipsec_site_connection.rb | 4 +- .../network}/models/ipsec_site_connections.rb | 10 +- .../network}/models/lb_health_monitor.rb | 4 +- .../network}/models/lb_health_monitors.rb | 10 +- .../network}/models/lb_member.rb | 4 +- .../network}/models/lb_members.rb | 10 +- .../network}/models/lb_pool.rb | 4 +- .../network}/models/lb_pools.rb | 10 +- .../network}/models/lb_vip.rb | 4 +- .../network}/models/lb_vips.rb | 10 +- .../network}/models/network.rb | 4 +- .../models/network_ip_availabilities.rb | 10 +- .../models/network_ip_availability.rb | 4 +- .../network}/models/networks.rb | 10 +- .../network}/models/port.rb | 4 +- .../network}/models/ports.rb | 10 +- .../network}/models/rbac_policies.rb | 10 +- .../network}/models/rbac_policy.rb | 4 +- .../network}/models/router.rb | 6 +- .../network}/models/routers.rb | 10 +- .../network}/models/security_group.rb | 6 +- .../network}/models/security_group_rule.rb | 4 +- .../network}/models/security_group_rules.rb | 10 +- .../network}/models/security_groups.rb | 10 +- .../network}/models/subnet.rb | 4 +- .../network}/models/subnet_pool.rb | 4 +- .../network}/models/subnet_pools.rb | 10 +- .../network}/models/subnets.rb | 10 +- .../network}/models/vpn_service.rb | 4 +- .../network}/models/vpn_services.rb | 10 +- .../network/network.rb} | 10 +- .../network}/requests/add_router_interface.rb | 4 +- .../requests/associate_floating_ip.rb | 4 +- .../requests/associate_lb_health_monitor.rb | 6 +- .../network}/requests/create_floating_ip.rb | 4 +- .../network}/requests/create_ike_policy.rb | 4 +- .../network}/requests/create_ipsec_policy.rb | 4 +- .../requests/create_ipsec_site_connection.rb | 4 +- .../requests/create_lb_health_monitor.rb | 4 +- .../network}/requests/create_lb_member.rb | 4 +- .../network}/requests/create_lb_pool.rb | 4 +- .../network}/requests/create_lb_vip.rb | 4 +- .../requests/create_lbaas_healthmonitor.rb | 4 +- .../requests/create_lbaas_l7policy.rb | 4 +- .../network}/requests/create_lbaas_l7rule.rb | 4 +- .../requests/create_lbaas_listener.rb | 4 +- .../requests/create_lbaas_loadbalancer.rb | 4 +- .../network}/requests/create_lbaas_pool.rb | 4 +- .../requests/create_lbaas_pool_member.rb | 4 +- .../network}/requests/create_network.rb | 8 +- .../network}/requests/create_port.rb | 4 +- .../network}/requests/create_rbac_policy.rb | 4 +- .../network}/requests/create_router.rb | 8 +- .../requests/create_security_group.rb | 4 +- .../requests/create_security_group_rule.rb | 4 +- .../network}/requests/create_subnet.rb | 4 +- .../network}/requests/create_subnet_pool.rb | 4 +- .../network}/requests/create_vpn_service.rb | 4 +- .../network}/requests/delete_floating_ip.rb | 6 +- .../network}/requests/delete_ike_policy.rb | 6 +- .../network}/requests/delete_ipsec_policy.rb | 6 +- .../requests/delete_ipsec_site_connection.rb | 6 +- .../requests/delete_lb_health_monitor.rb | 6 +- .../network}/requests/delete_lb_member.rb | 6 +- .../network}/requests/delete_lb_pool.rb | 6 +- .../network}/requests/delete_lb_vip.rb | 6 +- .../requests/delete_lbaas_healthmonitor.rb | 6 +- .../requests/delete_lbaas_l7policy.rb | 6 +- .../network}/requests/delete_lbaas_l7rule.rb | 6 +- .../requests/delete_lbaas_listener.rb | 6 +- .../requests/delete_lbaas_loadbalancer.rb | 6 +- .../network}/requests/delete_lbaas_pool.rb | 6 +- .../requests/delete_lbaas_pool_member.rb | 6 +- .../network}/requests/delete_network.rb | 6 +- .../network}/requests/delete_port.rb | 6 +- .../network}/requests/delete_quota.rb | 4 +- .../network}/requests/delete_rbac_policy.rb | 6 +- .../network}/requests/delete_router.rb | 6 +- .../requests/delete_security_group.rb | 6 +- .../requests/delete_security_group_rule.rb | 6 +- .../network}/requests/delete_subnet.rb | 6 +- .../network}/requests/delete_subnet_pool.rb | 6 +- .../network}/requests/delete_vpn_service.rb | 6 +- .../requests/disassociate_floating_ip.rb | 4 +- .../disassociate_lb_health_monitor.rb | 6 +- .../network}/requests/get_extension.rb | 6 +- .../network}/requests/get_floating_ip.rb | 6 +- .../network}/requests/get_ike_policy.rb | 6 +- .../network}/requests/get_ipsec_policy.rb | 6 +- .../requests/get_ipsec_site_connection.rb | 6 +- .../requests/get_lb_health_monitor.rb | 6 +- .../network}/requests/get_lb_member.rb | 6 +- .../network}/requests/get_lb_pool.rb | 6 +- .../network}/requests/get_lb_pool_stats.rb | 6 +- .../network}/requests/get_lb_vip.rb | 6 +- .../requests/get_lbaas_healthmonitor.rb | 6 +- .../network}/requests/get_lbaas_l7policy.rb | 6 +- .../network}/requests/get_lbaas_l7rule.rb | 6 +- .../network}/requests/get_lbaas_listener.rb | 6 +- .../requests/get_lbaas_loadbalancer.rb | 6 +- .../network}/requests/get_lbaas_pool.rb | 6 +- .../requests/get_lbaas_pool_member.rb | 6 +- .../network}/requests/get_network.rb | 6 +- .../requests/get_network_ip_availability.rb | 6 +- .../network}/requests/get_port.rb | 6 +- .../network}/requests/get_quota.rb | 4 +- .../network}/requests/get_quotas.rb | 4 +- .../network}/requests/get_rbac_policy.rb | 6 +- .../network}/requests/get_router.rb | 6 +- .../network}/requests/get_security_group.rb | 6 +- .../requests/get_security_group_rule.rb | 6 +- .../network}/requests/get_subnet.rb | 6 +- .../network}/requests/get_subnet_pool.rb | 6 +- .../network}/requests/get_vpn_service.rb | 6 +- .../network}/requests/list_extensions.rb | 4 +- .../network}/requests/list_floating_ips.rb | 4 +- .../network}/requests/list_ike_policies.rb | 4 +- .../network}/requests/list_ipsec_policies.rb | 4 +- .../requests/list_ipsec_site_connections.rb | 4 +- .../requests/list_lb_health_monitors.rb | 4 +- .../network}/requests/list_lb_members.rb | 4 +- .../network}/requests/list_lb_pools.rb | 4 +- .../network}/requests/list_lb_vips.rb | 4 +- .../requests/list_lbaas_healthmonitors.rb | 4 +- .../requests/list_lbaas_l7policies.rb | 4 +- .../network}/requests/list_lbaas_l7rules.rb | 4 +- .../network}/requests/list_lbaas_listeners.rb | 4 +- .../requests/list_lbaas_loadbalancers.rb | 4 +- .../requests/list_lbaas_pool_members.rb | 4 +- .../network}/requests/list_lbaas_pools.rb | 4 +- .../list_network_ip_availabilities.rb | 6 +- .../network}/requests/list_networks.rb | 4 +- .../network}/requests/list_ports.rb | 4 +- .../network}/requests/list_rbac_policies.rb | 4 +- .../network}/requests/list_routers.rb | 4 +- .../requests/list_security_group_rules.rb | 4 +- .../network}/requests/list_security_groups.rb | 4 +- .../network}/requests/list_subnet_pools.rb | 4 +- .../network}/requests/list_subnets.rb | 4 +- .../network}/requests/list_vpn_services.rb | 4 +- .../requests/remove_router_interface.rb | 4 +- .../network}/requests/set_tenant.rb | 4 +- .../network}/requests/update_ike_policy.rb | 6 +- .../network}/requests/update_ipsec_policy.rb | 6 +- .../requests/update_ipsec_site_connection.rb | 6 +- .../requests/update_lb_health_monitor.rb | 6 +- .../network}/requests/update_lb_member.rb | 6 +- .../network}/requests/update_lb_pool.rb | 6 +- .../network}/requests/update_lb_vip.rb | 6 +- .../requests/update_lbaas_healthmonitor.rb | 6 +- .../requests/update_lbaas_l7policy.rb | 6 +- .../network}/requests/update_lbaas_l7rule.rb | 6 +- .../requests/update_lbaas_listener.rb | 6 +- .../requests/update_lbaas_loadbalancer.rb | 6 +- .../network}/requests/update_lbaas_pool.rb | 6 +- .../requests/update_lbaas_pool_member.rb | 6 +- .../network}/requests/update_network.rb | 8 +- .../network}/requests/update_port.rb | 6 +- .../network}/requests/update_quota.rb | 4 +- .../network}/requests/update_rbac_policy.rb | 6 +- .../network}/requests/update_router.rb | 10 +- .../requests/update_security_group.rb | 6 +- .../network}/requests/update_subnet.rb | 6 +- .../network}/requests/update_subnet_pool.rb | 6 +- .../network}/requests/update_vpn_service.rb | 6 +- .../openstack => openstack/nfv}/models/vnf.rb | 4 +- .../nfv}/models/vnfd.rb | 4 +- .../nfv}/models/vnfds.rb | 10 +- .../nfv}/models/vnfs.rb | 10 +- .../openstack.rb => openstack/nfv/nfv.rb} | 10 +- .../nfv}/requests/create_vnf.rb | 4 +- .../nfv}/requests/create_vnfd.rb | 4 +- .../nfv}/requests/delete_vnf.rb | 4 +- .../nfv}/requests/delete_vnfd.rb | 4 +- .../nfv}/requests/get_vnf.rb | 4 +- .../nfv}/requests/get_vnfd.rb | 4 +- .../nfv}/requests/list_vnfds.rb | 4 +- .../nfv}/requests/list_vnfs.rb | 4 +- .../nfv}/requests/update_vnf.rb | 4 +- .../orchestration}/models/event.rb | 4 +- .../orchestration}/models/events.rb | 10 +- .../orchestration}/models/resource.rb | 4 +- .../orchestration}/models/resource_schemas.rb | 6 +- .../orchestration}/models/resources.rb | 12 +- .../orchestration}/models/stack.rb | 6 +- .../orchestration}/models/stacks.rb | 10 +- .../orchestration}/models/template.rb | 4 +- .../orchestration}/models/templates.rb | 10 +- .../orchestration/orchestration.rb} | 12 +- .../orchestration}/requests/abandon_stack.rb | 4 +- .../orchestration}/requests/build_info.rb | 4 +- .../orchestration}/requests/cancel_update.rb | 4 +- .../orchestration}/requests/create_stack.rb | 6 +- .../orchestration}/requests/delete_stack.rb | 4 +- .../requests/get_stack_template.rb | 4 +- .../orchestration}/requests/list_events.rb | 4 +- .../requests/list_resource_events.rb | 4 +- .../requests/list_resource_types.rb | 4 +- .../orchestration}/requests/list_resources.rb | 4 +- .../requests/list_stack_data.rb | 4 +- .../requests/list_stack_data_detailed.rb | 4 +- .../requests/list_stack_events.rb | 4 +- .../orchestration}/requests/patch_stack.rb | 6 +- .../orchestration}/requests/preview_stack.rb | 4 +- .../requests/show_event_details.rb | 4 +- .../requests/show_resource_data.rb | 4 +- .../requests/show_resource_metadata.rb | 4 +- .../requests/show_resource_schema.rb | 4 +- .../requests/show_resource_template.rb | 4 +- .../requests/show_stack_details.rb | 4 +- .../orchestration}/requests/update_stack.rb | 6 +- .../requests/validate_template.rb | 4 +- .../util/recursive_hot_file_loader.rb | 4 +- .../planning}/models/plan.rb | 0 .../planning}/models/plans.rb | 2 +- .../planning}/models/role.rb | 0 .../planning}/models/roles.rb | 2 +- .../planning/planning.rb} | 10 +- .../planning}/requests/add_role_to_plan.rb | 0 .../planning}/requests/create_plan.rb | 0 .../planning}/requests/delete_plan.rb | 0 .../planning}/requests/get_plan.rb | 0 .../planning}/requests/get_plan_templates.rb | 0 .../planning}/requests/list_plans.rb | 0 .../planning}/requests/list_roles.rb | 0 .../planning}/requests/patch_plan.rb | 0 .../requests/remove_role_from_plan.rb | 0 .../models/availability_zone.rb | 4 +- .../models/availability_zones.rb | 8 +- .../shared_file_system}/models/network.rb | 4 +- .../shared_file_system}/models/networks.rb | 8 +- .../shared_file_system}/models/share.rb | 6 +- .../models/share_access_rule.rb | 4 +- .../models/share_access_rules.rb | 8 +- .../models/share_export_location.rb | 6 +- .../models/share_export_locations.rb | 12 +- .../shared_file_system}/models/shares.rb | 8 +- .../shared_file_system}/models/snapshot.rb | 4 +- .../shared_file_system}/models/snapshots.rb | 8 +- .../add_security_service_to_share_network.rb | 4 +- .../requests/create_security_service.rb | 4 +- .../requests/create_share.rb | 4 +- .../requests/create_share_network.rb | 4 +- .../requests/create_snapshot.rb | 4 +- .../requests/delete_security_service.rb | 4 +- .../requests/delete_share.rb | 4 +- .../requests/delete_share_network.rb | 4 +- .../requests/delete_snapshot.rb | 4 +- .../requests/extend_share.rb | 4 +- .../requests/get_limits.rb | 4 +- .../shared_file_system}/requests/get_quota.rb | 4 +- .../requests/get_security_service.rb | 4 +- .../shared_file_system}/requests/get_share.rb | 4 +- .../requests/get_share_export_location.rb | 6 +- .../requests/get_share_network.rb | 4 +- .../requests/get_snapshot.rb | 4 +- .../requests/grant_share_access.rb | 4 +- .../requests/list_availability_zones.rb | 4 +- .../requests/list_security_services.rb | 4 +- .../requests/list_security_services_detail.rb | 4 +- .../requests/list_share_access_rules.rb | 4 +- .../requests/list_share_export_locations.rb | 6 +- .../requests/list_share_networks.rb | 4 +- .../requests/list_share_networks_detail.rb | 4 +- .../requests/list_shares.rb | 4 +- .../requests/list_shares_detail.rb | 4 +- .../requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detail.rb | 4 +- ...ove_security_service_from_share_network.rb | 4 +- .../requests/revoke_share_access.rb | 4 +- .../requests/share_action.rb | 4 +- .../requests/share_network_action.rb | 4 +- .../requests/shrink_share.rb | 4 +- .../requests/update_quota.rb | 4 +- .../requests/update_security_service.rb | 4 +- .../requests/update_share.rb | 4 +- .../requests/update_share_network.rb | 4 +- .../requests/update_snapshot.rb | 4 +- .../shared_file_system/shared_file_system.rb} | 10 +- .../storage}/models/directories.rb | 10 +- .../storage}/models/directory.rb | 10 +- .../storage}/models/file.rb | 4 +- .../storage}/models/files.rb | 12 +- .../storage}/requests/copy_object.rb | 4 +- .../storage}/requests/delete_container.rb | 4 +- .../requests/delete_multiple_objects.rb | 4 +- .../storage}/requests/delete_object.rb | 4 +- .../requests/delete_static_large_object.rb | 4 +- .../storage}/requests/get_container.rb | 4 +- .../storage}/requests/get_containers.rb | 4 +- .../storage}/requests/get_object.rb | 4 +- .../storage}/requests/get_object_http_url.rb | 4 +- .../storage}/requests/get_object_https_url.rb | 4 +- .../storage}/requests/head_container.rb | 4 +- .../storage}/requests/head_containers.rb | 4 +- .../storage}/requests/head_object.rb | 4 +- .../storage}/requests/post_object.rb | 4 +- .../requests/post_set_meta_temp_url_key.rb | 4 +- .../storage}/requests/public_url.rb | 4 +- .../storage}/requests/put_container.rb | 4 +- .../requests/put_dynamic_obj_manifest.rb | 6 +- .../storage}/requests/put_object.rb | 4 +- .../storage}/requests/put_object_manifest.rb | 4 +- .../requests/put_static_obj_manifest.rb | 6 +- .../storage/storage.rb} | 12 +- .../volume}/models/availability_zone.rb | 4 +- .../volume}/models/availability_zones.rb | 4 +- .../volume}/models/backup.rb | 4 +- .../volume}/models/backups.rb | 6 +- .../volume}/models/snapshot.rb | 4 +- .../volume}/models/snapshots.rb | 6 +- .../volume}/models/transfer.rb | 4 +- .../volume}/models/transfers.rb | 6 +- .../volume}/models/volume.rb | 4 +- .../volume}/models/volume_type.rb | 4 +- .../volume}/models/volume_types.rb | 6 +- .../volume}/models/volumes.rb | 6 +- .../volume}/requests/accept_transfer.rb | 4 +- .../volume}/requests/action.rb | 4 +- .../volume}/requests/create_backup.rb | 4 +- .../volume}/requests/create_snapshot.rb | 4 +- .../volume}/requests/create_transfer.rb | 4 +- .../volume}/requests/create_volume.rb | 4 +- .../volume}/requests/create_volume_type.rb | 4 +- .../volume}/requests/delete_backup.rb | 4 +- .../volume}/requests/delete_metadata.rb | 4 +- .../volume}/requests/delete_snapshot.rb | 4 +- .../requests/delete_snapshot_metadata.rb | 4 +- .../volume}/requests/delete_transfer.rb | 4 +- .../volume}/requests/delete_volume.rb | 4 +- .../volume}/requests/delete_volume_type.rb | 4 +- .../volume}/requests/extend_volume.rb | 4 +- .../volume}/requests/get_backup_details.rb | 4 +- .../volume}/requests/get_quota.rb | 4 +- .../volume}/requests/get_quota_defaults.rb | 4 +- .../volume}/requests/get_quota_usage.rb | 4 +- .../volume}/requests/get_snapshot_details.rb | 4 +- .../volume}/requests/get_transfer_details.rb | 4 +- .../volume}/requests/get_volume_details.rb | 4 +- .../requests/get_volume_type_details.rb | 4 +- .../volume}/requests/list_backups.rb | 4 +- .../volume}/requests/list_backups_detailed.rb | 4 +- .../volume}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detailed.rb | 4 +- .../volume}/requests/list_transfers.rb | 4 +- .../requests/list_transfers_detailed.rb | 4 +- .../volume}/requests/list_volume_types.rb | 4 +- .../volume}/requests/list_volumes.rb | 4 +- .../volume}/requests/list_volumes_detailed.rb | 4 +- .../volume}/requests/list_zones.rb | 4 +- .../volume}/requests/replace_metadata.rb | 4 +- .../volume}/requests/restore_backup.rb | 4 +- .../volume}/requests/set_tenant.rb | 4 +- .../volume}/requests/snapshot_action.rb | 4 +- .../volume}/requests/update_metadata.rb | 4 +- .../volume}/requests/update_quota.rb | 4 +- .../volume}/requests/update_snapshot.rb | 4 +- .../requests/update_snapshot_metadata.rb | 4 +- .../volume}/requests/update_volume.rb | 4 +- .../volume}/requests/update_volume_type.rb | 4 +- .../openstack => openstack/volume}/v1.rb | 14 +-- .../volume/v1/models/availability_zone.rb | 15 +++ .../volume/v1/models/availability_zones.rb | 16 +++ .../volume}/v1/models/backup.rb | 8 +- lib/fog/openstack/volume/v1/models/backups.rb | 16 +++ .../volume}/v1/models/snapshot.rb | 8 +- .../openstack/volume/v1/models/snapshots.rb | 16 +++ .../volume}/v1/models/transfer.rb | 8 +- .../openstack/volume/v1/models/transfers.rb | 16 +++ .../volume}/v1/models/volume.rb | 8 +- .../volume}/v1/models/volume_type.rb | 8 +- .../volume/v1/models/volume_types.rb | 16 +++ lib/fog/openstack/volume/v1/models/volumes.rb | 16 +++ .../volume/v1/requests/accept_transfer.rb | 2 + .../openstack/volume/v1/requests/action.rb | 2 + .../volume/v1/requests/create_backup.rb | 2 + .../volume}/v1/requests/create_snapshot.rb | 8 +- .../volume/v1/requests/create_transfer.rb | 2 + .../volume}/v1/requests/create_volume.rb | 8 +- .../volume/v1/requests/create_volume_type.rb | 2 + .../volume/v1/requests/delete_backup.rb | 2 + .../volume/v1/requests/delete_metadata.rb | 2 + .../volume/v1/requests/delete_snapshot.rb | 2 + .../v1/requests/delete_snapshot_metadata.rb | 2 + .../volume/v1/requests/delete_transfer.rb | 2 + .../volume/v1/requests/delete_volume.rb | 2 + .../volume/v1/requests/delete_volume_type.rb | 2 + .../volume/v1/requests/extend_volume.rb | 2 + .../volume/v1/requests/get_backup_details.rb | 2 + .../openstack/volume/v1/requests/get_quota.rb | 2 + .../volume/v1/requests/get_quota_defaults.rb | 2 + .../volume/v1/requests/get_quota_usage.rb | 2 + .../v1/requests/get_snapshot_details.rb | 8 +- .../v1/requests/get_transfer_details.rb | 2 + .../volume}/v1/requests/get_volume_details.rb | 8 +- .../v1/requests/get_volume_type_details.rb | 2 + .../volume/v1/requests/list_backups.rb | 2 + .../v1/requests/list_backups_detailed.rb | 2 + .../volume/v1/requests/list_snapshots.rb | 2 + .../v1/requests/list_snapshots_detailed.rb | 2 + .../volume/v1/requests/list_transfers.rb | 2 + .../v1/requests/list_transfers_detailed.rb | 2 + .../volume/v1/requests/list_volume_types.rb | 2 + .../volume}/v1/requests/list_volumes.rb | 8 +- .../v1/requests/list_volumes_detailed.rb | 8 +- .../volume/v1/requests/list_zones.rb | 2 + .../volume}/v1/requests/real.rb | 6 +- .../openstack/volume/v1/requests/real_mock.rb | 14 +++ .../volume/v1/requests/replace_metadata.rb | 2 + .../volume/v1/requests/restore_backup.rb | 2 + .../volume/v1/requests/set_tenant.rb | 2 + .../volume/v1/requests/update_metadata.rb | 2 + .../volume/v1/requests/update_quota.rb | 2 + .../volume/v1/requests/update_snapshot.rb | 2 + .../v1/requests/update_snapshot_metadata.rb | 2 + .../volume/v1/requests/update_volume.rb | 2 + .../openstack => openstack/volume}/v2.rb | 14 +-- .../volume/v2/models/availability_zone.rb | 15 +++ .../volume/v2/models/availability_zones.rb | 16 +++ .../volume}/v2/models/backup.rb | 8 +- lib/fog/openstack/volume/v2/models/backups.rb | 16 +++ .../volume}/v2/models/snapshot.rb | 8 +- .../openstack/volume/v2/models/snapshots.rb | 16 +++ .../volume}/v2/models/transfer.rb | 8 +- .../openstack/volume/v2/models/transfers.rb | 16 +++ .../volume}/v2/models/volume.rb | 8 +- .../volume}/v2/models/volume_type.rb | 8 +- .../volume/v2/models/volume_types.rb | 16 +++ lib/fog/openstack/volume/v2/models/volumes.rb | 16 +++ .../volume/v2/requests/accept_transfer.rb | 2 + .../openstack/volume/v2/requests/action.rb | 2 + .../volume/v2/requests/create_backup.rb | 2 + .../volume}/v2/requests/create_snapshot.rb | 8 +- .../volume/v2/requests/create_transfer.rb | 2 + .../volume}/v2/requests/create_volume.rb | 8 +- .../volume/v2/requests/create_volume_type.rb | 2 + .../volume/v2/requests/delete_backup.rb | 2 + .../volume/v2/requests/delete_metadata.rb | 2 + .../volume/v2/requests/delete_snapshot.rb | 2 + .../v2/requests/delete_snapshot_metadata.rb | 2 + .../volume/v2/requests/delete_transfer.rb | 2 + .../volume/v2/requests/delete_volume.rb | 2 + .../volume/v2/requests/delete_volume_type.rb | 2 + .../volume/v2/requests/extend_volume.rb | 2 + .../volume/v2/requests/get_backup_details.rb | 2 + .../openstack/volume/v2/requests/get_quota.rb | 2 + .../volume/v2/requests/get_quota_defaults.rb | 2 + .../volume/v2/requests/get_quota_usage.rb | 2 + .../v2/requests/get_snapshot_details.rb | 8 +- .../v2/requests/get_transfer_details.rb | 2 + .../volume}/v2/requests/get_volume_details.rb | 8 +- .../v2/requests/get_volume_type_details.rb | 2 + .../volume/v2/requests/list_backups.rb | 2 + .../v2/requests/list_backups_detailed.rb | 2 + .../volume/v2/requests/list_snapshots.rb | 2 + .../v2/requests/list_snapshots_detailed.rb | 2 + .../volume/v2/requests/list_transfers.rb | 2 + .../v2/requests/list_transfers_detailed.rb | 2 + .../volume/v2/requests/list_volume_types.rb | 2 + .../volume}/v2/requests/list_volumes.rb | 8 +- .../v2/requests/list_volumes_detailed.rb | 8 +- .../volume/v2/requests/list_zones.rb | 2 + .../volume}/v2/requests/real.rb | 6 +- .../openstack/volume/v2/requests/real_mock.rb | 14 +++ .../volume/v2/requests/replace_metadata.rb | 2 + .../volume/v2/requests/restore_backup.rb | 2 + .../volume/v2/requests/set_tenant.rb | 2 + .../volume/v2/requests/snapshot_action.rb | 2 + .../volume/v2/requests/update_metadata.rb | 2 + .../volume/v2/requests/update_quota.rb | 2 + .../volume/v2/requests/update_snapshot.rb | 2 + .../v2/requests/update_snapshot_metadata.rb | 2 + .../volume/v2/requests/update_volume.rb | 2 + .../volume/v2/requests/update_volume_type.rb | 2 + .../volume/volume.rb} | 14 +-- .../openstack => openstack/workflow}/v2.rb | 10 +- .../workflow}/v2/requests/create_action.rb | 4 +- .../v2/requests/create_action_execution.rb | 4 +- .../v2/requests/create_cron_trigger.rb | 4 +- .../v2/requests/create_environment.rb | 4 +- .../workflow}/v2/requests/create_execution.rb | 4 +- .../workflow}/v2/requests/create_workbook.rb | 4 +- .../workflow}/v2/requests/create_workflow.rb | 4 +- .../workflow}/v2/requests/delete_action.rb | 4 +- .../v2/requests/delete_action_execution.rb | 4 +- .../v2/requests/delete_cron_trigger.rb | 4 +- .../v2/requests/delete_environment.rb | 4 +- .../workflow}/v2/requests/delete_execution.rb | 4 +- .../workflow}/v2/requests/delete_workbook.rb | 4 +- .../workflow}/v2/requests/delete_workflow.rb | 4 +- .../workflow}/v2/requests/get_action.rb | 4 +- .../v2/requests/get_action_execution.rb | 4 +- .../workflow}/v2/requests/get_cron_trigger.rb | 4 +- .../workflow}/v2/requests/get_environment.rb | 4 +- .../workflow}/v2/requests/get_execution.rb | 4 +- .../workflow}/v2/requests/get_task.rb | 4 +- .../workflow}/v2/requests/get_workbook.rb | 4 +- .../workflow}/v2/requests/get_workflow.rb | 4 +- .../v2/requests/list_action_executions.rb | 4 +- .../workflow}/v2/requests/list_actions.rb | 4 +- .../v2/requests/list_cron_triggers.rb | 4 +- .../v2/requests/list_environments.rb | 4 +- .../workflow}/v2/requests/list_executions.rb | 4 +- .../workflow}/v2/requests/list_services.rb | 4 +- .../workflow}/v2/requests/list_tasks.rb | 4 +- .../workflow}/v2/requests/list_workbooks.rb | 4 +- .../workflow}/v2/requests/list_workflows.rb | 4 +- .../workflow}/v2/requests/rerun_task.rb | 4 +- .../workflow}/v2/requests/update_action.rb | 4 +- .../v2/requests/update_action_execution.rb | 4 +- .../v2/requests/update_environment.rb | 4 +- .../workflow}/v2/requests/update_execution.rb | 4 +- .../workflow}/v2/requests/update_workbook.rb | 4 +- .../workflow}/v2/requests/update_workflow.rb | 4 +- .../workflow}/v2/requests/validate_action.rb | 4 +- .../v2/requests/validate_workbook.rb | 4 +- .../v2/requests/validate_workflow.rb | 4 +- .../workflow/workflow.rb} | 10 +- .../openstack/v1/models/availability_zone.rb | 15 --- .../openstack/v1/models/availability_zones.rb | 16 --- lib/fog/volume/openstack/v1/models/backups.rb | 16 --- .../volume/openstack/v1/models/snapshots.rb | 16 --- .../volume/openstack/v1/models/transfers.rb | 16 --- .../openstack/v1/models/volume_types.rb | 16 --- lib/fog/volume/openstack/v1/models/volumes.rb | 16 --- .../openstack/v1/requests/accept_transfer.rb | 2 - .../volume/openstack/v1/requests/action.rb | 2 - .../openstack/v1/requests/create_backup.rb | 2 - .../openstack/v1/requests/create_transfer.rb | 2 - .../v1/requests/create_volume_type.rb | 2 - .../openstack/v1/requests/delete_backup.rb | 2 - .../openstack/v1/requests/delete_metadata.rb | 2 - .../openstack/v1/requests/delete_snapshot.rb | 2 - .../v1/requests/delete_snapshot_metadata.rb | 2 - .../openstack/v1/requests/delete_transfer.rb | 2 - .../openstack/v1/requests/delete_volume.rb | 2 - .../v1/requests/delete_volume_type.rb | 2 - .../openstack/v1/requests/extend_volume.rb | 2 - .../v1/requests/get_backup_details.rb | 2 - .../volume/openstack/v1/requests/get_quota.rb | 2 - .../v1/requests/get_quota_defaults.rb | 2 - .../openstack/v1/requests/get_quota_usage.rb | 2 - .../v1/requests/get_transfer_details.rb | 2 - .../v1/requests/get_volume_type_details.rb | 2 - .../openstack/v1/requests/list_backups.rb | 2 - .../v1/requests/list_backups_detailed.rb | 2 - .../openstack/v1/requests/list_snapshots.rb | 2 - .../v1/requests/list_snapshots_detailed.rb | 2 - .../openstack/v1/requests/list_transfers.rb | 2 - .../v1/requests/list_transfers_detailed.rb | 2 - .../v1/requests/list_volume_types.rb | 2 - .../openstack/v1/requests/list_zones.rb | 2 - .../volume/openstack/v1/requests/real_mock.rb | 14 --- .../openstack/v1/requests/replace_metadata.rb | 2 - .../openstack/v1/requests/restore_backup.rb | 2 - .../openstack/v1/requests/set_tenant.rb | 2 - .../openstack/v1/requests/update_metadata.rb | 2 - .../openstack/v1/requests/update_quota.rb | 2 - .../openstack/v1/requests/update_snapshot.rb | 2 - .../v1/requests/update_snapshot_metadata.rb | 2 - .../openstack/v1/requests/update_volume.rb | 2 - .../openstack/v2/models/availability_zone.rb | 15 --- .../openstack/v2/models/availability_zones.rb | 16 --- lib/fog/volume/openstack/v2/models/backups.rb | 16 --- .../volume/openstack/v2/models/snapshots.rb | 16 --- .../volume/openstack/v2/models/transfers.rb | 16 --- .../openstack/v2/models/volume_types.rb | 16 --- lib/fog/volume/openstack/v2/models/volumes.rb | 16 --- .../openstack/v2/requests/accept_transfer.rb | 2 - .../volume/openstack/v2/requests/action.rb | 2 - .../openstack/v2/requests/create_backup.rb | 2 - .../openstack/v2/requests/create_transfer.rb | 2 - .../v2/requests/create_volume_type.rb | 2 - .../openstack/v2/requests/delete_backup.rb | 2 - .../openstack/v2/requests/delete_metadata.rb | 2 - .../openstack/v2/requests/delete_snapshot.rb | 2 - .../v2/requests/delete_snapshot_metadata.rb | 2 - .../openstack/v2/requests/delete_transfer.rb | 2 - .../openstack/v2/requests/delete_volume.rb | 2 - .../v2/requests/delete_volume_type.rb | 2 - .../openstack/v2/requests/extend_volume.rb | 2 - .../v2/requests/get_backup_details.rb | 2 - .../volume/openstack/v2/requests/get_quota.rb | 2 - .../v2/requests/get_quota_defaults.rb | 2 - .../openstack/v2/requests/get_quota_usage.rb | 2 - .../v2/requests/get_transfer_details.rb | 2 - .../v2/requests/get_volume_type_details.rb | 2 - .../openstack/v2/requests/list_backups.rb | 2 - .../v2/requests/list_backups_detailed.rb | 2 - .../openstack/v2/requests/list_snapshots.rb | 2 - .../v2/requests/list_snapshots_detailed.rb | 2 - .../openstack/v2/requests/list_transfers.rb | 2 - .../v2/requests/list_transfers_detailed.rb | 2 - .../v2/requests/list_volume_types.rb | 2 - .../openstack/v2/requests/list_zones.rb | 2 - .../volume/openstack/v2/requests/real_mock.rb | 14 --- .../openstack/v2/requests/replace_metadata.rb | 2 - .../openstack/v2/requests/restore_backup.rb | 2 - .../openstack/v2/requests/set_tenant.rb | 2 - .../openstack/v2/requests/snapshot_action.rb | 2 - .../openstack/v2/requests/update_metadata.rb | 2 - .../openstack/v2/requests/update_quota.rb | 2 - .../openstack/v2/requests/update_snapshot.rb | 2 - .../v2/requests/update_snapshot_metadata.rb | 2 - .../openstack/v2/requests/update_volume.rb | 2 - .../v2/requests/update_volume_type.rb | 2 - spec/dns_v2_spec.rb | 4 +- spec/identity_v3_spec.rb | 70 ++++++------ spec/image_v1_spec.rb | 4 +- spec/image_v2_spec.rb | 6 +- spec/image_v2_upload_spec.rb | 6 +- spec/monitoring_spec.rb | 12 +- spec/network_spec.rb | 8 +- spec/shared_context.rb | 4 +- spec/shared_file_system_spec.rb | 6 +- spec/volume_spec.rb | 44 ++++---- test/authenticate_tests.rb | 4 +- test/helpers/collection_helper.rb | 6 +- test/helpers/container_infra_helper.rb | 2 +- test/helpers/dns_v2_helper.rb | 2 +- test/helpers/network_helper.rb | 2 +- test/helpers/nfv_helper.rb | 2 +- test/identity_version_tests.rb | 4 +- test/models/compute/images_tests.rb | 4 +- test/models/compute/security_group_tests.rb | 4 +- test/models/compute/server_group_tests.rb | 6 +- test/models/compute/server_tests.rb | 6 +- test/models/compute/service_tests.rb | 6 +- .../models/container_infra/bay_model_tests.rb | 2 +- test/models/container_infra/bay_tests.rb | 2 +- .../container_infra/certificate_tests.rb | 2 +- .../container_infra/cluster_template_tests.rb | 2 +- test/models/container_infra/cluster_tests.rb | 2 +- test/models/identity/ec2_credential_tests.rb | 2 +- test/models/identity/ec2_credentials_tests.rb | 6 +- test/models/identity/role_tests.rb | 2 +- test/models/identity/roles_tests.rb | 4 +- test/models/identity/tenant_tests.rb | 2 +- test/models/identity/tenants_tests.rb | 8 +- test/models/identity/user_tests.rb | 2 +- test/models/identity/users_tests.rb | 8 +- test/models/image/image_tests.rb | 4 +- test/models/image/images_tests.rb | 10 +- test/models/network/floating_ip_tests.rb | 2 +- test/models/network/floating_ips_tests.rb | 2 +- test/models/network/ike_policies_tests.rb | 2 +- test/models/network/ike_policy_tests.rb | 2 +- test/models/network/ipsec_policies_tests.rb | 2 +- test/models/network/ipsec_policy_tests.rb | 2 +- .../network/ipsec_site_connection_tests.rb | 2 +- .../network/ipsec_site_connections_tests.rb | 2 +- .../models/network/lb_health_monitor_tests.rb | 2 +- .../network/lb_health_monitors_tests.rb | 2 +- test/models/network/lb_member_tests.rb | 2 +- test/models/network/lb_members_tests.rb | 2 +- test/models/network/lb_pool_tests.rb | 2 +- test/models/network/lb_pools_tests.rb | 2 +- test/models/network/lb_vip_tests.rb | 2 +- test/models/network/lb_vips_tests.rb | 2 +- test/models/network/network_tests.rb | 2 +- test/models/network/networks_tests.rb | 2 +- test/models/network/port_tests.rb | 2 +- test/models/network/ports_tests.rb | 2 +- test/models/network/router_tests.rb | 2 +- test/models/network/routers_tests.rb | 2 +- .../network/security_group_rule_tests.rb | 2 +- .../network/security_group_rules_tests.rb | 2 +- test/models/network/security_group_tests.rb | 2 +- test/models/network/security_groups_tests.rb | 2 +- test/models/network/subnet_pools_tests.rb | 2 +- test/models/network/subnet_tests.rb | 2 +- test/models/network/subnets_tests.rb | 2 +- test/models/network/vpn_service_tests.rb | 2 +- test/models/network/vpn_services_tests.rb | 2 +- test/models/planning/plan_tests.rb | 4 +- test/models/planning/plans_tests.rb | 4 +- test/models/planning/role_tests.rb | 6 +- test/models/storage/file_tests.rb | 2 +- test/requests/baremetal/chassis_tests.rb | 4 +- test/requests/baremetal/driver_tests.rb | 4 +- test/requests/baremetal/node_tests.rb | 4 +- test/requests/baremetal/port_tests.rb | 8 +- test/requests/compute/address_tests.rb | 4 +- test/requests/compute/aggregate_tests.rb | 4 +- .../compute/availability_zone_tests.rb | 6 +- test/requests/compute/flavor_tests.rb | 16 +-- test/requests/compute/helper.rb | 8 +- test/requests/compute/image_tests.rb | 10 +- test/requests/compute/keypair_tests.rb | 8 +- test/requests/compute/limit_tests.rb | 10 +- test/requests/compute/quota_tests.rb | 6 +- test/requests/compute/security_group_tests.rb | 2 +- test/requests/compute/server_tests.rb | 20 ++-- test/requests/compute/service_tests.rb | 10 +- test/requests/compute/tenant_tests.rb | 6 +- test/requests/compute/volume_tests.rb | 4 +- .../container_infra/bay_model_tests.rb | 2 +- test/requests/container_infra/bay_tests.rb | 2 +- .../container_infra/certificate_tests.rb | 2 +- .../container_infra/cluster_template_tests.rb | 2 +- .../requests/container_infra/cluster_tests.rb | 2 +- test/requests/dns_v1/domain_tests.rb | 4 +- test/requests/dns_v1/quota_tests.rb | 4 +- test/requests/dns_v2/pool_tests.rb | 2 +- test/requests/dns_v2/quota_tests.rb | 4 +- test/requests/dns_v2/recordset_tests.rb | 2 +- test/requests/dns_v2/zone_tests.rb | 2 +- test/requests/event/event_tests.rb | 4 +- .../identity/ec2_credentials_tests.rb | 2 +- test/requests/identity/role_tests.rb | 2 +- test/requests/identity/tenant_tests.rb | 2 +- test/requests/identity/user_tests.rb | 2 +- test/requests/image/image_tests.rb | 24 ++-- .../introspection/introspection_tests.rb | 4 +- test/requests/introspection/rules_tests.rb | 2 +- test/requests/metering/event_tests.rb | 4 +- test/requests/metering/meter_tests.rb | 4 +- test/requests/metering/resource_tests.rb | 4 +- test/requests/metric/metric_test.rb | 4 +- test/requests/metric/resource_test.rb | 4 +- test/requests/network/extension_tests.rb | 4 +- test/requests/network/ike_policy_tests.rb | 8 +- test/requests/network/ipsec_policy_tests.rb | 8 +- .../network/ipsec_site_connection_tests.rb | 8 +- .../network/lb_health_monitor_tests.rb | 12 +- test/requests/network/lb_member_tests.rb | 8 +- test/requests/network/lb_pool_tests.rb | 8 +- test/requests/network/lb_vip_tests.rb | 8 +- test/requests/network/network_tests.rb | 8 +- test/requests/network/port_tests.rb | 8 +- test/requests/network/quota_tests.rb | 4 +- test/requests/network/router_tests.rb | 8 +- .../network/security_group_rule_tests.rb | 6 +- test/requests/network/security_group_tests.rb | 6 +- test/requests/network/subnet_pool_tests.rb | 8 +- test/requests/network/subnet_tests.rb | 8 +- test/requests/network/vpn_service_tests.rb | 8 +- .../stack_files_util_helper_tests.rb | 6 +- .../orchestration/stack_files_util_tests.rb | 18 +-- test/requests/orchestration/stack_tests.rb | 6 +- test/requests/planning/plan_tests.rb | 22 ++-- test/requests/planning/role_tests.rb | 4 +- .../shared_file_system/quota_tests.rb | 4 +- test/requests/storage/container_tests.rb | 12 +- test/requests/storage/large_object_tests.rb | 8 +- test/requests/storage/object_tests.rb | 86 +++++++-------- .../volume/availability_zone_tests.rb | 4 +- test/requests/volume/backup_tests.rb | 4 +- test/requests/volume/quota_tests.rb | 6 +- test/requests/volume/volume_type_tests.rb | 4 +- test/requests/workflow/workflow_tests.rb | 8 +- test/storage_tests.rb | 4 +- test/volume_tests.rb | 10 +- 1360 files changed, 3712 insertions(+), 3774 deletions(-) delete mode 100644 lib/fog/dns/openstack.rb delete mode 100644 lib/fog/image/openstack.rb rename lib/fog/{baremetal/openstack.rb => openstack/baremetal/baremetal.rb} (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/chassis_collection.rb (89%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/driver.rb (91%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/drivers.rb (72%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/node.rb (98%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/nodes.rb (89%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/port.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/ports.rb (89%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/create_chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/create_node.rb (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/create_port.rb (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/delete_chassis.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/delete_node.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/delete_port.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_chassis.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_driver.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_driver_properties.rb (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_node.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_port.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_chassis_detailed.rb (93%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_drivers.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_nodes.rb (95%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_nodes_detailed.rb (93%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_ports.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_ports_detailed.rb (93%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/patch_chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/patch_node.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/patch_port.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/set_node_maintenance.rb (95%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/set_node_power_state.rb (95%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/set_node_provision_state.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/unset_node_maintenance.rb (95%) rename lib/fog/{compute/openstack.rb => openstack/compute/compute.rb} (98%) rename lib/fog/{compute/openstack => openstack/compute}/models/address.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/models/addresses.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/aggregate.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/models/aggregates.rb (78%) rename lib/fog/{compute/openstack => openstack/compute}/models/availability_zone.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/models/availability_zones.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/flavor.rb (86%) rename lib/fog/{compute/openstack => openstack/compute}/models/flavors.rb (75%) rename lib/fog/{compute/openstack => openstack/compute}/models/host.rb (81%) rename lib/fog/{compute/openstack => openstack/compute}/models/hosts.rb (73%) rename lib/fog/{compute/openstack => openstack/compute}/models/image.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/models/images.rb (80%) rename lib/fog/{compute/openstack => openstack/compute}/models/key_pair.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/models/key_pairs.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/metadata.rb (79%) rename lib/fog/{compute/openstack => openstack/compute}/models/metadatum.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/models/network.rb (84%) rename lib/fog/{compute/openstack => openstack/compute}/models/networks.rb (81%) rename lib/fog/{compute/openstack => openstack/compute}/models/os_interface.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/models/os_interfaces.rb (78%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_group.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_group_rule.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_group_rules.rb (65%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_groups.rb (70%) rename lib/fog/{compute/openstack => openstack/compute}/models/server.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/models/server_group.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/models/server_groups.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/servers.rb (75%) rename lib/fog/{compute/openstack => openstack/compute}/models/service.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/models/services.rb (83%) rename lib/fog/{compute/openstack => openstack/compute}/models/snapshot.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/models/snapshots.rb (84%) rename lib/fog/{compute/openstack => openstack/compute}/models/tenant.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/models/tenants.rb (78%) rename lib/fog/{compute/openstack => openstack/compute}/models/volume.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/models/volume_attachment.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/models/volume_attachments.rb (71%) rename lib/fog/{compute/openstack => openstack/compute}/models/volumes.rb (84%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_aggregate_host.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_fixed_ip.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_flavor_access.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_security_group.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/allocate_address.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/associate_address.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/attach_volume.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/boot_from_snapshot.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/change_server_password.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/confirm_resize_server.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_aggregate.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_flavor.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_flavor_metadata.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_image.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_key_pair.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_os_interface.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_security_group.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_security_group_rule.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_server.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_server_group.rb (80%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_snapshot.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_volume.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_aggregate.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_flavor.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_flavor_metadata.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_image.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_key_pair.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_meta.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_os_interface.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_security_group.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_security_group_rule.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_server_group.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_service.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_snapshot.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_volume.rb (86%) rename lib/fog/{compute/openstack => openstack/compute}/requests/detach_volume.rb (89%) rename lib/fog/{compute/openstack => openstack/compute}/requests/disable_service.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/disable_service_log_reason.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/disassociate_address.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/enable_service.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/evacuate_server.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_address.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_aggregate.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_console_output.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_flavor_details.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_flavor_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_host_details.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_hypervisor.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_hypervisor_statistics.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_image_details.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_key_pair.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_limits.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_os_interface.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_quota.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_quota_defaults.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_security_group.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_security_group_rule.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_details.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_group.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_password.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_volumes.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_snapshot_details.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_usage.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_vnc_console.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_volume_details.rb (89%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_address_pools.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_addresses.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_aggregates.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_all_addresses.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_availability_zones.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_flavors.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_flavors_detail.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hosts.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hypervisor_servers.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hypervisors.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hypervisors_detail.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_images.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_images_detail.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_key_pairs.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_os_interfaces.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_private_addresses.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_public_addresses.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_security_groups.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_server_groups.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_servers.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_servers_detail.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_services.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_snapshots.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_snapshots_detail.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_tenants_with_flavor_access.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_usages.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_volume_attachments.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_volumes.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_volumes_detail.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_zones.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_zones_detailed.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/live_migrate_server.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/migrate_server.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/requests/pause_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/reboot_server.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/rebuild_server.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/release_address.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remote_consoles.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_aggregate_host.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_fixed_ip.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_flavor_access.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_security_group.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/rescue_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/reset_server_state.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/resize_server.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/resume_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/revert_resize_server.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/server_action.rb (89%) rename lib/fog/{compute/openstack => openstack/compute}/requests/server_actions.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/server_diagnostics.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/set_metadata.rb (86%) rename lib/fog/{compute/openstack => openstack/compute}/requests/set_tenant.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/shelve_offload_server.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/shelve_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/start_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/stop_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/suspend_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/unpause_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/unshelve_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_aggregate.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_aggregate_metadata.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_flavor_metadata.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_meta.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_metadata.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_quota.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_server.rb (89%) rename lib/fog/{container_infra/openstack.rb => openstack/container_infra/container_infra.rb} (94%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/base.rb (76%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bay.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bay_model.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bay_models.rb (64%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bays.rb (63%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/certificate.rb (73%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/certificates.rb (64%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/cluster.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/cluster_template.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/cluster_templates.rb (65%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/clusters.rb (64%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_bay.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_bay_model.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_certificate.rb (95%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_cluster.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_cluster_template.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_bay.rb (90%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_bay_model.rb (91%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_cluster.rb (91%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_cluster_template.rb (91%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_bay.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_bay_model.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_certificate.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_cluster.rb (96%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_cluster_template.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_bay_models.rb (98%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_bays.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_cluster_templates.rb (98%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_clusters.rb (95%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_bay.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_bay_model.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_cluster.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_cluster_template.rb (97%) create mode 100644 lib/fog/openstack/dns/dns.rb rename lib/fog/{dns/openstack => openstack/dns}/v1.rb (96%) rename lib/fog/{dns/openstack => openstack/dns}/v1/requests/get_quota.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v1/requests/list_domains.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v1/requests/update_quota.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2.rb (98%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/pool.rb (92%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/pools.rb (79%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/recordset.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/recordsets.rb (83%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_accept.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_accepts.rb (77%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_request.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_requests.rb (80%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zones.rb (82%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_recordset.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_zone.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_zone_transfer_accept.rb (90%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_zone_transfer_request.rb (96%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/delete_recordset.rb (91%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/delete_zone.rb (89%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/delete_zone_transfer_request.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_pool.rb (86%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_quota.rb (86%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_recordset.rb (91%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_zone.rb (86%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_zone_transfer_accept.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_zone_transfer_request.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_pools.rb (85%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_recordsets.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_zone_transfer_accepts.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_zone_transfer_requests.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_zones.rb (85%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_quota.rb (89%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_recordset.rb (92%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_zone.rb (91%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_zone_transfer_request.rb (97%) rename lib/fog/{event/openstack.rb => openstack/event/event.rb} (93%) rename lib/fog/{event/openstack => openstack/event}/models/event.rb (88%) rename lib/fog/{event/openstack => openstack/event}/models/events.rb (67%) rename lib/fog/{event/openstack => openstack/event}/requests/get_event.rb (94%) rename lib/fog/{event/openstack => openstack/event}/requests/list_events.rb (96%) rename lib/fog/{identity/openstack.rb => openstack/identity/identity.rb} (85%) rename lib/fog/{identity/openstack => openstack/identity}/v2.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/ec2_credential.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/ec2_credentials.rb (85%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/role.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/roles.rb (71%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/tenant.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/tenants.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/user.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/users.rb (78%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/add_user_to_tenant.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/check_token.rb (92%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_ec2_credential.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_role.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_user.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_user_role.rb (93%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_ec2_credential.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_role.rb (86%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_user.rb (87%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_user_role.rb (93%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_ec2_credential.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_role.rb (86%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_tenants_by_id.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_tenants_by_name.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_user_by_id.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_user_by_name.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_ec2_credentials.rb (98%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_endpoints_for_token.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_roles.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_roles_for_user_on_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_tenants.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_user_global_roles.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_users.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/remove_user_from_tenant.rb (92%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/set_tenant.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/update_tenant.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/update_user.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/validate_token.rb (92%) rename lib/fog/{identity/openstack => openstack/identity}/v3.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/domain.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/domains.rb (76%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/endpoint.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/endpoints.rb (74%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/group.rb (93%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/groups.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/os_credential.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/os_credentials.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/policies.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/policy.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/project.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/projects.rb (81%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/role.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/role_assignment.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/role_assignments.rb (82%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/roles.rb (86%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/service.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/services.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/token.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/tokens.rb (78%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/user.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/users.rb (80%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/add_user_to_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/auth_domains.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/auth_projects.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_domain_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_domain_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_project_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_project_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_domain.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_endpoint.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_os_credential.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_policy.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_project.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_service.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_user.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_domain.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_endpoint.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_group.rb (88%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_os_credential.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_policy.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_project.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_role.rb (88%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_service.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_user.rb (88%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_domain.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_endpoint.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_os_credential.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_policy.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_project.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_role.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_service.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_user.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_domain_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_domain_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_project_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_project_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/group_user_check.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_domain_group_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_domain_user_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_domains.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_endpoints.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_group_users.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_groups.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_os_credentials.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_policies.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_project_group_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_project_user_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_projects.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_role_assignments.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_services.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_user_groups.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_user_projects.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_users.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/remove_user_from_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_domain_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_domain_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_project_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_project_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_authenticate.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_check.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_revoke.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_validate.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_domain.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_endpoint.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_os_credential.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_policy.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_project.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_service.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_user.rb (90%) create mode 100644 lib/fog/openstack/image/image.rb rename lib/fog/{image/openstack => openstack/image}/v1.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v1/models/image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/models/images.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/add_member_to_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/create_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/delete_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_image_by_id.rb (97%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_image_members.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_shared_images.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/list_public_images.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/list_public_images_detailed.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/remove_member_from_image.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/set_tenant.rb (90%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/update_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/update_image_members.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v2/models/image.rb (99%) rename lib/fog/{image/openstack => openstack/image}/v2/models/images.rb (89%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/add_member_to_image.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/add_tag_to_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/create_image.rb (97%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/deactivate_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/delete_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/download_image.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_image_by_id.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_image_members.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_member_details.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_shared_images.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/list_images.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/reactivate_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/remove_member_from_image.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/remove_tag_from_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/set_tenant.rb (90%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/update_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/update_image_member.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/upload_image.rb (95%) rename lib/fog/{introspection/openstack.rb => openstack/introspection/introspection.rb} (85%) rename lib/fog/{introspection/openstack => openstack/introspection}/models/rules.rb (93%) rename lib/fog/{introspection/openstack => openstack/introspection}/models/rules_collection.rb (71%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/abort_introspection.rb (91%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/create_introspection.rb (94%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/create_rules.rb (94%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/delete_rules.rb (90%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/delete_rules_all.rb (89%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/get_introspection.rb (91%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/get_introspection_details.rb (92%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/get_rules.rb (91%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/list_rules.rb (90%) rename lib/fog/{key_manager/openstack.rb => openstack/key_manager/key_manager.rb} (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/acl.rb (90%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/container.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/containers.rb (66%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/secret.rb (95%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/secrets.rb (66%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/create_container.rb (87%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/create_secret.rb (87%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_container.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_container_acl.rb (91%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_secret.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_secret_acl.rb (91%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_container.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_container_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret_metadata.rb (86%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret_payload.rb (88%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/list_containers.rb (87%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/list_secrets.rb (86%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/replace_container_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/replace_secret_acl.rb (93%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/update_container_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/update_secret_acl.rb (93%) rename lib/fog/{metering/openstack.rb => openstack/metering/metering.rb} (94%) rename lib/fog/{metering/openstack => openstack/metering}/models/event.rb (87%) rename lib/fog/{metering/openstack => openstack/metering}/models/events.rb (66%) rename lib/fog/{metering/openstack => openstack/metering}/models/meter.rb (100%) rename lib/fog/{metering/openstack => openstack/metering}/models/meters.rb (100%) rename lib/fog/{metering/openstack => openstack/metering}/models/resource.rb (86%) rename lib/fog/{metering/openstack => openstack/metering}/models/resources.rb (66%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_event.rb (93%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_resource.rb (94%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_samples.rb (97%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_statistics.rb (97%) rename lib/fog/{metering/openstack => openstack/metering}/requests/list_events.rb (95%) rename lib/fog/{metering/openstack => openstack/metering}/requests/list_meters.rb (96%) rename lib/fog/{metering/openstack => openstack/metering}/requests/list_resources.rb (94%) rename lib/fog/{metric/openstack.rb => openstack/metric/metric.rb} (94%) rename lib/fog/{metric/openstack => openstack/metric}/models/metric.rb (90%) rename lib/fog/{metric/openstack => openstack/metric}/models/metrics.rb (71%) rename lib/fog/{metric/openstack => openstack/metric}/models/resource.rb (88%) rename lib/fog/{metric/openstack => openstack/metric}/models/resources.rb (68%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_metric.rb (98%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_metric_measures.rb (96%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_resource.rb (97%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_resource_metric_measures.rb (96%) rename lib/fog/{metric/openstack => openstack/metric}/requests/list_metrics.rb (99%) rename lib/fog/{metric/openstack => openstack/metric}/requests/list_resources.rb (98%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm.rb (95%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_count.rb (86%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_counts.rb (61%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_definition.rb (96%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_definitions.rb (81%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_state.rb (93%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_states.rb (75%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarms.rb (76%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/dimension_value.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/dimension_values.rb (65%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/measurement.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/measurements.rb (63%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/metric.rb (92%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/metrics.rb (74%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/notification_method.rb (96%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/notification_methods.rb (82%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/statistic.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/statistics.rb (63%) rename lib/fog/{monitoring/openstack.rb => openstack/monitoring/monitoring.rb} (92%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_alarm_definition.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_metric.rb (93%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_metric_array.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_notification_method.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/delete_alarm.rb (86%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/delete_alarm_definition.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/delete_notification_method.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/find_measurements.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_alarm.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_alarm_counts.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_alarm_definition.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_notification_method.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarm_definitions.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarm_state_history_for_all_alarms.rb (91%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarm_state_history_for_specific_alarm.rb (91%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarms.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_dimension_values.rb (92%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_metric_names.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_metrics.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_notification_method_types.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_notification_methods.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_statistics.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/patch_alarm.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/patch_alarm_definition.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/patch_notification_method.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/put_notification_method.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/update_alarm.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/update_alarm_definition.rb (89%) rename lib/fog/{network/openstack => openstack/network}/models/extension.rb (87%) rename lib/fog/{network/openstack => openstack/network}/models/extensions.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/floating_ips.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/ike_policies.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/ike_policy.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_policies.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_site_connection.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_site_connections.rb (77%) rename lib/fog/{network/openstack => openstack/network}/models/lb_health_monitor.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/lb_health_monitors.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/lb_member.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/lb_members.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/lb_pool.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/lb_pools.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/lb_vip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/lb_vips.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/network.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/network_ip_availabilities.rb (70%) rename lib/fog/{network/openstack => openstack/network}/models/network_ip_availability.rb (90%) rename lib/fog/{network/openstack => openstack/network}/models/networks.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/port.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/ports.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/rbac_policies.rb (77%) rename lib/fog/{network/openstack => openstack/network}/models/rbac_policy.rb (95%) rename lib/fog/{network/openstack => openstack/network}/models/router.rb (92%) rename lib/fog/{network/openstack => openstack/network}/models/routers.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/security_group.rb (88%) rename lib/fog/{network/openstack => openstack/network}/models/security_group_rule.rb (95%) rename lib/fog/{network/openstack => openstack/network}/models/security_group_rules.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/security_groups.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/subnet.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/subnet_pool.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/subnet_pools.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/subnets.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/vpn_service.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/vpn_services.rb (76%) rename lib/fog/{network/openstack.rb => openstack/network/network.rb} (98%) rename lib/fog/{network/openstack => openstack/network}/requests/add_router_interface.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/associate_floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/associate_lb_health_monitor.rb (91%) rename lib/fog/{network/openstack => openstack/network}/requests/create_floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_ike_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_ipsec_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_ipsec_site_connection.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_health_monitor.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_member.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_pool.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_vip.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_healthmonitor.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_l7policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_l7rule.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_listener.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_loadbalancer.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_pool.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_pool_member.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_network.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/create_port.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_rbac_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_router.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/create_security_group.rb (99%) rename lib/fog/{network/openstack => openstack/network}/requests/create_security_group_rule.rb (99%) rename lib/fog/{network/openstack => openstack/network}/requests/create_subnet.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_subnet_pool.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_vpn_service.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_floating_ip.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_ike_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_ipsec_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_ipsec_site_connection.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_health_monitor.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_member.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_pool.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_vip.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_healthmonitor.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_l7policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_l7rule.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_listener.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_loadbalancer.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_pool.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_pool_member.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_network.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_port.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_quota.rb (91%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_rbac_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_router.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_security_group.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_security_group_rule.rb (90%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_subnet.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_subnet_pool.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_vpn_service.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/disassociate_floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/disassociate_lb_health_monitor.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/get_extension.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_floating_ip.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/get_ike_policy.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_ipsec_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_ipsec_site_connection.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_health_monitor.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_member.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_pool.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_pool_stats.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_vip.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_healthmonitor.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_l7policy.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_l7rule.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_listener.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_loadbalancer.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_pool.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_pool_member.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_network.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_network_ip_availability.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_port.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/get_quota.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/get_quotas.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/get_rbac_policy.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_router.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_security_group.rb (96%) rename lib/fog/{network/openstack => openstack/network}/requests/get_security_group_rule.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/get_subnet.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/get_subnet_pool.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_vpn_service.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/list_extensions.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_floating_ips.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ike_policies.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ipsec_policies.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ipsec_site_connections.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_health_monitors.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_members.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_pools.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_vips.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_healthmonitors.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_l7policies.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_l7rules.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_listeners.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_loadbalancers.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_pool_members.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_pools.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_network_ip_availabilities.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/list_networks.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ports.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_rbac_policies.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_routers.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_security_group_rules.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/list_security_groups.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/list_subnet_pools.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_subnets.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_vpn_services.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/remove_router_interface.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/set_tenant.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/update_ike_policy.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/update_ipsec_policy.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/update_ipsec_site_connection.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_health_monitor.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_member.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_pool.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_vip.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_healthmonitor.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_l7policy.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_l7rule.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_listener.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_loadbalancer.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_pool.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_pool_member.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_network.rb (90%) rename lib/fog/{network/openstack => openstack/network}/requests/update_port.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_quota.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_rbac_policy.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_router.rb (91%) rename lib/fog/{network/openstack => openstack/network}/requests/update_security_group.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_subnet.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_subnet_pool.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_vpn_service.rb (94%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnf.rb (97%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnfd.rb (97%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnfds.rb (73%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnfs.rb (73%) rename lib/fog/{nfv/openstack.rb => openstack/nfv/nfv.rb} (94%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/create_vnf.rb (96%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/create_vnfd.rb (95%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/delete_vnf.rb (92%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/delete_vnfd.rb (92%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/get_vnf.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/get_vnfd.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/list_vnfds.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/list_vnfs.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/update_vnf.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/event.rb (89%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/events.rb (79%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/resource.rb (94%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/resource_schemas.rb (73%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/resources.rb (76%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/stack.rb (96%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/stacks.rb (89%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/template.rb (85%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/templates.rb (85%) rename lib/fog/{orchestration/openstack.rb => openstack/orchestration/orchestration.rb} (94%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/abandon_stack.rb (86%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/build_info.rb (83%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/cancel_update.rb (92%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/create_stack.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/delete_stack.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/get_stack_template.rb (89%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_events.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_resource_events.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_resource_types.rb (92%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_resources.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_stack_data.rb (92%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_stack_data_detailed.rb (98%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_stack_events.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/patch_stack.rb (90%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/preview_stack.rb (87%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_event_details.rb (93%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_data.rb (93%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_metadata.rb (93%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_schema.rb (85%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_template.rb (88%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_stack_details.rb (91%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/update_stack.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/validate_template.rb (87%) rename lib/fog/{ => openstack}/orchestration/util/recursive_hot_file_loader.rb (99%) rename lib/fog/{planning/openstack => openstack/planning}/models/plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/models/plans.rb (93%) rename lib/fog/{planning/openstack => openstack/planning}/models/role.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/models/roles.rb (87%) rename lib/fog/{planning/openstack.rb => openstack/planning/planning.rb} (96%) rename lib/fog/{planning/openstack => openstack/planning}/requests/add_role_to_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/create_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/delete_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/get_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/get_plan_templates.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/list_plans.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/list_roles.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/patch_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/remove_role_from_plan.rb (100%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/availability_zone.rb (83%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/availability_zones.rb (59%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/network.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/networks.rb (77%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share.rb (97%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_access_rule.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_access_rules.rb (76%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_export_location.rb (83%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_export_locations.rb (77%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/shares.rb (76%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/snapshot.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/snapshots.rb (77%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/add_security_service_to_share_network.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_security_service.rb (96%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_share.rb (96%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_share_network.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_snapshot.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_security_service.rb (90%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_share.rb (93%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_share_network.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_snapshot.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/extend_share.rb (90%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_limits.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_quota.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_security_service.rb (93%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_share.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_share_export_location.rb (89%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_share_network.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_snapshot.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/grant_share_access.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_availability_zones.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_security_services.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_security_services_detail.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_access_rules.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_export_locations.rb (87%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_networks.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_networks_detail.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_shares.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_shares_detail.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_snapshots.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_snapshots_detail.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/remove_security_service_from_share_network.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/revoke_share_access.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/share_action.rb (87%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/share_network_action.rb (88%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/shrink_share.rb (90%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_quota.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_security_service.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_share.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_share_network.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_snapshot.rb (94%) rename lib/fog/{shared_file_system/openstack.rb => openstack/shared_file_system/shared_file_system.rb} (98%) rename lib/fog/{storage/openstack => openstack/storage}/models/directories.rb (82%) rename lib/fog/{storage/openstack => openstack/storage}/models/directory.rb (83%) rename lib/fog/{storage/openstack => openstack/storage}/models/file.rb (99%) rename lib/fog/{storage/openstack => openstack/storage}/models/files.rb (91%) rename lib/fog/{storage/openstack => openstack/storage}/requests/copy_object.rb (96%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_container.rb (91%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_multiple_objects.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_object.rb (93%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_static_large_object.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_container.rb (97%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_containers.rb (96%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_object.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_object_http_url.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_object_https_url.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/head_container.rb (95%) rename lib/fog/{storage/openstack => openstack/storage}/requests/head_containers.rb (93%) rename lib/fog/{storage/openstack => openstack/storage}/requests/head_object.rb (93%) rename lib/fog/{storage/openstack => openstack/storage}/requests/post_object.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/post_set_meta_temp_url_key.rb (96%) rename lib/fog/{storage/openstack => openstack/storage}/requests/public_url.rb (95%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_container.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_dynamic_obj_manifest.rb (95%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_object.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_object_manifest.rb (90%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_static_obj_manifest.rb (96%) rename lib/fog/{storage/openstack.rb => openstack/storage/storage.rb} (95%) rename lib/fog/{volume/openstack => openstack/volume}/models/availability_zone.rb (78%) rename lib/fog/{volume/openstack => openstack/volume}/models/availability_zones.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/models/backup.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/models/backups.rb (86%) rename lib/fog/{volume/openstack => openstack/volume}/models/snapshot.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/models/snapshots.rb (86%) rename lib/fog/{volume/openstack => openstack/volume}/models/transfer.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/models/transfers.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/models/volume.rb (98%) rename lib/fog/{volume/openstack => openstack/volume}/models/volume_type.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/models/volume_types.rb (84%) rename lib/fog/{volume/openstack => openstack/volume}/models/volumes.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/accept_transfer.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/action.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_backup.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_snapshot.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_transfer.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_volume.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_volume_type.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_backup.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_metadata.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_snapshot.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_snapshot_metadata.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_transfer.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_volume.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_volume_type.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/extend_volume.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_backup_details.rb (95%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_quota.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_quota_defaults.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_quota_usage.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_snapshot_details.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_transfer_details.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_volume_details.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_volume_type_details.rb (95%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_backups.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_backups_detailed.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_snapshots.rb (97%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_snapshots_detailed.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_transfers.rb (90%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_transfers_detailed.rb (90%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_volume_types.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_volumes.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_volumes_detailed.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_zones.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/replace_metadata.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/restore_backup.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/set_tenant.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/snapshot_action.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_metadata.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_quota.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_snapshot.rb (97%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_snapshot_metadata.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_volume.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_volume_type.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/v1.rb (94%) create mode 100644 lib/fog/openstack/volume/v1/models/availability_zone.rb create mode 100644 lib/fog/openstack/volume/v1/models/availability_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/backup.rb (53%) create mode 100644 lib/fog/openstack/volume/v1/models/backups.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/snapshot.rb (89%) create mode 100644 lib/fog/openstack/volume/v1/models/snapshots.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/transfer.rb (66%) create mode 100644 lib/fog/openstack/volume/v1/models/transfers.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/volume.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/v1/models/volume_type.rb (51%) create mode 100644 lib/fog/openstack/volume/v1/models/volume_types.rb create mode 100644 lib/fog/openstack/volume/v1/models/volumes.rb create mode 100644 lib/fog/openstack/volume/v1/requests/accept_transfer.rb create mode 100644 lib/fog/openstack/volume/v1/requests/action.rb create mode 100644 lib/fog/openstack/volume/v1/requests/create_backup.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/create_snapshot.rb (89%) create mode 100644 lib/fog/openstack/volume/v1/requests/create_transfer.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/create_volume.rb (91%) create mode 100644 lib/fog/openstack/volume/v1/requests/create_volume_type.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_backup.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_snapshot.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_transfer.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_volume.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_volume_type.rb create mode 100644 lib/fog/openstack/volume/v1/requests/extend_volume.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_backup_details.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_quota.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_quota_usage.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/get_snapshot_details.rb (83%) create mode 100644 lib/fog/openstack/volume/v1/requests/get_transfer_details.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/get_volume_details.rb (86%) create mode 100644 lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_backups.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_snapshots.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_transfers.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_volume_types.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/list_volumes.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/list_volumes_detailed.rb (90%) create mode 100644 lib/fog/openstack/volume/v1/requests/list_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/real.rb (50%) create mode 100644 lib/fog/openstack/volume/v1/requests/real_mock.rb create mode 100644 lib/fog/openstack/volume/v1/requests/replace_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/restore_backup.rb create mode 100644 lib/fog/openstack/volume/v1/requests/set_tenant.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_quota.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_snapshot.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_volume.rb rename lib/fog/{volume/openstack => openstack/volume}/v2.rb (94%) create mode 100644 lib/fog/openstack/volume/v2/models/availability_zone.rb create mode 100644 lib/fog/openstack/volume/v2/models/availability_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/backup.rb (53%) create mode 100644 lib/fog/openstack/volume/v2/models/backups.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/snapshot.rb (88%) create mode 100644 lib/fog/openstack/volume/v2/models/snapshots.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/transfer.rb (66%) create mode 100644 lib/fog/openstack/volume/v2/models/transfers.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/volume.rb (86%) rename lib/fog/{volume/openstack => openstack/volume}/v2/models/volume_type.rb (51%) create mode 100644 lib/fog/openstack/volume/v2/models/volume_types.rb create mode 100644 lib/fog/openstack/volume/v2/models/volumes.rb create mode 100644 lib/fog/openstack/volume/v2/requests/accept_transfer.rb create mode 100644 lib/fog/openstack/volume/v2/requests/action.rb create mode 100644 lib/fog/openstack/volume/v2/requests/create_backup.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/create_snapshot.rb (88%) create mode 100644 lib/fog/openstack/volume/v2/requests/create_transfer.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/create_volume.rb (90%) create mode 100644 lib/fog/openstack/volume/v2/requests/create_volume_type.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_backup.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_snapshot.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_transfer.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_volume.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_volume_type.rb create mode 100644 lib/fog/openstack/volume/v2/requests/extend_volume.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_backup_details.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_quota.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_quota_usage.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/get_snapshot_details.rb (82%) create mode 100644 lib/fog/openstack/volume/v2/requests/get_transfer_details.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/get_volume_details.rb (86%) create mode 100644 lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_backups.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_snapshots.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_transfers.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_volume_types.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/list_volumes.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/list_volumes_detailed.rb (90%) create mode 100644 lib/fog/openstack/volume/v2/requests/list_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/real.rb (50%) create mode 100644 lib/fog/openstack/volume/v2/requests/real_mock.rb create mode 100644 lib/fog/openstack/volume/v2/requests/replace_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/restore_backup.rb create mode 100644 lib/fog/openstack/volume/v2/requests/set_tenant.rb create mode 100644 lib/fog/openstack/volume/v2/requests/snapshot_action.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_quota.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_snapshot.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_volume.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_volume_type.rb rename lib/fog/{volume/openstack.rb => openstack/volume/volume.rb} (73%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_action.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_action_execution.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_cron_trigger.rb (97%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_environment.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_execution.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_workbook.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_workflow.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_action.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_action_execution.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_cron_trigger.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_environment.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_execution.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_workbook.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_workflow.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_action.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_action_execution.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_cron_trigger.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_environment.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_execution.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_task.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_workbook.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_workflow.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_action_executions.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_actions.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_cron_triggers.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_environments.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_executions.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_services.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_tasks.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_workbooks.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_workflows.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/rerun_task.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_action.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_action_execution.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_environment.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_execution.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_workbook.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_workflow.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/validate_action.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/validate_workbook.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/validate_workflow.rb (94%) rename lib/fog/{workflow/openstack.rb => openstack/workflow/workflow.rb} (50%) delete mode 100644 lib/fog/volume/openstack/v1/models/availability_zone.rb delete mode 100644 lib/fog/volume/openstack/v1/models/availability_zones.rb delete mode 100644 lib/fog/volume/openstack/v1/models/backups.rb delete mode 100644 lib/fog/volume/openstack/v1/models/snapshots.rb delete mode 100644 lib/fog/volume/openstack/v1/models/transfers.rb delete mode 100644 lib/fog/volume/openstack/v1/models/volume_types.rb delete mode 100644 lib/fog/volume/openstack/v1/models/volumes.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/accept_transfer.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/action.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/create_backup.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/create_transfer.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/create_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_backup.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_transfer.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_volume.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/extend_volume.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_backup_details.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_quota.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_quota_usage.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_transfer_details.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_backups.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_snapshots.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_transfers.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_volume_types.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_zones.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/real_mock.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/replace_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/restore_backup.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/set_tenant.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_quota.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/models/availability_zone.rb delete mode 100644 lib/fog/volume/openstack/v2/models/availability_zones.rb delete mode 100644 lib/fog/volume/openstack/v2/models/backups.rb delete mode 100644 lib/fog/volume/openstack/v2/models/snapshots.rb delete mode 100644 lib/fog/volume/openstack/v2/models/transfers.rb delete mode 100644 lib/fog/volume/openstack/v2/models/volume_types.rb delete mode 100644 lib/fog/volume/openstack/v2/models/volumes.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/accept_transfer.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/action.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/create_backup.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/create_transfer.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/create_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_backup.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_transfer.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/extend_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_backup_details.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_quota.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_quota_usage.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_transfer_details.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_backups.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_snapshots.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_transfers.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_volume_types.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_zones.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/real_mock.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/replace_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/restore_backup.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/set_tenant.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/snapshot_action.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_quota.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_volume_type.rb diff --git a/README.md b/README.md index 3d5d60ab9..844e65403 100644 --- a/README.md +++ b/README.md @@ -82,18 +82,18 @@ The exception is if you're using Nova (and not Neutron) for your instance networ Initialise a connection to the compute service: ```ruby -compute = Fog::Compute::OpenStack.new(@connection_params) +compute = Fog::OpenStack::Compute.new(@connection_params) ``` Get a list of available images for use with booting new instances: ```ruby p compute.images -# => @@ -105,9 +105,9 @@ List available flavors so we can decide how powerful to make this instance: ```ruby p compute.flavors -# => , -# {:duration=>17.359134} p instance -# => [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:f4:75:ab", "version"=>4, "addr"=>"1.2.3.4", "OS-EXT-IPS:type"=>"fixed"}]}, @@ -177,11 +177,11 @@ Allow TCP traffic through port 22: ```ruby security_group = compute.security_groups.create name: "Test SSH", description: "Allow access to port 22" -# => @@ -502,7 +502,7 @@ Set up a project's public gateway (needed for external access): ```ruby -identity = Fog::Identity::OpenStack.new(@connection_params) +identity = Fog::OpenStack::Identity.new(@connection_params) tenants = identity.projects.select do |project| project.name == @connection_params[:openstack_project_name] @@ -510,7 +510,7 @@ end tenant_id = tenants[0].id -neutron = Fog::Network::OpenStack.new(@connection_params) +neutron = Fog::OpenStack::Network.new(@connection_params) network = neutron.networks.create name: "default", tenant_id: tenant_id diff --git a/docs/compute.md b/docs/compute.md index 18454e513..675b10aea 100644 --- a/docs/compute.md +++ b/docs/compute.md @@ -16,7 +16,7 @@ Once `irb` has launched you need to require the Fog library by executing: Next, create a connection to the Compute Service: - service = Fog::Compute::OpenStack.new({ + service = Fog::OpenStack::Compute.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id @@ -71,7 +71,7 @@ This will return: {"flavors"=>[{"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}], "name"=>"m1.tiny"}, {"id"=>"2", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"bookmark"}], "name"=>"m1.small"}, {"id"=>"3", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"bookmark"}], "name"=>"m1.medium"}, {"id"=>"4", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"bookmark"}], "name"=>"m1.large"}, {"id"=>"42", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"bookmark"}], "name"=>"m1.nano"}, {"id"=>"5", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"bookmark"}], "name"=>"m1.xlarge"}, {"id"=>"84", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"bookmark"}], "name"=>"m1.micro"}]} -To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Compute/Openstack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/compute/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -137,13 +137,13 @@ To retrieve a list of available images: service.images -This returns a collection of `Fog::Compute::OpenStack::Image` models: +This returns a collection of `Fog::OpenStack::Compute::Image` models: - , - @@ -167,7 +167,7 @@ This returns a collection of `Fog::Compute::OpenStack::Image` models: >, links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}] >, - , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}] @@ -190,9 +190,9 @@ To retrieve individual image: service.images.get "821e2b73-5aed-4f9d-aaa7-2f4f297779f3" -This returns an `Fog::Compute::OpenStack::Image` instance: +This returns an `Fog::OpenStack::Compute::Image` instance: - , - @@ -223,11 +223,11 @@ To retrieve a list of available flavors: service.flavors -This returns a collection of `Fog::Compute::OpenStack::Flavor` models: +This returns a collection of `Fog::OpenStack::Compute::Flavor` models: - , - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}], @@ -331,16 +331,16 @@ To return an individual server: service.servers.get "4572529c-0cfc-433e-8dbf-7cc383ed5b7c" -This returns a `Fog::Compute::OpenStack::Server` instance: +This returns a `Fog::OpenStack::Compute::Server` instance: - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}], @@ -380,16 +380,16 @@ To create a server: **Note**: The `:name`, `:flavor_ref`, and `image_ref` attributes are required for server creation. -This will return a `Fog::Compute::OpenStack::Server` instance: +This will return a `Fog::OpenStack::Compute::Server` instance: - , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"bookmark"}], @@ -423,14 +423,14 @@ Notice that your server contains several `nil` attributes. To see the latest sta You can see that the server is currently being built: - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:71:0d:c4", "version"=>4, "addr"=>"10.0.0.2", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"bookmark"}], @@ -464,7 +464,7 @@ Fog can wait for the server to become ready as follows: server.wait_for { ready? } -**Note**: The `Fog::Compute::OpenStack::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`. +**Note**: The `Fog::OpenStack::Compute::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`. ### Additional Parameters @@ -481,7 +481,7 @@ The `create` method also supports the following key values: :personality - Array of files to be injected onto the server. Please refer to the Fog personality API documentation for further information. + Array of files to be injected onto the server. Please refer to the Fog personality API documentation for further information. diff --git a/docs/introspection.md b/docs/introspection.md index 56d7cd25e..847b671be 100644 --- a/docs/introspection.md +++ b/docs/introspection.md @@ -92,7 +92,7 @@ require 'fog/openstack' Find the available Baremetal nodes. ```ruby -iron = Fog::Baremetal::OpenStack.new(@connection_params) +iron = Fog::OpenStack::Baremetal.new(@connection_params) nodes = iron.node_list ``` @@ -109,7 +109,7 @@ http://docs.openstack.org/developer/ironic/deploy/install-guide.html#hardware-in ```ruby node_id = nodes.body["nodes"][0]["uuid"] -inspector = Fog::Introspection::OpenStack.new(@connection_params) +inspector = Fog::OpenStack::Introspection.new(@connection_params) introspection1 = inspector.create_introspection(node_id) ``` diff --git a/docs/metering.md b/docs/metering.md index 278b2df52..c486575d3 100644 --- a/docs/metering.md +++ b/docs/metering.md @@ -9,7 +9,7 @@ Fog uses the [OpenStack Metering API](http://docs.openstack.org/developer/ceilom Get a handle on the Metering service: ```ruby -service = Fog::Metering::OpenStack.new({ +service = Fog::OpenStack::Metering.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id diff --git a/docs/network.md b/docs/network.md index 498e28c7c..ab853620d 100644 --- a/docs/network.md +++ b/docs/network.md @@ -16,7 +16,7 @@ require 'fog/openstack' Next, create a connection to the Network Service: ``` -service = Fog::Network::OpenStack.new( +service = Fog::OpenStack::Network.new( :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_domain_name => OPEN_STACK_DOMAIN, # Your OpenStack Domain name @@ -104,7 +104,7 @@ This will return: {"id"=>"e624a36d-762b-481f-9b50-4154ceb78bbb", "name"=>"network_1", "subnets"=>["2e4ec6a4-0150-47f5-8523-e899ac03026e"], "shared"=>false, "status"=>"ACTIVE", "admin_state_up"=>true, "tenant_id"=>"f8b26a6032bc47718a7702233ac708b9"}] } ``` -To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/Fog/Network/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/fog/openstack/network/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -182,14 +182,14 @@ networks = service.networks ``` This returns in the following `Fog::OpenStack::Model`: ``` -] + [] >, shared=true, status="ACTIVE", @@ -200,10 +200,10 @@ This returns in the following `Fog::OpenStack::Model`: provider_segmentation_id=nil, router_external=false >, - , diff --git a/docs/orchestration.md b/docs/orchestration.md index 0051c1ecc..a661217fb 100644 --- a/docs/orchestration.md +++ b/docs/orchestration.md @@ -25,7 +25,7 @@ _Source: [OpenStack Wiki](https://wiki.openstack.org/wiki/Heat)_ Get a handle on the Orchestration service: ```ruby -service = Fog::Orchestration::OpenStack.new({ +service = Fog::OpenStack::Orchestration.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id @@ -46,9 +46,9 @@ service.stacks ``` This returns a list of stacks with minimum attributes, leaving other attributes empty ```ruby -=> ``` @@ -212,9 +212,9 @@ You can list `Events` of a `stack`: ```ruby stack.events -=> "http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}], @@ -260,7 +260,7 @@ An `event` has an associated `resource`: ```ruby resource = event.resource -=> 1}) -=> "http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}], @@ -332,7 +332,7 @@ You can validate a template (either HOT or CFN) before using it: ```ruby service.templates.validate(:template => content) -=> 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_domain_name => OPEN_STACK_DOMAIN, # Your OpenStack Domain name diff --git a/docs/storage.md b/docs/storage.md index fb1706a75..54b9276f4 100644 --- a/docs/storage.md +++ b/docs/storage.md @@ -29,7 +29,7 @@ require 'fog/openstack' Next, create a connection to Swift: ```ruby -service = Fog::Storage::OpenStack.new({ +service = Fog::OpenStack::Storage.new({ :openstack_username => USERNAME, # Your OpenStack Username :openstack_api_key => PASSWORD, # Your OpenStack Password :openstack_auth_url => 'http://YOUR_OPENSTACK_ENDPOINT:PORT/v2.0/tokens', @@ -126,7 +126,7 @@ This will return: {"X-Account-Bytes-Used"=>"2563554", "Date"=>"Thu, 21 Feb 2013 21:57:02 GMT", "X-Account-Meta-Temp-Url-Key"=>"super_secret_key", "X-Timestamp"=>"1354552916.82056", "Content-Length"=>"0", "Content-Type"=>"application/json; charset=utf-8", "X-Trans-Id"=>"txe934924374a744c8a6c40dd8f29ab94a", "Accept-Ranges"=>"bytes", "X-Account-Container-Count"=>"7", "X-Account-Object-Count"=>"5"} ``` -To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Storage/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/storage/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -184,7 +184,7 @@ To retrieve a list of directories: service.directories ``` -This returns a collection of `Fog::Storage::OpenStack::Directory` models: +This returns a collection of `Fog::OpenStack::Storage::Directory` models: ## Get Directory @@ -194,7 +194,7 @@ To retrieve a specific directory: service.directories.get "blue" ``` -This returns a `Fog::Storage::OpenStack::Directory` instance: +This returns a `Fog::OpenStack::Storage::Directory` instance: ## Create Directory diff --git a/docs/workflow.md b/docs/workflow.md index cb7544cf0..8577683c7 100644 --- a/docs/workflow.md +++ b/docs/workflow.md @@ -9,7 +9,7 @@ Fog uses the [OpenStack Mistral API](http://docs.openstack.org/developer/mistral Get a handle for the Workflow service: ```ruby -service = Fog::Workflow::OpenStack.new({ +service = Fog::OpenStack::Workflow.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id diff --git a/examples/compute/block_device_mapping_v2.rb b/examples/compute/block_device_mapping_v2.rb index d59012fac..b8f8c4abb 100644 --- a/examples/compute/block_device_mapping_v2.rb +++ b/examples/compute/block_device_mapping_v2.rb @@ -7,7 +7,7 @@ password = 'secret' tenant = 'My Compute Tenant' # String -compute_client ||= ::Fog::Compute::OpenStack.new( +compute_client ||= ::Fog::OpenStack::Compute.new( :openstack_api_key => password, :openstack_username => username, :openstack_auth_url => auth_url, diff --git a/examples/container_infra/basics.rb b/examples/container_infra/basics.rb index 9e4daac1a..1c1d4da44 100644 --- a/examples/container_infra/basics.rb +++ b/examples/container_infra/basics.rb @@ -12,7 +12,7 @@ container_infra = Fog::ContainerInfra::OpenStack.new(params) # Get the Fedora Atomic image -image = Fog::Image::OpenStack.new(params) +image = Fog::OpenStack::Image.new(params) unless image.images.map(&:name).include?("fedora-atomic-latest") puts "Couldn't find Fedora Atomic. Uploading to Glance..." diff --git a/examples/event/basics.rb b/examples/event/basics.rb index b04082ca3..93fbf5d73 100644 --- a/examples/event/basics.rb +++ b/examples/event/basics.rb @@ -13,7 +13,7 @@ puts "### SERVICE CONNECTION ###" -event_service = Fog::Event::OpenStack.new(@connection_params) +event_service = Fog::OpenStack::Event.new(@connection_params) p event_service diff --git a/examples/identity/basics.rb b/examples/identity/basics.rb index d0efd0f89..a66320d3c 100644 --- a/examples/identity/basics.rb +++ b/examples/identity/basics.rb @@ -8,7 +8,7 @@ password = 'secret' tenant = 'admin' -keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, +keystone = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, :openstack_username => username, :openstack_api_key => password, :openstack_tenant => tenant @@ -19,7 +19,7 @@ # Listing keystone tenants # keystone.tenants.each do |tenant| - # auth_url, - :openstack_username => username, - :openstack_api_key => password, +keystone = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, + :openstack_username => username, + :openstack_api_key => password, :openstack_project_name => project, - :openstack_domain_name => domain + :openstack_domain_name => domain # Optional, self-signed certs #:connection_options => { :ssl_verify_peer => false } @@ -21,17 +21,17 @@ # List keystone projects # keystone.projects.each do |project| - #"http://example.net:35357/..."}, - # parent_id=nil, - # subtree=nil, - # parents=nil - #> + # "http://example.net:35357/..."}, + # parent_id=nil, + # subtree=nil, + # parents=nil + # > # ... pp project end @@ -40,17 +40,17 @@ # List users # keystone.users.each do |user| - #"http://example.net:35357/..."}, - # password=nil - #> + # "http://example.net:35357/..."}, + # password=nil + # > # ... pp user end diff --git a/examples/image/upload-test-image.rb b/examples/image/upload-test-image.rb index c57c8847e..766415887 100755 --- a/examples/image/upload-test-image.rb +++ b/examples/image/upload-test-image.rb @@ -43,32 +43,32 @@ end end -image_service = Fog::Image::OpenStack.new :openstack_api_key => ENV['OS_PASSWORD'], +image_service = Fog::OpenStack::Image.new :openstack_api_key => ENV['OS_PASSWORD'], :openstack_username => ENV["OS_USERNAME"], :openstack_auth_url => ENV["OS_AUTH_URL"] + "/tokens", - :openstack_tenant => ENV["OS_TENANT_NAME"] + :openstack_tenant => ENV["OS_TENANT_NAME"] puts "Uploading AKI..." -aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki', - :size => File.size(aki), - :disk_format => 'aki', +aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki', + :size => File.size(aki), + :disk_format => 'aki', :container_format => 'aki', - :location => aki + :location => aki puts "Uploading ARI..." -ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari', - :size => File.size(ari), - :disk_format => 'ari', +ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari', + :size => File.size(ari), + :disk_format => 'ari', :container_format => 'ari', - :location => ari + :location => ari puts "Uploading AMI..." -image_service.images.create :name => 'cirros-0.3.0-amd64', - :size => File.size(ami), - :disk_format => 'ami', +image_service.images.create :name => 'cirros-0.3.0-amd64', + :size => File.size(ami), + :disk_format => 'ami', :container_format => 'ami', - :location => ami, - :properties => { + :location => ami, + :properties => { 'kernel_id' => aki.id, 'ramdisk_id' => ari.id } diff --git a/examples/introspection/basics.rb b/examples/introspection/basics.rb index b76b75353..0d17773e4 100644 --- a/examples/introspection/basics.rb +++ b/examples/introspection/basics.rb @@ -15,10 +15,10 @@ :openstack_domain_id => "default" } -inspector = Fog::Introspection::OpenStack.new(@connection_params) +inspector = Fog::OpenStack::Introspection.new(@connection_params) # Introspection of an Ironic node -ironic = Fog::Baremetal::OpenStack.new(@connection_params) +ironic = Fog::OpenStack::Baremetal.new(@connection_params) nodes = ironic.list_nodes node1_uuid = nodes.body["nodes"][0]["uuid"] diff --git a/examples/metric/basics.rb b/examples/metric/basics.rb index f001e2e6a..3fe0083af 100644 --- a/examples/metric/basics.rb +++ b/examples/metric/basics.rb @@ -16,7 +16,7 @@ puts "### SERVICE CONNECTION ###" -metric = Fog::Metric::OpenStack.new(@connection_params) +metric = Fog::OpenStack::Metric.new(@connection_params) p metric diff --git a/examples/network/network_rbac.rb b/examples/network/network_rbac.rb index eb574625d..c22145f65 100644 --- a/examples/network/network_rbac.rb +++ b/examples/network/network_rbac.rb @@ -29,8 +29,8 @@ :connection_options => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'} } -identity_service = Fog::Identity::OpenStack::V3.new(auth_options) -network_service = Fog::Network::OpenStack.new(auth_options) +identity_service = Fog::OpenStack::Identity::V3.new(auth_options) +network_service = Fog::OpenStack::Network.new(auth_options) own_project = identity_service.projects.select { |p| p.name == ENV['OS_PROJECT_NAME'] }.first other_project = identity_service.projects.select { |p| p.name != ENV['OS_PROJECT_NAME'] }.first diff --git a/examples/network/network_subnets_routers.rb b/examples/network/network_subnets_routers.rb index 746db7523..a8067835e 100644 --- a/examples/network/network_subnets_routers.rb +++ b/examples/network/network_subnets_routers.rb @@ -17,7 +17,7 @@ def create_tenant_network( tenant_name, subnet_gateway = '10.0.0.1', private_network_name = 'private' ) - network = Fog::Network[:openstack] + network = Fog::OpenStack::Network.new id = Fog::Identity[:openstack] tenant = id.tenants.find { |t| t.name == tenant_name } diff --git a/examples/shared_file_system/basics.rb b/examples/shared_file_system/basics.rb index d24339b6c..a32b87f36 100644 --- a/examples/shared_file_system/basics.rb +++ b/examples/shared_file_system/basics.rb @@ -29,8 +29,8 @@ :connection_options => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'} } -network_service = Fog::Network::OpenStack.new(auth_options) -share_service = Fog::SharedFileSystem::OpenStack.new(auth_options) +network_service = Fog::OpenStack::Network.new(auth_options) +share_service = Fog::OpenStack::SharedFileSystem.new(auth_options) net = network_service.networks.first raise 'no network exists' if net.nil? diff --git a/examples/storage/set-account-quota.rb b/examples/storage/set-account-quota.rb index a17b50b61..f018f7191 100644 --- a/examples/storage/set-account-quota.rb +++ b/examples/storage/set-account-quota.rb @@ -28,14 +28,14 @@ # to retrieve the list of tenants available and find # the tenant we want to set the quotas for. # -id = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, +id = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, :openstack_username => user, :openstack_api_key => password # # Storage service (Swift) # -st = Fog::Storage::OpenStack.new :openstack_auth_url => auth_url, +st = Fog::OpenStack::Storage.new :openstack_auth_url => auth_url, :openstack_username => user, :openstack_api_key => password diff --git a/examples/volume/backups.rb b/examples/volume/backups.rb index 5ffa627fb..5af221065 100644 --- a/examples/volume/backups.rb +++ b/examples/volume/backups.rb @@ -1,5 +1,5 @@ require 'fog/openstack' -require 'fog/workflow/openstack/v2' +require 'fog/openstack/workflow/v2' auth_url = "http://192.0.2.1:5000/v3/auth/tokens" username = "admin" @@ -14,7 +14,7 @@ :openstack_domain_id => "default", } -cinder = Fog::Volume::OpenStack.new(@connection_params) +cinder = Fog::OpenStack::Volume.new(@connection_params) puts "INFO: create backup of existing volume named test" diff --git a/examples/workflow/workflow-examples.rb b/examples/workflow/workflow-examples.rb index aca65554b..24779b2cc 100644 --- a/examples/workflow/workflow-examples.rb +++ b/examples/workflow/workflow-examples.rb @@ -1,5 +1,5 @@ require 'fog/openstack' -require 'fog/workflow/openstack/v2' +require 'fog/openstack/workflow/v2' auth_url = "http://192.0.2.1:5000/v3/auth/tokens" username = "admin" @@ -14,7 +14,7 @@ :openstack_domain_id => "default", } -mistral = Fog::Workflow::OpenStack.new(@connection_params) +mistral = Fog::OpenStack::Workflow.new(@connection_params) puts "INFO: create_execution" diff --git a/lib/fog/dns/openstack.rb b/lib/fog/dns/openstack.rb deleted file mode 100644 index 0007a5d63..000000000 --- a/lib/fog/dns/openstack.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Fog - module DNS - class OpenStack < Fog::Service - autoload :V1, 'fog/dns/openstack/v1' - autoload :V2, 'fog/dns/openstack/v2' - - # Fog::DNS::OpenStack.new() will return a Fog::DNS::OpenStack::V2 or a Fog::DNS::OpenStack::V1, - # choosing the latest available - def self.new(args = {}) - @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - if inspect == 'Fog::DNS::OpenStack' - service = Fog::DNS::OpenStack::V2.new(args) unless args.empty? - service ||= Fog::DNS::OpenStack::V1.new(args) - else - service = Fog::Service.new(args) - end - service - end - end - end -end diff --git a/lib/fog/image/openstack.rb b/lib/fog/image/openstack.rb deleted file mode 100644 index 3aa4ed518..000000000 --- a/lib/fog/image/openstack.rb +++ /dev/null @@ -1,23 +0,0 @@ - - -module Fog - module Image - class OpenStack < Fog::Service - autoload :V1, 'fog/image/openstack/v1' - autoload :V2, 'fog/image/openstack/v2' - - # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V1, - # choosing the latest available - def self.new(args = {}) - @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - if inspect == 'Fog::Image::OpenStack' - service = Fog::Image::OpenStack::V2.new(args) unless args.empty? - service ||= Fog::Image::OpenStack::V1.new(args) - else - service = Fog::Service.new(args) - end - service - end - end - end -end diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index 2b5a4cc42..f61a00ee4 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -2,87 +2,6 @@ require 'fog/json' module Fog - module Baremetal - autoload :OpenStack, 'fog/baremetal/openstack' - end - - module Compute - autoload :OpenStack, 'fog/compute/openstack' - end - - module ContainerInfra - autoload :OpenStack, 'fog/container_infra/openstack' - end - - module DNS - autoload :OpenStack, 'fog/dns/openstack' - end - - module Event - autoload :OpenStack, 'fog/event/openstack' - end - - module Identity - autoload :OpenStack, 'fog/identity/openstack' - end - - module Image - autoload :OpenStack, 'fog/image/openstack' - end - - module Introspection - autoload :OpenStack, 'fog/introspection/openstack' - end - - module KeyManager - autoload :OpenStack, 'fog/key_manager/openstack' - end - - module Metering - autoload :OpenStack, 'fog/metering/openstack' - end - - module Metric - autoload :OpenStack, 'fog/metric/openstack' - end - - module Monitoring - autoload :OpenStack, 'fog/monitoring/openstack' - end - - module Network - autoload :OpenStack, 'fog/network/openstack' - end - - module NFV - autoload :OpenStack, 'fog/nfv/openstack' - end - - module Orchestration - autoload :OpenStack, 'fog/orchestration/openstack' - autoload :Util, 'fog/orchestration/util/recursive_hot_file_loader' - end - - module SharedFileSystem - autoload :OpenStack, 'fog/shared_file_system/openstack' - end - - module Storage - autoload :OpenStack, 'fog/storage/openstack' - end - - module Volume - autoload :OpenStack, 'fog/volume/openstack' - end - - module Workflow - autoload :OpenStack, 'fog/workflow/openstack' - - class OpenStack - autoload :V2, 'fog/workflow/openstack/v2' - end - end - module OpenStack require 'fog/openstack/auth/token' @@ -90,7 +9,28 @@ module OpenStack autoload :Core, 'fog/openstack/core' autoload :Errors, 'fog/openstack/errors' - autoload :Planning, 'fog/planning/openstack' + + autoload :Baremetal, 'fog/openstack/baremetal/baremetal' + autoload :Compute, 'fog/openstack/compute/compute' + autoload :ContainerInfra, 'fog/openstack/container_infra/container_infra' + autoload :DNS, 'fog/openstack/dns/dns' + autoload :Event, 'fog/openstack/event/event' + autoload :Identity, 'fog/openstack/identity/identity' + autoload :Image, 'fog/openstack/image/image' + autoload :Introspection, 'fog/openstack/introspection/introspection' + autoload :KeyManager, 'fog/openstack/key_manager/key_manager' + autoload :Metering, 'fog/openstack/metering/metering' + autoload :Metric, 'fog/openstack/metric/metric' + autoload :Monitoring, 'fog/openstack/monitoring/monitoring' + autoload :Network, 'fog/openstack/network/network' + autoload :NFV, 'fog/openstack/nfv/nfv' + autoload :Orchestration, 'fog/openstack/orchestration/orchestration' + autoload :OrchestrationUtil, 'fog/openstack/orchestration/util/recursive_hot_file_loader' + autoload :Planning, 'fog/openstack/planning/planning' + autoload :SharedFileSystem, 'fog/openstack/shared_file_system/shared_file_system' + autoload :Storage, 'fog/openstack/storage/storage' + autoload :Workflow, 'fog/openstack/workflow/workflow' + autoload :Volume, 'fog/openstack/volume/volume' extend Fog::Provider diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/openstack/baremetal/baremetal.rb similarity index 97% rename from lib/fog/baremetal/openstack.rb rename to lib/fog/openstack/baremetal/baremetal.rb index 136911c3b..c1ba2e52e 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/openstack/baremetal/baremetal.rb @@ -1,8 +1,6 @@ - - module Fog - module Baremetal - class OpenStack < Fog::Service + module OpenStack + class Baremetal < Fog::Service SUPPORTED_VERSIONS = /(.)*/ requires :openstack_auth_url @@ -19,7 +17,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/baremetal/openstack/models' + model_path 'fog/openstack/baremetal/models' model :chassis collection :chassis_collection model :driver @@ -31,7 +29,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/baremetal/openstack/requests' + request_path 'fog/openstack/baremetal/requests' # Node requests request :create_node @@ -250,7 +248,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Baremetal::OpenStack::NotFound + Fog::OpenStack::Baremetal::NotFound end def default_service_type diff --git a/lib/fog/baremetal/openstack/models/chassis.rb b/lib/fog/openstack/baremetal/models/chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/models/chassis.rb rename to lib/fog/openstack/baremetal/models/chassis.rb index 006501962..e096109eb 100644 --- a/lib/fog/baremetal/openstack/models/chassis.rb +++ b/lib/fog/openstack/baremetal/models/chassis.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Chassis < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/baremetal/openstack/models/chassis_collection.rb b/lib/fog/openstack/baremetal/models/chassis_collection.rb similarity index 89% rename from lib/fog/baremetal/openstack/models/chassis_collection.rb rename to lib/fog/openstack/baremetal/models/chassis_collection.rb index 8d9176247..cee1170f7 100644 --- a/lib/fog/baremetal/openstack/models/chassis_collection.rb +++ b/lib/fog/openstack/baremetal/models/chassis_collection.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/chassis' +require 'fog/openstack/baremetal/models/chassis' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class ChassisCollection < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Chassis + model Fog::OpenStack::Baremetal::Chassis def all(options = {}) load_response(service.list_chassis_detailed(options), 'chassis') diff --git a/lib/fog/baremetal/openstack/models/driver.rb b/lib/fog/openstack/baremetal/models/driver.rb similarity index 91% rename from lib/fog/baremetal/openstack/models/driver.rb rename to lib/fog/openstack/baremetal/models/driver.rb index 529ae2224..8693ce329 100644 --- a/lib/fog/baremetal/openstack/models/driver.rb +++ b/lib/fog/openstack/baremetal/models/driver.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Driver < Fog::OpenStack::Model identity :name diff --git a/lib/fog/baremetal/openstack/models/drivers.rb b/lib/fog/openstack/baremetal/models/drivers.rb similarity index 72% rename from lib/fog/baremetal/openstack/models/drivers.rb rename to lib/fog/openstack/baremetal/models/drivers.rb index 9e6ca4dd4..567ba9549 100644 --- a/lib/fog/baremetal/openstack/models/drivers.rb +++ b/lib/fog/openstack/baremetal/models/drivers.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/driver' +require 'fog/openstack/baremetal/models/driver' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Drivers < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Driver + model Fog::OpenStack::Baremetal::Driver def all(options = {}) load_response(service.list_drivers(options), 'drivers') diff --git a/lib/fog/baremetal/openstack/models/node.rb b/lib/fog/openstack/baremetal/models/node.rb similarity index 98% rename from lib/fog/baremetal/openstack/models/node.rb rename to lib/fog/openstack/baremetal/models/node.rb index 774b34fdd..403485b52 100644 --- a/lib/fog/baremetal/openstack/models/node.rb +++ b/lib/fog/openstack/baremetal/models/node.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Node < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/baremetal/openstack/models/nodes.rb b/lib/fog/openstack/baremetal/models/nodes.rb similarity index 89% rename from lib/fog/baremetal/openstack/models/nodes.rb rename to lib/fog/openstack/baremetal/models/nodes.rb index 972560e72..a9e8c58a0 100644 --- a/lib/fog/baremetal/openstack/models/nodes.rb +++ b/lib/fog/openstack/baremetal/models/nodes.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/node' +require 'fog/openstack/baremetal/models/node' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Nodes < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Node + model Fog::OpenStack::Baremetal::Node def all(options = {}) load_response(service.list_nodes_detailed(options), 'nodes') diff --git a/lib/fog/baremetal/openstack/models/port.rb b/lib/fog/openstack/baremetal/models/port.rb similarity index 96% rename from lib/fog/baremetal/openstack/models/port.rb rename to lib/fog/openstack/baremetal/models/port.rb index 6170bb30c..479af5bd0 100644 --- a/lib/fog/baremetal/openstack/models/port.rb +++ b/lib/fog/openstack/baremetal/models/port.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Port < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/baremetal/openstack/models/ports.rb b/lib/fog/openstack/baremetal/models/ports.rb similarity index 89% rename from lib/fog/baremetal/openstack/models/ports.rb rename to lib/fog/openstack/baremetal/models/ports.rb index 4d9e79657..d5322650c 100644 --- a/lib/fog/baremetal/openstack/models/ports.rb +++ b/lib/fog/openstack/baremetal/models/ports.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/port' +require 'fog/openstack/baremetal/models/port' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Ports < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Port + model Fog::OpenStack::Baremetal::Port def all(options = {}) load_response(service.list_ports_detailed(options), 'ports') diff --git a/lib/fog/baremetal/openstack/requests/create_chassis.rb b/lib/fog/openstack/baremetal/requests/create_chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/create_chassis.rb rename to lib/fog/openstack/baremetal/requests/create_chassis.rb index 88d213b6b..dc1da3d84 100644 --- a/lib/fog/baremetal/openstack/requests/create_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/create_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Create a new chassis # diff --git a/lib/fog/baremetal/openstack/requests/create_node.rb b/lib/fog/openstack/baremetal/requests/create_node.rb similarity index 97% rename from lib/fog/baremetal/openstack/requests/create_node.rb rename to lib/fog/openstack/baremetal/requests/create_node.rb index 3f81ece30..629e0614f 100644 --- a/lib/fog/baremetal/openstack/requests/create_node.rb +++ b/lib/fog/openstack/baremetal/requests/create_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Create a new node # diff --git a/lib/fog/baremetal/openstack/requests/create_port.rb b/lib/fog/openstack/baremetal/requests/create_port.rb similarity index 97% rename from lib/fog/baremetal/openstack/requests/create_port.rb rename to lib/fog/openstack/baremetal/requests/create_port.rb index 5bc678cb1..a980ed0ab 100644 --- a/lib/fog/baremetal/openstack/requests/create_port.rb +++ b/lib/fog/openstack/baremetal/requests/create_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Create a new port # diff --git a/lib/fog/baremetal/openstack/requests/delete_chassis.rb b/lib/fog/openstack/baremetal/requests/delete_chassis.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/delete_chassis.rb rename to lib/fog/openstack/baremetal/requests/delete_chassis.rb index 2b35cebcd..a13ce5b7b 100644 --- a/lib/fog/baremetal/openstack/requests/delete_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/delete_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def delete_chassis(chassis_uuid) data = {:chassis_uuid => chassis_uuid} diff --git a/lib/fog/baremetal/openstack/requests/delete_node.rb b/lib/fog/openstack/baremetal/requests/delete_node.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/delete_node.rb rename to lib/fog/openstack/baremetal/requests/delete_node.rb index 260c1844d..522373555 100644 --- a/lib/fog/baremetal/openstack/requests/delete_node.rb +++ b/lib/fog/openstack/baremetal/requests/delete_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def delete_node(node_uuid) data = {:node_ident => node_uuid} diff --git a/lib/fog/baremetal/openstack/requests/delete_port.rb b/lib/fog/openstack/baremetal/requests/delete_port.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/delete_port.rb rename to lib/fog/openstack/baremetal/requests/delete_port.rb index 89e9a0c77..1faadb1d1 100644 --- a/lib/fog/baremetal/openstack/requests/delete_port.rb +++ b/lib/fog/openstack/baremetal/requests/delete_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def delete_port(port_uuid) data = {:port_uuid => port_uuid} diff --git a/lib/fog/baremetal/openstack/requests/get_chassis.rb b/lib/fog/openstack/baremetal/requests/get_chassis.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_chassis.rb rename to lib/fog/openstack/baremetal/requests/get_chassis.rb index 88fa41d3d..def0f616b 100644 --- a/lib/fog/baremetal/openstack/requests/get_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/get_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_chassis(chassis_uuid) request( diff --git a/lib/fog/baremetal/openstack/requests/get_driver.rb b/lib/fog/openstack/baremetal/requests/get_driver.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_driver.rb rename to lib/fog/openstack/baremetal/requests/get_driver.rb index 48f95940d..915f03638 100644 --- a/lib/fog/baremetal/openstack/requests/get_driver.rb +++ b/lib/fog/openstack/baremetal/requests/get_driver.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_driver(driver_name) request( diff --git a/lib/fog/baremetal/openstack/requests/get_driver_properties.rb b/lib/fog/openstack/baremetal/requests/get_driver_properties.rb similarity index 97% rename from lib/fog/baremetal/openstack/requests/get_driver_properties.rb rename to lib/fog/openstack/baremetal/requests/get_driver_properties.rb index 3404d53da..3dc9e11ea 100644 --- a/lib/fog/baremetal/openstack/requests/get_driver_properties.rb +++ b/lib/fog/openstack/baremetal/requests/get_driver_properties.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_driver_properties(driver_name) data = {:driver_name => driver_name} diff --git a/lib/fog/baremetal/openstack/requests/get_node.rb b/lib/fog/openstack/baremetal/requests/get_node.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_node.rb rename to lib/fog/openstack/baremetal/requests/get_node.rb index 444909b87..60d4be300 100644 --- a/lib/fog/baremetal/openstack/requests/get_node.rb +++ b/lib/fog/openstack/baremetal/requests/get_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_node(node_id) request( diff --git a/lib/fog/baremetal/openstack/requests/get_port.rb b/lib/fog/openstack/baremetal/requests/get_port.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_port.rb rename to lib/fog/openstack/baremetal/requests/get_port.rb index 27c2fccb2..bf34be34f 100644 --- a/lib/fog/baremetal/openstack/requests/get_port.rb +++ b/lib/fog/openstack/baremetal/requests/get_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_port(port_id) request( diff --git a/lib/fog/baremetal/openstack/requests/list_chassis.rb b/lib/fog/openstack/baremetal/requests/list_chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/list_chassis.rb rename to lib/fog/openstack/baremetal/requests/list_chassis.rb index d9e583f7f..f7d5272cc 100644 --- a/lib/fog/baremetal/openstack/requests/list_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/list_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_chassis(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb b/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb similarity index 93% rename from lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb rename to lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb index cd59e91e4..63a25d58b 100644 --- a/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_chassis_detailed(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_drivers.rb b/lib/fog/openstack/baremetal/requests/list_drivers.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/list_drivers.rb rename to lib/fog/openstack/baremetal/requests/list_drivers.rb index c26ac48da..bf0646520 100644 --- a/lib/fog/baremetal/openstack/requests/list_drivers.rb +++ b/lib/fog/openstack/baremetal/requests/list_drivers.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_drivers(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_nodes.rb b/lib/fog/openstack/baremetal/requests/list_nodes.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/list_nodes.rb rename to lib/fog/openstack/baremetal/requests/list_nodes.rb index b3b8013ce..ff2c63964 100644 --- a/lib/fog/baremetal/openstack/requests/list_nodes.rb +++ b/lib/fog/openstack/baremetal/requests/list_nodes.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_nodes(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb b/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb similarity index 93% rename from lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb rename to lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb index 0ab63c487..afbca74d5 100644 --- a/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_nodes_detailed(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_ports.rb b/lib/fog/openstack/baremetal/requests/list_ports.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/list_ports.rb rename to lib/fog/openstack/baremetal/requests/list_ports.rb index e31765644..0a68f4042 100644 --- a/lib/fog/baremetal/openstack/requests/list_ports.rb +++ b/lib/fog/openstack/baremetal/requests/list_ports.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_ports(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb b/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb similarity index 93% rename from lib/fog/baremetal/openstack/requests/list_ports_detailed.rb rename to lib/fog/openstack/baremetal/requests/list_ports_detailed.rb index 31216effa..768c40773 100644 --- a/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_ports_detailed(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/patch_chassis.rb b/lib/fog/openstack/baremetal/requests/patch_chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/patch_chassis.rb rename to lib/fog/openstack/baremetal/requests/patch_chassis.rb index a21904e44..ebfe87b66 100644 --- a/lib/fog/baremetal/openstack/requests/patch_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/patch_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Patch a chassis # diff --git a/lib/fog/baremetal/openstack/requests/patch_node.rb b/lib/fog/openstack/baremetal/requests/patch_node.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/patch_node.rb rename to lib/fog/openstack/baremetal/requests/patch_node.rb index ba2143780..445b15cc7 100644 --- a/lib/fog/baremetal/openstack/requests/patch_node.rb +++ b/lib/fog/openstack/baremetal/requests/patch_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Patch a node # diff --git a/lib/fog/baremetal/openstack/requests/patch_port.rb b/lib/fog/openstack/baremetal/requests/patch_port.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/patch_port.rb rename to lib/fog/openstack/baremetal/requests/patch_port.rb index 0a162aa30..ffe9da2ba 100644 --- a/lib/fog/baremetal/openstack/requests/patch_port.rb +++ b/lib/fog/openstack/baremetal/requests/patch_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Patch a port # diff --git a/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb b/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/set_node_maintenance.rb rename to lib/fog/openstack/baremetal/requests/set_node_maintenance.rb index fdcd584e5..8939b200b 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def set_node_maintenance(node_uuid, parameters = nil) request( diff --git a/lib/fog/baremetal/openstack/requests/set_node_power_state.rb b/lib/fog/openstack/baremetal/requests/set_node_power_state.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/set_node_power_state.rb rename to lib/fog/openstack/baremetal/requests/set_node_power_state.rb index 360aed009..f036c074f 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_power_state.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_power_state.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def set_node_power_state(node_id, power_state) data = { diff --git a/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb b/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/set_node_provision_state.rb rename to lib/fog/openstack/baremetal/requests/set_node_provision_state.rb index 64328c7d6..f2ddc57dc 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def set_node_provision_state(node_id, provision_state) data = { diff --git a/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb b/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb rename to lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb index a996d3098..7cdd20f76 100644 --- a/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb +++ b/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def unset_node_maintenance(node_uuid, parameters = nil) request( diff --git a/lib/fog/compute/openstack.rb b/lib/fog/openstack/compute/compute.rb similarity index 98% rename from lib/fog/compute/openstack.rb rename to lib/fog/openstack/compute/compute.rb index 3d2049979..38bc5a2ed 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/openstack/compute/compute.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack < Fog::Service + module OpenStack + class Compute < Fog::Service SUPPORTED_VERSIONS = /v2\.0|v2\.1/ SUPPORTED_MICROVERSION = '2.15'.freeze @@ -18,7 +18,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/compute/openstack/models' + model_path 'fog/openstack/compute/models' model :aggregate collection :aggregates model :availability_zone @@ -60,7 +60,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/compute/openstack/requests' + request_path 'fog/openstack/compute/requests' # Aggregate CRUD request :list_aggregates @@ -373,7 +373,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Compute::OpenStack::NotFound + Fog::OpenStack::Compute::NotFound end def default_service_type diff --git a/lib/fog/compute/openstack/models/address.rb b/lib/fog/openstack/compute/models/address.rb similarity index 97% rename from lib/fog/compute/openstack/models/address.rb rename to lib/fog/openstack/compute/models/address.rb index a74160bbf..ac62ade97 100644 --- a/lib/fog/compute/openstack/models/address.rb +++ b/lib/fog/openstack/compute/models/address.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Address < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/addresses.rb b/lib/fog/openstack/compute/models/addresses.rb similarity index 74% rename from lib/fog/compute/openstack/models/addresses.rb rename to lib/fog/openstack/compute/models/addresses.rb index 3fe6282fe..5969106a9 100644 --- a/lib/fog/compute/openstack/models/addresses.rb +++ b/lib/fog/openstack/compute/models/addresses.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/address' +require 'fog/openstack/compute/models/address' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Addresses < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Address + model Fog::OpenStack::Compute::Address def all(options = {}) load_response(service.list_all_addresses(options), 'floating_ips') @@ -15,7 +15,7 @@ def get(address_id) if address = service.get_address(address_id).body['floating_ip'] new(address) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end diff --git a/lib/fog/compute/openstack/models/aggregate.rb b/lib/fog/openstack/compute/models/aggregate.rb similarity index 97% rename from lib/fog/compute/openstack/models/aggregate.rb rename to lib/fog/openstack/compute/models/aggregate.rb index ffc77c819..1cafe5184 100644 --- a/lib/fog/compute/openstack/models/aggregate.rb +++ b/lib/fog/openstack/compute/models/aggregate.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Aggregate < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/aggregates.rb b/lib/fog/openstack/compute/models/aggregates.rb similarity index 78% rename from lib/fog/compute/openstack/models/aggregates.rb rename to lib/fog/openstack/compute/models/aggregates.rb index 956fb2468..2e4126f57 100644 --- a/lib/fog/compute/openstack/models/aggregates.rb +++ b/lib/fog/openstack/compute/models/aggregates.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/aggregate' +require 'fog/openstack/compute/models/aggregate' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Aggregates < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Aggregate + model Fog::OpenStack::Compute::Aggregate def all(options = {}) load_response(service.list_aggregates(options), 'aggregates') diff --git a/lib/fog/compute/openstack/models/availability_zone.rb b/lib/fog/openstack/compute/models/availability_zone.rb similarity index 88% rename from lib/fog/compute/openstack/models/availability_zone.rb rename to lib/fog/openstack/compute/models/availability_zone.rb index 2f82201cb..fad9a1471 100644 --- a/lib/fog/compute/openstack/models/availability_zone.rb +++ b/lib/fog/openstack/compute/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class AvailabilityZone < Fog::OpenStack::Model identity :zoneName diff --git a/lib/fog/compute/openstack/models/availability_zones.rb b/lib/fog/openstack/compute/models/availability_zones.rb similarity index 74% rename from lib/fog/compute/openstack/models/availability_zones.rb rename to lib/fog/openstack/compute/models/availability_zones.rb index b4befaea6..b3be66cf7 100644 --- a/lib/fog/compute/openstack/models/availability_zones.rb +++ b/lib/fog/openstack/compute/models/availability_zones.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/availability_zone' +require 'fog/openstack/compute/models/availability_zone' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class AvailabilityZones < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::AvailabilityZone + model Fog::OpenStack::Compute::AvailabilityZone def all(options = {}) data = service.list_zones_detailed(options) diff --git a/lib/fog/compute/openstack/models/flavor.rb b/lib/fog/openstack/compute/models/flavor.rb similarity index 86% rename from lib/fog/compute/openstack/models/flavor.rb rename to lib/fog/openstack/compute/models/flavor.rb index 553056aff..aa56fc297 100644 --- a/lib/fog/compute/openstack/models/flavor.rb +++ b/lib/fog/openstack/compute/models/flavor.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Flavor < Fog::OpenStack::Model identity :id @@ -37,25 +37,25 @@ def destroy def metadata service.get_flavor_metadata(id).body['extra_specs'] - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def create_metadata(metadata) service.create_flavor_metadata(id, metadata) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def update_metadata(key, value) service.update_flavor_metadata(id, key, value) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def delete_metadata(key) service.delete_flavor_metadata(id, key) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/flavors.rb b/lib/fog/openstack/compute/models/flavors.rb similarity index 75% rename from lib/fog/compute/openstack/models/flavors.rb rename to lib/fog/openstack/compute/models/flavors.rb index e5d6b754f..c4430e96c 100644 --- a/lib/fog/compute/openstack/models/flavors.rb +++ b/lib/fog/openstack/compute/models/flavors.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/flavor' +require 'fog/openstack/compute/models/flavor' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Flavors < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Flavor + model Fog::OpenStack::Compute::Flavor def all(options = {}) data = service.list_flavors_detail(options) @@ -20,7 +20,7 @@ def summary(options = {}) def get(flavor_id) data = service.get_flavor_details(flavor_id).body['flavor'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/host.rb b/lib/fog/openstack/compute/models/host.rb similarity index 81% rename from lib/fog/compute/openstack/models/host.rb rename to lib/fog/openstack/compute/models/host.rb index 637d451ff..bf79e813c 100644 --- a/lib/fog/compute/openstack/models/host.rb +++ b/lib/fog/openstack/compute/models/host.rb @@ -1,9 +1,9 @@ require 'fog/compute/models/server' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Host < Fog::OpenStack::Model attribute :host_name attribute :service_name @@ -19,7 +19,7 @@ def initialize(attributes) def details service.get_host_details(host_name).body['host'] - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/hosts.rb b/lib/fog/openstack/compute/models/hosts.rb similarity index 73% rename from lib/fog/compute/openstack/models/hosts.rb rename to lib/fog/openstack/compute/models/hosts.rb index 8cc8fa1b5..9baf1edc3 100644 --- a/lib/fog/compute/openstack/models/hosts.rb +++ b/lib/fog/openstack/compute/models/hosts.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/host' +require 'fog/openstack/compute/models/host' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Hosts < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Host + model Fog::OpenStack::Compute::Host def all(options = {}) data = service.list_hosts(options) @@ -17,7 +17,7 @@ def get(host_name) new('host_name' => host_name, 'details' => host) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/image.rb b/lib/fog/openstack/compute/models/image.rb similarity index 87% rename from lib/fog/compute/openstack/models/image.rb rename to lib/fog/openstack/compute/models/image.rb index cd9a41ff4..bc2b0c8cb 100644 --- a/lib/fog/compute/openstack/models/image.rb +++ b/lib/fog/openstack/compute/models/image.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Image < Fog::OpenStack::Model identity :id @@ -21,7 +21,7 @@ class Image < Fog::OpenStack::Model def metadata @metadata ||= begin - Fog::Compute::OpenStack::Metadata.new(:service => service, + Fog::OpenStack::Compute::Metadata.new(:service => service, :parent => self) end end diff --git a/lib/fog/compute/openstack/models/images.rb b/lib/fog/openstack/compute/models/images.rb similarity index 80% rename from lib/fog/compute/openstack/models/images.rb rename to lib/fog/openstack/compute/models/images.rb index b1e00a84f..5aecc5937 100644 --- a/lib/fog/compute/openstack/models/images.rb +++ b/lib/fog/openstack/compute/models/images.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/image' +require 'fog/openstack/compute/models/image' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Images < Fog::OpenStack::Collection attribute :filters - model Fog::Compute::OpenStack::Image + model Fog::OpenStack::Compute::Image attribute :server @@ -29,7 +29,7 @@ def all(filters_arg = filters) def get(image_id) data = service.get_image_details(image_id).body['image'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/key_pair.rb b/lib/fog/openstack/compute/models/key_pair.rb similarity index 97% rename from lib/fog/compute/openstack/models/key_pair.rb rename to lib/fog/openstack/compute/models/key_pair.rb index 6cc30481f..7a16a7a75 100644 --- a/lib/fog/compute/openstack/models/key_pair.rb +++ b/lib/fog/openstack/compute/models/key_pair.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class KeyPair < Fog::OpenStack::Model identity :name diff --git a/lib/fog/compute/openstack/models/key_pairs.rb b/lib/fog/openstack/compute/models/key_pairs.rb similarity index 74% rename from lib/fog/compute/openstack/models/key_pairs.rb rename to lib/fog/openstack/compute/models/key_pairs.rb index fbbd98bf2..468d07ff9 100644 --- a/lib/fog/compute/openstack/models/key_pairs.rb +++ b/lib/fog/openstack/compute/models/key_pairs.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/key_pair' +require 'fog/openstack/compute/models/key_pair' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class KeyPairs < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::KeyPair + model Fog::OpenStack::Compute::KeyPair def all(options = {}) items = [] @@ -20,7 +20,7 @@ def get(key_pair_name) if key_pair_name all.select { |kp| kp.name == key_pair_name }.first end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/metadata.rb b/lib/fog/openstack/compute/models/metadata.rb similarity index 79% rename from lib/fog/compute/openstack/models/metadata.rb rename to lib/fog/openstack/compute/models/metadata.rb index 0c42f3d67..50cfc70ec 100644 --- a/lib/fog/compute/openstack/models/metadata.rb +++ b/lib/fog/openstack/compute/models/metadata.rb @@ -1,16 +1,16 @@ require 'fog/openstack/models/collection' require 'fog/openstack/models/meta_parent' -require 'fog/compute/openstack/models/metadatum' -require 'fog/compute/openstack/models/image' -require 'fog/compute/openstack/models/server' +require 'fog/openstack/compute/models/metadatum' +require 'fog/openstack/compute/models/image' +require 'fog/openstack/compute/models/server' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Metadata < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Metadatum + model Fog::OpenStack::Compute::Metadatum - include Fog::Compute::OpenStack::MetaParent + include Fog::OpenStack::Compute::MetaParent def all requires :parent @@ -27,7 +27,7 @@ def get(key) metas = [] data.each_pair { |k, v| metas << {"key" => k, "value" => v} } new(metas[0]) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end @@ -50,7 +50,7 @@ def to_hash(data = nil) if data.nil? data = {} each do |meta| - if meta.kind_of?(Fog::Compute::OpenStack::Metadatum) + if meta.kind_of?(Fog::OpenStack::Compute::Metadatum) data.store(meta.key, meta.value) else data.store(meta["key"], meta["value"]) diff --git a/lib/fog/compute/openstack/models/metadatum.rb b/lib/fog/openstack/compute/models/metadatum.rb similarity index 85% rename from lib/fog/compute/openstack/models/metadatum.rb rename to lib/fog/openstack/compute/models/metadatum.rb index d9c03f3ea..431f70af4 100644 --- a/lib/fog/compute/openstack/models/metadatum.rb +++ b/lib/fog/openstack/compute/models/metadatum.rb @@ -2,10 +2,10 @@ require 'fog/openstack/models/meta_parent' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Metadatum < Fog::OpenStack::Model - include Fog::Compute::OpenStack::MetaParent + include Fog::OpenStack::Compute::MetaParent identity :key attribute :value diff --git a/lib/fog/compute/openstack/models/network.rb b/lib/fog/openstack/compute/models/network.rb similarity index 84% rename from lib/fog/compute/openstack/models/network.rb rename to lib/fog/openstack/compute/models/network.rb index f6d866ee2..a25f39acb 100644 --- a/lib/fog/compute/openstack/models/network.rb +++ b/lib/fog/openstack/compute/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Network < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/compute/openstack/models/networks.rb b/lib/fog/openstack/compute/models/networks.rb similarity index 81% rename from lib/fog/compute/openstack/models/networks.rb rename to lib/fog/openstack/compute/models/networks.rb index 06c57ae6c..98d1224a0 100644 --- a/lib/fog/compute/openstack/models/networks.rb +++ b/lib/fog/openstack/compute/models/networks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/network' +require 'fog/openstack/compute/models/network' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Networks < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Network + model Fog::OpenStack::Compute::Network attribute :server diff --git a/lib/fog/compute/openstack/models/os_interface.rb b/lib/fog/openstack/compute/models/os_interface.rb similarity index 88% rename from lib/fog/compute/openstack/models/os_interface.rb rename to lib/fog/openstack/compute/models/os_interface.rb index f685dddac..dc47e446a 100644 --- a/lib/fog/compute/openstack/models/os_interface.rb +++ b/lib/fog/openstack/compute/models/os_interface.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class OsInterface < Fog::OpenStack::Model identity :port_id attribute :fixed_ips, :type => :array diff --git a/lib/fog/compute/openstack/models/os_interfaces.rb b/lib/fog/openstack/compute/models/os_interfaces.rb similarity index 78% rename from lib/fog/compute/openstack/models/os_interfaces.rb rename to lib/fog/openstack/compute/models/os_interfaces.rb index c4140bbee..32c69dc3f 100644 --- a/lib/fog/compute/openstack/models/os_interfaces.rb +++ b/lib/fog/openstack/compute/models/os_interfaces.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/os_interface' +require 'fog/openstack/compute/models/os_interface' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class OsInterfaces < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::OsInterface + model Fog::OpenStack::Compute::OsInterface attribute :server diff --git a/lib/fog/compute/openstack/models/security_group.rb b/lib/fog/openstack/compute/models/security_group.rb similarity index 85% rename from lib/fog/compute/openstack/models/security_group.rb rename to lib/fog/openstack/compute/models/security_group.rb index 83057b9c2..8a7305815 100644 --- a/lib/fog/compute/openstack/models/security_group.rb +++ b/lib/fog/openstack/compute/models/security_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroup < Fog::OpenStack::Model identity :id @@ -12,7 +12,7 @@ class SecurityGroup < Fog::OpenStack::Model attribute :tenant_id def security_group_rules - Fog::Compute::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::OpenStack::Compute::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) end def rules @@ -23,7 +23,7 @@ def rules # no one should be calling this because it doesn't do anything # useful but we deprecated the rules attribute and need to maintain the API def rules=(new_rules) - Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.') + Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRules collection to create new rules.') attributes[:security_group_rules] = new_rules end @@ -41,13 +41,13 @@ def destroy end def create_security_group_rule(min, max, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id = nil) - Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.') + Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRules collection to create new rules.') requires :id service.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id) end def delete_security_group_rule(rule_id) - Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRule objects to destroy rules.') + Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRule objects to destroy rules.') service.delete_security_group_rule(rule_id) true end diff --git a/lib/fog/compute/openstack/models/security_group_rule.rb b/lib/fog/openstack/compute/models/security_group_rule.rb similarity index 95% rename from lib/fog/compute/openstack/models/security_group_rule.rb rename to lib/fog/openstack/compute/models/security_group_rule.rb index 48e061b5a..bcbf017b2 100644 --- a/lib/fog/compute/openstack/models/security_group_rule.rb +++ b/lib/fog/openstack/compute/models/security_group_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroupRule < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/security_group_rules.rb b/lib/fog/openstack/compute/models/security_group_rules.rb similarity index 65% rename from lib/fog/compute/openstack/models/security_group_rules.rb rename to lib/fog/openstack/compute/models/security_group_rules.rb index acab2e4dc..bbf39d5f6 100644 --- a/lib/fog/compute/openstack/models/security_group_rules.rb +++ b/lib/fog/openstack/compute/models/security_group_rules.rb @@ -1,18 +1,18 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/security_group_rule' +require 'fog/openstack/compute/models/security_group_rule' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroupRules < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::SecurityGroupRule + model Fog::OpenStack::Compute::SecurityGroupRule def get(security_group_rule_id) if security_group_rule_id body = service.get_security_group_rule(security_group_rule_id).body new(body['security_group_rule']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/security_groups.rb b/lib/fog/openstack/compute/models/security_groups.rb similarity index 70% rename from lib/fog/compute/openstack/models/security_groups.rb rename to lib/fog/openstack/compute/models/security_groups.rb index 1a26414ad..cbcf1f110 100644 --- a/lib/fog/compute/openstack/models/security_groups.rb +++ b/lib/fog/openstack/compute/models/security_groups.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/security_group' +require 'fog/openstack/compute/models/security_group' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroups < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::SecurityGroup + model Fog::OpenStack::Compute::SecurityGroup def all(options = {}) load_response(service.list_security_groups(options), 'security_groups') @@ -15,7 +15,7 @@ def get(security_group_id) if security_group_id new(service.get_security_group(security_group_id).body['security_group']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/server.rb b/lib/fog/openstack/compute/models/server.rb similarity index 98% rename from lib/fog/compute/openstack/models/server.rb rename to lib/fog/openstack/compute/models/server.rb index c0d698af7..66df13fa3 100644 --- a/lib/fog/compute/openstack/models/server.rb +++ b/lib/fog/openstack/compute/models/server.rb @@ -1,9 +1,9 @@ require 'fog/compute/models/server' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Server < Fog::Compute::Server identity :id attribute :instance_name, :aliases => 'OS-EXT-SRV-ATTR:instance_name' @@ -74,7 +74,7 @@ def initialize(attributes = {}) def metadata @metadata ||= begin - Fog::Compute::OpenStack::Metadata.new(:service => service, + Fog::OpenStack::Compute::Metadata.new(:service => service, :parent => self) end end @@ -233,7 +233,7 @@ def security_groups groups = service.list_security_groups(:server_id => id).body['security_groups'] groups.map do |group| - Fog::Compute::OpenStack::SecurityGroup.new group.merge(:service => service) + Fog::OpenStack::Compute::SecurityGroup.new group.merge(:service => service) end else service.security_groups.all diff --git a/lib/fog/compute/openstack/models/server_group.rb b/lib/fog/openstack/compute/models/server_group.rb similarity index 94% rename from lib/fog/compute/openstack/models/server_group.rb rename to lib/fog/openstack/compute/models/server_group.rb index 8514e1ad5..73bca63b0 100644 --- a/lib/fog/compute/openstack/models/server_group.rb +++ b/lib/fog/openstack/compute/models/server_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class ServerGroup < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/compute/openstack/models/server_groups.rb b/lib/fog/openstack/compute/models/server_groups.rb similarity index 74% rename from lib/fog/compute/openstack/models/server_groups.rb rename to lib/fog/openstack/compute/models/server_groups.rb index 8b5d8ddca..901657654 100644 --- a/lib/fog/compute/openstack/models/server_groups.rb +++ b/lib/fog/openstack/compute/models/server_groups.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/server_group' +require 'fog/openstack/compute/models/server_group' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class ServerGroups < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::ServerGroup + model Fog::OpenStack::Compute::ServerGroup def all(options = {}) load_response(service.list_server_groups(options), 'server_groups') @@ -15,7 +15,7 @@ def get(server_group_id) if server_group_id new(service.get_server_group(server_group_id).body['server_group']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end diff --git a/lib/fog/compute/openstack/models/servers.rb b/lib/fog/openstack/compute/models/servers.rb similarity index 75% rename from lib/fog/compute/openstack/models/servers.rb rename to lib/fog/openstack/compute/models/servers.rb index 1f8e14a7e..8f1fed4c3 100644 --- a/lib/fog/compute/openstack/models/servers.rb +++ b/lib/fog/openstack/compute/models/servers.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/server' +require 'fog/openstack/compute/models/server' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Servers < Fog::OpenStack::Collection attribute :filters - model Fog::Compute::OpenStack::Server + model Fog::OpenStack::Compute::Server def initialize(attributes) self.filters ||= {} @@ -27,11 +27,11 @@ def summary(filters_arg = filters) end # Creates a new server and populates ssh keys - # @return [Fog::Compute::OpenStack::Server] - # @raise [Fog::Compute::OpenStack::NotFound] - HTTP 404 - # @raise [Fog::Compute::OpenStack::BadRequest] - HTTP 400 - # @raise [Fog::Compute::OpenStack::InternalServerError] - HTTP 500 - # @raise [Fog::Compute::OpenStack::ServiceError] + # @return [Fog::OpenStack::Compute::Server] + # @raise [Fog::OpenStack::Compute::NotFound] - HTTP 404 + # @raise [Fog::OpenStack::Compute::BadRequest] - HTTP 400 + # @raise [Fog::OpenStack::Compute::InternalServerError] - HTTP 500 + # @raise [Fog::OpenStack::Compute::ServiceError] # @example # service.servers.bootstrap :name => 'bootstrap-server', # :flavor_ref => service.flavors.first.id, @@ -50,7 +50,7 @@ def get(server_id) if server = service.get_server_details(server_id).body['server'] new(server) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/service.rb b/lib/fog/openstack/compute/models/service.rb similarity index 95% rename from lib/fog/compute/openstack/models/service.rb rename to lib/fog/openstack/compute/models/service.rb index 7a9fcb1a7..e36471dbb 100644 --- a/lib/fog/compute/openstack/models/service.rb +++ b/lib/fog/openstack/compute/models/service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Service < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/services.rb b/lib/fog/openstack/compute/models/services.rb similarity index 83% rename from lib/fog/compute/openstack/models/services.rb rename to lib/fog/openstack/compute/models/services.rb index d1a8ce8b7..3331dbd02 100644 --- a/lib/fog/compute/openstack/models/services.rb +++ b/lib/fog/openstack/compute/models/services.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/service' +require 'fog/openstack/compute/models/service' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Services < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Service + model Fog::OpenStack::Compute::Service def all(options = {}) load_response(service.list_services(options), 'services') @@ -26,7 +26,7 @@ def get(service_id) s['id'] == service_id end new(serv) if serv - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/snapshot.rb b/lib/fog/openstack/compute/models/snapshot.rb similarity index 90% rename from lib/fog/compute/openstack/models/snapshot.rb rename to lib/fog/openstack/compute/models/snapshot.rb index 8ed587497..a0bf1db9d 100644 --- a/lib/fog/compute/openstack/models/snapshot.rb +++ b/lib/fog/openstack/compute/models/snapshot.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Snapshot < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/snapshots.rb b/lib/fog/openstack/compute/models/snapshots.rb similarity index 84% rename from lib/fog/compute/openstack/models/snapshots.rb rename to lib/fog/openstack/compute/models/snapshots.rb index 9d1c21855..110da6e2a 100644 --- a/lib/fog/compute/openstack/models/snapshots.rb +++ b/lib/fog/openstack/compute/models/snapshots.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/snapshot' +require 'fog/openstack/compute/models/snapshot' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Snapshots < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Snapshot + model Fog::OpenStack::Compute::Snapshot def all(options = {}) if !options.kind_of?(Hash) @@ -28,7 +28,7 @@ def get(snapshot_id) if snapshot = service.get_snapshot_details(snapshot_id).body['snapshot'] new(snapshot) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/tenant.rb b/lib/fog/openstack/compute/models/tenant.rb similarity index 91% rename from lib/fog/compute/openstack/models/tenant.rb rename to lib/fog/openstack/compute/models/tenant.rb index 2f6c50438..7553297e7 100644 --- a/lib/fog/compute/openstack/models/tenant.rb +++ b/lib/fog/openstack/compute/models/tenant.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Tenant < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/tenants.rb b/lib/fog/openstack/compute/models/tenants.rb similarity index 78% rename from lib/fog/compute/openstack/models/tenants.rb rename to lib/fog/openstack/compute/models/tenants.rb index 15d8645fb..a00d6c1f3 100644 --- a/lib/fog/compute/openstack/models/tenants.rb +++ b/lib/fog/openstack/compute/models/tenants.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/tenant' +require 'fog/openstack/compute/models/tenant' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Tenants < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Tenant + model Fog::OpenStack::Compute::Tenant def all load_response(service.list_tenants, 'tenants') diff --git a/lib/fog/compute/openstack/models/volume.rb b/lib/fog/openstack/compute/models/volume.rb similarity index 94% rename from lib/fog/compute/openstack/models/volume.rb rename to lib/fog/openstack/compute/models/volume.rb index cacbf5254..0ac7293d9 100644 --- a/lib/fog/compute/openstack/models/volume.rb +++ b/lib/fog/openstack/compute/models/volume.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Volume < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/volume_attachment.rb b/lib/fog/openstack/compute/models/volume_attachment.rb similarity index 85% rename from lib/fog/compute/openstack/models/volume_attachment.rb rename to lib/fog/openstack/compute/models/volume_attachment.rb index 8297bd475..41727a1f6 100644 --- a/lib/fog/compute/openstack/models/volume_attachment.rb +++ b/lib/fog/openstack/compute/models/volume_attachment.rb @@ -1,8 +1,8 @@ require 'fog/core/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class VolumeAttachment < Fog::Model identity :id diff --git a/lib/fog/compute/openstack/models/volume_attachments.rb b/lib/fog/openstack/compute/models/volume_attachments.rb similarity index 71% rename from lib/fog/compute/openstack/models/volume_attachments.rb rename to lib/fog/openstack/compute/models/volume_attachments.rb index d67f68ba5..6c5046741 100644 --- a/lib/fog/compute/openstack/models/volume_attachments.rb +++ b/lib/fog/openstack/compute/models/volume_attachments.rb @@ -1,17 +1,17 @@ require 'fog/core/collection' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class VolumeAttachments < Fog::Collection - model Fog::Compute::OpenStack::VolumeAttachment + model Fog::OpenStack::Compute::VolumeAttachment def get(server_id) if server_id puts service.list_volume_attachments(server_id).body load(service.list_volume_attachments(server_id).body['volumeAttachments']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/volumes.rb b/lib/fog/openstack/compute/models/volumes.rb similarity index 84% rename from lib/fog/compute/openstack/models/volumes.rb rename to lib/fog/openstack/compute/models/volumes.rb index 8ffee8073..843cdf6db 100644 --- a/lib/fog/compute/openstack/models/volumes.rb +++ b/lib/fog/openstack/compute/models/volumes.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/volume' +require 'fog/openstack/compute/models/volume' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Volumes < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Volume + model Fog::OpenStack::Compute::Volume def all(options = true) if !options.kind_of?(Hash) @@ -28,7 +28,7 @@ def get(volume_id) if volume = service.get_volume_details(volume_id).body['volume'] new(volume) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/requests/add_aggregate_host.rb b/lib/fog/openstack/compute/requests/add_aggregate_host.rb similarity index 95% rename from lib/fog/compute/openstack/requests/add_aggregate_host.rb rename to lib/fog/openstack/compute/requests/add_aggregate_host.rb index 8b54bce0c..6775bd6a9 100644 --- a/lib/fog/compute/openstack/requests/add_aggregate_host.rb +++ b/lib/fog/openstack/compute/requests/add_aggregate_host.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def add_aggregate_host(uuid, host_uuid) data = {'add_host' => {'host' => host_uuid}} diff --git a/lib/fog/compute/openstack/requests/add_fixed_ip.rb b/lib/fog/openstack/compute/requests/add_fixed_ip.rb similarity index 94% rename from lib/fog/compute/openstack/requests/add_fixed_ip.rb rename to lib/fog/openstack/compute/requests/add_fixed_ip.rb index db4fa8461..c3e6c4256 100644 --- a/lib/fog/compute/openstack/requests/add_fixed_ip.rb +++ b/lib/fog/openstack/compute/requests/add_fixed_ip.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Add an IP address on a network. # diff --git a/lib/fog/compute/openstack/requests/add_flavor_access.rb b/lib/fog/openstack/compute/requests/add_flavor_access.rb similarity index 95% rename from lib/fog/compute/openstack/requests/add_flavor_access.rb rename to lib/fog/openstack/compute/requests/add_flavor_access.rb index cf73ba031..bd9c14e8c 100644 --- a/lib/fog/compute/openstack/requests/add_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/add_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def add_flavor_access(flavor_ref, tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/add_security_group.rb b/lib/fog/openstack/compute/requests/add_security_group.rb similarity index 91% rename from lib/fog/compute/openstack/requests/add_security_group.rb rename to lib/fog/openstack/compute/requests/add_security_group.rb index 13133d0bb..368e57416 100644 --- a/lib/fog/compute/openstack/requests/add_security_group.rb +++ b/lib/fog/openstack/compute/requests/add_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def add_security_group(server_id, group_name) body = {'addSecurityGroup' => {"name" => group_name}} diff --git a/lib/fog/compute/openstack/requests/allocate_address.rb b/lib/fog/openstack/compute/requests/allocate_address.rb similarity index 96% rename from lib/fog/compute/openstack/requests/allocate_address.rb rename to lib/fog/openstack/compute/requests/allocate_address.rb index fdae56401..20619b639 100644 --- a/lib/fog/compute/openstack/requests/allocate_address.rb +++ b/lib/fog/openstack/compute/requests/allocate_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def allocate_address(pool = nil) request( diff --git a/lib/fog/compute/openstack/requests/associate_address.rb b/lib/fog/openstack/compute/requests/associate_address.rb similarity index 95% rename from lib/fog/compute/openstack/requests/associate_address.rb rename to lib/fog/openstack/compute/requests/associate_address.rb index 259efd117..00c69a048 100644 --- a/lib/fog/compute/openstack/requests/associate_address.rb +++ b/lib/fog/openstack/compute/requests/associate_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def associate_address(server_id, ip_address) body = {"addFloatingIp" => {"address" => ip_address}} diff --git a/lib/fog/compute/openstack/requests/attach_volume.rb b/lib/fog/openstack/compute/requests/attach_volume.rb similarity index 96% rename from lib/fog/compute/openstack/requests/attach_volume.rb rename to lib/fog/openstack/compute/requests/attach_volume.rb index 1dcb04218..186e06a32 100644 --- a/lib/fog/compute/openstack/requests/attach_volume.rb +++ b/lib/fog/openstack/compute/requests/attach_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def attach_volume(volume_id, server_id, device) data = { diff --git a/lib/fog/compute/openstack/requests/boot_from_snapshot.rb b/lib/fog/openstack/compute/requests/boot_from_snapshot.rb similarity index 97% rename from lib/fog/compute/openstack/requests/boot_from_snapshot.rb rename to lib/fog/openstack/compute/requests/boot_from_snapshot.rb index a5e3b0231..64fbed70b 100644 --- a/lib/fog/compute/openstack/requests/boot_from_snapshot.rb +++ b/lib/fog/openstack/compute/requests/boot_from_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def boot_from_snapshot(name, image_ref, flavor_ref, options = {}) data = { diff --git a/lib/fog/compute/openstack/requests/change_server_password.rb b/lib/fog/openstack/compute/requests/change_server_password.rb similarity index 92% rename from lib/fog/compute/openstack/requests/change_server_password.rb rename to lib/fog/openstack/compute/requests/change_server_password.rb index 362d6ea3a..533e0a3d3 100644 --- a/lib/fog/compute/openstack/requests/change_server_password.rb +++ b/lib/fog/openstack/compute/requests/change_server_password.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def change_server_password(server_id, admin_password) body = {'changePassword' => {'adminPass' => admin_password}} diff --git a/lib/fog/compute/openstack/requests/confirm_resize_server.rb b/lib/fog/openstack/compute/requests/confirm_resize_server.rb similarity index 91% rename from lib/fog/compute/openstack/requests/confirm_resize_server.rb rename to lib/fog/openstack/compute/requests/confirm_resize_server.rb index 56188b99e..0a202efbd 100644 --- a/lib/fog/compute/openstack/requests/confirm_resize_server.rb +++ b/lib/fog/openstack/compute/requests/confirm_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def confirm_resize_server(server_id) body = {'confirmResize' => nil} diff --git a/lib/fog/compute/openstack/requests/create_aggregate.rb b/lib/fog/openstack/compute/requests/create_aggregate.rb similarity index 96% rename from lib/fog/compute/openstack/requests/create_aggregate.rb rename to lib/fog/openstack/compute/requests/create_aggregate.rb index a1efdc594..1a023c603 100644 --- a/lib/fog/compute/openstack/requests/create_aggregate.rb +++ b/lib/fog/openstack/compute/requests/create_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_aggregate(name, options = {}) data = { diff --git a/lib/fog/compute/openstack/requests/create_flavor.rb b/lib/fog/openstack/compute/requests/create_flavor.rb similarity index 98% rename from lib/fog/compute/openstack/requests/create_flavor.rb rename to lib/fog/openstack/compute/requests/create_flavor.rb index 7d7b9bbe0..76ac3ce01 100644 --- a/lib/fog/compute/openstack/requests/create_flavor.rb +++ b/lib/fog/openstack/compute/requests/create_flavor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # PARAMETERS # # name = Name of flavor diff --git a/lib/fog/compute/openstack/requests/create_flavor_metadata.rb b/lib/fog/openstack/compute/requests/create_flavor_metadata.rb similarity index 96% rename from lib/fog/compute/openstack/requests/create_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/create_flavor_metadata.rb index acdbe91e4..5b434cfc5 100644 --- a/lib/fog/compute/openstack/requests/create_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/create_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_flavor_metadata(flavor_ref, metadata) data = { diff --git a/lib/fog/compute/openstack/requests/create_image.rb b/lib/fog/openstack/compute/requests/create_image.rb similarity index 97% rename from lib/fog/compute/openstack/requests/create_image.rb rename to lib/fog/openstack/compute/requests/create_image.rb index bf4132a61..6a8fb545a 100644 --- a/lib/fog/compute/openstack/requests/create_image.rb +++ b/lib/fog/openstack/compute/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_image(server_id, name, metadata = {}) body = {'createImage' => { diff --git a/lib/fog/compute/openstack/requests/create_key_pair.rb b/lib/fog/openstack/compute/requests/create_key_pair.rb similarity index 98% rename from lib/fog/compute/openstack/requests/create_key_pair.rb rename to lib/fog/openstack/compute/requests/create_key_pair.rb index b94d6a338..e90e0d854 100644 --- a/lib/fog/compute/openstack/requests/create_key_pair.rb +++ b/lib/fog/openstack/compute/requests/create_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_key_pair(key_name, public_key = nil, user_id = nil) data = { diff --git a/lib/fog/compute/openstack/requests/create_os_interface.rb b/lib/fog/openstack/compute/requests/create_os_interface.rb similarity index 96% rename from lib/fog/compute/openstack/requests/create_os_interface.rb rename to lib/fog/openstack/compute/requests/create_os_interface.rb index 128a18b21..b192d600a 100644 --- a/lib/fog/compute/openstack/requests/create_os_interface.rb +++ b/lib/fog/openstack/compute/requests/create_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # === Parameters # * server_id <~String> diff --git a/lib/fog/compute/openstack/requests/create_security_group.rb b/lib/fog/openstack/compute/requests/create_security_group.rb similarity index 90% rename from lib/fog/compute/openstack/requests/create_security_group.rb rename to lib/fog/openstack/compute/requests/create_security_group.rb index 01d7a348a..3c5ebef75 100644 --- a/lib/fog/compute/openstack/requests/create_security_group.rb +++ b/lib/fog/openstack/compute/requests/create_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_security_group(name, description) data = { @@ -21,8 +21,8 @@ def create_security_group(name, description) class Mock def create_security_group(name, description) - Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') - tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first + Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + tenant_id = Fog::OpenStack::Identity::V2::Mock.data[current_tenant][:tenants].keys.first security_group_id = Fog::Mock.random_numbers(2).to_i + 1 data[:security_groups][security_group_id.to_s] = { 'tenant_id' => tenant_id, diff --git a/lib/fog/compute/openstack/requests/create_security_group_rule.rb b/lib/fog/openstack/compute/requests/create_security_group_rule.rb similarity index 98% rename from lib/fog/compute/openstack/requests/create_security_group_rule.rb rename to lib/fog/openstack/compute/requests/create_security_group_rule.rb index 7a9908dbb..7d591d44a 100644 --- a/lib/fog/compute/openstack/requests/create_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/create_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id = nil) data = { diff --git a/lib/fog/compute/openstack/requests/create_server.rb b/lib/fog/openstack/compute/requests/create_server.rb similarity index 97% rename from lib/fog/compute/openstack/requests/create_server.rb rename to lib/fog/openstack/compute/requests/create_server.rb index c36d3a254..7d64f97e7 100644 --- a/lib/fog/compute/openstack/requests/create_server.rb +++ b/lib/fog/openstack/compute/requests/create_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_server(name, image_ref, flavor_ref, options = {}) data = { @@ -23,7 +23,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) # security names requires a hash with a name prefix data['server']['security_groups'] = Array(options['security_groups']).map do |sg| - name = if sg.kind_of?(Fog::Compute::OpenStack::SecurityGroup) + name = if sg.kind_of?(Fog::OpenStack::Compute::SecurityGroup) sg.name else sg @@ -94,7 +94,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) response.status = 202 server_id = Fog::Mock.random_numbers(6).to_s - identity = Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') user = identity.users.find do |u| u.name == @openstack_username end @@ -158,7 +158,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) security_groups = options['security_groups'] if security_groups groups = Array(security_groups).map do |sg| - if sg.kind_of?(Fog::Compute::OpenStack::SecurityGroup) + if sg.kind_of?(Fog::OpenStack::Compute::SecurityGroup) sg.name else sg diff --git a/lib/fog/compute/openstack/requests/create_server_group.rb b/lib/fog/openstack/compute/requests/create_server_group.rb similarity index 80% rename from lib/fog/compute/openstack/requests/create_server_group.rb rename to lib/fog/openstack/compute/requests/create_server_group.rb index 10a42b9b5..63a73591e 100644 --- a/lib/fog/compute/openstack/requests/create_server_group.rb +++ b/lib/fog/openstack/compute/requests/create_server_group.rb @@ -1,9 +1,9 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_server_group(name, policy) - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy body = {'server_group' => { 'name' => name, @@ -20,7 +20,7 @@ def create_server_group(name, policy) class Mock def create_server_group(name, policy) - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy id = SecureRandom.uuid data[:server_groups][id] = {:name => name, :policies => [policy], :members => []} get_server_group id diff --git a/lib/fog/compute/openstack/requests/create_snapshot.rb b/lib/fog/openstack/compute/requests/create_snapshot.rb similarity index 94% rename from lib/fog/compute/openstack/requests/create_snapshot.rb rename to lib/fog/openstack/compute/requests/create_snapshot.rb index c6d400b97..8df9ad038 100644 --- a/lib/fog/compute/openstack/requests/create_snapshot.rb +++ b/lib/fog/openstack/compute/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_snapshot(volume_id, name, description, force = false) data = { @@ -26,7 +26,7 @@ def create_snapshot(volume_id, name, description, _force = false) volume_response = get_volume_details(volume_id) volume = volume_response.data[:body]['volume'] if volume.nil? - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound else response = Excon::Response.new data = { diff --git a/lib/fog/compute/openstack/requests/create_volume.rb b/lib/fog/openstack/compute/requests/create_volume.rb similarity index 97% rename from lib/fog/compute/openstack/requests/create_volume.rb rename to lib/fog/openstack/compute/requests/create_volume.rb index 4d39fde7c..d90d439eb 100644 --- a/lib/fog/compute/openstack/requests/create_volume.rb +++ b/lib/fog/openstack/compute/requests/create_volume.rb @@ -1,7 +1,7 @@ # module Fog - module Compute - class OpenStack + module OpenStack + class Compute # class Real def create_volume(name, description, size, options = {}) diff --git a/lib/fog/compute/openstack/requests/delete_aggregate.rb b/lib/fog/openstack/compute/requests/delete_aggregate.rb similarity index 94% rename from lib/fog/compute/openstack/requests/delete_aggregate.rb rename to lib/fog/openstack/compute/requests/delete_aggregate.rb index e878ec6ee..fbd6ee4f1 100644 --- a/lib/fog/compute/openstack/requests/delete_aggregate.rb +++ b/lib/fog/openstack/compute/requests/delete_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_aggregate(uuid) request( diff --git a/lib/fog/compute/openstack/requests/delete_flavor.rb b/lib/fog/openstack/compute/requests/delete_flavor.rb similarity index 94% rename from lib/fog/compute/openstack/requests/delete_flavor.rb rename to lib/fog/openstack/compute/requests/delete_flavor.rb index 260c800c4..8cb4b2aa1 100644 --- a/lib/fog/compute/openstack/requests/delete_flavor.rb +++ b/lib/fog/openstack/compute/requests/delete_flavor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_flavor(flavor_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_flavor_metadata.rb b/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/delete_flavor_metadata.rb index fbb88dbb8..609147148 100644 --- a/lib/fog/compute/openstack/requests/delete_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_flavor_metadata(flavor_ref, key) request( diff --git a/lib/fog/compute/openstack/requests/delete_image.rb b/lib/fog/openstack/compute/requests/delete_image.rb similarity index 96% rename from lib/fog/compute/openstack/requests/delete_image.rb rename to lib/fog/openstack/compute/requests/delete_image.rb index 5b21ac423..c5841497c 100644 --- a/lib/fog/compute/openstack/requests/delete_image.rb +++ b/lib/fog/openstack/compute/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_image(image_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_key_pair.rb b/lib/fog/openstack/compute/requests/delete_key_pair.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_key_pair.rb rename to lib/fog/openstack/compute/requests/delete_key_pair.rb index 7b5e8568c..c39152ed3 100644 --- a/lib/fog/compute/openstack/requests/delete_key_pair.rb +++ b/lib/fog/openstack/compute/requests/delete_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_key_pair(key_name, user_id = nil) options = {} diff --git a/lib/fog/compute/openstack/requests/delete_meta.rb b/lib/fog/openstack/compute/requests/delete_meta.rb similarity index 85% rename from lib/fog/compute/openstack/requests/delete_meta.rb rename to lib/fog/openstack/compute/requests/delete_meta.rb index a0ce4f837..cc7fdf007 100644 --- a/lib/fog/compute/openstack/requests/delete_meta.rb +++ b/lib/fog/openstack/compute/requests/delete_meta.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_meta(collection_name, parent_id, key) request( @@ -15,13 +15,13 @@ class Mock def delete_meta(collection_name, parent_id, _key) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/delete_metadata.rb b/lib/fog/openstack/compute/requests/delete_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/delete_metadata.rb rename to lib/fog/openstack/compute/requests/delete_metadata.rb index cc3d9960b..0dd71329e 100644 --- a/lib/fog/compute/openstack/requests/delete_metadata.rb +++ b/lib/fog/openstack/compute/requests/delete_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_metadata(collection_name, parent_id, key) request( diff --git a/lib/fog/compute/openstack/requests/delete_os_interface.rb b/lib/fog/openstack/compute/requests/delete_os_interface.rb similarity index 92% rename from lib/fog/compute/openstack/requests/delete_os_interface.rb rename to lib/fog/openstack/compute/requests/delete_os_interface.rb index f5a053ae7..c70ded8ca 100644 --- a/lib/fog/compute/openstack/requests/delete_os_interface.rb +++ b/lib/fog/openstack/compute/requests/delete_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # === Parameters # * server_id <~String> diff --git a/lib/fog/compute/openstack/requests/delete_security_group.rb b/lib/fog/openstack/compute/requests/delete_security_group.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_security_group.rb rename to lib/fog/openstack/compute/requests/delete_security_group.rb index f25801011..aed82769c 100644 --- a/lib/fog/compute/openstack/requests/delete_security_group.rb +++ b/lib/fog/openstack/compute/requests/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_security_group(security_group_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_security_group_rule.rb b/lib/fog/openstack/compute/requests/delete_security_group_rule.rb similarity index 96% rename from lib/fog/compute/openstack/requests/delete_security_group_rule.rb rename to lib/fog/openstack/compute/requests/delete_security_group_rule.rb index c6bf309ad..751fa8f67 100644 --- a/lib/fog/compute/openstack/requests/delete_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/delete_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_security_group_rule(security_group_rule_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_server.rb b/lib/fog/openstack/compute/requests/delete_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/delete_server.rb rename to lib/fog/openstack/compute/requests/delete_server.rb index dd2087ab6..9a7a381d2 100644 --- a/lib/fog/compute/openstack/requests/delete_server.rb +++ b/lib/fog/openstack/compute/requests/delete_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_server(server_id) request( @@ -31,7 +31,7 @@ def delete_server(server_id) end response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/delete_server_group.rb b/lib/fog/openstack/compute/requests/delete_server_group.rb similarity index 94% rename from lib/fog/compute/openstack/requests/delete_server_group.rb rename to lib/fog/openstack/compute/requests/delete_server_group.rb index 26a4ade92..0e4212a0c 100644 --- a/lib/fog/compute/openstack/requests/delete_server_group.rb +++ b/lib/fog/openstack/compute/requests/delete_server_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_server_group(group_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_service.rb b/lib/fog/openstack/compute/requests/delete_service.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_service.rb rename to lib/fog/openstack/compute/requests/delete_service.rb index 24cfa4887..6193a3da9 100644 --- a/lib/fog/compute/openstack/requests/delete_service.rb +++ b/lib/fog/openstack/compute/requests/delete_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_service(uuid, optional_params = nil) # Encode all params diff --git a/lib/fog/compute/openstack/requests/delete_snapshot.rb b/lib/fog/openstack/compute/requests/delete_snapshot.rb similarity index 87% rename from lib/fog/compute/openstack/requests/delete_snapshot.rb rename to lib/fog/openstack/compute/requests/delete_snapshot.rb index 495264e2c..76877e107 100644 --- a/lib/fog/compute/openstack/requests/delete_snapshot.rb +++ b/lib/fog/openstack/compute/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_snapshot(snapshot_id) request( @@ -18,7 +18,7 @@ def delete_snapshot(snapshot_id) if list_snapshots_detail.body['snapshots'].find { |snap| snap['id'] == snapshot_id } data[:snapshots].delete(snapshot_id) else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end response end diff --git a/lib/fog/compute/openstack/requests/delete_volume.rb b/lib/fog/openstack/compute/requests/delete_volume.rb similarity index 86% rename from lib/fog/compute/openstack/requests/delete_volume.rb rename to lib/fog/openstack/compute/requests/delete_volume.rb index 24bd64ffc..405aa85d4 100644 --- a/lib/fog/compute/openstack/requests/delete_volume.rb +++ b/lib/fog/openstack/compute/requests/delete_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_volume(volume_id) request( @@ -19,7 +19,7 @@ def delete_volume(volume_id) response.status = 204 response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/detach_volume.rb b/lib/fog/openstack/compute/requests/detach_volume.rb similarity index 89% rename from lib/fog/compute/openstack/requests/detach_volume.rb rename to lib/fog/openstack/compute/requests/detach_volume.rb index 908023ef0..696ad3c85 100644 --- a/lib/fog/compute/openstack/requests/detach_volume.rb +++ b/lib/fog/openstack/compute/requests/detach_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def detach_volume(server_id, attachment_id) request( @@ -20,7 +20,7 @@ def detach_volume(server_id, attachment_id) response.status = 202 response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/disable_service.rb b/lib/fog/openstack/compute/requests/disable_service.rb similarity index 96% rename from lib/fog/compute/openstack/requests/disable_service.rb rename to lib/fog/openstack/compute/requests/disable_service.rb index 6dea8df79..cc20f0e4f 100644 --- a/lib/fog/compute/openstack/requests/disable_service.rb +++ b/lib/fog/openstack/compute/requests/disable_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def disable_service(host, binary, optional_params = nil) data = {"host" => host, "binary" => binary} diff --git a/lib/fog/compute/openstack/requests/disable_service_log_reason.rb b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb similarity index 96% rename from lib/fog/compute/openstack/requests/disable_service_log_reason.rb rename to lib/fog/openstack/compute/requests/disable_service_log_reason.rb index e462c5e6a..c18c834f6 100644 --- a/lib/fog/compute/openstack/requests/disable_service_log_reason.rb +++ b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def disable_service_log_reason(host, binary, disabled_reason, optional_params = nil) data = {"host" => host, "binary" => binary, "disabled_reason" => disabled_reason} diff --git a/lib/fog/compute/openstack/requests/disassociate_address.rb b/lib/fog/openstack/compute/requests/disassociate_address.rb similarity index 94% rename from lib/fog/compute/openstack/requests/disassociate_address.rb rename to lib/fog/openstack/compute/requests/disassociate_address.rb index a11bac537..7ec15b304 100644 --- a/lib/fog/compute/openstack/requests/disassociate_address.rb +++ b/lib/fog/openstack/compute/requests/disassociate_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def disassociate_address(server_id, ip_address) body = {"removeFloatingIp" => {"address" => ip_address}} diff --git a/lib/fog/compute/openstack/requests/enable_service.rb b/lib/fog/openstack/compute/requests/enable_service.rb similarity index 96% rename from lib/fog/compute/openstack/requests/enable_service.rb rename to lib/fog/openstack/compute/requests/enable_service.rb index bbdec5dba..cc146268c 100644 --- a/lib/fog/compute/openstack/requests/enable_service.rb +++ b/lib/fog/openstack/compute/requests/enable_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def enable_service(host, binary, optional_params = nil) data = {"host" => host, "binary" => binary} diff --git a/lib/fog/compute/openstack/requests/evacuate_server.rb b/lib/fog/openstack/compute/requests/evacuate_server.rb similarity index 95% rename from lib/fog/compute/openstack/requests/evacuate_server.rb rename to lib/fog/openstack/compute/requests/evacuate_server.rb index 9efcc43c2..87017d0e1 100644 --- a/lib/fog/compute/openstack/requests/evacuate_server.rb +++ b/lib/fog/openstack/compute/requests/evacuate_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_password = nil) evacuate = {} diff --git a/lib/fog/compute/openstack/requests/get_address.rb b/lib/fog/openstack/compute/requests/get_address.rb similarity index 96% rename from lib/fog/compute/openstack/requests/get_address.rb rename to lib/fog/openstack/compute/requests/get_address.rb index 19debb1fa..14e1d4bdf 100644 --- a/lib/fog/compute/openstack/requests/get_address.rb +++ b/lib/fog/openstack/compute/requests/get_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_address(address_id) request( diff --git a/lib/fog/compute/openstack/requests/get_aggregate.rb b/lib/fog/openstack/compute/requests/get_aggregate.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_aggregate.rb rename to lib/fog/openstack/compute/requests/get_aggregate.rb index 5dba4fde4..be3589855 100644 --- a/lib/fog/compute/openstack/requests/get_aggregate.rb +++ b/lib/fog/openstack/compute/requests/get_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_aggregate(uuid) request( diff --git a/lib/fog/compute/openstack/requests/get_console_output.rb b/lib/fog/openstack/compute/requests/get_console_output.rb similarity index 92% rename from lib/fog/compute/openstack/requests/get_console_output.rb rename to lib/fog/openstack/compute/requests/get_console_output.rb index f0b666a32..a29da59b2 100644 --- a/lib/fog/compute/openstack/requests/get_console_output.rb +++ b/lib/fog/openstack/compute/requests/get_console_output.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_console_output(server_id, log_length) body = { diff --git a/lib/fog/compute/openstack/requests/get_flavor_details.rb b/lib/fog/openstack/compute/requests/get_flavor_details.rb similarity index 95% rename from lib/fog/compute/openstack/requests/get_flavor_details.rb rename to lib/fog/openstack/compute/requests/get_flavor_details.rb index fd94fd0ed..0d7b45309 100644 --- a/lib/fog/compute/openstack/requests/get_flavor_details.rb +++ b/lib/fog/openstack/compute/requests/get_flavor_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_flavor_details(flavor_ref) request( @@ -30,7 +30,7 @@ def get_flavor_details(flavor_ref) } response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_flavor_metadata.rb b/lib/fog/openstack/compute/requests/get_flavor_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/get_flavor_metadata.rb index e54f4337d..6aab20b3b 100644 --- a/lib/fog/compute/openstack/requests/get_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/get_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_flavor_metadata(flavor_ref) request( diff --git a/lib/fog/compute/openstack/requests/get_host_details.rb b/lib/fog/openstack/compute/requests/get_host_details.rb similarity index 97% rename from lib/fog/compute/openstack/requests/get_host_details.rb rename to lib/fog/openstack/compute/requests/get_host_details.rb index ca43d14b1..7441bf711 100644 --- a/lib/fog/compute/openstack/requests/get_host_details.rb +++ b/lib/fog/openstack/compute/requests/get_host_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_host_details(host) request( diff --git a/lib/fog/compute/openstack/requests/get_hypervisor.rb b/lib/fog/openstack/compute/requests/get_hypervisor.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_hypervisor.rb rename to lib/fog/openstack/compute/requests/get_hypervisor.rb index 7834d5a0e..0358dd704 100644 --- a/lib/fog/compute/openstack/requests/get_hypervisor.rb +++ b/lib/fog/openstack/compute/requests/get_hypervisor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_hypervisor(hypervisor_id) request( diff --git a/lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb b/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb similarity index 96% rename from lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb rename to lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb index 130f0c4fa..511880b83 100644 --- a/lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb +++ b/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_hypervisor_statistics(_tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/get_image_details.rb b/lib/fog/openstack/compute/requests/get_image_details.rb similarity index 87% rename from lib/fog/compute/openstack/requests/get_image_details.rb rename to lib/fog/openstack/compute/requests/get_image_details.rb index cbb49670b..aa27f8ef8 100644 --- a/lib/fog/compute/openstack/requests/get_image_details.rb +++ b/lib/fog/openstack/compute/requests/get_image_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_image_details(image_id) request( @@ -20,7 +20,7 @@ def get_image_details(image_id) response.body = {'image' => image} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_key_pair.rb b/lib/fog/openstack/compute/requests/get_key_pair.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_key_pair.rb rename to lib/fog/openstack/compute/requests/get_key_pair.rb index 22710a658..46361d6c5 100644 --- a/lib/fog/compute/openstack/requests/get_key_pair.rb +++ b/lib/fog/openstack/compute/requests/get_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_key_pair(key_name) request( diff --git a/lib/fog/compute/openstack/requests/get_limits.rb b/lib/fog/openstack/compute/requests/get_limits.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_limits.rb rename to lib/fog/openstack/compute/requests/get_limits.rb index 5dd7e8fd1..cb8c0bc74 100644 --- a/lib/fog/compute/openstack/requests/get_limits.rb +++ b/lib/fog/openstack/compute/requests/get_limits.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute # http://developer.openstack.org/api-ref-compute-v2.1.html#showlimits class Real diff --git a/lib/fog/compute/openstack/requests/get_metadata.rb b/lib/fog/openstack/compute/requests/get_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_metadata.rb rename to lib/fog/openstack/compute/requests/get_metadata.rb index 52db21f05..9f7c37094 100644 --- a/lib/fog/compute/openstack/requests/get_metadata.rb +++ b/lib/fog/openstack/compute/requests/get_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_metadata(collection_name, parent_id, key) request( diff --git a/lib/fog/compute/openstack/requests/get_os_interface.rb b/lib/fog/openstack/compute/requests/get_os_interface.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_os_interface.rb rename to lib/fog/openstack/compute/requests/get_os_interface.rb index d6697fa09..424fca7a9 100644 --- a/lib/fog/compute/openstack/requests/get_os_interface.rb +++ b/lib/fog/openstack/compute/requests/get_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_os_interface(server_id,port_id) request( diff --git a/lib/fog/compute/openstack/requests/get_quota.rb b/lib/fog/openstack/compute/requests/get_quota.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_quota.rb rename to lib/fog/openstack/compute/requests/get_quota.rb index a1a716924..94c5caa01 100644 --- a/lib/fog/compute/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/compute/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_quota(tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/get_quota_defaults.rb b/lib/fog/openstack/compute/requests/get_quota_defaults.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_quota_defaults.rb rename to lib/fog/openstack/compute/requests/get_quota_defaults.rb index 1cf1ace87..9469b2c0f 100644 --- a/lib/fog/compute/openstack/requests/get_quota_defaults.rb +++ b/lib/fog/openstack/compute/requests/get_quota_defaults.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_quota_defaults(tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/get_security_group.rb b/lib/fog/openstack/compute/requests/get_security_group.rb similarity index 90% rename from lib/fog/compute/openstack/requests/get_security_group.rb rename to lib/fog/openstack/compute/requests/get_security_group.rb index e82139a8f..7641bd5db 100644 --- a/lib/fog/compute/openstack/requests/get_security_group.rb +++ b/lib/fog/openstack/compute/requests/get_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_security_group(security_group_id) request( @@ -27,7 +27,7 @@ def get_security_group(security_group_id) "security_group" => security_group } else - raise Fog::Compute::OpenStack::NotFound, "Security group #{security_group_id} does not exist" + raise Fog::OpenStack::Compute::NotFound, "Security group #{security_group_id} does not exist" end response end diff --git a/lib/fog/compute/openstack/requests/get_security_group_rule.rb b/lib/fog/openstack/compute/requests/get_security_group_rule.rb similarity index 92% rename from lib/fog/compute/openstack/requests/get_security_group_rule.rb rename to lib/fog/openstack/compute/requests/get_security_group_rule.rb index 738eec005..ee52de5fd 100644 --- a/lib/fog/compute/openstack/requests/get_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/get_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_security_group_rule(security_group_rule_id) request( @@ -28,7 +28,7 @@ def get_security_group_rule(security_group_rule_id) "security_group_rule" => security_group_rule } else - raise Fog::Compute::OpenStack::NotFound, "Security group rule #{security_group_rule_id} does not exist" + raise Fog::OpenStack::Compute::NotFound, "Security group rule #{security_group_rule_id} does not exist" end response end diff --git a/lib/fog/compute/openstack/requests/get_server_details.rb b/lib/fog/openstack/compute/requests/get_server_details.rb similarity index 87% rename from lib/fog/compute/openstack/requests/get_server_details.rb rename to lib/fog/openstack/compute/requests/get_server_details.rb index 6a732aad4..28b1405e2 100644 --- a/lib/fog/compute/openstack/requests/get_server_details.rb +++ b/lib/fog/openstack/compute/requests/get_server_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_details(server_id) request( @@ -20,7 +20,7 @@ def get_server_details(server_id) response.body = {'server' => server} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_server_group.rb b/lib/fog/openstack/compute/requests/get_server_group.rb similarity index 96% rename from lib/fog/compute/openstack/requests/get_server_group.rb rename to lib/fog/openstack/compute/requests/get_server_group.rb index df89e5a57..8ebb01cfa 100644 --- a/lib/fog/compute/openstack/requests/get_server_group.rb +++ b/lib/fog/openstack/compute/requests/get_server_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_group(group_id) request( diff --git a/lib/fog/compute/openstack/requests/get_server_password.rb b/lib/fog/openstack/compute/requests/get_server_password.rb similarity index 88% rename from lib/fog/compute/openstack/requests/get_server_password.rb rename to lib/fog/openstack/compute/requests/get_server_password.rb index aebf0ec87..2496f0f10 100644 --- a/lib/fog/compute/openstack/requests/get_server_password.rb +++ b/lib/fog/openstack/compute/requests/get_server_password.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_password(server_id) request( @@ -20,7 +20,7 @@ def get_server_password(server_id) response.body = {'server' => server} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_server_volumes.rb b/lib/fog/openstack/compute/requests/get_server_volumes.rb similarity index 95% rename from lib/fog/compute/openstack/requests/get_server_volumes.rb rename to lib/fog/openstack/compute/requests/get_server_volumes.rb index 0f2117dfb..8322b6709 100644 --- a/lib/fog/compute/openstack/requests/get_server_volumes.rb +++ b/lib/fog/openstack/compute/requests/get_server_volumes.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_volumes(server_id) request( diff --git a/lib/fog/compute/openstack/requests/get_snapshot_details.rb b/lib/fog/openstack/compute/requests/get_snapshot_details.rb similarity index 88% rename from lib/fog/compute/openstack/requests/get_snapshot_details.rb rename to lib/fog/openstack/compute/requests/get_snapshot_details.rb index 0ab0c58df..3ec669e6f 100644 --- a/lib/fog/compute/openstack/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/compute/requests/get_snapshot_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_snapshot_details(snapshot_id) request( @@ -21,7 +21,7 @@ def get_snapshot_details(snapshot_id) response.body = {'snapshot' => snapshot} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_usage.rb b/lib/fog/openstack/compute/requests/get_usage.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_usage.rb rename to lib/fog/openstack/compute/requests/get_usage.rb index 5f7908b3f..71428bc6c 100644 --- a/lib/fog/compute/openstack/requests/get_usage.rb +++ b/lib/fog/openstack/compute/requests/get_usage.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_usage(tenant_id, date_start, date_end) params = {} diff --git a/lib/fog/compute/openstack/requests/get_vnc_console.rb b/lib/fog/openstack/compute/requests/get_vnc_console.rb similarity index 97% rename from lib/fog/compute/openstack/requests/get_vnc_console.rb rename to lib/fog/openstack/compute/requests/get_vnc_console.rb index 01e4c3f71..22b387e28 100644 --- a/lib/fog/compute/openstack/requests/get_vnc_console.rb +++ b/lib/fog/openstack/compute/requests/get_vnc_console.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Get a vnc console for an instance. # For microversion < 2.6 as it has been replaced with remote-consoles diff --git a/lib/fog/compute/openstack/requests/get_volume_details.rb b/lib/fog/openstack/compute/requests/get_volume_details.rb similarity index 89% rename from lib/fog/compute/openstack/requests/get_volume_details.rb rename to lib/fog/openstack/compute/requests/get_volume_details.rb index 560290e0f..f7ee4eb4f 100644 --- a/lib/fog/compute/openstack/requests/get_volume_details.rb +++ b/lib/fog/openstack/compute/requests/get_volume_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_volume_details(volume_id) request( @@ -23,7 +23,7 @@ def get_volume_details(volume_id) response.body = {'volume' => data} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_address_pools.rb b/lib/fog/openstack/compute/requests/list_address_pools.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_address_pools.rb rename to lib/fog/openstack/compute/requests/list_address_pools.rb index 961142b4f..f8998cef3 100644 --- a/lib/fog/compute/openstack/requests/list_address_pools.rb +++ b/lib/fog/openstack/compute/requests/list_address_pools.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_address_pools request( diff --git a/lib/fog/compute/openstack/requests/list_addresses.rb b/lib/fog/openstack/compute/requests/list_addresses.rb similarity index 87% rename from lib/fog/compute/openstack/requests/list_addresses.rb rename to lib/fog/openstack/compute/requests/list_addresses.rb index 994787fb6..1428dc754 100644 --- a/lib/fog/compute/openstack/requests/list_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_addresses(server_id) response.body = {'addresses' => server['addresses']} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_aggregates.rb b/lib/fog/openstack/compute/requests/list_aggregates.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_aggregates.rb rename to lib/fog/openstack/compute/requests/list_aggregates.rb index 2e4dcee21..97c78a034 100644 --- a/lib/fog/compute/openstack/requests/list_aggregates.rb +++ b/lib/fog/openstack/compute/requests/list_aggregates.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_aggregates(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_all_addresses.rb b/lib/fog/openstack/compute/requests/list_all_addresses.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_all_addresses.rb rename to lib/fog/openstack/compute/requests/list_all_addresses.rb index 9c77b74ff..bce5aaf68 100644 --- a/lib/fog/compute/openstack/requests/list_all_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_all_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_all_addresses(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_availability_zones.rb b/lib/fog/openstack/compute/requests/list_availability_zones.rb similarity index 91% rename from lib/fog/compute/openstack/requests/list_availability_zones.rb rename to lib/fog/openstack/compute/requests/list_availability_zones.rb index 274026ae5..c069a6a8c 100644 --- a/lib/fog/compute/openstack/requests/list_availability_zones.rb +++ b/lib/fog/openstack/compute/requests/list_availability_zones.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_availability_zones(options = {}) params = options diff --git a/lib/fog/compute/openstack/requests/list_flavors.rb b/lib/fog/openstack/compute/requests/list_flavors.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_flavors.rb rename to lib/fog/openstack/compute/requests/list_flavors.rb index d8b5d3949..906733b9b 100644 --- a/lib/fog/compute/openstack/requests/list_flavors.rb +++ b/lib/fog/openstack/compute/requests/list_flavors.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_flavors(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_flavors_detail.rb b/lib/fog/openstack/compute/requests/list_flavors_detail.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_flavors_detail.rb rename to lib/fog/openstack/compute/requests/list_flavors_detail.rb index 67ea9e78b..33d1b648c 100644 --- a/lib/fog/compute/openstack/requests/list_flavors_detail.rb +++ b/lib/fog/openstack/compute/requests/list_flavors_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_flavors_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hosts.rb b/lib/fog/openstack/compute/requests/list_hosts.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_hosts.rb rename to lib/fog/openstack/compute/requests/list_hosts.rb index 0f7c4d50b..263368a36 100644 --- a/lib/fog/compute/openstack/requests/list_hosts.rb +++ b/lib/fog/openstack/compute/requests/list_hosts.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hosts(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hypervisor_servers.rb b/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_hypervisor_servers.rb rename to lib/fog/openstack/compute/requests/list_hypervisor_servers.rb index 926def05f..2e704033c 100644 --- a/lib/fog/compute/openstack/requests/list_hypervisor_servers.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hypervisor_servers(hypervisor_id, options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hypervisors.rb b/lib/fog/openstack/compute/requests/list_hypervisors.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_hypervisors.rb rename to lib/fog/openstack/compute/requests/list_hypervisors.rb index ed07af72a..cab7a5813 100644 --- a/lib/fog/compute/openstack/requests/list_hypervisors.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisors.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hypervisors(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hypervisors_detail.rb b/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_hypervisors_detail.rb rename to lib/fog/openstack/compute/requests/list_hypervisors_detail.rb index 3d1a1ac0a..5840e4ab6 100644 --- a/lib/fog/compute/openstack/requests/list_hypervisors_detail.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hypervisors_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_images.rb b/lib/fog/openstack/compute/requests/list_images.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_images.rb rename to lib/fog/openstack/compute/requests/list_images.rb index cd467014d..f3faa629e 100644 --- a/lib/fog/compute/openstack/requests/list_images.rb +++ b/lib/fog/openstack/compute/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_images request( diff --git a/lib/fog/compute/openstack/requests/list_images_detail.rb b/lib/fog/openstack/compute/requests/list_images_detail.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_images_detail.rb rename to lib/fog/openstack/compute/requests/list_images_detail.rb index 9e43ebb65..2884a3956 100644 --- a/lib/fog/compute/openstack/requests/list_images_detail.rb +++ b/lib/fog/openstack/compute/requests/list_images_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_images_detail(filters = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_key_pairs.rb b/lib/fog/openstack/compute/requests/list_key_pairs.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_key_pairs.rb rename to lib/fog/openstack/compute/requests/list_key_pairs.rb index 99861421c..40a6cce4e 100644 --- a/lib/fog/compute/openstack/requests/list_key_pairs.rb +++ b/lib/fog/openstack/compute/requests/list_key_pairs.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_key_pairs(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_metadata.rb b/lib/fog/openstack/compute/requests/list_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_metadata.rb rename to lib/fog/openstack/compute/requests/list_metadata.rb index b1c1a82ae..ea81fe543 100644 --- a/lib/fog/compute/openstack/requests/list_metadata.rb +++ b/lib/fog/openstack/compute/requests/list_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_metadata(collection_name, parent_id) request( diff --git a/lib/fog/compute/openstack/requests/list_os_interfaces.rb b/lib/fog/openstack/compute/requests/list_os_interfaces.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_os_interfaces.rb rename to lib/fog/openstack/compute/requests/list_os_interfaces.rb index 06fa5948b..5e861e098 100644 --- a/lib/fog/compute/openstack/requests/list_os_interfaces.rb +++ b/lib/fog/openstack/compute/requests/list_os_interfaces.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_os_interfaces(server_id) request( diff --git a/lib/fog/compute/openstack/requests/list_private_addresses.rb b/lib/fog/openstack/compute/requests/list_private_addresses.rb similarity index 88% rename from lib/fog/compute/openstack/requests/list_private_addresses.rb rename to lib/fog/openstack/compute/requests/list_private_addresses.rb index ef0c7033e..bc6787503 100644 --- a/lib/fog/compute/openstack/requests/list_private_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_private_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_private_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_private_addresses(server_id) response.body = {'private' => server['addresses']['private']} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_public_addresses.rb b/lib/fog/openstack/compute/requests/list_public_addresses.rb similarity index 88% rename from lib/fog/compute/openstack/requests/list_public_addresses.rb rename to lib/fog/openstack/compute/requests/list_public_addresses.rb index c662f6991..ccc2f0260 100644 --- a/lib/fog/compute/openstack/requests/list_public_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_public_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_public_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_public_addresses(server_id) response.body = {'public' => server['addresses']['public']} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_security_groups.rb b/lib/fog/openstack/compute/requests/list_security_groups.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_security_groups.rb rename to lib/fog/openstack/compute/requests/list_security_groups.rb index 1c0dc2a34..f5db8f0d8 100644 --- a/lib/fog/compute/openstack/requests/list_security_groups.rb +++ b/lib/fog/openstack/compute/requests/list_security_groups.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_security_groups(options = {}) path = "os-security-groups" diff --git a/lib/fog/compute/openstack/requests/list_server_groups.rb b/lib/fog/openstack/compute/requests/list_server_groups.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_server_groups.rb rename to lib/fog/openstack/compute/requests/list_server_groups.rb index a69cbd163..642552012 100644 --- a/lib/fog/compute/openstack/requests/list_server_groups.rb +++ b/lib/fog/openstack/compute/requests/list_server_groups.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_server_groups(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_servers.rb b/lib/fog/openstack/compute/requests/list_servers.rb similarity index 95% rename from lib/fog/compute/openstack/requests/list_servers.rb rename to lib/fog/openstack/compute/requests/list_servers.rb index 23df0ea3b..7f8ddddd4 100644 --- a/lib/fog/compute/openstack/requests/list_servers.rb +++ b/lib/fog/openstack/compute/requests/list_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_servers(options = {}) params = options.dup diff --git a/lib/fog/compute/openstack/requests/list_servers_detail.rb b/lib/fog/openstack/compute/requests/list_servers_detail.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_servers_detail.rb rename to lib/fog/openstack/compute/requests/list_servers_detail.rb index e4e4be2ab..0210db8b1 100644 --- a/lib/fog/compute/openstack/requests/list_servers_detail.rb +++ b/lib/fog/openstack/compute/requests/list_servers_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Available filters: name, status, image, flavor, changes_since, reservation_id def list_servers_detail(options = {}) diff --git a/lib/fog/compute/openstack/requests/list_services.rb b/lib/fog/openstack/compute/requests/list_services.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_services.rb rename to lib/fog/openstack/compute/requests/list_services.rb index 74156035e..289d305b6 100644 --- a/lib/fog/compute/openstack/requests/list_services.rb +++ b/lib/fog/openstack/compute/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_services(parameters = nil) request( diff --git a/lib/fog/compute/openstack/requests/list_snapshots.rb b/lib/fog/openstack/compute/requests/list_snapshots.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_snapshots.rb rename to lib/fog/openstack/compute/requests/list_snapshots.rb index f96824f89..9933f80d6 100644 --- a/lib/fog/compute/openstack/requests/list_snapshots.rb +++ b/lib/fog/openstack/compute/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_snapshots(options = true) if options.kind_of?(Hash) diff --git a/lib/fog/compute/openstack/requests/list_snapshots_detail.rb b/lib/fog/openstack/compute/requests/list_snapshots_detail.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_snapshots_detail.rb rename to lib/fog/openstack/compute/requests/list_snapshots_detail.rb index 2bf652454..5acd89803 100644 --- a/lib/fog/compute/openstack/requests/list_snapshots_detail.rb +++ b/lib/fog/openstack/compute/requests/list_snapshots_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_snapshots_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb b/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb rename to lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb index deb7e3cd9..63dc99015 100644 --- a/lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_tenants_with_flavor_access(flavor_ref) request( diff --git a/lib/fog/compute/openstack/requests/list_usages.rb b/lib/fog/openstack/compute/requests/list_usages.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_usages.rb rename to lib/fog/openstack/compute/requests/list_usages.rb index f4d2d7150..aeac14242 100644 --- a/lib/fog/compute/openstack/requests/list_usages.rb +++ b/lib/fog/openstack/compute/requests/list_usages.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_usages(date_start = nil, date_end = nil, detailed = false) params = {} diff --git a/lib/fog/compute/openstack/requests/list_volume_attachments.rb b/lib/fog/openstack/compute/requests/list_volume_attachments.rb similarity index 95% rename from lib/fog/compute/openstack/requests/list_volume_attachments.rb rename to lib/fog/openstack/compute/requests/list_volume_attachments.rb index 3e7f4122c..21bc0298a 100644 --- a/lib/fog/compute/openstack/requests/list_volume_attachments.rb +++ b/lib/fog/openstack/compute/requests/list_volume_attachments.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_volume_attachments(server_id) request( diff --git a/lib/fog/compute/openstack/requests/list_volumes.rb b/lib/fog/openstack/compute/requests/list_volumes.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_volumes.rb rename to lib/fog/openstack/compute/requests/list_volumes.rb index 91cdd6e88..dacd8aa66 100644 --- a/lib/fog/compute/openstack/requests/list_volumes.rb +++ b/lib/fog/openstack/compute/requests/list_volumes.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_volumes(options = true) if options.kind_of?(Hash) diff --git a/lib/fog/compute/openstack/requests/list_volumes_detail.rb b/lib/fog/openstack/compute/requests/list_volumes_detail.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_volumes_detail.rb rename to lib/fog/openstack/compute/requests/list_volumes_detail.rb index 8fbb044dc..29316eaf6 100644 --- a/lib/fog/compute/openstack/requests/list_volumes_detail.rb +++ b/lib/fog/openstack/compute/requests/list_volumes_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_volumes_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_zones.rb b/lib/fog/openstack/compute/requests/list_zones.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_zones.rb rename to lib/fog/openstack/compute/requests/list_zones.rb index f1971c735..50a084be9 100644 --- a/lib/fog/compute/openstack/requests/list_zones.rb +++ b/lib/fog/openstack/compute/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_zones(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_zones_detailed.rb b/lib/fog/openstack/compute/requests/list_zones_detailed.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_zones_detailed.rb rename to lib/fog/openstack/compute/requests/list_zones_detailed.rb index 754f82861..375f70d03 100644 --- a/lib/fog/compute/openstack/requests/list_zones_detailed.rb +++ b/lib/fog/openstack/compute/requests/list_zones_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_zones_detailed(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/live_migrate_server.rb b/lib/fog/openstack/compute/requests/live_migrate_server.rb similarity index 94% rename from lib/fog/compute/openstack/requests/live_migrate_server.rb rename to lib/fog/openstack/compute/requests/live_migrate_server.rb index 26bbfe14e..e749a7632 100644 --- a/lib/fog/compute/openstack/requests/live_migrate_server.rb +++ b/lib/fog/openstack/compute/requests/live_migrate_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def live_migrate_server(server_id, host, block_migration, disk_over_commit) body = { diff --git a/lib/fog/compute/openstack/requests/migrate_server.rb b/lib/fog/openstack/compute/requests/migrate_server.rb similarity index 90% rename from lib/fog/compute/openstack/requests/migrate_server.rb rename to lib/fog/openstack/compute/requests/migrate_server.rb index 909d95a10..a4c61fb9a 100644 --- a/lib/fog/compute/openstack/requests/migrate_server.rb +++ b/lib/fog/openstack/compute/requests/migrate_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def migrate_server(server_id) body = {'migrate' => nil} diff --git a/lib/fog/compute/openstack/requests/pause_server.rb b/lib/fog/openstack/compute/requests/pause_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/pause_server.rb rename to lib/fog/openstack/compute/requests/pause_server.rb index a5b8bab7f..77a02c04e 100644 --- a/lib/fog/compute/openstack/requests/pause_server.rb +++ b/lib/fog/openstack/compute/requests/pause_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Pause the server. # diff --git a/lib/fog/compute/openstack/requests/reboot_server.rb b/lib/fog/openstack/compute/requests/reboot_server.rb similarity index 91% rename from lib/fog/compute/openstack/requests/reboot_server.rb rename to lib/fog/openstack/compute/requests/reboot_server.rb index 30cf812d7..8ed24c712 100644 --- a/lib/fog/compute/openstack/requests/reboot_server.rb +++ b/lib/fog/openstack/compute/requests/reboot_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def reboot_server(server_id, type = 'SOFT') body = {'reboot' => {'type' => type}} diff --git a/lib/fog/compute/openstack/requests/rebuild_server.rb b/lib/fog/openstack/compute/requests/rebuild_server.rb similarity index 96% rename from lib/fog/compute/openstack/requests/rebuild_server.rb rename to lib/fog/openstack/compute/requests/rebuild_server.rb index b519620c3..43adb63ec 100644 --- a/lib/fog/compute/openstack/requests/rebuild_server.rb +++ b/lib/fog/openstack/compute/requests/rebuild_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def rebuild_server(server_id, image_ref, name, admin_pass = nil, metadata = nil, personality = nil) body = {'rebuild' => { diff --git a/lib/fog/compute/openstack/requests/release_address.rb b/lib/fog/openstack/compute/requests/release_address.rb similarity index 94% rename from lib/fog/compute/openstack/requests/release_address.rb rename to lib/fog/openstack/compute/requests/release_address.rb index 9b7b68fdb..ee563c5e7 100644 --- a/lib/fog/compute/openstack/requests/release_address.rb +++ b/lib/fog/openstack/compute/requests/release_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def release_address(address_id) request( diff --git a/lib/fog/compute/openstack/requests/remote_consoles.rb b/lib/fog/openstack/compute/requests/remote_consoles.rb similarity index 97% rename from lib/fog/compute/openstack/requests/remote_consoles.rb rename to lib/fog/openstack/compute/requests/remote_consoles.rb index 3c869acd0..d4efe40e7 100644 --- a/lib/fog/compute/openstack/requests/remote_consoles.rb +++ b/lib/fog/openstack/compute/requests/remote_consoles.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Get a vnc console for an instance. # For microversion >= 2.6 diff --git a/lib/fog/compute/openstack/requests/remove_aggregate_host.rb b/lib/fog/openstack/compute/requests/remove_aggregate_host.rb similarity index 95% rename from lib/fog/compute/openstack/requests/remove_aggregate_host.rb rename to lib/fog/openstack/compute/requests/remove_aggregate_host.rb index 8a0879f91..9cef36b6b 100644 --- a/lib/fog/compute/openstack/requests/remove_aggregate_host.rb +++ b/lib/fog/openstack/compute/requests/remove_aggregate_host.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def remove_aggregate_host(uuid, host_uuid) data = {'remove_host' => {'host' => host_uuid}} diff --git a/lib/fog/compute/openstack/requests/remove_fixed_ip.rb b/lib/fog/openstack/compute/requests/remove_fixed_ip.rb similarity index 94% rename from lib/fog/compute/openstack/requests/remove_fixed_ip.rb rename to lib/fog/openstack/compute/requests/remove_fixed_ip.rb index ea1024145..d35add92b 100644 --- a/lib/fog/compute/openstack/requests/remove_fixed_ip.rb +++ b/lib/fog/openstack/compute/requests/remove_fixed_ip.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Remove an IP address. # diff --git a/lib/fog/compute/openstack/requests/remove_flavor_access.rb b/lib/fog/openstack/compute/requests/remove_flavor_access.rb similarity index 95% rename from lib/fog/compute/openstack/requests/remove_flavor_access.rb rename to lib/fog/openstack/compute/requests/remove_flavor_access.rb index b26cb94ec..d15628914 100644 --- a/lib/fog/compute/openstack/requests/remove_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/remove_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def remove_flavor_access(flavor_ref, tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/remove_security_group.rb b/lib/fog/openstack/compute/requests/remove_security_group.rb similarity index 91% rename from lib/fog/compute/openstack/requests/remove_security_group.rb rename to lib/fog/openstack/compute/requests/remove_security_group.rb index 9dd118fde..3fabe564a 100644 --- a/lib/fog/compute/openstack/requests/remove_security_group.rb +++ b/lib/fog/openstack/compute/requests/remove_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def remove_security_group(server_id, group_name) body = {'removeSecurityGroup' => {"name" => group_name}} diff --git a/lib/fog/compute/openstack/requests/rescue_server.rb b/lib/fog/openstack/compute/requests/rescue_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/rescue_server.rb rename to lib/fog/openstack/compute/requests/rescue_server.rb index 936926e1e..c23ca54ca 100644 --- a/lib/fog/compute/openstack/requests/rescue_server.rb +++ b/lib/fog/openstack/compute/requests/rescue_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Rescue the server. # diff --git a/lib/fog/compute/openstack/requests/reset_server_state.rb b/lib/fog/openstack/compute/requests/reset_server_state.rb similarity index 92% rename from lib/fog/compute/openstack/requests/reset_server_state.rb rename to lib/fog/openstack/compute/requests/reset_server_state.rb index d70ae954e..5287047f1 100644 --- a/lib/fog/compute/openstack/requests/reset_server_state.rb +++ b/lib/fog/openstack/compute/requests/reset_server_state.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def reset_server_state(server_id, status) body = {'os-resetState' => {'state' => status}} diff --git a/lib/fog/compute/openstack/requests/resize_server.rb b/lib/fog/openstack/compute/requests/resize_server.rb similarity index 91% rename from lib/fog/compute/openstack/requests/resize_server.rb rename to lib/fog/openstack/compute/requests/resize_server.rb index a90f2dde1..e7eea5837 100644 --- a/lib/fog/compute/openstack/requests/resize_server.rb +++ b/lib/fog/openstack/compute/requests/resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def resize_server(server_id, flavor_ref) body = {'resize' => {'flavorRef' => flavor_ref}} diff --git a/lib/fog/compute/openstack/requests/resume_server.rb b/lib/fog/openstack/compute/requests/resume_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/resume_server.rb rename to lib/fog/openstack/compute/requests/resume_server.rb index 44274d381..d33638930 100644 --- a/lib/fog/compute/openstack/requests/resume_server.rb +++ b/lib/fog/openstack/compute/requests/resume_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Resume the server. # diff --git a/lib/fog/compute/openstack/requests/revert_resize_server.rb b/lib/fog/openstack/compute/requests/revert_resize_server.rb similarity index 94% rename from lib/fog/compute/openstack/requests/revert_resize_server.rb rename to lib/fog/openstack/compute/requests/revert_resize_server.rb index 047921122..83fb61b89 100644 --- a/lib/fog/compute/openstack/requests/revert_resize_server.rb +++ b/lib/fog/openstack/compute/requests/revert_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def revert_resize_server(server_id) body = {'revertResize' => nil} diff --git a/lib/fog/compute/openstack/requests/server_action.rb b/lib/fog/openstack/compute/requests/server_action.rb similarity index 89% rename from lib/fog/compute/openstack/requests/server_action.rb rename to lib/fog/openstack/compute/requests/server_action.rb index 99f32c394..e735efd78 100644 --- a/lib/fog/compute/openstack/requests/server_action.rb +++ b/lib/fog/openstack/compute/requests/server_action.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def server_action(server_id, body, expects = [200, 202]) request( diff --git a/lib/fog/compute/openstack/requests/server_actions.rb b/lib/fog/openstack/compute/requests/server_actions.rb similarity index 96% rename from lib/fog/compute/openstack/requests/server_actions.rb rename to lib/fog/openstack/compute/requests/server_actions.rb index 6eb119c50..006fa5301 100644 --- a/lib/fog/compute/openstack/requests/server_actions.rb +++ b/lib/fog/openstack/compute/requests/server_actions.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Retrieve server actions. # diff --git a/lib/fog/compute/openstack/requests/server_diagnostics.rb b/lib/fog/openstack/compute/requests/server_diagnostics.rb similarity index 93% rename from lib/fog/compute/openstack/requests/server_diagnostics.rb rename to lib/fog/openstack/compute/requests/server_diagnostics.rb index d6e6c52a7..45b995693 100644 --- a/lib/fog/compute/openstack/requests/server_diagnostics.rb +++ b/lib/fog/openstack/compute/requests/server_diagnostics.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Retrieve server diagnostics. # diff --git a/lib/fog/compute/openstack/requests/set_metadata.rb b/lib/fog/openstack/compute/requests/set_metadata.rb similarity index 86% rename from lib/fog/compute/openstack/requests/set_metadata.rb rename to lib/fog/openstack/compute/requests/set_metadata.rb index 976c4bd9b..dba2f091d 100644 --- a/lib/fog/compute/openstack/requests/set_metadata.rb +++ b/lib/fog/openstack/compute/requests/set_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def set_metadata(collection_name, parent_id, metadata = {}) request( @@ -16,13 +16,13 @@ class Mock def set_metadata(collection_name, parent_id, metadata = {}) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/set_tenant.rb b/lib/fog/openstack/compute/requests/set_tenant.rb similarity index 88% rename from lib/fog/compute/openstack/requests/set_tenant.rb rename to lib/fog/openstack/compute/requests/set_tenant.rb index 620d74c7e..e3ae500dc 100644 --- a/lib/fog/compute/openstack/requests/set_tenant.rb +++ b/lib/fog/openstack/compute/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/compute/openstack/requests/shelve_offload_server.rb b/lib/fog/openstack/compute/requests/shelve_offload_server.rb similarity index 93% rename from lib/fog/compute/openstack/requests/shelve_offload_server.rb rename to lib/fog/openstack/compute/requests/shelve_offload_server.rb index 045ebfe4d..3964a411c 100644 --- a/lib/fog/compute/openstack/requests/shelve_offload_server.rb +++ b/lib/fog/openstack/compute/requests/shelve_offload_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Shelve Off load the server. Data and resource associations are deleted. # diff --git a/lib/fog/compute/openstack/requests/shelve_server.rb b/lib/fog/openstack/compute/requests/shelve_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/shelve_server.rb rename to lib/fog/openstack/compute/requests/shelve_server.rb index 7ba422f98..c12867981 100644 --- a/lib/fog/compute/openstack/requests/shelve_server.rb +++ b/lib/fog/openstack/compute/requests/shelve_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Shelve the server. # diff --git a/lib/fog/compute/openstack/requests/start_server.rb b/lib/fog/openstack/compute/requests/start_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/start_server.rb rename to lib/fog/openstack/compute/requests/start_server.rb index 1d1286e58..9bcb326e4 100644 --- a/lib/fog/compute/openstack/requests/start_server.rb +++ b/lib/fog/openstack/compute/requests/start_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Start the server. # diff --git a/lib/fog/compute/openstack/requests/stop_server.rb b/lib/fog/openstack/compute/requests/stop_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/stop_server.rb rename to lib/fog/openstack/compute/requests/stop_server.rb index 7addb0bf0..8948bc18f 100644 --- a/lib/fog/compute/openstack/requests/stop_server.rb +++ b/lib/fog/openstack/compute/requests/stop_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Stop the server. # diff --git a/lib/fog/compute/openstack/requests/suspend_server.rb b/lib/fog/openstack/compute/requests/suspend_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/suspend_server.rb rename to lib/fog/openstack/compute/requests/suspend_server.rb index 780b1a5a1..05f8ecb41 100644 --- a/lib/fog/compute/openstack/requests/suspend_server.rb +++ b/lib/fog/openstack/compute/requests/suspend_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Suspend the server. # diff --git a/lib/fog/compute/openstack/requests/unpause_server.rb b/lib/fog/openstack/compute/requests/unpause_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/unpause_server.rb rename to lib/fog/openstack/compute/requests/unpause_server.rb index d60c11d20..69aec04dc 100644 --- a/lib/fog/compute/openstack/requests/unpause_server.rb +++ b/lib/fog/openstack/compute/requests/unpause_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Unpause the server. # diff --git a/lib/fog/compute/openstack/requests/unshelve_server.rb b/lib/fog/openstack/compute/requests/unshelve_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/unshelve_server.rb rename to lib/fog/openstack/compute/requests/unshelve_server.rb index c5b80b0bb..b8589b04f 100644 --- a/lib/fog/compute/openstack/requests/unshelve_server.rb +++ b/lib/fog/openstack/compute/requests/unshelve_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Unshelve the server. # diff --git a/lib/fog/compute/openstack/requests/update_aggregate.rb b/lib/fog/openstack/compute/requests/update_aggregate.rb similarity index 96% rename from lib/fog/compute/openstack/requests/update_aggregate.rb rename to lib/fog/openstack/compute/requests/update_aggregate.rb index ab63235c1..3d0a777b9 100644 --- a/lib/fog/compute/openstack/requests/update_aggregate.rb +++ b/lib/fog/openstack/compute/requests/update_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_aggregate(uuid, options = {}) vanilla_options = [:name, :availability_zone] diff --git a/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb b/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb similarity index 95% rename from lib/fog/compute/openstack/requests/update_aggregate_metadata.rb rename to lib/fog/openstack/compute/requests/update_aggregate_metadata.rb index 08b65638e..a1718a93a 100644 --- a/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_aggregate_metadata(uuid, metadata = {}) data = {'set_metadata' => {'metadata' => metadata}} diff --git a/lib/fog/compute/openstack/requests/update_flavor_metadata.rb b/lib/fog/openstack/compute/requests/update_flavor_metadata.rb similarity index 95% rename from lib/fog/compute/openstack/requests/update_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/update_flavor_metadata.rb index 1c4b2d835..a63c59c39 100644 --- a/lib/fog/compute/openstack/requests/update_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_flavor_metadata(flavor_ref, key, value) data = {key => value} diff --git a/lib/fog/compute/openstack/requests/update_meta.rb b/lib/fog/openstack/compute/requests/update_meta.rb similarity index 87% rename from lib/fog/compute/openstack/requests/update_meta.rb rename to lib/fog/openstack/compute/requests/update_meta.rb index ba3c71475..0eba6aadf 100644 --- a/lib/fog/compute/openstack/requests/update_meta.rb +++ b/lib/fog/openstack/compute/requests/update_meta.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_meta(collection_name, parent_id, key, value) request( @@ -16,13 +16,13 @@ class Mock def update_meta(collection_name, parent_id, key, value) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/update_metadata.rb b/lib/fog/openstack/compute/requests/update_metadata.rb similarity index 87% rename from lib/fog/compute/openstack/requests/update_metadata.rb rename to lib/fog/openstack/compute/requests/update_metadata.rb index ca7ae6251..18c5af67c 100644 --- a/lib/fog/compute/openstack/requests/update_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_metadata(collection_name, parent_id, metadata = {}) request( @@ -16,13 +16,13 @@ class Mock def update_metadata(collection_name, parent_id, metadata = {}) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/update_quota.rb b/lib/fog/openstack/compute/requests/update_quota.rb similarity index 94% rename from lib/fog/compute/openstack/requests/update_quota.rb rename to lib/fog/openstack/compute/requests/update_quota.rb index ad518e5bc..7acc88d80 100644 --- a/lib/fog/compute/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/compute/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/compute/openstack/requests/update_server.rb b/lib/fog/openstack/compute/requests/update_server.rb similarity index 89% rename from lib/fog/compute/openstack/requests/update_server.rb rename to lib/fog/openstack/compute/requests/update_server.rb index 482431fc8..5485ad820 100644 --- a/lib/fog/compute/openstack/requests/update_server.rb +++ b/lib/fog/openstack/compute/requests/update_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_server(server_id, options = {}) request( @@ -23,7 +23,7 @@ def update_server(server_id, options = {}) response.status = 200 response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/container_infra/openstack.rb b/lib/fog/openstack/container_infra/container_infra.rb similarity index 94% rename from lib/fog/container_infra/openstack.rb rename to lib/fog/openstack/container_infra/container_infra.rb index cc5daa073..30a9f1e14 100644 --- a/lib/fog/container_infra/openstack.rb +++ b/lib/fog/openstack/container_infra/container_infra.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack < Fog::Service + module OpenStack + class ContainerInfra < Fog::Service SUPPORTED_VERSIONS = /v1/ SUPPORTED_MICROVERSION = '1.3' @@ -16,7 +16,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/container_infra/openstack/models' + model_path 'fog/openstack/container_infra/models' model :bay collection :bays @@ -29,7 +29,7 @@ class OpenStack < Fog::Service model :cluster_template collection :cluster_templates - request_path 'fog/container_infra/openstack/requests' + request_path 'fog/openstack/container_infra/requests' # Bay CRUD request :create_bay @@ -123,7 +123,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::ContainerInfra::OpenStack::NotFound + Fog::OpenStack::ContainerInfra::NotFound end def default_path_prefix diff --git a/lib/fog/container_infra/openstack/models/base.rb b/lib/fog/openstack/container_infra/models/base.rb similarity index 76% rename from lib/fog/container_infra/openstack/models/base.rb rename to lib/fog/openstack/container_infra/models/base.rb index 265e5ec35..55094626d 100644 --- a/lib/fog/container_infra/openstack/models/base.rb +++ b/lib/fog/openstack/container_infra/models/base.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' module Fog - module ContainerInfra - class OpenStack - class Base < Fog::OpenStack::Model + module OpenStack + class ContainerInfra + class Base < Fog::OpenStack::Model def convert_update_params(params) params = params.map do |key, value| { @@ -11,9 +11,9 @@ def convert_update_params(params) "op" => value ? "replace" : "remove" }.merge(value ? {"value" => value} : {}) end - params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} + params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} end end end end -end \ No newline at end of file +end diff --git a/lib/fog/container_infra/openstack/models/bay.rb b/lib/fog/openstack/container_infra/models/bay.rb similarity index 92% rename from lib/fog/container_infra/openstack/models/bay.rb rename to lib/fog/openstack/container_infra/models/bay.rb index 9465aed9d..5cdc9aa71 100644 --- a/lib/fog/container_infra/openstack/models/bay.rb +++ b/lib/fog/openstack/container_infra/models/bay.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class Bay < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class Bay < Fog::OpenStack::ContainerInfra::Base identity :uuid attribute :api_address diff --git a/lib/fog/container_infra/openstack/models/bay_model.rb b/lib/fog/openstack/container_infra/models/bay_model.rb similarity index 93% rename from lib/fog/container_infra/openstack/models/bay_model.rb rename to lib/fog/openstack/container_infra/models/bay_model.rb index 50bb59a2f..738066630 100644 --- a/lib/fog/container_infra/openstack/models/bay_model.rb +++ b/lib/fog/openstack/container_infra/models/bay_model.rb @@ -1,11 +1,11 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class BayModel < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class BayModel < Fog::OpenStack::ContainerInfra::Base identity :uuid - + attribute :apiserver_port attribute :cluster_distro attribute :coe diff --git a/lib/fog/container_infra/openstack/models/bay_models.rb b/lib/fog/openstack/container_infra/models/bay_models.rb similarity index 64% rename from lib/fog/container_infra/openstack/models/bay_models.rb rename to lib/fog/openstack/container_infra/models/bay_models.rb index 82d9e8395..29e8c9d45 100644 --- a/lib/fog/container_infra/openstack/models/bay_models.rb +++ b/lib/fog/openstack/container_infra/models/bay_models.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/bay_model' +require 'fog/openstack/container_infra/models/bay_model' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class BayModels < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::BayModel + model Fog::OpenStack::ContainerInfra::BayModel def all load_response(service.list_bay_models, 'baymodels') @@ -14,7 +14,7 @@ def all def get(bay_model_uuid_or_name) resource = service.get_bay_model(bay_model_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/bays.rb b/lib/fog/openstack/container_infra/models/bays.rb similarity index 63% rename from lib/fog/container_infra/openstack/models/bays.rb rename to lib/fog/openstack/container_infra/models/bays.rb index 043c39663..03e23e19e 100644 --- a/lib/fog/container_infra/openstack/models/bays.rb +++ b/lib/fog/openstack/container_infra/models/bays.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/bay' +require 'fog/openstack/container_infra/models/bay' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Bays < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::Bay + model Fog::OpenStack::ContainerInfra::Bay def all load_response(service.list_bays, "bays") @@ -14,7 +14,7 @@ def all def get(bay_uuid_or_name) resource = service.get_bay(bay_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/certificate.rb b/lib/fog/openstack/container_infra/models/certificate.rb similarity index 73% rename from lib/fog/container_infra/openstack/models/certificate.rb rename to lib/fog/openstack/container_infra/models/certificate.rb index 7c452bb27..f6f80050f 100644 --- a/lib/fog/container_infra/openstack/models/certificate.rb +++ b/lib/fog/openstack/container_infra/models/certificate.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class Certificate < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class Certificate < Fog::OpenStack::ContainerInfra::Base identity :bay_uuid attribute :pem diff --git a/lib/fog/container_infra/openstack/models/certificates.rb b/lib/fog/openstack/container_infra/models/certificates.rb similarity index 64% rename from lib/fog/container_infra/openstack/models/certificates.rb rename to lib/fog/openstack/container_infra/models/certificates.rb index 74ba7595a..ccd0d7621 100644 --- a/lib/fog/container_infra/openstack/models/certificates.rb +++ b/lib/fog/openstack/container_infra/models/certificates.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/certificate' +require 'fog/openstack/container_infra/models/certificate' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Certificates < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::Certificate + model Fog::OpenStack::ContainerInfra::Certificate def create(bay_uuid) resource = service.create_certificate(bay_uuid).body @@ -16,7 +16,7 @@ def create(bay_uuid) def get(bay_uuid) resource = service.get_certificate(bay_uuid).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/cluster.rb b/lib/fog/openstack/container_infra/models/cluster.rb similarity index 92% rename from lib/fog/container_infra/openstack/models/cluster.rb rename to lib/fog/openstack/container_infra/models/cluster.rb index 63500607f..d9bb73205 100644 --- a/lib/fog/container_infra/openstack/models/cluster.rb +++ b/lib/fog/openstack/container_infra/models/cluster.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class Cluster < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class Cluster < Fog::OpenStack::ContainerInfra::Base identity :uuid attribute :api_address diff --git a/lib/fog/container_infra/openstack/models/cluster_template.rb b/lib/fog/openstack/container_infra/models/cluster_template.rb similarity index 93% rename from lib/fog/container_infra/openstack/models/cluster_template.rb rename to lib/fog/openstack/container_infra/models/cluster_template.rb index 42e60d16c..1b8762970 100644 --- a/lib/fog/container_infra/openstack/models/cluster_template.rb +++ b/lib/fog/openstack/container_infra/models/cluster_template.rb @@ -1,11 +1,11 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class ClusterTemplate < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class ClusterTemplate < Fog::OpenStack::ContainerInfra::Base identity :uuid - + attribute :apiserver_port attribute :cluster_distro attribute :coe diff --git a/lib/fog/container_infra/openstack/models/cluster_templates.rb b/lib/fog/openstack/container_infra/models/cluster_templates.rb similarity index 65% rename from lib/fog/container_infra/openstack/models/cluster_templates.rb rename to lib/fog/openstack/container_infra/models/cluster_templates.rb index fd549429f..01a2d9e33 100644 --- a/lib/fog/container_infra/openstack/models/cluster_templates.rb +++ b/lib/fog/openstack/container_infra/models/cluster_templates.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/cluster_template' +require 'fog/openstack/container_infra/models/cluster_template' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class ClusterTemplates < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::ClusterTemplate + model Fog::OpenStack::ContainerInfra::ClusterTemplate def all load_response(service.list_cluster_templates, 'clustertemplates') @@ -15,7 +15,7 @@ def all def get(cluster_template_uuid_or_name) resource = service.get_cluster_template(cluster_template_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/clusters.rb b/lib/fog/openstack/container_infra/models/clusters.rb similarity index 64% rename from lib/fog/container_infra/openstack/models/clusters.rb rename to lib/fog/openstack/container_infra/models/clusters.rb index 8a8294f22..e0038aa55 100644 --- a/lib/fog/container_infra/openstack/models/clusters.rb +++ b/lib/fog/openstack/container_infra/models/clusters.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/cluster' +require 'fog/openstack/container_infra/models/cluster' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Clusters < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::Cluster + model Fog::OpenStack::ContainerInfra::Cluster def all load_response(service.list_clusters, "clusters") @@ -15,7 +15,7 @@ def all def get(cluster_uuid_or_name) resource = service.get_cluster(cluster_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/requests/create_bay.rb b/lib/fog/openstack/container_infra/requests/create_bay.rb similarity index 92% rename from lib/fog/container_infra/openstack/requests/create_bay.rb rename to lib/fog/openstack/container_infra/requests/create_bay.rb index 82e84e335..1f6e31100 100644 --- a/lib/fog/container_infra/openstack/requests/create_bay.rb +++ b/lib/fog/openstack/container_infra/requests/create_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_bay(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_bay_model.rb b/lib/fog/openstack/container_infra/requests/create_bay_model.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/create_bay_model.rb rename to lib/fog/openstack/container_infra/requests/create_bay_model.rb index e6cac430d..e080810c6 100644 --- a/lib/fog/container_infra/openstack/requests/create_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/create_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_bay_model(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_certificate.rb b/lib/fog/openstack/container_infra/requests/create_certificate.rb similarity index 95% rename from lib/fog/container_infra/openstack/requests/create_certificate.rb rename to lib/fog/openstack/container_infra/requests/create_certificate.rb index 3f9e099da..ce81a2512 100644 --- a/lib/fog/container_infra/openstack/requests/create_certificate.rb +++ b/lib/fog/openstack/container_infra/requests/create_certificate.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_certificate(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_cluster.rb b/lib/fog/openstack/container_infra/requests/create_cluster.rb similarity index 92% rename from lib/fog/container_infra/openstack/requests/create_cluster.rb rename to lib/fog/openstack/container_infra/requests/create_cluster.rb index 046d9f10a..8acd5897a 100644 --- a/lib/fog/container_infra/openstack/requests/create_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/create_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_cluster(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_cluster_template.rb b/lib/fog/openstack/container_infra/requests/create_cluster_template.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/create_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/create_cluster_template.rb index 92d8ec476..a138fdcee 100644 --- a/lib/fog/container_infra/openstack/requests/create_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/create_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_cluster_template(params) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_bay.rb b/lib/fog/openstack/container_infra/requests/delete_bay.rb similarity index 90% rename from lib/fog/container_infra/openstack/requests/delete_bay.rb rename to lib/fog/openstack/container_infra/requests/delete_bay.rb index bda6c49fb..27826933d 100644 --- a/lib/fog/container_infra/openstack/requests/delete_bay.rb +++ b/lib/fog/openstack/container_infra/requests/delete_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_bay(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_bay_model.rb b/lib/fog/openstack/container_infra/requests/delete_bay_model.rb similarity index 91% rename from lib/fog/container_infra/openstack/requests/delete_bay_model.rb rename to lib/fog/openstack/container_infra/requests/delete_bay_model.rb index 37cdff96e..7231738a4 100644 --- a/lib/fog/container_infra/openstack/requests/delete_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/delete_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_bay_model(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_cluster.rb b/lib/fog/openstack/container_infra/requests/delete_cluster.rb similarity index 91% rename from lib/fog/container_infra/openstack/requests/delete_cluster.rb rename to lib/fog/openstack/container_infra/requests/delete_cluster.rb index a72e5f9dd..459649aa4 100644 --- a/lib/fog/container_infra/openstack/requests/delete_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/delete_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_cluster(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_cluster_template.rb b/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb similarity index 91% rename from lib/fog/container_infra/openstack/requests/delete_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/delete_cluster_template.rb index 099a8f3b8..c2b0d16bc 100644 --- a/lib/fog/container_infra/openstack/requests/delete_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_cluster_template(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_bay.rb b/lib/fog/openstack/container_infra/requests/get_bay.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/get_bay.rb rename to lib/fog/openstack/container_infra/requests/get_bay.rb index a0ee1ac4b..77df5b3d0 100644 --- a/lib/fog/container_infra/openstack/requests/get_bay.rb +++ b/lib/fog/openstack/container_infra/requests/get_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_bay(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_bay_model.rb b/lib/fog/openstack/container_infra/requests/get_bay_model.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/get_bay_model.rb rename to lib/fog/openstack/container_infra/requests/get_bay_model.rb index b141c902c..31017b396 100644 --- a/lib/fog/container_infra/openstack/requests/get_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/get_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_bay_model(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_certificate.rb b/lib/fog/openstack/container_infra/requests/get_certificate.rb similarity index 93% rename from lib/fog/container_infra/openstack/requests/get_certificate.rb rename to lib/fog/openstack/container_infra/requests/get_certificate.rb index d5bef95ca..9fff2dcb9 100644 --- a/lib/fog/container_infra/openstack/requests/get_certificate.rb +++ b/lib/fog/openstack/container_infra/requests/get_certificate.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_certificate(bay_uuid) request( diff --git a/lib/fog/container_infra/openstack/requests/get_cluster.rb b/lib/fog/openstack/container_infra/requests/get_cluster.rb similarity index 96% rename from lib/fog/container_infra/openstack/requests/get_cluster.rb rename to lib/fog/openstack/container_infra/requests/get_cluster.rb index da4ea3912..96b9e43c5 100644 --- a/lib/fog/container_infra/openstack/requests/get_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/get_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_cluster(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_cluster_template.rb b/lib/fog/openstack/container_infra/requests/get_cluster_template.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/get_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/get_cluster_template.rb index 7670cb159..afe36620c 100644 --- a/lib/fog/container_infra/openstack/requests/get_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/get_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_cluster_template(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/list_bay_models.rb b/lib/fog/openstack/container_infra/requests/list_bay_models.rb similarity index 98% rename from lib/fog/container_infra/openstack/requests/list_bay_models.rb rename to lib/fog/openstack/container_infra/requests/list_bay_models.rb index 0257dc095..d7faae6c5 100644 --- a/lib/fog/container_infra/openstack/requests/list_bay_models.rb +++ b/lib/fog/openstack/container_infra/requests/list_bay_models.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_bay_models request( diff --git a/lib/fog/container_infra/openstack/requests/list_bays.rb b/lib/fog/openstack/container_infra/requests/list_bays.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/list_bays.rb rename to lib/fog/openstack/container_infra/requests/list_bays.rb index 68d8e37df..784913155 100644 --- a/lib/fog/container_infra/openstack/requests/list_bays.rb +++ b/lib/fog/openstack/container_infra/requests/list_bays.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_bays request( diff --git a/lib/fog/container_infra/openstack/requests/list_cluster_templates.rb b/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb similarity index 98% rename from lib/fog/container_infra/openstack/requests/list_cluster_templates.rb rename to lib/fog/openstack/container_infra/requests/list_cluster_templates.rb index 52436b623..7eb4a3c6d 100644 --- a/lib/fog/container_infra/openstack/requests/list_cluster_templates.rb +++ b/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_cluster_templates request( diff --git a/lib/fog/container_infra/openstack/requests/list_clusters.rb b/lib/fog/openstack/container_infra/requests/list_clusters.rb similarity index 95% rename from lib/fog/container_infra/openstack/requests/list_clusters.rb rename to lib/fog/openstack/container_infra/requests/list_clusters.rb index b81461ecc..8f302f1a0 100644 --- a/lib/fog/container_infra/openstack/requests/list_clusters.rb +++ b/lib/fog/openstack/container_infra/requests/list_clusters.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_clusters request( diff --git a/lib/fog/container_infra/openstack/requests/update_bay.rb b/lib/fog/openstack/container_infra/requests/update_bay.rb similarity index 92% rename from lib/fog/container_infra/openstack/requests/update_bay.rb rename to lib/fog/openstack/container_infra/requests/update_bay.rb index 4ed52fc75..306225c7e 100644 --- a/lib/fog/container_infra/openstack/requests/update_bay.rb +++ b/lib/fog/openstack/container_infra/requests/update_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_bay(uuid_or_name, params) request( diff --git a/lib/fog/container_infra/openstack/requests/update_bay_model.rb b/lib/fog/openstack/container_infra/requests/update_bay_model.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/update_bay_model.rb rename to lib/fog/openstack/container_infra/requests/update_bay_model.rb index d08dbaf79..8db575ba8 100644 --- a/lib/fog/container_infra/openstack/requests/update_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/update_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_bay_model(uuid_or_name, params) request( diff --git a/lib/fog/container_infra/openstack/requests/update_cluster.rb b/lib/fog/openstack/container_infra/requests/update_cluster.rb similarity index 93% rename from lib/fog/container_infra/openstack/requests/update_cluster.rb rename to lib/fog/openstack/container_infra/requests/update_cluster.rb index d78926f8e..0cc20bb90 100644 --- a/lib/fog/container_infra/openstack/requests/update_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/update_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_cluster(uuid_or_name, params) request( diff --git a/lib/fog/container_infra/openstack/requests/update_cluster_template.rb b/lib/fog/openstack/container_infra/requests/update_cluster_template.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/update_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/update_cluster_template.rb index c0b85f0e6..78e8cbf66 100644 --- a/lib/fog/container_infra/openstack/requests/update_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/update_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_cluster_template(uuid_or_name, params) request( diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index a0ad1f9c0..d013838a3 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -19,7 +19,7 @@ module Core # fallback def self.not_found_class - Fog::Compute::OpenStack::NotFound + Fog::OpenStack::Compute::NotFound end def credentials diff --git a/lib/fog/openstack/dns/dns.rb b/lib/fog/openstack/dns/dns.rb new file mode 100644 index 000000000..34a072a1a --- /dev/null +++ b/lib/fog/openstack/dns/dns.rb @@ -0,0 +1,21 @@ +module Fog + module OpenStack + class DNS < Fog::Service + autoload :V1, 'fog/openstack/dns/v1' + autoload :V2, 'fog/openstack/dns/v2' + + # Fog::OpenStack::DNS.new() will return a Fog::OpenStack::DNS::V2 or a Fog::OpenStack::DNS::V1, + # choosing the latest available + def self.new(args = {}) + @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] + if inspect == 'Fog::OpenStack::DNS' + service = Fog::OpenStack::DNS::V2.new(args) unless args.empty? + service ||= Fog::OpenStack::DNS::V1.new(args) + else + service = Fog::Service.new(args) + end + service + end + end + end +end diff --git a/lib/fog/dns/openstack/v1.rb b/lib/fog/openstack/dns/v1.rb similarity index 96% rename from lib/fog/dns/openstack/v1.rb rename to lib/fog/openstack/dns/v1.rb index f42dda83b..e645d5258 100644 --- a/lib/fog/dns/openstack/v1.rb +++ b/lib/fog/openstack/dns/v1.rb @@ -1,8 +1,8 @@ -require 'fog/dns/openstack' +require 'fog/openstack/dns/dns' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -16,7 +16,7 @@ class V1 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - request_path 'fog/dns/openstack/v1/requests' + request_path 'fog/openstack/dns/v1/requests' request :list_domains @@ -99,7 +99,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::DNS::OpenStack::NotFound + Fog::OpenStack::DNS::NotFound end def default_path_prefix diff --git a/lib/fog/dns/openstack/v1/requests/get_quota.rb b/lib/fog/openstack/dns/v1/requests/get_quota.rb similarity index 94% rename from lib/fog/dns/openstack/v1/requests/get_quota.rb rename to lib/fog/openstack/dns/v1/requests/get_quota.rb index ac9fe7c24..38df7615a 100644 --- a/lib/fog/dns/openstack/v1/requests/get_quota.rb +++ b/lib/fog/openstack/dns/v1/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 class Real def get_quota(project_id) diff --git a/lib/fog/dns/openstack/v1/requests/list_domains.rb b/lib/fog/openstack/dns/v1/requests/list_domains.rb similarity index 94% rename from lib/fog/dns/openstack/v1/requests/list_domains.rb rename to lib/fog/openstack/dns/v1/requests/list_domains.rb index 41cefa46c..57e2db2c2 100644 --- a/lib/fog/dns/openstack/v1/requests/list_domains.rb +++ b/lib/fog/openstack/dns/v1/requests/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 class Real def list_domains(options = {}) diff --git a/lib/fog/dns/openstack/v1/requests/update_quota.rb b/lib/fog/openstack/dns/v1/requests/update_quota.rb similarity index 95% rename from lib/fog/dns/openstack/v1/requests/update_quota.rb rename to lib/fog/openstack/dns/v1/requests/update_quota.rb index f19519163..0009f6e74 100644 --- a/lib/fog/dns/openstack/v1/requests/update_quota.rb +++ b/lib/fog/openstack/dns/v1/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 class Real def update_quota(project_id, options = {}) diff --git a/lib/fog/dns/openstack/v2.rb b/lib/fog/openstack/dns/v2.rb similarity index 98% rename from lib/fog/dns/openstack/v2.rb rename to lib/fog/openstack/dns/v2.rb index 35cf9cfa3..8be50f1d6 100644 --- a/lib/fog/dns/openstack/v2.rb +++ b/lib/fog/openstack/dns/v2.rb @@ -1,8 +1,8 @@ -require 'fog/dns/openstack' +require 'fog/openstack/dns/dns' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -18,7 +18,7 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - model_path 'fog/dns/openstack/v2/models' + model_path 'fog/openstack/dns/v2/models' model :zone collection :zones model :recordset @@ -30,7 +30,7 @@ class V2 < Fog::Service model :zone_transfer_accept collection :zone_transfer_accepts - request_path 'fog/dns/openstack/v2/requests' + request_path 'fog/openstack/dns/v2/requests' request :list_zones request :get_zone @@ -308,7 +308,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::DNS::OpenStack::NotFound + Fog::OpenStack::DNS::NotFound end def default_path_prefix diff --git a/lib/fog/dns/openstack/v2/models/pool.rb b/lib/fog/openstack/dns/v2/models/pool.rb similarity index 92% rename from lib/fog/dns/openstack/v2/models/pool.rb rename to lib/fog/openstack/dns/v2/models/pool.rb index c9cd85ae7..d390a4576 100644 --- a/lib/fog/dns/openstack/v2/models/pool.rb +++ b/lib/fog/openstack/dns/v2/models/pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Pool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/pools.rb b/lib/fog/openstack/dns/v2/models/pools.rb similarity index 79% rename from lib/fog/dns/openstack/v2/models/pools.rb rename to lib/fog/openstack/dns/v2/models/pools.rb index bdf41c66b..4c81a4118 100644 --- a/lib/fog/dns/openstack/v2/models/pools.rb +++ b/lib/fog/openstack/dns/v2/models/pools.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/pool' +require 'fog/openstack/dns/v2/models/pool' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Pools < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::Pool + model Fog::OpenStack::DNS::V2::Pool def all(options = {}) load_response(service.list_pools(options), 'pools') diff --git a/lib/fog/dns/openstack/v2/models/recordset.rb b/lib/fog/openstack/dns/v2/models/recordset.rb similarity index 97% rename from lib/fog/dns/openstack/v2/models/recordset.rb rename to lib/fog/openstack/dns/v2/models/recordset.rb index ad3f685ab..fca03eaf0 100644 --- a/lib/fog/dns/openstack/v2/models/recordset.rb +++ b/lib/fog/openstack/dns/v2/models/recordset.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Recordset < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/recordsets.rb b/lib/fog/openstack/dns/v2/models/recordsets.rb similarity index 83% rename from lib/fog/dns/openstack/v2/models/recordsets.rb rename to lib/fog/openstack/dns/v2/models/recordsets.rb index ab6584b54..293b56d29 100644 --- a/lib/fog/dns/openstack/v2/models/recordsets.rb +++ b/lib/fog/openstack/dns/v2/models/recordsets.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/recordset' +require 'fog/openstack/dns/v2/models/recordset' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Recordsets < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::Recordset + model Fog::OpenStack::DNS::V2::Recordset def all(options = {}) load_response(service.list_recordsets(options), 'recordsets') diff --git a/lib/fog/dns/openstack/v2/models/zone.rb b/lib/fog/openstack/dns/v2/models/zone.rb similarity index 97% rename from lib/fog/dns/openstack/v2/models/zone.rb rename to lib/fog/openstack/dns/v2/models/zone.rb index 9e5fae992..3fc16d48f 100644 --- a/lib/fog/dns/openstack/v2/models/zone.rb +++ b/lib/fog/openstack/dns/v2/models/zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Zone < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb similarity index 95% rename from lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb index 3d27da7a7..42931fc7f 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferAccept < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb similarity index 77% rename from lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb index 2dceaa807..5a68159c7 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/zone_transfer_accept' +require 'fog/openstack/dns/v2/models/zone_transfer_accept' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferAccepts < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::ZoneTransferAccept + model Fog::OpenStack::DNS::V2::ZoneTransferAccept def all(options = {}) load_response(service.list_zone_transfer_accepts(options), 'transfer_accepts') diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_request.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb similarity index 97% rename from lib/fog/dns/openstack/v2/models/zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_request.rb index 67c3b05ce..5610145d0 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferRequest < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb similarity index 80% rename from lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb index 09da75767..66d4323b6 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/zone_transfer_request' +require 'fog/openstack/dns/v2/models/zone_transfer_request' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferRequests < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::ZoneTransferRequest + model Fog::OpenStack::DNS::V2::ZoneTransferRequest def all(options = {}) load_response(service.list_zone_transfer_requests(options), 'transfer_requests') diff --git a/lib/fog/dns/openstack/v2/models/zones.rb b/lib/fog/openstack/dns/v2/models/zones.rb similarity index 82% rename from lib/fog/dns/openstack/v2/models/zones.rb rename to lib/fog/openstack/dns/v2/models/zones.rb index 150ee1135..132cff248 100644 --- a/lib/fog/dns/openstack/v2/models/zones.rb +++ b/lib/fog/openstack/dns/v2/models/zones.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/zone' +require 'fog/openstack/dns/v2/models/zone' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Zones < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::Zone + model Fog::OpenStack::DNS::V2::Zone def all(options = {}) load_response(service.list_zones(options), 'zones') diff --git a/lib/fog/dns/openstack/v2/requests/create_recordset.rb b/lib/fog/openstack/dns/v2/requests/create_recordset.rb similarity index 97% rename from lib/fog/dns/openstack/v2/requests/create_recordset.rb rename to lib/fog/openstack/dns/v2/requests/create_recordset.rb index fe508fe31..d489b2698 100644 --- a/lib/fog/dns/openstack/v2/requests/create_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/create_recordset.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_recordset(zone_id, name, type, records, options = {}) diff --git a/lib/fog/dns/openstack/v2/requests/create_zone.rb b/lib/fog/openstack/dns/v2/requests/create_zone.rb similarity index 97% rename from lib/fog/dns/openstack/v2/requests/create_zone.rb rename to lib/fog/openstack/dns/v2/requests/create_zone.rb index 5346e8e89..311e72847 100644 --- a/lib/fog/dns/openstack/v2/requests/create_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_zone(name, email, options = {}) diff --git a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb similarity index 90% rename from lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb rename to lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb index 1f7db40f2..1b71288f3 100644 --- a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) @@ -9,7 +9,7 @@ def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) :zone_transfer_request_id => zone_transfer_request_id } - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :headers => headers, diff --git a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb similarity index 96% rename from lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb index ce51ea8c8..ba435a7ee 100644 --- a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_zone_transfer_request(zone_id, options = {}) diff --git a/lib/fog/dns/openstack/v2/requests/delete_recordset.rb b/lib/fog/openstack/dns/v2/requests/delete_recordset.rb similarity index 91% rename from lib/fog/dns/openstack/v2/requests/delete_recordset.rb rename to lib/fog/openstack/dns/v2/requests/delete_recordset.rb index 3a600ad48..4ea01a619 100644 --- a/lib/fog/dns/openstack/v2/requests/delete_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_recordset.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def delete_recordset(zone_id, id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 202, :method => 'DELETE', diff --git a/lib/fog/dns/openstack/v2/requests/delete_zone.rb b/lib/fog/openstack/dns/v2/requests/delete_zone.rb similarity index 89% rename from lib/fog/dns/openstack/v2/requests/delete_zone.rb rename to lib/fog/openstack/dns/v2/requests/delete_zone.rb index 5574255a9..566b8ed81 100644 --- a/lib/fog/dns/openstack/v2/requests/delete_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_zone.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def delete_zone(id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 202, :method => 'DELETE', diff --git a/lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb index c2b9799be..957dc5f8b 100644 --- a/lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def delete_zone_transfer_request(zone_transfer_request_id) diff --git a/lib/fog/dns/openstack/v2/requests/get_pool.rb b/lib/fog/openstack/dns/v2/requests/get_pool.rb similarity index 86% rename from lib/fog/dns/openstack/v2/requests/get_pool.rb rename to lib/fog/openstack/dns/v2/requests/get_pool.rb index 4a825b3f7..780a6b19a 100644 --- a/lib/fog/dns/openstack/v2/requests/get_pool.rb +++ b/lib/fog/openstack/dns/v2/requests/get_pool.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_pool(id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/dns/openstack/v2/requests/get_quota.rb b/lib/fog/openstack/dns/v2/requests/get_quota.rb similarity index 86% rename from lib/fog/dns/openstack/v2/requests/get_quota.rb rename to lib/fog/openstack/dns/v2/requests/get_quota.rb index 3ad2f700f..584af54a8 100644 --- a/lib/fog/dns/openstack/v2/requests/get_quota.rb +++ b/lib/fog/openstack/dns/v2/requests/get_quota.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_quota(project_id = nil) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(:all_projects => !project_id.nil?) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(:all_projects => !project_id.nil?) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/get_recordset.rb b/lib/fog/openstack/dns/v2/requests/get_recordset.rb similarity index 91% rename from lib/fog/dns/openstack/v2/requests/get_recordset.rb rename to lib/fog/openstack/dns/v2/requests/get_recordset.rb index 2bc1dad50..2d8c64a60 100644 --- a/lib/fog/dns/openstack/v2/requests/get_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/get_recordset.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_recordset(zone_id, id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/dns/openstack/v2/requests/get_zone.rb b/lib/fog/openstack/dns/v2/requests/get_zone.rb similarity index 86% rename from lib/fog/dns/openstack/v2/requests/get_zone.rb rename to lib/fog/openstack/dns/v2/requests/get_zone.rb index 75ab7c2dc..ab0f42b8e 100644 --- a/lib/fog/dns/openstack/v2/requests/get_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_zone(id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb similarity index 95% rename from lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb rename to lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb index 36c69e021..a4c57d490 100644 --- a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_zone_transfer_accept(zone_transfer_accept_id) diff --git a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb similarity index 95% rename from lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb index 33b138330..d98e1a36a 100644 --- a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_zone_transfer_request(zone_transfer_request_id) diff --git a/lib/fog/dns/openstack/v2/requests/list_pools.rb b/lib/fog/openstack/dns/v2/requests/list_pools.rb similarity index 85% rename from lib/fog/dns/openstack/v2/requests/list_pools.rb rename to lib/fog/openstack/dns/v2/requests/list_pools.rb index 009e03372..5e30111e6 100644 --- a/lib/fog/dns/openstack/v2/requests/list_pools.rb +++ b/lib/fog/openstack/dns/v2/requests/list_pools.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_pools(options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/list_recordsets.rb b/lib/fog/openstack/dns/v2/requests/list_recordsets.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/list_recordsets.rb rename to lib/fog/openstack/dns/v2/requests/list_recordsets.rb index d67bf213c..8f46c4d17 100644 --- a/lib/fog/dns/openstack/v2/requests/list_recordsets.rb +++ b/lib/fog/openstack/dns/v2/requests/list_recordsets.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_recordsets(zone_id = nil, options = {}) @@ -19,7 +19,7 @@ def list_recordsets(zone_id = nil, options = {}) zone_id = options.delete(:zone_id) if zone_id.nil? path = zone_id.nil? ? 'recordsets' : "zones/#{zone_id}/recordsets" - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb rename to lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb index 09e96e807..d326b401f 100644 --- a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_zone_transfer_accepts(options={}) diff --git a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb rename to lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb index 4c3d8a635..8357c0f86 100644 --- a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_zone_transfer_requests(options={}) diff --git a/lib/fog/dns/openstack/v2/requests/list_zones.rb b/lib/fog/openstack/dns/v2/requests/list_zones.rb similarity index 85% rename from lib/fog/dns/openstack/v2/requests/list_zones.rb rename to lib/fog/openstack/dns/v2/requests/list_zones.rb index 9f0a54173..498494700 100644 --- a/lib/fog/dns/openstack/v2/requests/list_zones.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zones.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_zones(options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/update_quota.rb b/lib/fog/openstack/dns/v2/requests/update_quota.rb similarity index 89% rename from lib/fog/dns/openstack/v2/requests/update_quota.rb rename to lib/fog/openstack/dns/v2/requests/update_quota.rb index bacac48cd..3431c7988 100644 --- a/lib/fog/dns/openstack/v2/requests/update_quota.rb +++ b/lib/fog/openstack/dns/v2/requests/update_quota.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_quota(project_id, options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/dns/openstack/v2/requests/update_recordset.rb b/lib/fog/openstack/dns/v2/requests/update_recordset.rb similarity index 92% rename from lib/fog/dns/openstack/v2/requests/update_recordset.rb rename to lib/fog/openstack/dns/v2/requests/update_recordset.rb index 460753d92..654c4e2cd 100644 --- a/lib/fog/dns/openstack/v2/requests/update_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/update_recordset.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_recordset(zone_id, id, options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/dns/openstack/v2/requests/update_zone.rb b/lib/fog/openstack/dns/v2/requests/update_zone.rb similarity index 91% rename from lib/fog/dns/openstack/v2/requests/update_zone.rb rename to lib/fog/openstack/dns/v2/requests/update_zone.rb index d592a1911..345eaeab6 100644 --- a/lib/fog/dns/openstack/v2/requests/update_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/update_zone.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_zone(id, options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb similarity index 97% rename from lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb index bf99ca8c7..61980f621 100644 --- a/lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_zone_transfer_request(zone_transfer_request_id,description,options={}) diff --git a/lib/fog/event/openstack.rb b/lib/fog/openstack/event/event.rb similarity index 93% rename from lib/fog/event/openstack.rb rename to lib/fog/openstack/event/event.rb index 5317ecacd..b03b41593 100644 --- a/lib/fog/event/openstack.rb +++ b/lib/fog/openstack/event/event.rb @@ -1,6 +1,6 @@ module Fog - module Event - class OpenStack < Fog::Service + module OpenStack + class Event < Fog::Service SUPPORTED_VERSIONS = /v2/ requires :openstack_auth_url @@ -15,12 +15,12 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/event/openstack/models' + model_path 'fog/openstack/event/models' model :event collection :events - request_path 'fog/event/openstack/requests' + request_path 'fog/openstack/event/requests' request :get_event request :list_events @@ -85,7 +85,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Event::OpenStack::NotFound + Fog::OpenStack::Event::NotFound end def default_path_prefix diff --git a/lib/fog/event/openstack/models/event.rb b/lib/fog/openstack/event/models/event.rb similarity index 88% rename from lib/fog/event/openstack/models/event.rb rename to lib/fog/openstack/event/models/event.rb index fffa54856..29c04a05a 100644 --- a/lib/fog/event/openstack/models/event.rb +++ b/lib/fog/openstack/event/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Event - class OpenStack + module OpenStack + class Event class Event < Fog::OpenStack::Model identity :message_id diff --git a/lib/fog/event/openstack/models/events.rb b/lib/fog/openstack/event/models/events.rb similarity index 67% rename from lib/fog/event/openstack/models/events.rb rename to lib/fog/openstack/event/models/events.rb index 4dace3546..d8680c0b1 100644 --- a/lib/fog/event/openstack/models/events.rb +++ b/lib/fog/openstack/event/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/event/openstack/models/event' +require 'fog/openstack/event/models/event' module Fog - module Event - class OpenStack + module OpenStack + class Event class Events < Fog::OpenStack::Collection - model Fog::Event::OpenStack::Event + model Fog::OpenStack::Event::Event def all(q = []) load_response(service.list_events(q)) @@ -14,7 +14,7 @@ def all(q = []) def find_by_id(message_id) event = service.get_event(message_id).body new(event) - rescue Fog::Event::OpenStack::NotFound + rescue Fog::OpenStack::Event::NotFound nil end end diff --git a/lib/fog/event/openstack/requests/get_event.rb b/lib/fog/openstack/event/requests/get_event.rb similarity index 94% rename from lib/fog/event/openstack/requests/get_event.rb rename to lib/fog/openstack/event/requests/get_event.rb index 04bb58c66..86c28f7e6 100644 --- a/lib/fog/event/openstack/requests/get_event.rb +++ b/lib/fog/openstack/event/requests/get_event.rb @@ -1,6 +1,6 @@ module Fog - module Event - class OpenStack + module OpenStack + class Event class Real def get_event(message_id) request( diff --git a/lib/fog/event/openstack/requests/list_events.rb b/lib/fog/openstack/event/requests/list_events.rb similarity index 96% rename from lib/fog/event/openstack/requests/list_events.rb rename to lib/fog/openstack/event/requests/list_events.rb index 679a3586f..8172f75f8 100644 --- a/lib/fog/event/openstack/requests/list_events.rb +++ b/lib/fog/openstack/event/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module Event - class OpenStack + module OpenStack + class Event class Real def list_events(options = []) data = { diff --git a/lib/fog/identity/openstack.rb b/lib/fog/openstack/identity/identity.rb similarity index 85% rename from lib/fog/identity/openstack.rb rename to lib/fog/openstack/identity/identity.rb index f657f6be4..cdbd4fca6 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/openstack/identity/identity.rb @@ -1,8 +1,8 @@ module Fog - module Identity - class OpenStack < Fog::Service - autoload :V2, 'fog/identity/openstack/v2' - autoload :V3, 'fog/identity/openstack/v3' + module OpenStack + class Identity < Fog::Service + autoload :V2, 'fog/openstack/identity/v2' + autoload :V3, 'fog/openstack/identity/v3' def self.new(args = {}) version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i @@ -25,9 +25,9 @@ def self.new(args = {}) case version when '2.0' - Fog::Identity::OpenStack::V2.new(args) + Fog::OpenStack::Identity::V2.new(args) else - Fog::Identity::OpenStack::V3.new(args) + Fog::OpenStack::Identity::V3.new(args) end end @@ -44,7 +44,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Identity::OpenStack::NotFound + Fog::OpenStack::Identity::NotFound end def config_service? diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/openstack/identity/v2.rb similarity index 96% rename from lib/fog/identity/openstack/v2.rb rename to lib/fog/openstack/identity/v2.rb index 0eedb7b53..0ec570f2d 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/openstack/identity/v2.rb @@ -1,8 +1,8 @@ -require 'fog/identity/openstack' +require 'fog/openstack/identity/identity' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -16,7 +16,7 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :no_path_prefix - model_path 'fog/identity/openstack/v2/models' + model_path 'fog/openstack/identity/v2/models' model :tenant collection :tenants model :user @@ -26,7 +26,7 @@ class V2 < Fog::Service model :ec2_credential collection :ec2_credentials - request_path 'fog/identity/openstack/v2/requests' + request_path 'fog/openstack/identity/v2/requests' request :check_token request :validate_token @@ -168,7 +168,7 @@ def credentials end end - class Real < Fog::Identity::OpenStack::Real + class Real < Fog::OpenStack::Identity::Real def initialize(args) @path_prefix = if args[:no_path_prefix] '' diff --git a/lib/fog/identity/openstack/v2/models/ec2_credential.rb b/lib/fog/openstack/identity/v2/models/ec2_credential.rb similarity index 95% rename from lib/fog/identity/openstack/v2/models/ec2_credential.rb rename to lib/fog/openstack/identity/v2/models/ec2_credential.rb index 5b3098786..705022df7 100644 --- a/lib/fog/identity/openstack/v2/models/ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/models/ec2_credential.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Ec2Credential < Fog::OpenStack::Model identity :access, :aliases => 'access_key' diff --git a/lib/fog/identity/openstack/v2/models/ec2_credentials.rb b/lib/fog/openstack/identity/v2/models/ec2_credentials.rb similarity index 85% rename from lib/fog/identity/openstack/v2/models/ec2_credentials.rb rename to lib/fog/openstack/identity/v2/models/ec2_credentials.rb index f9d92bc33..8036608ab 100644 --- a/lib/fog/identity/openstack/v2/models/ec2_credentials.rb +++ b/lib/fog/openstack/identity/v2/models/ec2_credentials.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/ec2_credential' +require 'fog/openstack/identity/v2/models/ec2_credential' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Ec2Credentials < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::Ec2Credential + model Fog::OpenStack::Identity::V2::Ec2Credential attribute :user @@ -44,7 +44,7 @@ def find_by_access_key(access_key) body = response.body['credential'] body = body.merge 'service' => service - ec2_credential = Fog::Identity::OpenStack::V2::EC2Credential.new(body) + ec2_credential = Fog::OpenStack::Identity::V2::EC2Credential.new(body) end ec2_credential diff --git a/lib/fog/identity/openstack/v2/models/role.rb b/lib/fog/openstack/identity/v2/models/role.rb similarity index 97% rename from lib/fog/identity/openstack/v2/models/role.rb rename to lib/fog/openstack/identity/v2/models/role.rb index 683d701f3..3d428b556 100644 --- a/lib/fog/identity/openstack/v2/models/role.rb +++ b/lib/fog/openstack/identity/v2/models/role.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Role < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v2/models/roles.rb b/lib/fog/openstack/identity/v2/models/roles.rb similarity index 71% rename from lib/fog/identity/openstack/v2/models/roles.rb rename to lib/fog/openstack/identity/v2/models/roles.rb index 893cbe266..4da71e466 100644 --- a/lib/fog/identity/openstack/v2/models/roles.rb +++ b/lib/fog/openstack/identity/v2/models/roles.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/role' +require 'fog/openstack/identity/v2/models/role' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Roles < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::Role + model Fog::OpenStack::Identity::V2::Role def all(options = {}) load_response(service.list_roles(options), 'roles') diff --git a/lib/fog/identity/openstack/v2/models/tenant.rb b/lib/fog/openstack/identity/v2/models/tenant.rb similarity index 97% rename from lib/fog/identity/openstack/v2/models/tenant.rb rename to lib/fog/openstack/identity/v2/models/tenant.rb index c24c7e022..280bbfb36 100644 --- a/lib/fog/identity/openstack/v2/models/tenant.rb +++ b/lib/fog/openstack/identity/v2/models/tenant.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Tenant < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v2/models/tenants.rb b/lib/fog/openstack/identity/v2/models/tenants.rb similarity index 77% rename from lib/fog/identity/openstack/v2/models/tenants.rb rename to lib/fog/openstack/identity/v2/models/tenants.rb index e74a16bb5..d779676ef 100644 --- a/lib/fog/identity/openstack/v2/models/tenants.rb +++ b/lib/fog/openstack/identity/v2/models/tenants.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/tenant' +require 'fog/openstack/identity/v2/models/tenant' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Tenants < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::Tenant + model Fog::OpenStack::Identity::V2::Tenant def all(options = {}) load_response(service.list_tenants(options), 'tenants') @@ -16,7 +16,7 @@ def find_by_id(id) cached_tenant = find { |tenant| tenant.id == id } return cached_tenant if cached_tenant tenant_hash = service.get_tenant(id).body['tenant'] - Fog::Identity::OpenStack::V2::Tenant.new( + Fog::OpenStack::Identity::V2::Tenant.new( tenant_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v2/models/user.rb b/lib/fog/openstack/identity/v2/models/user.rb similarity index 97% rename from lib/fog/identity/openstack/v2/models/user.rb rename to lib/fog/openstack/identity/v2/models/user.rb index da35cb819..df4740127 100644 --- a/lib/fog/identity/openstack/v2/models/user.rb +++ b/lib/fog/openstack/identity/v2/models/user.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class User < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v2/models/users.rb b/lib/fog/openstack/identity/v2/models/users.rb similarity index 78% rename from lib/fog/identity/openstack/v2/models/users.rb rename to lib/fog/openstack/identity/v2/models/users.rb index 40c17d228..7aa1f67de 100644 --- a/lib/fog/identity/openstack/v2/models/users.rb +++ b/lib/fog/openstack/identity/v2/models/users.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/user' +require 'fog/openstack/identity/v2/models/user' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Users < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::User + model Fog::OpenStack::Identity::V2::User attribute :tenant_id @@ -18,7 +18,7 @@ def all(options = {}) def find_by_id(id) find { |user| user.id == id } || - Fog::Identity::OpenStack::V2::User.new( + Fog::OpenStack::Identity::V2::User.new( service.get_user_by_id(id).body['user'].merge( 'service' => service ) @@ -27,7 +27,7 @@ def find_by_id(id) def find_by_name(name) find { |user| user.name == name } || - Fog::Identity::OpenStack::V2::User.new( + Fog::OpenStack::Identity::V2::User.new( service.get_user_by_name(name).body['user'].merge( 'service' => service ) diff --git a/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb b/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb similarity index 96% rename from lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb rename to lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb index 3926b7e1e..4674a5ed6 100644 --- a/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def add_user_to_tenant(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/check_token.rb b/lib/fog/openstack/identity/v2/requests/check_token.rb similarity index 92% rename from lib/fog/identity/openstack/v2/requests/check_token.rb rename to lib/fog/openstack/identity/v2/requests/check_token.rb index cf38bdb70..15b234fe8 100644 --- a/lib/fog/identity/openstack/v2/requests/check_token.rb +++ b/lib/fog/openstack/identity/v2/requests/check_token.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def check_token(token_id, tenant_id = nil) diff --git a/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb similarity index 97% rename from lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb rename to lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb index ee014ae26..ffe19f619 100644 --- a/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## diff --git a/lib/fog/identity/openstack/v2/requests/create_role.rb b/lib/fog/openstack/identity/v2/requests/create_role.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/create_role.rb rename to lib/fog/openstack/identity/v2/requests/create_role.rb index dcf1bf80f..5a4ef4fce 100644 --- a/lib/fog/identity/openstack/v2/requests/create_role.rb +++ b/lib/fog/openstack/identity/v2/requests/create_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_role(name) diff --git a/lib/fog/identity/openstack/v2/requests/create_tenant.rb b/lib/fog/openstack/identity/v2/requests/create_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/create_tenant.rb rename to lib/fog/openstack/identity/v2/requests/create_tenant.rb index ee1a49860..cabb9f37f 100644 --- a/lib/fog/identity/openstack/v2/requests/create_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/create_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_tenant(attributes) diff --git a/lib/fog/identity/openstack/v2/requests/create_user.rb b/lib/fog/openstack/identity/v2/requests/create_user.rb similarity index 96% rename from lib/fog/identity/openstack/v2/requests/create_user.rb rename to lib/fog/openstack/identity/v2/requests/create_user.rb index 7f13f337c..bf1c5b256 100644 --- a/lib/fog/identity/openstack/v2/requests/create_user.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_user(name, password, email, tenantId = nil, enabled = true) diff --git a/lib/fog/identity/openstack/v2/requests/create_user_role.rb b/lib/fog/openstack/identity/v2/requests/create_user_role.rb similarity index 93% rename from lib/fog/identity/openstack/v2/requests/create_user_role.rb rename to lib/fog/openstack/identity/v2/requests/create_user_role.rb index b56f2fc22..9a5e3c07c 100644 --- a/lib/fog/identity/openstack/v2/requests/create_user_role.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_user_role(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb similarity index 91% rename from lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb rename to lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb index b487feee1..9fc30ca5e 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## @@ -27,7 +27,7 @@ def delete_ec2_credential(user_id, access) class Mock def delete_ec2_credential(user_id, access) - raise Fog::Identity::OpenStack::NotFound unless data[:ec2_credentials][user_id][access] + raise Fog::OpenStack::Identity::NotFound unless data[:ec2_credentials][user_id][access] data[:ec2_credentials][user_id].delete access diff --git a/lib/fog/identity/openstack/v2/requests/delete_role.rb b/lib/fog/openstack/identity/v2/requests/delete_role.rb similarity index 86% rename from lib/fog/identity/openstack/v2/requests/delete_role.rb rename to lib/fog/openstack/identity/v2/requests/delete_role.rb index 28d36ee24..aecf3f2d9 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_role.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_role(role_id) @@ -20,7 +20,7 @@ def delete_role(role_id) response.status = 204 response else - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_tenant.rb b/lib/fog/openstack/identity/v2/requests/delete_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/delete_tenant.rb rename to lib/fog/openstack/identity/v2/requests/delete_tenant.rb index c7410624b..e187d8438 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_tenant(id) diff --git a/lib/fog/identity/openstack/v2/requests/delete_user.rb b/lib/fog/openstack/identity/v2/requests/delete_user.rb similarity index 87% rename from lib/fog/identity/openstack/v2/requests/delete_user.rb rename to lib/fog/openstack/identity/v2/requests/delete_user.rb index 1413c7655..3ccfcb258 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_user.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_user(user_id) @@ -22,7 +22,7 @@ def delete_user(user_id) response.status = 204 response rescue - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_user_role.rb b/lib/fog/openstack/identity/v2/requests/delete_user_role.rb similarity index 93% rename from lib/fog/identity/openstack/v2/requests/delete_user_role.rb rename to lib/fog/openstack/identity/v2/requests/delete_user_role.rb index a9f9a45d7..2f6a477d8 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_user_role.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_user_role(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb similarity index 94% rename from lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb rename to lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb index e7eed8295..800d04791 100644 --- a/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## @@ -28,7 +28,7 @@ def get_ec2_credential(user_id, access) :path => "users/#{user_id}/credentials/OS-EC2/#{access}" ) rescue Excon::Errors::Unauthorized - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end diff --git a/lib/fog/identity/openstack/v2/requests/get_role.rb b/lib/fog/openstack/identity/v2/requests/get_role.rb similarity index 86% rename from lib/fog/identity/openstack/v2/requests/get_role.rb rename to lib/fog/openstack/identity/v2/requests/get_role.rb index 4ec42ef01..defaac045 100644 --- a/lib/fog/identity/openstack/v2/requests/get_role.rb +++ b/lib/fog/openstack/identity/v2/requests/get_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_role(id) @@ -20,7 +20,7 @@ def get_role(id) response.body = {'role' => data} response else - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_tenant.rb b/lib/fog/openstack/identity/v2/requests/get_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/get_tenant.rb rename to lib/fog/openstack/identity/v2/requests/get_tenant.rb index 0a57bd7f8..6b2676cdd 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_tenant(id) diff --git a/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb b/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb rename to lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb index 7018ceaba..df4a0fa03 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_tenants_by_id(tenant_id) diff --git a/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb b/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb rename to lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb index c03b29d7d..bdbefb7a8 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_tenants_by_name(name) diff --git a/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb b/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/get_user_by_id.rb rename to lib/fog/openstack/identity/v2/requests/get_user_by_id.rb index 72bf390e9..e8fbbb205 100644 --- a/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb +++ b/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_user_by_id(user_id) diff --git a/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb b/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb similarity index 94% rename from lib/fog/identity/openstack/v2/requests/get_user_by_name.rb rename to lib/fog/openstack/identity/v2/requests/get_user_by_name.rb index d283d9167..79233d995 100644 --- a/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb +++ b/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_user_by_name(name) diff --git a/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb b/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb similarity index 98% rename from lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb rename to lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb index e830a8222..9277676df 100644 --- a/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb +++ b/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## diff --git a/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb b/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb similarity index 90% rename from lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb rename to lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb index 7d4c410c5..c4fc28bd4 100644 --- a/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb +++ b/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_endpoints_for_token(token_id) diff --git a/lib/fog/identity/openstack/v2/requests/list_roles.rb b/lib/fog/openstack/identity/v2/requests/list_roles.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/list_roles.rb rename to lib/fog/openstack/identity/v2/requests/list_roles.rb index 99332ebd3..ee55cc72d 100644 --- a/lib/fog/identity/openstack/v2/requests/list_roles.rb +++ b/lib/fog/openstack/identity/v2/requests/list_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_roles(options = {}) diff --git a/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb b/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb rename to lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb index 504b63d5c..3acfade1f 100644 --- a/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_roles_for_user_on_tenant(tenant_id, user_id) diff --git a/lib/fog/identity/openstack/v2/requests/list_tenants.rb b/lib/fog/openstack/identity/v2/requests/list_tenants.rb similarity index 97% rename from lib/fog/identity/openstack/v2/requests/list_tenants.rb rename to lib/fog/openstack/identity/v2/requests/list_tenants.rb index 015549631..bec98c056 100644 --- a/lib/fog/identity/openstack/v2/requests/list_tenants.rb +++ b/lib/fog/openstack/identity/v2/requests/list_tenants.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_tenants(options = nil, marker = nil) diff --git a/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb b/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb rename to lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb index c8f618b1d..2b3d493ac 100644 --- a/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb +++ b/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_user_global_roles(user_id) diff --git a/lib/fog/identity/openstack/v2/requests/list_users.rb b/lib/fog/openstack/identity/v2/requests/list_users.rb similarity index 96% rename from lib/fog/identity/openstack/v2/requests/list_users.rb rename to lib/fog/openstack/identity/v2/requests/list_users.rb index e57efdc71..55305f221 100644 --- a/lib/fog/identity/openstack/v2/requests/list_users.rb +++ b/lib/fog/openstack/identity/v2/requests/list_users.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_users(options = {}) diff --git a/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb b/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb similarity index 92% rename from lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb rename to lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb index d68ad4f54..8814dc518 100644 --- a/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def remove_user_from_tenant(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/set_tenant.rb b/lib/fog/openstack/identity/v2/requests/set_tenant.rb similarity index 90% rename from lib/fog/identity/openstack/v2/requests/set_tenant.rb rename to lib/fog/openstack/identity/v2/requests/set_tenant.rb index 4beb72e84..7827c63dd 100644 --- a/lib/fog/identity/openstack/v2/requests/set_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def set_tenant(tenant) diff --git a/lib/fog/identity/openstack/v2/requests/update_tenant.rb b/lib/fog/openstack/identity/v2/requests/update_tenant.rb similarity index 94% rename from lib/fog/identity/openstack/v2/requests/update_tenant.rb rename to lib/fog/openstack/identity/v2/requests/update_tenant.rb index e24a8d90d..956b8fd01 100644 --- a/lib/fog/identity/openstack/v2/requests/update_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/update_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def update_tenant(id, attributes) diff --git a/lib/fog/identity/openstack/v2/requests/update_user.rb b/lib/fog/openstack/identity/v2/requests/update_user.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/update_user.rb rename to lib/fog/openstack/identity/v2/requests/update_user.rb index 67709eb43..0d8622d1d 100644 --- a/lib/fog/identity/openstack/v2/requests/update_user.rb +++ b/lib/fog/openstack/identity/v2/requests/update_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def update_user(user_id, options = {}) @@ -24,7 +24,7 @@ def update_user(user_id, options) response.status = 200 response else - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/validate_token.rb b/lib/fog/openstack/identity/v2/requests/validate_token.rb similarity index 92% rename from lib/fog/identity/openstack/v2/requests/validate_token.rb rename to lib/fog/openstack/identity/v2/requests/validate_token.rb index c278558a6..a7d4a1cb7 100644 --- a/lib/fog/identity/openstack/v2/requests/validate_token.rb +++ b/lib/fog/openstack/identity/v2/requests/validate_token.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def validate_token(token_id, tenant_id = nil) diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/openstack/identity/v3.rb similarity index 95% rename from lib/fog/identity/openstack/v3.rb rename to lib/fog/openstack/identity/v3.rb index 86d5345fa..61da21d23 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/openstack/identity/v3.rb @@ -1,8 +1,8 @@ -require 'fog/identity/openstack' +require 'fog/openstack/identity/identity' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, @@ -15,7 +15,7 @@ class V3 < Fog::Service :current_user, :current_user_id, :current_tenant, :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix - model_path 'fog/identity/openstack/v3/models' + model_path 'fog/openstack/identity/v3/models' model :domain collection :domains model :endpoint @@ -39,7 +39,7 @@ class V3 < Fog::Service model :policy collection :policies - request_path 'fog/identity/openstack/v3/requests' + request_path 'fog/openstack/identity/v3/requests' request :list_users request :get_user @@ -141,7 +141,7 @@ def self.get_api_version(uri, connection_options = {}) version end - class Real < Fog::Identity::OpenStack::Real + class Real < Fog::OpenStack::Identity::Real def initialize(args) @path_prefix = if args[:no_path_prefix] '' diff --git a/lib/fog/identity/openstack/v3/models/domain.rb b/lib/fog/openstack/identity/v3/models/domain.rb similarity index 96% rename from lib/fog/identity/openstack/v3/models/domain.rb rename to lib/fog/openstack/identity/v3/models/domain.rb index 7c182b7b1..fda46d176 100644 --- a/lib/fog/identity/openstack/v3/models/domain.rb +++ b/lib/fog/openstack/identity/v3/models/domain.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Domain < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/domains.rb b/lib/fog/openstack/identity/v3/models/domains.rb similarity index 76% rename from lib/fog/identity/openstack/v3/models/domains.rb rename to lib/fog/openstack/identity/v3/models/domains.rb index 58c02e2be..43d33c12f 100644 --- a/lib/fog/identity/openstack/v3/models/domains.rb +++ b/lib/fog/openstack/identity/v3/models/domains.rb @@ -1,26 +1,26 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/domain' +require 'fog/openstack/identity/v3/models/domain' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Domains < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Domain + model Fog::OpenStack::Identity::V3::Domain def all(options = {}) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::Identity::OpenStack::V3::Domain.cache[{:token => service.auth_token, + cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, :options => options}] return cached_domain if cached_domain && expires > Time.now end domain_to_cache = load_response(service.list_domains(options), 'domains') if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Domain.cache + cache = Fog::OpenStack::Identity::V3::Domain.cache cache[{:token => service.auth_token, :options => options}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] - Fog::Identity::OpenStack::V3::Domain.cache = cache + Fog::OpenStack::Identity::V3::Domain.cache = cache end domain_to_cache end @@ -35,19 +35,19 @@ def auth_domains(options = {}) def find_by_id(id) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::Identity::OpenStack::V3::Domain.cache[{:token => service.auth_token, + cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, :id => id}] return cached_domain if cached_domain && expires > Time.now end domain_hash = service.get_domain(id).body['domain'] - domain_to_cache = Fog::Identity::OpenStack::V3::Domain.new( + domain_to_cache = Fog::OpenStack::Identity::V3::Domain.new( domain_hash.merge(:service => service) ) if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Domain.cache + cache = Fog::OpenStack::Identity::V3::Domain.cache cache[{:token => service.auth_token, :id => id}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] - Fog::Identity::OpenStack::V3::Domain.cache = cache + Fog::OpenStack::Identity::V3::Domain.cache = cache end domain_to_cache end diff --git a/lib/fog/identity/openstack/v3/models/endpoint.rb b/lib/fog/openstack/identity/v3/models/endpoint.rb similarity index 96% rename from lib/fog/identity/openstack/v3/models/endpoint.rb rename to lib/fog/openstack/identity/v3/models/endpoint.rb index 5b71e7103..1d735187b 100644 --- a/lib/fog/identity/openstack/v3/models/endpoint.rb +++ b/lib/fog/openstack/identity/v3/models/endpoint.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Endpoint < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/endpoints.rb b/lib/fog/openstack/identity/v3/models/endpoints.rb similarity index 74% rename from lib/fog/identity/openstack/v3/models/endpoints.rb rename to lib/fog/openstack/identity/v3/models/endpoints.rb index 3ba08aaf9..4351b5984 100644 --- a/lib/fog/identity/openstack/v3/models/endpoints.rb +++ b/lib/fog/openstack/identity/v3/models/endpoints.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/service' +require 'fog/openstack/identity/v3/models/service' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Endpoints < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Endpoint + model Fog::OpenStack::Identity::V3::Endpoint def all(options = {}) load_response(service.list_endpoints(options), 'endpoints') @@ -16,7 +16,7 @@ def find_by_id(id) cached_endpoint = find { |endpoint| endpoint.id == id } return cached_endpoint if cached_endpoint endpoint_hash = service.get_endpoint(id).body['endpoint'] - Fog::Identity::OpenStack::V3::Endpoint.new( + Fog::OpenStack::Identity::V3::Endpoint.new( endpoint_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/group.rb b/lib/fog/openstack/identity/v3/models/group.rb similarity index 93% rename from lib/fog/identity/openstack/v3/models/group.rb rename to lib/fog/openstack/identity/v3/models/group.rb index 7448ec376..46b7c7a00 100644 --- a/lib/fog/identity/openstack/v3/models/group.rb +++ b/lib/fog/openstack/identity/v3/models/group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Group < Fog::OpenStack::Model identity :id @@ -52,7 +52,7 @@ def contains_user?(user_id) requires :id begin service.group_user_check(id, user_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true @@ -72,7 +72,7 @@ def check_role(role_id) requires :id, :domain_id begin service.check_domain_group_role(domain_id, id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true diff --git a/lib/fog/identity/openstack/v3/models/groups.rb b/lib/fog/openstack/identity/v3/models/groups.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/groups.rb rename to lib/fog/openstack/identity/v3/models/groups.rb index 8185e1c9f..9af758aae 100644 --- a/lib/fog/identity/openstack/v3/models/groups.rb +++ b/lib/fog/openstack/identity/v3/models/groups.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/group' +require 'fog/openstack/identity/v3/models/group' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Groups < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Group + model Fog::OpenStack::Identity::V3::Group def all(options = {}) load_response(service.list_groups(options), 'groups') @@ -16,7 +16,7 @@ def find_by_id(id) cached_group = find { |group| group.id == id } return cached_group if cached_group group_hash = service.get_group(id).body['group'] - Fog::Identity::OpenStack::V3.group.new( + Fog::OpenStack::Identity::V3.group.new( group_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/os_credential.rb b/lib/fog/openstack/identity/v3/models/os_credential.rb similarity index 97% rename from lib/fog/identity/openstack/v3/models/os_credential.rb rename to lib/fog/openstack/identity/v3/models/os_credential.rb index 0b84470e8..70efbf741 100644 --- a/lib/fog/identity/openstack/v3/models/os_credential.rb +++ b/lib/fog/openstack/identity/v3/models/os_credential.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class OsCredential < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/os_credentials.rb b/lib/fog/openstack/identity/v3/models/os_credentials.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/os_credentials.rb rename to lib/fog/openstack/identity/v3/models/os_credentials.rb index b8de44bde..afa764fdd 100644 --- a/lib/fog/identity/openstack/v3/models/os_credentials.rb +++ b/lib/fog/openstack/identity/v3/models/os_credentials.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/os_credential' +require 'fog/openstack/identity/v3/models/os_credential' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class OsCredentials < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::OsCredential + model Fog::OpenStack::Identity::V3::OsCredential def all(options = {}) load_response(service.list_os_credentials(options), 'credentials') @@ -16,7 +16,7 @@ def find_by_id(id) cached_credential = find { |credential| credential.id == id } return cached_credential if cached_credential credential_hash = service.get_os_credential(id).body['credential'] - Fog::Identity::OpenStack::V3::Credential.new( + Fog::OpenStack::Identity::V3::Credential.new( credential_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/policies.rb b/lib/fog/openstack/identity/v3/models/policies.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/policies.rb rename to lib/fog/openstack/identity/v3/models/policies.rb index 08dce3d0e..9641bc30a 100644 --- a/lib/fog/identity/openstack/v3/models/policies.rb +++ b/lib/fog/openstack/identity/v3/models/policies.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/policy' +require 'fog/openstack/identity/v3/models/policy' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Policies < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Policy + model Fog::OpenStack::Identity::V3::Policy def all(options = {}) load_response(service.list_policies(options), 'policies') @@ -16,7 +16,7 @@ def find_by_id(id) cached_policy = find { |policy| policy.id == id } return cached_policy if cached_policy policy_hash = service.get_policy(id).body['policy'] - Fog::Identity::OpenStack::V3::Policy.new( + Fog::OpenStack::Identity::V3::Policy.new( policy_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/policy.rb b/lib/fog/openstack/identity/v3/models/policy.rb similarity index 95% rename from lib/fog/identity/openstack/v3/models/policy.rb rename to lib/fog/openstack/identity/v3/models/policy.rb index e136c6312..a642994a0 100644 --- a/lib/fog/identity/openstack/v3/models/policy.rb +++ b/lib/fog/openstack/identity/v3/models/policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Policy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/project.rb b/lib/fog/openstack/identity/v3/models/project.rb similarity index 94% rename from lib/fog/identity/openstack/v3/models/project.rb rename to lib/fog/openstack/identity/v3/models/project.rb index b3d53ddb3..5abcc3dca 100644 --- a/lib/fog/identity/openstack/v3/models/project.rb +++ b/lib/fog/openstack/identity/v3/models/project.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Project < Fog::OpenStack::Model identity :id @@ -65,7 +65,7 @@ def check_user_role(user_id, role_id) requires :id begin service.check_project_user_role(id, user_id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true @@ -92,7 +92,7 @@ def check_group_role(group_id, role_id) requires :id begin service.check_project_group_role(id, group_id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true diff --git a/lib/fog/identity/openstack/v3/models/projects.rb b/lib/fog/openstack/identity/v3/models/projects.rb similarity index 81% rename from lib/fog/identity/openstack/v3/models/projects.rb rename to lib/fog/openstack/identity/v3/models/projects.rb index b1d413221..fd13515c3 100644 --- a/lib/fog/identity/openstack/v3/models/projects.rb +++ b/lib/fog/openstack/identity/v3/models/projects.rb @@ -1,26 +1,26 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/project' +require 'fog/openstack/identity/v3/models/project' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Projects < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Project + model Fog::OpenStack::Identity::V3::Project def all(options = {}) if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::Identity::OpenStack::V3::Project.cache[{:token => service.auth_token, + cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, :options => options}] return cached_project if cached_project && expires > Time.now end project_to_cache = load_response(service.list_projects(options), 'projects') if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Project.cache + cache = Fog::OpenStack::Identity::V3::Project.cache cache[{:token => service.auth_token, :options => options}] = [project_to_cache, Time.now + service.openstack_cache_ttl] - Fog::Identity::OpenStack::V3::Project.cache = cache + Fog::OpenStack::Identity::V3::Project.cache = cache end project_to_cache end @@ -39,7 +39,7 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree end if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::Identity::OpenStack::V3::Project.cache[{:token => service.auth_token, + cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, :id => id, :options => options}] return cached_project if cached_project && expires > Time.now @@ -54,11 +54,11 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree end if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Project.cache + cache = Fog::OpenStack::Identity::V3::Project.cache cache[{:token => service.auth_token, :id => id, :options => options}] = [ top_project, Time.now + service.openstack_cache_ttl ] - Fog::Identity::OpenStack::V3::Project.cache = cache + Fog::OpenStack::Identity::V3::Project.cache = cache end top_project end @@ -66,7 +66,7 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree private def project_from_hash(project_hash, service) - Fog::Identity::OpenStack::V3::Project.new(project_hash.merge(:service => service)) + Fog::OpenStack::Identity::V3::Project.new(project_hash.merge(:service => service)) end end end diff --git a/lib/fog/identity/openstack/v3/models/role.rb b/lib/fog/openstack/identity/v3/models/role.rb similarity index 95% rename from lib/fog/identity/openstack/v3/models/role.rb rename to lib/fog/openstack/identity/v3/models/role.rb index 024b251b4..67a4414a2 100644 --- a/lib/fog/identity/openstack/v3/models/role.rb +++ b/lib/fog/openstack/identity/v3/models/role.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Role < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/role_assignment.rb b/lib/fog/openstack/identity/v3/models/role_assignment.rb similarity index 90% rename from lib/fog/identity/openstack/v3/models/role_assignment.rb rename to lib/fog/openstack/identity/v3/models/role_assignment.rb index 0fe981a00..2e8fc4df9 100644 --- a/lib/fog/identity/openstack/v3/models/role_assignment.rb +++ b/lib/fog/openstack/identity/v3/models/role_assignment.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class RoleAssignment < Fog::OpenStack::Model attribute :scope diff --git a/lib/fog/identity/openstack/v3/models/role_assignments.rb b/lib/fog/openstack/identity/v3/models/role_assignments.rb similarity index 82% rename from lib/fog/identity/openstack/v3/models/role_assignments.rb rename to lib/fog/openstack/identity/v3/models/role_assignments.rb index 5ebaa7f01..e1777c25f 100644 --- a/lib/fog/identity/openstack/v3/models/role_assignments.rb +++ b/lib/fog/openstack/identity/v3/models/role_assignments.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/role' +require 'fog/openstack/identity/v3/models/role' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class RoleAssignments < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::RoleAssignment + model Fog::OpenStack::Identity::V3::RoleAssignment def all(options = {}) load_response(service.list_role_assignments(options), 'role_assignments') diff --git a/lib/fog/identity/openstack/v3/models/roles.rb b/lib/fog/openstack/identity/v3/models/roles.rb similarity index 86% rename from lib/fog/identity/openstack/v3/models/roles.rb rename to lib/fog/openstack/identity/v3/models/roles.rb index 0b6a8cfbe..707fddc8d 100644 --- a/lib/fog/identity/openstack/v3/models/roles.rb +++ b/lib/fog/openstack/identity/v3/models/roles.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/role' +require 'fog/openstack/identity/v3/models/role' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Roles < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Role + model Fog::OpenStack::Identity::V3::Role def all(options = {}) load_response(service.list_roles(options), 'roles') @@ -24,7 +24,7 @@ def find_by_id(id) cached_role = find { |role| role.id == id } return cached_role if cached_role role_hash = service.get_role(id).body['role'] - Fog::Identity::OpenStack::V3.role.new( + Fog::OpenStack::Identity::V3.role.new( role_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/service.rb b/lib/fog/openstack/identity/v3/models/service.rb similarity index 96% rename from lib/fog/identity/openstack/v3/models/service.rb rename to lib/fog/openstack/identity/v3/models/service.rb index a06ef8a43..15d0249ca 100644 --- a/lib/fog/identity/openstack/v3/models/service.rb +++ b/lib/fog/openstack/identity/v3/models/service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Service < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/services.rb b/lib/fog/openstack/identity/v3/models/services.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/services.rb rename to lib/fog/openstack/identity/v3/models/services.rb index d9dc4a982..c60569839 100644 --- a/lib/fog/identity/openstack/v3/models/services.rb +++ b/lib/fog/openstack/identity/v3/models/services.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/service' +require 'fog/openstack/identity/v3/models/service' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Services < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Service + model Fog::OpenStack::Identity::V3::Service def all(options = {}) load_response(service.list_services(options), 'services') @@ -16,7 +16,7 @@ def find_by_id(id) cached_service = find { |service| service.id == id } return cached_service if cached_service service_hash = service.get_service(id).body['service'] - Fog::Identity::OpenStack::V3::Service.new( + Fog::OpenStack::Identity::V3::Service.new( service_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/token.rb b/lib/fog/openstack/identity/v3/models/token.rb similarity index 91% rename from lib/fog/identity/openstack/v3/models/token.rb rename to lib/fog/openstack/identity/v3/models/token.rb index 5c2392684..7e15c5fc1 100644 --- a/lib/fog/identity/openstack/v3/models/token.rb +++ b/lib/fog/openstack/identity/v3/models/token.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Token < Fog::OpenStack::Model attribute :value diff --git a/lib/fog/identity/openstack/v3/models/tokens.rb b/lib/fog/openstack/identity/v3/models/tokens.rb similarity index 78% rename from lib/fog/identity/openstack/v3/models/tokens.rb rename to lib/fog/openstack/identity/v3/models/tokens.rb index b07ea92ac..028eb9a8e 100644 --- a/lib/fog/identity/openstack/v3/models/tokens.rb +++ b/lib/fog/openstack/identity/v3/models/tokens.rb @@ -1,17 +1,17 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/service' +require 'fog/openstack/identity/v3/models/service' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Tokens < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Token + model Fog::OpenStack::Identity::V3::Token def authenticate(auth) response = service.token_authenticate(auth) token_hash = response.body['token'] - Fog::Identity::OpenStack::V3::Token.new( + Fog::OpenStack::Identity::V3::Token.new( token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) ) end @@ -19,7 +19,7 @@ def authenticate(auth) def validate(subject_token) response = service.token_validate(subject_token) token_hash = response.body['token'] - Fog::Identity::OpenStack::V3::Token.new( + Fog::OpenStack::Identity::V3::Token.new( token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) ) end diff --git a/lib/fog/identity/openstack/v3/models/user.rb b/lib/fog/openstack/identity/v3/models/user.rb similarity index 95% rename from lib/fog/identity/openstack/v3/models/user.rb rename to lib/fog/openstack/identity/v3/models/user.rb index cf2ee4b59..70a677f90 100644 --- a/lib/fog/identity/openstack/v3/models/user.rb +++ b/lib/fog/openstack/identity/v3/models/user.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class User < Fog::OpenStack::Model identity :id @@ -44,7 +44,7 @@ def check_role(role_id) requires :id, :domain_id begin service.check_domain_user_role(domain_id, id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true diff --git a/lib/fog/identity/openstack/v3/models/users.rb b/lib/fog/openstack/identity/v3/models/users.rb similarity index 80% rename from lib/fog/identity/openstack/v3/models/users.rb rename to lib/fog/openstack/identity/v3/models/users.rb index 9dc92a22c..109476747 100644 --- a/lib/fog/identity/openstack/v3/models/users.rb +++ b/lib/fog/openstack/identity/v3/models/users.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/domain' +require 'fog/openstack/identity/v3/models/domain' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Users < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::User + model Fog::OpenStack::Identity::V3::User def all(options = {}) load_response(service.list_users(options), 'users') @@ -16,7 +16,7 @@ def find_by_id(id) cached_user = find { |user| user.id == id } return cached_user if cached_user user_hash = service.get_user(id).body['user'] - Fog::Identity::OpenStack::V3::User.new( + Fog::OpenStack::Identity::V3::User.new( user_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/requests/add_user_to_group.rb b/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/add_user_to_group.rb rename to lib/fog/openstack/identity/v3/requests/add_user_to_group.rb index 03a55d02f..852191bf0 100644 --- a/lib/fog/identity/openstack/v3/requests/add_user_to_group.rb +++ b/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def add_user_to_group(group_id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/auth_domains.rb b/lib/fog/openstack/identity/v3/requests/auth_domains.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/auth_domains.rb rename to lib/fog/openstack/identity/v3/requests/auth_domains.rb index 176214f5a..883a386ed 100644 --- a/lib/fog/identity/openstack/v3/requests/auth_domains.rb +++ b/lib/fog/openstack/identity/v3/requests/auth_domains.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def auth_domains(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/auth_projects.rb b/lib/fog/openstack/identity/v3/requests/auth_projects.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/auth_projects.rb rename to lib/fog/openstack/identity/v3/requests/auth_projects.rb index 2cd4c3455..f4861a39d 100644 --- a/lib/fog/identity/openstack/v3/requests/auth_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/auth_projects.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def auth_projects(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb rename to lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb index eb69a9dca..63f84fd99 100644 --- a/lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb rename to lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb index 8c842b1e8..ea40b6541 100644 --- a/lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/check_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_project_group_role.rb rename to lib/fog/openstack/identity/v3/requests/check_project_group_role.rb index 22895db06..d3a84af5b 100644 --- a/lib/fog/identity/openstack/v3/requests/check_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_project_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/check_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_project_user_role.rb rename to lib/fog/openstack/identity/v3/requests/check_project_user_role.rb index 1ee3415ee..36da39e1a 100644 --- a/lib/fog/identity/openstack/v3/requests/check_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_project_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/create_domain.rb b/lib/fog/openstack/identity/v3/requests/create_domain.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_domain.rb rename to lib/fog/openstack/identity/v3/requests/create_domain.rb index aabe7d2fa..cf2403dd9 100644 --- a/lib/fog/identity/openstack/v3/requests/create_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/create_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_domain(domain) diff --git a/lib/fog/identity/openstack/v3/requests/create_endpoint.rb b/lib/fog/openstack/identity/v3/requests/create_endpoint.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/create_endpoint.rb index ac57e58f4..d1f3e8017 100644 --- a/lib/fog/identity/openstack/v3/requests/create_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/create_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_endpoint(endpoint) diff --git a/lib/fog/identity/openstack/v3/requests/create_group.rb b/lib/fog/openstack/identity/v3/requests/create_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_group.rb rename to lib/fog/openstack/identity/v3/requests/create_group.rb index 74db0225b..5411edcc4 100644 --- a/lib/fog/identity/openstack/v3/requests/create_group.rb +++ b/lib/fog/openstack/identity/v3/requests/create_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_group(group) diff --git a/lib/fog/identity/openstack/v3/requests/create_os_credential.rb b/lib/fog/openstack/identity/v3/requests/create_os_credential.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/create_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/create_os_credential.rb index 9cfa4a030..61d555c16 100644 --- a/lib/fog/identity/openstack/v3/requests/create_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/create_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_os_credential(credential) diff --git a/lib/fog/identity/openstack/v3/requests/create_policy.rb b/lib/fog/openstack/identity/v3/requests/create_policy.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_policy.rb rename to lib/fog/openstack/identity/v3/requests/create_policy.rb index 46e719ac4..125d8354d 100644 --- a/lib/fog/identity/openstack/v3/requests/create_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/create_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_policy(policy) diff --git a/lib/fog/identity/openstack/v3/requests/create_project.rb b/lib/fog/openstack/identity/v3/requests/create_project.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_project.rb rename to lib/fog/openstack/identity/v3/requests/create_project.rb index 729dab287..1fcf1e21a 100644 --- a/lib/fog/identity/openstack/v3/requests/create_project.rb +++ b/lib/fog/openstack/identity/v3/requests/create_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_project(project) diff --git a/lib/fog/identity/openstack/v3/requests/create_role.rb b/lib/fog/openstack/identity/v3/requests/create_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_role.rb rename to lib/fog/openstack/identity/v3/requests/create_role.rb index 5ca245be4..e985bddae 100644 --- a/lib/fog/identity/openstack/v3/requests/create_role.rb +++ b/lib/fog/openstack/identity/v3/requests/create_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_role(role) diff --git a/lib/fog/identity/openstack/v3/requests/create_service.rb b/lib/fog/openstack/identity/v3/requests/create_service.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_service.rb rename to lib/fog/openstack/identity/v3/requests/create_service.rb index 6dc675a54..d765fdbb1 100644 --- a/lib/fog/identity/openstack/v3/requests/create_service.rb +++ b/lib/fog/openstack/identity/v3/requests/create_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_service(service) diff --git a/lib/fog/identity/openstack/v3/requests/create_user.rb b/lib/fog/openstack/identity/v3/requests/create_user.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_user.rb rename to lib/fog/openstack/identity/v3/requests/create_user.rb index cd80365ef..841d689d3 100644 --- a/lib/fog/identity/openstack/v3/requests/create_user.rb +++ b/lib/fog/openstack/identity/v3/requests/create_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_user(user) diff --git a/lib/fog/identity/openstack/v3/requests/delete_domain.rb b/lib/fog/openstack/identity/v3/requests/delete_domain.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_domain.rb rename to lib/fog/openstack/identity/v3/requests/delete_domain.rb index e99823e14..d2eb6d06c 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_domain(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_endpoint.rb b/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/delete_endpoint.rb index b86802d82..57023a664 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_endpoint(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_group.rb b/lib/fog/openstack/identity/v3/requests/delete_group.rb similarity index 88% rename from lib/fog/identity/openstack/v3/requests/delete_group.rb rename to lib/fog/openstack/identity/v3/requests/delete_group.rb index 1aad1f448..d494c5794 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_group.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_group(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_os_credential.rb b/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/delete_os_credential.rb index 7caf39d2a..45b9223f2 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_os_credential(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_policy.rb b/lib/fog/openstack/identity/v3/requests/delete_policy.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_policy.rb rename to lib/fog/openstack/identity/v3/requests/delete_policy.rb index e0a211aa1..3264965b4 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_policy(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_project.rb b/lib/fog/openstack/identity/v3/requests/delete_project.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_project.rb rename to lib/fog/openstack/identity/v3/requests/delete_project.rb index 0cc3c07d0..634186beb 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_project.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_project(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_role.rb b/lib/fog/openstack/identity/v3/requests/delete_role.rb similarity index 88% rename from lib/fog/identity/openstack/v3/requests/delete_role.rb rename to lib/fog/openstack/identity/v3/requests/delete_role.rb index 9b4e64244..0a5baf05d 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_role.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_role(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_service.rb b/lib/fog/openstack/identity/v3/requests/delete_service.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_service.rb rename to lib/fog/openstack/identity/v3/requests/delete_service.rb index 6ede4eb30..16761e478 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_service.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_service(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_user.rb b/lib/fog/openstack/identity/v3/requests/delete_user.rb similarity index 88% rename from lib/fog/identity/openstack/v3/requests/delete_user.rb rename to lib/fog/openstack/identity/v3/requests/delete_user.rb index b08fd457a..eef6ee128 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_user.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_user(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_domain.rb b/lib/fog/openstack/identity/v3/requests/get_domain.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_domain.rb rename to lib/fog/openstack/identity/v3/requests/get_domain.rb index 3170fd640..0a2bd126f 100644 --- a/lib/fog/identity/openstack/v3/requests/get_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/get_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_domain(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_endpoint.rb b/lib/fog/openstack/identity/v3/requests/get_endpoint.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/get_endpoint.rb index b4860d18e..cd8fed07d 100644 --- a/lib/fog/identity/openstack/v3/requests/get_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/get_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_endpoint(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_group.rb b/lib/fog/openstack/identity/v3/requests/get_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_group.rb rename to lib/fog/openstack/identity/v3/requests/get_group.rb index 01b1fc210..706cc4880 100644 --- a/lib/fog/identity/openstack/v3/requests/get_group.rb +++ b/lib/fog/openstack/identity/v3/requests/get_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_group(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_os_credential.rb b/lib/fog/openstack/identity/v3/requests/get_os_credential.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/get_os_credential.rb index 2f049a51a..ed42db756 100644 --- a/lib/fog/identity/openstack/v3/requests/get_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/get_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_os_credential(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_policy.rb b/lib/fog/openstack/identity/v3/requests/get_policy.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_policy.rb rename to lib/fog/openstack/identity/v3/requests/get_policy.rb index ffddca73e..3bfb57755 100644 --- a/lib/fog/identity/openstack/v3/requests/get_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/get_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_policy(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_project.rb b/lib/fog/openstack/identity/v3/requests/get_project.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_project.rb rename to lib/fog/openstack/identity/v3/requests/get_project.rb index 1c93ab78d..1d6494491 100644 --- a/lib/fog/identity/openstack/v3/requests/get_project.rb +++ b/lib/fog/openstack/identity/v3/requests/get_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_project(id, options = []) diff --git a/lib/fog/identity/openstack/v3/requests/get_role.rb b/lib/fog/openstack/identity/v3/requests/get_role.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/get_role.rb rename to lib/fog/openstack/identity/v3/requests/get_role.rb index 78031e027..fecf25b45 100644 --- a/lib/fog/identity/openstack/v3/requests/get_role.rb +++ b/lib/fog/openstack/identity/v3/requests/get_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_role(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_service.rb b/lib/fog/openstack/identity/v3/requests/get_service.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_service.rb rename to lib/fog/openstack/identity/v3/requests/get_service.rb index 8c3408f54..0a83c3e88 100644 --- a/lib/fog/identity/openstack/v3/requests/get_service.rb +++ b/lib/fog/openstack/identity/v3/requests/get_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_service(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_user.rb b/lib/fog/openstack/identity/v3/requests/get_user.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/get_user.rb rename to lib/fog/openstack/identity/v3/requests/get_user.rb index a2200b3bb..93f119a01 100644 --- a/lib/fog/identity/openstack/v3/requests/get_user.rb +++ b/lib/fog/openstack/identity/v3/requests/get_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_user(id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb index c92301342..ed7d90405 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb index e23129e5f..b91bc7da4 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb index ffe442f01..99a5939b8 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_project_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb index 27ecd63fc..1dee70dba 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_project_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/group_user_check.rb b/lib/fog/openstack/identity/v3/requests/group_user_check.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/group_user_check.rb rename to lib/fog/openstack/identity/v3/requests/group_user_check.rb index 193292877..14a2b2001 100644 --- a/lib/fog/identity/openstack/v3/requests/group_user_check.rb +++ b/lib/fog/openstack/identity/v3/requests/group_user_check.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def group_user_check(group_id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb b/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb index 60126007b..3e0ff8620 100644 --- a/lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_domain_group_roles(id, group_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb b/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb index 26d7ce24f..a11a8e053 100644 --- a/lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_domain_user_roles(id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_domains.rb b/lib/fog/openstack/identity/v3/requests/list_domains.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_domains.rb rename to lib/fog/openstack/identity/v3/requests/list_domains.rb index f5a4d8480..884002d33 100644 --- a/lib/fog/identity/openstack/v3/requests/list_domains.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_domains(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_endpoints.rb b/lib/fog/openstack/identity/v3/requests/list_endpoints.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_endpoints.rb rename to lib/fog/openstack/identity/v3/requests/list_endpoints.rb index 7faf83f81..c72e27f10 100644 --- a/lib/fog/identity/openstack/v3/requests/list_endpoints.rb +++ b/lib/fog/openstack/identity/v3/requests/list_endpoints.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_endpoints(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_group_users.rb b/lib/fog/openstack/identity/v3/requests/list_group_users.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_group_users.rb rename to lib/fog/openstack/identity/v3/requests/list_group_users.rb index 25e4b43ea..a474bced0 100644 --- a/lib/fog/identity/openstack/v3/requests/list_group_users.rb +++ b/lib/fog/openstack/identity/v3/requests/list_group_users.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_group_users(id, options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_groups.rb b/lib/fog/openstack/identity/v3/requests/list_groups.rb similarity index 94% rename from lib/fog/identity/openstack/v3/requests/list_groups.rb rename to lib/fog/openstack/identity/v3/requests/list_groups.rb index d43290761..ab54244cd 100644 --- a/lib/fog/identity/openstack/v3/requests/list_groups.rb +++ b/lib/fog/openstack/identity/v3/requests/list_groups.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_groups(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_os_credentials.rb b/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_os_credentials.rb rename to lib/fog/openstack/identity/v3/requests/list_os_credentials.rb index 1aac07f95..bf74399fb 100644 --- a/lib/fog/identity/openstack/v3/requests/list_os_credentials.rb +++ b/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_os_credentials(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_policies.rb b/lib/fog/openstack/identity/v3/requests/list_policies.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_policies.rb rename to lib/fog/openstack/identity/v3/requests/list_policies.rb index 011234d83..acd7be6ed 100644 --- a/lib/fog/identity/openstack/v3/requests/list_policies.rb +++ b/lib/fog/openstack/identity/v3/requests/list_policies.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_policies(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb b/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb index 138e6fa57..87f37aa4b 100644 --- a/lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_project_group_roles(id, group_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb b/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb index a715334f8..cdcdae06a 100644 --- a/lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_project_user_roles(id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_projects.rb b/lib/fog/openstack/identity/v3/requests/list_projects.rb similarity index 94% rename from lib/fog/identity/openstack/v3/requests/list_projects.rb rename to lib/fog/openstack/identity/v3/requests/list_projects.rb index cd05fb71f..25edd6a79 100644 --- a/lib/fog/identity/openstack/v3/requests/list_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/list_projects.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_projects(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_role_assignments.rb b/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb similarity index 96% rename from lib/fog/identity/openstack/v3/requests/list_role_assignments.rb rename to lib/fog/openstack/identity/v3/requests/list_role_assignments.rb index 3b64bfe81..49611fadd 100644 --- a/lib/fog/identity/openstack/v3/requests/list_role_assignments.rb +++ b/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_role_assignments(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_roles.rb b/lib/fog/openstack/identity/v3/requests/list_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_roles.rb index da2ddd31c..e9a538311 100644 --- a/lib/fog/identity/openstack/v3/requests/list_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_roles(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_services.rb b/lib/fog/openstack/identity/v3/requests/list_services.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_services.rb rename to lib/fog/openstack/identity/v3/requests/list_services.rb index a822a3779..b0e0c446f 100644 --- a/lib/fog/identity/openstack/v3/requests/list_services.rb +++ b/lib/fog/openstack/identity/v3/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_services(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_user_groups.rb b/lib/fog/openstack/identity/v3/requests/list_user_groups.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/list_user_groups.rb rename to lib/fog/openstack/identity/v3/requests/list_user_groups.rb index 7e6a90ed3..a6d6ac77e 100644 --- a/lib/fog/identity/openstack/v3/requests/list_user_groups.rb +++ b/lib/fog/openstack/identity/v3/requests/list_user_groups.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_user_groups(user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_user_projects.rb b/lib/fog/openstack/identity/v3/requests/list_user_projects.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_user_projects.rb rename to lib/fog/openstack/identity/v3/requests/list_user_projects.rb index e4079e011..cf96a30a0 100644 --- a/lib/fog/identity/openstack/v3/requests/list_user_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/list_user_projects.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_user_projects(user_id, options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_users.rb b/lib/fog/openstack/identity/v3/requests/list_users.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_users.rb rename to lib/fog/openstack/identity/v3/requests/list_users.rb index 017496dcb..0a5159a85 100644 --- a/lib/fog/identity/openstack/v3/requests/list_users.rb +++ b/lib/fog/openstack/identity/v3/requests/list_users.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_users(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb b/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb rename to lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb index 8f162eb98..f9b770883 100644 --- a/lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb +++ b/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def remove_user_from_group(group_id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb index 7f04ea149..0e69b4a2d 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb index ded732f45..2aac1107f 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb index 3bb8b6d86..f069db266 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_project_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb index e32e1b851..6262bfec9 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_project_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/token_authenticate.rb b/lib/fog/openstack/identity/v3/requests/token_authenticate.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/token_authenticate.rb rename to lib/fog/openstack/identity/v3/requests/token_authenticate.rb index b8135513c..d6facf733 100644 --- a/lib/fog/identity/openstack/v3/requests/token_authenticate.rb +++ b/lib/fog/openstack/identity/v3/requests/token_authenticate.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_authenticate(auth) diff --git a/lib/fog/identity/openstack/v3/requests/token_check.rb b/lib/fog/openstack/identity/v3/requests/token_check.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/token_check.rb rename to lib/fog/openstack/identity/v3/requests/token_check.rb index d8d69ad8b..5f850af1d 100644 --- a/lib/fog/identity/openstack/v3/requests/token_check.rb +++ b/lib/fog/openstack/identity/v3/requests/token_check.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_check(subject_token) diff --git a/lib/fog/identity/openstack/v3/requests/token_revoke.rb b/lib/fog/openstack/identity/v3/requests/token_revoke.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/token_revoke.rb rename to lib/fog/openstack/identity/v3/requests/token_revoke.rb index c93c96040..e1c0b6f97 100644 --- a/lib/fog/identity/openstack/v3/requests/token_revoke.rb +++ b/lib/fog/openstack/identity/v3/requests/token_revoke.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_revoke(subject_token) diff --git a/lib/fog/identity/openstack/v3/requests/token_validate.rb b/lib/fog/openstack/identity/v3/requests/token_validate.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/token_validate.rb rename to lib/fog/openstack/identity/v3/requests/token_validate.rb index f19d04b5f..c2b842753 100644 --- a/lib/fog/identity/openstack/v3/requests/token_validate.rb +++ b/lib/fog/openstack/identity/v3/requests/token_validate.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_validate(subject_token) diff --git a/lib/fog/identity/openstack/v3/requests/update_domain.rb b/lib/fog/openstack/identity/v3/requests/update_domain.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_domain.rb rename to lib/fog/openstack/identity/v3/requests/update_domain.rb index 28e96ca71..7f430dec3 100644 --- a/lib/fog/identity/openstack/v3/requests/update_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/update_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_domain(id, domain) diff --git a/lib/fog/identity/openstack/v3/requests/update_endpoint.rb b/lib/fog/openstack/identity/v3/requests/update_endpoint.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/update_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/update_endpoint.rb index e66bfb646..e54a9725b 100644 --- a/lib/fog/identity/openstack/v3/requests/update_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/update_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_endpoint(id, endpoint) diff --git a/lib/fog/identity/openstack/v3/requests/update_group.rb b/lib/fog/openstack/identity/v3/requests/update_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_group.rb rename to lib/fog/openstack/identity/v3/requests/update_group.rb index 8ea59f3bc..e93f851c2 100644 --- a/lib/fog/identity/openstack/v3/requests/update_group.rb +++ b/lib/fog/openstack/identity/v3/requests/update_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_group(id, group) diff --git a/lib/fog/identity/openstack/v3/requests/update_os_credential.rb b/lib/fog/openstack/identity/v3/requests/update_os_credential.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/update_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/update_os_credential.rb index a547c3aae..74281369d 100644 --- a/lib/fog/identity/openstack/v3/requests/update_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/update_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_os_credential(id, credential) diff --git a/lib/fog/identity/openstack/v3/requests/update_policy.rb b/lib/fog/openstack/identity/v3/requests/update_policy.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_policy.rb rename to lib/fog/openstack/identity/v3/requests/update_policy.rb index 05653537b..ad2a19691 100644 --- a/lib/fog/identity/openstack/v3/requests/update_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/update_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_policy(id, policy) diff --git a/lib/fog/identity/openstack/v3/requests/update_project.rb b/lib/fog/openstack/identity/v3/requests/update_project.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_project.rb rename to lib/fog/openstack/identity/v3/requests/update_project.rb index aac584281..91e7e2150 100644 --- a/lib/fog/identity/openstack/v3/requests/update_project.rb +++ b/lib/fog/openstack/identity/v3/requests/update_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_project(id, project) diff --git a/lib/fog/identity/openstack/v3/requests/update_role.rb b/lib/fog/openstack/identity/v3/requests/update_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_role.rb rename to lib/fog/openstack/identity/v3/requests/update_role.rb index be463ed0a..a93e33291 100644 --- a/lib/fog/identity/openstack/v3/requests/update_role.rb +++ b/lib/fog/openstack/identity/v3/requests/update_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_role(id, role) diff --git a/lib/fog/identity/openstack/v3/requests/update_service.rb b/lib/fog/openstack/identity/v3/requests/update_service.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_service.rb rename to lib/fog/openstack/identity/v3/requests/update_service.rb index 1cb56876d..bdfc39f8f 100644 --- a/lib/fog/identity/openstack/v3/requests/update_service.rb +++ b/lib/fog/openstack/identity/v3/requests/update_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_service(id, service) diff --git a/lib/fog/identity/openstack/v3/requests/update_user.rb b/lib/fog/openstack/identity/v3/requests/update_user.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_user.rb rename to lib/fog/openstack/identity/v3/requests/update_user.rb index 1d9595029..9d928493d 100644 --- a/lib/fog/identity/openstack/v3/requests/update_user.rb +++ b/lib/fog/openstack/identity/v3/requests/update_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_user(id, user) diff --git a/lib/fog/openstack/image/image.rb b/lib/fog/openstack/image/image.rb new file mode 100644 index 000000000..7d9d9a20d --- /dev/null +++ b/lib/fog/openstack/image/image.rb @@ -0,0 +1,23 @@ + + +module Fog + module OpenStack + class Image < Fog::Service + autoload :V1, 'fog/openstack/image/v1' + autoload :V2, 'fog/openstack/image/v2' + + # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Image::V2 or a Fog::OpenStack::Image::V1, + # choosing the latest available + def self.new(args = {}) + @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] + if inspect == 'Fog::OpenStack::Image' + service = Fog::OpenStack::Image::V2.new(args) unless args.empty? + service ||= Fog::OpenStack::Image::V1.new(args) + else + service = Fog::Service.new(args) + end + service + end + end + end +end diff --git a/lib/fog/image/openstack/v1.rb b/lib/fog/openstack/image/v1.rb similarity index 94% rename from lib/fog/image/openstack/v1.rb rename to lib/fog/openstack/image/v1.rb index a08d1e51b..5c0183a4e 100644 --- a/lib/fog/image/openstack/v1.rb +++ b/lib/fog/openstack/image/v1.rb @@ -1,8 +1,8 @@ -require 'fog/image/openstack' +require 'fog/openstack/image/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 < Fog::Service SUPPORTED_VERSIONS = /v1(\.(0|1))*/ @@ -18,12 +18,12 @@ class V1 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/image/openstack/v1/models' + model_path 'fog/openstack/image/v1/models' model :image collection :images - request_path 'fog/image/openstack/v1/requests' + request_path 'fog/openstack/image/v1/requests' request :list_public_images request :list_public_images_detailed @@ -99,7 +99,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Image::OpenStack::NotFound + Fog::OpenStack::Image::NotFound end def default_endpoint_type diff --git a/lib/fog/image/openstack/v1/models/image.rb b/lib/fog/openstack/image/v1/models/image.rb similarity index 98% rename from lib/fog/image/openstack/v1/models/image.rb rename to lib/fog/openstack/image/v1/models/image.rb index 2d911e2a6..dfd3eae11 100644 --- a/lib/fog/image/openstack/v1/models/image.rb +++ b/lib/fog/openstack/image/v1/models/image.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Image < Fog::OpenStack::Model identity :id diff --git a/lib/fog/image/openstack/v1/models/images.rb b/lib/fog/openstack/image/v1/models/images.rb similarity index 94% rename from lib/fog/image/openstack/v1/models/images.rb rename to lib/fog/openstack/image/v1/models/images.rb index dee79dcb9..095a3a4a3 100644 --- a/lib/fog/image/openstack/v1/models/images.rb +++ b/lib/fog/openstack/image/v1/models/images.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/image/openstack/v1/models/image' +require 'fog/openstack/image/v1/models/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Images < Fog::OpenStack::Collection - model Fog::Image::OpenStack::V1::Image + model Fog::OpenStack::Image::V1::Image def all(options = {}) load_response(service.list_public_images_detailed(options), 'images') @@ -38,7 +38,7 @@ def find_by_id(id) params['properties'] = custom_properties new(params) - rescue Fog::Image::OpenStack::NotFound + rescue Fog::OpenStack::Image::NotFound nil end alias get find_by_id diff --git a/lib/fog/image/openstack/v1/requests/add_member_to_image.rb b/lib/fog/openstack/image/v1/requests/add_member_to_image.rb similarity index 93% rename from lib/fog/image/openstack/v1/requests/add_member_to_image.rb rename to lib/fog/openstack/image/v1/requests/add_member_to_image.rb index f6bbb33f0..9dec5a819 100644 --- a/lib/fog/image/openstack/v1/requests/add_member_to_image.rb +++ b/lib/fog/openstack/image/v1/requests/add_member_to_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def add_member_to_image(image_id, tenant_id) diff --git a/lib/fog/image/openstack/v1/requests/create_image.rb b/lib/fog/openstack/image/v1/requests/create_image.rb similarity index 98% rename from lib/fog/image/openstack/v1/requests/create_image.rb rename to lib/fog/openstack/image/v1/requests/create_image.rb index 23f515b45..16306b353 100644 --- a/lib/fog/image/openstack/v1/requests/create_image.rb +++ b/lib/fog/openstack/image/v1/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def create_image(attributes) diff --git a/lib/fog/image/openstack/v1/requests/delete_image.rb b/lib/fog/openstack/image/v1/requests/delete_image.rb similarity index 93% rename from lib/fog/image/openstack/v1/requests/delete_image.rb rename to lib/fog/openstack/image/v1/requests/delete_image.rb index 5e64ecd0d..36393e08b 100644 --- a/lib/fog/image/openstack/v1/requests/delete_image.rb +++ b/lib/fog/openstack/image/v1/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def delete_image(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_image.rb b/lib/fog/openstack/image/v1/requests/get_image.rb similarity index 98% rename from lib/fog/image/openstack/v1/requests/get_image.rb rename to lib/fog/openstack/image/v1/requests/get_image.rb index 69db152ac..87a68789f 100644 --- a/lib/fog/image/openstack/v1/requests/get_image.rb +++ b/lib/fog/openstack/image/v1/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_image(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_image_by_id.rb b/lib/fog/openstack/image/v1/requests/get_image_by_id.rb similarity index 97% rename from lib/fog/image/openstack/v1/requests/get_image_by_id.rb rename to lib/fog/openstack/image/v1/requests/get_image_by_id.rb index 9c2c32e92..ef9441edf 100644 --- a/lib/fog/image/openstack/v1/requests/get_image_by_id.rb +++ b/lib/fog/openstack/image/v1/requests/get_image_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_image_by_id(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_image_members.rb b/lib/fog/openstack/image/v1/requests/get_image_members.rb similarity index 95% rename from lib/fog/image/openstack/v1/requests/get_image_members.rb rename to lib/fog/openstack/image/v1/requests/get_image_members.rb index 55f4917c4..89b479b53 100644 --- a/lib/fog/image/openstack/v1/requests/get_image_members.rb +++ b/lib/fog/openstack/image/v1/requests/get_image_members.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_image_members(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_shared_images.rb b/lib/fog/openstack/image/v1/requests/get_shared_images.rb similarity index 95% rename from lib/fog/image/openstack/v1/requests/get_shared_images.rb rename to lib/fog/openstack/image/v1/requests/get_shared_images.rb index 82a4bec92..5c25aac42 100644 --- a/lib/fog/image/openstack/v1/requests/get_shared_images.rb +++ b/lib/fog/openstack/image/v1/requests/get_shared_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_shared_images(tenant_id) diff --git a/lib/fog/image/openstack/v1/requests/list_public_images.rb b/lib/fog/openstack/image/v1/requests/list_public_images.rb similarity index 96% rename from lib/fog/image/openstack/v1/requests/list_public_images.rb rename to lib/fog/openstack/image/v1/requests/list_public_images.rb index 3e48e1557..34fd231ec 100644 --- a/lib/fog/image/openstack/v1/requests/list_public_images.rb +++ b/lib/fog/openstack/image/v1/requests/list_public_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def list_public_images(options = {}) diff --git a/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb b/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb similarity index 96% rename from lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb rename to lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb index 3e3423553..d6c18c623 100644 --- a/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb +++ b/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def list_public_images_detailed(options = {}, query_deprecated = nil) diff --git a/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb b/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb similarity index 94% rename from lib/fog/image/openstack/v1/requests/remove_member_from_image.rb rename to lib/fog/openstack/image/v1/requests/remove_member_from_image.rb index c23bae900..a40e457bb 100644 --- a/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb +++ b/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def remove_member_from_image(image_id, member_id) diff --git a/lib/fog/image/openstack/v1/requests/set_tenant.rb b/lib/fog/openstack/image/v1/requests/set_tenant.rb similarity index 90% rename from lib/fog/image/openstack/v1/requests/set_tenant.rb rename to lib/fog/openstack/image/v1/requests/set_tenant.rb index a65b20c12..e973c9bfa 100644 --- a/lib/fog/image/openstack/v1/requests/set_tenant.rb +++ b/lib/fog/openstack/image/v1/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def set_tenant(tenant) diff --git a/lib/fog/image/openstack/v1/requests/update_image.rb b/lib/fog/openstack/image/v1/requests/update_image.rb similarity index 98% rename from lib/fog/image/openstack/v1/requests/update_image.rb rename to lib/fog/openstack/image/v1/requests/update_image.rb index f0242576b..a7d0e238c 100644 --- a/lib/fog/image/openstack/v1/requests/update_image.rb +++ b/lib/fog/openstack/image/v1/requests/update_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def update_image(attributes) diff --git a/lib/fog/image/openstack/v1/requests/update_image_members.rb b/lib/fog/openstack/image/v1/requests/update_image_members.rb similarity index 96% rename from lib/fog/image/openstack/v1/requests/update_image_members.rb rename to lib/fog/openstack/image/v1/requests/update_image_members.rb index 3a2129ccd..65751cb34 100644 --- a/lib/fog/image/openstack/v1/requests/update_image_members.rb +++ b/lib/fog/openstack/image/v1/requests/update_image_members.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def update_image_members(image_id, members) diff --git a/lib/fog/image/openstack/v2.rb b/lib/fog/openstack/image/v2.rb similarity index 94% rename from lib/fog/image/openstack/v2.rb rename to lib/fog/openstack/image/v2.rb index b7cdc9f2e..f613988f9 100644 --- a/lib/fog/image/openstack/v2.rb +++ b/lib/fog/openstack/image/v2.rb @@ -1,8 +1,8 @@ -require 'fog/image/openstack' +require 'fog/openstack/image/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 < Fog::Service SUPPORTED_VERSIONS = /v2(\.(0|1|2|3))*/ @@ -18,12 +18,12 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/image/openstack/v2/models' + model_path 'fog/openstack/image/v2/models' model :image collection :images - request_path 'fog/image/openstack/v2/requests' + request_path 'fog/openstack/image/v2/requests' request :list_images request :get_image @@ -107,7 +107,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Image::OpenStack::NotFound + Fog::OpenStack::Image::NotFound end def default_endpoint_type diff --git a/lib/fog/image/openstack/v2/models/image.rb b/lib/fog/openstack/image/v2/models/image.rb similarity index 99% rename from lib/fog/image/openstack/v2/models/image.rb rename to lib/fog/openstack/image/v2/models/image.rb index 52a7b2768..69fcc0c99 100644 --- a/lib/fog/image/openstack/v2/models/image.rb +++ b/lib/fog/openstack/image/v2/models/image.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Image < Fog::OpenStack::Model identity :id diff --git a/lib/fog/image/openstack/v2/models/images.rb b/lib/fog/openstack/image/v2/models/images.rb similarity index 89% rename from lib/fog/image/openstack/v2/models/images.rb rename to lib/fog/openstack/image/v2/models/images.rb index f17bdfedf..4030816ac 100644 --- a/lib/fog/image/openstack/v2/models/images.rb +++ b/lib/fog/openstack/image/v2/models/images.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/image/openstack/v2/models/image' +require 'fog/openstack/image/v2/models/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Images < Fog::OpenStack::Collection - model Fog::Image::OpenStack::V2::Image + model Fog::OpenStack::Image::V2::Image def all(options = {}) load_response(service.list_images(options), 'images') @@ -18,7 +18,7 @@ def summary(options = {}) def find_by_id(id) new(service.get_image_by_id(id).body) - rescue Fog::Image::OpenStack::NotFound + rescue Fog::OpenStack::Image::NotFound nil end diff --git a/lib/fog/image/openstack/v2/requests/add_member_to_image.rb b/lib/fog/openstack/image/v2/requests/add_member_to_image.rb similarity index 94% rename from lib/fog/image/openstack/v2/requests/add_member_to_image.rb rename to lib/fog/openstack/image/v2/requests/add_member_to_image.rb index 1d867a234..512392f23 100644 --- a/lib/fog/image/openstack/v2/requests/add_member_to_image.rb +++ b/lib/fog/openstack/image/v2/requests/add_member_to_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def add_member_to_image(image_id, tenant_id) diff --git a/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb b/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/add_tag_to_image.rb rename to lib/fog/openstack/image/v2/requests/add_tag_to_image.rb index f22e6bdfb..682bd64de 100644 --- a/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb +++ b/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def add_tag_to_image(image_id, tag) diff --git a/lib/fog/image/openstack/v2/requests/create_image.rb b/lib/fog/openstack/image/v2/requests/create_image.rb similarity index 97% rename from lib/fog/image/openstack/v2/requests/create_image.rb rename to lib/fog/openstack/image/v2/requests/create_image.rb index a3864ee14..8c92fe7cb 100644 --- a/lib/fog/image/openstack/v2/requests/create_image.rb +++ b/lib/fog/openstack/image/v2/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def create_image(image) diff --git a/lib/fog/image/openstack/v2/requests/deactivate_image.rb b/lib/fog/openstack/image/v2/requests/deactivate_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/deactivate_image.rb rename to lib/fog/openstack/image/v2/requests/deactivate_image.rb index f6a7e37a1..02f8c2c43 100644 --- a/lib/fog/image/openstack/v2/requests/deactivate_image.rb +++ b/lib/fog/openstack/image/v2/requests/deactivate_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def deactivate_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/delete_image.rb b/lib/fog/openstack/image/v2/requests/delete_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/delete_image.rb rename to lib/fog/openstack/image/v2/requests/delete_image.rb index 257794741..8275cd351 100644 --- a/lib/fog/image/openstack/v2/requests/delete_image.rb +++ b/lib/fog/openstack/image/v2/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def delete_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/download_image.rb b/lib/fog/openstack/image/v2/requests/download_image.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/download_image.rb rename to lib/fog/openstack/image/v2/requests/download_image.rb index eb0d306cc..76924090d 100644 --- a/lib/fog/image/openstack/v2/requests/download_image.rb +++ b/lib/fog/openstack/image/v2/requests/download_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def download_image(image_id, _content_range = nil, params) # TODO: implement content range handling diff --git a/lib/fog/image/openstack/v2/requests/get_image.rb b/lib/fog/openstack/image/v2/requests/get_image.rb similarity index 98% rename from lib/fog/image/openstack/v2/requests/get_image.rb rename to lib/fog/openstack/image/v2/requests/get_image.rb index 0c84793f3..d686ef716 100644 --- a/lib/fog/image/openstack/v2/requests/get_image.rb +++ b/lib/fog/openstack/image/v2/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/get_image_by_id.rb b/lib/fog/openstack/image/v2/requests/get_image_by_id.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/get_image_by_id.rb rename to lib/fog/openstack/image/v2/requests/get_image_by_id.rb index ef7dbcbb7..4f9943347 100644 --- a/lib/fog/image/openstack/v2/requests/get_image_by_id.rb +++ b/lib/fog/openstack/image/v2/requests/get_image_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_image_by_id(image_id) diff --git a/lib/fog/image/openstack/v2/requests/get_image_members.rb b/lib/fog/openstack/image/v2/requests/get_image_members.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/get_image_members.rb rename to lib/fog/openstack/image/v2/requests/get_image_members.rb index 37fa276ba..9f788c7f4 100644 --- a/lib/fog/image/openstack/v2/requests/get_image_members.rb +++ b/lib/fog/openstack/image/v2/requests/get_image_members.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_image_members(image_id) diff --git a/lib/fog/image/openstack/v2/requests/get_member_details.rb b/lib/fog/openstack/image/v2/requests/get_member_details.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/get_member_details.rb rename to lib/fog/openstack/image/v2/requests/get_member_details.rb index 88bda499c..6d8942ead 100644 --- a/lib/fog/image/openstack/v2/requests/get_member_details.rb +++ b/lib/fog/openstack/image/v2/requests/get_member_details.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_member_details(image_id, member_id) diff --git a/lib/fog/image/openstack/v2/requests/get_shared_images.rb b/lib/fog/openstack/image/v2/requests/get_shared_images.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/get_shared_images.rb rename to lib/fog/openstack/image/v2/requests/get_shared_images.rb index 8812a5686..9f9479b41 100644 --- a/lib/fog/image/openstack/v2/requests/get_shared_images.rb +++ b/lib/fog/openstack/image/v2/requests/get_shared_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_shared_images(tenant_id) diff --git a/lib/fog/image/openstack/v2/requests/list_images.rb b/lib/fog/openstack/image/v2/requests/list_images.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/list_images.rb rename to lib/fog/openstack/image/v2/requests/list_images.rb index cd95d7a5f..e4ac2e794 100644 --- a/lib/fog/image/openstack/v2/requests/list_images.rb +++ b/lib/fog/openstack/image/v2/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def list_images(options = {}) diff --git a/lib/fog/image/openstack/v2/requests/reactivate_image.rb b/lib/fog/openstack/image/v2/requests/reactivate_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/reactivate_image.rb rename to lib/fog/openstack/image/v2/requests/reactivate_image.rb index b4877c8cd..49fc76802 100644 --- a/lib/fog/image/openstack/v2/requests/reactivate_image.rb +++ b/lib/fog/openstack/image/v2/requests/reactivate_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def reactivate_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb b/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb similarity index 94% rename from lib/fog/image/openstack/v2/requests/remove_member_from_image.rb rename to lib/fog/openstack/image/v2/requests/remove_member_from_image.rb index a9b7fba3a..ef5ee7b76 100644 --- a/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb +++ b/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def remove_member_from_image(image_id, member_id) diff --git a/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb b/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb rename to lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb index 32a22f3b3..e550f63d3 100644 --- a/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb +++ b/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def remove_tag_from_image(image_id, tag) diff --git a/lib/fog/image/openstack/v2/requests/set_tenant.rb b/lib/fog/openstack/image/v2/requests/set_tenant.rb similarity index 90% rename from lib/fog/image/openstack/v2/requests/set_tenant.rb rename to lib/fog/openstack/image/v2/requests/set_tenant.rb index 56f1445b7..90e408571 100644 --- a/lib/fog/image/openstack/v2/requests/set_tenant.rb +++ b/lib/fog/openstack/image/v2/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def set_tenant(tenant) diff --git a/lib/fog/image/openstack/v2/requests/update_image.rb b/lib/fog/openstack/image/v2/requests/update_image.rb similarity index 98% rename from lib/fog/image/openstack/v2/requests/update_image.rb rename to lib/fog/openstack/image/v2/requests/update_image.rb index 4891b1d53..cead9ed33 100644 --- a/lib/fog/image/openstack/v2/requests/update_image.rb +++ b/lib/fog/openstack/image/v2/requests/update_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def update_image(id, json_patch) diff --git a/lib/fog/image/openstack/v2/requests/update_image_member.rb b/lib/fog/openstack/image/v2/requests/update_image_member.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/update_image_member.rb rename to lib/fog/openstack/image/v2/requests/update_image_member.rb index eefc31a20..40fa17a2e 100644 --- a/lib/fog/image/openstack/v2/requests/update_image_member.rb +++ b/lib/fog/openstack/image/v2/requests/update_image_member.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def update_image_member(image_id, member) diff --git a/lib/fog/image/openstack/v2/requests/upload_image.rb b/lib/fog/openstack/image/v2/requests/upload_image.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/upload_image.rb rename to lib/fog/openstack/image/v2/requests/upload_image.rb index 65d0b20db..e0ef0906b 100644 --- a/lib/fog/image/openstack/v2/requests/upload_image.rb +++ b/lib/fog/openstack/image/v2/requests/upload_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def upload_image(image_id, body, params = {}) diff --git a/lib/fog/introspection/openstack.rb b/lib/fog/openstack/introspection/introspection.rb similarity index 85% rename from lib/fog/introspection/openstack.rb rename to lib/fog/openstack/introspection/introspection.rb index 0bd02278a..67430dd00 100644 --- a/lib/fog/introspection/openstack.rb +++ b/lib/fog/openstack/introspection/introspection.rb @@ -1,8 +1,8 @@ require 'yaml' module Fog - module Introspection - class OpenStack < Fog::Service + module OpenStack + class Introspection < Fog::Service SUPPORTED_VERSIONS = /v1/ requires :openstack_auth_url @@ -19,7 +19,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/introspection/openstack/requests' + request_path 'fog/openstack/introspection/requests' # Introspection requests request :create_introspection @@ -36,7 +36,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/introspection/openstack/models' + model_path 'fog/openstack/introspection/models' model :rules collection :rules_collection @@ -44,8 +44,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| # Introspection data is *huge* we load it from a yaml file - file = "../../../../test/fixtures/introspection.yaml" - hash[key] = YAML.load(File.read(File.expand_path(file, __FILE__))) + file = "test/fixtures/introspection.yaml" + hash[key] = YAML.load(File.read(file)) end end @@ -73,7 +73,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Introspection::OpenStack::NotFound + Fog::OpenStack::Introspection::NotFound end def default_path_prefix diff --git a/lib/fog/introspection/openstack/models/rules.rb b/lib/fog/openstack/introspection/models/rules.rb similarity index 93% rename from lib/fog/introspection/openstack/models/rules.rb rename to lib/fog/openstack/introspection/models/rules.rb index 3db449d57..acdd3d037 100644 --- a/lib/fog/introspection/openstack/models/rules.rb +++ b/lib/fog/openstack/introspection/models/rules.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Rules < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/introspection/openstack/models/rules_collection.rb b/lib/fog/openstack/introspection/models/rules_collection.rb similarity index 71% rename from lib/fog/introspection/openstack/models/rules_collection.rb rename to lib/fog/openstack/introspection/models/rules_collection.rb index b6b437a0a..6b7e8e0db 100644 --- a/lib/fog/introspection/openstack/models/rules_collection.rb +++ b/lib/fog/openstack/introspection/models/rules_collection.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/introspection/openstack/models/rules' +require 'fog/openstack/introspection/models/rules' module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class RulesCollection < Fog::OpenStack::Collection - model Fog::Introspection::OpenStack::Rules + model Fog::OpenStack::Introspection::Rules def all(_options = {}) load_response(service.list_rules, 'rules') @@ -14,7 +14,7 @@ def all(_options = {}) def get(uuid) data = service.get_rules(uuid).body new(data) - rescue Fog::Introspection::OpenStack::NotFound + rescue Fog::OpenStack::Introspection::NotFound nil end diff --git a/lib/fog/introspection/openstack/requests/abort_introspection.rb b/lib/fog/openstack/introspection/requests/abort_introspection.rb similarity index 91% rename from lib/fog/introspection/openstack/requests/abort_introspection.rb rename to lib/fog/openstack/introspection/requests/abort_introspection.rb index 61dcebc94..51f127952 100644 --- a/lib/fog/introspection/openstack/requests/abort_introspection.rb +++ b/lib/fog/openstack/introspection/requests/abort_introspection.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def abort_introspection(node_id) request( diff --git a/lib/fog/introspection/openstack/requests/create_introspection.rb b/lib/fog/openstack/introspection/requests/create_introspection.rb similarity index 94% rename from lib/fog/introspection/openstack/requests/create_introspection.rb rename to lib/fog/openstack/introspection/requests/create_introspection.rb index 46ad193ce..cc05eeb7c 100644 --- a/lib/fog/introspection/openstack/requests/create_introspection.rb +++ b/lib/fog/openstack/introspection/requests/create_introspection.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def create_introspection(node_id, options = {}) if options diff --git a/lib/fog/introspection/openstack/requests/create_rules.rb b/lib/fog/openstack/introspection/requests/create_rules.rb similarity index 94% rename from lib/fog/introspection/openstack/requests/create_rules.rb rename to lib/fog/openstack/introspection/requests/create_rules.rb index da921cf4a..d3332186f 100644 --- a/lib/fog/introspection/openstack/requests/create_rules.rb +++ b/lib/fog/openstack/introspection/requests/create_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def create_rules(attributes) attributes_valid = [ diff --git a/lib/fog/introspection/openstack/requests/delete_rules.rb b/lib/fog/openstack/introspection/requests/delete_rules.rb similarity index 90% rename from lib/fog/introspection/openstack/requests/delete_rules.rb rename to lib/fog/openstack/introspection/requests/delete_rules.rb index fc254ed05..6a8eba027 100644 --- a/lib/fog/introspection/openstack/requests/delete_rules.rb +++ b/lib/fog/openstack/introspection/requests/delete_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def delete_rules(rule_id) request( diff --git a/lib/fog/introspection/openstack/requests/delete_rules_all.rb b/lib/fog/openstack/introspection/requests/delete_rules_all.rb similarity index 89% rename from lib/fog/introspection/openstack/requests/delete_rules_all.rb rename to lib/fog/openstack/introspection/requests/delete_rules_all.rb index 9449e7f0e..086296f73 100644 --- a/lib/fog/introspection/openstack/requests/delete_rules_all.rb +++ b/lib/fog/openstack/introspection/requests/delete_rules_all.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def delete_rules_all request( diff --git a/lib/fog/introspection/openstack/requests/get_introspection.rb b/lib/fog/openstack/introspection/requests/get_introspection.rb similarity index 91% rename from lib/fog/introspection/openstack/requests/get_introspection.rb rename to lib/fog/openstack/introspection/requests/get_introspection.rb index 3e8dff436..04cacb96e 100644 --- a/lib/fog/introspection/openstack/requests/get_introspection.rb +++ b/lib/fog/openstack/introspection/requests/get_introspection.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def get_introspection(node_id) request( diff --git a/lib/fog/introspection/openstack/requests/get_introspection_details.rb b/lib/fog/openstack/introspection/requests/get_introspection_details.rb similarity index 92% rename from lib/fog/introspection/openstack/requests/get_introspection_details.rb rename to lib/fog/openstack/introspection/requests/get_introspection_details.rb index 6a4d05d45..610c86955 100644 --- a/lib/fog/introspection/openstack/requests/get_introspection_details.rb +++ b/lib/fog/openstack/introspection/requests/get_introspection_details.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def get_introspection_details(node_id) request( diff --git a/lib/fog/introspection/openstack/requests/get_rules.rb b/lib/fog/openstack/introspection/requests/get_rules.rb similarity index 91% rename from lib/fog/introspection/openstack/requests/get_rules.rb rename to lib/fog/openstack/introspection/requests/get_rules.rb index 32e0ab150..c5df3e31f 100644 --- a/lib/fog/introspection/openstack/requests/get_rules.rb +++ b/lib/fog/openstack/introspection/requests/get_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def get_rules(rule_id) request( diff --git a/lib/fog/introspection/openstack/requests/list_rules.rb b/lib/fog/openstack/introspection/requests/list_rules.rb similarity index 90% rename from lib/fog/introspection/openstack/requests/list_rules.rb rename to lib/fog/openstack/introspection/requests/list_rules.rb index 5439da840..c05261574 100644 --- a/lib/fog/introspection/openstack/requests/list_rules.rb +++ b/lib/fog/openstack/introspection/requests/list_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def list_rules request( diff --git a/lib/fog/key_manager/openstack.rb b/lib/fog/openstack/key_manager/key_manager.rb similarity index 94% rename from lib/fog/key_manager/openstack.rb rename to lib/fog/openstack/key_manager/key_manager.rb index dc56d3f90..5c411cc31 100644 --- a/lib/fog/key_manager/openstack.rb +++ b/lib/fog/openstack/key_manager/key_manager.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack < Fog::Service + module OpenStack + class KeyManager < Fog::Service SUPPORTED_VERSIONS = /v1(\.0)*/ requires :openstack_auth_url @@ -18,7 +18,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/key_manager/openstack/models' + model_path 'fog/openstack/key_manager/models' model :secret collection :secrets model :container @@ -28,7 +28,7 @@ class OpenStack < Fog::Service ## REQUESTS # secrets - request_path 'fog/key_manager/openstack/requests' + request_path 'fog/openstack/key_manager/requests' request :create_secret request :list_secrets request :get_secret @@ -93,7 +93,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::KeyManager::OpenStack::NotFound + Fog::OpenStack::KeyManager::NotFound end def default_path_prefix diff --git a/lib/fog/key_manager/openstack/models/acl.rb b/lib/fog/openstack/key_manager/models/acl.rb similarity index 90% rename from lib/fog/key_manager/openstack/models/acl.rb rename to lib/fog/openstack/key_manager/models/acl.rb index 9602e8451..1b52d7cfa 100644 --- a/lib/fog/key_manager/openstack/models/acl.rb +++ b/lib/fog/openstack/key_manager/models/acl.rb @@ -2,8 +2,8 @@ require 'fog/openstack/models/model' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class ACL < Fog::OpenStack::Model identity :acl_ref diff --git a/lib/fog/key_manager/openstack/models/container.rb b/lib/fog/openstack/key_manager/models/container.rb similarity index 94% rename from lib/fog/key_manager/openstack/models/container.rb rename to lib/fog/openstack/key_manager/models/container.rb index 3ebd6511e..4d5fb89ca 100644 --- a/lib/fog/key_manager/openstack/models/container.rb +++ b/lib/fog/openstack/key_manager/models/container.rb @@ -2,8 +2,8 @@ require 'uri' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Container < Fog::OpenStack::Model identity :container_ref @@ -41,4 +41,4 @@ def destroy end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/models/containers.rb b/lib/fog/openstack/key_manager/models/containers.rb similarity index 66% rename from lib/fog/key_manager/openstack/models/containers.rb rename to lib/fog/openstack/key_manager/models/containers.rb index ea73a8d73..0df3c9762 100644 --- a/lib/fog/key_manager/openstack/models/containers.rb +++ b/lib/fog/openstack/key_manager/models/containers.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/key_manager/openstack/models/container' +require 'fog/openstack/key_manager/models/container' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Containers < Fog::OpenStack::Collection - model Fog::KeyManager::OpenStack::Container + model Fog::OpenStack::KeyManager::Container def all(options = {}) load_response(service.list_containers(options), 'containers') @@ -15,11 +15,11 @@ def get(secret_ref) if secret = service.get_container(secret_ref).body new(secret) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/models/secret.rb b/lib/fog/openstack/key_manager/models/secret.rb similarity index 95% rename from lib/fog/key_manager/openstack/models/secret.rb rename to lib/fog/openstack/key_manager/models/secret.rb index 06c63652c..af55f07de 100644 --- a/lib/fog/key_manager/openstack/models/secret.rb +++ b/lib/fog/openstack/key_manager/models/secret.rb @@ -2,8 +2,8 @@ require 'uri' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Secret < Fog::OpenStack::Model identity :secret_ref @@ -50,4 +50,4 @@ def destroy end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/models/secrets.rb b/lib/fog/openstack/key_manager/models/secrets.rb similarity index 66% rename from lib/fog/key_manager/openstack/models/secrets.rb rename to lib/fog/openstack/key_manager/models/secrets.rb index 6858b5e12..5d133965d 100644 --- a/lib/fog/key_manager/openstack/models/secrets.rb +++ b/lib/fog/openstack/key_manager/models/secrets.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/key_manager/openstack/models/secret' +require 'fog/openstack/key_manager/models/secret' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Secrets < Fog::OpenStack::Collection - model Fog::KeyManager::OpenStack::Secret + model Fog::OpenStack::KeyManager::Secret def all(options = {}) load_response(service.list_secrets(options), 'secrets') @@ -15,11 +15,11 @@ def get(secret_ref) if secret = service.get_secret(secret_ref).body new(secret) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/create_container.rb b/lib/fog/openstack/key_manager/requests/create_container.rb similarity index 87% rename from lib/fog/key_manager/openstack/requests/create_container.rb rename to lib/fog/openstack/key_manager/requests/create_container.rb index 283e9b9a5..3ce4b3a0e 100644 --- a/lib/fog/key_manager/openstack/requests/create_container.rb +++ b/lib/fog/openstack/key_manager/requests/create_container.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def create_container(options) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/create_secret.rb b/lib/fog/openstack/key_manager/requests/create_secret.rb similarity index 87% rename from lib/fog/key_manager/openstack/requests/create_secret.rb rename to lib/fog/openstack/key_manager/requests/create_secret.rb index 03914933f..fad47e055 100644 --- a/lib/fog/key_manager/openstack/requests/create_secret.rb +++ b/lib/fog/openstack/key_manager/requests/create_secret.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def create_secret(options) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/delete_container.rb b/lib/fog/openstack/key_manager/requests/delete_container.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/delete_container.rb rename to lib/fog/openstack/key_manager/requests/delete_container.rb index ef0fa356e..571ae2a98 100644 --- a/lib/fog/key_manager/openstack/requests/delete_container.rb +++ b/lib/fog/openstack/key_manager/requests/delete_container.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_container(id) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/delete_container_acl.rb b/lib/fog/openstack/key_manager/requests/delete_container_acl.rb similarity index 91% rename from lib/fog/key_manager/openstack/requests/delete_container_acl.rb rename to lib/fog/openstack/key_manager/requests/delete_container_acl.rb index bf19f5e2d..803712bc8 100644 --- a/lib/fog/key_manager/openstack/requests/delete_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/delete_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_container_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/delete_secret.rb b/lib/fog/openstack/key_manager/requests/delete_secret.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/delete_secret.rb rename to lib/fog/openstack/key_manager/requests/delete_secret.rb index 5d4201187..d5f439c3a 100644 --- a/lib/fog/key_manager/openstack/requests/delete_secret.rb +++ b/lib/fog/openstack/key_manager/requests/delete_secret.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_secret(id) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/delete_secret_acl.rb b/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb similarity index 91% rename from lib/fog/key_manager/openstack/requests/delete_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/delete_secret_acl.rb index 7ff365869..446d8ff4a 100644 --- a/lib/fog/key_manager/openstack/requests/delete_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_secret_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/get_container.rb b/lib/fog/openstack/key_manager/requests/get_container.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/get_container.rb rename to lib/fog/openstack/key_manager/requests/get_container.rb index 4b5684a74..b8293f7ba 100644 --- a/lib/fog/key_manager/openstack/requests/get_container.rb +++ b/lib/fog/openstack/key_manager/requests/get_container.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_container(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/get_container_acl.rb b/lib/fog/openstack/key_manager/requests/get_container_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/get_container_acl.rb rename to lib/fog/openstack/key_manager/requests/get_container_acl.rb index 3523a6f69..07c33ca93 100644 --- a/lib/fog/key_manager/openstack/requests/get_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/get_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_container_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/get_secret.rb b/lib/fog/openstack/key_manager/requests/get_secret.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/get_secret.rb rename to lib/fog/openstack/key_manager/requests/get_secret.rb index 0085f75ec..52814f8f7 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/get_secret_acl.rb b/lib/fog/openstack/key_manager/requests/get_secret_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/get_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/get_secret_acl.rb index 6f5c2f1c6..5205edecf 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/get_secret_metadata.rb b/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb similarity index 86% rename from lib/fog/key_manager/openstack/requests/get_secret_metadata.rb rename to lib/fog/openstack/key_manager/requests/get_secret_metadata.rb index a91a00391..05ae2fc98 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret_metadata.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret_metadata(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/get_secret_payload.rb b/lib/fog/openstack/key_manager/requests/get_secret_payload.rb similarity index 88% rename from lib/fog/key_manager/openstack/requests/get_secret_payload.rb rename to lib/fog/openstack/key_manager/requests/get_secret_payload.rb index 29a3ec0f2..042855c51 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret_payload.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_payload.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret_payload(uuid) request( @@ -18,4 +18,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/list_containers.rb b/lib/fog/openstack/key_manager/requests/list_containers.rb similarity index 87% rename from lib/fog/key_manager/openstack/requests/list_containers.rb rename to lib/fog/openstack/key_manager/requests/list_containers.rb index cd0f2cdbe..f89b699c1 100644 --- a/lib/fog/key_manager/openstack/requests/list_containers.rb +++ b/lib/fog/openstack/key_manager/requests/list_containers.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def list_containers(options = {}) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/list_secrets.rb b/lib/fog/openstack/key_manager/requests/list_secrets.rb similarity index 86% rename from lib/fog/key_manager/openstack/requests/list_secrets.rb rename to lib/fog/openstack/key_manager/requests/list_secrets.rb index 7bbbbce41..612da0d7b 100644 --- a/lib/fog/key_manager/openstack/requests/list_secrets.rb +++ b/lib/fog/openstack/key_manager/requests/list_secrets.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def list_secrets(options = {}) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/replace_container_acl.rb b/lib/fog/openstack/key_manager/requests/replace_container_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/replace_container_acl.rb rename to lib/fog/openstack/key_manager/requests/replace_container_acl.rb index 50000cec8..24ec6fb12 100644 --- a/lib/fog/key_manager/openstack/requests/replace_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/replace_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def replace_container_acl(uuid, options) request( diff --git a/lib/fog/key_manager/openstack/requests/replace_secret_acl.rb b/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb similarity index 93% rename from lib/fog/key_manager/openstack/requests/replace_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/replace_secret_acl.rb index e4960c7b9..62559ebaa 100644 --- a/lib/fog/key_manager/openstack/requests/replace_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def replace_secret_acl(uuid, options) request( diff --git a/lib/fog/key_manager/openstack/requests/update_container_acl.rb b/lib/fog/openstack/key_manager/requests/update_container_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/update_container_acl.rb rename to lib/fog/openstack/key_manager/requests/update_container_acl.rb index 01657b1c9..f65ccdff2 100644 --- a/lib/fog/key_manager/openstack/requests/update_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/update_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def update_container_acl(uuid, options) request( diff --git a/lib/fog/key_manager/openstack/requests/update_secret_acl.rb b/lib/fog/openstack/key_manager/requests/update_secret_acl.rb similarity index 93% rename from lib/fog/key_manager/openstack/requests/update_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/update_secret_acl.rb index d92bc55e1..3bca98a31 100644 --- a/lib/fog/key_manager/openstack/requests/update_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/update_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def update_secret_acl(uuid, options) request( diff --git a/lib/fog/metering/openstack.rb b/lib/fog/openstack/metering/metering.rb similarity index 94% rename from lib/fog/metering/openstack.rb rename to lib/fog/openstack/metering/metering.rb index bd0f84d7f..ab6d9c294 100644 --- a/lib/fog/metering/openstack.rb +++ b/lib/fog/openstack/metering/metering.rb @@ -1,8 +1,8 @@ module Fog - module Metering - class OpenStack < Fog::Service + module OpenStack + class Metering < Fog::Service SUPPORTED_VERSIONS = /v2/ requires :openstack_auth_url @@ -17,7 +17,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/metering/openstack/models' + model_path 'fog/openstack/metering/models' model :resource collection :resources @@ -26,7 +26,7 @@ class OpenStack < Fog::Service model :event collection :events - request_path 'fog/metering/openstack/requests' + request_path 'fog/openstack/metering/requests' # Metering request :get_event @@ -97,7 +97,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Metering::OpenStack::NotFound + Fog::OpenStack::Metering::NotFound end def default_endpoint_type diff --git a/lib/fog/metering/openstack/models/event.rb b/lib/fog/openstack/metering/models/event.rb similarity index 87% rename from lib/fog/metering/openstack/models/event.rb rename to lib/fog/openstack/metering/models/event.rb index 606ebc0c1..7cf900642 100644 --- a/lib/fog/metering/openstack/models/event.rb +++ b/lib/fog/openstack/metering/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Event < Fog::OpenStack::Model identity :message_id diff --git a/lib/fog/metering/openstack/models/events.rb b/lib/fog/openstack/metering/models/events.rb similarity index 66% rename from lib/fog/metering/openstack/models/events.rb rename to lib/fog/openstack/metering/models/events.rb index 01af6f5a1..8b12e73e9 100644 --- a/lib/fog/metering/openstack/models/events.rb +++ b/lib/fog/openstack/metering/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/metering/openstack/models/event' +require 'fog/openstack/metering/models/event' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Events < Fog::OpenStack::Collection - model Fog::Metering::OpenStack::Event + model Fog::OpenStack::Metering::Event def all(q = []) load_response(service.list_events(q)) @@ -14,7 +14,7 @@ def all(q = []) def find_by_id(message_id) event = service.get_event(message_id).body new(event) - rescue Fog::Metering::OpenStack::NotFound + rescue Fog::OpenStack::Metering::NotFound nil end end diff --git a/lib/fog/metering/openstack/models/meter.rb b/lib/fog/openstack/metering/models/meter.rb similarity index 100% rename from lib/fog/metering/openstack/models/meter.rb rename to lib/fog/openstack/metering/models/meter.rb diff --git a/lib/fog/metering/openstack/models/meters.rb b/lib/fog/openstack/metering/models/meters.rb similarity index 100% rename from lib/fog/metering/openstack/models/meters.rb rename to lib/fog/openstack/metering/models/meters.rb diff --git a/lib/fog/metering/openstack/models/resource.rb b/lib/fog/openstack/metering/models/resource.rb similarity index 86% rename from lib/fog/metering/openstack/models/resource.rb rename to lib/fog/openstack/metering/models/resource.rb index 9d08cfe23..78fe5086a 100644 --- a/lib/fog/metering/openstack/models/resource.rb +++ b/lib/fog/openstack/metering/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Resource < Fog::OpenStack::Model identity :resource_id diff --git a/lib/fog/metering/openstack/models/resources.rb b/lib/fog/openstack/metering/models/resources.rb similarity index 66% rename from lib/fog/metering/openstack/models/resources.rb rename to lib/fog/openstack/metering/models/resources.rb index 048861625..93acfb551 100644 --- a/lib/fog/metering/openstack/models/resources.rb +++ b/lib/fog/openstack/metering/models/resources.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/metering/openstack/models/resource' +require 'fog/openstack/metering/models/resource' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Resources < Fog::OpenStack::Collection - model Fog::Metering::OpenStack::Resource + model Fog::OpenStack::Metering::Resource def all(_detailed = true) load_response(service.list_resources) @@ -14,7 +14,7 @@ def all(_detailed = true) def find_by_id(resource_id) resource = service.get_resource(resource_id).body new(resource) - rescue Fog::Metering::OpenStack::NotFound + rescue Fog::OpenStack::Metering::NotFound nil end end diff --git a/lib/fog/metering/openstack/requests/get_event.rb b/lib/fog/openstack/metering/requests/get_event.rb similarity index 93% rename from lib/fog/metering/openstack/requests/get_event.rb rename to lib/fog/openstack/metering/requests/get_event.rb index 6738f426c..26d92b355 100644 --- a/lib/fog/metering/openstack/requests/get_event.rb +++ b/lib/fog/openstack/metering/requests/get_event.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_event(message_id) request( diff --git a/lib/fog/metering/openstack/requests/get_resource.rb b/lib/fog/openstack/metering/requests/get_resource.rb similarity index 94% rename from lib/fog/metering/openstack/requests/get_resource.rb rename to lib/fog/openstack/metering/requests/get_resource.rb index f878e4526..8a807c3a1 100644 --- a/lib/fog/metering/openstack/requests/get_resource.rb +++ b/lib/fog/openstack/metering/requests/get_resource.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_resource(resource_id) request( diff --git a/lib/fog/metering/openstack/requests/get_samples.rb b/lib/fog/openstack/metering/requests/get_samples.rb similarity index 97% rename from lib/fog/metering/openstack/requests/get_samples.rb rename to lib/fog/openstack/metering/requests/get_samples.rb index 58dd6707c..791b6b9e7 100644 --- a/lib/fog/metering/openstack/requests/get_samples.rb +++ b/lib/fog/openstack/metering/requests/get_samples.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_samples(meter_id, options = [], limit = 10000000) data = { diff --git a/lib/fog/metering/openstack/requests/get_statistics.rb b/lib/fog/openstack/metering/requests/get_statistics.rb similarity index 97% rename from lib/fog/metering/openstack/requests/get_statistics.rb rename to lib/fog/openstack/metering/requests/get_statistics.rb index b0905b7ee..841666b96 100644 --- a/lib/fog/metering/openstack/requests/get_statistics.rb +++ b/lib/fog/openstack/metering/requests/get_statistics.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_statistics(meter_id, options = {}) data = { diff --git a/lib/fog/metering/openstack/requests/list_events.rb b/lib/fog/openstack/metering/requests/list_events.rb similarity index 95% rename from lib/fog/metering/openstack/requests/list_events.rb rename to lib/fog/openstack/metering/requests/list_events.rb index 06f3f927c..e94ac857b 100644 --- a/lib/fog/metering/openstack/requests/list_events.rb +++ b/lib/fog/openstack/metering/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def list_events(options = []) data = { diff --git a/lib/fog/metering/openstack/requests/list_meters.rb b/lib/fog/openstack/metering/requests/list_meters.rb similarity index 96% rename from lib/fog/metering/openstack/requests/list_meters.rb rename to lib/fog/openstack/metering/requests/list_meters.rb index 99b857c45..728797d0d 100644 --- a/lib/fog/metering/openstack/requests/list_meters.rb +++ b/lib/fog/openstack/metering/requests/list_meters.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def list_meters(options = []) data = { diff --git a/lib/fog/metering/openstack/requests/list_resources.rb b/lib/fog/openstack/metering/requests/list_resources.rb similarity index 94% rename from lib/fog/metering/openstack/requests/list_resources.rb rename to lib/fog/openstack/metering/requests/list_resources.rb index 910ced8e1..4b574fe9b 100644 --- a/lib/fog/metering/openstack/requests/list_resources.rb +++ b/lib/fog/openstack/metering/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def list_resources(_options = {}) request( diff --git a/lib/fog/metric/openstack.rb b/lib/fog/openstack/metric/metric.rb similarity index 94% rename from lib/fog/metric/openstack.rb rename to lib/fog/openstack/metric/metric.rb index 08144e5eb..3feed8b09 100644 --- a/lib/fog/metric/openstack.rb +++ b/lib/fog/openstack/metric/metric.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack < Fog::Service + module OpenStack + class Metric < Fog::Service SUPPORTED_VERSIONS = /v1/ requires :openstack_auth_url @@ -15,14 +15,14 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/metric/openstack/models' + model_path 'fog/openstack/metric/models' model :metric collection :metrics model :resource collection :resources - request_path 'fog/metric/openstack/requests' + request_path 'fog/openstack/metric/requests' request :get_resource_metric_measures request :get_metric_measures @@ -95,7 +95,7 @@ def default_path_prefix end def self.not_found_class - Fog::Metric::OpenStack::NotFound + Fog::OpenStack::Metric::NotFound end def default_service_type diff --git a/lib/fog/metric/openstack/models/metric.rb b/lib/fog/openstack/metric/models/metric.rb similarity index 90% rename from lib/fog/metric/openstack/models/metric.rb rename to lib/fog/openstack/metric/models/metric.rb index aedf0ca50..fda7bce88 100644 --- a/lib/fog/metric/openstack/models/metric.rb +++ b/lib/fog/openstack/metric/models/metric.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Metric < Fog::OpenStack::Model identity :id diff --git a/lib/fog/metric/openstack/models/metrics.rb b/lib/fog/openstack/metric/models/metrics.rb similarity index 71% rename from lib/fog/metric/openstack/models/metrics.rb rename to lib/fog/openstack/metric/models/metrics.rb index c68f8a12e..594e5c3ac 100644 --- a/lib/fog/metric/openstack/models/metrics.rb +++ b/lib/fog/openstack/metric/models/metrics.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/metric/openstack/models/metric' +require 'fog/openstack/metric/models/metric' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Metrics < Fog::OpenStack::Collection - model Fog::Metric::OpenStack::Metric + model Fog::OpenStack::Metric::Metric def all(options = {}) load_response(service.list_metrics(options)) @@ -15,14 +15,14 @@ def all(options = {}) def find_by_id(metric_id) resource = service.get_metric(metric_id).body new(resource) - rescue Fog::Metric::OpenStack::NotFound + rescue Fog::OpenStack::Metric::NotFound nil end def find_measures_by_id(metric_id, options = {}) resource = service.get_metric_measures(metric_id, options).body new(resource) - rescue Fog::Metric::OpenStack::NotFound + rescue Fog::OpenStack::Metric::NotFound nil end end diff --git a/lib/fog/metric/openstack/models/resource.rb b/lib/fog/openstack/metric/models/resource.rb similarity index 88% rename from lib/fog/metric/openstack/models/resource.rb rename to lib/fog/openstack/metric/models/resource.rb index 772d72a96..5524c31a3 100644 --- a/lib/fog/metric/openstack/models/resource.rb +++ b/lib/fog/openstack/metric/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Resource < Fog::OpenStack::Model identity :id diff --git a/lib/fog/metric/openstack/models/resources.rb b/lib/fog/openstack/metric/models/resources.rb similarity index 68% rename from lib/fog/metric/openstack/models/resources.rb rename to lib/fog/openstack/metric/models/resources.rb index b0edaa6af..d58807c18 100644 --- a/lib/fog/metric/openstack/models/resources.rb +++ b/lib/fog/openstack/metric/models/resources.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/metric/openstack/models/resource' +require 'fog/openstack/metric/models/resource' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Resources < Fog::OpenStack::Collection - model Fog::Metric::OpenStack::Resource + model Fog::OpenStack::Metric::Resource def all(options = {}) load_response(service.list_resources(options)) @@ -15,7 +15,7 @@ def all(options = {}) def find_by_id(resource_id) resource = service.get_resource(resource_id).body new(resource) - rescue Fog::Metric::OpenStack::NotFound + rescue Fog::OpenStack::Metric::NotFound nil end end diff --git a/lib/fog/metric/openstack/requests/get_metric.rb b/lib/fog/openstack/metric/requests/get_metric.rb similarity index 98% rename from lib/fog/metric/openstack/requests/get_metric.rb rename to lib/fog/openstack/metric/requests/get_metric.rb index f2f7f7556..3bbfd904b 100644 --- a/lib/fog/metric/openstack/requests/get_metric.rb +++ b/lib/fog/openstack/metric/requests/get_metric.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_metric(metric_id) request( diff --git a/lib/fog/metric/openstack/requests/get_metric_measures.rb b/lib/fog/openstack/metric/requests/get_metric_measures.rb similarity index 96% rename from lib/fog/metric/openstack/requests/get_metric_measures.rb rename to lib/fog/openstack/metric/requests/get_metric_measures.rb index 9f8ee1374..21b207a42 100644 --- a/lib/fog/metric/openstack/requests/get_metric_measures.rb +++ b/lib/fog/openstack/metric/requests/get_metric_measures.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_metric_measures(metric_id, options = {}) request( diff --git a/lib/fog/metric/openstack/requests/get_resource.rb b/lib/fog/openstack/metric/requests/get_resource.rb similarity index 97% rename from lib/fog/metric/openstack/requests/get_resource.rb rename to lib/fog/openstack/metric/requests/get_resource.rb index 486070bc0..33f9f994e 100644 --- a/lib/fog/metric/openstack/requests/get_resource.rb +++ b/lib/fog/openstack/metric/requests/get_resource.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_resource(resource_id) request( diff --git a/lib/fog/metric/openstack/requests/get_resource_metric_measures.rb b/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb similarity index 96% rename from lib/fog/metric/openstack/requests/get_resource_metric_measures.rb rename to lib/fog/openstack/metric/requests/get_resource_metric_measures.rb index c188a7a93..91dbc33bb 100644 --- a/lib/fog/metric/openstack/requests/get_resource_metric_measures.rb +++ b/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_resource_metric_measures(resource_id, metric_name, options = {}) request( diff --git a/lib/fog/metric/openstack/requests/list_metrics.rb b/lib/fog/openstack/metric/requests/list_metrics.rb similarity index 99% rename from lib/fog/metric/openstack/requests/list_metrics.rb rename to lib/fog/openstack/metric/requests/list_metrics.rb index 830d773b9..736fb9dd2 100644 --- a/lib/fog/metric/openstack/requests/list_metrics.rb +++ b/lib/fog/openstack/metric/requests/list_metrics.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def list_metrics(options = {}) request( diff --git a/lib/fog/metric/openstack/requests/list_resources.rb b/lib/fog/openstack/metric/requests/list_resources.rb similarity index 98% rename from lib/fog/metric/openstack/requests/list_resources.rb rename to lib/fog/openstack/metric/requests/list_resources.rb index 57d59d9db..2b32f609e 100644 --- a/lib/fog/metric/openstack/requests/list_resources.rb +++ b/lib/fog/openstack/metric/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def list_resources(type = "generic", options = {}) request( diff --git a/lib/fog/openstack/models/meta_parent.rb b/lib/fog/openstack/models/meta_parent.rb index b90b6e5b1..b9b624330 100644 --- a/lib/fog/openstack/models/meta_parent.rb +++ b/lib/fog/openstack/models/meta_parent.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute module MetaParent def parent @parent @@ -11,9 +11,9 @@ def parent=(new_parent) end def collection_name - if @parent.class == Fog::Compute::OpenStack::Image + if @parent.class == Fog::OpenStack::Compute::Image return "images" - elsif @parent.class == Fog::Compute::OpenStack::Server + elsif @parent.class == Fog::OpenStack::Compute::Server return "servers" else raise "Metadata is not supported for this model type." diff --git a/lib/fog/monitoring/openstack/models/alarm.rb b/lib/fog/openstack/monitoring/models/alarm.rb similarity index 95% rename from lib/fog/monitoring/openstack/models/alarm.rb rename to lib/fog/openstack/monitoring/models/alarm.rb index c42f20ff4..eafba1074 100644 --- a/lib/fog/monitoring/openstack/models/alarm.rb +++ b/lib/fog/openstack/monitoring/models/alarm.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Alarm < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/alarm_count.rb b/lib/fog/openstack/monitoring/models/alarm_count.rb similarity index 86% rename from lib/fog/monitoring/openstack/models/alarm_count.rb rename to lib/fog/openstack/monitoring/models/alarm_count.rb index afd2d5aa3..af982eec0 100644 --- a/lib/fog/monitoring/openstack/models/alarm_count.rb +++ b/lib/fog/openstack/monitoring/models/alarm_count.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmCount < Fog::OpenStack::Model attribute :links attribute :columns diff --git a/lib/fog/monitoring/openstack/models/alarm_counts.rb b/lib/fog/openstack/monitoring/models/alarm_counts.rb similarity index 61% rename from lib/fog/monitoring/openstack/models/alarm_counts.rb rename to lib/fog/openstack/monitoring/models/alarm_counts.rb index 9b2070c87..7e340e988 100644 --- a/lib/fog/monitoring/openstack/models/alarm_counts.rb +++ b/lib/fog/openstack/monitoring/models/alarm_counts.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm_count' +require 'fog/openstack/monitoring/models/alarm_count' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmCounts < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::AlarmCount + model Fog::OpenStack::Monitoring::AlarmCount def get(options = {}) load_response(service.get_alarm_counts(options)) diff --git a/lib/fog/monitoring/openstack/models/alarm_definition.rb b/lib/fog/openstack/monitoring/models/alarm_definition.rb similarity index 96% rename from lib/fog/monitoring/openstack/models/alarm_definition.rb rename to lib/fog/openstack/monitoring/models/alarm_definition.rb index 3938f0b8b..af7ba6839 100644 --- a/lib/fog/monitoring/openstack/models/alarm_definition.rb +++ b/lib/fog/openstack/monitoring/models/alarm_definition.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmDefinition < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/alarm_definitions.rb b/lib/fog/openstack/monitoring/models/alarm_definitions.rb similarity index 81% rename from lib/fog/monitoring/openstack/models/alarm_definitions.rb rename to lib/fog/openstack/monitoring/models/alarm_definitions.rb index a1b5451c0..0366033fe 100644 --- a/lib/fog/monitoring/openstack/models/alarm_definitions.rb +++ b/lib/fog/openstack/monitoring/models/alarm_definitions.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm_definition' +require 'fog/openstack/monitoring/models/alarm_definition' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmDefinitions < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::AlarmDefinition + model Fog::OpenStack::Monitoring::AlarmDefinition def create(attributes) super(attributes) @@ -27,7 +27,7 @@ def find_by_id(id) cached_alarm_definition = detect { |alarm_definition| alarm_definition.id == id } return cached_alarm_definition if cached_alarm_definition alarm_definition_hash = service.get_alarm_definition(id).body - Fog::Monitoring::OpenStack::AlarmDefinition.new( + Fog::OpenStack::Monitoring::AlarmDefinition.new( alarm_definition_hash.merge(:service => service) ) end diff --git a/lib/fog/monitoring/openstack/models/alarm_state.rb b/lib/fog/openstack/monitoring/models/alarm_state.rb similarity index 93% rename from lib/fog/monitoring/openstack/models/alarm_state.rb rename to lib/fog/openstack/monitoring/models/alarm_state.rb index 8dc34052e..0b5be8907 100644 --- a/lib/fog/monitoring/openstack/models/alarm_state.rb +++ b/lib/fog/openstack/monitoring/models/alarm_state.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmState < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/alarm_states.rb b/lib/fog/openstack/monitoring/models/alarm_states.rb similarity index 75% rename from lib/fog/monitoring/openstack/models/alarm_states.rb rename to lib/fog/openstack/monitoring/models/alarm_states.rb index 87fa6e5f0..4bef0a5a6 100644 --- a/lib/fog/monitoring/openstack/models/alarm_states.rb +++ b/lib/fog/openstack/monitoring/models/alarm_states.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm_state' +require 'fog/openstack/monitoring/models/alarm_state' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmStates < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::AlarmState + model Fog::OpenStack::Monitoring::AlarmState def all(options = {}) load_response(service.list_alarm_state_history_for_all_alarms(options), 'elements') diff --git a/lib/fog/monitoring/openstack/models/alarms.rb b/lib/fog/openstack/monitoring/models/alarms.rb similarity index 76% rename from lib/fog/monitoring/openstack/models/alarms.rb rename to lib/fog/openstack/monitoring/models/alarms.rb index 0a89ff5ea..f3aa14f1a 100644 --- a/lib/fog/monitoring/openstack/models/alarms.rb +++ b/lib/fog/openstack/monitoring/models/alarms.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm' +require 'fog/openstack/monitoring/models/alarm' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Alarms < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Alarm + model Fog::OpenStack::Monitoring::Alarm def all(options = {}) load_response(service.list_alarms(options), 'elements') @@ -15,7 +15,7 @@ def find_by_id(id) cached_alarm = detect { |alarm| alarm.id == id } return cached_alarm if cached_alarm alarm_hash = service.get_alarm(id).body - Fog::Monitoring::OpenStack::Alarm.new( + Fog::OpenStack::Monitoring::Alarm.new( alarm_hash.merge(:service => service) ) end diff --git a/lib/fog/monitoring/openstack/models/dimension_value.rb b/lib/fog/openstack/monitoring/models/dimension_value.rb similarity index 87% rename from lib/fog/monitoring/openstack/models/dimension_value.rb rename to lib/fog/openstack/monitoring/models/dimension_value.rb index 8595f884a..4946bf798 100644 --- a/lib/fog/monitoring/openstack/models/dimension_value.rb +++ b/lib/fog/openstack/monitoring/models/dimension_value.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class DimensionValue < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/dimension_values.rb b/lib/fog/openstack/monitoring/models/dimension_values.rb similarity index 65% rename from lib/fog/monitoring/openstack/models/dimension_values.rb rename to lib/fog/openstack/monitoring/models/dimension_values.rb index 05fd95d8a..d6457dab5 100644 --- a/lib/fog/monitoring/openstack/models/dimension_values.rb +++ b/lib/fog/openstack/monitoring/models/dimension_values.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/dimension_value' +require 'fog/openstack/monitoring/models/dimension_value' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class DimensionValues < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::DimensionValue + model Fog::OpenStack::Monitoring::DimensionValue def all(dimension_name, options = {}) load_response(service.list_dimension_values(dimension_name, options), 'elements') diff --git a/lib/fog/monitoring/openstack/models/measurement.rb b/lib/fog/openstack/monitoring/models/measurement.rb similarity index 88% rename from lib/fog/monitoring/openstack/models/measurement.rb rename to lib/fog/openstack/monitoring/models/measurement.rb index fdbc27c72..de2d72e5b 100644 --- a/lib/fog/monitoring/openstack/models/measurement.rb +++ b/lib/fog/openstack/monitoring/models/measurement.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Measurement < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/measurements.rb b/lib/fog/openstack/monitoring/models/measurements.rb similarity index 63% rename from lib/fog/monitoring/openstack/models/measurements.rb rename to lib/fog/openstack/monitoring/models/measurements.rb index cc36c8f7e..c47f8f178 100644 --- a/lib/fog/monitoring/openstack/models/measurements.rb +++ b/lib/fog/openstack/monitoring/models/measurements.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/measurement' +require 'fog/openstack/monitoring/models/measurement' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Measurements < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Measurement + model Fog::OpenStack::Monitoring::Measurement def find(options = {}) load_response(service.find_measurements(options), 'elements') diff --git a/lib/fog/monitoring/openstack/models/metric.rb b/lib/fog/openstack/monitoring/models/metric.rb similarity index 92% rename from lib/fog/monitoring/openstack/models/metric.rb rename to lib/fog/openstack/monitoring/models/metric.rb index 9b8482272..9ed795398 100644 --- a/lib/fog/monitoring/openstack/models/metric.rb +++ b/lib/fog/openstack/monitoring/models/metric.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Metric < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/metrics.rb b/lib/fog/openstack/monitoring/models/metrics.rb similarity index 74% rename from lib/fog/monitoring/openstack/models/metrics.rb rename to lib/fog/openstack/monitoring/models/metrics.rb index 1b10f384f..095a6a471 100644 --- a/lib/fog/monitoring/openstack/models/metrics.rb +++ b/lib/fog/openstack/monitoring/models/metrics.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/metric' -require 'fog/monitoring/openstack/models/dimension_values' +require 'fog/openstack/monitoring/models/metric' +require 'fog/openstack/monitoring/models/dimension_values' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Metrics < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Metric + model Fog::OpenStack::Monitoring::Metric def all(options = {}) load_response(service.list_metrics(options), 'elements') @@ -25,7 +25,7 @@ def create_metric_array(metrics_list = []) end def list_dimension_values(dimension_name, options = {}) - dimension_value = Fog::Monitoring::OpenStack::DimensionValues.new + dimension_value = Fog::OpenStack::Monitoring::DimensionValues.new dimension_value.load_response( service.list_dimension_values(dimension_name, options), 'elements' ) diff --git a/lib/fog/monitoring/openstack/models/notification_method.rb b/lib/fog/openstack/monitoring/models/notification_method.rb similarity index 96% rename from lib/fog/monitoring/openstack/models/notification_method.rb rename to lib/fog/openstack/monitoring/models/notification_method.rb index 075e32333..f2a1fbfdc 100644 --- a/lib/fog/monitoring/openstack/models/notification_method.rb +++ b/lib/fog/openstack/monitoring/models/notification_method.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class NotificationMethod < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/notification_methods.rb b/lib/fog/openstack/monitoring/models/notification_methods.rb similarity index 82% rename from lib/fog/monitoring/openstack/models/notification_methods.rb rename to lib/fog/openstack/monitoring/models/notification_methods.rb index c8b8c711d..4d1fbaa07 100644 --- a/lib/fog/monitoring/openstack/models/notification_methods.rb +++ b/lib/fog/openstack/monitoring/models/notification_methods.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/notification_method' +require 'fog/openstack/monitoring/models/notification_method' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class NotificationMethods < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::NotificationMethod + model Fog::OpenStack::Monitoring::NotificationMethod def all(options = {}) load_response(service.list_notification_methods(options), 'elements') @@ -23,7 +23,7 @@ def find_by_id(id) cached_notification_method = detect { |notification_method| notification_method.id == id } return cached_notification_method if cached_notification_method notification_method_hash = service.get_notification_method(id).body - Fog::Monitoring::OpenStack::NotificationMethod.new( + Fog::OpenStack::Monitoring::NotificationMethod.new( notification_method_hash.merge(:service => service) ) end diff --git a/lib/fog/monitoring/openstack/models/statistic.rb b/lib/fog/openstack/monitoring/models/statistic.rb similarity index 88% rename from lib/fog/monitoring/openstack/models/statistic.rb rename to lib/fog/openstack/monitoring/models/statistic.rb index e38ca7db2..5bfcde135 100644 --- a/lib/fog/monitoring/openstack/models/statistic.rb +++ b/lib/fog/openstack/monitoring/models/statistic.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Statistic < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/statistics.rb b/lib/fog/openstack/monitoring/models/statistics.rb similarity index 63% rename from lib/fog/monitoring/openstack/models/statistics.rb rename to lib/fog/openstack/monitoring/models/statistics.rb index 2098a2e4e..9bce67cc4 100644 --- a/lib/fog/monitoring/openstack/models/statistics.rb +++ b/lib/fog/openstack/monitoring/models/statistics.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/statistic' +require 'fog/openstack/monitoring/models/statistic' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Statistics < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Statistic + model Fog::OpenStack::Monitoring::Statistic def all(options = {}) load_response(service.list_statistics(options), 'elements') diff --git a/lib/fog/monitoring/openstack.rb b/lib/fog/openstack/monitoring/monitoring.rb similarity index 92% rename from lib/fog/monitoring/openstack.rb rename to lib/fog/openstack/monitoring/monitoring.rb index bd8141c3c..85f60452b 100644 --- a/lib/fog/monitoring/openstack.rb +++ b/lib/fog/openstack/monitoring/monitoring.rb @@ -1,7 +1,7 @@ module Fog - module Monitoring - class OpenStack < Fog::Service + module OpenStack + class Monitoring < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -14,7 +14,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - model_path 'fog/monitoring/openstack/models' + model_path 'fog/openstack/monitoring/models' model :metric collection :metrics model :measurement @@ -33,7 +33,7 @@ class OpenStack < Fog::Service collection :alarm_counts model :dimension_value - request_path 'fog/monitoring/openstack/requests' + request_path 'fog/openstack/monitoring/requests' request :create_metric request :create_metric_array request :list_metrics @@ -75,7 +75,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Monitoring::OpenStack::NotFound + Fog::OpenStack::Monitoring::NotFound end def default_service_type diff --git a/lib/fog/monitoring/openstack/requests/create_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/create_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/create_alarm_definition.rb index 6bf1e1da2..1a145cb8e 100644 --- a/lib/fog/monitoring/openstack/requests/create_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_alarm_definition(options) request( diff --git a/lib/fog/monitoring/openstack/requests/create_metric.rb b/lib/fog/openstack/monitoring/requests/create_metric.rb similarity index 93% rename from lib/fog/monitoring/openstack/requests/create_metric.rb rename to lib/fog/openstack/monitoring/requests/create_metric.rb index c84d56502..569641d67 100644 --- a/lib/fog/monitoring/openstack/requests/create_metric.rb +++ b/lib/fog/openstack/monitoring/requests/create_metric.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_metric(options) data = options diff --git a/lib/fog/monitoring/openstack/requests/create_metric_array.rb b/lib/fog/openstack/monitoring/requests/create_metric_array.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/create_metric_array.rb rename to lib/fog/openstack/monitoring/requests/create_metric_array.rb index da23b278b..87307b981 100644 --- a/lib/fog/monitoring/openstack/requests/create_metric_array.rb +++ b/lib/fog/openstack/monitoring/requests/create_metric_array.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_metric_array(metrics_list) request( diff --git a/lib/fog/monitoring/openstack/requests/create_notification_method.rb b/lib/fog/openstack/monitoring/requests/create_notification_method.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/create_notification_method.rb rename to lib/fog/openstack/monitoring/requests/create_notification_method.rb index b2456b56a..33b21d8b0 100644 --- a/lib/fog/monitoring/openstack/requests/create_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/create_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_notification_method(options) request( diff --git a/lib/fog/monitoring/openstack/requests/delete_alarm.rb b/lib/fog/openstack/monitoring/requests/delete_alarm.rb similarity index 86% rename from lib/fog/monitoring/openstack/requests/delete_alarm.rb rename to lib/fog/openstack/monitoring/requests/delete_alarm.rb index 27a12ff9c..ec16a8c0b 100644 --- a/lib/fog/monitoring/openstack/requests/delete_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/delete_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def delete_alarm(id) request( diff --git a/lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb index 8a51ad390..396544111 100644 --- a/lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def delete_alarm_definition(id) request( diff --git a/lib/fog/monitoring/openstack/requests/delete_notification_method.rb b/lib/fog/openstack/monitoring/requests/delete_notification_method.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/delete_notification_method.rb rename to lib/fog/openstack/monitoring/requests/delete_notification_method.rb index 5df23eb78..9bee9bf3a 100644 --- a/lib/fog/monitoring/openstack/requests/delete_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/delete_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def delete_notification_method(id) request( diff --git a/lib/fog/monitoring/openstack/requests/find_measurements.rb b/lib/fog/openstack/monitoring/requests/find_measurements.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/find_measurements.rb rename to lib/fog/openstack/monitoring/requests/find_measurements.rb index fd96c8ed2..31e123df7 100644 --- a/lib/fog/monitoring/openstack/requests/find_measurements.rb +++ b/lib/fog/openstack/monitoring/requests/find_measurements.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def find_measurements(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/get_alarm.rb b/lib/fog/openstack/monitoring/requests/get_alarm.rb similarity index 88% rename from lib/fog/monitoring/openstack/requests/get_alarm.rb rename to lib/fog/openstack/monitoring/requests/get_alarm.rb index 1bff9afba..b20a0c049 100644 --- a/lib/fog/monitoring/openstack/requests/get_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_alarm(id) request( diff --git a/lib/fog/monitoring/openstack/requests/get_alarm_counts.rb b/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/get_alarm_counts.rb rename to lib/fog/openstack/monitoring/requests/get_alarm_counts.rb index 8fd9e07cb..42da01d93 100644 --- a/lib/fog/monitoring/openstack/requests/get_alarm_counts.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_alarm_counts(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/get_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/get_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/get_alarm_definition.rb index 206cab92b..656ed7350 100644 --- a/lib/fog/monitoring/openstack/requests/get_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_alarm_definition(id) request( diff --git a/lib/fog/monitoring/openstack/requests/get_notification_method.rb b/lib/fog/openstack/monitoring/requests/get_notification_method.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/get_notification_method.rb rename to lib/fog/openstack/monitoring/requests/get_notification_method.rb index 69207e2a1..ad42e476e 100644 --- a/lib/fog/monitoring/openstack/requests/get_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/get_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_notification_method(id) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb b/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb rename to lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb index ebecef2ab..b76ab5a31 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarm_definitions(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb similarity index 91% rename from lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb rename to lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb index 20f65e754..770a11f31 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarm_state_history_for_all_alarms(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb similarity index 91% rename from lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb rename to lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb index 9fa40ad0f..2fb5c4a54 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarm_state_history_for_specific_alarm(id, options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarms.rb b/lib/fog/openstack/monitoring/requests/list_alarms.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/list_alarms.rb rename to lib/fog/openstack/monitoring/requests/list_alarms.rb index 34bae7338..3288b1f54 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarms.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarms.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarms(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_dimension_values.rb b/lib/fog/openstack/monitoring/requests/list_dimension_values.rb similarity index 92% rename from lib/fog/monitoring/openstack/requests/list_dimension_values.rb rename to lib/fog/openstack/monitoring/requests/list_dimension_values.rb index 3655b294c..0e29b215e 100644 --- a/lib/fog/monitoring/openstack/requests/list_dimension_values.rb +++ b/lib/fog/openstack/monitoring/requests/list_dimension_values.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_dimension_values(dimension_name, options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_metric_names.rb b/lib/fog/openstack/monitoring/requests/list_metric_names.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_metric_names.rb rename to lib/fog/openstack/monitoring/requests/list_metric_names.rb index 7d7eab855..2aae310cc 100644 --- a/lib/fog/monitoring/openstack/requests/list_metric_names.rb +++ b/lib/fog/openstack/monitoring/requests/list_metric_names.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_metric_names(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_metrics.rb b/lib/fog/openstack/monitoring/requests/list_metrics.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_metrics.rb rename to lib/fog/openstack/monitoring/requests/list_metrics.rb index ec36e4cee..c2baeb595 100644 --- a/lib/fog/monitoring/openstack/requests/list_metrics.rb +++ b/lib/fog/openstack/monitoring/requests/list_metrics.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_metrics(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb b/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/list_notification_method_types.rb rename to lib/fog/openstack/monitoring/requests/list_notification_method_types.rb index 6d3da6e83..74b8c1bfa 100644 --- a/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb +++ b/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_notification_method_types request( diff --git a/lib/fog/monitoring/openstack/requests/list_notification_methods.rb b/lib/fog/openstack/monitoring/requests/list_notification_methods.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_notification_methods.rb rename to lib/fog/openstack/monitoring/requests/list_notification_methods.rb index 904ac4655..21639c200 100644 --- a/lib/fog/monitoring/openstack/requests/list_notification_methods.rb +++ b/lib/fog/openstack/monitoring/requests/list_notification_methods.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_notification_methods(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_statistics.rb b/lib/fog/openstack/monitoring/requests/list_statistics.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_statistics.rb rename to lib/fog/openstack/monitoring/requests/list_statistics.rb index ab39fd904..03df6c7fe 100644 --- a/lib/fog/monitoring/openstack/requests/list_statistics.rb +++ b/lib/fog/openstack/monitoring/requests/list_statistics.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_statistics(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/patch_alarm.rb b/lib/fog/openstack/monitoring/requests/patch_alarm.rb similarity index 88% rename from lib/fog/monitoring/openstack/requests/patch_alarm.rb rename to lib/fog/openstack/monitoring/requests/patch_alarm.rb index 2d3bdfd78..aa5df3082 100644 --- a/lib/fog/monitoring/openstack/requests/patch_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/patch_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def patch_alarm(id, options) request( diff --git a/lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb index 8e887722e..3e3354d08 100644 --- a/lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def patch_alarm_definition(id, alarm_definition) request( diff --git a/lib/fog/monitoring/openstack/requests/patch_notification_method.rb b/lib/fog/openstack/monitoring/requests/patch_notification_method.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/patch_notification_method.rb rename to lib/fog/openstack/monitoring/requests/patch_notification_method.rb index 4f995ed49..34a3b92f5 100644 --- a/lib/fog/monitoring/openstack/requests/patch_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/patch_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def update_notification_method(id, notification) request( diff --git a/lib/fog/monitoring/openstack/requests/put_notification_method.rb b/lib/fog/openstack/monitoring/requests/put_notification_method.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/put_notification_method.rb rename to lib/fog/openstack/monitoring/requests/put_notification_method.rb index 3f0397e38..219d97144 100644 --- a/lib/fog/monitoring/openstack/requests/put_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/put_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def put_notification_method(id, notification) request( diff --git a/lib/fog/monitoring/openstack/requests/update_alarm.rb b/lib/fog/openstack/monitoring/requests/update_alarm.rb similarity index 88% rename from lib/fog/monitoring/openstack/requests/update_alarm.rb rename to lib/fog/openstack/monitoring/requests/update_alarm.rb index a8910dd1d..cbd4384b2 100644 --- a/lib/fog/monitoring/openstack/requests/update_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/update_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def update_alarm(id, options) request( diff --git a/lib/fog/monitoring/openstack/requests/update_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/update_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/update_alarm_definition.rb index 925404cae..3e5fb81fe 100644 --- a/lib/fog/monitoring/openstack/requests/update_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def update_alarm_definition(id, alarm_definition) request( diff --git a/lib/fog/network/openstack/models/extension.rb b/lib/fog/openstack/network/models/extension.rb similarity index 87% rename from lib/fog/network/openstack/models/extension.rb rename to lib/fog/openstack/network/models/extension.rb index 745aa2b8f..1b95bd752 100644 --- a/lib/fog/network/openstack/models/extension.rb +++ b/lib/fog/openstack/network/models/extension.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Extension < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/network/openstack/models/extensions.rb b/lib/fog/openstack/network/models/extensions.rb similarity index 76% rename from lib/fog/network/openstack/models/extensions.rb rename to lib/fog/openstack/network/models/extensions.rb index 6c01bbe7f..f105ce488 100644 --- a/lib/fog/network/openstack/models/extensions.rb +++ b/lib/fog/openstack/network/models/extensions.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/extension' +require 'fog/openstack/network/models/extension' module Fog - module Network - class OpenStack + module OpenStack + class Network class Extensions < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Extension + model Fog::OpenStack::Network::Extension def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(extension_id) if extension = service.get_extension(extension_id).body['extension'] new(extension) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/floating_ip.rb b/lib/fog/openstack/network/models/floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/models/floating_ip.rb rename to lib/fog/openstack/network/models/floating_ip.rb index de836fc9d..434ebe7f3 100644 --- a/lib/fog/network/openstack/models/floating_ip.rb +++ b/lib/fog/openstack/network/models/floating_ip.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class FloatingIp < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/floating_ips.rb b/lib/fog/openstack/network/models/floating_ips.rb similarity index 76% rename from lib/fog/network/openstack/models/floating_ips.rb rename to lib/fog/openstack/network/models/floating_ips.rb index dfeb12b6e..764b8f183 100644 --- a/lib/fog/network/openstack/models/floating_ips.rb +++ b/lib/fog/openstack/network/models/floating_ips.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/floating_ip' +require 'fog/openstack/network/models/floating_ip' module Fog - module Network - class OpenStack + module OpenStack + class Network class FloatingIps < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::FloatingIp + model Fog::OpenStack::Network::FloatingIp def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(floating_network_id) if floating_ip = service.get_floating_ip(floating_network_id).body['floatingip'] new(floating_ip) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/ike_policies.rb b/lib/fog/openstack/network/models/ike_policies.rb similarity index 76% rename from lib/fog/network/openstack/models/ike_policies.rb rename to lib/fog/openstack/network/models/ike_policies.rb index 39caae444..d659af701 100644 --- a/lib/fog/network/openstack/models/ike_policies.rb +++ b/lib/fog/openstack/network/models/ike_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/ike_policy' +require 'fog/openstack/network/models/ike_policy' module Fog - module Network - class OpenStack + module OpenStack + class Network class IkePolicies < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::IkePolicy + model Fog::OpenStack::Network::IkePolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(ike_policy_id) if ike_policy = service.get_ike_policy(ike_policy_id).body['ikepolicy'] new(ike_policy) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/ike_policy.rb b/lib/fog/openstack/network/models/ike_policy.rb similarity index 96% rename from lib/fog/network/openstack/models/ike_policy.rb rename to lib/fog/openstack/network/models/ike_policy.rb index 1cff0e650..47b7ed3bd 100644 --- a/lib/fog/network/openstack/models/ike_policy.rb +++ b/lib/fog/openstack/network/models/ike_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class IkePolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ipsec_policies.rb b/lib/fog/openstack/network/models/ipsec_policies.rb similarity index 76% rename from lib/fog/network/openstack/models/ipsec_policies.rb rename to lib/fog/openstack/network/models/ipsec_policies.rb index 5c4afe956..99e52a8be 100644 --- a/lib/fog/network/openstack/models/ipsec_policies.rb +++ b/lib/fog/openstack/network/models/ipsec_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/ipsec_policy' +require 'fog/openstack/network/models/ipsec_policy' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecPolicies < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::IpsecPolicy + model Fog::OpenStack::Network::IpsecPolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(ipsec_policy_id) if ipsec_policy = service.get_ipsec_policy(ipsec_policy_id).body['ipsecpolicy'] new(ipsec_policy) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/ipsec_policy.rb b/lib/fog/openstack/network/models/ipsec_policy.rb similarity index 97% rename from lib/fog/network/openstack/models/ipsec_policy.rb rename to lib/fog/openstack/network/models/ipsec_policy.rb index 3368d37b8..d7c5b4360 100644 --- a/lib/fog/network/openstack/models/ipsec_policy.rb +++ b/lib/fog/openstack/network/models/ipsec_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecPolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ipsec_site_connection.rb b/lib/fog/openstack/network/models/ipsec_site_connection.rb similarity index 97% rename from lib/fog/network/openstack/models/ipsec_site_connection.rb rename to lib/fog/openstack/network/models/ipsec_site_connection.rb index ec17a60f2..b5cf87f71 100644 --- a/lib/fog/network/openstack/models/ipsec_site_connection.rb +++ b/lib/fog/openstack/network/models/ipsec_site_connection.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecSiteConnection < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ipsec_site_connections.rb b/lib/fog/openstack/network/models/ipsec_site_connections.rb similarity index 77% rename from lib/fog/network/openstack/models/ipsec_site_connections.rb rename to lib/fog/openstack/network/models/ipsec_site_connections.rb index 15df5e80f..e560bc424 100644 --- a/lib/fog/network/openstack/models/ipsec_site_connections.rb +++ b/lib/fog/openstack/network/models/ipsec_site_connections.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/ipsec_site_connection' +require 'fog/openstack/network/models/ipsec_site_connection' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecSiteConnections < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::IpsecSiteConnection + model Fog::OpenStack::Network::IpsecSiteConnection def initialize(attributes) self.filters ||= {} @@ -24,7 +24,7 @@ def get(ipsec_site_connection_id) if connection new(connection) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_health_monitor.rb b/lib/fog/openstack/network/models/lb_health_monitor.rb similarity index 97% rename from lib/fog/network/openstack/models/lb_health_monitor.rb rename to lib/fog/openstack/network/models/lb_health_monitor.rb index 479533f18..ef64acfc4 100644 --- a/lib/fog/network/openstack/models/lb_health_monitor.rb +++ b/lib/fog/openstack/network/models/lb_health_monitor.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbHealthMonitor < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_health_monitors.rb b/lib/fog/openstack/network/models/lb_health_monitors.rb similarity index 76% rename from lib/fog/network/openstack/models/lb_health_monitors.rb rename to lib/fog/openstack/network/models/lb_health_monitors.rb index 5fcb7c271..30ab428cb 100644 --- a/lib/fog/network/openstack/models/lb_health_monitors.rb +++ b/lib/fog/openstack/network/models/lb_health_monitors.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_health_monitor' +require 'fog/openstack/network/models/lb_health_monitor' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbHealthMonitors < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbHealthMonitor + model Fog::OpenStack::Network::LbHealthMonitor def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(health_monitor_id) if health_monitor = service.get_lb_health_monitor(health_monitor_id).body['health_monitor'] new(health_monitor) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_member.rb b/lib/fog/openstack/network/models/lb_member.rb similarity index 96% rename from lib/fog/network/openstack/models/lb_member.rb rename to lib/fog/openstack/network/models/lb_member.rb index e19db01a7..da8a44dbd 100644 --- a/lib/fog/network/openstack/models/lb_member.rb +++ b/lib/fog/openstack/network/models/lb_member.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbMember < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_members.rb b/lib/fog/openstack/network/models/lb_members.rb similarity index 75% rename from lib/fog/network/openstack/models/lb_members.rb rename to lib/fog/openstack/network/models/lb_members.rb index a897f82ad..fd74508bb 100644 --- a/lib/fog/network/openstack/models/lb_members.rb +++ b/lib/fog/openstack/network/models/lb_members.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_member' +require 'fog/openstack/network/models/lb_member' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbMembers < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbMember + model Fog::OpenStack::Network::LbMember def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(member_id) if member = service.get_lb_member(member_id).body['member'] new(member) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_pool.rb b/lib/fog/openstack/network/models/lb_pool.rb similarity index 97% rename from lib/fog/network/openstack/models/lb_pool.rb rename to lib/fog/openstack/network/models/lb_pool.rb index 9edf37d65..fbac5b226 100644 --- a/lib/fog/network/openstack/models/lb_pool.rb +++ b/lib/fog/openstack/network/models/lb_pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbPool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_pools.rb b/lib/fog/openstack/network/models/lb_pools.rb similarity index 75% rename from lib/fog/network/openstack/models/lb_pools.rb rename to lib/fog/openstack/network/models/lb_pools.rb index 218d486d2..8a0f7adf5 100644 --- a/lib/fog/network/openstack/models/lb_pools.rb +++ b/lib/fog/openstack/network/models/lb_pools.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_pool' +require 'fog/openstack/network/models/lb_pool' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbPools < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbPool + model Fog::OpenStack::Network::LbPool def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(pool_id) if pool = service.get_lb_pool(pool_id).body['pool'] new(pool) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_vip.rb b/lib/fog/openstack/network/models/lb_vip.rb similarity index 97% rename from lib/fog/network/openstack/models/lb_vip.rb rename to lib/fog/openstack/network/models/lb_vip.rb index 18039149e..928bb0674 100644 --- a/lib/fog/network/openstack/models/lb_vip.rb +++ b/lib/fog/openstack/network/models/lb_vip.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbVip < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_vips.rb b/lib/fog/openstack/network/models/lb_vips.rb similarity index 75% rename from lib/fog/network/openstack/models/lb_vips.rb rename to lib/fog/openstack/network/models/lb_vips.rb index 24f00e48f..ee44aa639 100644 --- a/lib/fog/network/openstack/models/lb_vips.rb +++ b/lib/fog/openstack/network/models/lb_vips.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_vip' +require 'fog/openstack/network/models/lb_vip' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbVips < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbVip + model Fog::OpenStack::Network::LbVip def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(vip_id) if vip = service.get_lb_vip(vip_id).body['vip'] new(vip) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/network.rb b/lib/fog/openstack/network/models/network.rb similarity index 96% rename from lib/fog/network/openstack/models/network.rb rename to lib/fog/openstack/network/models/network.rb index 36afb31c9..7daec5c02 100644 --- a/lib/fog/network/openstack/models/network.rb +++ b/lib/fog/openstack/network/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Network < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/network_ip_availabilities.rb b/lib/fog/openstack/network/models/network_ip_availabilities.rb similarity index 70% rename from lib/fog/network/openstack/models/network_ip_availabilities.rb rename to lib/fog/openstack/network/models/network_ip_availabilities.rb index b9dc84abe..ac285856b 100644 --- a/lib/fog/network/openstack/models/network_ip_availabilities.rb +++ b/lib/fog/openstack/network/models/network_ip_availabilities.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/network_ip_availability' +require 'fog/openstack/network/models/network_ip_availability' module Fog - module Network - class OpenStack + module OpenStack + class Network class NetworkIpAvailabilities < Fog::OpenStack::Collection - model Fog::Network::OpenStack::NetworkIpAvailability + model Fog::OpenStack::Network::NetworkIpAvailability def all load_response(service.list_network_ip_availabilities, 'network_ip_availabilities') @@ -15,7 +15,7 @@ def get(network_id) if network_ip_availability = service.get_network_ip_availability(network_id).body['network_ip_availability'] new(network_ip_availability) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/network_ip_availability.rb b/lib/fog/openstack/network/models/network_ip_availability.rb similarity index 90% rename from lib/fog/network/openstack/models/network_ip_availability.rb rename to lib/fog/openstack/network/models/network_ip_availability.rb index 18c263f11..86b32de8c 100644 --- a/lib/fog/network/openstack/models/network_ip_availability.rb +++ b/lib/fog/openstack/network/models/network_ip_availability.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class NetworkIpAvailability < Fog::OpenStack::Model attribute :used_ips attribute :subnet_ip_availability diff --git a/lib/fog/network/openstack/models/networks.rb b/lib/fog/openstack/network/models/networks.rb similarity index 76% rename from lib/fog/network/openstack/models/networks.rb rename to lib/fog/openstack/network/models/networks.rb index 2a6e061e5..4ff5cf06c 100644 --- a/lib/fog/network/openstack/models/networks.rb +++ b/lib/fog/openstack/network/models/networks.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/network' +require 'fog/openstack/network/models/network' module Fog - module Network - class OpenStack + module OpenStack + class Network class Networks < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Network + model Fog::OpenStack::Network::Network def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(network_id) if network = service.get_network(network_id).body['network'] new(network) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/port.rb b/lib/fog/openstack/network/models/port.rb similarity index 96% rename from lib/fog/network/openstack/models/port.rb rename to lib/fog/openstack/network/models/port.rb index 1d3bbb88f..c5a02df4a 100644 --- a/lib/fog/network/openstack/models/port.rb +++ b/lib/fog/openstack/network/models/port.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Port < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ports.rb b/lib/fog/openstack/network/models/ports.rb similarity index 75% rename from lib/fog/network/openstack/models/ports.rb rename to lib/fog/openstack/network/models/ports.rb index b92c00310..e81e61ba6 100644 --- a/lib/fog/network/openstack/models/ports.rb +++ b/lib/fog/openstack/network/models/ports.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/port' +require 'fog/openstack/network/models/port' module Fog - module Network - class OpenStack + module OpenStack + class Network class Ports < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Port + model Fog::OpenStack::Network::Port def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(port_id) if port = service.get_port(port_id).body['port'] new(port) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/rbac_policies.rb b/lib/fog/openstack/network/models/rbac_policies.rb similarity index 77% rename from lib/fog/network/openstack/models/rbac_policies.rb rename to lib/fog/openstack/network/models/rbac_policies.rb index c25ce357f..11e6bdcaa 100644 --- a/lib/fog/network/openstack/models/rbac_policies.rb +++ b/lib/fog/openstack/network/models/rbac_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/rbac_policy' +require 'fog/openstack/network/models/rbac_policy' module Fog - module Network - class OpenStack + module OpenStack + class Network class RbacPolicies < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::RbacPolicy + model Fog::OpenStack::Network::RbacPolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(rbac_policy_id) if rbac_policy = service.get_rbac_policy(rbac_policy_id).body['rbac_policy'] new(rbac_policy) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end alias find_by_id get diff --git a/lib/fog/network/openstack/models/rbac_policy.rb b/lib/fog/openstack/network/models/rbac_policy.rb similarity index 95% rename from lib/fog/network/openstack/models/rbac_policy.rb rename to lib/fog/openstack/network/models/rbac_policy.rb index f315384cf..5ed353695 100644 --- a/lib/fog/network/openstack/models/rbac_policy.rb +++ b/lib/fog/openstack/network/models/rbac_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class RbacPolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/router.rb b/lib/fog/openstack/network/models/router.rb similarity index 92% rename from lib/fog/network/openstack/models/router.rb rename to lib/fog/openstack/network/models/router.rb index f1d86a012..e7059ee8a 100644 --- a/lib/fog/network/openstack/models/router.rb +++ b/lib/fog/openstack/network/models/router.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network # The Layer-3 Networking Extensions (router) # # A logical entity for forwarding packets across internal @@ -47,7 +47,7 @@ def options options = attributes.dup if options[:external_gateway_info] - if options[:external_gateway_info].kind_of?(Fog::Network::OpenStack::Network) + if options[:external_gateway_info].kind_of?(Fog::OpenStack::Network::Network) options[:external_gateway_info] = {:network_id => options[:external_gateway_info].id} else options[:external_gateway_info] = {:network_id => options[:external_gateway_info]} diff --git a/lib/fog/network/openstack/models/routers.rb b/lib/fog/openstack/network/models/routers.rb similarity index 75% rename from lib/fog/network/openstack/models/routers.rb rename to lib/fog/openstack/network/models/routers.rb index 3f5f49a49..e9bcea262 100644 --- a/lib/fog/network/openstack/models/routers.rb +++ b/lib/fog/openstack/network/models/routers.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/router' +require 'fog/openstack/network/models/router' module Fog - module Network - class OpenStack + module OpenStack + class Network class Routers < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Router + model Fog::OpenStack::Network::Router def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(router_id) if router = service.get_router(router_id).body['router'] new(router) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/security_group.rb b/lib/fog/openstack/network/models/security_group.rb similarity index 88% rename from lib/fog/network/openstack/models/security_group.rb rename to lib/fog/openstack/network/models/security_group.rb index 55bc842fb..307b412b1 100644 --- a/lib/fog/network/openstack/models/security_group.rb +++ b/lib/fog/openstack/network/models/security_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroup < Fog::OpenStack::Model identity :id @@ -18,7 +18,7 @@ def destroy end def security_group_rules - Fog::Network::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::OpenStack::Network::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) end def save diff --git a/lib/fog/network/openstack/models/security_group_rule.rb b/lib/fog/openstack/network/models/security_group_rule.rb similarity index 95% rename from lib/fog/network/openstack/models/security_group_rule.rb rename to lib/fog/openstack/network/models/security_group_rule.rb index 15ecff135..73f67ae53 100644 --- a/lib/fog/network/openstack/models/security_group_rule.rb +++ b/lib/fog/openstack/network/models/security_group_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroupRule < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/security_group_rules.rb b/lib/fog/openstack/network/models/security_group_rules.rb similarity index 76% rename from lib/fog/network/openstack/models/security_group_rules.rb rename to lib/fog/openstack/network/models/security_group_rules.rb index de8486a4e..138985b89 100644 --- a/lib/fog/network/openstack/models/security_group_rules.rb +++ b/lib/fog/openstack/network/models/security_group_rules.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/security_group_rule' +require 'fog/openstack/network/models/security_group_rule' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroupRules < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::SecurityGroupRule + model Fog::OpenStack::Network::SecurityGroupRule def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(sec_group_rule_id) if sec_group_rule = service.get_security_group_rule(sec_group_rule_id).body['security_group_rule'] new(sec_group_rule) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/security_groups.rb b/lib/fog/openstack/network/models/security_groups.rb similarity index 76% rename from lib/fog/network/openstack/models/security_groups.rb rename to lib/fog/openstack/network/models/security_groups.rb index cd79a446a..35bfe2b97 100644 --- a/lib/fog/network/openstack/models/security_groups.rb +++ b/lib/fog/openstack/network/models/security_groups.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/security_group' +require 'fog/openstack/network/models/security_group' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroups < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::SecurityGroup + model Fog::OpenStack::Network::SecurityGroup def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(security_group_id) if security_group = service.get_security_group(security_group_id).body['security_group'] new(security_group) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/subnet.rb b/lib/fog/openstack/network/models/subnet.rb similarity index 96% rename from lib/fog/network/openstack/models/subnet.rb rename to lib/fog/openstack/network/models/subnet.rb index 377a68c9e..cbec2ba14 100644 --- a/lib/fog/network/openstack/models/subnet.rb +++ b/lib/fog/openstack/network/models/subnet.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Subnet < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/subnet_pool.rb b/lib/fog/openstack/network/models/subnet_pool.rb similarity index 96% rename from lib/fog/network/openstack/models/subnet_pool.rb rename to lib/fog/openstack/network/models/subnet_pool.rb index bade0636a..c14208b18 100644 --- a/lib/fog/network/openstack/models/subnet_pool.rb +++ b/lib/fog/openstack/network/models/subnet_pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class SubnetPool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/subnet_pools.rb b/lib/fog/openstack/network/models/subnet_pools.rb similarity index 76% rename from lib/fog/network/openstack/models/subnet_pools.rb rename to lib/fog/openstack/network/models/subnet_pools.rb index fa8006430..414cad0f8 100644 --- a/lib/fog/network/openstack/models/subnet_pools.rb +++ b/lib/fog/openstack/network/models/subnet_pools.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/subnet_pool' +require 'fog/openstack/network/models/subnet_pool' module Fog - module Network - class OpenStack + module OpenStack + class Network class SubnetPools < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::SubnetPool + model Fog::OpenStack::Network::SubnetPool def initialize(attributes) self.filters ||= {} @@ -24,7 +24,7 @@ def get(subnet_pool_id) if subnet_pool new(subnet_pool) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/subnets.rb b/lib/fog/openstack/network/models/subnets.rb similarity index 75% rename from lib/fog/network/openstack/models/subnets.rb rename to lib/fog/openstack/network/models/subnets.rb index f7df5f7f1..7f7b8dff2 100644 --- a/lib/fog/network/openstack/models/subnets.rb +++ b/lib/fog/openstack/network/models/subnets.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/subnet' +require 'fog/openstack/network/models/subnet' module Fog - module Network - class OpenStack + module OpenStack + class Network class Subnets < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Subnet + model Fog::OpenStack::Network::Subnet def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(subnet_id) if subnet = service.get_subnet(subnet_id).body['subnet'] new(subnet) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/vpn_service.rb b/lib/fog/openstack/network/models/vpn_service.rb similarity index 96% rename from lib/fog/network/openstack/models/vpn_service.rb rename to lib/fog/openstack/network/models/vpn_service.rb index 41217aadf..8dbb990c5 100644 --- a/lib/fog/network/openstack/models/vpn_service.rb +++ b/lib/fog/openstack/network/models/vpn_service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class VpnService < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/vpn_services.rb b/lib/fog/openstack/network/models/vpn_services.rb similarity index 76% rename from lib/fog/network/openstack/models/vpn_services.rb rename to lib/fog/openstack/network/models/vpn_services.rb index af8baea7d..c062a2fa0 100644 --- a/lib/fog/network/openstack/models/vpn_services.rb +++ b/lib/fog/openstack/network/models/vpn_services.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/vpn_service' +require 'fog/openstack/network/models/vpn_service' module Fog - module Network - class OpenStack + module OpenStack + class Network class VpnServices < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::VpnService + model Fog::OpenStack::Network::VpnService def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(vpn_service_id) if vpn_service = service.get_vpn_service(vpn_service_id).body['vpnservice'] new(vpn_service) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack.rb b/lib/fog/openstack/network/network.rb similarity index 98% rename from lib/fog/network/openstack.rb rename to lib/fog/openstack/network/network.rb index f0c1e0f3c..10070d4d3 100644 --- a/lib/fog/network/openstack.rb +++ b/lib/fog/openstack/network/network.rb @@ -1,8 +1,8 @@ module Fog - module Network - class OpenStack < Fog::Service + module OpenStack + class Network < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -17,7 +17,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/network/openstack/models' + model_path 'fog/openstack/network/models' model :extension collection :extensions model :network @@ -59,7 +59,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/network/openstack/requests' + request_path 'fog/openstack/network/requests' # Neutron Extensions request :list_extensions @@ -442,7 +442,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Network::OpenStack::NotFound + Fog::OpenStack::Network::NotFound end def default_path_prefix diff --git a/lib/fog/network/openstack/requests/add_router_interface.rb b/lib/fog/openstack/network/requests/add_router_interface.rb similarity index 97% rename from lib/fog/network/openstack/requests/add_router_interface.rb rename to lib/fog/openstack/network/requests/add_router_interface.rb index e3c566128..ad6f8748d 100644 --- a/lib/fog/network/openstack/requests/add_router_interface.rb +++ b/lib/fog/openstack/network/requests/add_router_interface.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def add_router_interface(router_id, subnet_id_or_options) if subnet_id_or_options.kind_of? String diff --git a/lib/fog/network/openstack/requests/associate_floating_ip.rb b/lib/fog/openstack/network/requests/associate_floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/requests/associate_floating_ip.rb rename to lib/fog/openstack/network/requests/associate_floating_ip.rb index bb1b306a4..6ffa8d498 100644 --- a/lib/fog/network/openstack/requests/associate_floating_ip.rb +++ b/lib/fog/openstack/network/requests/associate_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def associate_floating_ip(floating_ip_id, port_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/associate_lb_health_monitor.rb b/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb similarity index 91% rename from lib/fog/network/openstack/requests/associate_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/associate_lb_health_monitor.rb index ad575e507..523310005 100644 --- a/lib/fog/network/openstack/requests/associate_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def associate_lb_health_monitor(pool_id, health_monitor_id) data = { @@ -28,7 +28,7 @@ def associate_lb_health_monitor(pool_id, health_monitor_id) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/create_floating_ip.rb b/lib/fog/openstack/network/requests/create_floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_floating_ip.rb rename to lib/fog/openstack/network/requests/create_floating_ip.rb index 5074ae40b..ec71f30a4 100644 --- a/lib/fog/network/openstack/requests/create_floating_ip.rb +++ b/lib/fog/openstack/network/requests/create_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_floating_ip(floating_network_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_ike_policy.rb b/lib/fog/openstack/network/requests/create_ike_policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_ike_policy.rb rename to lib/fog/openstack/network/requests/create_ike_policy.rb index 7d2296cc5..28b33df7f 100644 --- a/lib/fog/network/openstack/requests/create_ike_policy.rb +++ b/lib/fog/openstack/network/requests/create_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_ike_policy(options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_ipsec_policy.rb b/lib/fog/openstack/network/requests/create_ipsec_policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_ipsec_policy.rb rename to lib/fog/openstack/network/requests/create_ipsec_policy.rb index 8072890cd..0a0fd904d 100644 --- a/lib/fog/network/openstack/requests/create_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/create_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_ipsec_policy(options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/create_ipsec_site_connection.rb index fde20bca8..a5b674a13 100644 --- a/lib/fog/network/openstack/requests/create_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_health_monitor.rb b/lib/fog/openstack/network/requests/create_lb_health_monitor.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/create_lb_health_monitor.rb index eb3498c81..944c40cd6 100644 --- a/lib/fog/network/openstack/requests/create_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/create_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_member.rb b/lib/fog/openstack/network/requests/create_lb_member.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lb_member.rb rename to lib/fog/openstack/network/requests/create_lb_member.rb index 64443d13d..262201a48 100644 --- a/lib/fog/network/openstack/requests/create_lb_member.rb +++ b/lib/fog/openstack/network/requests/create_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_member(pool_id, address, protocol_port, weight, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_pool.rb b/lib/fog/openstack/network/requests/create_lb_pool.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lb_pool.rb rename to lib/fog/openstack/network/requests/create_lb_pool.rb index 6a03b6d78..e4ebd5cd1 100644 --- a/lib/fog/network/openstack/requests/create_lb_pool.rb +++ b/lib/fog/openstack/network/requests/create_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_pool(subnet_id, protocol, lb_method, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_vip.rb b/lib/fog/openstack/network/requests/create_lb_vip.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lb_vip.rb rename to lib/fog/openstack/network/requests/create_lb_vip.rb index 3344c2716..70a3358e7 100644 --- a/lib/fog/network/openstack/requests/create_lb_vip.rb +++ b/lib/fog/openstack/network/requests/create_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb index 98be085b7..be0a68f66 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_healthmonitor(pool_id, type, delay, timeout, max_retries, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/create_lbaas_l7policy.rb index aac267e48..7ef1c2333 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_l7policy(listener_id, action, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/create_lbaas_l7rule.rb index 869670308..e2992aa8e 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_l7rule(l7policy_id, type, compare_type, value, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_listener.rb b/lib/fog/openstack/network/requests/create_lbaas_listener.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lbaas_listener.rb rename to lib/fog/openstack/network/requests/create_lbaas_listener.rb index dcec8c92f..5abeccaac 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_listener(loadbalancer_id, protocol, protocol_port, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb index aa8fb2afc..dd7d61118 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_loadbalancer(vip_subnet_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_pool.rb b/lib/fog/openstack/network/requests/create_lbaas_pool.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_pool.rb rename to lib/fog/openstack/network/requests/create_lbaas_pool.rb index c539862ff..cddffc9bd 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_pool(listener_id, protocol, lb_algorithm, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/create_lbaas_pool_member.rb index 8e73b2d8d..547158991 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_pool_member(pool_id, address, protocol_port, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_network.rb b/lib/fog/openstack/network/requests/create_network.rb similarity index 94% rename from lib/fog/network/openstack/requests/create_network.rb rename to lib/fog/openstack/network/requests/create_network.rb index 035e284b5..bee8dc484 100644 --- a/lib/fog/network/openstack/requests/create_network.rb +++ b/lib/fog/openstack/network/requests/create_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real CREATE_OPTIONS = [ :name, @@ -25,7 +25,7 @@ class Real :router_external, ].freeze - # Map Fog::Network::OpenStack::Network + # Map Fog::OpenStack::Network::Network # model attributes to OpenStack provider attributes ALIASES = { :provider_network_type => 'provider:network_type', @@ -77,7 +77,7 @@ def create_network(options = {}) 'qos_policy_id' => options[:qos_policy_id], 'port_security_enabled' => options[:port_security_enabled] || false } - data.merge!(Fog::Network::OpenStack::Real.create(options)) + data.merge!(Fog::OpenStack::Network::Real.create(options)) self.data[:networks][data['id']] = data response.body = {'network' => data} response diff --git a/lib/fog/network/openstack/requests/create_port.rb b/lib/fog/openstack/network/requests/create_port.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_port.rb rename to lib/fog/openstack/network/requests/create_port.rb index f915d977e..75d41a049 100644 --- a/lib/fog/network/openstack/requests/create_port.rb +++ b/lib/fog/openstack/network/requests/create_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_port(network_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_rbac_policy.rb b/lib/fog/openstack/network/requests/create_rbac_policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_rbac_policy.rb rename to lib/fog/openstack/network/requests/create_rbac_policy.rb index bf9b34392..661dd5ae8 100644 --- a/lib/fog/network/openstack/requests/create_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/create_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_rbac_policy(options = {}) data = {'rbac_policy' => {}} diff --git a/lib/fog/network/openstack/requests/create_router.rb b/lib/fog/openstack/network/requests/create_router.rb similarity index 93% rename from lib/fog/network/openstack/requests/create_router.rb rename to lib/fog/openstack/network/requests/create_router.rb index 489666099..d02b67be8 100644 --- a/lib/fog/network/openstack/requests/create_router.rb +++ b/lib/fog/openstack/network/requests/create_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_router(name, options = {}) data = { @@ -23,7 +23,7 @@ def create_router(name, options = {}) # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::Network::OpenStack::Network) + if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" data['router'][:external_gateway_info] = {:network_id => egi.id} @@ -50,7 +50,7 @@ def create_router(name, options = {}) # remove this in a future egi = options[:external_gateway_info] - if egi && egi.kind_of?(Fog::Network::OpenStack::Network) + if egi && egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" egi = {:network_id => egi.id} diff --git a/lib/fog/network/openstack/requests/create_security_group.rb b/lib/fog/openstack/network/requests/create_security_group.rb similarity index 99% rename from lib/fog/network/openstack/requests/create_security_group.rb rename to lib/fog/openstack/network/requests/create_security_group.rb index 024f557e1..84800e80b 100644 --- a/lib/fog/network/openstack/requests/create_security_group.rb +++ b/lib/fog/openstack/network/requests/create_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Create a new security group # diff --git a/lib/fog/network/openstack/requests/create_security_group_rule.rb b/lib/fog/openstack/network/requests/create_security_group_rule.rb similarity index 99% rename from lib/fog/network/openstack/requests/create_security_group_rule.rb rename to lib/fog/openstack/network/requests/create_security_group_rule.rb index d80a5911f..3de620781 100644 --- a/lib/fog/network/openstack/requests/create_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/create_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Create a new security group rule # diff --git a/lib/fog/network/openstack/requests/create_subnet.rb b/lib/fog/openstack/network/requests/create_subnet.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_subnet.rb rename to lib/fog/openstack/network/requests/create_subnet.rb index 610fcb09b..1d49b1a34 100644 --- a/lib/fog/network/openstack/requests/create_subnet.rb +++ b/lib/fog/openstack/network/requests/create_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_subnet(network_id, cidr, ip_version, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_subnet_pool.rb b/lib/fog/openstack/network/requests/create_subnet_pool.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_subnet_pool.rb rename to lib/fog/openstack/network/requests/create_subnet_pool.rb index f2064879a..3b56580f7 100644 --- a/lib/fog/network/openstack/requests/create_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/create_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_subnet_pool(name, prefixes, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_vpn_service.rb b/lib/fog/openstack/network/requests/create_vpn_service.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_vpn_service.rb rename to lib/fog/openstack/network/requests/create_vpn_service.rb index b607e239f..811658e66 100644 --- a/lib/fog/network/openstack/requests/create_vpn_service.rb +++ b/lib/fog/openstack/network/requests/create_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_vpn_service(subnet_id, router_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/delete_floating_ip.rb b/lib/fog/openstack/network/requests/delete_floating_ip.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_floating_ip.rb rename to lib/fog/openstack/network/requests/delete_floating_ip.rb index 3410ae317..a5ed2249b 100644 --- a/lib/fog/network/openstack/requests/delete_floating_ip.rb +++ b/lib/fog/openstack/network/requests/delete_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_floating_ip(floating_ip_id) request( @@ -19,7 +19,7 @@ def delete_floating_ip(floating_ip_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_ike_policy.rb b/lib/fog/openstack/network/requests/delete_ike_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_ike_policy.rb rename to lib/fog/openstack/network/requests/delete_ike_policy.rb index fc798c3ae..7ded4a686 100644 --- a/lib/fog/network/openstack/requests/delete_ike_policy.rb +++ b/lib/fog/openstack/network/requests/delete_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_ike_policy(ike_policy_id) request( @@ -19,7 +19,7 @@ def delete_ike_policy(ike_policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_ipsec_policy.rb b/lib/fog/openstack/network/requests/delete_ipsec_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_ipsec_policy.rb rename to lib/fog/openstack/network/requests/delete_ipsec_policy.rb index b9ca9bf95..ab38153de 100644 --- a/lib/fog/network/openstack/requests/delete_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/delete_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_ipsec_policy(ipsec_policy_id) request( @@ -19,7 +19,7 @@ def delete_ipsec_policy(ipsec_policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb similarity index 89% rename from lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb index fd24837c9..685b2201e 100644 --- a/lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_ipsec_site_connection(ipsec_site_connection_id) request( @@ -20,7 +20,7 @@ def delete_ipsec_site_connection(ipsec_site_connection_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_health_monitor.rb b/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/delete_lb_health_monitor.rb index 53759f2c8..bcda68445 100644 --- a/lib/fog/network/openstack/requests/delete_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_health_monitor(health_monitor_id) request( @@ -19,7 +19,7 @@ def delete_lb_health_monitor(health_monitor_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_member.rb b/lib/fog/openstack/network/requests/delete_lb_member.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lb_member.rb rename to lib/fog/openstack/network/requests/delete_lb_member.rb index d7dc2f956..5f59c5b87 100644 --- a/lib/fog/network/openstack/requests/delete_lb_member.rb +++ b/lib/fog/openstack/network/requests/delete_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_member(member_id) request( @@ -19,7 +19,7 @@ def delete_lb_member(member_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_pool.rb b/lib/fog/openstack/network/requests/delete_lb_pool.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lb_pool.rb rename to lib/fog/openstack/network/requests/delete_lb_pool.rb index 2028cfe49..c74ddf3e9 100644 --- a/lib/fog/network/openstack/requests/delete_lb_pool.rb +++ b/lib/fog/openstack/network/requests/delete_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_pool(pool_id) request( @@ -19,7 +19,7 @@ def delete_lb_pool(pool_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_vip.rb b/lib/fog/openstack/network/requests/delete_lb_vip.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lb_vip.rb rename to lib/fog/openstack/network/requests/delete_lb_vip.rb index 5a413684c..feb25b5fc 100644 --- a/lib/fog/network/openstack/requests/delete_lb_vip.rb +++ b/lib/fog/openstack/network/requests/delete_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_vip(vip_id) request( @@ -19,7 +19,7 @@ def delete_lb_vip(vip_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb index 31e41356b..54987f35a 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_healthmonitor(healthmonitor_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_healthmonitor(healthmonitor_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb index bafde224d..932da19e1 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_l7policy(l7policy_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_l7policy(l7policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb index dec806767..e8c238b53 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_l7rule(l7policy_id, l7rule_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_l7rule(l7policy_id, l7rule_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_listener.rb b/lib/fog/openstack/network/requests/delete_lbaas_listener.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_lbaas_listener.rb rename to lib/fog/openstack/network/requests/delete_lbaas_listener.rb index 3f4e73465..757f4dbd6 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_listener(listener_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_listener(listener_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb index e73cd61d4..86bd24c1e 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_loadbalancer(loadbalancer_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_loadbalancer(loadbalancer_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_pool.rb b/lib/fog/openstack/network/requests/delete_lbaas_pool.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lbaas_pool.rb rename to lib/fog/openstack/network/requests/delete_lbaas_pool.rb index 8c0e5cf93..3034c130a 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_pool(pool_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_pool(pool_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb index 17e547efb..82ef9e421 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_pool_member(pool_id, member_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_pool_member(pool_id, member_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_network.rb b/lib/fog/openstack/network/requests/delete_network.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_network.rb rename to lib/fog/openstack/network/requests/delete_network.rb index 0bee8e6c1..abd10a4c0 100644 --- a/lib/fog/network/openstack/requests/delete_network.rb +++ b/lib/fog/openstack/network/requests/delete_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_network(network_id) request( @@ -19,7 +19,7 @@ def delete_network(network_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_port.rb b/lib/fog/openstack/network/requests/delete_port.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_port.rb rename to lib/fog/openstack/network/requests/delete_port.rb index 16b91a740..270b5eb25 100644 --- a/lib/fog/network/openstack/requests/delete_port.rb +++ b/lib/fog/openstack/network/requests/delete_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_port(port_id) request( @@ -19,7 +19,7 @@ def delete_port(port_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_quota.rb b/lib/fog/openstack/network/requests/delete_quota.rb similarity index 91% rename from lib/fog/network/openstack/requests/delete_quota.rb rename to lib/fog/openstack/network/requests/delete_quota.rb index 1336ab448..8cb55f731 100644 --- a/lib/fog/network/openstack/requests/delete_quota.rb +++ b/lib/fog/openstack/network/requests/delete_quota.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_quota(tenant_id) request( diff --git a/lib/fog/network/openstack/requests/delete_rbac_policy.rb b/lib/fog/openstack/network/requests/delete_rbac_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_rbac_policy.rb rename to lib/fog/openstack/network/requests/delete_rbac_policy.rb index f051160e3..61ab9a190 100644 --- a/lib/fog/network/openstack/requests/delete_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/delete_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_rbac_policy(rbac_policy_id) request( @@ -19,7 +19,7 @@ def delete_rbac_policy(rbac_policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_router.rb b/lib/fog/openstack/network/requests/delete_router.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_router.rb rename to lib/fog/openstack/network/requests/delete_router.rb index 313ce92d5..40b558328 100644 --- a/lib/fog/network/openstack/requests/delete_router.rb +++ b/lib/fog/openstack/network/requests/delete_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_router(router_id) request( @@ -19,7 +19,7 @@ def delete_router(router_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_security_group.rb b/lib/fog/openstack/network/requests/delete_security_group.rb similarity index 89% rename from lib/fog/network/openstack/requests/delete_security_group.rb rename to lib/fog/openstack/network/requests/delete_security_group.rb index 9dadd9b2f..d467dc440 100644 --- a/lib/fog/network/openstack/requests/delete_security_group.rb +++ b/lib/fog/openstack/network/requests/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Delete a security group # @@ -23,7 +23,7 @@ def delete_security_group(security_group_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_security_group_rule.rb b/lib/fog/openstack/network/requests/delete_security_group_rule.rb similarity index 90% rename from lib/fog/network/openstack/requests/delete_security_group_rule.rb rename to lib/fog/openstack/network/requests/delete_security_group_rule.rb index 2651982d9..0ad7a8ac5 100644 --- a/lib/fog/network/openstack/requests/delete_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/delete_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Delete a security group rule # @@ -23,7 +23,7 @@ def delete_security_group_rule(security_group_rule_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_subnet.rb b/lib/fog/openstack/network/requests/delete_subnet.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_subnet.rb rename to lib/fog/openstack/network/requests/delete_subnet.rb index 86d3e4a64..0d47b2563 100644 --- a/lib/fog/network/openstack/requests/delete_subnet.rb +++ b/lib/fog/openstack/network/requests/delete_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_subnet(subnet_id) request( @@ -19,7 +19,7 @@ def delete_subnet(subnet_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_subnet_pool.rb b/lib/fog/openstack/network/requests/delete_subnet_pool.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_subnet_pool.rb rename to lib/fog/openstack/network/requests/delete_subnet_pool.rb index 9c985d0ce..ed2f970c2 100644 --- a/lib/fog/network/openstack/requests/delete_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/delete_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_subnet_pool(subnet_pool_id) request( @@ -19,7 +19,7 @@ def delete_subnet_pool(subnet_pool_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_vpn_service.rb b/lib/fog/openstack/network/requests/delete_vpn_service.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_vpn_service.rb rename to lib/fog/openstack/network/requests/delete_vpn_service.rb index 99fd4a866..37665346e 100644 --- a/lib/fog/network/openstack/requests/delete_vpn_service.rb +++ b/lib/fog/openstack/network/requests/delete_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_vpn_service(vpn_service_id) request( @@ -19,7 +19,7 @@ def delete_vpn_service(vpn_service_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/disassociate_floating_ip.rb b/lib/fog/openstack/network/requests/disassociate_floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/requests/disassociate_floating_ip.rb rename to lib/fog/openstack/network/requests/disassociate_floating_ip.rb index 048e11ea2..f82c61378 100644 --- a/lib/fog/network/openstack/requests/disassociate_floating_ip.rb +++ b/lib/fog/openstack/network/requests/disassociate_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def disassociate_floating_ip(floating_ip_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb b/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb similarity index 89% rename from lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb index 3cafc56f4..473fa2ffe 100644 --- a/lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def disassociate_lb_health_monitor(pool_id, health_monitor_id) request( @@ -20,7 +20,7 @@ def disassociate_lb_health_monitor(pool_id, health_monitor_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_extension.rb b/lib/fog/openstack/network/requests/get_extension.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_extension.rb rename to lib/fog/openstack/network/requests/get_extension.rb index 9cef9ec26..4bf4bd7c1 100644 --- a/lib/fog/network/openstack/requests/get_extension.rb +++ b/lib/fog/openstack/network/requests/get_extension.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_extension(name) request( @@ -19,7 +19,7 @@ def get_extension(name) response.body = {'extension' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_floating_ip.rb b/lib/fog/openstack/network/requests/get_floating_ip.rb similarity index 92% rename from lib/fog/network/openstack/requests/get_floating_ip.rb rename to lib/fog/openstack/network/requests/get_floating_ip.rb index 2ec92555e..4bd6ac2a5 100644 --- a/lib/fog/network/openstack/requests/get_floating_ip.rb +++ b/lib/fog/openstack/network/requests/get_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_floating_ip(floating_ip_id) request( @@ -30,7 +30,7 @@ def get_floating_ip(floating_ip_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_ike_policy.rb b/lib/fog/openstack/network/requests/get_ike_policy.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_ike_policy.rb rename to lib/fog/openstack/network/requests/get_ike_policy.rb index da81eb114..4eacb6261 100644 --- a/lib/fog/network/openstack/requests/get_ike_policy.rb +++ b/lib/fog/openstack/network/requests/get_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_ike_policy(ike_policy_id) request( @@ -19,7 +19,7 @@ def get_ike_policy(ike_policy_id) response.body = {'ikepolicy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_ipsec_policy.rb b/lib/fog/openstack/network/requests/get_ipsec_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_ipsec_policy.rb rename to lib/fog/openstack/network/requests/get_ipsec_policy.rb index 4d6336f45..b8c7d7b2f 100644 --- a/lib/fog/network/openstack/requests/get_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/get_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_ipsec_policy(ipsec_policy_id) request( @@ -19,7 +19,7 @@ def get_ipsec_policy(ipsec_policy_id) response.body = {'ipsecpolicy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb similarity index 88% rename from lib/fog/network/openstack/requests/get_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/get_ipsec_site_connection.rb index 5b1774b64..e100d18b4 100644 --- a/lib/fog/network/openstack/requests/get_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_ipsec_site_connection(ipsec_site_connection_id) request( @@ -19,7 +19,7 @@ def get_ipsec_site_connection(ipsec_site_connection_id) response.body = {'ipsec_site_connection' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_health_monitor.rb b/lib/fog/openstack/network/requests/get_lb_health_monitor.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/get_lb_health_monitor.rb index 6af8dadcf..1ac983470 100644 --- a/lib/fog/network/openstack/requests/get_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/get_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_health_monitor(health_monitor_id) request( @@ -19,7 +19,7 @@ def get_lb_health_monitor(health_monitor_id) response.body = {'health_monitor' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_member.rb b/lib/fog/openstack/network/requests/get_lb_member.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_lb_member.rb rename to lib/fog/openstack/network/requests/get_lb_member.rb index f6e0d0e38..cd18a27d7 100644 --- a/lib/fog/network/openstack/requests/get_lb_member.rb +++ b/lib/fog/openstack/network/requests/get_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_member(member_id) request( @@ -19,7 +19,7 @@ def get_lb_member(member_id) response.body = {'member' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_pool.rb b/lib/fog/openstack/network/requests/get_lb_pool.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_lb_pool.rb rename to lib/fog/openstack/network/requests/get_lb_pool.rb index c32746c83..93668dd60 100644 --- a/lib/fog/network/openstack/requests/get_lb_pool.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_pool(pool_id) request( @@ -19,7 +19,7 @@ def get_lb_pool(pool_id) response.body = {'pool' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_pool_stats.rb b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb similarity index 89% rename from lib/fog/network/openstack/requests/get_lb_pool_stats.rb rename to lib/fog/openstack/network/requests/get_lb_pool_stats.rb index 2e50f9425..385cec020 100644 --- a/lib/fog/network/openstack/requests/get_lb_pool_stats.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_pool_stats(pool_id) request( @@ -24,7 +24,7 @@ def get_lb_pool_stats(pool_id) response.body = {'stats' => stats} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_vip.rb b/lib/fog/openstack/network/requests/get_lb_vip.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_lb_vip.rb rename to lib/fog/openstack/network/requests/get_lb_vip.rb index 97c8bb13e..54b85101a 100644 --- a/lib/fog/network/openstack/requests/get_lb_vip.rb +++ b/lib/fog/openstack/network/requests/get_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_vip(vip_id) request( @@ -19,7 +19,7 @@ def get_lb_vip(vip_id) response.body = {'vip' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb index 5c7fcbf87..6a02762b6 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_healthmonitor(healthmonitor_id) request( @@ -19,7 +19,7 @@ def get_lbaas_healthmonitor(healthmonitor_id) response.body = {'healthmonitor' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/get_lbaas_l7policy.rb index 44d87105c..e1a319869 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_l7policy(l7policy_id) request( @@ -19,7 +19,7 @@ def get_lbaas_l7policy(l7policy_id) response.body = {'l7policy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/get_lbaas_l7rule.rb index e63b527d6..5f628dd1d 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_l7rule(l7policy_id, l7rule_id) request( @@ -19,7 +19,7 @@ def get_lbaas_l7rule(l7policy_id, l7rule_id) response.body = {'rule' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_listener.rb b/lib/fog/openstack/network/requests/get_lbaas_listener.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_lbaas_listener.rb rename to lib/fog/openstack/network/requests/get_lbaas_listener.rb index 2bfc10b78..2e3e9c360 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_listener(listener_id) request( @@ -19,7 +19,7 @@ def get_lbaas_listener(listener_id) response.body = {'listener' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb index e9c5f790b..9adbc292f 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_loadbalancer(loadbalancer_id) request( @@ -19,7 +19,7 @@ def get_lbaas_loadbalancer(loadbalancer_id) response.body = {'loadbalancer' => data[:lbaas_loadbalancer]} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_pool.rb b/lib/fog/openstack/network/requests/get_lbaas_pool.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_lbaas_pool.rb rename to lib/fog/openstack/network/requests/get_lbaas_pool.rb index 8342fe7c2..7ee764d14 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_pool(pool_id) request( @@ -19,7 +19,7 @@ def get_lbaas_pool(pool_id) response.body = {'pool' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/get_lbaas_pool_member.rb index 88b89ac97..d91f8358c 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_pool_member(pool_id, member_id) request( @@ -19,7 +19,7 @@ def get_lbaas_pool_member(pool_id, member_id) response.body = {'member' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_network.rb b/lib/fog/openstack/network/requests/get_network.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_network.rb rename to lib/fog/openstack/network/requests/get_network.rb index 44acd5d1c..86968552d 100644 --- a/lib/fog/network/openstack/requests/get_network.rb +++ b/lib/fog/openstack/network/requests/get_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_network(network_id) request( @@ -19,7 +19,7 @@ def get_network(network_id) response.body = {'network' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_network_ip_availability.rb b/lib/fog/openstack/network/requests/get_network_ip_availability.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_network_ip_availability.rb rename to lib/fog/openstack/network/requests/get_network_ip_availability.rb index ad09682db..08c2319cb 100644 --- a/lib/fog/network/openstack/requests/get_network_ip_availability.rb +++ b/lib/fog/openstack/network/requests/get_network_ip_availability.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_network_ip_availability(network_id) request( @@ -19,7 +19,7 @@ def get_network_ip_availability(network_id) response.body = {'network_ip_availability' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_port.rb b/lib/fog/openstack/network/requests/get_port.rb similarity index 94% rename from lib/fog/network/openstack/requests/get_port.rb rename to lib/fog/openstack/network/requests/get_port.rb index f8210265e..da6159748 100644 --- a/lib/fog/network/openstack/requests/get_port.rb +++ b/lib/fog/openstack/network/requests/get_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_port(port_id) request( @@ -42,7 +42,7 @@ def get_port(port_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_quota.rb b/lib/fog/openstack/network/requests/get_quota.rb similarity index 93% rename from lib/fog/network/openstack/requests/get_quota.rb rename to lib/fog/openstack/network/requests/get_quota.rb index 629c8db6b..7caa56c36 100644 --- a/lib/fog/network/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/network/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_quota(tenant_id) request( diff --git a/lib/fog/network/openstack/requests/get_quotas.rb b/lib/fog/openstack/network/requests/get_quotas.rb similarity index 92% rename from lib/fog/network/openstack/requests/get_quotas.rb rename to lib/fog/openstack/network/requests/get_quotas.rb index b13d9b530..295caca5a 100644 --- a/lib/fog/network/openstack/requests/get_quotas.rb +++ b/lib/fog/openstack/network/requests/get_quotas.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_quotas request( diff --git a/lib/fog/network/openstack/requests/get_rbac_policy.rb b/lib/fog/openstack/network/requests/get_rbac_policy.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_rbac_policy.rb rename to lib/fog/openstack/network/requests/get_rbac_policy.rb index 6b0ba0f7b..c42f505d9 100644 --- a/lib/fog/network/openstack/requests/get_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/get_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_rbac_policy(rbac_policy_id) request( @@ -19,7 +19,7 @@ def get_rbac_policy(rbac_policy_id) response.body = {'rbac_policy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_router.rb b/lib/fog/openstack/network/requests/get_router.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_router.rb rename to lib/fog/openstack/network/requests/get_router.rb index 7791dc996..dc69e2be8 100644 --- a/lib/fog/network/openstack/requests/get_router.rb +++ b/lib/fog/openstack/network/requests/get_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_router(router_id) request( @@ -21,7 +21,7 @@ def get_router(router_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_security_group.rb b/lib/fog/openstack/network/requests/get_security_group.rb similarity index 96% rename from lib/fog/network/openstack/requests/get_security_group.rb rename to lib/fog/openstack/network/requests/get_security_group.rb index 86e10a088..7ef1c916d 100644 --- a/lib/fog/network/openstack/requests/get_security_group.rb +++ b/lib/fog/openstack/network/requests/get_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Get details about a security group # @@ -43,7 +43,7 @@ def get_security_group(security_group_id) response.body = {"security_group" => sec_group} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_security_group_rule.rb b/lib/fog/openstack/network/requests/get_security_group_rule.rb similarity index 95% rename from lib/fog/network/openstack/requests/get_security_group_rule.rb rename to lib/fog/openstack/network/requests/get_security_group_rule.rb index 67204e8ec..ac746088e 100644 --- a/lib/fog/network/openstack/requests/get_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/get_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Get details about a security group rule # @@ -38,7 +38,7 @@ def get_security_group_rule(security_group_rule_id) response.body = {"security_group_rule" => sec_group_rule} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_subnet.rb b/lib/fog/openstack/network/requests/get_subnet.rb similarity index 93% rename from lib/fog/network/openstack/requests/get_subnet.rb rename to lib/fog/openstack/network/requests/get_subnet.rb index cac3ed4b4..8271a4dbf 100644 --- a/lib/fog/network/openstack/requests/get_subnet.rb +++ b/lib/fog/openstack/network/requests/get_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_subnet(subnet_id) request( @@ -38,7 +38,7 @@ def get_subnet(subnet_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_subnet_pool.rb b/lib/fog/openstack/network/requests/get_subnet_pool.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_subnet_pool.rb rename to lib/fog/openstack/network/requests/get_subnet_pool.rb index dcbd84491..c1159b4ed 100644 --- a/lib/fog/network/openstack/requests/get_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/get_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_subnet_pool(subnet_pool_id) request( @@ -20,7 +20,7 @@ def get_subnet_pool(subnet_pool_id) response.body = {'subnetpool' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_vpn_service.rb b/lib/fog/openstack/network/requests/get_vpn_service.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_vpn_service.rb rename to lib/fog/openstack/network/requests/get_vpn_service.rb index 3e8858e00..ac0825e43 100644 --- a/lib/fog/network/openstack/requests/get_vpn_service.rb +++ b/lib/fog/openstack/network/requests/get_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_vpn_service(vpn_service_id) request( @@ -19,7 +19,7 @@ def get_vpn_service(vpn_service_id) response.body = {'vpnservice' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/list_extensions.rb b/lib/fog/openstack/network/requests/list_extensions.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_extensions.rb rename to lib/fog/openstack/network/requests/list_extensions.rb index 2b8f7c7d7..2eee193a2 100644 --- a/lib/fog/network/openstack/requests/list_extensions.rb +++ b/lib/fog/openstack/network/requests/list_extensions.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_extensions(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_floating_ips.rb b/lib/fog/openstack/network/requests/list_floating_ips.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_floating_ips.rb rename to lib/fog/openstack/network/requests/list_floating_ips.rb index 58664a180..5932a7e87 100644 --- a/lib/fog/network/openstack/requests/list_floating_ips.rb +++ b/lib/fog/openstack/network/requests/list_floating_ips.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_floating_ips(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ike_policies.rb b/lib/fog/openstack/network/requests/list_ike_policies.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_ike_policies.rb rename to lib/fog/openstack/network/requests/list_ike_policies.rb index b3a5f265d..ede627f96 100644 --- a/lib/fog/network/openstack/requests/list_ike_policies.rb +++ b/lib/fog/openstack/network/requests/list_ike_policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ike_policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ipsec_policies.rb b/lib/fog/openstack/network/requests/list_ipsec_policies.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_ipsec_policies.rb rename to lib/fog/openstack/network/requests/list_ipsec_policies.rb index 07bb6a6d7..9cca1ca17 100644 --- a/lib/fog/network/openstack/requests/list_ipsec_policies.rb +++ b/lib/fog/openstack/network/requests/list_ipsec_policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ipsec_policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ipsec_site_connections.rb b/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_ipsec_site_connections.rb rename to lib/fog/openstack/network/requests/list_ipsec_site_connections.rb index de7a105a4..cd50b9e5a 100644 --- a/lib/fog/network/openstack/requests/list_ipsec_site_connections.rb +++ b/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ipsec_site_connections(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_health_monitors.rb b/lib/fog/openstack/network/requests/list_lb_health_monitors.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lb_health_monitors.rb rename to lib/fog/openstack/network/requests/list_lb_health_monitors.rb index e9d532375..60a1a9532 100644 --- a/lib/fog/network/openstack/requests/list_lb_health_monitors.rb +++ b/lib/fog/openstack/network/requests/list_lb_health_monitors.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_health_monitors(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_members.rb b/lib/fog/openstack/network/requests/list_lb_members.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lb_members.rb rename to lib/fog/openstack/network/requests/list_lb_members.rb index b8e893c1e..0c4c1f53e 100644 --- a/lib/fog/network/openstack/requests/list_lb_members.rb +++ b/lib/fog/openstack/network/requests/list_lb_members.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_members(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_pools.rb b/lib/fog/openstack/network/requests/list_lb_pools.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lb_pools.rb rename to lib/fog/openstack/network/requests/list_lb_pools.rb index 3987cc27b..aaa853b3f 100644 --- a/lib/fog/network/openstack/requests/list_lb_pools.rb +++ b/lib/fog/openstack/network/requests/list_lb_pools.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_pools(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_vips.rb b/lib/fog/openstack/network/requests/list_lb_vips.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lb_vips.rb rename to lib/fog/openstack/network/requests/list_lb_vips.rb index d6e7fa018..0e1749afc 100644 --- a/lib/fog/network/openstack/requests/list_lb_vips.rb +++ b/lib/fog/openstack/network/requests/list_lb_vips.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_vips(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb b/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb rename to lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb index 63e8e77df..17e68f45b 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_healthmonitors(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_l7policies.rb b/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_l7policies.rb rename to lib/fog/openstack/network/requests/list_lbaas_l7policies.rb index b2a9415a1..c3e12db3f 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_l7policies.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_l7policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_l7rules.rb b/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_l7rules.rb rename to lib/fog/openstack/network/requests/list_lbaas_l7rules.rb index d716a7245..49321df5d 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_l7rules.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_l7rules(l7policy_id, filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_listeners.rb b/lib/fog/openstack/network/requests/list_lbaas_listeners.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_listeners.rb rename to lib/fog/openstack/network/requests/list_lbaas_listeners.rb index ff5dd4c9d..f6c4cf266 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_listeners.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_listeners.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_listeners(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb b/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb rename to lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb index 78dcc433b..c548296ec 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_loadbalancers(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_pool_members.rb b/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_pool_members.rb rename to lib/fog/openstack/network/requests/list_lbaas_pool_members.rb index 84ea68244..8bf197228 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_pool_members.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_pool_members(pool_id, filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_pools.rb b/lib/fog/openstack/network/requests/list_lbaas_pools.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lbaas_pools.rb rename to lib/fog/openstack/network/requests/list_lbaas_pools.rb index d4a59342b..d792cb075 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_pools.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_pools.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_pools(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_network_ip_availabilities.rb b/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb similarity index 86% rename from lib/fog/network/openstack/requests/list_network_ip_availabilities.rb rename to lib/fog/openstack/network/requests/list_network_ip_availabilities.rb index 119fa612f..df4269d78 100644 --- a/lib/fog/network/openstack/requests/list_network_ip_availabilities.rb +++ b/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_network_ip_availabilities request( @@ -19,7 +19,7 @@ def list_network_ip_availabilities response.body = {'network_ip_availabilities' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/list_networks.rb b/lib/fog/openstack/network/requests/list_networks.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_networks.rb rename to lib/fog/openstack/network/requests/list_networks.rb index 2f2d163fb..e21c89971 100644 --- a/lib/fog/network/openstack/requests/list_networks.rb +++ b/lib/fog/openstack/network/requests/list_networks.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_networks(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ports.rb b/lib/fog/openstack/network/requests/list_ports.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_ports.rb rename to lib/fog/openstack/network/requests/list_ports.rb index 4a70473e7..46fe03b6c 100644 --- a/lib/fog/network/openstack/requests/list_ports.rb +++ b/lib/fog/openstack/network/requests/list_ports.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ports(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_rbac_policies.rb b/lib/fog/openstack/network/requests/list_rbac_policies.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_rbac_policies.rb rename to lib/fog/openstack/network/requests/list_rbac_policies.rb index 7140a3ce6..0e2b95e70 100644 --- a/lib/fog/network/openstack/requests/list_rbac_policies.rb +++ b/lib/fog/openstack/network/requests/list_rbac_policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_rbac_policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_routers.rb b/lib/fog/openstack/network/requests/list_routers.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_routers.rb rename to lib/fog/openstack/network/requests/list_routers.rb index 510ba2875..3c9010c6f 100644 --- a/lib/fog/network/openstack/requests/list_routers.rb +++ b/lib/fog/openstack/network/requests/list_routers.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_routers(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_security_group_rules.rb b/lib/fog/openstack/network/requests/list_security_group_rules.rb similarity index 97% rename from lib/fog/network/openstack/requests/list_security_group_rules.rb rename to lib/fog/openstack/network/requests/list_security_group_rules.rb index ac126c807..d985d6fdd 100644 --- a/lib/fog/network/openstack/requests/list_security_group_rules.rb +++ b/lib/fog/openstack/network/requests/list_security_group_rules.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # List all security group rules # diff --git a/lib/fog/network/openstack/requests/list_security_groups.rb b/lib/fog/openstack/network/requests/list_security_groups.rb similarity index 98% rename from lib/fog/network/openstack/requests/list_security_groups.rb rename to lib/fog/openstack/network/requests/list_security_groups.rb index 9a4ee79b4..ceb16c9da 100644 --- a/lib/fog/network/openstack/requests/list_security_groups.rb +++ b/lib/fog/openstack/network/requests/list_security_groups.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # List all security groups # diff --git a/lib/fog/network/openstack/requests/list_subnet_pools.rb b/lib/fog/openstack/network/requests/list_subnet_pools.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_subnet_pools.rb rename to lib/fog/openstack/network/requests/list_subnet_pools.rb index 0e8fe3f29..eee578c22 100644 --- a/lib/fog/network/openstack/requests/list_subnet_pools.rb +++ b/lib/fog/openstack/network/requests/list_subnet_pools.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_subnet_pools(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_subnets.rb b/lib/fog/openstack/network/requests/list_subnets.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_subnets.rb rename to lib/fog/openstack/network/requests/list_subnets.rb index 7de67fd1e..aae439beb 100644 --- a/lib/fog/network/openstack/requests/list_subnets.rb +++ b/lib/fog/openstack/network/requests/list_subnets.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_subnets(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_vpn_services.rb b/lib/fog/openstack/network/requests/list_vpn_services.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_vpn_services.rb rename to lib/fog/openstack/network/requests/list_vpn_services.rb index f37c445c5..277c447f9 100644 --- a/lib/fog/network/openstack/requests/list_vpn_services.rb +++ b/lib/fog/openstack/network/requests/list_vpn_services.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_vpn_services(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/remove_router_interface.rb b/lib/fog/openstack/network/requests/remove_router_interface.rb similarity index 95% rename from lib/fog/network/openstack/requests/remove_router_interface.rb rename to lib/fog/openstack/network/requests/remove_router_interface.rb index 86343ba30..81de8ea05 100644 --- a/lib/fog/network/openstack/requests/remove_router_interface.rb +++ b/lib/fog/openstack/network/requests/remove_router_interface.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def remove_router_interface(router_id, subnet_id, _options = {}) data = { diff --git a/lib/fog/network/openstack/requests/set_tenant.rb b/lib/fog/openstack/network/requests/set_tenant.rb similarity index 88% rename from lib/fog/network/openstack/requests/set_tenant.rb rename to lib/fog/openstack/network/requests/set_tenant.rb index 81dba7308..805f37521 100644 --- a/lib/fog/network/openstack/requests/set_tenant.rb +++ b/lib/fog/openstack/network/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/network/openstack/requests/update_ike_policy.rb b/lib/fog/openstack/network/requests/update_ike_policy.rb similarity index 95% rename from lib/fog/network/openstack/requests/update_ike_policy.rb rename to lib/fog/openstack/network/requests/update_ike_policy.rb index 53fa86f02..feb337958 100644 --- a/lib/fog/network/openstack/requests/update_ike_policy.rb +++ b/lib/fog/openstack/network/requests/update_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_ike_policy(ike_policy_id, options = {}) data = {'ikepolicy' => {}} @@ -39,7 +39,7 @@ def update_ike_policy(ike_policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_ipsec_policy.rb b/lib/fog/openstack/network/requests/update_ipsec_policy.rb similarity index 95% rename from lib/fog/network/openstack/requests/update_ipsec_policy.rb rename to lib/fog/openstack/network/requests/update_ipsec_policy.rb index e41c9f5aa..db3ea1344 100644 --- a/lib/fog/network/openstack/requests/update_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/update_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_ipsec_policy(ipsec_policy_id, options = {}) data = {'ipsecpolicy' => {}} @@ -42,7 +42,7 @@ def update_ipsec_policy(ipsec_policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb similarity index 97% rename from lib/fog/network/openstack/requests/update_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/update_ipsec_site_connection.rb index ae43af2d3..894e65041 100644 --- a/lib/fog/network/openstack/requests/update_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) data = {'ipsec_site_connection' => {}} @@ -54,7 +54,7 @@ def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_health_monitor.rb b/lib/fog/openstack/network/requests/update_lb_health_monitor.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/update_lb_health_monitor.rb index f84f4080a..7c4bfcf7c 100644 --- a/lib/fog/network/openstack/requests/update_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/update_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_health_monitor(health_monitor_id, options = {}) data = {'health_monitor' => {}} @@ -34,7 +34,7 @@ def update_lb_health_monitor(health_monitor_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_member.rb b/lib/fog/openstack/network/requests/update_lb_member.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lb_member.rb rename to lib/fog/openstack/network/requests/update_lb_member.rb index 212096751..c12aa1e98 100644 --- a/lib/fog/network/openstack/requests/update_lb_member.rb +++ b/lib/fog/openstack/network/requests/update_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_member(member_id, options = {}) data = {'member' => {}} @@ -30,7 +30,7 @@ def update_lb_member(member_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_pool.rb b/lib/fog/openstack/network/requests/update_lb_pool.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lb_pool.rb rename to lib/fog/openstack/network/requests/update_lb_pool.rb index 2e20cd78f..5bb101a04 100644 --- a/lib/fog/network/openstack/requests/update_lb_pool.rb +++ b/lib/fog/openstack/network/requests/update_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_pool(pool_id, options = {}) data = {'pool' => {}} @@ -31,7 +31,7 @@ def update_lb_pool(pool_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_vip.rb b/lib/fog/openstack/network/requests/update_lb_vip.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lb_vip.rb rename to lib/fog/openstack/network/requests/update_lb_vip.rb index e3aa77586..103f2bb5d 100644 --- a/lib/fog/network/openstack/requests/update_lb_vip.rb +++ b/lib/fog/openstack/network/requests/update_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_vip(vip_id, options = {}) data = {'vip' => {}} @@ -33,7 +33,7 @@ def update_lb_vip(vip_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb index 474188e63..6289ad379 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_healthmonitor(healthmonitor_id, options = {}) data = {'healthmonitor' => {}} @@ -34,7 +34,7 @@ def update_lbaas_healthmonitor(healthmonitor_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/update_lbaas_l7policy.rb index bc21a9e95..2f17e8bf6 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_l7policy(l7policy_id, options = {}) @@ -34,7 +34,7 @@ def update_lbaas_l7rule(l7policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/update_lbaas_l7rule.rb index e7a0be425..c464c2e11 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) @@ -33,7 +33,7 @@ def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_listener.rb b/lib/fog/openstack/network/requests/update_lbaas_listener.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_lbaas_listener.rb rename to lib/fog/openstack/network/requests/update_lbaas_listener.rb index 6417c3429..02b46fb77 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_listener(listener_id, options = {}) @@ -35,7 +35,7 @@ def update_lbaas_listener(listener_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb index 8933875e8..8a6aeb255 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_loadbalancer(loadbalancer_id, options = {}) data = { @@ -32,7 +32,7 @@ def update_lbaas_loadbalancer(loadbalancer_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_pool.rb b/lib/fog/openstack/network/requests/update_lbaas_pool.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lbaas_pool.rb rename to lib/fog/openstack/network/requests/update_lbaas_pool.rb index cc7c79b4a..9e4e30dd5 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_pool(pool_id, options = {}) data = {'pool' => {}} @@ -31,7 +31,7 @@ def update_lbaas_pool(pool_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/update_lbaas_pool_member.rb index 507cd2348..78c0a5a13 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_pool_member(pool_id, member_id, options = {}) data = {'member' => {}} @@ -30,7 +30,7 @@ def update_lbaas_pool_member(pool_id, member_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_network.rb b/lib/fog/openstack/network/requests/update_network.rb similarity index 90% rename from lib/fog/network/openstack/requests/update_network.rb rename to lib/fog/openstack/network/requests/update_network.rb index 23536ca0c..fa88d8d04 100644 --- a/lib/fog/network/openstack/requests/update_network.rb +++ b/lib/fog/openstack/network/requests/update_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Not all options can be updated UPDATE_OPTIONS = [ @@ -44,12 +44,12 @@ class Mock def update_network(network_id, options = {}) response = Excon::Response.new if network = list_networks.body['networks'].find { |_| _['id'] == network_id } - network.merge!(Fog::Network::OpenStack::Real.update(options)) + network.merge!(Fog::OpenStack::Network::Real.update(options)) response.body = {'network' => network} response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_port.rb b/lib/fog/openstack/network/requests/update_port.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_port.rb rename to lib/fog/openstack/network/requests/update_port.rb index 8b5014f66..b3ffcaed5 100644 --- a/lib/fog/network/openstack/requests/update_port.rb +++ b/lib/fog/openstack/network/requests/update_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_port(port_id, options = {}) data = {'port' => {}} @@ -35,7 +35,7 @@ def update_port(port_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_quota.rb b/lib/fog/openstack/network/requests/update_quota.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_quota.rb rename to lib/fog/openstack/network/requests/update_quota.rb index 7f52ed709..9d774b016 100644 --- a/lib/fog/network/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/network/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/network/openstack/requests/update_rbac_policy.rb b/lib/fog/openstack/network/requests/update_rbac_policy.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_rbac_policy.rb rename to lib/fog/openstack/network/requests/update_rbac_policy.rb index dfb0721ec..98fd3483f 100644 --- a/lib/fog/network/openstack/requests/update_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/update_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_rbac_policy(rbac_policy_id, options = {}) data = {'rbac_policy' => {}} @@ -32,7 +32,7 @@ def update_rbac_policy(rbac_policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_router.rb b/lib/fog/openstack/network/requests/update_router.rb similarity index 91% rename from lib/fog/network/openstack/requests/update_router.rb rename to lib/fog/openstack/network/requests/update_router.rb index 48724d81d..cf76566cf 100644 --- a/lib/fog/network/openstack/requests/update_router.rb +++ b/lib/fog/openstack/network/requests/update_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Update Router # @@ -18,7 +18,7 @@ def update_router(router_id, options = {}) # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::Network::OpenStack::Network) + if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" data['router'][:external_gateway_info] = {:network_id => egi.id} @@ -43,14 +43,14 @@ def update_router(router_id, options = {}) response = Excon::Response.new router = list_routers.body['routers'].find { |r| r[:id] == router_id } - raise Fog::Network::OpenStack::NotFound unless router + raise Fog::OpenStack::Network::NotFound unless router options.keys.each { |k| router[k] = options[k] } # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::Network::OpenStack::Network) + if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" router[:external_gateway_info] = { :network_id => egi.id } diff --git a/lib/fog/network/openstack/requests/update_security_group.rb b/lib/fog/openstack/network/requests/update_security_group.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_security_group.rb rename to lib/fog/openstack/network/requests/update_security_group.rb index 27aaae122..69824e119 100644 --- a/lib/fog/network/openstack/requests/update_security_group.rb +++ b/lib/fog/openstack/network/requests/update_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_security_group(security_group_id, options = {}) data = {'security_group' => {}} @@ -32,7 +32,7 @@ def update_security_group(security_group_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_subnet.rb b/lib/fog/openstack/network/requests/update_subnet.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_subnet.rb rename to lib/fog/openstack/network/requests/update_subnet.rb index 10f5743c1..11e886890 100644 --- a/lib/fog/network/openstack/requests/update_subnet.rb +++ b/lib/fog/openstack/network/requests/update_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_subnet(subnet_id, options = {}) data = {'subnet' => {}} @@ -34,7 +34,7 @@ def update_subnet(subnet_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_subnet_pool.rb b/lib/fog/openstack/network/requests/update_subnet_pool.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_subnet_pool.rb rename to lib/fog/openstack/network/requests/update_subnet_pool.rb index b0a0ee546..8833a2568 100644 --- a/lib/fog/network/openstack/requests/update_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/update_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_subnet_pool(subnet_pool_id, options = {}) data = {'subnetpool' => {}} @@ -37,7 +37,7 @@ def update_subnet_pool(subnet_pool_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_vpn_service.rb b/lib/fog/openstack/network/requests/update_vpn_service.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_vpn_service.rb rename to lib/fog/openstack/network/requests/update_vpn_service.rb index 87e3ef458..8a65c83b9 100644 --- a/lib/fog/network/openstack/requests/update_vpn_service.rb +++ b/lib/fog/openstack/network/requests/update_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_vpn_service(vpn_service_id, options = {}) data = {'vpnservice' => {}} @@ -37,7 +37,7 @@ def update_vpn_service(vpn_service_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/nfv/openstack/models/vnf.rb b/lib/fog/openstack/nfv/models/vnf.rb similarity index 97% rename from lib/fog/nfv/openstack/models/vnf.rb rename to lib/fog/openstack/nfv/models/vnf.rb index 6373e172f..8229f4992 100644 --- a/lib/fog/nfv/openstack/models/vnf.rb +++ b/lib/fog/openstack/nfv/models/vnf.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnf < Fog::OpenStack::Model identity :id diff --git a/lib/fog/nfv/openstack/models/vnfd.rb b/lib/fog/openstack/nfv/models/vnfd.rb similarity index 97% rename from lib/fog/nfv/openstack/models/vnfd.rb rename to lib/fog/openstack/nfv/models/vnfd.rb index 1c39c0b2a..ebcda3ec1 100644 --- a/lib/fog/nfv/openstack/models/vnfd.rb +++ b/lib/fog/openstack/nfv/models/vnfd.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnfd < Fog::OpenStack::Model identity :id diff --git a/lib/fog/nfv/openstack/models/vnfds.rb b/lib/fog/openstack/nfv/models/vnfds.rb similarity index 73% rename from lib/fog/nfv/openstack/models/vnfds.rb rename to lib/fog/openstack/nfv/models/vnfds.rb index 924df6e43..9d213f235 100644 --- a/lib/fog/nfv/openstack/models/vnfds.rb +++ b/lib/fog/openstack/nfv/models/vnfds.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/nfv/openstack/models/vnfd' +require 'fog/openstack/nfv/models/vnfd' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnfds < Fog::OpenStack::Collection - model Fog::NFV::OpenStack::Vnfd + model Fog::OpenStack::NFV::Vnfd def all(options = {}) load_response(service.list_vnfds(options), 'vnfds') @@ -14,7 +14,7 @@ def all(options = {}) def get(uuid) data = service.get_vnfd(uuid).body['vnfd'] new(data) - rescue Fog::NFV::OpenStack::NotFound + rescue Fog::OpenStack::NFV::NotFound nil end diff --git a/lib/fog/nfv/openstack/models/vnfs.rb b/lib/fog/openstack/nfv/models/vnfs.rb similarity index 73% rename from lib/fog/nfv/openstack/models/vnfs.rb rename to lib/fog/openstack/nfv/models/vnfs.rb index 6db6c11dc..73813b470 100644 --- a/lib/fog/nfv/openstack/models/vnfs.rb +++ b/lib/fog/openstack/nfv/models/vnfs.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/nfv/openstack/models/vnf' +require 'fog/openstack/nfv/models/vnf' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnfs < Fog::OpenStack::Collection - model Fog::NFV::OpenStack::Vnf + model Fog::OpenStack::NFV::Vnf def all(options = {}) load_response(service.list_vnfs(options), 'vnfs') @@ -14,7 +14,7 @@ def all(options = {}) def get(uuid) data = service.get_vnf(uuid).body['vnf'] new(data) - rescue Fog::NFV::OpenStack::NotFound + rescue Fog::OpenStack::NFV::NotFound nil end diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/openstack/nfv/nfv.rb similarity index 94% rename from lib/fog/nfv/openstack.rb rename to lib/fog/openstack/nfv/nfv.rb index 857cacc19..b0cd206fc 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/openstack/nfv/nfv.rb @@ -1,8 +1,8 @@ require 'yaml' module Fog - module NFV - class OpenStack < Fog::Service + module OpenStack + class NFV < Fog::Service SUPPORTED_VERSIONS = /v1.0/ requires :openstack_auth_url @@ -19,7 +19,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/nfv/openstack/requests' + request_path 'fog/openstack/nfv/requests' # vnfds requests request :list_vnfds @@ -36,7 +36,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/nfv/openstack/models' + model_path 'fog/openstack/nfv/models' model :vnfd collection :vnfds model :vnf @@ -98,7 +98,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::NFV::OpenStack::NotFound + Fog::OpenStack::NFV::NotFound end def default_path_prefix diff --git a/lib/fog/nfv/openstack/requests/create_vnf.rb b/lib/fog/openstack/nfv/requests/create_vnf.rb similarity index 96% rename from lib/fog/nfv/openstack/requests/create_vnf.rb rename to lib/fog/openstack/nfv/requests/create_vnf.rb index 69f0d7b4a..ca6220d8e 100644 --- a/lib/fog/nfv/openstack/requests/create_vnf.rb +++ b/lib/fog/openstack/nfv/requests/create_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def create_vnf(options) options_valid = [ diff --git a/lib/fog/nfv/openstack/requests/create_vnfd.rb b/lib/fog/openstack/nfv/requests/create_vnfd.rb similarity index 95% rename from lib/fog/nfv/openstack/requests/create_vnfd.rb rename to lib/fog/openstack/nfv/requests/create_vnfd.rb index 44dbaf6ab..3cc9f441d 100644 --- a/lib/fog/nfv/openstack/requests/create_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/create_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def create_vnfd(options) options_valid = [ diff --git a/lib/fog/nfv/openstack/requests/delete_vnf.rb b/lib/fog/openstack/nfv/requests/delete_vnf.rb similarity index 92% rename from lib/fog/nfv/openstack/requests/delete_vnf.rb rename to lib/fog/openstack/nfv/requests/delete_vnf.rb index 71f89a4bf..979c6cfa3 100644 --- a/lib/fog/nfv/openstack/requests/delete_vnf.rb +++ b/lib/fog/openstack/nfv/requests/delete_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def delete_vnf(vnf_id) request( diff --git a/lib/fog/nfv/openstack/requests/delete_vnfd.rb b/lib/fog/openstack/nfv/requests/delete_vnfd.rb similarity index 92% rename from lib/fog/nfv/openstack/requests/delete_vnfd.rb rename to lib/fog/openstack/nfv/requests/delete_vnfd.rb index 3efdd7672..f8d1ec581 100644 --- a/lib/fog/nfv/openstack/requests/delete_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/delete_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def delete_vnfd(vnfd_id) request( diff --git a/lib/fog/nfv/openstack/requests/get_vnf.rb b/lib/fog/openstack/nfv/requests/get_vnf.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/get_vnf.rb rename to lib/fog/openstack/nfv/requests/get_vnf.rb index f204ee7b2..62a7df092 100644 --- a/lib/fog/nfv/openstack/requests/get_vnf.rb +++ b/lib/fog/openstack/nfv/requests/get_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def get_vnf(vnf_id) request( diff --git a/lib/fog/nfv/openstack/requests/get_vnfd.rb b/lib/fog/openstack/nfv/requests/get_vnfd.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/get_vnfd.rb rename to lib/fog/openstack/nfv/requests/get_vnfd.rb index f5f0e5781..5e47de284 100644 --- a/lib/fog/nfv/openstack/requests/get_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/get_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def get_vnfd(vnfd_id) request( diff --git a/lib/fog/nfv/openstack/requests/list_vnfds.rb b/lib/fog/openstack/nfv/requests/list_vnfds.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/list_vnfds.rb rename to lib/fog/openstack/nfv/requests/list_vnfds.rb index a74aa33e9..f1a7793ed 100644 --- a/lib/fog/nfv/openstack/requests/list_vnfds.rb +++ b/lib/fog/openstack/nfv/requests/list_vnfds.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def list_vnfds(options = {}) request( diff --git a/lib/fog/nfv/openstack/requests/list_vnfs.rb b/lib/fog/openstack/nfv/requests/list_vnfs.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/list_vnfs.rb rename to lib/fog/openstack/nfv/requests/list_vnfs.rb index 1f08060fd..a89b6723e 100644 --- a/lib/fog/nfv/openstack/requests/list_vnfs.rb +++ b/lib/fog/openstack/nfv/requests/list_vnfs.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def list_vnfs(options = {}) request( diff --git a/lib/fog/nfv/openstack/requests/update_vnf.rb b/lib/fog/openstack/nfv/requests/update_vnf.rb similarity index 95% rename from lib/fog/nfv/openstack/requests/update_vnf.rb rename to lib/fog/openstack/nfv/requests/update_vnf.rb index 37766efa7..47d1fcde8 100644 --- a/lib/fog/nfv/openstack/requests/update_vnf.rb +++ b/lib/fog/openstack/nfv/requests/update_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def update_vnf(id, options) options_valid = [ diff --git a/lib/fog/orchestration/openstack/models/event.rb b/lib/fog/openstack/orchestration/models/event.rb similarity index 89% rename from lib/fog/orchestration/openstack/models/event.rb rename to lib/fog/openstack/orchestration/models/event.rb index 8debd856a..283f9c476 100644 --- a/lib/fog/orchestration/openstack/models/event.rb +++ b/lib/fog/openstack/orchestration/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Event < Fog::OpenStack::Model include Reflectable diff --git a/lib/fog/orchestration/openstack/models/events.rb b/lib/fog/openstack/orchestration/models/events.rb similarity index 79% rename from lib/fog/orchestration/openstack/models/events.rb rename to lib/fog/openstack/orchestration/models/events.rb index 2d5ddd7f0..b2a823fe1 100644 --- a/lib/fog/orchestration/openstack/models/events.rb +++ b/lib/fog/openstack/orchestration/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/event' +require 'fog/openstack/orchestration/models/event' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Events < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Event + model Fog::OpenStack::Orchestration::Event def all(options = {}, options_deprecated = {}) data = if options.kind_of?(Stack) @@ -22,7 +22,7 @@ def all(options = {}, options_deprecated = {}) def get(stack, resource, event_id) data = service.show_event_details(stack, resource, event_id).body['event'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/orchestration/openstack/models/resource.rb b/lib/fog/openstack/orchestration/models/resource.rb similarity index 94% rename from lib/fog/orchestration/openstack/models/resource.rb rename to lib/fog/openstack/orchestration/models/resource.rb index 6d8574cf6..705e93e07 100644 --- a/lib/fog/orchestration/openstack/models/resource.rb +++ b/lib/fog/openstack/orchestration/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Resource < Fog::OpenStack::Model include Reflectable diff --git a/lib/fog/orchestration/openstack/models/resource_schemas.rb b/lib/fog/openstack/orchestration/models/resource_schemas.rb similarity index 73% rename from lib/fog/orchestration/openstack/models/resource_schemas.rb rename to lib/fog/openstack/orchestration/models/resource_schemas.rb index f0131c84b..bd177115c 100644 --- a/lib/fog/orchestration/openstack/models/resource_schemas.rb +++ b/lib/fog/openstack/orchestration/models/resource_schemas.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class ResourceSchemas < Fog::OpenStack::Collection def get(resource_type) service.show_resource_schema(resource_type).body - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/orchestration/openstack/models/resources.rb b/lib/fog/openstack/orchestration/models/resources.rb similarity index 76% rename from lib/fog/orchestration/openstack/models/resources.rb rename to lib/fog/openstack/orchestration/models/resources.rb index 6a9f7867c..fbc3f1988 100644 --- a/lib/fog/orchestration/openstack/models/resources.rb +++ b/lib/fog/openstack/orchestration/models/resources.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/resource' +require 'fog/openstack/orchestration/models/resource' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Resources < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Resource + model Fog::OpenStack::Orchestration::Resource def types service.list_resource_types.body['resource_types'].sort @@ -20,13 +20,13 @@ def get(resource_name, stack = nil) stack = first.stack if stack.nil? data = service.show_resource_data(stack.stack_name, stack.id, resource_name).body['resource'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def metadata(stack_name, stack_id, resource_name) service.show_resource_metadata(stack_name, stack_id, resource_name).body['resource'] - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/orchestration/openstack/models/stack.rb b/lib/fog/openstack/orchestration/models/stack.rb similarity index 96% rename from lib/fog/orchestration/openstack/models/stack.rb rename to lib/fog/openstack/orchestration/models/stack.rb index a21f070ee..7c54a6e33 100644 --- a/lib/fog/orchestration/openstack/models/stack.rb +++ b/lib/fog/openstack/orchestration/models/stack.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Stack < Fog::OpenStack::Model identity :id @@ -105,7 +105,7 @@ def timeout_in_minutes=(minutes) # build options to create or update stack def default_options template_content = - if template && template.kind_of?(Fog::Orchestration::OpenStack::Template) + if template && template.kind_of?(Fog::OpenStack::Orchestration::Template) template.content else template diff --git a/lib/fog/orchestration/openstack/models/stacks.rb b/lib/fog/openstack/orchestration/models/stacks.rb similarity index 89% rename from lib/fog/orchestration/openstack/models/stacks.rb rename to lib/fog/openstack/orchestration/models/stacks.rb index 1a4e8b0b8..176b6c824 100644 --- a/lib/fog/orchestration/openstack/models/stacks.rb +++ b/lib/fog/openstack/orchestration/models/stacks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/stack' +require 'fog/openstack/orchestration/models/stack' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Stacks < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Stack + model Fog::OpenStack::Orchestration::Stack def all(options = {}) # TODO(lsmola) we can uncomment this when https://bugs.launchpad.net/heat/+bug/1468318 is fixed, till then @@ -38,7 +38,7 @@ def get(arg1, arg2 = nil) id = arg2 data = service.show_stack_details(name, id).body['stack'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end diff --git a/lib/fog/orchestration/openstack/models/template.rb b/lib/fog/openstack/orchestration/models/template.rb similarity index 85% rename from lib/fog/orchestration/openstack/models/template.rb rename to lib/fog/openstack/orchestration/models/template.rb index b99687efb..5f16d20ba 100644 --- a/lib/fog/orchestration/openstack/models/template.rb +++ b/lib/fog/openstack/orchestration/models/template.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Template < Fog::OpenStack::Model %w(format description template_version parameters resources content).each do |a| attribute a.to_sym diff --git a/lib/fog/orchestration/openstack/models/templates.rb b/lib/fog/openstack/orchestration/models/templates.rb similarity index 85% rename from lib/fog/orchestration/openstack/models/templates.rb rename to lib/fog/openstack/orchestration/models/templates.rb index 9d1182666..b1d0dbd52 100644 --- a/lib/fog/orchestration/openstack/models/templates.rb +++ b/lib/fog/openstack/orchestration/models/templates.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/template' +require 'fog/openstack/orchestration/models/template' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Templates < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Template + model Fog::OpenStack::Orchestration::Template def get(obj) data = if obj.kind_of?(Stack) @@ -28,7 +28,7 @@ def get(obj) end new(data) - rescue Fog::Orchestration::OpenStack::NotFound + rescue Fog::OpenStack::Orchestration::NotFound nil end diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/openstack/orchestration/orchestration.rb similarity index 94% rename from lib/fog/orchestration/openstack.rb rename to lib/fog/openstack/orchestration/orchestration.rb index 18be8177f..8542a7760 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/openstack/orchestration/orchestration.rb @@ -1,8 +1,6 @@ - - module Fog - module Orchestration - class OpenStack < Fog::Service + module OpenStack + class Orchestration < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -15,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/orchestration/openstack/models' + model_path 'fog/openstack/orchestration/models' model :stack collection :stacks @@ -30,7 +28,7 @@ class OpenStack < Fog::Service model :template collection :templates - request_path 'fog/orchestration/openstack/requests' + request_path 'fog/openstack/orchestration/requests' request :abandon_stack request :build_info request :create_stack @@ -127,7 +125,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Orchestration::OpenStack::NotFound + Fog::OpenStack::Orchestration::NotFound end def default_service_type diff --git a/lib/fog/orchestration/openstack/requests/abandon_stack.rb b/lib/fog/openstack/orchestration/requests/abandon_stack.rb similarity index 86% rename from lib/fog/orchestration/openstack/requests/abandon_stack.rb rename to lib/fog/openstack/orchestration/requests/abandon_stack.rb index 370be9f31..c0a8a0f44 100644 --- a/lib/fog/orchestration/openstack/requests/abandon_stack.rb +++ b/lib/fog/openstack/orchestration/requests/abandon_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def abandon_stack(stack) request( diff --git a/lib/fog/orchestration/openstack/requests/build_info.rb b/lib/fog/openstack/orchestration/requests/build_info.rb similarity index 83% rename from lib/fog/orchestration/openstack/requests/build_info.rb rename to lib/fog/openstack/orchestration/requests/build_info.rb index 0f65d96ab..cb0ae3482 100644 --- a/lib/fog/orchestration/openstack/requests/build_info.rb +++ b/lib/fog/openstack/orchestration/requests/build_info.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def build_info request( diff --git a/lib/fog/orchestration/openstack/requests/cancel_update.rb b/lib/fog/openstack/orchestration/requests/cancel_update.rb similarity index 92% rename from lib/fog/orchestration/openstack/requests/cancel_update.rb rename to lib/fog/openstack/orchestration/requests/cancel_update.rb index ca1627ee1..878326cd2 100644 --- a/lib/fog/orchestration/openstack/requests/cancel_update.rb +++ b/lib/fog/openstack/orchestration/requests/cancel_update.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def cancel_update(stack) request( diff --git a/lib/fog/orchestration/openstack/requests/create_stack.rb b/lib/fog/openstack/orchestration/requests/create_stack.rb similarity index 95% rename from lib/fog/orchestration/openstack/requests/create_stack.rb rename to lib/fog/openstack/orchestration/requests/create_stack.rb index ed82afec7..9377719fc 100644 --- a/lib/fog/orchestration/openstack/requests/create_stack.rb +++ b/lib/fog/openstack/orchestration/requests/create_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # Create a stack. # @@ -87,7 +87,7 @@ def create_stack(arg1, arg2 = nil) end if options.key?(:template) || options.key?(:template_url) - file_resolver = Util::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) + file_resolver = OrchestrationUtil::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) response.body['files'] = file_resolver.files unless file_resolver.files.empty? end diff --git a/lib/fog/orchestration/openstack/requests/delete_stack.rb b/lib/fog/openstack/orchestration/requests/delete_stack.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/delete_stack.rb rename to lib/fog/openstack/orchestration/requests/delete_stack.rb index b236e9b35..ba2e917aa 100644 --- a/lib/fog/orchestration/openstack/requests/delete_stack.rb +++ b/lib/fog/openstack/orchestration/requests/delete_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # Delete a stack. # diff --git a/lib/fog/orchestration/openstack/requests/get_stack_template.rb b/lib/fog/openstack/orchestration/requests/get_stack_template.rb similarity index 89% rename from lib/fog/orchestration/openstack/requests/get_stack_template.rb rename to lib/fog/openstack/orchestration/requests/get_stack_template.rb index 8551f778c..b053a5150 100644 --- a/lib/fog/orchestration/openstack/requests/get_stack_template.rb +++ b/lib/fog/openstack/orchestration/requests/get_stack_template.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def get_stack_template(stack) request( diff --git a/lib/fog/orchestration/openstack/requests/list_events.rb b/lib/fog/openstack/orchestration/requests/list_events.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/list_events.rb rename to lib/fog/openstack/orchestration/requests/list_events.rb index 7e456b8b0..1dedd2f1c 100644 --- a/lib/fog/orchestration/openstack/requests/list_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_events(options = {}) if !options.key?(:stack) && !(options.key?(:stack_name) && options.key?(:stack_id)) diff --git a/lib/fog/orchestration/openstack/requests/list_resource_events.rb b/lib/fog/openstack/orchestration/requests/list_resource_events.rb similarity index 95% rename from lib/fog/orchestration/openstack/requests/list_resource_events.rb rename to lib/fog/openstack/orchestration/requests/list_resource_events.rb index c2736f13d..d82e77a7b 100644 --- a/lib/fog/orchestration/openstack/requests/list_resource_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_resource_events.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_resource_events(stack, resource, options = {}) Fog::Logger.deprecation('Calling OpenStack[:orchestration].list_resource_events(stack, resource, options)'\ diff --git a/lib/fog/orchestration/openstack/requests/list_resource_types.rb b/lib/fog/openstack/orchestration/requests/list_resource_types.rb similarity index 92% rename from lib/fog/orchestration/openstack/requests/list_resource_types.rb rename to lib/fog/openstack/orchestration/requests/list_resource_types.rb index 358239b2f..7de2aef4b 100644 --- a/lib/fog/orchestration/openstack/requests/list_resource_types.rb +++ b/lib/fog/openstack/orchestration/requests/list_resource_types.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_resource_types(_options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/list_resources.rb b/lib/fog/openstack/orchestration/requests/list_resources.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/list_resources.rb rename to lib/fog/openstack/orchestration/requests/list_resources.rb index 2565d91e6..e8826638c 100644 --- a/lib/fog/orchestration/openstack/requests/list_resources.rb +++ b/lib/fog/openstack/orchestration/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_resources(options = {}, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/orchestration/openstack/requests/list_stack_data.rb b/lib/fog/openstack/orchestration/requests/list_stack_data.rb similarity index 92% rename from lib/fog/orchestration/openstack/requests/list_stack_data.rb rename to lib/fog/openstack/orchestration/requests/list_stack_data.rb index 7dfd23276..b5d12a8ef 100644 --- a/lib/fog/orchestration/openstack/requests/list_stack_data.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_data.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_stack_data(options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb b/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb similarity index 98% rename from lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb rename to lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb index 401712562..1bf382733 100644 --- a/lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_stack_data_detailed(options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/list_stack_events.rb b/lib/fog/openstack/orchestration/requests/list_stack_events.rb similarity index 95% rename from lib/fog/orchestration/openstack/requests/list_stack_events.rb rename to lib/fog/openstack/orchestration/requests/list_stack_events.rb index b9c848789..61d9979cb 100644 --- a/lib/fog/orchestration/openstack/requests/list_stack_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_events.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_stack_events(stack, options = {}) Fog::Logger.deprecation('Calling OpenStack[:orchestration].list_stack_events(stack, options)'\ diff --git a/lib/fog/orchestration/openstack/requests/patch_stack.rb b/lib/fog/openstack/orchestration/requests/patch_stack.rb similarity index 90% rename from lib/fog/orchestration/openstack/requests/patch_stack.rb rename to lib/fog/openstack/orchestration/requests/patch_stack.rb index bcaaa59be..2a25511a5 100644 --- a/lib/fog/orchestration/openstack/requests/patch_stack.rb +++ b/lib/fog/openstack/orchestration/requests/patch_stack.rb @@ -1,10 +1,10 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # patch a stack. # - # @param [Fog::Orchestration::OpenStack::Stack] the stack to patch. + # @param [Fog::OpenStack::Orchestration::Stack] the stack to patch. # @param [Hash] options # * :template [String] Structure containing the template body. # or (one of the two Template parameters is required) diff --git a/lib/fog/orchestration/openstack/requests/preview_stack.rb b/lib/fog/openstack/orchestration/requests/preview_stack.rb similarity index 87% rename from lib/fog/orchestration/openstack/requests/preview_stack.rb rename to lib/fog/openstack/orchestration/requests/preview_stack.rb index c4fe397f9..440ed4da4 100644 --- a/lib/fog/orchestration/openstack/requests/preview_stack.rb +++ b/lib/fog/openstack/orchestration/requests/preview_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def preview_stack(options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/show_event_details.rb b/lib/fog/openstack/orchestration/requests/show_event_details.rb similarity index 93% rename from lib/fog/orchestration/openstack/requests/show_event_details.rb rename to lib/fog/openstack/orchestration/requests/show_event_details.rb index a86649b2b..739666e43 100644 --- a/lib/fog/orchestration/openstack/requests/show_event_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_event_details.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_event_details(stack, resource, event_id) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_data.rb b/lib/fog/openstack/orchestration/requests/show_resource_data.rb similarity index 93% rename from lib/fog/orchestration/openstack/requests/show_resource_data.rb rename to lib/fog/openstack/orchestration/requests/show_resource_data.rb index a6b902b22..9225efd5d 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_data.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_data.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_data(stack_name, stack_id, resource_name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_metadata.rb b/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb similarity index 93% rename from lib/fog/orchestration/openstack/requests/show_resource_metadata.rb rename to lib/fog/openstack/orchestration/requests/show_resource_metadata.rb index 0142882e6..486259bfc 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_metadata.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_metadata(stack, resource_name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_schema.rb b/lib/fog/openstack/orchestration/requests/show_resource_schema.rb similarity index 85% rename from lib/fog/orchestration/openstack/requests/show_resource_schema.rb rename to lib/fog/openstack/orchestration/requests/show_resource_schema.rb index 822fcc11a..7df1b5fe3 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_schema.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_schema.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_schema(name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_template.rb b/lib/fog/openstack/orchestration/requests/show_resource_template.rb similarity index 88% rename from lib/fog/orchestration/openstack/requests/show_resource_template.rb rename to lib/fog/openstack/orchestration/requests/show_resource_template.rb index 60f23c81c..496cbe568 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_template.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_template.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_template(name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_stack_details.rb b/lib/fog/openstack/orchestration/requests/show_stack_details.rb similarity index 91% rename from lib/fog/orchestration/openstack/requests/show_stack_details.rb rename to lib/fog/openstack/orchestration/requests/show_stack_details.rb index c4868cafe..3568a669e 100644 --- a/lib/fog/orchestration/openstack/requests/show_stack_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_stack_details.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_stack_details(name, id) request( diff --git a/lib/fog/orchestration/openstack/requests/update_stack.rb b/lib/fog/openstack/orchestration/requests/update_stack.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/update_stack.rb rename to lib/fog/openstack/orchestration/requests/update_stack.rb index 913c2e26b..585a7f63f 100644 --- a/lib/fog/orchestration/openstack/requests/update_stack.rb +++ b/lib/fog/openstack/orchestration/requests/update_stack.rb @@ -1,10 +1,10 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # Update a stack. # - # @param [Fog::Orchestration::OpenStack::Stack] the stack to update. + # @param [Fog::OpenStack::Orchestration::Stack] the stack to update. # @param [Hash] options # * :template [String] Structure containing the template body. # or (one of the two Template parameters is required) diff --git a/lib/fog/orchestration/openstack/requests/validate_template.rb b/lib/fog/openstack/orchestration/requests/validate_template.rb similarity index 87% rename from lib/fog/orchestration/openstack/requests/validate_template.rb rename to lib/fog/openstack/orchestration/requests/validate_template.rb index f203cad88..c0c962376 100644 --- a/lib/fog/orchestration/openstack/requests/validate_template.rb +++ b/lib/fog/openstack/orchestration/requests/validate_template.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def validate_template(options = {}) request( diff --git a/lib/fog/orchestration/util/recursive_hot_file_loader.rb b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb similarity index 99% rename from lib/fog/orchestration/util/recursive_hot_file_loader.rb rename to lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb index 74af237e7..826f51b4a 100644 --- a/lib/fog/orchestration/util/recursive_hot_file_loader.rb +++ b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb @@ -5,8 +5,8 @@ require 'fog/core' module Fog - module Orchestration - module Util + module OpenStack + module OrchestrationUtil # # Resolve get_file resources found in a HOT template populating # a files Hash conforming to Heat Specs diff --git a/lib/fog/planning/openstack/models/plan.rb b/lib/fog/openstack/planning/models/plan.rb similarity index 100% rename from lib/fog/planning/openstack/models/plan.rb rename to lib/fog/openstack/planning/models/plan.rb diff --git a/lib/fog/planning/openstack/models/plans.rb b/lib/fog/openstack/planning/models/plans.rb similarity index 93% rename from lib/fog/planning/openstack/models/plans.rb rename to lib/fog/openstack/planning/models/plans.rb index dec602896..cc0c915a5 100644 --- a/lib/fog/planning/openstack/models/plans.rb +++ b/lib/fog/openstack/planning/models/plans.rb @@ -1,5 +1,5 @@ require 'fog/openstack/models/collection' -require 'fog/planning/openstack/models/plan' +require 'fog/openstack/planning/models/plan' module Fog module OpenStack diff --git a/lib/fog/planning/openstack/models/role.rb b/lib/fog/openstack/planning/models/role.rb similarity index 100% rename from lib/fog/planning/openstack/models/role.rb rename to lib/fog/openstack/planning/models/role.rb diff --git a/lib/fog/planning/openstack/models/roles.rb b/lib/fog/openstack/planning/models/roles.rb similarity index 87% rename from lib/fog/planning/openstack/models/roles.rb rename to lib/fog/openstack/planning/models/roles.rb index 19dffd8bf..61cb22c69 100644 --- a/lib/fog/planning/openstack/models/roles.rb +++ b/lib/fog/openstack/planning/models/roles.rb @@ -1,5 +1,5 @@ require 'fog/openstack/models/collection' -require 'fog/planning/openstack/models/role' +require 'fog/openstack/planning/models/role' module Fog module OpenStack diff --git a/lib/fog/planning/openstack.rb b/lib/fog/openstack/planning/planning.rb similarity index 96% rename from lib/fog/planning/openstack.rb rename to lib/fog/openstack/planning/planning.rb index eb5f75cd8..e7253a2ad 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/openstack/planning/planning.rb @@ -1,5 +1,3 @@ - - module Fog module OpenStack class Planning < Fog::Service @@ -19,7 +17,7 @@ class Planning < Fog::Service ## MODELS # - model_path 'fog/planning/openstack/models' + model_path 'fog/openstack/planning/models' model :role collection :roles model :plan @@ -27,7 +25,7 @@ class Planning < Fog::Service ## REQUESTS # - request_path 'fog/planning/openstack/requests' + request_path 'fog/openstack/planning/requests' # Role requests request :list_roles @@ -122,10 +120,12 @@ def self.[](service) end def self.new(attributes) + require 'pry-byebug' + binding.pry + attributes = attributes.dup # Prevent delete from having side effects service = attributes.delete(:service).to_s.downcase.to_sym if services.include?(service) - require "fog/#{service}/openstack" return Fog::OpenStack.const_get(service.to_s.capitalize).new(attributes) end raise ArgumentError, "Openstack has no #{service} service" diff --git a/lib/fog/planning/openstack/requests/add_role_to_plan.rb b/lib/fog/openstack/planning/requests/add_role_to_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/add_role_to_plan.rb rename to lib/fog/openstack/planning/requests/add_role_to_plan.rb diff --git a/lib/fog/planning/openstack/requests/create_plan.rb b/lib/fog/openstack/planning/requests/create_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/create_plan.rb rename to lib/fog/openstack/planning/requests/create_plan.rb diff --git a/lib/fog/planning/openstack/requests/delete_plan.rb b/lib/fog/openstack/planning/requests/delete_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/delete_plan.rb rename to lib/fog/openstack/planning/requests/delete_plan.rb diff --git a/lib/fog/planning/openstack/requests/get_plan.rb b/lib/fog/openstack/planning/requests/get_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/get_plan.rb rename to lib/fog/openstack/planning/requests/get_plan.rb diff --git a/lib/fog/planning/openstack/requests/get_plan_templates.rb b/lib/fog/openstack/planning/requests/get_plan_templates.rb similarity index 100% rename from lib/fog/planning/openstack/requests/get_plan_templates.rb rename to lib/fog/openstack/planning/requests/get_plan_templates.rb diff --git a/lib/fog/planning/openstack/requests/list_plans.rb b/lib/fog/openstack/planning/requests/list_plans.rb similarity index 100% rename from lib/fog/planning/openstack/requests/list_plans.rb rename to lib/fog/openstack/planning/requests/list_plans.rb diff --git a/lib/fog/planning/openstack/requests/list_roles.rb b/lib/fog/openstack/planning/requests/list_roles.rb similarity index 100% rename from lib/fog/planning/openstack/requests/list_roles.rb rename to lib/fog/openstack/planning/requests/list_roles.rb diff --git a/lib/fog/planning/openstack/requests/patch_plan.rb b/lib/fog/openstack/planning/requests/patch_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/patch_plan.rb rename to lib/fog/openstack/planning/requests/patch_plan.rb diff --git a/lib/fog/planning/openstack/requests/remove_role_from_plan.rb b/lib/fog/openstack/planning/requests/remove_role_from_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/remove_role_from_plan.rb rename to lib/fog/openstack/planning/requests/remove_role_from_plan.rb diff --git a/lib/fog/shared_file_system/openstack/models/availability_zone.rb b/lib/fog/openstack/shared_file_system/models/availability_zone.rb similarity index 83% rename from lib/fog/shared_file_system/openstack/models/availability_zone.rb rename to lib/fog/openstack/shared_file_system/models/availability_zone.rb index 73a5f5526..10c2c463f 100644 --- a/lib/fog/shared_file_system/openstack/models/availability_zone.rb +++ b/lib/fog/openstack/shared_file_system/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class AvailabilityZone < Fog::OpenStack::Model identity :id diff --git a/lib/fog/shared_file_system/openstack/models/availability_zones.rb b/lib/fog/openstack/shared_file_system/models/availability_zones.rb similarity index 59% rename from lib/fog/shared_file_system/openstack/models/availability_zones.rb rename to lib/fog/openstack/shared_file_system/models/availability_zones.rb index d63442b8b..47ee8eb43 100644 --- a/lib/fog/shared_file_system/openstack/models/availability_zones.rb +++ b/lib/fog/openstack/shared_file_system/models/availability_zones.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/availability_zone' +require 'fog/openstack/shared_file_system/models/availability_zone' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class AvailabilityZones < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::AvailabilityZone + model Fog::OpenStack::SharedFileSystem::AvailabilityZone def all load_response(service.list_availability_zones(), 'availability_zones') diff --git a/lib/fog/shared_file_system/openstack/models/network.rb b/lib/fog/openstack/shared_file_system/models/network.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/models/network.rb rename to lib/fog/openstack/shared_file_system/models/network.rb index 62d2a574a..7787cdf2a 100644 --- a/lib/fog/shared_file_system/openstack/models/network.rb +++ b/lib/fog/openstack/shared_file_system/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Network < Fog::OpenStack::Model identity :id diff --git a/lib/fog/shared_file_system/openstack/models/networks.rb b/lib/fog/openstack/shared_file_system/models/networks.rb similarity index 77% rename from lib/fog/shared_file_system/openstack/models/networks.rb rename to lib/fog/openstack/shared_file_system/models/networks.rb index 84fe46937..4bdd9026c 100644 --- a/lib/fog/shared_file_system/openstack/models/networks.rb +++ b/lib/fog/openstack/shared_file_system/models/networks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/network' +require 'fog/openstack/shared_file_system/models/network' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Networks < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::Network + model Fog::OpenStack::SharedFileSystem::Network def all(options = {}) load_response(service.list_share_networks_detail(options), 'share_networks') diff --git a/lib/fog/shared_file_system/openstack/models/share.rb b/lib/fog/openstack/shared_file_system/models/share.rb similarity index 97% rename from lib/fog/shared_file_system/openstack/models/share.rb rename to lib/fog/openstack/shared_file_system/models/share.rb index 26bf7b7c3..bfedd2b9a 100644 --- a/lib/fog/shared_file_system/openstack/models/share.rb +++ b/lib/fog/openstack/shared_file_system/models/share.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Share < Fog::OpenStack::Model identity :id @@ -85,7 +85,7 @@ def revoke_access(access_id) def access_rules service.share_access_rules(:share => self) end - + def export_locations service.share_export_locations(:share => self) end diff --git a/lib/fog/shared_file_system/openstack/models/share_access_rule.rb b/lib/fog/openstack/shared_file_system/models/share_access_rule.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/models/share_access_rule.rb rename to lib/fog/openstack/shared_file_system/models/share_access_rule.rb index 932e01ec6..923efa78f 100644 --- a/lib/fog/shared_file_system/openstack/models/share_access_rule.rb +++ b/lib/fog/openstack/shared_file_system/models/share_access_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareAccessRule < Fog::OpenStack::Model attr_accessor :share diff --git a/lib/fog/shared_file_system/openstack/models/share_access_rules.rb b/lib/fog/openstack/shared_file_system/models/share_access_rules.rb similarity index 76% rename from lib/fog/shared_file_system/openstack/models/share_access_rules.rb rename to lib/fog/openstack/shared_file_system/models/share_access_rules.rb index d35020e06..88ce81d50 100644 --- a/lib/fog/shared_file_system/openstack/models/share_access_rules.rb +++ b/lib/fog/openstack/shared_file_system/models/share_access_rules.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/share_access_rule' +require 'fog/openstack/shared_file_system/models/share_access_rule' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareAccessRules < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::ShareAccessRule + model Fog::OpenStack::SharedFileSystem::ShareAccessRule attr_accessor :share diff --git a/lib/fog/shared_file_system/openstack/models/share_export_location.rb b/lib/fog/openstack/shared_file_system/models/share_export_location.rb similarity index 83% rename from lib/fog/shared_file_system/openstack/models/share_export_location.rb rename to lib/fog/openstack/shared_file_system/models/share_export_location.rb index 6c0975381..e25dd6d5d 100644 --- a/lib/fog/shared_file_system/openstack/models/share_export_location.rb +++ b/lib/fog/openstack/shared_file_system/models/share_export_location.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareExportLocation < Fog::OpenStack::Model identity :id - + attribute :share_instance_id attribute :path attribute :is_admin_only diff --git a/lib/fog/shared_file_system/openstack/models/share_export_locations.rb b/lib/fog/openstack/shared_file_system/models/share_export_locations.rb similarity index 77% rename from lib/fog/shared_file_system/openstack/models/share_export_locations.rb rename to lib/fog/openstack/shared_file_system/models/share_export_locations.rb index 39cdadbaf..49bf13206 100644 --- a/lib/fog/shared_file_system/openstack/models/share_export_locations.rb +++ b/lib/fog/openstack/shared_file_system/models/share_export_locations.rb @@ -1,14 +1,14 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/share_access_rule' +require 'fog/openstack/shared_file_system/models/share_access_rule' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareExportLocations < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::ShareExportLocation + model Fog::OpenStack::SharedFileSystem::ShareExportLocation attr_accessor :share - + def all requires :share load_response(service.list_share_export_locations(@share.id), 'export_locations') @@ -20,7 +20,7 @@ def find_by_id(id) end alias get find_by_id - + def new(attributes = {}) requires :share super({:share => @share}.merge!(attributes)) diff --git a/lib/fog/shared_file_system/openstack/models/shares.rb b/lib/fog/openstack/shared_file_system/models/shares.rb similarity index 76% rename from lib/fog/shared_file_system/openstack/models/shares.rb rename to lib/fog/openstack/shared_file_system/models/shares.rb index 6f512b000..06e4ae729 100644 --- a/lib/fog/shared_file_system/openstack/models/shares.rb +++ b/lib/fog/openstack/shared_file_system/models/shares.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/share' +require 'fog/openstack/shared_file_system/models/share' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Shares < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::Share + model Fog::OpenStack::SharedFileSystem::Share def all(options = {}) load_response(service.list_shares_detail(options), 'shares') diff --git a/lib/fog/shared_file_system/openstack/models/snapshot.rb b/lib/fog/openstack/shared_file_system/models/snapshot.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/models/snapshot.rb rename to lib/fog/openstack/shared_file_system/models/snapshot.rb index 8f831a75a..6fefca9be 100644 --- a/lib/fog/shared_file_system/openstack/models/snapshot.rb +++ b/lib/fog/openstack/shared_file_system/models/snapshot.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Snapshot < Fog::OpenStack::Model identity :id diff --git a/lib/fog/shared_file_system/openstack/models/snapshots.rb b/lib/fog/openstack/shared_file_system/models/snapshots.rb similarity index 77% rename from lib/fog/shared_file_system/openstack/models/snapshots.rb rename to lib/fog/openstack/shared_file_system/models/snapshots.rb index e8a0ad749..3a6756f7c 100644 --- a/lib/fog/shared_file_system/openstack/models/snapshots.rb +++ b/lib/fog/openstack/shared_file_system/models/snapshots.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/snapshot' +require 'fog/openstack/shared_file_system/models/snapshot' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Snapshots < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::Snapshot + model Fog::OpenStack::SharedFileSystem::Snapshot def all(options = {}) load_response(service.list_snapshots_detail(options), 'snapshots') diff --git a/lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb b/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb index c80ede107..8ad8537e1 100644 --- a/lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def add_security_service_to_share_network(security_service_id, share_network_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/create_security_service.rb b/lib/fog/openstack/shared_file_system/requests/create_security_service.rb similarity index 96% rename from lib/fog/shared_file_system/openstack/requests/create_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/create_security_service.rb index bfc3bb543..a32ce1b09 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_security_service(type, name, options = {}) data = { diff --git a/lib/fog/shared_file_system/openstack/requests/create_share.rb b/lib/fog/openstack/shared_file_system/requests/create_share.rb similarity index 96% rename from lib/fog/shared_file_system/openstack/requests/create_share.rb rename to lib/fog/openstack/shared_file_system/requests/create_share.rb index cd8535110..8222a6465 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_share(protocol, size, options = {}) data = { diff --git a/lib/fog/shared_file_system/openstack/requests/create_share_network.rb b/lib/fog/openstack/shared_file_system/requests/create_share_network.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/create_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/create_share_network.rb index 21c11285c..6a38d5b9c 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_share_network(options = {}) data = {} diff --git a/lib/fog/shared_file_system/openstack/requests/create_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/create_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/create_snapshot.rb index 4c9fff6e8..9e4befabd 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_snapshot(share_id, options = {}) data = { diff --git a/lib/fog/shared_file_system/openstack/requests/delete_security_service.rb b/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb similarity index 90% rename from lib/fog/shared_file_system/openstack/requests/delete_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/delete_security_service.rb index 036057124..b304d2d22 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_security_service(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/delete_share.rb b/lib/fog/openstack/shared_file_system/requests/delete_share.rb similarity index 93% rename from lib/fog/shared_file_system/openstack/requests/delete_share.rb rename to lib/fog/openstack/shared_file_system/requests/delete_share.rb index f18126418..41c1113d2 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_share(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/delete_share_network.rb b/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/delete_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/delete_share_network.rb index 73bb098dc..3211b2cf2 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_share_network(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb index 48ca62beb..e48dfd759 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_snapshot(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/extend_share.rb b/lib/fog/openstack/shared_file_system/requests/extend_share.rb similarity index 90% rename from lib/fog/shared_file_system/openstack/requests/extend_share.rb rename to lib/fog/openstack/shared_file_system/requests/extend_share.rb index 6fd4fcd99..723db63ce 100644 --- a/lib/fog/shared_file_system/openstack/requests/extend_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/extend_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def extend_share(share_id, new_size) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/get_limits.rb b/lib/fog/openstack/shared_file_system/requests/get_limits.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/get_limits.rb rename to lib/fog/openstack/shared_file_system/requests/get_limits.rb index c4421586c..eea8774ca 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_limits.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_limits.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_limits request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_quota.rb b/lib/fog/openstack/shared_file_system/requests/get_quota.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/get_quota.rb rename to lib/fog/openstack/shared_file_system/requests/get_quota.rb index c381abd93..28dff4787 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_quota(project_id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_security_service.rb b/lib/fog/openstack/shared_file_system/requests/get_security_service.rb similarity index 93% rename from lib/fog/shared_file_system/openstack/requests/get_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/get_security_service.rb index 86c134319..42682244e 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_security_service(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_share.rb b/lib/fog/openstack/shared_file_system/requests/get_share.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/get_share.rb rename to lib/fog/openstack/shared_file_system/requests/get_share.rb index f37a5ac26..60103a993 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_share(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb b/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb similarity index 89% rename from lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb rename to lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb index 1c5319ec7..8c3400ef3 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb @@ -1,8 +1,8 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real - # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). + # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns the export location detail. def get_share_export_location(share_id,export_location_id) diff --git a/lib/fog/shared_file_system/openstack/requests/get_share_network.rb b/lib/fog/openstack/shared_file_system/requests/get_share_network.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/get_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/get_share_network.rb index b8fb78218..befa8fb1a 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_share_network(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/get_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/get_snapshot.rb index b39ca1604..b9acf812a 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_snapshot(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb b/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/grant_share_access.rb rename to lib/fog/openstack/shared_file_system/requests/grant_share_access.rb index c428e5821..92b3136a9 100644 --- a/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb +++ b/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def grant_share_access(share_id, access_to = '0.0.0.0/0', access_type = 'ip', access_level = 'rw') action = { diff --git a/lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb b/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb rename to lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb index 1752876db..a2b8639b2 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_availability_zones() request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_security_services.rb b/lib/fog/openstack/shared_file_system/requests/list_security_services.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_security_services.rb rename to lib/fog/openstack/shared_file_system/requests/list_security_services.rb index 7495481e0..e6588d094 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_security_services.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_security_services.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_security_services(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb index 9e47a0e04..5d9750b6d 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_security_services_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb b/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb index c22da2865..b232a1de6 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_share_access_rules(share_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb b/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb similarity index 87% rename from lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb index 54cebbffb..b2c283432 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb @@ -1,8 +1,8 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real - # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). + # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns a list of the export locations. def list_share_export_locations(share_id) diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_networks.rb b/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_share_networks.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_networks.rb index 263ba803c..eec063415 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_networks.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_share_networks(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb index a73ff21f4..1555248f4 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_share_networks_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_shares.rb b/lib/fog/openstack/shared_file_system/requests/list_shares.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_shares.rb rename to lib/fog/openstack/shared_file_system/requests/list_shares.rb index 090c91b52..13fd4e2a0 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_shares.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_shares.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_shares(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb index a3f722fd8..30abb0331 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_shares_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_snapshots.rb b/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_snapshots.rb rename to lib/fog/openstack/shared_file_system/requests/list_snapshots.rb index 59a8b50b3..b62e978ab 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_snapshots.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_snapshots(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb index 786449924..15e69cad1 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_snapshots_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb b/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb index 000154d94..a2072ddd4 100644 --- a/lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def remove_security_service_from_share_network(security_service_id, share_network_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb b/lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb rename to lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb index 3f7016dd3..47610ee97 100644 --- a/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb +++ b/lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def revoke_share_access(share_id, access_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/share_action.rb b/lib/fog/openstack/shared_file_system/requests/share_action.rb similarity index 87% rename from lib/fog/shared_file_system/openstack/requests/share_action.rb rename to lib/fog/openstack/shared_file_system/requests/share_action.rb index 5cb3f0ba2..c5c3cd97a 100644 --- a/lib/fog/shared_file_system/openstack/requests/share_action.rb +++ b/lib/fog/openstack/shared_file_system/requests/share_action.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def share_action(id, options = {}, expects_status = 202) request( diff --git a/lib/fog/shared_file_system/openstack/requests/share_network_action.rb b/lib/fog/openstack/shared_file_system/requests/share_network_action.rb similarity index 88% rename from lib/fog/shared_file_system/openstack/requests/share_network_action.rb rename to lib/fog/openstack/shared_file_system/requests/share_network_action.rb index d788f5ec5..9d78c1fe0 100644 --- a/lib/fog/shared_file_system/openstack/requests/share_network_action.rb +++ b/lib/fog/openstack/shared_file_system/requests/share_network_action.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def share_network_action(id, options = {}, expects_status = 200) request( diff --git a/lib/fog/shared_file_system/openstack/requests/shrink_share.rb b/lib/fog/openstack/shared_file_system/requests/shrink_share.rb similarity index 90% rename from lib/fog/shared_file_system/openstack/requests/shrink_share.rb rename to lib/fog/openstack/shared_file_system/requests/shrink_share.rb index 377b8ddb1..e0ebe59fc 100644 --- a/lib/fog/shared_file_system/openstack/requests/shrink_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/shrink_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def shrink_share(share_id, new_size) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/update_quota.rb b/lib/fog/openstack/shared_file_system/requests/update_quota.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_quota.rb rename to lib/fog/openstack/shared_file_system/requests/update_quota.rb index cfd9eef46..55392410d 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_quota(project_id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_security_service.rb b/lib/fog/openstack/shared_file_system/requests/update_security_service.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/update_security_service.rb index 132e9d12c..a1be0a855 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_security_service(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_share.rb b/lib/fog/openstack/shared_file_system/requests/update_share.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/update_share.rb rename to lib/fog/openstack/shared_file_system/requests/update_share.rb index 08f2fceeb..d283878b6 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_share(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_share_network.rb b/lib/fog/openstack/shared_file_system/requests/update_share_network.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/update_share_network.rb index d90187a77..b5c55dac1 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_share_network(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/update_snapshot.rb index 46a77677f..3898a9715 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_snapshot(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/openstack/shared_file_system/shared_file_system.rb similarity index 98% rename from lib/fog/shared_file_system/openstack.rb rename to lib/fog/openstack/shared_file_system/shared_file_system.rb index 556df1739..1f70859de 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/openstack/shared_file_system/shared_file_system.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack < Fog::Service + module OpenStack + class SharedFileSystem < Fog::Service SUPPORTED_VERSIONS = /v2(\.0)*/ SUPPORTED_MICROVERSION = '2.15'.freeze @@ -16,7 +16,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_shared_file_system_microversion - model_path 'fog/shared_file_system/openstack/models' + model_path 'fog/openstack/shared_file_system/models' model :network collection :networks model :share @@ -30,7 +30,7 @@ class OpenStack < Fog::Service model :availability_zone collection :availability_zones - request_path 'fog/shared_file_system/openstack/requests' + request_path 'fog/openstack/shared_file_system/requests' # share networks request :list_share_networks request :list_share_networks_detail @@ -348,7 +348,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::SharedFileSystem::OpenStack::NotFound + Fog::OpenStack::SharedFileSystem::NotFound end def action_prefix diff --git a/lib/fog/storage/openstack/models/directories.rb b/lib/fog/openstack/storage/models/directories.rb similarity index 82% rename from lib/fog/storage/openstack/models/directories.rb rename to lib/fog/openstack/storage/models/directories.rb index d912cda10..f4dd7e6be 100644 --- a/lib/fog/storage/openstack/models/directories.rb +++ b/lib/fog/openstack/storage/models/directories.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/storage/openstack/models/directory' +require 'fog/openstack/storage/models/directory' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Directories < Fog::OpenStack::Collection - model Fog::Storage::OpenStack::Directory + model Fog::OpenStack::Storage::Directory def all(options = {}) data = service.get_containers(options) @@ -27,7 +27,7 @@ def get(key, options = {}) directory.files << directory.files.new(file) end directory - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound nil end end diff --git a/lib/fog/storage/openstack/models/directory.rb b/lib/fog/openstack/storage/models/directory.rb similarity index 83% rename from lib/fog/storage/openstack/models/directory.rb rename to lib/fog/openstack/storage/models/directory.rb index b6a6ba8b1..9d2f4ccbb 100644 --- a/lib/fog/storage/openstack/models/directory.rb +++ b/lib/fog/openstack/storage/models/directory.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/storage/openstack/models/files' +require 'fog/openstack/storage/models/files' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Directory < Fog::OpenStack::Model identity :key, :aliases => 'name' @@ -22,7 +22,7 @@ def destroy def files @files ||= begin - Fog::Storage::OpenStack::Files.new( + Fog::OpenStack::Storage::Files.new( :directory => self, :service => service ) @@ -34,7 +34,7 @@ def public_url @public_url ||= begin service.public_url(key) - rescue Fog::Storage::OpenStack::NotFound => err + rescue Fog::OpenStack::Storage::NotFound => err nil end end diff --git a/lib/fog/storage/openstack/models/file.rb b/lib/fog/openstack/storage/models/file.rb similarity index 99% rename from lib/fog/storage/openstack/models/file.rb rename to lib/fog/openstack/storage/models/file.rb index 1650a27f8..8096f3e94 100644 --- a/lib/fog/storage/openstack/models/file.rb +++ b/lib/fog/openstack/storage/models/file.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class File < Fog::OpenStack::Model identity :key, :aliases => 'name' diff --git a/lib/fog/storage/openstack/models/files.rb b/lib/fog/openstack/storage/models/files.rb similarity index 91% rename from lib/fog/storage/openstack/models/files.rb rename to lib/fog/openstack/storage/models/files.rb index 141242948..9b4437830 100644 --- a/lib/fog/storage/openstack/models/files.rb +++ b/lib/fog/openstack/storage/models/files.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/collection' -require 'fog/storage/openstack/models/file' +require 'fog/openstack/storage/models/file' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Files < Fog::OpenStack::Collection attribute :directory attribute :limit @@ -11,7 +11,7 @@ class Files < Fog::OpenStack::Collection attribute :path attribute :prefix - model Fog::Storage::OpenStack::File + model Fog::OpenStack::Storage::File def all(options = {}) requires :directory @@ -55,7 +55,7 @@ def get(key, &block) file_data = data.headers.merge(:body => data.body, :key => key) new(file_data) - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound nil end @@ -81,7 +81,7 @@ def head(key, _options = {}) data = service.head_object(directory.key, key) file_data = data.headers.merge(:key => key) new(file_data) - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound nil end diff --git a/lib/fog/storage/openstack/requests/copy_object.rb b/lib/fog/openstack/storage/requests/copy_object.rb similarity index 96% rename from lib/fog/storage/openstack/requests/copy_object.rb rename to lib/fog/openstack/storage/requests/copy_object.rb index 2e98e523f..db518bead 100644 --- a/lib/fog/storage/openstack/requests/copy_object.rb +++ b/lib/fog/openstack/storage/requests/copy_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Copy object # diff --git a/lib/fog/storage/openstack/requests/delete_container.rb b/lib/fog/openstack/storage/requests/delete_container.rb similarity index 91% rename from lib/fog/storage/openstack/requests/delete_container.rb rename to lib/fog/openstack/storage/requests/delete_container.rb index 5023110f5..2fa501eb3 100644 --- a/lib/fog/storage/openstack/requests/delete_container.rb +++ b/lib/fog/openstack/storage/requests/delete_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Delete an existing container # diff --git a/lib/fog/storage/openstack/requests/delete_multiple_objects.rb b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb similarity index 98% rename from lib/fog/storage/openstack/requests/delete_multiple_objects.rb rename to lib/fog/openstack/storage/requests/delete_multiple_objects.rb index a91d5a245..ca69fecfa 100644 --- a/lib/fog/storage/openstack/requests/delete_multiple_objects.rb +++ b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Deletes multiple objects or containers with a single request. # diff --git a/lib/fog/storage/openstack/requests/delete_object.rb b/lib/fog/openstack/storage/requests/delete_object.rb similarity index 93% rename from lib/fog/storage/openstack/requests/delete_object.rb rename to lib/fog/openstack/storage/requests/delete_object.rb index bbc344cda..7b6954cea 100644 --- a/lib/fog/storage/openstack/requests/delete_object.rb +++ b/lib/fog/openstack/storage/requests/delete_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Delete an existing object # diff --git a/lib/fog/storage/openstack/requests/delete_static_large_object.rb b/lib/fog/openstack/storage/requests/delete_static_large_object.rb similarity index 98% rename from lib/fog/storage/openstack/requests/delete_static_large_object.rb rename to lib/fog/openstack/storage/requests/delete_static_large_object.rb index 4acddd449..50e6dd0f1 100644 --- a/lib/fog/storage/openstack/requests/delete_static_large_object.rb +++ b/lib/fog/openstack/storage/requests/delete_static_large_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Delete a static large object. # diff --git a/lib/fog/storage/openstack/requests/get_container.rb b/lib/fog/openstack/storage/requests/get_container.rb similarity index 97% rename from lib/fog/storage/openstack/requests/get_container.rb rename to lib/fog/openstack/storage/requests/get_container.rb index 27b93da95..8f8f2b1c2 100644 --- a/lib/fog/storage/openstack/requests/get_container.rb +++ b/lib/fog/openstack/storage/requests/get_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get details for container and total bytes stored # diff --git a/lib/fog/storage/openstack/requests/get_containers.rb b/lib/fog/openstack/storage/requests/get_containers.rb similarity index 96% rename from lib/fog/storage/openstack/requests/get_containers.rb rename to lib/fog/openstack/storage/requests/get_containers.rb index 254cd0d9a..b3d0835f4 100644 --- a/lib/fog/storage/openstack/requests/get_containers.rb +++ b/lib/fog/openstack/storage/requests/get_containers.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # List existing storage containers # diff --git a/lib/fog/storage/openstack/requests/get_object.rb b/lib/fog/openstack/storage/requests/get_object.rb similarity index 94% rename from lib/fog/storage/openstack/requests/get_object.rb rename to lib/fog/openstack/storage/requests/get_object.rb index bdfa1b02a..479038723 100644 --- a/lib/fog/storage/openstack/requests/get_object.rb +++ b/lib/fog/openstack/storage/requests/get_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get details for object # diff --git a/lib/fog/storage/openstack/requests/get_object_http_url.rb b/lib/fog/openstack/storage/requests/get_object_http_url.rb similarity index 94% rename from lib/fog/storage/openstack/requests/get_object_http_url.rb rename to lib/fog/openstack/storage/requests/get_object_http_url.rb index 0e8582417..ef79757d4 100644 --- a/lib/fog/storage/openstack/requests/get_object_http_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get an expiring object http url # diff --git a/lib/fog/storage/openstack/requests/get_object_https_url.rb b/lib/fog/openstack/storage/requests/get_object_https_url.rb similarity index 98% rename from lib/fog/storage/openstack/requests/get_object_https_url.rb rename to lib/fog/openstack/storage/requests/get_object_https_url.rb index 4f9a418d2..5b8cd50e7 100644 --- a/lib/fog/storage/openstack/requests/get_object_https_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get an expiring object https url from Cloud Files # diff --git a/lib/fog/storage/openstack/requests/head_container.rb b/lib/fog/openstack/storage/requests/head_container.rb similarity index 95% rename from lib/fog/storage/openstack/requests/head_container.rb rename to lib/fog/openstack/storage/requests/head_container.rb index c42b83ca9..141e4cb04 100644 --- a/lib/fog/storage/openstack/requests/head_container.rb +++ b/lib/fog/openstack/storage/requests/head_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # List number of objects and total bytes stored # diff --git a/lib/fog/storage/openstack/requests/head_containers.rb b/lib/fog/openstack/storage/requests/head_containers.rb similarity index 93% rename from lib/fog/storage/openstack/requests/head_containers.rb rename to lib/fog/openstack/storage/requests/head_containers.rb index d4dea719a..1cbdffe18 100644 --- a/lib/fog/storage/openstack/requests/head_containers.rb +++ b/lib/fog/openstack/storage/requests/head_containers.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # List number of containers and total bytes stored # diff --git a/lib/fog/storage/openstack/requests/head_object.rb b/lib/fog/openstack/storage/requests/head_object.rb similarity index 93% rename from lib/fog/storage/openstack/requests/head_object.rb rename to lib/fog/openstack/storage/requests/head_object.rb index c38095991..647e289e6 100644 --- a/lib/fog/storage/openstack/requests/head_object.rb +++ b/lib/fog/openstack/storage/requests/head_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get headers for object # diff --git a/lib/fog/storage/openstack/requests/post_object.rb b/lib/fog/openstack/storage/requests/post_object.rb similarity index 94% rename from lib/fog/storage/openstack/requests/post_object.rb rename to lib/fog/openstack/storage/requests/post_object.rb index 418d93820..2b66db150 100644 --- a/lib/fog/storage/openstack/requests/post_object.rb +++ b/lib/fog/openstack/storage/requests/post_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Update object metadata # diff --git a/lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb b/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb similarity index 96% rename from lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb rename to lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb index 45cc2dc8b..c5ca3a455 100644 --- a/lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb +++ b/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Set the account wide Temp URL Key. This is a secret key that's # used to generate signed expiring URLs. diff --git a/lib/fog/storage/openstack/requests/public_url.rb b/lib/fog/openstack/storage/requests/public_url.rb similarity index 95% rename from lib/fog/storage/openstack/requests/public_url.rb rename to lib/fog/openstack/storage/requests/public_url.rb index c95c8d7e3..ca2261863 100644 --- a/lib/fog/storage/openstack/requests/public_url.rb +++ b/lib/fog/openstack/storage/requests/public_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage module PublicUrl # Get public_url for an object # diff --git a/lib/fog/storage/openstack/requests/put_container.rb b/lib/fog/openstack/storage/requests/put_container.rb similarity index 94% rename from lib/fog/storage/openstack/requests/put_container.rb rename to lib/fog/openstack/storage/requests/put_container.rb index 4b3c976d2..ba09d8f5d 100644 --- a/lib/fog/storage/openstack/requests/put_container.rb +++ b/lib/fog/openstack/storage/requests/put_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new container # diff --git a/lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb b/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb similarity index 95% rename from lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb rename to lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb index b35f20e5a..4c0124ab5 100644 --- a/lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new dynamic large object manifest # @@ -19,7 +19,7 @@ class Real # @param options [Hash] Config headers for +object+. # @option options [String] 'X-Object-Manifest' ("container/object") "/" for segment objects. # - # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404 + # @raise [Fog::OpenStack::Storage::NotFound] HTTP 404 # @raise [Excon::Errors::BadRequest] HTTP 400 # @raise [Excon::Errors::Unauthorized] HTTP 401 # @raise [Excon::Errors::HTTPStatusError] diff --git a/lib/fog/storage/openstack/requests/put_object.rb b/lib/fog/openstack/storage/requests/put_object.rb similarity index 98% rename from lib/fog/storage/openstack/requests/put_object.rb rename to lib/fog/openstack/storage/requests/put_object.rb index 3057510d1..57007cc02 100644 --- a/lib/fog/storage/openstack/requests/put_object.rb +++ b/lib/fog/openstack/storage/requests/put_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new object # diff --git a/lib/fog/storage/openstack/requests/put_object_manifest.rb b/lib/fog/openstack/storage/requests/put_object_manifest.rb similarity index 90% rename from lib/fog/storage/openstack/requests/put_object_manifest.rb rename to lib/fog/openstack/storage/requests/put_object_manifest.rb index 1fe01c6d8..e52456217 100644 --- a/lib/fog/storage/openstack/requests/put_object_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_object_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new dynamic large object manifest # diff --git a/lib/fog/storage/openstack/requests/put_static_obj_manifest.rb b/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb similarity index 96% rename from lib/fog/storage/openstack/requests/put_static_obj_manifest.rb rename to lib/fog/openstack/storage/requests/put_static_obj_manifest.rb index 23b18a260..f031c1093 100644 --- a/lib/fog/storage/openstack/requests/put_static_obj_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new static large object manifest. # @@ -33,7 +33,7 @@ class Real # @param segments [Array] Segment data for the object. # @param options [Hash] Config headers for +object+. # - # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404 + # @raise [Fog::OpenStack::Storage::NotFound] HTTP 404 # @raise [Excon::Errors::BadRequest] HTTP 400 # @raise [Excon::Errors::Unauthorized] HTTP 401 # @raise [Excon::Errors::HTTPStatusError] diff --git a/lib/fog/storage/openstack.rb b/lib/fog/openstack/storage/storage.rb similarity index 95% rename from lib/fog/storage/openstack.rb rename to lib/fog/openstack/storage/storage.rb index cca6d65a4..c369f0753 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/openstack/storage/storage.rb @@ -1,8 +1,8 @@ module Fog - module Storage - class OpenStack < Fog::Service + module OpenStack + class Storage < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -15,13 +15,13 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key - model_path 'fog/storage/openstack/models' + model_path 'fog/openstack/storage/models' model :directory collection :directories model :file collection :files - request_path 'fog/storage/openstack/requests' + request_path 'fog/openstack/storage/requests' request :copy_object request :delete_container request :delete_object @@ -105,7 +105,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Storage::OpenStack::NotFound + Fog::OpenStack::Storage::NotFound end def default_service_type @@ -125,7 +125,7 @@ def initialize(options = {}) # For example: # # # List current user account details - # service = Fog::Storage[:openstack] + # service = Fog::OpenStack::Storage.new # service.request :method => 'HEAD' # # Would return something like: diff --git a/lib/fog/volume/openstack/models/availability_zone.rb b/lib/fog/openstack/volume/models/availability_zone.rb similarity index 78% rename from lib/fog/volume/openstack/models/availability_zone.rb rename to lib/fog/openstack/volume/models/availability_zone.rb index e1b34cf14..bdbe24823 100644 --- a/lib/fog/volume/openstack/models/availability_zone.rb +++ b/lib/fog/openstack/volume/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class AvailabilityZone < Fog::OpenStack::Model end end diff --git a/lib/fog/volume/openstack/models/availability_zones.rb b/lib/fog/openstack/volume/models/availability_zones.rb similarity index 87% rename from lib/fog/volume/openstack/models/availability_zones.rb rename to lib/fog/openstack/volume/models/availability_zones.rb index 42563cee7..413e5b2c8 100644 --- a/lib/fog/volume/openstack/models/availability_zones.rb +++ b/lib/fog/openstack/volume/models/availability_zones.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module AvailabilityZones def all(options = {}) data = service.list_zones(options) diff --git a/lib/fog/volume/openstack/models/backup.rb b/lib/fog/openstack/volume/models/backup.rb similarity index 96% rename from lib/fog/volume/openstack/models/backup.rb rename to lib/fog/openstack/volume/models/backup.rb index 676a16c78..bb76a2bc7 100644 --- a/lib/fog/volume/openstack/models/backup.rb +++ b/lib/fog/openstack/volume/models/backup.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Backup < Fog::OpenStack::Model attribute :availability_zone attribute :container diff --git a/lib/fog/volume/openstack/models/backups.rb b/lib/fog/openstack/volume/models/backups.rb similarity index 86% rename from lib/fog/volume/openstack/models/backups.rb rename to lib/fog/openstack/volume/models/backups.rb index a7e29aeb2..3315bcd18 100644 --- a/lib/fog/volume/openstack/models/backups.rb +++ b/lib/fog/openstack/volume/models/backups.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Backups def all(options = {}) load_response(service.list_backups_detailed(options), 'backups') @@ -17,7 +17,7 @@ def get(backup_id) if backup new(backup) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/models/snapshot.rb b/lib/fog/openstack/volume/models/snapshot.rb similarity index 96% rename from lib/fog/volume/openstack/models/snapshot.rb rename to lib/fog/openstack/volume/models/snapshot.rb index e4ee978f1..83b4363e8 100644 --- a/lib/fog/volume/openstack/models/snapshot.rb +++ b/lib/fog/openstack/volume/models/snapshot.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Snapshot < Fog::OpenStack::Model def update(data) requires :id diff --git a/lib/fog/volume/openstack/models/snapshots.rb b/lib/fog/openstack/volume/models/snapshots.rb similarity index 86% rename from lib/fog/volume/openstack/models/snapshots.rb rename to lib/fog/openstack/volume/models/snapshots.rb index 77d92a9e7..2537440e7 100644 --- a/lib/fog/volume/openstack/models/snapshots.rb +++ b/lib/fog/openstack/volume/models/snapshots.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Snapshots def all(options = {}) load_response(service.list_snapshots_detailed(options), 'snapshots') @@ -17,7 +17,7 @@ def get(snapshots_id) if snapshot new(snapshot) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/models/transfer.rb b/lib/fog/openstack/volume/models/transfer.rb similarity index 94% rename from lib/fog/volume/openstack/models/transfer.rb rename to lib/fog/openstack/volume/models/transfer.rb index 773cdd15d..fc711e972 100644 --- a/lib/fog/volume/openstack/models/transfer.rb +++ b/lib/fog/openstack/volume/models/transfer.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Transfer < Fog::OpenStack::Model def save requires :name, :volume_id diff --git a/lib/fog/volume/openstack/models/transfers.rb b/lib/fog/openstack/volume/models/transfers.rb similarity index 91% rename from lib/fog/volume/openstack/models/transfers.rb rename to lib/fog/openstack/volume/models/transfers.rb index 824c21cd7..5118419eb 100644 --- a/lib/fog/volume/openstack/models/transfers.rb +++ b/lib/fog/openstack/volume/models/transfers.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Transfers def all(options = {}) load_response(service.list_transfers_detailed(options), 'transfers') @@ -16,7 +16,7 @@ def get(transfer_id) if transfer = service.get_transfer_details(transfer_id).body['transfer'] new(transfer) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end diff --git a/lib/fog/volume/openstack/models/volume.rb b/lib/fog/openstack/volume/models/volume.rb similarity index 98% rename from lib/fog/volume/openstack/models/volume.rb rename to lib/fog/openstack/volume/models/volume.rb index 531862350..565e71c09 100644 --- a/lib/fog/volume/openstack/models/volume.rb +++ b/lib/fog/openstack/volume/models/volume.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Volume < Fog::OpenStack::Model attribute :metadata attribute :status diff --git a/lib/fog/volume/openstack/models/volume_type.rb b/lib/fog/openstack/volume/models/volume_type.rb similarity index 94% rename from lib/fog/volume/openstack/models/volume_type.rb rename to lib/fog/openstack/volume/models/volume_type.rb index 843188950..6f23d4082 100644 --- a/lib/fog/volume/openstack/models/volume_type.rb +++ b/lib/fog/openstack/volume/models/volume_type.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class VolumeType < Fog::OpenStack::Model attribute :extra_specs diff --git a/lib/fog/volume/openstack/models/volume_types.rb b/lib/fog/openstack/volume/models/volume_types.rb similarity index 84% rename from lib/fog/volume/openstack/models/volume_types.rb rename to lib/fog/openstack/volume/models/volume_types.rb index 3e58e0a77..3e1cd9851 100644 --- a/lib/fog/volume/openstack/models/volume_types.rb +++ b/lib/fog/openstack/volume/models/volume_types.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module VolumeTypes def all(options = {}) response = service.list_volume_types(options) @@ -13,7 +13,7 @@ def get(volume_type_id) if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type'] new(volume_type) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/models/volumes.rb b/lib/fog/openstack/volume/models/volumes.rb similarity index 93% rename from lib/fog/volume/openstack/models/volumes.rb rename to lib/fog/openstack/volume/models/volumes.rb index 03fbc8be1..7efa2ad6f 100644 --- a/lib/fog/volume/openstack/models/volumes.rb +++ b/lib/fog/openstack/volume/models/volumes.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Volumes def all(options = {}) # the parameter has been "detailed = true" before. Make sure we are @@ -26,7 +26,7 @@ def get(volume_id) if volume = service.get_volume_details(volume_id).body['volume'] new(volume) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/requests/accept_transfer.rb b/lib/fog/openstack/volume/requests/accept_transfer.rb similarity index 92% rename from lib/fog/volume/openstack/requests/accept_transfer.rb rename to lib/fog/openstack/volume/requests/accept_transfer.rb index 965ba4843..aaceb873b 100644 --- a/lib/fog/volume/openstack/requests/accept_transfer.rb +++ b/lib/fog/openstack/volume/requests/accept_transfer.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def accept_transfer(transfer_id, auth_key) data = { diff --git a/lib/fog/volume/openstack/requests/action.rb b/lib/fog/openstack/volume/requests/action.rb similarity index 89% rename from lib/fog/volume/openstack/requests/action.rb rename to lib/fog/openstack/volume/requests/action.rb index d9a6116f2..1b9addcc7 100644 --- a/lib/fog/volume/openstack/requests/action.rb +++ b/lib/fog/openstack/volume/requests/action.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def action(id, data) request( diff --git a/lib/fog/volume/openstack/requests/create_backup.rb b/lib/fog/openstack/volume/requests/create_backup.rb similarity index 96% rename from lib/fog/volume/openstack/requests/create_backup.rb rename to lib/fog/openstack/volume/requests/create_backup.rb index eb68bc50a..8e5278191 100644 --- a/lib/fog/volume/openstack/requests/create_backup.rb +++ b/lib/fog/openstack/volume/requests/create_backup.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def create_backup(attributes) desired_options = [ diff --git a/lib/fog/volume/openstack/requests/create_snapshot.rb b/lib/fog/openstack/volume/requests/create_snapshot.rb similarity index 89% rename from lib/fog/volume/openstack/requests/create_snapshot.rb rename to lib/fog/openstack/volume/requests/create_snapshot.rb index 0af0b86f5..1d6c394a3 100644 --- a/lib/fog/volume/openstack/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real private diff --git a/lib/fog/volume/openstack/requests/create_transfer.rb b/lib/fog/openstack/volume/requests/create_transfer.rb similarity index 93% rename from lib/fog/volume/openstack/requests/create_transfer.rb rename to lib/fog/openstack/volume/requests/create_transfer.rb index a4453af12..94e2e2857 100644 --- a/lib/fog/volume/openstack/requests/create_transfer.rb +++ b/lib/fog/openstack/volume/requests/create_transfer.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def create_transfer(volume_id, options = {}) data = { diff --git a/lib/fog/volume/openstack/requests/create_volume.rb b/lib/fog/openstack/volume/requests/create_volume.rb similarity index 94% rename from lib/fog/volume/openstack/requests/create_volume.rb rename to lib/fog/openstack/volume/requests/create_volume.rb index 2b8cf3281..c639dde0e 100644 --- a/lib/fog/volume/openstack/requests/create_volume.rb +++ b/lib/fog/openstack/volume/requests/create_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real private diff --git a/lib/fog/volume/openstack/requests/create_volume_type.rb b/lib/fog/openstack/volume/requests/create_volume_type.rb similarity index 96% rename from lib/fog/volume/openstack/requests/create_volume_type.rb rename to lib/fog/openstack/volume/requests/create_volume_type.rb index 24ce2f868..b0eca9574 100644 --- a/lib/fog/volume/openstack/requests/create_volume_type.rb +++ b/lib/fog/openstack/volume/requests/create_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def create_volume_type(options = {}) data = { diff --git a/lib/fog/volume/openstack/requests/delete_backup.rb b/lib/fog/openstack/volume/requests/delete_backup.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_backup.rb rename to lib/fog/openstack/volume/requests/delete_backup.rb index 52d07a675..bf76b0ffa 100644 --- a/lib/fog/volume/openstack/requests/delete_backup.rb +++ b/lib/fog/openstack/volume/requests/delete_backup.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_backup(backup_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_metadata.rb b/lib/fog/openstack/volume/requests/delete_metadata.rb similarity index 88% rename from lib/fog/volume/openstack/requests/delete_metadata.rb rename to lib/fog/openstack/volume/requests/delete_metadata.rb index 972f116ec..e93ba9e92 100644 --- a/lib/fog/volume/openstack/requests/delete_metadata.rb +++ b/lib/fog/openstack/volume/requests/delete_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_metadata(volume_id, key_name) request( diff --git a/lib/fog/volume/openstack/requests/delete_snapshot.rb b/lib/fog/openstack/volume/requests/delete_snapshot.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_snapshot.rb rename to lib/fog/openstack/volume/requests/delete_snapshot.rb index f252f9327..e03d3fefb 100644 --- a/lib/fog/volume/openstack/requests/delete_snapshot.rb +++ b/lib/fog/openstack/volume/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_snapshot(snapshot_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb similarity index 89% rename from lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb rename to lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb index a4143134f..69bb6fda1 100644 --- a/lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb +++ b/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_snapshot_metadata(snapshot_id, key_name) request( diff --git a/lib/fog/volume/openstack/requests/delete_transfer.rb b/lib/fog/openstack/volume/requests/delete_transfer.rb similarity index 88% rename from lib/fog/volume/openstack/requests/delete_transfer.rb rename to lib/fog/openstack/volume/requests/delete_transfer.rb index 6f49251a8..84ceedbbd 100644 --- a/lib/fog/volume/openstack/requests/delete_transfer.rb +++ b/lib/fog/openstack/volume/requests/delete_transfer.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_transfer(transfer_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_volume.rb b/lib/fog/openstack/volume/requests/delete_volume.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_volume.rb rename to lib/fog/openstack/volume/requests/delete_volume.rb index 7ebe8c137..fbc0748c3 100644 --- a/lib/fog/volume/openstack/requests/delete_volume.rb +++ b/lib/fog/openstack/volume/requests/delete_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_volume(volume_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_volume_type.rb b/lib/fog/openstack/volume/requests/delete_volume_type.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_volume_type.rb rename to lib/fog/openstack/volume/requests/delete_volume_type.rb index 57abf0fc7..2313d5559 100644 --- a/lib/fog/volume/openstack/requests/delete_volume_type.rb +++ b/lib/fog/openstack/volume/requests/delete_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_volume_type(volume_type_id) request( diff --git a/lib/fog/volume/openstack/requests/extend_volume.rb b/lib/fog/openstack/volume/requests/extend_volume.rb similarity index 93% rename from lib/fog/volume/openstack/requests/extend_volume.rb rename to lib/fog/openstack/volume/requests/extend_volume.rb index 24c089aa7..421cc40dd 100644 --- a/lib/fog/volume/openstack/requests/extend_volume.rb +++ b/lib/fog/openstack/volume/requests/extend_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def extend_volume(volume_id, size) body = {'os-extend' => {'new_size' => size}} diff --git a/lib/fog/volume/openstack/requests/get_backup_details.rb b/lib/fog/openstack/volume/requests/get_backup_details.rb similarity index 95% rename from lib/fog/volume/openstack/requests/get_backup_details.rb rename to lib/fog/openstack/volume/requests/get_backup_details.rb index a001a09d7..1f5a346be 100644 --- a/lib/fog/volume/openstack/requests/get_backup_details.rb +++ b/lib/fog/openstack/volume/requests/get_backup_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_backup_details(backup_id) request( diff --git a/lib/fog/volume/openstack/requests/get_quota.rb b/lib/fog/openstack/volume/requests/get_quota.rb similarity index 93% rename from lib/fog/volume/openstack/requests/get_quota.rb rename to lib/fog/openstack/volume/requests/get_quota.rb index 6e2569b06..1e25662c8 100644 --- a/lib/fog/volume/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/volume/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_quota(tenant_id) request( diff --git a/lib/fog/volume/openstack/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/requests/get_quota_defaults.rb similarity index 93% rename from lib/fog/volume/openstack/requests/get_quota_defaults.rb rename to lib/fog/openstack/volume/requests/get_quota_defaults.rb index ae2830e6c..101cfa266 100644 --- a/lib/fog/volume/openstack/requests/get_quota_defaults.rb +++ b/lib/fog/openstack/volume/requests/get_quota_defaults.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_quota_defaults(tenant_id) request( diff --git a/lib/fog/volume/openstack/requests/get_quota_usage.rb b/lib/fog/openstack/volume/requests/get_quota_usage.rb similarity index 96% rename from lib/fog/volume/openstack/requests/get_quota_usage.rb rename to lib/fog/openstack/volume/requests/get_quota_usage.rb index 42d8511a9..18431fe33 100644 --- a/lib/fog/volume/openstack/requests/get_quota_usage.rb +++ b/lib/fog/openstack/volume/requests/get_quota_usage.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_quota_usage(tenant_id) request( diff --git a/lib/fog/volume/openstack/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/requests/get_snapshot_details.rb similarity index 87% rename from lib/fog/volume/openstack/requests/get_snapshot_details.rb rename to lib/fog/openstack/volume/requests/get_snapshot_details.rb index 47f3fbb31..46a198a90 100644 --- a/lib/fog/volume/openstack/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/requests/get_snapshot_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_snapshot_details(snapshot_id) request( diff --git a/lib/fog/volume/openstack/requests/get_transfer_details.rb b/lib/fog/openstack/volume/requests/get_transfer_details.rb similarity index 89% rename from lib/fog/volume/openstack/requests/get_transfer_details.rb rename to lib/fog/openstack/volume/requests/get_transfer_details.rb index 35db96484..58ac36d37 100644 --- a/lib/fog/volume/openstack/requests/get_transfer_details.rb +++ b/lib/fog/openstack/volume/requests/get_transfer_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/volume/openstack/requests/get_volume_details.rb b/lib/fog/openstack/volume/requests/get_volume_details.rb similarity index 87% rename from lib/fog/volume/openstack/requests/get_volume_details.rb rename to lib/fog/openstack/volume/requests/get_volume_details.rb index facb196cc..7e9e85fdc 100644 --- a/lib/fog/volume/openstack/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/requests/get_volume_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_volume_details(volume_id) request( diff --git a/lib/fog/volume/openstack/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/requests/get_volume_type_details.rb similarity index 95% rename from lib/fog/volume/openstack/requests/get_volume_type_details.rb rename to lib/fog/openstack/volume/requests/get_volume_type_details.rb index 701796cf4..57cd39aa0 100644 --- a/lib/fog/volume/openstack/requests/get_volume_type_details.rb +++ b/lib/fog/openstack/volume/requests/get_volume_type_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_volume_type_details(volume_type_id) request( diff --git a/lib/fog/volume/openstack/requests/list_backups.rb b/lib/fog/openstack/volume/requests/list_backups.rb similarity index 88% rename from lib/fog/volume/openstack/requests/list_backups.rb rename to lib/fog/openstack/volume/requests/list_backups.rb index 229ce1125..74fcec90c 100644 --- a/lib/fog/volume/openstack/requests/list_backups.rb +++ b/lib/fog/openstack/volume/requests/list_backups.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_backups(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/requests/list_backups_detailed.rb similarity index 96% rename from lib/fog/volume/openstack/requests/list_backups_detailed.rb rename to lib/fog/openstack/volume/requests/list_backups_detailed.rb index 9c9f66e0f..b9f425523 100644 --- a/lib/fog/volume/openstack/requests/list_backups_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_backups_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_backups_detailed(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_snapshots.rb b/lib/fog/openstack/volume/requests/list_snapshots.rb similarity index 97% rename from lib/fog/volume/openstack/requests/list_snapshots.rb rename to lib/fog/openstack/volume/requests/list_snapshots.rb index d20eba97a..acc7242d5 100644 --- a/lib/fog/volume/openstack/requests/list_snapshots.rb +++ b/lib/fog/openstack/volume/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_snapshots(options = true, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/volume/openstack/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb similarity index 94% rename from lib/fog/volume/openstack/requests/list_snapshots_detailed.rb rename to lib/fog/openstack/volume/requests/list_snapshots_detailed.rb index ff04452ef..3879ecf97 100644 --- a/lib/fog/volume/openstack/requests/list_snapshots_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_snapshots_detailed(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_transfers.rb b/lib/fog/openstack/volume/requests/list_transfers.rb similarity index 90% rename from lib/fog/volume/openstack/requests/list_transfers.rb rename to lib/fog/openstack/volume/requests/list_transfers.rb index 45f37b83e..52868e450 100644 --- a/lib/fog/volume/openstack/requests/list_transfers.rb +++ b/lib/fog/openstack/volume/requests/list_transfers.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/volume/openstack/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/requests/list_transfers_detailed.rb similarity index 90% rename from lib/fog/volume/openstack/requests/list_transfers_detailed.rb rename to lib/fog/openstack/volume/requests/list_transfers_detailed.rb index afb1d9972..824e2c477 100644 --- a/lib/fog/volume/openstack/requests/list_transfers_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_transfers_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/volume/openstack/requests/list_volume_types.rb b/lib/fog/openstack/volume/requests/list_volume_types.rb similarity index 96% rename from lib/fog/volume/openstack/requests/list_volume_types.rb rename to lib/fog/openstack/volume/requests/list_volume_types.rb index e9ab78da8..ef76d8e1e 100644 --- a/lib/fog/volume/openstack/requests/list_volume_types.rb +++ b/lib/fog/openstack/volume/requests/list_volume_types.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_volume_types(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_volumes.rb b/lib/fog/openstack/volume/requests/list_volumes.rb similarity index 96% rename from lib/fog/volume/openstack/requests/list_volumes.rb rename to lib/fog/openstack/volume/requests/list_volumes.rb index 707465a3e..5f5e776d0 100644 --- a/lib/fog/volume/openstack/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/requests/list_volumes.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_volumes(options = true, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/volume/openstack/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/requests/list_volumes_detailed.rb similarity index 88% rename from lib/fog/volume/openstack/requests/list_volumes_detailed.rb rename to lib/fog/openstack/volume/requests/list_volumes_detailed.rb index d70110349..a2dc53479 100644 --- a/lib/fog/volume/openstack/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_volumes_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_volumes_detailed(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_zones.rb b/lib/fog/openstack/volume/requests/list_zones.rb similarity index 94% rename from lib/fog/volume/openstack/requests/list_zones.rb rename to lib/fog/openstack/volume/requests/list_zones.rb index 67303472d..f2f606050 100644 --- a/lib/fog/volume/openstack/requests/list_zones.rb +++ b/lib/fog/openstack/volume/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_zones(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/replace_metadata.rb b/lib/fog/openstack/volume/requests/replace_metadata.rb similarity index 91% rename from lib/fog/volume/openstack/requests/replace_metadata.rb rename to lib/fog/openstack/volume/requests/replace_metadata.rb index a46b43eea..c03c45cc5 100644 --- a/lib/fog/volume/openstack/requests/replace_metadata.rb +++ b/lib/fog/openstack/volume/requests/replace_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def replace_metadata(volume_id, metadata = {}) data = { diff --git a/lib/fog/volume/openstack/requests/restore_backup.rb b/lib/fog/openstack/volume/requests/restore_backup.rb similarity index 91% rename from lib/fog/volume/openstack/requests/restore_backup.rb rename to lib/fog/openstack/volume/requests/restore_backup.rb index d71bd6287..2b5298cc0 100644 --- a/lib/fog/volume/openstack/requests/restore_backup.rb +++ b/lib/fog/openstack/volume/requests/restore_backup.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def restore_backup(backup_id, volume_id = nil, name = nil) data = {'restore' => {'volume_id' => volume_id, 'name' => name}} diff --git a/lib/fog/volume/openstack/requests/set_tenant.rb b/lib/fog/openstack/volume/requests/set_tenant.rb similarity index 89% rename from lib/fog/volume/openstack/requests/set_tenant.rb rename to lib/fog/openstack/volume/requests/set_tenant.rb index 6a04e8c45..9853a01a2 100644 --- a/lib/fog/volume/openstack/requests/set_tenant.rb +++ b/lib/fog/openstack/volume/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/volume/openstack/requests/snapshot_action.rb b/lib/fog/openstack/volume/requests/snapshot_action.rb similarity index 89% rename from lib/fog/volume/openstack/requests/snapshot_action.rb rename to lib/fog/openstack/volume/requests/snapshot_action.rb index b977cea89..6065298ba 100644 --- a/lib/fog/volume/openstack/requests/snapshot_action.rb +++ b/lib/fog/openstack/volume/requests/snapshot_action.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def snapshot_action(id, data) request( diff --git a/lib/fog/volume/openstack/requests/update_metadata.rb b/lib/fog/openstack/volume/requests/update_metadata.rb similarity index 91% rename from lib/fog/volume/openstack/requests/update_metadata.rb rename to lib/fog/openstack/volume/requests/update_metadata.rb index 4b6d7c3a8..18b480049 100644 --- a/lib/fog/volume/openstack/requests/update_metadata.rb +++ b/lib/fog/openstack/volume/requests/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_metadata(volume_id, metadata = {}) data = { diff --git a/lib/fog/volume/openstack/requests/update_quota.rb b/lib/fog/openstack/volume/requests/update_quota.rb similarity index 94% rename from lib/fog/volume/openstack/requests/update_quota.rb rename to lib/fog/openstack/volume/requests/update_quota.rb index 01aa91918..3fc2b86e3 100644 --- a/lib/fog/volume/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/volume/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/volume/openstack/requests/update_snapshot.rb b/lib/fog/openstack/volume/requests/update_snapshot.rb similarity index 97% rename from lib/fog/volume/openstack/requests/update_snapshot.rb rename to lib/fog/openstack/volume/requests/update_snapshot.rb index 5ed42ef3f..3c7703550 100644 --- a/lib/fog/volume/openstack/requests/update_snapshot.rb +++ b/lib/fog/openstack/volume/requests/update_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_snapshot(snapshot_id, data = {}) request( diff --git a/lib/fog/volume/openstack/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb similarity index 91% rename from lib/fog/volume/openstack/requests/update_snapshot_metadata.rb rename to lib/fog/openstack/volume/requests/update_snapshot_metadata.rb index 46497b145..0ba7015f6 100644 --- a/lib/fog/volume/openstack/requests/update_snapshot_metadata.rb +++ b/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_snapshot_metadata(snapshot_id, metadata = {}) data = { diff --git a/lib/fog/volume/openstack/requests/update_volume.rb b/lib/fog/openstack/volume/requests/update_volume.rb similarity index 94% rename from lib/fog/volume/openstack/requests/update_volume.rb rename to lib/fog/openstack/volume/requests/update_volume.rb index 8ef96681c..224aaa30c 100644 --- a/lib/fog/volume/openstack/requests/update_volume.rb +++ b/lib/fog/openstack/volume/requests/update_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_volume(volume_id, data = {}) request( diff --git a/lib/fog/volume/openstack/requests/update_volume_type.rb b/lib/fog/openstack/volume/requests/update_volume_type.rb similarity index 96% rename from lib/fog/volume/openstack/requests/update_volume_type.rb rename to lib/fog/openstack/volume/requests/update_volume_type.rb index 0420f1bde..5ba12c889 100644 --- a/lib/fog/volume/openstack/requests/update_volume_type.rb +++ b/lib/fog/openstack/volume/requests/update_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_volume_type(volume_type_id, options = {}) data = { diff --git a/lib/fog/volume/openstack/v1.rb b/lib/fog/openstack/volume/v1.rb similarity index 94% rename from lib/fog/volume/openstack/v1.rb rename to lib/fog/openstack/volume/v1.rb index 03ed14513..d3ed15e7a 100644 --- a/lib/fog/volume/openstack/v1.rb +++ b/lib/fog/openstack/volume/v1.rb @@ -1,17 +1,17 @@ require 'fog/openstack/core' -require 'fog/volume/openstack' +require 'fog/openstack/volume/volume' module Fog - module Volume - class OpenStack - class V1 < Fog::Volume::OpenStack + module OpenStack + class Volume + class V1 < Fog::OpenStack::Volume SUPPORTED_VERSIONS = /v1(\.(0-9))*/ requires :openstack_auth_url recognizes *@@recognizes - model_path 'fog/volume/openstack/v1/models' + model_path 'fog/openstack/volume/v1/models' model :volume collection :volumes @@ -31,7 +31,7 @@ class V1 < Fog::Volume::OpenStack model :backup collection :backups - request_path 'fog/volume/openstack/v1/requests' + request_path 'fog/openstack/volume/v1/requests' # Volume request :list_volumes @@ -149,7 +149,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Volume::OpenStack::NotFound + Fog::OpenStack::Volume::NotFound end def default_endtpoint_type diff --git a/lib/fog/openstack/volume/v1/models/availability_zone.rb b/lib/fog/openstack/volume/v1/models/availability_zone.rb new file mode 100644 index 000000000..e46cbd50f --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/availability_zone.rb @@ -0,0 +1,15 @@ +require 'fog/openstack/volume/models/availability_zone' + +module Fog + module OpenStack + class Volume + class V1 + class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone + identity :zoneName + + attribute :zoneState + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/availability_zones.rb b/lib/fog/openstack/volume/v1/models/availability_zones.rb new file mode 100644 index 000000000..c8411fcb2 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/availability_zones.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/availability_zone' +require 'fog/openstack/volume/models/availability_zones' + +module Fog + module OpenStack + class Volume + class V1 + class AvailabilityZones < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::AvailabilityZone + include Fog::OpenStack::Volume::AvailabilityZones + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/backup.rb b/lib/fog/openstack/volume/v1/models/backup.rb similarity index 53% rename from lib/fog/volume/openstack/v1/models/backup.rb rename to lib/fog/openstack/volume/v1/models/backup.rb index ff5a88382..48e79cfe4 100644 --- a/lib/fog/volume/openstack/v1/models/backup.rb +++ b/lib/fog/openstack/volume/v1/models/backup.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/backup' +require 'fog/openstack/volume/models/backup' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Backup < Fog::Volume::OpenStack::Backup + class Backup < Fog::OpenStack::Volume::Backup identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/openstack/volume/v1/models/backups.rb b/lib/fog/openstack/volume/v1/models/backups.rb new file mode 100644 index 000000000..f986fe81c --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/backups.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/backup' +require 'fog/openstack/volume/models/backups' + +module Fog + module OpenStack + class Volume + class V1 + class Backups < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Backup + include Fog::OpenStack::Volume::Backups + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/snapshot.rb b/lib/fog/openstack/volume/v1/models/snapshot.rb similarity index 89% rename from lib/fog/volume/openstack/v1/models/snapshot.rb rename to lib/fog/openstack/volume/v1/models/snapshot.rb index 02f64f1de..9dc1451fe 100644 --- a/lib/fog/volume/openstack/v1/models/snapshot.rb +++ b/lib/fog/openstack/volume/v1/models/snapshot.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/snapshot' +require 'fog/openstack/volume/models/snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Snapshot < Fog::Volume::OpenStack::Snapshot + class Snapshot < Fog::OpenStack::Volume::Snapshot identity :id attribute :display_name diff --git a/lib/fog/openstack/volume/v1/models/snapshots.rb b/lib/fog/openstack/volume/v1/models/snapshots.rb new file mode 100644 index 000000000..43a7694d4 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/snapshots.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/snapshot' +require 'fog/openstack/volume/models/snapshots' + +module Fog + module OpenStack + class Volume + class V1 + class Snapshots < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Snapshot + include Fog::OpenStack::Volume::Snapshots + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/transfer.rb b/lib/fog/openstack/volume/v1/models/transfer.rb similarity index 66% rename from lib/fog/volume/openstack/v1/models/transfer.rb rename to lib/fog/openstack/volume/v1/models/transfer.rb index e9b68a6eb..9ef55cd98 100644 --- a/lib/fog/volume/openstack/v1/models/transfer.rb +++ b/lib/fog/openstack/volume/v1/models/transfer.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/transfer' +require 'fog/openstack/volume/models/transfer' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Transfer < Fog::Volume::OpenStack::Transfer + class Transfer < Fog::OpenStack::Volume::Transfer identity :id attribute :auth_key, :aliases => 'authKey' diff --git a/lib/fog/openstack/volume/v1/models/transfers.rb b/lib/fog/openstack/volume/v1/models/transfers.rb new file mode 100644 index 000000000..8dfede857 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/transfers.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/transfer' +require 'fog/openstack/volume/models/transfers' + +module Fog + module OpenStack + class Volume + class V1 + class Transfers < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Transfer + include Fog::OpenStack::Volume::Transfers + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/volume.rb b/lib/fog/openstack/volume/v1/models/volume.rb similarity index 87% rename from lib/fog/volume/openstack/v1/models/volume.rb rename to lib/fog/openstack/volume/v1/models/volume.rb index 753f49d9d..89aaa76e7 100644 --- a/lib/fog/volume/openstack/v1/models/volume.rb +++ b/lib/fog/openstack/volume/v1/models/volume.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume' +require 'fog/openstack/volume/models/volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Volume < Fog::Volume::OpenStack::Volume + class Volume < Fog::OpenStack::Volume::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/volume/openstack/v1/models/volume_type.rb b/lib/fog/openstack/volume/v1/models/volume_type.rb similarity index 51% rename from lib/fog/volume/openstack/v1/models/volume_type.rb rename to lib/fog/openstack/volume/v1/models/volume_type.rb index eb8c57c1a..f30127c52 100644 --- a/lib/fog/volume/openstack/v1/models/volume_type.rb +++ b/lib/fog/openstack/volume/v1/models/volume_type.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume_type' +require 'fog/openstack/volume/models/volume_type' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class VolumeType < Fog::Volume::OpenStack::VolumeType + class VolumeType < Fog::OpenStack::Volume::VolumeType identity :id attribute :name diff --git a/lib/fog/openstack/volume/v1/models/volume_types.rb b/lib/fog/openstack/volume/v1/models/volume_types.rb new file mode 100644 index 000000000..2e336a1e6 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/volume_types.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/volume_type' +require 'fog/openstack/volume/models/volume_types' + +module Fog + module OpenStack + class Volume + class V1 + class VolumeTypes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::VolumeType + include Fog::OpenStack::Volume::VolumeTypes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/volumes.rb b/lib/fog/openstack/volume/v1/models/volumes.rb new file mode 100644 index 000000000..3c66ccdad --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/volumes.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/volume' +require 'fog/openstack/volume/models/volumes' + +module Fog + module OpenStack + class Volume + class V1 + class Volumes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Volume + include Fog::OpenStack::Volume::Volumes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/requests/accept_transfer.rb b/lib/fog/openstack/volume/v1/requests/accept_transfer.rb new file mode 100644 index 000000000..0bdc678ff --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/accept_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/accept_transfer' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/action.rb b/lib/fog/openstack/volume/v1/requests/action.rb new file mode 100644 index 000000000..e49b96818 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/action.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/action' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_backup.rb b/lib/fog/openstack/volume/v1/requests/create_backup.rb new file mode 100644 index 000000000..1135e30ea --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/create_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_backup' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_snapshot.rb b/lib/fog/openstack/volume/v1/requests/create_snapshot.rb similarity index 89% rename from lib/fog/volume/openstack/v1/requests/create_snapshot.rb rename to lib/fog/openstack/volume/v1/requests/create_snapshot.rb index 35cdc9e4e..7cfcfad93 100644 --- a/lib/fog/volume/openstack/v1/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/v1/requests/create_snapshot.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/create_snapshot' +require 'fog/openstack/volume/requests/create_snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real def create_snapshot(volume_id, name, description, force = false) data = { diff --git a/lib/fog/openstack/volume/v1/requests/create_transfer.rb b/lib/fog/openstack/volume/v1/requests/create_transfer.rb new file mode 100644 index 000000000..90f2ebe26 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/create_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_transfer' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_volume.rb b/lib/fog/openstack/volume/v1/requests/create_volume.rb similarity index 91% rename from lib/fog/volume/openstack/v1/requests/create_volume.rb rename to lib/fog/openstack/volume/v1/requests/create_volume.rb index 5c3587379..86c0d2ce1 100644 --- a/lib/fog/volume/openstack/v1/requests/create_volume.rb +++ b/lib/fog/openstack/volume/v1/requests/create_volume.rb @@ -1,8 +1,8 @@ -require 'fog/volume/openstack/requests/create_volume' +require 'fog/openstack/volume/requests/create_volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real def create_volume(name, description, size, options = {}) @@ -17,7 +17,7 @@ def create_volume(name, description, size, options = {}) _create_volume(data, options) end - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/create_volume_type.rb b/lib/fog/openstack/volume/v1/requests/create_volume_type.rb new file mode 100644 index 000000000..b0be257c7 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/create_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_volume_type' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_backup.rb b/lib/fog/openstack/volume/v1/requests/delete_backup.rb new file mode 100644 index 000000000..a801dceaa --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_backup' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_metadata.rb b/lib/fog/openstack/volume/v1/requests/delete_metadata.rb new file mode 100644 index 000000000..924d1c2ed --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb b/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb new file mode 100644 index 000000000..4ed627842 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb new file mode 100644 index 000000000..c2f24ba75 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_transfer.rb b/lib/fog/openstack/volume/v1/requests/delete_transfer.rb new file mode 100644 index 000000000..2394932c4 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_transfer' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_volume.rb b/lib/fog/openstack/volume/v1/requests/delete_volume.rb new file mode 100644 index 000000000..f5dbbe801 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb b/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb new file mode 100644 index 000000000..e14b2e3d7 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume_type' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/extend_volume.rb b/lib/fog/openstack/volume/v1/requests/extend_volume.rb new file mode 100644 index 000000000..1b2bc73ae --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/extend_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/extend_volume' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_backup_details.rb b/lib/fog/openstack/volume/v1/requests/get_backup_details.rb new file mode 100644 index 000000000..d92ca3a94 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_backup_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_backup_details' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota.rb b/lib/fog/openstack/volume/v1/requests/get_quota.rb new file mode 100644 index 000000000..b909d6de5 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb new file mode 100644 index 000000000..406b1542b --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_defaults' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb b/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb new file mode 100644 index 000000000..cde513e68 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_usage' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb similarity index 83% rename from lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb rename to lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb index 6980212e7..6429db1cc 100644 --- a/lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_snapshot_details' +require 'fog/openstack/volume/requests/get_snapshot_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb b/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb new file mode 100644 index 000000000..75b32b293 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_transfer_details' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_volume_details.rb b/lib/fog/openstack/volume/v1/requests/get_volume_details.rb similarity index 86% rename from lib/fog/volume/openstack/v1/requests/get_volume_details.rb rename to lib/fog/openstack/volume/v1/requests/get_volume_details.rb index 78729f963..cf43edf2c 100644 --- a/lib/fog/volume/openstack/v1/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/v1/requests/get_volume_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_volume_details' +require 'fog/openstack/volume/requests/get_volume_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb new file mode 100644 index 000000000..e3c124195 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_volume_type_details' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_backups.rb b/lib/fog/openstack/volume/v1/requests/list_backups.rb new file mode 100644 index 000000000..8db51bc44 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_backups.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb new file mode 100644 index 000000000..c8418b0ee --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups_detailed' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_snapshots.rb b/lib/fog/openstack/volume/v1/requests/list_snapshots.rb new file mode 100644 index 000000000..8fcfee35c --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_snapshots.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb new file mode 100644 index 000000000..df242787d --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots_detailed' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_transfers.rb b/lib/fog/openstack/volume/v1/requests/list_transfers.rb new file mode 100644 index 000000000..2535a2589 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_transfers.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb new file mode 100644 index 000000000..fd94ac7a3 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers_detailed' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_volume_types.rb b/lib/fog/openstack/volume/v1/requests/list_volume_types.rb new file mode 100644 index 000000000..ea52d0e1a --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_volume_types.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_volume_types' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_volumes.rb b/lib/fog/openstack/volume/v1/requests/list_volumes.rb similarity index 91% rename from lib/fog/volume/openstack/v1/requests/list_volumes.rb rename to lib/fog/openstack/volume/v1/requests/list_volumes.rb index 26103e539..805cdd57d 100644 --- a/lib/fog/volume/openstack/v1/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/v1/requests/list_volumes.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes' +require 'fog/openstack/volume/requests/list_volumes' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb similarity index 90% rename from lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb rename to lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb index d762e7c06..12c461552 100644 --- a/lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes_detailed' +require 'fog/openstack/volume/requests/list_volumes_detailed' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/list_zones.rb b/lib/fog/openstack/volume/v1/requests/list_zones.rb new file mode 100644 index 000000000..ec96a724e --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_zones.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_zones' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/real.rb b/lib/fog/openstack/volume/v1/requests/real.rb similarity index 50% rename from lib/fog/volume/openstack/v1/requests/real.rb rename to lib/fog/openstack/volume/v1/requests/real.rb index 2a37b535a..c021f0318 100644 --- a/lib/fog/volume/openstack/v1/requests/real.rb +++ b/lib/fog/openstack/volume/v1/requests/real.rb @@ -1,9 +1,9 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end end end diff --git a/lib/fog/openstack/volume/v1/requests/real_mock.rb b/lib/fog/openstack/volume/v1/requests/real_mock.rb new file mode 100644 index 000000000..8856c5ab5 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/real_mock.rb @@ -0,0 +1,14 @@ +module Fog + module OpenStack + class Volume + class V1 + class Real + include Fog::OpenStack::Volume::Real + end + class Mock + include Fog::OpenStack::Volume::Mock + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/requests/replace_metadata.rb b/lib/fog/openstack/volume/v1/requests/replace_metadata.rb new file mode 100644 index 000000000..f27a16398 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/replace_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/replace_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/restore_backup.rb b/lib/fog/openstack/volume/v1/requests/restore_backup.rb new file mode 100644 index 000000000..f186448f9 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/restore_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/restore_backup' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/set_tenant.rb b/lib/fog/openstack/volume/v1/requests/set_tenant.rb new file mode 100644 index 000000000..19dac303b --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/set_tenant.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/set_tenant' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/update_metadata.rb b/lib/fog/openstack/volume/v1/requests/update_metadata.rb new file mode 100644 index 000000000..c5454974d --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_quota.rb b/lib/fog/openstack/volume/v1/requests/update_quota.rb new file mode 100644 index 000000000..671b65e6a --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_quota' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/update_snapshot.rb b/lib/fog/openstack/volume/v1/requests/update_snapshot.rb new file mode 100644 index 000000000..8a9a231e7 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb new file mode 100644 index 000000000..f98829982 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_volume.rb b/lib/fog/openstack/volume/v1/requests/update_volume.rb new file mode 100644 index 000000000..e57109738 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_volume' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v2.rb b/lib/fog/openstack/volume/v2.rb similarity index 94% rename from lib/fog/volume/openstack/v2.rb rename to lib/fog/openstack/volume/v2.rb index 64a1de788..8aeed1483 100644 --- a/lib/fog/volume/openstack/v2.rb +++ b/lib/fog/openstack/volume/v2.rb @@ -1,17 +1,17 @@ require 'fog/openstack/core' -require 'fog/volume/openstack' +require 'fog/openstack/volume/volume' module Fog - module Volume - class OpenStack - class V2 < Fog::Volume::OpenStack + module OpenStack + class Volume + class V2 < Fog::OpenStack::Volume SUPPORTED_VERSIONS = /v2(\.(0-9))*/ requires :openstack_auth_url recognizes *@@recognizes - model_path 'fog/volume/openstack/v2/models' + model_path 'fog/openstack/volume/v2/models' model :volume collection :volumes @@ -31,7 +31,7 @@ class V2 < Fog::Volume::OpenStack model :backup collection :backups - request_path 'fog/volume/openstack/v2/requests' + request_path 'fog/openstack/volume/v2/requests' # Volume request :list_volumes @@ -151,7 +151,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Volume::OpenStack::NotFound + Fog::OpenStack::Volume::NotFound end def default_endtpoint_type diff --git a/lib/fog/openstack/volume/v2/models/availability_zone.rb b/lib/fog/openstack/volume/v2/models/availability_zone.rb new file mode 100644 index 000000000..c0e4c528d --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/availability_zone.rb @@ -0,0 +1,15 @@ +require 'fog/openstack/volume/models/availability_zone' + +module Fog + module OpenStack + class Volume + class V2 + class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone + identity :zoneName + + attribute :zoneState + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/availability_zones.rb b/lib/fog/openstack/volume/v2/models/availability_zones.rb new file mode 100644 index 000000000..1c028c819 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/availability_zones.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/availability_zone' +require 'fog/openstack/volume/models/availability_zones' + +module Fog + module OpenStack + class Volume + class V2 + class AvailabilityZones < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::AvailabilityZone + include Fog::OpenStack::Volume::AvailabilityZones + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/backup.rb b/lib/fog/openstack/volume/v2/models/backup.rb similarity index 53% rename from lib/fog/volume/openstack/v2/models/backup.rb rename to lib/fog/openstack/volume/v2/models/backup.rb index a3f1fe943..5d9941cb3 100644 --- a/lib/fog/volume/openstack/v2/models/backup.rb +++ b/lib/fog/openstack/volume/v2/models/backup.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/backup' +require 'fog/openstack/volume/models/backup' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Backup < Fog::Volume::OpenStack::Backup + class Backup < Fog::OpenStack::Volume::Backup identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/openstack/volume/v2/models/backups.rb b/lib/fog/openstack/volume/v2/models/backups.rb new file mode 100644 index 000000000..75f53a770 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/backups.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/backup' +require 'fog/openstack/volume/models/backups' + +module Fog + module OpenStack + class Volume + class V2 + class Backups < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Backup + include Fog::OpenStack::Volume::Backups + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/snapshot.rb b/lib/fog/openstack/volume/v2/models/snapshot.rb similarity index 88% rename from lib/fog/volume/openstack/v2/models/snapshot.rb rename to lib/fog/openstack/volume/v2/models/snapshot.rb index 9ed9ff277..4a2a5bcd1 100644 --- a/lib/fog/volume/openstack/v2/models/snapshot.rb +++ b/lib/fog/openstack/volume/v2/models/snapshot.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/snapshot' +require 'fog/openstack/volume/models/snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Snapshot < Fog::Volume::OpenStack::Snapshot + class Snapshot < Fog::OpenStack::Volume::Snapshot identity :id attribute :name diff --git a/lib/fog/openstack/volume/v2/models/snapshots.rb b/lib/fog/openstack/volume/v2/models/snapshots.rb new file mode 100644 index 000000000..653c0bc98 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/snapshots.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/snapshot' +require 'fog/openstack/volume/models/snapshots' + +module Fog + module OpenStack + class Volume + class V2 + class Snapshots < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Snapshot + include Fog::OpenStack::Volume::Snapshots + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/transfer.rb b/lib/fog/openstack/volume/v2/models/transfer.rb similarity index 66% rename from lib/fog/volume/openstack/v2/models/transfer.rb rename to lib/fog/openstack/volume/v2/models/transfer.rb index ba2e5e51f..2739831f5 100644 --- a/lib/fog/volume/openstack/v2/models/transfer.rb +++ b/lib/fog/openstack/volume/v2/models/transfer.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/transfer' +require 'fog/openstack/volume/models/transfer' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Transfer < Fog::Volume::OpenStack::Transfer + class Transfer < Fog::OpenStack::Volume::Transfer identity :id attribute :auth_key, :aliases => 'authKey' diff --git a/lib/fog/openstack/volume/v2/models/transfers.rb b/lib/fog/openstack/volume/v2/models/transfers.rb new file mode 100644 index 000000000..cbee48f5e --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/transfers.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/transfer' +require 'fog/openstack/volume/models/transfers' + +module Fog + module OpenStack + class Volume + class V2 + class Transfers < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Transfer + include Fog::OpenStack::Volume::Transfers + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/volume.rb b/lib/fog/openstack/volume/v2/models/volume.rb similarity index 86% rename from lib/fog/volume/openstack/v2/models/volume.rb rename to lib/fog/openstack/volume/v2/models/volume.rb index edc1464b9..d20c022dc 100644 --- a/lib/fog/volume/openstack/v2/models/volume.rb +++ b/lib/fog/openstack/volume/v2/models/volume.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume' +require 'fog/openstack/volume/models/volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Volume < Fog::Volume::OpenStack::Volume + class Volume < Fog::OpenStack::Volume::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/volume/openstack/v2/models/volume_type.rb b/lib/fog/openstack/volume/v2/models/volume_type.rb similarity index 51% rename from lib/fog/volume/openstack/v2/models/volume_type.rb rename to lib/fog/openstack/volume/v2/models/volume_type.rb index 9df096a7c..13924bd76 100644 --- a/lib/fog/volume/openstack/v2/models/volume_type.rb +++ b/lib/fog/openstack/volume/v2/models/volume_type.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume_type' +require 'fog/openstack/volume/models/volume_type' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class VolumeType < Fog::Volume::OpenStack::VolumeType + class VolumeType < Fog::OpenStack::Volume::VolumeType identity :id attribute :name diff --git a/lib/fog/openstack/volume/v2/models/volume_types.rb b/lib/fog/openstack/volume/v2/models/volume_types.rb new file mode 100644 index 000000000..33e118c1b --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/volume_types.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/volume_type' +require 'fog/openstack/volume/models/volume_types' + +module Fog + module OpenStack + class Volume + class V2 + class VolumeTypes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::VolumeType + include Fog::OpenStack::Volume::VolumeTypes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/volumes.rb b/lib/fog/openstack/volume/v2/models/volumes.rb new file mode 100644 index 000000000..d0a2dfe95 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/volumes.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/volume' +require 'fog/openstack/volume/models/volumes' + +module Fog + module OpenStack + class Volume + class V2 + class Volumes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Volume + include Fog::OpenStack::Volume::Volumes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/requests/accept_transfer.rb b/lib/fog/openstack/volume/v2/requests/accept_transfer.rb new file mode 100644 index 000000000..b0c99657c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/accept_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/accept_transfer' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/action.rb b/lib/fog/openstack/volume/v2/requests/action.rb new file mode 100644 index 000000000..ccc36a89e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/action.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/action' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_backup.rb b/lib/fog/openstack/volume/v2/requests/create_backup.rb new file mode 100644 index 000000000..e2099585b --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/create_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_backup' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_snapshot.rb b/lib/fog/openstack/volume/v2/requests/create_snapshot.rb similarity index 88% rename from lib/fog/volume/openstack/v2/requests/create_snapshot.rb rename to lib/fog/openstack/volume/v2/requests/create_snapshot.rb index 520990376..95fbd0efc 100644 --- a/lib/fog/volume/openstack/v2/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/v2/requests/create_snapshot.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/create_snapshot' +require 'fog/openstack/volume/requests/create_snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real def create_snapshot(volume_id, name, description, force = false) data = { diff --git a/lib/fog/openstack/volume/v2/requests/create_transfer.rb b/lib/fog/openstack/volume/v2/requests/create_transfer.rb new file mode 100644 index 000000000..250ab3f55 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/create_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_transfer' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_volume.rb b/lib/fog/openstack/volume/v2/requests/create_volume.rb similarity index 90% rename from lib/fog/volume/openstack/v2/requests/create_volume.rb rename to lib/fog/openstack/volume/v2/requests/create_volume.rb index 0c0659558..ca5361214 100644 --- a/lib/fog/volume/openstack/v2/requests/create_volume.rb +++ b/lib/fog/openstack/volume/v2/requests/create_volume.rb @@ -1,8 +1,8 @@ -require 'fog/volume/openstack/requests/create_volume' +require 'fog/openstack/volume/requests/create_volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real def create_volume(name, description, size, options = {}) @@ -17,7 +17,7 @@ def create_volume(name, description, size, options = {}) _create_volume(data, options) end - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/create_volume_type.rb b/lib/fog/openstack/volume/v2/requests/create_volume_type.rb new file mode 100644 index 000000000..e5c10b5c8 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/create_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_volume_type' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_backup.rb b/lib/fog/openstack/volume/v2/requests/delete_backup.rb new file mode 100644 index 000000000..bb6ea632c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_backup' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_metadata.rb b/lib/fog/openstack/volume/v2/requests/delete_metadata.rb new file mode 100644 index 000000000..6174c85dc --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb b/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb new file mode 100644 index 000000000..7e55826a9 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb new file mode 100644 index 000000000..a674e33a7 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_transfer.rb b/lib/fog/openstack/volume/v2/requests/delete_transfer.rb new file mode 100644 index 000000000..a743af6bb --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_transfer' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_volume.rb b/lib/fog/openstack/volume/v2/requests/delete_volume.rb new file mode 100644 index 000000000..ace5f64f7 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb b/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb new file mode 100644 index 000000000..4a923106d --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume_type' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/extend_volume.rb b/lib/fog/openstack/volume/v2/requests/extend_volume.rb new file mode 100644 index 000000000..e5b0cec1e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/extend_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/extend_volume' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_backup_details.rb b/lib/fog/openstack/volume/v2/requests/get_backup_details.rb new file mode 100644 index 000000000..b7b580b0b --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_backup_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_backup_details' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota.rb b/lib/fog/openstack/volume/v2/requests/get_quota.rb new file mode 100644 index 000000000..c5bd543de --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb new file mode 100644 index 000000000..fdda9129f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_defaults' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb b/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb new file mode 100644 index 000000000..9487a898e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_usage' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb similarity index 82% rename from lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb rename to lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb index c7c25303a..8594d9ddb 100644 --- a/lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_snapshot_details' +require 'fog/openstack/volume/requests/get_snapshot_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb b/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb new file mode 100644 index 000000000..b4db93b7f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_transfer_details' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_volume_details.rb b/lib/fog/openstack/volume/v2/requests/get_volume_details.rb similarity index 86% rename from lib/fog/volume/openstack/v2/requests/get_volume_details.rb rename to lib/fog/openstack/volume/v2/requests/get_volume_details.rb index f8ca41d7b..b87a61760 100644 --- a/lib/fog/volume/openstack/v2/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/v2/requests/get_volume_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_volume_details' +require 'fog/openstack/volume/requests/get_volume_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb new file mode 100644 index 000000000..500ff567e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_volume_type_details' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_backups.rb b/lib/fog/openstack/volume/v2/requests/list_backups.rb new file mode 100644 index 000000000..9db231553 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_backups.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb new file mode 100644 index 000000000..0350a0033 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups_detailed' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_snapshots.rb b/lib/fog/openstack/volume/v2/requests/list_snapshots.rb new file mode 100644 index 000000000..9fe012b85 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_snapshots.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb new file mode 100644 index 000000000..5fcbf469a --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots_detailed' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_transfers.rb b/lib/fog/openstack/volume/v2/requests/list_transfers.rb new file mode 100644 index 000000000..26681aa7a --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_transfers.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb new file mode 100644 index 000000000..31157701c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers_detailed' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_volume_types.rb b/lib/fog/openstack/volume/v2/requests/list_volume_types.rb new file mode 100644 index 000000000..f67411696 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_volume_types.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_volume_types' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_volumes.rb b/lib/fog/openstack/volume/v2/requests/list_volumes.rb similarity index 91% rename from lib/fog/volume/openstack/v2/requests/list_volumes.rb rename to lib/fog/openstack/volume/v2/requests/list_volumes.rb index 4cbb9b28b..c3e1b9363 100644 --- a/lib/fog/volume/openstack/v2/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/v2/requests/list_volumes.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes' +require 'fog/openstack/volume/requests/list_volumes' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb similarity index 90% rename from lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb rename to lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb index a4c1b76b6..55565c2b7 100644 --- a/lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes_detailed' +require 'fog/openstack/volume/requests/list_volumes_detailed' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/list_zones.rb b/lib/fog/openstack/volume/v2/requests/list_zones.rb new file mode 100644 index 000000000..e07fafc5f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_zones.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_zones' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/real.rb b/lib/fog/openstack/volume/v2/requests/real.rb similarity index 50% rename from lib/fog/volume/openstack/v2/requests/real.rb rename to lib/fog/openstack/volume/v2/requests/real.rb index 174b38887..016ac048b 100644 --- a/lib/fog/volume/openstack/v2/requests/real.rb +++ b/lib/fog/openstack/volume/v2/requests/real.rb @@ -1,9 +1,9 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end end end diff --git a/lib/fog/openstack/volume/v2/requests/real_mock.rb b/lib/fog/openstack/volume/v2/requests/real_mock.rb new file mode 100644 index 000000000..cc2fca322 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/real_mock.rb @@ -0,0 +1,14 @@ +module Fog + module OpenStack + class Volume + class V2 + class Real + include Fog::OpenStack::Volume::Real + end + class Mock + include Fog::OpenStack::Volume::Mock + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/requests/replace_metadata.rb b/lib/fog/openstack/volume/v2/requests/replace_metadata.rb new file mode 100644 index 000000000..ea96993a5 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/replace_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/replace_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/restore_backup.rb b/lib/fog/openstack/volume/v2/requests/restore_backup.rb new file mode 100644 index 000000000..6e5d56df8 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/restore_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/restore_backup' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/set_tenant.rb b/lib/fog/openstack/volume/v2/requests/set_tenant.rb new file mode 100644 index 000000000..9c7ce462c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/set_tenant.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/set_tenant' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/snapshot_action.rb b/lib/fog/openstack/volume/v2/requests/snapshot_action.rb new file mode 100644 index 000000000..34e77445f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/snapshot_action.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/snapshot_action' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_metadata.rb b/lib/fog/openstack/volume/v2/requests/update_metadata.rb new file mode 100644 index 000000000..325ebabd3 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_quota.rb b/lib/fog/openstack/volume/v2/requests/update_quota.rb new file mode 100644 index 000000000..671b65e6a --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_quota' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/update_snapshot.rb b/lib/fog/openstack/volume/v2/requests/update_snapshot.rb new file mode 100644 index 000000000..ca8f66113 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb new file mode 100644 index 000000000..becbf026f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_volume.rb b/lib/fog/openstack/volume/v2/requests/update_volume.rb new file mode 100644 index 000000000..58a077081 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_volume' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_volume_type.rb b/lib/fog/openstack/volume/v2/requests/update_volume_type.rb new file mode 100644 index 000000000..7e696c055 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_volume_type' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack.rb b/lib/fog/openstack/volume/volume.rb similarity index 73% rename from lib/fog/volume/openstack.rb rename to lib/fog/openstack/volume/volume.rb index fbc961d42..6fc49815c 100644 --- a/lib/fog/volume/openstack.rb +++ b/lib/fog/openstack/volume/volume.rb @@ -1,10 +1,10 @@ module Fog - module Volume - class OpenStack < Fog::Service - autoload :V1, 'fog/volume/openstack/v1' - autoload :V2, 'fog/volume/openstack/v2' + module OpenStack + class Volume < Fog::Service + autoload :V1, 'fog/openstack/volume/v1' + autoload :V2, 'fog/openstack/volume/v2' @@recognizes = [:openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -17,12 +17,12 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version] - # Fog::Image::OpenStack.new() will return a Fog::Volume::OpenStack::V2 or a Fog::Volume::OpenStack::V1, + # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Volume::V2 or a Fog::OpenStack::Volume::V1, # choosing the V2 by default, as V1 is deprecated since OpenStack Juno def self.new(args = {}) @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - service = if inspect == 'Fog::Volume::OpenStack' - Fog::Volume::OpenStack::V2.new(args) || Fog::Volume::OpenStack::V1.new(args) + service = if inspect == 'Fog::OpenStack::Volume' + Fog::OpenStack::Volume::V2.new(args) || Fog::OpenStack::Volume::V1.new(args) else super end diff --git a/lib/fog/workflow/openstack/v2.rb b/lib/fog/openstack/workflow/v2.rb similarity index 94% rename from lib/fog/workflow/openstack/v2.rb rename to lib/fog/openstack/workflow/v2.rb index fbd829b87..b2896cd4b 100644 --- a/lib/fog/workflow/openstack/v2.rb +++ b/lib/fog/openstack/workflow/v2.rb @@ -1,8 +1,8 @@ -require 'fog/workflow/openstack' +require 'fog/openstack/workflow/workflow' module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -12,7 +12,7 @@ class V2 < Fog::Service ## REQUESTS # - request_path 'fog/workflow/openstack/v2/requests' + request_path 'fog/openstack/workflow/v2/requests' # Workflow requests request :create_execution @@ -126,7 +126,7 @@ def request(params) rescue Excon::Errors::HTTPStatusError => error raise case error when Excon::Errors::NotFound - Fog::Workflow::OpenStack::NotFound.slurp(error) + Fog::OpenStack::Workflow::NotFound.slurp(error) else error end diff --git a/lib/fog/workflow/openstack/v2/requests/create_action.rb b/lib/fog/openstack/workflow/v2/requests/create_action.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/create_action.rb rename to lib/fog/openstack/workflow/v2/requests/create_action.rb index c122c544e..4ee532b19 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_action(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/create_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/create_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/create_action_execution.rb index b8f650740..baf281247 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_action_execution(action, input = {}, params = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb similarity index 97% rename from lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb rename to lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb index 28f147197..ad2032176 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_cron_trigger(name, diff --git a/lib/fog/workflow/openstack/v2/requests/create_environment.rb b/lib/fog/openstack/workflow/v2/requests/create_environment.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/create_environment.rb rename to lib/fog/openstack/workflow/v2/requests/create_environment.rb index 6a62874b8..ec6b372d3 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_environment(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/create_execution.rb b/lib/fog/openstack/workflow/v2/requests/create_execution.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/create_execution.rb rename to lib/fog/openstack/workflow/v2/requests/create_execution.rb index 3fa4fb7c3..56ac002c8 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_execution(workflow, input = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/create_workbook.rb b/lib/fog/openstack/workflow/v2/requests/create_workbook.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/create_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/create_workbook.rb index ec6fc7169..52a44346f 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_workbook(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/create_workflow.rb b/lib/fog/openstack/workflow/v2/requests/create_workflow.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/create_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/create_workflow.rb index 2717e7990..483ae8de1 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_workflow(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_action.rb b/lib/fog/openstack/workflow/v2/requests/delete_action.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_action.rb rename to lib/fog/openstack/workflow/v2/requests/delete_action.rb index 9ca4b7938..4c4918980 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_action(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb index 7ed4176b6..c4e6e41c4 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_action_execution(id) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb rename to lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb index 4f7a95051..9cf48bc51 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_cron_trigger(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_environment.rb b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_environment.rb rename to lib/fog/openstack/workflow/v2/requests/delete_environment.rb index f7f493fba..21308810f 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_environment(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_execution.rb b/lib/fog/openstack/workflow/v2/requests/delete_execution.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_execution.rb rename to lib/fog/openstack/workflow/v2/requests/delete_execution.rb index 3ef3db279..b43dc71b1 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_execution(id) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_workbook.rb b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/delete_workbook.rb index 29d66e80e..649caea29 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_workbook(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_workflow.rb b/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/delete_workflow.rb index 8553b953b..a2d7a3da8 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_workflow(identifier) diff --git a/lib/fog/workflow/openstack/v2/requests/get_action.rb b/lib/fog/openstack/workflow/v2/requests/get_action.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_action.rb rename to lib/fog/openstack/workflow/v2/requests/get_action.rb index 468cb6fb7..c937c48f7 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_action(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/get_action_execution.rb index e19b118f3..6478d96b4 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_action_execution(execution_id) diff --git a/lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb rename to lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb index ccb3f236f..924362d6d 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_cron_trigger(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_environment.rb b/lib/fog/openstack/workflow/v2/requests/get_environment.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_environment.rb rename to lib/fog/openstack/workflow/v2/requests/get_environment.rb index 977bc684d..5bdad97db 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_environment(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_execution.rb b/lib/fog/openstack/workflow/v2/requests/get_execution.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_execution.rb rename to lib/fog/openstack/workflow/v2/requests/get_execution.rb index 88edc2c98..9c499161f 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_execution(execution_id) diff --git a/lib/fog/workflow/openstack/v2/requests/get_task.rb b/lib/fog/openstack/workflow/v2/requests/get_task.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_task.rb rename to lib/fog/openstack/workflow/v2/requests/get_task.rb index 203530e8b..09c1e4250 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_task.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_task.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_task(id) diff --git a/lib/fog/workflow/openstack/v2/requests/get_workbook.rb b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/get_workbook.rb index 2c9cb6bdc..33597a310 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_workbook(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_workflow.rb b/lib/fog/openstack/workflow/v2/requests/get_workflow.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/get_workflow.rb index efe0b24a7..27ca108a6 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_workflow(identifier) diff --git a/lib/fog/workflow/openstack/v2/requests/list_action_executions.rb b/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_action_executions.rb rename to lib/fog/openstack/workflow/v2/requests/list_action_executions.rb index c3a6b6a22..16b08c121 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_action_executions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_action_executions diff --git a/lib/fog/workflow/openstack/v2/requests/list_actions.rb b/lib/fog/openstack/workflow/v2/requests/list_actions.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/list_actions.rb rename to lib/fog/openstack/workflow/v2/requests/list_actions.rb index cf734cf4f..58dd4b73c 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_actions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_actions.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_actions(params = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb b/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb rename to lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb index 5422ec500..6fce0012b 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_cron_triggers diff --git a/lib/fog/workflow/openstack/v2/requests/list_environments.rb b/lib/fog/openstack/workflow/v2/requests/list_environments.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_environments.rb rename to lib/fog/openstack/workflow/v2/requests/list_environments.rb index 5375dda8e..cefb642dd 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_environments.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_environments.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_environments diff --git a/lib/fog/workflow/openstack/v2/requests/list_executions.rb b/lib/fog/openstack/workflow/v2/requests/list_executions.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_executions.rb rename to lib/fog/openstack/workflow/v2/requests/list_executions.rb index e95cc9210..8fe847e06 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_executions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_executions.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_executions diff --git a/lib/fog/workflow/openstack/v2/requests/list_services.rb b/lib/fog/openstack/workflow/v2/requests/list_services.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_services.rb rename to lib/fog/openstack/workflow/v2/requests/list_services.rb index 9b014921a..bbed40bff 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_services.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_services diff --git a/lib/fog/workflow/openstack/v2/requests/list_tasks.rb b/lib/fog/openstack/workflow/v2/requests/list_tasks.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_tasks.rb rename to lib/fog/openstack/workflow/v2/requests/list_tasks.rb index c0fdae7f4..1bba660a6 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_tasks.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_tasks.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_tasks(workflow_execution_id) diff --git a/lib/fog/workflow/openstack/v2/requests/list_workbooks.rb b/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_workbooks.rb rename to lib/fog/openstack/workflow/v2/requests/list_workbooks.rb index d429852a0..0173cb87b 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_workbooks.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_workbooks diff --git a/lib/fog/workflow/openstack/v2/requests/list_workflows.rb b/lib/fog/openstack/workflow/v2/requests/list_workflows.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/list_workflows.rb rename to lib/fog/openstack/workflow/v2/requests/list_workflows.rb index 397518c58..7fed8b8bb 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_workflows.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_workflows.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_workflows(params = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/rerun_task.rb b/lib/fog/openstack/workflow/v2/requests/rerun_task.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/rerun_task.rb rename to lib/fog/openstack/workflow/v2/requests/rerun_task.rb index a45be6ece..b999a925d 100644 --- a/lib/fog/workflow/openstack/v2/requests/rerun_task.rb +++ b/lib/fog/openstack/workflow/v2/requests/rerun_task.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def rerun_task(task_ex_id) diff --git a/lib/fog/workflow/openstack/v2/requests/update_action.rb b/lib/fog/openstack/workflow/v2/requests/update_action.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/update_action.rb rename to lib/fog/openstack/workflow/v2/requests/update_action.rb index 6b338dfc6..4dfb8c003 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_action(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/update_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/update_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/update_action_execution.rb index fc12c0c71..f8620b015 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_action_execution(id, name, value) diff --git a/lib/fog/workflow/openstack/v2/requests/update_environment.rb b/lib/fog/openstack/workflow/v2/requests/update_environment.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/update_environment.rb rename to lib/fog/openstack/workflow/v2/requests/update_environment.rb index a127ef6e7..e428b1332 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_environment(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/update_execution.rb b/lib/fog/openstack/workflow/v2/requests/update_execution.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/update_execution.rb rename to lib/fog/openstack/workflow/v2/requests/update_execution.rb index ee6635a33..121b9cc10 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_execution(id, name, value) diff --git a/lib/fog/workflow/openstack/v2/requests/update_workbook.rb b/lib/fog/openstack/workflow/v2/requests/update_workbook.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/update_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/update_workbook.rb index 2df428739..46f2abec2 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_workbook(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/update_workflow.rb b/lib/fog/openstack/workflow/v2/requests/update_workflow.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/update_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/update_workflow.rb index f9f916d8b..311fe9f22 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_workflow(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/validate_action.rb b/lib/fog/openstack/workflow/v2/requests/validate_action.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/validate_action.rb rename to lib/fog/openstack/workflow/v2/requests/validate_action.rb index bbf77bb04..81c62717c 100644 --- a/lib/fog/workflow/openstack/v2/requests/validate_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def validate_action(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/validate_workbook.rb b/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/validate_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/validate_workbook.rb index 0f919612c..195997b5b 100644 --- a/lib/fog/workflow/openstack/v2/requests/validate_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def validate_workbook(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/validate_workflow.rb b/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/validate_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/validate_workflow.rb index c190439ba..a4bbd3f43 100644 --- a/lib/fog/workflow/openstack/v2/requests/validate_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def validate_workflow(definition) diff --git a/lib/fog/workflow/openstack.rb b/lib/fog/openstack/workflow/workflow.rb similarity index 50% rename from lib/fog/workflow/openstack.rb rename to lib/fog/openstack/workflow/workflow.rb index 63b241672..23ba033cd 100644 --- a/lib/fog/workflow/openstack.rb +++ b/lib/fog/openstack/workflow/workflow.rb @@ -1,11 +1,13 @@ module Fog - module Workflow - class OpenStack < Fog::Service - # Fog::Workflow::OpenStack.new() will return a Fog::Workflow::OpenStack::V2 + module OpenStack + class Workflow < Fog::Service + autoload :V2, 'fog/openstack/workflow/v2' + + # Fog::OpenStack::Workflow.new() will return a Fog::OpenStack::Workflow::V2 # Will choose the latest available once Mistral V3 is released. def self.new(args = {}) @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - Fog::Workflow::OpenStack::V2.new(args) + Fog::OpenStack::Workflow::V2.new(args) end end end diff --git a/lib/fog/volume/openstack/v1/models/availability_zone.rb b/lib/fog/volume/openstack/v1/models/availability_zone.rb deleted file mode 100644 index 35d6fdb2d..000000000 --- a/lib/fog/volume/openstack/v1/models/availability_zone.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'fog/volume/openstack/models/availability_zone' - -module Fog - module Volume - class OpenStack - class V1 - class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone - identity :zoneName - - attribute :zoneState - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/availability_zones.rb b/lib/fog/volume/openstack/v1/models/availability_zones.rb deleted file mode 100644 index ab449952b..000000000 --- a/lib/fog/volume/openstack/v1/models/availability_zones.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/availability_zone' -require 'fog/volume/openstack/models/availability_zones' - -module Fog - module Volume - class OpenStack - class V1 - class AvailabilityZones < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::AvailabilityZone - include Fog::Volume::OpenStack::AvailabilityZones - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/backups.rb b/lib/fog/volume/openstack/v1/models/backups.rb deleted file mode 100644 index 383fad71d..000000000 --- a/lib/fog/volume/openstack/v1/models/backups.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/backup' -require 'fog/volume/openstack/models/backups' - -module Fog - module Volume - class OpenStack - class V1 - class Backups < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Backup - include Fog::Volume::OpenStack::Backups - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/snapshots.rb b/lib/fog/volume/openstack/v1/models/snapshots.rb deleted file mode 100644 index f12d1a85a..000000000 --- a/lib/fog/volume/openstack/v1/models/snapshots.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/snapshot' -require 'fog/volume/openstack/models/snapshots' - -module Fog - module Volume - class OpenStack - class V1 - class Snapshots < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Snapshot - include Fog::Volume::OpenStack::Snapshots - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/transfers.rb b/lib/fog/volume/openstack/v1/models/transfers.rb deleted file mode 100644 index c35a60914..000000000 --- a/lib/fog/volume/openstack/v1/models/transfers.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/transfer' -require 'fog/volume/openstack/models/transfers' - -module Fog - module Volume - class OpenStack - class V1 - class Transfers < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Transfer - include Fog::Volume::OpenStack::Transfers - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/volume_types.rb b/lib/fog/volume/openstack/v1/models/volume_types.rb deleted file mode 100644 index 803e0c14c..000000000 --- a/lib/fog/volume/openstack/v1/models/volume_types.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/volume_type' -require 'fog/volume/openstack/models/volume_types' - -module Fog - module Volume - class OpenStack - class V1 - class VolumeTypes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::VolumeType - include Fog::Volume::OpenStack::VolumeTypes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/volumes.rb b/lib/fog/volume/openstack/v1/models/volumes.rb deleted file mode 100644 index 11dbb4b16..000000000 --- a/lib/fog/volume/openstack/v1/models/volumes.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/volume' -require 'fog/volume/openstack/models/volumes' - -module Fog - module Volume - class OpenStack - class V1 - class Volumes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Volume - include Fog::Volume::OpenStack::Volumes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/requests/accept_transfer.rb b/lib/fog/volume/openstack/v1/requests/accept_transfer.rb deleted file mode 100644 index 22fb2e28b..000000000 --- a/lib/fog/volume/openstack/v1/requests/accept_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/accept_transfer' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/action.rb b/lib/fog/volume/openstack/v1/requests/action.rb deleted file mode 100644 index 864515140..000000000 --- a/lib/fog/volume/openstack/v1/requests/action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/action' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_backup.rb b/lib/fog/volume/openstack/v1/requests/create_backup.rb deleted file mode 100644 index 87aee6107..000000000 --- a/lib/fog/volume/openstack/v1/requests/create_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_backup' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_transfer.rb b/lib/fog/volume/openstack/v1/requests/create_transfer.rb deleted file mode 100644 index 589a96835..000000000 --- a/lib/fog/volume/openstack/v1/requests/create_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_transfer' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_volume_type.rb b/lib/fog/volume/openstack/v1/requests/create_volume_type.rb deleted file mode 100644 index 39fb7df50..000000000 --- a/lib/fog/volume/openstack/v1/requests/create_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_volume_type' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_backup.rb b/lib/fog/volume/openstack/v1/requests/delete_backup.rb deleted file mode 100644 index 0c931e879..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_backup' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_metadata.rb b/lib/fog/volume/openstack/v1/requests/delete_metadata.rb deleted file mode 100644 index cd60fa7bb..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb b/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb deleted file mode 100644 index 735096720..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb deleted file mode 100644 index 3399004e2..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_transfer.rb b/lib/fog/volume/openstack/v1/requests/delete_transfer.rb deleted file mode 100644 index d10c4f8d2..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_transfer' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_volume.rb b/lib/fog/volume/openstack/v1/requests/delete_volume.rb deleted file mode 100644 index 1b65c11b9..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb b/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb deleted file mode 100644 index 87b41422d..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume_type' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/extend_volume.rb b/lib/fog/volume/openstack/v1/requests/extend_volume.rb deleted file mode 100644 index 40b949a3d..000000000 --- a/lib/fog/volume/openstack/v1/requests/extend_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/extend_volume' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_backup_details.rb b/lib/fog/volume/openstack/v1/requests/get_backup_details.rb deleted file mode 100644 index 42018a151..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_backup_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_backup_details' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota.rb b/lib/fog/volume/openstack/v1/requests/get_quota.rb deleted file mode 100644 index fb32eb165..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb deleted file mode 100644 index a9b4f99b5..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_defaults' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb b/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb deleted file mode 100644 index dc6022759..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_usage' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb b/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb deleted file mode 100644 index f5c6f0087..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_transfer_details' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb deleted file mode 100644 index 7551a0536..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_volume_type_details' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_backups.rb b/lib/fog/volume/openstack/v1/requests/list_backups.rb deleted file mode 100644 index 7b8730232..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_backups.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb deleted file mode 100644 index b2af7b137..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups_detailed' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_snapshots.rb b/lib/fog/volume/openstack/v1/requests/list_snapshots.rb deleted file mode 100644 index 77a90414a..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_snapshots.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb deleted file mode 100644 index 8538c572d..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots_detailed' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_transfers.rb b/lib/fog/volume/openstack/v1/requests/list_transfers.rb deleted file mode 100644 index ad3207161..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_transfers.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb deleted file mode 100644 index efa6efbe5..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers_detailed' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_volume_types.rb b/lib/fog/volume/openstack/v1/requests/list_volume_types.rb deleted file mode 100644 index 293a84e0a..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_volume_types.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_volume_types' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_zones.rb b/lib/fog/volume/openstack/v1/requests/list_zones.rb deleted file mode 100644 index c1140f633..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_zones.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_zones' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/real_mock.rb b/lib/fog/volume/openstack/v1/requests/real_mock.rb deleted file mode 100644 index e98f366ee..000000000 --- a/lib/fog/volume/openstack/v1/requests/real_mock.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Fog - module Volume - class OpenStack - class V1 - class Real - include Fog::Volume::OpenStack::Real - end - class Mock - include Fog::Volume::OpenStack::Mock - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/requests/replace_metadata.rb b/lib/fog/volume/openstack/v1/requests/replace_metadata.rb deleted file mode 100644 index e9f99233d..000000000 --- a/lib/fog/volume/openstack/v1/requests/replace_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/replace_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/restore_backup.rb b/lib/fog/volume/openstack/v1/requests/restore_backup.rb deleted file mode 100644 index 9bf58ae73..000000000 --- a/lib/fog/volume/openstack/v1/requests/restore_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/restore_backup' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/set_tenant.rb b/lib/fog/volume/openstack/v1/requests/set_tenant.rb deleted file mode 100644 index 542a550bb..000000000 --- a/lib/fog/volume/openstack/v1/requests/set_tenant.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/set_tenant' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/update_metadata.rb b/lib/fog/volume/openstack/v1/requests/update_metadata.rb deleted file mode 100644 index d1be8f383..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_quota.rb b/lib/fog/volume/openstack/v1/requests/update_quota.rb deleted file mode 100644 index ea7bdc107..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_quota' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/update_snapshot.rb b/lib/fog/volume/openstack/v1/requests/update_snapshot.rb deleted file mode 100644 index 8465042cf..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb deleted file mode 100644 index 8116b1dfa..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_volume.rb b/lib/fog/volume/openstack/v1/requests/update_volume.rb deleted file mode 100644 index 161bf1c9e..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_volume' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v2/models/availability_zone.rb b/lib/fog/volume/openstack/v2/models/availability_zone.rb deleted file mode 100644 index f7944c65d..000000000 --- a/lib/fog/volume/openstack/v2/models/availability_zone.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'fog/volume/openstack/models/availability_zone' - -module Fog - module Volume - class OpenStack - class V2 - class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone - identity :zoneName - - attribute :zoneState - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/availability_zones.rb b/lib/fog/volume/openstack/v2/models/availability_zones.rb deleted file mode 100644 index c91554740..000000000 --- a/lib/fog/volume/openstack/v2/models/availability_zones.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/availability_zone' -require 'fog/volume/openstack/models/availability_zones' - -module Fog - module Volume - class OpenStack - class V2 - class AvailabilityZones < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::AvailabilityZone - include Fog::Volume::OpenStack::AvailabilityZones - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/backups.rb b/lib/fog/volume/openstack/v2/models/backups.rb deleted file mode 100644 index 3c074ef16..000000000 --- a/lib/fog/volume/openstack/v2/models/backups.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/backup' -require 'fog/volume/openstack/models/backups' - -module Fog - module Volume - class OpenStack - class V2 - class Backups < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Backup - include Fog::Volume::OpenStack::Backups - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/snapshots.rb b/lib/fog/volume/openstack/v2/models/snapshots.rb deleted file mode 100644 index f5eda7fa0..000000000 --- a/lib/fog/volume/openstack/v2/models/snapshots.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/snapshot' -require 'fog/volume/openstack/models/snapshots' - -module Fog - module Volume - class OpenStack - class V2 - class Snapshots < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Snapshot - include Fog::Volume::OpenStack::Snapshots - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/transfers.rb b/lib/fog/volume/openstack/v2/models/transfers.rb deleted file mode 100644 index d12bb6ab7..000000000 --- a/lib/fog/volume/openstack/v2/models/transfers.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/transfer' -require 'fog/volume/openstack/models/transfers' - -module Fog - module Volume - class OpenStack - class V2 - class Transfers < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Transfer - include Fog::Volume::OpenStack::Transfers - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/volume_types.rb b/lib/fog/volume/openstack/v2/models/volume_types.rb deleted file mode 100644 index c9ff191d5..000000000 --- a/lib/fog/volume/openstack/v2/models/volume_types.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/volume_type' -require 'fog/volume/openstack/models/volume_types' - -module Fog - module Volume - class OpenStack - class V2 - class VolumeTypes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::VolumeType - include Fog::Volume::OpenStack::VolumeTypes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/volumes.rb b/lib/fog/volume/openstack/v2/models/volumes.rb deleted file mode 100644 index 6d732e1cd..000000000 --- a/lib/fog/volume/openstack/v2/models/volumes.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/volume' -require 'fog/volume/openstack/models/volumes' - -module Fog - module Volume - class OpenStack - class V2 - class Volumes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Volume - include Fog::Volume::OpenStack::Volumes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/requests/accept_transfer.rb b/lib/fog/volume/openstack/v2/requests/accept_transfer.rb deleted file mode 100644 index 90eeb4064..000000000 --- a/lib/fog/volume/openstack/v2/requests/accept_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/accept_transfer' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/action.rb b/lib/fog/volume/openstack/v2/requests/action.rb deleted file mode 100644 index 22ea9c995..000000000 --- a/lib/fog/volume/openstack/v2/requests/action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/action' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_backup.rb b/lib/fog/volume/openstack/v2/requests/create_backup.rb deleted file mode 100644 index 85e520897..000000000 --- a/lib/fog/volume/openstack/v2/requests/create_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_backup' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_transfer.rb b/lib/fog/volume/openstack/v2/requests/create_transfer.rb deleted file mode 100644 index 421b04770..000000000 --- a/lib/fog/volume/openstack/v2/requests/create_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_transfer' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_volume_type.rb b/lib/fog/volume/openstack/v2/requests/create_volume_type.rb deleted file mode 100644 index b0fed84ec..000000000 --- a/lib/fog/volume/openstack/v2/requests/create_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_volume_type' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_backup.rb b/lib/fog/volume/openstack/v2/requests/delete_backup.rb deleted file mode 100644 index c00284714..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_backup' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_metadata.rb b/lib/fog/volume/openstack/v2/requests/delete_metadata.rb deleted file mode 100644 index a8695156f..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb b/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb deleted file mode 100644 index 2b1ec6b66..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb deleted file mode 100644 index 80580e28b..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_transfer.rb b/lib/fog/volume/openstack/v2/requests/delete_transfer.rb deleted file mode 100644 index b3f443cef..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_transfer' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_volume.rb b/lib/fog/volume/openstack/v2/requests/delete_volume.rb deleted file mode 100644 index 237600d3d..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb b/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb deleted file mode 100644 index 1cc6024ea..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume_type' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/extend_volume.rb b/lib/fog/volume/openstack/v2/requests/extend_volume.rb deleted file mode 100644 index 78b79fdc2..000000000 --- a/lib/fog/volume/openstack/v2/requests/extend_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/extend_volume' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_backup_details.rb b/lib/fog/volume/openstack/v2/requests/get_backup_details.rb deleted file mode 100644 index 8cb7d5516..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_backup_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_backup_details' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota.rb b/lib/fog/volume/openstack/v2/requests/get_quota.rb deleted file mode 100644 index 0dcacd264..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb deleted file mode 100644 index 546ebad52..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_defaults' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb b/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb deleted file mode 100644 index b8aaa7936..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_usage' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb b/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb deleted file mode 100644 index be4f9f0e2..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_transfer_details' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb deleted file mode 100644 index 53f5ac17b..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_volume_type_details' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_backups.rb b/lib/fog/volume/openstack/v2/requests/list_backups.rb deleted file mode 100644 index a6fec7b77..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_backups.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb deleted file mode 100644 index 37bbea076..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups_detailed' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_snapshots.rb b/lib/fog/volume/openstack/v2/requests/list_snapshots.rb deleted file mode 100644 index d089a8cb6..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_snapshots.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb deleted file mode 100644 index 22c43a746..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots_detailed' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_transfers.rb b/lib/fog/volume/openstack/v2/requests/list_transfers.rb deleted file mode 100644 index 1b76af131..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_transfers.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb deleted file mode 100644 index 0ee3cbae8..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers_detailed' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_volume_types.rb b/lib/fog/volume/openstack/v2/requests/list_volume_types.rb deleted file mode 100644 index ebb0daee8..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_volume_types.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_volume_types' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_zones.rb b/lib/fog/volume/openstack/v2/requests/list_zones.rb deleted file mode 100644 index c45a1040d..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_zones.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_zones' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/real_mock.rb b/lib/fog/volume/openstack/v2/requests/real_mock.rb deleted file mode 100644 index 3a0a6e53b..000000000 --- a/lib/fog/volume/openstack/v2/requests/real_mock.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Fog - module Volume - class OpenStack - class V2 - class Real - include Fog::Volume::OpenStack::Real - end - class Mock - include Fog::Volume::OpenStack::Mock - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/requests/replace_metadata.rb b/lib/fog/volume/openstack/v2/requests/replace_metadata.rb deleted file mode 100644 index 7ea4e7678..000000000 --- a/lib/fog/volume/openstack/v2/requests/replace_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/replace_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/restore_backup.rb b/lib/fog/volume/openstack/v2/requests/restore_backup.rb deleted file mode 100644 index 6268f26c1..000000000 --- a/lib/fog/volume/openstack/v2/requests/restore_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/restore_backup' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/set_tenant.rb b/lib/fog/volume/openstack/v2/requests/set_tenant.rb deleted file mode 100644 index c1d386370..000000000 --- a/lib/fog/volume/openstack/v2/requests/set_tenant.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/set_tenant' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/snapshot_action.rb b/lib/fog/volume/openstack/v2/requests/snapshot_action.rb deleted file mode 100644 index 12940e411..000000000 --- a/lib/fog/volume/openstack/v2/requests/snapshot_action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/snapshot_action' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_metadata.rb b/lib/fog/volume/openstack/v2/requests/update_metadata.rb deleted file mode 100644 index ab49b90d5..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_quota.rb b/lib/fog/volume/openstack/v2/requests/update_quota.rb deleted file mode 100644 index ea7bdc107..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_quota' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/update_snapshot.rb b/lib/fog/volume/openstack/v2/requests/update_snapshot.rb deleted file mode 100644 index fcece5db5..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb deleted file mode 100644 index 87f5f9f7a..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_volume.rb b/lib/fog/volume/openstack/v2/requests/update_volume.rb deleted file mode 100644 index 52f5d0902..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_volume' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_volume_type.rb b/lib/fog/volume/openstack/v2/requests/update_volume_type.rb deleted file mode 100644 index 8006cf220..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_volume_type' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/spec/dns_v2_spec.rb b/spec/dns_v2_spec.rb index 2fc9a5645..a7cf05297 100644 --- a/spec/dns_v2_spec.rb +++ b/spec/dns_v2_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::DNS::OpenStack::V2 do +describe Fog::OpenStack::DNS::V2 do spec_data_folder = 'spec/fixtures/openstack/dns_v2' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::DNS::OpenStack # Fog to choose latest available version + :service_class => Fog::OpenStack::DNS # Fog to choose latest available version ) @service = openstack_vcr.service end diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index 6faf12dc5..899a587d4 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Identity::OpenStack::V3 do +describe Fog::OpenStack::Identity::V3 do before :all do @openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/identity_v3', - :service_class => Fog::Identity::OpenStack::V3 + :service_class => Fog::OpenStack::Identity::V3 ) @service = @openstack_vcr.service @os_auth_url = @openstack_vcr.os_auth_url @@ -13,7 +13,7 @@ it 'authenticates with password, userid and domain_id' do VCR.use_cassette('authv3_a') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_domain_id => @openstack_vcr.domain_id, :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, @@ -25,7 +25,7 @@ it 'authenticates with password, username and domain_id' do VCR.use_cassette('authv3_b') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_domain_id => @openstack_vcr.domain_id, :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, @@ -37,7 +37,7 @@ it 'authenticates with password, username and domain_name' do VCR.use_cassette('authv3_c') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_user_domain => @openstack_vcr.domain_name, :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, @@ -55,7 +55,7 @@ unless endpoints_in_region.empty? VCR.use_cassette('idv3_other_region') do - @fog = Fog::Identity::OpenStack::V3.new( + @fog = Fog::OpenStack::Identity::V3.new( :openstack_region => @openstack_vcr.region_other, :openstack_auth_url => @os_auth_url, :openstack_userid => @openstack_vcr.user_id, @@ -68,7 +68,7 @@ it 'get an unscoped token, then reauthenticate with it' do VCR.use_cassette('authv3_unscoped_reauth') do - id_v3 = Fog::Identity::OpenStack::V3.new( + id_v3 = Fog::OpenStack::Identity::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, @@ -81,7 +81,7 @@ :openstack_auth_url => @os_auth_url, :openstack_region => @openstack_vcr.region } - @fog2 = Fog::Identity::OpenStack::V3.new(auth_params) + @fog2 = Fog::OpenStack::Identity::V3.new(auth_params) @fog2.wont_equal nil token = @fog2.credentials[:openstack_auth_token] @@ -91,7 +91,7 @@ it 'authenticates with project scope' do VCR.use_cassette('authv3_project') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, :openstack_api_key => @openstack_vcr.password, @@ -104,7 +104,7 @@ it 'get an unscoped token, then use it to get a scoped token' do VCR.use_cassette('authv3_unscoped') do - id_v3 = Fog::Identity::OpenStack::V3.new( + id_v3 = Fog::OpenStack::Identity::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, @@ -112,7 +112,7 @@ ) # Exchange it for a project-scoped token - auth = Fog::Identity::OpenStack::V3.new( + auth = Fog::OpenStack::Identity::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, :openstack_auth_token => id_v3.credentials[:openstack_auth_token], @@ -127,13 +127,13 @@ validated_token.wont_equal nil id_v3.tokens.check(token) - proc { id_v3.tokens.check('random-token') }.must_raise Fog::Identity::OpenStack::NotFound + proc { id_v3.tokens.check('random-token') }.must_raise Fog::OpenStack::Identity::NotFound end end it "find specific user, lists users" do VCR.use_cassette('idv3_users') do - proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::OpenStack::Identity::NotFound admin_user = @service.users.find_by_name @openstack_vcr.username admin_user.length.must_equal 1 @@ -195,7 +195,7 @@ # Delete the user baz_user.destroy # Check that the deletion worked - proc { @service.users.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.users.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound @service.users.all.select { |user| %w[foobar baz].include? user.name }.length.must_equal 0 @service.users.find_by_name('foobar').length.must_equal 0 @service.users.find_by_name('baz').length.must_equal 0 @@ -258,7 +258,7 @@ # Delete the group baz_group.destroy - proc { @service.groups.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.groups.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound @service.groups.all.select { |group| %w[foobar baz].include? group.name }.length.must_equal 0 end end @@ -296,7 +296,7 @@ @service.tokens.check(token.value) @service.tokens.revoke(token.value) - proc { @service.tokens.check(token.value) }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.tokens.check(token.value) }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -316,7 +316,7 @@ foobar_role = @service.roles.create(:name => 'foobar_role390') foobar_user.grant_role(foobar_role.id) - nonadmin_v3 = Fog::Identity::OpenStack::V3.new( + nonadmin_v3 = Fog::OpenStack::Identity::V3.new( :openstack_domain_id => foobar_user.domain_id, :openstack_api_key => 's3cret!', :openstack_username => 'foobar_385', @@ -324,8 +324,8 @@ :openstack_auth_url => auth_url ) - # Test - check the token validity by using it to create a new Fog::Identity::OpenStack::V3 instance - token_check = Fog::Identity::OpenStack::V3.new( + # Test - check the token validity by using it to create a new Fog::OpenStack::Identity::V3 instance + token_check = Fog::OpenStack::Identity::V3.new( :openstack_auth_token => nonadmin_v3.auth_token, :openstack_region => @openstack_vcr.region, :openstack_auth_url => auth_url @@ -334,7 +334,7 @@ token_check.wont_equal nil proc do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_auth_token => 'blahblahblah', :openstack_region => @openstack_vcr.region, :openstack_auth_url => auth_url @@ -363,7 +363,7 @@ default_domain = @service.domains.find_by_id @openstack_vcr.domain_id default_domain.wont_equal nil - proc { @service.domains.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.domains.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -399,7 +399,7 @@ rescue end # Check that the deletion worked - proc { @service.domains.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.domains.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id %w[foobar baz].each do |domain_name| @service.domains.all(:name => domain_name).length.must_equal 0 end @@ -531,7 +531,7 @@ role_by_id = @service.roles.find_by_id roles_all.first.id role_by_id.wont_equal nil - proc { @service.roles.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.roles.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -555,7 +555,7 @@ baz_role.destroy baz_role = nil # Check that the deletion worked - proc { @service.roles.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.roles.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id %w[foobar23 baz23].each do |role_name| @service.roles.all(:name => role_name).length.must_equal 0 end @@ -582,7 +582,7 @@ project_byid = @service.projects.find_by_id projects_all.first.id project_byid.wont_equal nil - proc { @service.projects.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.projects.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -612,7 +612,7 @@ baz_project.destroy # Check that the deletion worked - proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.projects.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound ['p-foobar46', 'p-baz46'].each do |project_name| @service.projects.all(:name => project_name).length.must_equal 0 end @@ -699,7 +699,7 @@ prj_role ||= @service.roles.all(:name => 'r-project67').first prj_role.destroy if prj_role # Check that the deletion worked - proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.projects.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id ['p-booboo67', 'p-fooboo67', 'p-boo67', 'p-baz67', 'p-foobar67'].each do |project_name| prj = @service.projects.all(:name => project_name).first prj.destroy if prj @@ -812,7 +812,7 @@ some_service = @service.services.find_by_id services_all.first.id some_service.wont_equal nil - proc { @service.services.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.services.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -841,7 +841,7 @@ baz_service.destroy if baz_service # Check that the deletion worked - proc { @service.services.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.services.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id @service.services.all.select { |service| %w[foobar baz].include? service.name }.length.must_equal 0 end end @@ -860,7 +860,7 @@ some_endpoint = @service.endpoints.find_by_id endpoints_all.first.id some_endpoint.wont_equal nil - proc { @service.endpoints.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.endpoints.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -900,7 +900,7 @@ baz_endpoint.destroy # Check that the deletion worked - proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound @service.endpoints.all.select { |endpoint| %w[foobar baz].include? endpoint.name }.length.must_equal 0 end end @@ -914,7 +914,7 @@ credentials_all = @service.os_credentials.all credentials_all.wont_equal nil - proc { @service.os_credentials.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.os_credentials.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -976,7 +976,7 @@ # Check that the deletion worked if credential_id - proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::OpenStack::Identity::NotFound end @service.os_credentials.all.select { |credential| credential.type == 'ec2' }.length.must_equal 0 end @@ -993,7 +993,7 @@ policies_all.wont_equal nil policies_all.length.must_equal 0 - proc { @service.policies.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.policies.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -1026,7 +1026,7 @@ updated_policy.destroy # Check that the deletion worked - proc { @service.policies.find_by_id policy_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.policies.find_by_id policy_id }.must_raise Fog::OpenStack::Identity::NotFound @service.policies.all.select { |policy| policy.type == 'application/json' }.length.must_equal 0 end end diff --git a/spec/image_v1_spec.rb b/spec/image_v1_spec.rb index 8b25b1342..3e6fc6192 100644 --- a/spec/image_v1_spec.rb +++ b/spec/image_v1_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Image::OpenStack do +describe Fog::OpenStack::Image do before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/image_v1', - :service_class => Fog::Image::OpenStack::V1 + :service_class => Fog::OpenStack::Image::V1 ) @service = openstack_vcr.service end diff --git a/spec/image_v2_spec.rb b/spec/image_v2_spec.rb index b957f57a1..f132fbb5e 100644 --- a/spec/image_v2_spec.rb +++ b/spec/image_v2_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Image::OpenStack do +describe Fog::OpenStack::Image do spec_data_folder = 'spec/fixtures/openstack/image_v2' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, - :service_class => Fog::Image::OpenStack # Fog to choose latest available version + :service_class => Fog::OpenStack::Image # Fog to choose latest available version ) @service = openstack_vcr.service end @@ -95,7 +95,7 @@ def cleanup_image(image, image_name = nil, image_id = nil) identifier = "11111111-2222-3333-aaaa-bbbbbbcccce2" begin # Create an image with a specified ID - foobar_image = Fog::Image::OpenStack::V2::Image.new( + foobar_image = Fog::OpenStack::Image::V2::Image.new( :name => 'original_name', :id => identifier, :service => @service, diff --git a/spec/image_v2_upload_spec.rb b/spec/image_v2_upload_spec.rb index 18763a7dd..33d475d52 100644 --- a/spec/image_v2_upload_spec.rb +++ b/spec/image_v2_upload_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Fog::Image::OpenStack do +describe Fog::OpenStack::Image do it "Upload/download image data using chunked IO" do # We only run this against a live system, # because VCR's use of Webmock stops Excon :response_block from working correctly @@ -12,7 +12,7 @@ Excon.defaults[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false' # setup the service object - @service ||= Fog::Image::OpenStack.new( + @service ||= Fog::OpenStack::Image.new( :openstack_auth_url => "#{@os_auth_url}/auth/tokens", :openstack_project_name => ENV.fetch('OS_PROJECT_NAME'), :openstack_username => ENV.fetch('OS_USERNAME'), @@ -65,7 +65,7 @@ if foobar_id proc do @service.images.find_by_id foobar_id - end.must_raise Fog::Image::OpenStack::NotFound + end.must_raise Fog::OpenStack::Image::NotFound end @service.images.all(:name => 'foobar_up2').length.must_equal 0 end diff --git a/spec/monitoring_spec.rb b/spec/monitoring_spec.rb index bf7ee77f8..aa06eca84 100644 --- a/spec/monitoring_spec.rb +++ b/spec/monitoring_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' require_relative './shared_context' -require 'fog/monitoring/openstack/models/metric' +require 'fog/openstack/monitoring/models/metric' require 'time' -describe Fog::Monitoring::OpenStack do +describe Fog::OpenStack::Monitoring do spec_data_folder = 'spec/fixtures/openstack/monitoring' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, - :service_class => Fog::Monitoring::OpenStack + :service_class => Fog::OpenStack::Monitoring ) @service = openstack_vcr.service @timestamp = 146_375_736_714_3 @@ -28,13 +28,13 @@ # create multiple metrics - metric_1 = Fog::Monitoring::OpenStack::Metric.new(:name => 'sample_metric_1', + metric_1 = Fog::OpenStack::Monitoring::Metric.new(:name => 'sample_metric_1', :timestamp => @timestamp, :dimensions => {"key1" => "value1"}, :value => 42, :value_meta => {"meta_key1" => "meta_value1"}) - metric_2 = Fog::Monitoring::OpenStack::Metric.new(:name => 'sample_metric_2', + metric_2 = Fog::OpenStack::Monitoring::Metric.new(:name => 'sample_metric_2', :timestamp => @timestamp, :dimensions => {"key1" => "value1"}, :value => 42, @@ -151,7 +151,7 @@ proc do @service.notification_methods.find_by_id('bogus_id') - end.must_raise Fog::Monitoring::OpenStack::NotFound + end.must_raise Fog::OpenStack::Monitoring::NotFound ensure notification_method.destroy if notification_method end diff --git a/spec/network_spec.rb b/spec/network_spec.rb index 5a8f16888..659e129d1 100644 --- a/spec/network_spec.rb +++ b/spec/network_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Network::OpenStack do +describe Fog::OpenStack::Network do before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Network::OpenStack, + :service_class => Fog::OpenStack::Network, :project_scoped => true ) @service = openstack_vcr.service @@ -13,7 +13,7 @@ openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Identity::OpenStack::V3 + :service_class => Fog::OpenStack::Identity::V3 ) @identity_service = openstack_vcr.service end @@ -81,7 +81,7 @@ @auth_token = @identity_service.credentials[:openstack_auth_token] openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Network::OpenStack, + :service_class => Fog::OpenStack::Network, :project_scoped => true, :token_auth => true, :token => @auth_token diff --git a/spec/shared_context.rb b/spec/shared_context.rb index 06f4d4c12..7de391f74 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -33,7 +33,7 @@ class OpenStackVCR # This method should be called in a "before :all" call to set everything up. # A properly configured instance of the service class (e.g. - # Fog::Volume::OpenStack) is then made available in @service. + # Fog::OpenStack::Volume) is then made available in @service. def initialize(options) # read arguments # must_be_kind_of String @@ -109,7 +109,7 @@ def initialize(options) end # TODO: remove - # if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3') + # if @service_class == Fog::OpenStack::Identity::V3 || @os_auth_url.end_with?('/v3') if @identity_version == 'v3' connection_options = { :openstack_auth_url => @os_auth_url, diff --git a/spec/shared_file_system_spec.rb b/spec/shared_file_system_spec.rb index 1e00fb1fa..7db91ce67 100644 --- a/spec/shared_file_system_spec.rb +++ b/spec/shared_file_system_spec.rb @@ -1,21 +1,21 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::SharedFileSystem::OpenStack do +describe Fog::OpenStack::SharedFileSystem do spec_data_folder = 'spec/fixtures/openstack/shared_file_system' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::SharedFileSystem::OpenStack + :service_class => Fog::OpenStack::SharedFileSystem ) @service = openstack_vcr.service net_openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::Network::OpenStack + :service_class => Fog::OpenStack::Network ) @network_service = net_openstack_vcr.service end diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index c2934aab0..2c3896798 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -2,15 +2,15 @@ require_relative './shared_context' [ - Fog::Volume::OpenStack, - Fog::Volume::OpenStack::V1, - Fog::Volume::OpenStack::V2 + Fog::OpenStack::Volume, + Fog::OpenStack::Volume::V1, + Fog::OpenStack::Volume::V2 ].delete_if { |the_class| ENV['TEST_CLASS'] && ENV['TEST_CLASS'] != the_class.name }.each do |service_class| describe service_class do before :all do - vcr_directory = 'spec/fixtures/openstack/volume' if service_class == Fog::Volume::OpenStack - vcr_directory = 'spec/fixtures/openstack/volume_v1' if service_class == Fog::Volume::OpenStack::V1 - vcr_directory = 'spec/fixtures/openstack/volume_v2' if service_class == Fog::Volume::OpenStack::V2 + vcr_directory = 'spec/fixtures/openstack/volume' if service_class == Fog::OpenStack::Volume + vcr_directory = 'spec/fixtures/openstack/volume_v1' if service_class == Fog::OpenStack::Volume::V1 + vcr_directory = 'spec/fixtures/openstack/volume_v2' if service_class == Fog::OpenStack::Volume::V2 openstack_vcr = OpenStackVCR.new( :vcr_directory => vcr_directory, @@ -28,7 +28,7 @@ end def v2? - @service.kind_of? Fog::Volume::OpenStack::V2::Real + @service.kind_of? Fog::OpenStack::Volume::V2::Real end def setup_test_object(options) @@ -116,7 +116,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume by ID..." if ENV['DEBUG_VERBOSE'] volume = @service.volumes.get(volume_id) - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume volume.id.must_equal volume_id volume.display_name.must_equal volume_name unless v2? @@ -134,7 +134,7 @@ def cleanup_test_object(collection, id) volumes = @service.volumes.all(@name_param => volume_name) volumes.length.must_equal 1 volume = volumes[0] - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume volume.id.must_equal volume_id volume.display_name.must_equal volume_name unless v2? @@ -148,7 +148,7 @@ def cleanup_test_object(collection, id) volumes = @service.volumes.all(@name_param => volume_new_name) volume = volumes.first - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume volume.display_name.must_equal volume_new_name unless v2? volume.name.must_equal volume_new_name if v2? @@ -185,7 +185,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume type by ID..." if ENV['DEBUG_VERBOSE'] type = @service.volume_types.get(type_id) - type.must_be_kind_of Fog::Volume::OpenStack::VolumeType + type.must_be_kind_of Fog::OpenStack::Volume::VolumeType type.id.must_equal type_id type.name.must_equal type_name @@ -193,7 +193,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume type by name..." if ENV['DEBUG_VERBOSE'] type = @service.volume_types.all(type_name).first - type.must_be_kind_of Fog::Volume::OpenStack::VolumeType + type.must_be_kind_of Fog::OpenStack::Volume::VolumeType type.id.must_equal type_id type.name.must_equal type_name end @@ -230,7 +230,7 @@ def cleanup_test_object(collection, id) # check that extending a non-existing volume fails puts "Extending deleted volume should fail..." if ENV['DEBUG_VERBOSE'] - proc { @service.extend_volume(volume.id, volume_size_small) }.must_raise Fog::Volume::OpenStack::NotFound + proc { @service.extend_volume(volume.id, volume_size_small) }.must_raise Fog::OpenStack::Volume::NotFound end end end @@ -259,7 +259,7 @@ def cleanup_test_object(collection, id) puts 'Retrieving transfer by ID...' if ENV['DEBUG_VERBOSE'] transfer = @service.transfers.get(transfer_id) - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name @@ -271,7 +271,7 @@ def cleanup_test_object(collection, id) transfers = @service.transfers.all(:name => transfer_name) transfers.length.must_equal 1 transfer = transfers[0] - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name @@ -292,7 +292,7 @@ def cleanup_test_object(collection, id) other_service.transfers.all(:name => transfer_name).length.must_equal 0 # # check that recipient cannot see the volume before transfer - # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # proc { other_service.volumes.get(volume.id) }.must_raise Fog::OpenStack::Compute::NotFound # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 # The recipient can inexplicably see the volume even before the @@ -302,23 +302,23 @@ def cleanup_test_object(collection, id) # check that accept_transfer fails without valid transfer ID and auth key bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR - proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound + proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::OpenStack::Volume::NotFound proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest # accept transfer puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] transfer = other_service.transfers.accept(transfer.id, auth_key) - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name # check that recipient can see the volume volume = other_service.volumes.get(volume.id) - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume # # check that sender cannot see the volume anymore - # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # proc { @service.volumes.get(volume.id) }.must_raise Fog::OpenStack::Compute::NotFound # @service.volumes.all(@name_param => volume_name).length.must_equal 0 # As noted above, both users seem to be able to see the volume at all times. @@ -373,7 +373,7 @@ def cleanup_test_object(collection, id) # check that transfer cannot be accepted when it has been deleted puts 'Checking that accepting a deleted transfer fails...' if ENV['DEBUG_VERBOSE'] - proc { other_service.transfers.accept(transfer_id, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound + proc { other_service.transfers.accept(transfer_id, auth_key) }.must_raise Fog::OpenStack::Volume::NotFound ensure # cleanup volume cleanup_test_object(@service.volumes, volume.id) if volume @@ -429,7 +429,7 @@ def cleanup_test_object(collection, id) # cleanup volume begin snapshot.destroy if snapshot - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound # Don't care if it doesn't exist end diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index 0bc9d27ca..ebc9dab21 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -105,7 +105,7 @@ :openstack_auth_url => 'http://openstack:35357', :openstack_identity_api_version => 'v2.0' } - identity = Fog::Identity::OpenStack.new(creds) + identity = Fog::OpenStack::Identity.new(creds) identity.validate_token(@token, @tenant_token) identity.validate_token(@token) end @@ -115,7 +115,7 @@ :openstack_auth_url => 'http://openstack:35357', :openstack_identity_api_version => 'v2.0' } - identity = Fog::Identity::OpenStack.new(creds) + identity = Fog::OpenStack::Identity.new(creds) identity.check_token(@token, @tenant_token) identity.check_token(@token) end diff --git a/test/helpers/collection_helper.rb b/test/helpers/collection_helper.rb index 79275134c..85260ad65 100644 --- a/test/helpers/collection_helper.rb +++ b/test/helpers/collection_helper.rb @@ -16,7 +16,7 @@ def collection_tests(collection, params = {}) it "#create(#{params.inspect})" do unless Fog.mocking? - @instance.must_be_kind_of Fog::Network::OpenStack::SecurityGroup + @instance.must_be_kind_of Fog::OpenStack::Network::SecurityGroup end end @@ -27,13 +27,13 @@ def collection_tests(collection, params = {}) it "#all" do unless Fog.mocking? - collection.all.must_be_kind_of Fog::Network::OpenStack::SecurityGroups + collection.all.must_be_kind_of Fog::OpenStack::Network::SecurityGroups end end it "#get(#{@identity})" do unless Fog.mocking? - collection.get(@identity).must_be_kind_of Fog::Network::OpenStack::SecurityGroup + collection.get(@identity).must_be_kind_of Fog::OpenStack::Network::SecurityGroup end end diff --git a/test/helpers/container_infra_helper.rb b/test/helpers/container_infra_helper.rb index d0e19b9bb..69f34717a 100644 --- a/test/helpers/container_infra_helper.rb +++ b/test/helpers/container_infra_helper.rb @@ -4,7 +4,7 @@ def self.container_infra class_variable_get(:@@container_infra) end - class_variable_set(:@@container_infra, Fog::ContainerInfra::OpenStack.new) + class_variable_set(:@@container_infra, Fog::OpenStack::ContainerInfra.new) end end diff --git a/test/helpers/dns_v2_helper.rb b/test/helpers/dns_v2_helper.rb index 2d3c7d664..3ccb8e72b 100644 --- a/test/helpers/dns_v2_helper.rb +++ b/test/helpers/dns_v2_helper.rb @@ -1,5 +1,5 @@ def set_dns_data - @dns = Fog::DNS::OpenStack::V2.new + @dns = Fog::OpenStack::DNS::V2.new @zone = @dns.create_zone('example.org', 'hostmaster@example.org') @zone_id = @zone.body['id'] diff --git a/test/helpers/network_helper.rb b/test/helpers/network_helper.rb index 7d8f40e53..a15cf4eab 100644 --- a/test/helpers/network_helper.rb +++ b/test/helpers/network_helper.rb @@ -4,7 +4,7 @@ def self.network class_variable_get(:@@network) end - class_variable_set(:@@network, Fog::Network[:openstack]) + class_variable_set(:@@network, Fog::OpenStack::Network.new) end end diff --git a/test/helpers/nfv_helper.rb b/test/helpers/nfv_helper.rb index 3c89e3c4d..0f7c66c3a 100644 --- a/test/helpers/nfv_helper.rb +++ b/test/helpers/nfv_helper.rb @@ -1,5 +1,5 @@ def set_nfv_data - @nfv = Fog::NFV::OpenStack.new + @nfv = Fog::OpenStack::NFV.new @vnfd_data = { :attributes => { diff --git a/test/identity_version_tests.rb b/test/identity_version_tests.rb index 417b8a918..413fb144b 100644 --- a/test/identity_version_tests.rb +++ b/test/identity_version_tests.rb @@ -9,7 +9,7 @@ it "v2" do Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::Identity::OpenStack::V2::Real) do + assert(Fog::OpenStack::Identity::V2::Real) do Fog::Identity[:openstack].class end end @@ -17,7 +17,7 @@ it "v3" do Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::Identity::OpenStack::V3::Real) do + assert(Fog::OpenStack::Identity::V3::Real) do Fog::Identity[:openstack].class end end diff --git a/test/models/compute/images_tests.rb b/test/models/compute/images_tests.rb index 58131faa0..81e599882 100644 --- a/test/models/compute/images_tests.rb +++ b/test/models/compute/images_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Compute[:openstack] | images collection" do +describe "Fog::OpenStack::Compute | images collection" do describe "success" do describe "#all" do - let (:fog) { Fog::Compute[:openstack] } + let (:fog) { Fog::OpenStack::Compute.new } it "must be an Array" do fog.images.all.must_be_kind_of Array diff --git a/test/models/compute/security_group_tests.rb b/test/models/compute/security_group_tests.rb index 40d737fef..ca287e30e 100644 --- a/test/models/compute/security_group_tests.rb +++ b/test/models/compute/security_group_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Compute[:openstack] | security_group" do +describe "Fog::OpenStack::Compute | security_group" do describe "success" do - let(:fog) { Fog::Compute[:openstack] } + let(:fog) { Fog::OpenStack::Compute.new } let(:security_group) do fog.security_groups.create( :name => 'my_group', diff --git a/test/models/compute/server_group_tests.rb b/test/models/compute/server_group_tests.rb index d5a13333b..91fbdeb2d 100644 --- a/test/models/compute/server_group_tests.rb +++ b/test/models/compute/server_group_tests.rb @@ -1,16 +1,16 @@ require "test_helper" -describe "Fog::Compute::OpenStack::ServerGroup" do +describe "Fog::OpenStack::Compute::ServerGroup" do describe "validate_server_group_policy" do it "contains only allowed policies" do ['affinity', 'anti-affinity', 'soft-affinity', 'soft-anti-affinity'].each do |policy| - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy(policy).must_equal true + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy(policy).must_equal true end end it "raises an error" do assert_raises ArgumentError do - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy('invalid-policy') + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy('invalid-policy') end end end diff --git a/test/models/compute/server_tests.rb b/test/models/compute/server_tests.rb index 90968657e..841a63685 100644 --- a/test/models/compute/server_tests.rb +++ b/test/models/compute/server_tests.rb @@ -1,7 +1,7 @@ require "test_helper" -describe "Fog::Compute[:openstack] | server" do - let (:compute) { Fog::Compute[:openstack] } +describe "Fog::OpenStack::Compute | server" do + let (:compute) { Fog::OpenStack::Compute.new } describe "success" do it "#floating_ips" do @@ -14,7 +14,7 @@ ) server.save - ip1 = Fog::Network[:openstack].floating_ips.create( + ip1 = Fog::OpenStack::Network.new.floating_ips.create( :floating_network_id => 'f0000000-0000-0000-0000-000000000000', :fixed_ip_address => '192.168.11.3' ) diff --git a/test/models/compute/service_tests.rb b/test/models/compute/service_tests.rb index ec75e1254..d692bdadc 100644 --- a/test/models/compute/service_tests.rb +++ b/test/models/compute/service_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Compute[:openstack] | services" do +describe "Fog::OpenStack::Compute | services" do describe "success" do before do - services = Fog::Compute[:openstack].services.all + services = Fog::OpenStack::Compute.new.services.all @service = services.first end @@ -12,7 +12,7 @@ end it "#get" do - service = Fog::Compute[:openstack].services.get(@service.id) + service = Fog::OpenStack::Compute.new.services.get(@service.id) %w(id binary host).all? do |attr| attr1 = service.send(attr.to_sym) attr2 = @service.send(attr.to_sym) diff --git a/test/models/container_infra/bay_model_tests.rb b/test/models/container_infra/bay_model_tests.rb index b20292b58..a71cf4742 100644 --- a/test/models/container_infra/bay_model_tests.rb +++ b/test/models/container_infra/bay_model_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay model" do +describe "Fog::OpenStack::ContainerInfra | bay model" do describe "success" do before do @instance = container_infra.bay_models.create( diff --git a/test/models/container_infra/bay_tests.rb b/test/models/container_infra/bay_tests.rb index a375b1817..409735be2 100644 --- a/test/models/container_infra/bay_tests.rb +++ b/test/models/container_infra/bay_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay" do +describe "Fog::OpenStack::ContainerInfra | bay" do describe "success" do before do @instance = container_infra.bays.create( diff --git a/test/models/container_infra/certificate_tests.rb b/test/models/container_infra/certificate_tests.rb index c5e4cd742..4457a103e 100644 --- a/test/models/container_infra/certificate_tests.rb +++ b/test/models/container_infra/certificate_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | certificate" do +describe "Fog::OpenStack::ContainerInfra | certificate" do describe "success" do before do @instance = container_infra.certificates.create( diff --git a/test/models/container_infra/cluster_template_tests.rb b/test/models/container_infra/cluster_template_tests.rb index 02ccfdda1..828e3df5f 100644 --- a/test/models/container_infra/cluster_template_tests.rb +++ b/test/models/container_infra/cluster_template_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | cluster template" do +describe "Fog::OpenStack::ContainerInfra | cluster template" do describe "success" do before do @instance = container_infra.cluster_templates.create( diff --git a/test/models/container_infra/cluster_tests.rb b/test/models/container_infra/cluster_tests.rb index a5ed37081..349a92d20 100644 --- a/test/models/container_infra/cluster_tests.rb +++ b/test/models/container_infra/cluster_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | cluster" do +describe "Fog::OpenStack::ContainerInfra | cluster" do describe "success" do before do @instance = container_infra.clusters.create( diff --git a/test/models/identity/ec2_credential_tests.rb b/test/models/identity/ec2_credential_tests.rb index ed661a8a5..09b97863f 100644 --- a/test/models/identity/ec2_credential_tests.rb +++ b/test/models/identity/ec2_credential_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credential" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/ec2_credentials_tests.rb b/test/models/identity/ec2_credentials_tests.rb index 0b32d443e..8f673d020 100644 --- a/test/models/identity/ec2_credentials_tests.rb +++ b/test/models/identity/ec2_credentials_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credentials" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } @@ -47,7 +47,7 @@ unless Fog.mocking? proc do @user.ec2_credentials.find_by_access_key('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -55,7 +55,7 @@ unless Fog.mocking? proc do @user.ec2_credentials.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end end diff --git a/test/models/identity/role_tests.rb b/test/models/identity/role_tests.rb index c39c8671c..b46adf880 100644 --- a/test/models/identity/role_tests.rb +++ b/test/models/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.roles.new( :name => 'Role Name', :user_id => 1, diff --git a/test/models/identity/roles_tests.rb b/test/models/identity/roles_tests.rb index a3da03888..cef09c724 100644 --- a/test/models/identity/roles_tests.rb +++ b/test/models/identity/roles_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | roles" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant = @identity.tenants.create(:name => 'test_user') @user = @identity.users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof') @role = @identity.roles(:user => @user, :tenant => @tenant).create(:name => 'test_role') @@ -17,7 +17,7 @@ describe "success" do it "#all" do - @roles.all.must_be_kind_of Fog::Identity::OpenStack::V2::Roles + @roles.all.must_be_kind_of Fog::OpenStack::Identity::V2::Roles end it "#get" do diff --git a/test/models/identity/tenant_tests.rb b/test/models/identity/tenant_tests.rb index 4d04467e6..a883ea219 100644 --- a/test/models/identity/tenant_tests.rb +++ b/test/models/identity/tenant_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | tenant" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') end describe "success" do diff --git a/test/models/identity/tenants_tests.rb b/test/models/identity/tenants_tests.rb index 572960e37..17f1a3948 100644 --- a/test/models/identity/tenants_tests.rb +++ b/test/models/identity/tenants_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Compute[:openstack] | tenants" do +describe "Fog::OpenStack::Compute | tenants" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.tenants.create(:name => 'test') end @@ -22,7 +22,7 @@ unless Fog.mocking? proc do @identity.tenants.find_by_id('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -30,7 +30,7 @@ unless Fog.mocking? proc do @identity.tenants.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end end diff --git a/test/models/identity/user_tests.rb b/test/models/identity/user_tests.rb index 1d22aac7e..e4774fe7d 100644 --- a/test/models/identity/user_tests.rb +++ b/test/models/identity/user_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | user" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.new( :name => 'User Name', diff --git a/test/models/identity/users_tests.rb b/test/models/identity/users_tests.rb index 125027076..bc1c750c4 100644 --- a/test/models/identity/users_tests.rb +++ b/test/models/identity/users_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | users" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.create( :name => 'foobar', @@ -34,7 +34,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.find_by_id('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -42,7 +42,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.find_by_name('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -50,7 +50,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end end diff --git a/test/models/image/image_tests.rb b/test/models/image/image_tests.rb index ad7cdc6fa..79e61b544 100644 --- a/test/models/image/image_tests.rb +++ b/test/models/image/image_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Image[:openstack] | image" do +describe "Fog::OpenStack::Image | image" do describe "success" do before do - @instance = Fog::Image[:openstack].images.create(:name => 'test image') + @instance = Fog::OpenStack::Image.new.images.create(:name => 'test image') end it "#create" do diff --git a/test/models/image/images_tests.rb b/test/models/image/images_tests.rb index d61e90916..8b5f3eaf0 100644 --- a/test/models/image/images_tests.rb +++ b/test/models/image/images_tests.rb @@ -1,22 +1,22 @@ require "test_helper" -describe "Fog::Image[:openstack] | images" do +describe "Fog::OpenStack::Image | images" do before do - @instance = Fog::Image[:openstack].create_image(:name => "model test image").body + @instance = Fog::OpenStack::Image.new.create_image(:name => "model test image").body end describe "success" do it "#find_by_id" do - image = Fog::Image[:openstack].images.find_by_id(@instance['image']['id']) + image = Fog::OpenStack::Image.new.images.find_by_id(@instance['image']['id']) image.id.must_equal @instance['image']['id'] end it "#get" do - image = Fog::Image[:openstack].images.get(@instance['image']['id']) + image = Fog::OpenStack::Image.new.images.get(@instance['image']['id']) image.id.must_equal @instance['image']['id'] end it "#destroy" do - Fog::Image[:openstack].images.destroy(@instance['image']['id']).must_equal true + Fog::OpenStack::Image.new.images.destroy(@instance['image']['id']).must_equal true end end end diff --git a/test/models/network/floating_ip_tests.rb b/test/models/network/floating_ip_tests.rb index e12bd0a7a..bf0656819 100644 --- a/test/models/network/floating_ip_tests.rb +++ b/test/models/network/floating_ip_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | floating_ip" do +describe "Fog::OpenStack::Network | floating_ip" do describe "success" do let (:instance) do network.floating_ips.create( diff --git a/test/models/network/floating_ips_tests.rb b/test/models/network/floating_ips_tests.rb index c4d08fa8b..ed349ad5b 100644 --- a/test/models/network/floating_ips_tests.rb +++ b/test/models/network/floating_ips_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | floating_ips" do +describe "Fog::OpenStack::Network | floating_ips" do before do @floating_ip = network.floating_ips.create( :floating_network_id => 'f0000000-0000-0000-0000-000000000000' diff --git a/test/models/network/ike_policies_tests.rb b/test/models/network/ike_policies_tests.rb index bff516124..0149ffcc9 100644 --- a/test/models/network/ike_policies_tests.rb +++ b/test/models/network/ike_policies_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ike_policies" do +describe "Fog::OpenStack::Network | ike_policies" do before do @ike_policy = network.ike_policies.create( :name => 'test-ike-policy', diff --git a/test/models/network/ike_policy_tests.rb b/test/models/network/ike_policy_tests.rb index ceeace123..fb82f19f8 100644 --- a/test/models/network/ike_policy_tests.rb +++ b/test/models/network/ike_policy_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ike_policy" do +describe "Fog::OpenStack::Network | ike_policy" do describe "success" do before do @instance = network.ike_policies.create( diff --git a/test/models/network/ipsec_policies_tests.rb b/test/models/network/ipsec_policies_tests.rb index 4c00bcf7f..4a9911406 100644 --- a/test/models/network/ipsec_policies_tests.rb +++ b/test/models/network/ipsec_policies_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_policies" do +describe "Fog::OpenStack::Network | ipsec_policies" do before do params = { :name => 'test-ipsec-policy', diff --git a/test/models/network/ipsec_policy_tests.rb b/test/models/network/ipsec_policy_tests.rb index f9bd4a353..bef9e84f4 100644 --- a/test/models/network/ipsec_policy_tests.rb +++ b/test/models/network/ipsec_policy_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_policy" do +describe "Fog::OpenStack::Network | ipsec_policy" do describe "success" do before do @instance = network.ipsec_policies.create( diff --git a/test/models/network/ipsec_site_connection_tests.rb b/test/models/network/ipsec_site_connection_tests.rb index 79c87f675..025a45160 100644 --- a/test/models/network/ipsec_site_connection_tests.rb +++ b/test/models/network/ipsec_site_connection_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_site_connection" do +describe "Fog::OpenStack::Network | ipsec_site_connection" do describe "success" do before do params = { diff --git a/test/models/network/ipsec_site_connections_tests.rb b/test/models/network/ipsec_site_connections_tests.rb index 8dae7d416..02ff78e44 100644 --- a/test/models/network/ipsec_site_connections_tests.rb +++ b/test/models/network/ipsec_site_connections_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_site_connections" do +describe "Fog::OpenStack::Network | ipsec_site_connections" do before do params = { :name => 'test-ipsec-site-connection', diff --git a/test/models/network/lb_health_monitor_tests.rb b/test/models/network/lb_health_monitor_tests.rb index ae39cc7b4..8aa96723e 100644 --- a/test/models/network/lb_health_monitor_tests.rb +++ b/test/models/network/lb_health_monitor_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_health_monitor" do +describe "Fog::OpenStack::Network | lb_health_monitor" do describe "success" do before do @lb_pool = network.lb_pools.create( diff --git a/test/models/network/lb_health_monitors_tests.rb b/test/models/network/lb_health_monitors_tests.rb index d0a3af737..0546432cf 100644 --- a/test/models/network/lb_health_monitors_tests.rb +++ b/test/models/network/lb_health_monitors_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_health_monitors" do +describe "Fog::OpenStack::Network | lb_health_monitors" do before do @lb_health_monitor = network.lb_health_monitors.create( :type => 'PING', diff --git a/test/models/network/lb_member_tests.rb b/test/models/network/lb_member_tests.rb index d952f8730..69da26787 100644 --- a/test/models/network/lb_member_tests.rb +++ b/test/models/network/lb_member_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_member" do +describe "Fog::OpenStack::Network | lb_member" do describe "success" do before do @instance = network.lb_members.create( diff --git a/test/models/network/lb_members_tests.rb b/test/models/network/lb_members_tests.rb index e47cefa95..c43161936 100644 --- a/test/models/network/lb_members_tests.rb +++ b/test/models/network/lb_members_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_members" do +describe "Fog::OpenStack::Network | lb_members" do before do @lb_member = network.lb_members.create( :pool_id => 'pool_id', diff --git a/test/models/network/lb_pool_tests.rb b/test/models/network/lb_pool_tests.rb index 2c46a6f03..350ee2f4e 100644 --- a/test/models/network/lb_pool_tests.rb +++ b/test/models/network/lb_pool_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_pool" do +describe "Fog::OpenStack::Network | lb_pool" do describe "success" do before do @lb_health_monitor = network.lb_health_monitors.create( diff --git a/test/models/network/lb_pools_tests.rb b/test/models/network/lb_pools_tests.rb index 67ce0e352..9ade42c74 100644 --- a/test/models/network/lb_pools_tests.rb +++ b/test/models/network/lb_pools_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_pools" do +describe "Fog::OpenStack::Network | lb_pools" do before do @lb_pool = network.lb_pools.create( :subnet_id => 'subnet_id', diff --git a/test/models/network/lb_vip_tests.rb b/test/models/network/lb_vip_tests.rb index 9553a9142..37cadd52c 100644 --- a/test/models/network/lb_vip_tests.rb +++ b/test/models/network/lb_vip_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_vip" do +describe "Fog::OpenStack::Network | lb_vip" do describe "success" do before do attributes = { diff --git a/test/models/network/lb_vips_tests.rb b/test/models/network/lb_vips_tests.rb index b428477b0..9adf25765 100644 --- a/test/models/network/lb_vips_tests.rb +++ b/test/models/network/lb_vips_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_vips" do +describe "Fog::OpenStack::Network | lb_vips" do before do @lb_vip = network.lb_vips.create( :subnet_id => 'subnet_id', diff --git a/test/models/network/network_tests.rb b/test/models/network/network_tests.rb index c94ee566f..946bb7635 100644 --- a/test/models/network/network_tests.rb +++ b/test/models/network/network_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | network" do +describe "Fog::OpenStack::Network | network" do describe "success" do before do @instance = network.networks.create( diff --git a/test/models/network/networks_tests.rb b/test/models/network/networks_tests.rb index 6f7970f43..abdb6214e 100644 --- a/test/models/network/networks_tests.rb +++ b/test/models/network/networks_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | networks" do +describe "Fog::OpenStack::Network | networks" do before do @network = network.networks.create( :name => 'net_name', diff --git a/test/models/network/port_tests.rb b/test/models/network/port_tests.rb index c6db13aef..e1f996ad6 100644 --- a/test/models/network/port_tests.rb +++ b/test/models/network/port_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | port" do +describe "Fog::OpenStack::Network | port" do describe "success" do before do @instance = network.ports.create( diff --git a/test/models/network/ports_tests.rb b/test/models/network/ports_tests.rb index 94a93479e..2a7f7eb55 100644 --- a/test/models/network/ports_tests.rb +++ b/test/models/network/ports_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ports" do +describe "Fog::OpenStack::Network | ports" do before do @port = network.ports.create( :name => 'port_name', diff --git a/test/models/network/router_tests.rb b/test/models/network/router_tests.rb index 09f806fdb..a1bf17621 100644 --- a/test/models/network/router_tests.rb +++ b/test/models/network/router_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | router" do +describe "Fog::OpenStack::Network | router" do describe "success" do before do @instance = network.routers.create( diff --git a/test/models/network/routers_tests.rb b/test/models/network/routers_tests.rb index 2e81a8a2c..cbd0cae0b 100644 --- a/test/models/network/routers_tests.rb +++ b/test/models/network/routers_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | routers" do +describe "Fog::OpenStack::Network | routers" do before do @router = network.routers.create( :name => 'router_name', diff --git a/test/models/network/security_group_rule_tests.rb b/test/models/network/security_group_rule_tests.rb index c4894bd80..39dbfaba3 100644 --- a/test/models/network/security_group_rule_tests.rb +++ b/test/models/network/security_group_rule_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/model_helper" -describe "Fog::Network[:openstack] | security_group_rule model" do +describe "Fog::OpenStack::Network | security_group_rule model" do @secgroup = network.security_groups.create(:name => "fogsecgroup") attributes = {:security_group_id => @secgroup.id, :direction => "ingress"} model_tests(network.security_group_rules, attributes) diff --git a/test/models/network/security_group_rules_tests.rb b/test/models/network/security_group_rules_tests.rb index 4c34fb69d..8cb149e64 100644 --- a/test/models/network/security_group_rules_tests.rb +++ b/test/models/network/security_group_rules_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/collection_helper" -describe "Fog::Network[:openstack] | security_group_rules collection" do +describe "Fog::OpenStack::Network | security_group_rules collection" do @secgroup = network.security_groups.create(:name => "my_secgroup") attributes = {:security_group_id => @secgroup.id, :direction => "ingress"} collection_tests(network.security_group_rules, attributes) diff --git a/test/models/network/security_group_tests.rb b/test/models/network/security_group_tests.rb index 25d9b288c..d48319259 100644 --- a/test/models/network/security_group_tests.rb +++ b/test/models/network/security_group_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/model_helper" -describe "Fog::Network[:openstack] | security_group model" do +describe "Fog::OpenStack::Network | security_group model" do model_tests(network.security_groups, :name => "fogsecgroup") describe "success" do diff --git a/test/models/network/security_groups_tests.rb b/test/models/network/security_groups_tests.rb index 4f3cff179..06eda8e40 100644 --- a/test/models/network/security_groups_tests.rb +++ b/test/models/network/security_groups_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/collection_helper" -describe "Fog::Network[:openstack] | security_groups collection" do +describe "Fog::OpenStack::Network | security_groups collection" do @attributes = { :name => "my_secgroup", :description => "my sec group desc" diff --git a/test/models/network/subnet_pools_tests.rb b/test/models/network/subnet_pools_tests.rb index d76f6720c..1aabc0d6b 100644 --- a/test/models/network/subnet_pools_tests.rb +++ b/test/models/network/subnet_pools_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require "helpers/network_helper" -describe 'Fog::Network[:openstack] | subnet_pools' do +describe 'Fog::OpenStack::Network | subnet_pools' do describe 'success' do before do @subnet_pool = network.subnet_pools.create( diff --git a/test/models/network/subnet_tests.rb b/test/models/network/subnet_tests.rb index 64a5b26ea..b4b217332 100644 --- a/test/models/network/subnet_tests.rb +++ b/test/models/network/subnet_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | subnet" do +describe "Fog::OpenStack::Network | subnet" do describe "success" do before do @instance = network.subnets.create( diff --git a/test/models/network/subnets_tests.rb b/test/models/network/subnets_tests.rb index cb7ed4c91..0f92c49e7 100644 --- a/test/models/network/subnets_tests.rb +++ b/test/models/network/subnets_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | subnets" do +describe "Fog::OpenStack::Network | subnets" do describe "success" do before do @subnet = network.subnets.create( diff --git a/test/models/network/vpn_service_tests.rb b/test/models/network/vpn_service_tests.rb index 3c80baf72..af9b7dc3b 100644 --- a/test/models/network/vpn_service_tests.rb +++ b/test/models/network/vpn_service_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | vpn_service" do +describe "Fog::OpenStack::Network | vpn_service" do describe "success" do before do @instance = network.vpn_services.create( diff --git a/test/models/network/vpn_services_tests.rb b/test/models/network/vpn_services_tests.rb index ceeccf9ab..35af8740f 100644 --- a/test/models/network/vpn_services_tests.rb +++ b/test/models/network/vpn_services_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | vpn_services" do +describe "Fog::OpenStack::Network | vpn_services" do before do @vpn_service = network.vpn_services.create( :subnet_id => 'foo', diff --git a/test/models/planning/plan_tests.rb b/test/models/planning/plan_tests.rb index bada3ea61..1a2bcf8a6 100644 --- a/test/models/planning/plan_tests.rb +++ b/test/models/planning/plan_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | plan" do +describe "Fog::OpenStack::Planning | plan" do describe "success" do before do - @planning = Fog::OpenStack[:planning] + @planning = Fog::OpenStack::Planning.new @instance = @planning.plans.first @role = @planning.list_roles.body.first end diff --git a/test/models/planning/plans_tests.rb b/test/models/planning/plans_tests.rb index c87d8f7d9..dba84e72b 100644 --- a/test/models/planning/plans_tests.rb +++ b/test/models/planning/plans_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | plans" do +describe "Fog::OpenStack::Planning | plans" do describe "success" do before do - @planning = Fog::OpenStack[:planning] + @planning = Fog::OpenStack::Planning.new @instance = @planning.plans.all.first end diff --git a/test/models/planning/role_tests.rb b/test/models/planning/role_tests.rb index 8ed226937..1ee5d2600 100644 --- a/test/models/planning/role_tests.rb +++ b/test/models/planning/role_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | plan" do +describe "Fog::OpenStack::Planning | plan" do describe "success" do before do - @instance = Fog::OpenStack[:planning].roles.first - @plan = Fog::OpenStack[:planning].list_plans.body.first + @instance = Fog::OpenStack::Planning.new.roles.first + @plan = Fog::OpenStack::Planning.new.list_plans.body.first end it "#add_role" do diff --git a/test/models/storage/file_tests.rb b/test/models/storage/file_tests.rb index f5c1398c3..48ca223c5 100644 --- a/test/models/storage/file_tests.rb +++ b/test/models/storage/file_tests.rb @@ -29,7 +29,7 @@ def clear_metadata :key => "fogfilestests-#{rand(65536)}" } - @directory = Fog::Storage[:openstack].directories.create(directory_attributes) + @directory = Fog::OpenStack::Storage.new.directories.create(directory_attributes) describe "Fog::OpenStack::Storage | file" do after do diff --git a/test/requests/baremetal/chassis_tests.rb b/test/requests/baremetal/chassis_tests.rb index 43d659074..b858dc3c0 100644 --- a/test/requests/baremetal/chassis_tests.rb +++ b/test/requests/baremetal/chassis_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal chassis requests" do +describe "Fog::OpenStack::Baremetal | Baremetal chassis requests" do describe "success" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @chassis_format = { 'description' => String, diff --git a/test/requests/baremetal/driver_tests.rb b/test/requests/baremetal/driver_tests.rb index 34043581a..6c976b9a8 100644 --- a/test/requests/baremetal/driver_tests.rb +++ b/test/requests/baremetal/driver_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal driver requests" do +describe "Fog::OpenStack::Baremetal | Baremetal driver requests" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @driver_format = { 'hosts' => Array, diff --git a/test/requests/baremetal/node_tests.rb b/test/requests/baremetal/node_tests.rb index a8226efcc..99b61b308 100644 --- a/test/requests/baremetal/node_tests.rb +++ b/test/requests/baremetal/node_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal node requests" do +describe "Fog::OpenStack::Baremetal | Baremetal node requests" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @node_format = { 'instance_uuid' => Fog::Nullable::String, 'maintenance' => Fog::Boolean, diff --git a/test/requests/baremetal/port_tests.rb b/test/requests/baremetal/port_tests.rb index b408d69e2..689b7d046 100644 --- a/test/requests/baremetal/port_tests.rb +++ b/test/requests/baremetal/port_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal port requests" do +describe "Fog::OpenStack::Baremetal | Baremetal port requests" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @port_format = { 'address' => String, @@ -31,13 +31,13 @@ before do node_attributes = {:driver => 'pxe_ipmitool'} - @instance = Fog::Baremetal[:openstack].create_node(node_attributes).body + @instance = Fog::OpenStack::Baremetal.new.create_node(node_attributes).body port_attributes = { :address => '00:c2:08:85:de:ca', :node_uuid => @instance['uuid'] } - @port = Fog::Baremetal[:openstack].create_port(port_attributes).body + @port = Fog::OpenStack::Baremetal.new.create_port(port_attributes).body end it "#create_port" do diff --git a/test/requests/compute/address_tests.rb b/test/requests/compute/address_tests.rb index 39e4983c7..f43656aaf 100644 --- a/test/requests/compute/address_tests.rb +++ b/test/requests/compute/address_tests.rb @@ -7,7 +7,7 @@ # such as "warning: class variable access from toplevel" which pollute the tests # output. The latter has been avoided using class_variable_set/get and class # methods to wrap them. -describe "Fog::Compute[:openstack] | address requests" do +describe "Fog::OpenStack::Compute | address requests" do def self.compute class_variable_get(:@@compute) end @@ -20,7 +20,7 @@ def self.data class_variable_get(:@@data) end - class_variable_set(:@@compute, Fog::Compute[:openstack]) + class_variable_set(:@@compute, Fog::OpenStack::Compute.new) class_variable_set(:@@server_id, compute.create_server("test_server", get_image_ref, diff --git a/test/requests/compute/aggregate_tests.rb b/test/requests/compute/aggregate_tests.rb index a661da6a0..c21ce334a 100644 --- a/test/requests/compute/aggregate_tests.rb +++ b/test/requests/compute/aggregate_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | Compute aggregate requests" do +describe "Fog::OpenStack::Compute | Compute aggregate requests" do before do @aggregate_format = { "availability_zone" => Fog::Nullable::String, @@ -14,7 +14,7 @@ @detailed_aggregate_format = @aggregate_format.merge('hosts' => Array) @metadata_aggregate_format = @aggregate_format.merge("metadata" => Hash) - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @aggregate_body = @compute.create_aggregate('test_aggregate').body @aggregate = @aggregate_body['aggregate'] diff --git a/test/requests/compute/availability_zone_tests.rb b/test/requests/compute/availability_zone_tests.rb index 6a2137ed0..2da624419 100644 --- a/test/requests/compute/availability_zone_tests.rb +++ b/test/requests/compute/availability_zone_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | availability zone requests" do +describe "Fog::OpenStack::Compute | availability zone requests" do before do @flavor_format = { 'zoneName' => String, @@ -11,12 +11,12 @@ describe "success" do it "#list_zones" do - Fog::Compute[:openstack].list_zones.body. + Fog::OpenStack::Compute.new.list_zones.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end it "#list_zones_detailed" do - Fog::Compute[:openstack].list_zones_detailed.body. + Fog::OpenStack::Compute.new.list_zones_detailed.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end end diff --git a/test/requests/compute/flavor_tests.rb b/test/requests/compute/flavor_tests.rb index 171fe10cf..27052fd67 100644 --- a/test/requests/compute/flavor_tests.rb +++ b/test/requests/compute/flavor_tests.rb @@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::Compute[:openstack] | flavor requests" do +describe "Fog::OpenStack::Compute | flavor requests" do before do @flavor_format = { 'id' => String, @@ -18,7 +18,7 @@ 'vcpus' => Integer } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new end describe "success" do @@ -89,14 +89,14 @@ it "#get_flavor_details(0)" do proc do @compute.get_flavor_details("0") - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "add_flavor_access(1234, 1)" do unless Fog.mocking? proc do @compute.add_flavor_access(1234, 1).body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -104,7 +104,7 @@ unless Fog.mocking? proc do @compute.remove_flavor_access(1234, 1).body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -112,7 +112,7 @@ unless Fog.mocking? proc do @compute.list_tenants_with_flavor_access(1234) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -120,7 +120,7 @@ unless Fog.mocking? proc do @compute.get_flavor_metadata("1234").body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -129,7 +129,7 @@ proc do metadata = {:cpu_arch => 'x86_64'} @compute.create_flavor_metadata("1234", metadata).body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end end diff --git a/test/requests/compute/helper.rb b/test/requests/compute/helper.rb index ee4e0d547..d549e69a2 100644 --- a/test/requests/compute/helper.rb +++ b/test/requests/compute/helper.rb @@ -11,15 +11,15 @@ module Formats end def get_flavor_ref - ENV['OPENSTACK_FLAVOR_REF'] || Fog::Compute[:openstack].list_flavors.body['flavors'].first['id'] + ENV['OPENSTACK_FLAVOR_REF'] || Fog::OpenStack::Compute.new.list_flavors.body['flavors'].first['id'] end def get_image_ref - ENV['OPENSTACK_IMAGE_REF'] || Fog::Compute[:openstack].list_images.body['images'].first['id'] + ENV['OPENSTACK_IMAGE_REF'] || Fog::OpenStack::Compute.new.list_images.body['images'].first['id'] end def get_volume_ref - ENV['OPENSTACK_VOLUME_REF'] || Fog::Compute[:openstack].list_volumes.body['volumes'].first['id'] + ENV['OPENSTACK_VOLUME_REF'] || Fog::OpenStack::Compute.new.list_volumes.body['volumes'].first['id'] end def get_flavor_ref_resize @@ -34,5 +34,5 @@ def set_password_enabled def get_security_group_ref ENV['OPENSTACK_SECURITY_GROUP_REF'] || - Fog::Compute[:openstack].list_security_groups.body['security_groups'].first['name'] + Fog::OpenStack::Compute.new.list_security_groups.body['security_groups'].first['name'] end diff --git a/test/requests/compute/image_tests.rb b/test/requests/compute/image_tests.rb index b2d21675f..6577314ca 100644 --- a/test/requests/compute/image_tests.rb +++ b/test/requests/compute/image_tests.rb @@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::Compute[:openstack] | image requests" do +describe "Fog::OpenStack::Compute | image requests" do before do @image_format = { 'created' => Fog::Nullable::String, @@ -18,12 +18,12 @@ 'links' => Array } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new end describe "success" do before do - @image_id = Fog::Compute[:openstack].images[0].id + @image_id = Fog::OpenStack::Compute.new.images[0].id unless Fog.mocking? @compute.images.get(@image_id).wait_for { ready? } end @@ -58,7 +58,7 @@ unless Fog.mocking? proc do @compute.delete_image(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -66,7 +66,7 @@ unless Fog.mocking? proc do @compute.get_image_details(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end end diff --git a/test/requests/compute/keypair_tests.rb b/test/requests/compute/keypair_tests.rb index 3947bc8fe..8f5876eb0 100644 --- a/test/requests/compute/keypair_tests.rb +++ b/test/requests/compute/keypair_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | keypair requests" do +describe "Fog::OpenStack::Compute | keypair requests" do before do @keypair_format = { "public_key" => String, @@ -19,17 +19,17 @@ describe "success" do it "#create_key_pair((key_name, public_key = nil))" do - Fog::Compute[:openstack].create_key_pair('from_shindo_test').body. + Fog::OpenStack::Compute.new.create_key_pair('from_shindo_test').body. must_match_schema("keypair" => @keypair_format) end it "#list_key_pairs" do - Fog::Compute[:openstack].list_key_pairs.body. + Fog::OpenStack::Compute.new.list_key_pairs.body. must_match_schema("keypairs" => [{"keypair" => @keypair_list_format}]) end it "#delete_key_pair(key_name)" do - Fog::Compute[:openstack].delete_key_pair('from_shindo_test').status.must_equal 202 + Fog::OpenStack::Compute.new.delete_key_pair('from_shindo_test').status.must_equal 202 end end end diff --git a/test/requests/compute/limit_tests.rb b/test/requests/compute/limit_tests.rb index 2d90621e3..c827dba8e 100644 --- a/test/requests/compute/limit_tests.rb +++ b/test/requests/compute/limit_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | limits requests" do +describe "Fog::OpenStack::Compute | limits requests" do before do @rate_limit_format = { 'regex' => String, @@ -44,22 +44,22 @@ describe "success" do describe "#get_limits" do it "format" do - Fog::Compute[:openstack].get_limits.body['limits']. + Fog::OpenStack::Compute.new.get_limits.body['limits']. must_match_schema(@limits_format) end it "rate limit format" do - Fog::Compute[:openstack].get_limits.body['limits']['rate']. + Fog::OpenStack::Compute.new.get_limits.body['limits']['rate']. first.must_match_schema(@rate_limit_format) end it "rate limit usage format" do - Fog::Compute[:openstack].get_limits.body['limits']['rate']. + Fog::OpenStack::Compute.new.get_limits.body['limits']['rate']. first['limit'].first.must_match_schema(@rate_limit_usage_format) end it "absolute limits format" do - Fog::Compute[:openstack].get_limits.body['limits']['absolute']. + Fog::OpenStack::Compute.new.get_limits.body['limits']['absolute']. must_match_schema(@absolute_limits_format) end end diff --git a/test/requests/compute/quota_tests.rb b/test/requests/compute/quota_tests.rb index ef0657267..584622010 100644 --- a/test/requests/compute/quota_tests.rb +++ b/test/requests/compute/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Compute[:openstack] | quota requests" do +describe "Fog::OpenStack::Compute | quota requests" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'key_pairs' => Integer, @@ -21,7 +21,7 @@ 'id' => String } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @quota = @compute.get_quota(@tenant_id).body['quota_set'] end diff --git a/test/requests/compute/security_group_tests.rb b/test/requests/compute/security_group_tests.rb index 1767a6dc5..f776fd523 100644 --- a/test/requests/compute/security_group_tests.rb +++ b/test/requests/compute/security_group_tests.rb @@ -22,7 +22,7 @@ "parent_group_id" => Integer } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @security_group = @compute.create_security_group('from_shindo_test', 'this is from the shindo test' ).body diff --git a/test/requests/compute/server_tests.rb b/test/requests/compute/server_tests.rb index 3f57e4515..3d7b30c3f 100644 --- a/test/requests/compute/server_tests.rb +++ b/test/requests/compute/server_tests.rb @@ -2,12 +2,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::Compute[:openstack] | server requests" do +describe "Fog::OpenStack::Compute | server requests" do def self.compute class_variable_get(:@@compute) end - class_variable_set(:@@compute, Fog::Compute[:openstack]) + class_variable_set(:@@compute, Fog::OpenStack::Compute.new) def compute self.class.compute @@ -153,7 +153,7 @@ def compute @data = compute.create_server("test", @image_id, @flavor_id).body['server'] @server_id = @data['id'] compute.servers.get(@server_id).wait_for { ready? } unless Fog.mocking? - # Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } + # Fog::OpenStack::Compute.new.servers.get(@server_id).wait_for { ready? } end it "#create_server('test', #{@image_id}, 19)" do @@ -331,7 +331,7 @@ def compute # DELETE IMAGE it "#delete_image(#{@snapshot_id})" do - Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } + Fog::OpenStack::Compute.new.servers.get(@server_id).wait_for { ready? } assert(compute.delete_image(@snapshot_id)) end end @@ -341,26 +341,26 @@ def compute it "#delete_server(0)" do proc do self.class.compute.delete_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "#get_server_details(0)" do proc do self.class.compute.get_server_details(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')" do proc do self.class.compute.update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver') - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "#reboot_server(0)" do unless Fog.mocking? proc do self.class.compute.reboot_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -368,7 +368,7 @@ def compute unless Fog.mocking? proc do self.class.compute.start_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -376,7 +376,7 @@ def compute unless Fog.mocking? proc do self.class.compute.stop_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end end diff --git a/test/requests/compute/service_tests.rb b/test/requests/compute/service_tests.rb index 5107caa6c..74f1a6063 100644 --- a/test/requests/compute/service_tests.rb +++ b/test/requests/compute/service_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Shindo.tests('Fog::Compute[:openstack] | service requests" do +describe "Shindo.tests('Fog::OpenStack::Compute.new | service requests" do before do @service_format = { "id" => Integer, @@ -12,7 +12,7 @@ "zone" => String, 'disabled_reason' => Fog::Nullable::String } - @services = Fog::Compute[:openstack].list_services.body + @services = Fog::OpenStack::Compute.new.list_services.body @service = @services['services'].last end @@ -22,13 +22,13 @@ end it "#disable_service" do - Fog::Compute[:openstack].disable_service( + Fog::OpenStack::Compute.new.disable_service( @service['host'], @service['binary'] ).body["service"]["status"].must_equal "disabled" end it "#disable_service_log_reason" do - disabled_service = Fog::Compute[:openstack].disable_service_log_reason( + disabled_service = Fog::OpenStack::Compute.new.disable_service_log_reason( @service['host'], @service['binary'], 'reason' ).body disabled_service["service"]["status"].must_equal "disabled" @@ -36,7 +36,7 @@ end it "#enable_service" do - Fog::Compute[:openstack].enable_service( + Fog::OpenStack::Compute.new.enable_service( @service['host'], @service['binary'] ).body["service"]["status"].must_equal "enabled" end diff --git a/test/requests/compute/tenant_tests.rb b/test/requests/compute/tenant_tests.rb index b6804793d..ccc25cc02 100644 --- a/test/requests/compute/tenant_tests.rb +++ b/test/requests/compute/tenant_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | tenant requests" do +describe "Fog::OpenStack::Compute | tenant requests" do before do @tenant_format = { 'id' => String, @@ -12,13 +12,13 @@ describe "success" do it "#list_tenants" do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') identity.list_tenants.body. must_match_schema('tenants_links' => Array, 'tenants' => [@tenant_format]) end it "#set_tenant admin" do - Fog::Compute[:openstack].set_tenant("admin").must_equal true + Fog::OpenStack::Compute.new.set_tenant("admin").must_equal true end end end diff --git a/test/requests/compute/volume_tests.rb b/test/requests/compute/volume_tests.rb index 1237d4878..ec78c1409 100644 --- a/test/requests/compute/volume_tests.rb +++ b/test/requests/compute/volume_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | volume requests" do +describe "Fog::OpenStack::Compute | volume requests" do before do @volume_format = { 'id' => String, @@ -16,7 +16,7 @@ 'metadata' => Hash } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @volume = @compute.create_volume('loud', 'this is a loud volume', 3).body end diff --git a/test/requests/container_infra/bay_model_tests.rb b/test/requests/container_infra/bay_model_tests.rb index 903268315..677c26dff 100644 --- a/test/requests/container_infra/bay_model_tests.rb +++ b/test/requests/container_infra/bay_model_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay model requests" do +describe "Fog::OpenStack::ContainerInfra | bay model requests" do before do @bay_model_format = { "insecure_registry" => Fog::Nullable::String, diff --git a/test/requests/container_infra/bay_tests.rb b/test/requests/container_infra/bay_tests.rb index 83254a9b8..3f0fe6713 100644 --- a/test/requests/container_infra/bay_tests.rb +++ b/test/requests/container_infra/bay_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay requests" do +describe "Fog::OpenStack::ContainerInfra | bay requests" do before do @bay_format = { "status" => String, diff --git a/test/requests/container_infra/certificate_tests.rb b/test/requests/container_infra/certificate_tests.rb index 8dfff9dda..488bb3b5e 100644 --- a/test/requests/container_infra/certificate_tests.rb +++ b/test/requests/container_infra/certificate_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | certificate requests" do +describe "Fog::OpenStack::ContainerInfra | certificate requests" do before do @certificate_format = { "pem" => String, diff --git a/test/requests/container_infra/cluster_template_tests.rb b/test/requests/container_infra/cluster_template_tests.rb index a8f495355..418a580a4 100644 --- a/test/requests/container_infra/cluster_template_tests.rb +++ b/test/requests/container_infra/cluster_template_tests.rb @@ -3,7 +3,7 @@ @cluster_templates = [] -describe "Fog::ContainerInfra[:openstack] | cluster template requests" do +describe "Fog::OpenStack::ContainerInfra | cluster template requests" do before do @cluster_template_format = { "insecure_registry" => Fog::Nullable::String, diff --git a/test/requests/container_infra/cluster_tests.rb b/test/requests/container_infra/cluster_tests.rb index 63812e15d..100a3c08a 100644 --- a/test/requests/container_infra/cluster_tests.rb +++ b/test/requests/container_infra/cluster_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | cluster requests" do +describe "Fog::OpenStack::ContainerInfra | cluster requests" do before do @cluster_format = { "status" => String, diff --git a/test/requests/dns_v1/domain_tests.rb b/test/requests/dns_v1/domain_tests.rb index d714d7ae6..0774c6ccc 100644 --- a/test/requests/dns_v1/domain_tests.rb +++ b/test/requests/dns_v1/domain_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::DNS::OpenStack::V1 | domain requests" do +describe "Fog::OpenStack::DNS::V1 | domain requests" do before do - @dns = Fog::DNS::OpenStack::V1.new + @dns = Fog::OpenStack::DNS::V1.new @domain_format = { "id" => String, diff --git a/test/requests/dns_v1/quota_tests.rb b/test/requests/dns_v1/quota_tests.rb index 674b08323..0733b5383 100644 --- a/test/requests/dns_v1/quota_tests.rb +++ b/test/requests/dns_v1/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::DNS::OpenStack::V1 | quota requests" do +describe "Fog::OpenStack::DNS::V1 | quota requests" do before do - @dns = Fog::DNS::OpenStack::V1.new + @dns = Fog::OpenStack::DNS::V1.new @project_id = Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/dns_v2/pool_tests.rb b/test/requests/dns_v2/pool_tests.rb index 8714f1252..e8a68ed4c 100644 --- a/test/requests/dns_v2/pool_tests.rb +++ b/test/requests/dns_v2/pool_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::DNS::OpenStack::V2 | pool requests" do +describe "Fog::OpenStack::DNS::V2 | pool requests" do before do @dns, = set_dns_data diff --git a/test/requests/dns_v2/quota_tests.rb b/test/requests/dns_v2/quota_tests.rb index 959983d31..aec0065d3 100644 --- a/test/requests/dns_v2/quota_tests.rb +++ b/test/requests/dns_v2/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::DNS::OpenStack::V2 | quota requests" do +describe "Fog::OpenStack::DNS::V2 | quota requests" do before do - @dns = Fog::DNS::OpenStack::V2.new + @dns = Fog::OpenStack::DNS::V2.new @project_id = @dns.respond_to?(:current_tenant) ? @dns.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/dns_v2/recordset_tests.rb b/test/requests/dns_v2/recordset_tests.rb index 9289f69a1..6d1b6295b 100644 --- a/test/requests/dns_v2/recordset_tests.rb +++ b/test/requests/dns_v2/recordset_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::DNS::OpenStack::V2 | recordset requests" do +describe "Fog::OpenStack::DNS::V2 | recordset requests" do before do @dns, @zone, @zone_id = set_dns_data diff --git a/test/requests/dns_v2/zone_tests.rb b/test/requests/dns_v2/zone_tests.rb index 53acbff4e..940777afb 100644 --- a/test/requests/dns_v2/zone_tests.rb +++ b/test/requests/dns_v2/zone_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::DNS::OpenStack::V2 | zone requests" do +describe "Fog::OpenStack::DNS::V2 | zone requests" do before do @dns, @zone, @zone_id = set_dns_data diff --git a/test/requests/event/event_tests.rb b/test/requests/event/event_tests.rb index 6e737213a..f171a334f 100644 --- a/test/requests/event/event_tests.rb +++ b/test/requests/event/event_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Event[:openstack] | event requests" do +describe "Fog::OpenStack::Event | event requests" do before do - @metering = Fog::Event::OpenStack.new + @metering = Fog::OpenStack::Event.new @event_format = { 'message_id' => String, 'event_type' => String diff --git a/test/requests/identity/ec2_credentials_tests.rb b/test/requests/identity/ec2_credentials_tests.rb index 6b627935b..bf1891b54 100644 --- a/test/requests/identity/ec2_credentials_tests.rb +++ b/test/requests/identity/ec2_credentials_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | EC2 credential requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @credential_format = { 'access' => String, diff --git a/test/requests/identity/role_tests.rb b/test/requests/identity/role_tests.rb index 39a433b8d..4ab969af3 100644 --- a/test/requests/identity/role_tests.rb +++ b/test/requests/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @role_format = { 'id' => String, diff --git a/test/requests/identity/tenant_tests.rb b/test/requests/identity/tenant_tests.rb index 8aa2c7cfe..e5158e26c 100644 --- a/test/requests/identity/tenant_tests.rb +++ b/test/requests/identity/tenant_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | tenant requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_format = { 'id' => String, diff --git a/test/requests/identity/user_tests.rb b/test/requests/identity/user_tests.rb index 83ce1054b..cedbce996 100644 --- a/test/requests/identity/user_tests.rb +++ b/test/requests/identity/user_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | user requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @user_format = { 'id' => String, diff --git a/test/requests/image/image_tests.rb b/test/requests/image/image_tests.rb index 2843448b8..7a0fa2815 100644 --- a/test/requests/image/image_tests.rb +++ b/test/requests/image/image_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Image[:openstack] | image requests" do +describe "Fog::OpenStack::Image | image requests" do before(:all) do - openstack = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + openstack = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @image_attributes = { :name => 'new image', @@ -90,7 +90,7 @@ image_attributes[:location] = @test_iso.path end - @instance = Fog::Image[:openstack].create_image(image_attributes).body + @instance = Fog::OpenStack::Image.new.create_image(image_attributes).body end after do @@ -99,11 +99,11 @@ describe "success" do it "#list_public_images" do - Fog::Image[:openstack].list_public_images.body.must_match_schema('images' => [@image_format]) + Fog::OpenStack::Image.new.list_public_images.body.must_match_schema('images' => [@image_format]) end it "#list_public_images_detailed" do - Fog::Image[:openstack].list_public_images_detailed.body. + Fog::OpenStack::Image.new.list_public_images_detailed.body. must_match_schema('images' => [@detailed_image_format]) end @@ -112,12 +112,12 @@ end it "#get_image" do - Fog::Image[:openstack].get_image(@instance['image']['id']).headers. + Fog::OpenStack::Image.new.get_image(@instance['image']['id']).headers. must_match_schema(@image_meta_format) end it "#update_image" do - Fog::Image[:openstack].update_image( + Fog::OpenStack::Image.new.update_image( :id => @instance['image']['id'], :name => 'edit image' ).body['image'].must_match_schema(@detailed_image_format) @@ -125,30 +125,30 @@ it "#add_member_to_image" do [200, 204].must_include( - Fog::Image[:openstack].add_member_to_image( + Fog::OpenStack::Image.new.add_member_to_image( @instance['image']['id'], @instance['image']['owner'] ).status ) end it "#get_image_members" do - [200, 204].must_include(Fog::Image[:openstack].get_image_members(@instance['image']['id']).status) + [200, 204].must_include(Fog::OpenStack::Image.new.get_image_members(@instance['image']['id']).status) end it "#get_shared_images" do - [200, 204].must_include(Fog::Image[:openstack].get_shared_images(@instance['image']['owner']).status) + [200, 204].must_include(Fog::OpenStack::Image.new.get_shared_images(@instance['image']['owner']).status) end it "#remove_member_from_image" do [200, 204].must_include( - Fog::Image[:openstack].remove_member_from_image( + Fog::OpenStack::Image.new.remove_member_from_image( @instance['image']['id'], @instance['image']['owner'] ).status ) end it "#delete_image" do - Fog::Image[:openstack].delete_image(@instance['image']['id']).status.must_equal 200 + Fog::OpenStack::Image.new.delete_image(@instance['image']['id']).status.must_equal 200 end end end diff --git a/test/requests/introspection/introspection_tests.rb b/test/requests/introspection/introspection_tests.rb index 14aaaa403..126b7e70d 100644 --- a/test/requests/introspection/introspection_tests.rb +++ b/test/requests/introspection/introspection_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Introspection::OpenStack | Introspection requests" do +describe "Fog::OpenStack::Introspection | Introspection requests" do before do - @inspector = Fog::Introspection::OpenStack.new + @inspector = Fog::OpenStack::Introspection.new @node_uuid = Fog::UUID.uuid diff --git a/test/requests/introspection/rules_tests.rb b/test/requests/introspection/rules_tests.rb index 0cc4def6b..0835154d8 100644 --- a/test/requests/introspection/rules_tests.rb +++ b/test/requests/introspection/rules_tests.rb @@ -2,7 +2,7 @@ describe "@inspector | Introspection rules requests" do before do - @inspector = Fog::Introspection::OpenStack.new + @inspector = Fog::OpenStack::Introspection.new @rules_id = Fog::UUID.uuid @rules = { 'description' => Fog::Nullable::String, diff --git a/test/requests/metering/event_tests.rb b/test/requests/metering/event_tests.rb index 237c766f9..c07553403 100644 --- a/test/requests/metering/event_tests.rb +++ b/test/requests/metering/event_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metering[:openstack] | event requests" do +describe "Fog::OpenStack::Metering | event requests" do before do - @metering = Fog::Metering[:openstack] + @metering = Fog::OpenStack::Metering.new @event_format = { 'message_id' => String, 'event_type' => String diff --git a/test/requests/metering/meter_tests.rb b/test/requests/metering/meter_tests.rb index 890121dd5..c41ec5763 100644 --- a/test/requests/metering/meter_tests.rb +++ b/test/requests/metering/meter_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metering[:openstack] | meter requests" do +describe "Fog::OpenStack::Metering | meter requests" do before do - @metering = Fog::Metering[:openstack] + @metering = Fog::OpenStack::Metering.new @sample_format = { 'counter_name' => String, diff --git a/test/requests/metering/resource_tests.rb b/test/requests/metering/resource_tests.rb index 0ac533eb8..16b706ba1 100644 --- a/test/requests/metering/resource_tests.rb +++ b/test/requests/metering/resource_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metering[:openstack] | resource requests" do +describe "Fog::OpenStack::Metering | resource requests" do before do - @metering = Fog::Metering[:openstack] + @metering = Fog::OpenStack::Metering.new @resource_format = { 'resource_id' => String, diff --git a/test/requests/metric/metric_test.rb b/test/requests/metric/metric_test.rb index a914a8f94..4918afdd6 100644 --- a/test/requests/metric/metric_test.rb +++ b/test/requests/metric/metric_test.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metric::OpenStack | metric requests" do +describe "Fog::OpenStack::Metric | metric requests" do before do - @metric = Fog::Metric::OpenStack.new + @metric = Fog::OpenStack::Metric.new end describe "success" do diff --git a/test/requests/metric/resource_test.rb b/test/requests/metric/resource_test.rb index 2a0cb9bf1..d6b34f723 100644 --- a/test/requests/metric/resource_test.rb +++ b/test/requests/metric/resource_test.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metric::OpenStack | metric requests" do +describe "Fog::OpenStack::Metric | metric requests" do before do - @metric = Fog::Metric::OpenStack.new + @metric = Fog::OpenStack::Metric.new end describe "success" do diff --git a/test/requests/network/extension_tests.rb b/test/requests/network/extension_tests.rb index 62e3770bd..11fec830e 100644 --- a/test/requests/network/extension_tests.rb +++ b/test/requests/network/extension_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | extension requests" do +describe "Fog::OpenStack::Network | extension requests" do before do @extension_format = { 'id' => String, @@ -28,7 +28,7 @@ it "#get_extension" do proc do network.get_extension(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/ike_policy_tests.rb b/test/requests/network/ike_policy_tests.rb index f328a04c5..e76b67732 100644 --- a/test/requests/network/ike_policy_tests.rb +++ b/test/requests/network/ike_policy_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | ike_policy requests" do +describe "Fog::OpenStack::Network | ike_policy requests" do describe "success" do before do @ike_policy_format = { @@ -74,19 +74,19 @@ it "#get_ike_policy" do proc do network.get_ike_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_ike_policy" do proc do network.update_ike_policy(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_ike_policy" do proc do network.delete_ike_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/ipsec_policy_tests.rb b/test/requests/network/ipsec_policy_tests.rb index 8adb769e5..f3c1d3873 100644 --- a/test/requests/network/ipsec_policy_tests.rb +++ b/test/requests/network/ipsec_policy_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Network[:openstack] | ipsec_policy requests" do +describe "Fog::OpenStack::Network | ipsec_policy requests" do before do @ipsec_policy_format = { 'id' => String, @@ -76,19 +76,19 @@ it "#get_ipsec_policy" do proc do network.get_ipsec_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_ipsec_policy" do proc do network.update_ipsec_policy(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_ipsec_policy" do proc do network.delete_ipsec_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/ipsec_site_connection_tests.rb b/test/requests/network/ipsec_site_connection_tests.rb index d39abdd8a..0912b07cc 100644 --- a/test/requests/network/ipsec_site_connection_tests.rb +++ b/test/requests/network/ipsec_site_connection_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | ipsec_site_connection requests" do +describe "Fog::OpenStack::Network | ipsec_site_connection requests" do before do @ipsec_site_connection_format = { 'id' => String, @@ -100,19 +100,19 @@ it "#get_ipsec_site_connection" do proc do network.get_ipsec_site_connection(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_ipsec_site_connection" do proc do network.update_ipsec_site_connection(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_ipsec_site_connection" do proc do network.delete_ipsec_site_connection(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_health_monitor_tests.rb b/test/requests/network/lb_health_monitor_tests.rb index 9d18c48a7..a0dc44547 100644 --- a/test/requests/network/lb_health_monitor_tests.rb +++ b/test/requests/network/lb_health_monitor_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_health_monitor requests" do +describe "Fog::OpenStack::Network | lb_health_monitor requests" do before do @lb_health_monitor_format = { 'id' => String, @@ -98,31 +98,31 @@ it "#get_lb_health_monitor" do proc do network.get_lb_health_monitor(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_health_monitor" do proc do network.update_lb_health_monitor(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#associate_lb_health_monitor" do proc do network.associate_lb_health_monitor(0, 0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#disassociate_lb_health_monitor" do proc do network.disassociate_lb_health_monitor(0, 0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_health_monitor" do proc do network.delete_lb_health_monitor(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_member_tests.rb b/test/requests/network/lb_member_tests.rb index 4d8dfd8ae..eb734bfb9 100644 --- a/test/requests/network/lb_member_tests.rb +++ b/test/requests/network/lb_member_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_member requests" do +describe "Fog::OpenStack::Network | lb_member requests" do describe "success" do before do @lb_member_format = { @@ -63,19 +63,19 @@ it "#get_lb_member" do proc do network.get_lb_member(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_member" do proc do network.update_lb_member(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_member" do proc do network.delete_lb_member(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_pool_tests.rb b/test/requests/network/lb_pool_tests.rb index baa0065b6..4a56292a6 100644 --- a/test/requests/network/lb_pool_tests.rb +++ b/test/requests/network/lb_pool_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_pool requests" do +describe "Fog::OpenStack::Network | lb_pool requests" do before do @lb_pool_format = { 'id' => String, @@ -86,19 +86,19 @@ it "#get_lb_pool" do proc do network.get_lb_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_pool" do proc do network.update_lb_pool(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_pool" do proc do network.delete_lb_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_vip_tests.rb b/test/requests/network/lb_vip_tests.rb index 3926c4fe5..e92bc2e15 100644 --- a/test/requests/network/lb_vip_tests.rb +++ b/test/requests/network/lb_vip_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_vip requests" do +describe "Fog::OpenStack::Network | lb_vip requests" do describe "success" do before do @lb_vip_format = { @@ -74,19 +74,19 @@ it "#get_lb_vip" do proc do network.get_lb_vip(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_vip" do proc do network.update_lb_vip(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_vip" do proc do network.delete_lb_vip(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/network_tests.rb b/test/requests/network/network_tests.rb index dc486084a..57bdeab8b 100644 --- a/test/requests/network/network_tests.rb +++ b/test/requests/network/network_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/network_helper.rb' -describe "Fog::Network[:openstack] | network requests" do +describe "Fog::OpenStack::Network | network requests" do describe "success" do let(:network_format) do { @@ -124,19 +124,19 @@ it "#get_network" do proc do network.get_network(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_network" do proc do network.update_network(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_network" do proc do network.delete_network(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end diff --git a/test/requests/network/port_tests.rb b/test/requests/network/port_tests.rb index 76a75f69c..8caf37014 100644 --- a/test/requests/network/port_tests.rb +++ b/test/requests/network/port_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | port requests" do +describe "Fog::OpenStack::Network | port requests" do before do @port_format = { 'id' => String, @@ -75,19 +75,19 @@ it "#get_port" do proc do network.get_port(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_port" do proc do network.update_port(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_port" do proc do network.delete_port(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/quota_tests.rb b/test/requests/network/quota_tests.rb index 9c74e578d..e5d06c2cc 100644 --- a/test/requests/network/quota_tests.rb +++ b/test/requests/network/quota_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::Network[:openstack] | quota requests" do +describe "Fog::OpenStack::Network | quota requests" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_format = { 'subnet' => Fog::Nullable::Integer, diff --git a/test/requests/network/router_tests.rb b/test/requests/network/router_tests.rb index d50538a4a..6b10de227 100644 --- a/test/requests/network/router_tests.rb +++ b/test/requests/network/router_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | router requests" do +describe "Fog::OpenStack::Network | router requests" do before do @router_format = { :id => String, @@ -69,19 +69,19 @@ it "#get_router" do proc do network.get_router(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_router" do proc do network.update_router(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_router" do proc do network.delete_router(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/security_group_rule_tests.rb b/test/requests/network/security_group_rule_tests.rb index 3bb12f1d4..f8083255b 100644 --- a/test/requests/network/security_group_rule_tests.rb +++ b/test/requests/network/security_group_rule_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | security_grouprule requests" do +describe "Fog::OpenStack::Network | security_grouprule requests" do before do @security_group_rule_format = { "id" => String, @@ -59,13 +59,13 @@ it "#get_security_group_rule(0)" do proc do network.get_security_group_rule(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_security_group_rule(0)" do proc do network.delete_security_group_rule(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/security_group_tests.rb b/test/requests/network/security_group_tests.rb index 73e51b5de..6622e4fed 100644 --- a/test/requests/network/security_group_tests.rb +++ b/test/requests/network/security_group_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/network_helper' -describe "Fog::Network[:openstack] | security_group requests" do +describe "Fog::OpenStack::Network | security_group requests" do before do @security_group_format = { "id" => String, @@ -54,13 +54,13 @@ it "#get_security_group(0)" do proc do network.get_security_group(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_security_group(0)" do proc do network.delete_security_group(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/subnet_pool_tests.rb b/test/requests/network/subnet_pool_tests.rb index 72d11f828..50005886f 100644 --- a/test/requests/network/subnet_pool_tests.rb +++ b/test/requests/network/subnet_pool_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | subnet_pool requests" do +describe "Fog::OpenStack::Network | subnet_pool requests" do before do @subnet_pool_format = { 'id' => String, @@ -59,19 +59,19 @@ it "#get_subnet_pool" do proc do network.get_subnet_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_subnet_pool" do proc do network.update_subnet_pool(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_subnet_pool" do proc do network.delete_subnet_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/subnet_tests.rb b/test/requests/network/subnet_tests.rb index 6463a0435..e18338382 100644 --- a/test/requests/network/subnet_tests.rb +++ b/test/requests/network/subnet_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | subnet requests" do +describe "Fog::OpenStack::Network | subnet requests" do before do @subnet_format = { 'id' => String, @@ -70,19 +70,19 @@ it "#get_subnet" do proc do network.get_subnet(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_subnet" do proc do network.update_subnet(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_subnet" do proc do network.delete_subnet(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/vpn_service_tests.rb b/test/requests/network/vpn_service_tests.rb index 52113ef4c..1145a03f6 100644 --- a/test/requests/network/vpn_service_tests.rb +++ b/test/requests/network/vpn_service_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | vpn_service requests" do +describe "Fog::OpenStack::Network | vpn_service requests" do before do @vpn_service_format = { 'id' => String, @@ -68,19 +68,19 @@ it "#get_vpn_service" do proc do network.get_vpn_service(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_pool" do proc do network.update_lb_pool(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_vpn_service" do proc do network.delete_vpn_service(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/orchestration/stack_files_util_helper_tests.rb b/test/requests/orchestration/stack_files_util_helper_tests.rb index c520ec20e..1ade003a6 100644 --- a/test/requests/orchestration/stack_files_util_helper_tests.rb +++ b/test/requests/orchestration/stack_files_util_helper_tests.rb @@ -2,7 +2,7 @@ require "yaml" require "open-uri" -describe "Fog::Orchestration[:openstack] | stack requests" do +describe "Fog::OpenStack::Orchestration | stack requests" do @create_format_files = { 'id' => String, 'links' => Array, @@ -15,8 +15,8 @@ @data = YAML.load_file("stack_files_util_tests.yaml") @template_yaml = YAML.load_file("template.yaml") @local_yaml = YAML.load_file("local.yaml") - @orchestration = Fog::Orchestration[:openstack] - @file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + @orchestration = Fog::OpenStack::Orchestration.new + @file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) end after do Dir.chdir(@oldcwd) diff --git a/test/requests/orchestration/stack_files_util_tests.rb b/test/requests/orchestration/stack_files_util_tests.rb index ca727e704..fad89d19d 100644 --- a/test/requests/orchestration/stack_files_util_tests.rb +++ b/test/requests/orchestration/stack_files_util_tests.rb @@ -6,7 +6,7 @@ def travis? File.exist?('/home/travis/build/fog/fog-openstack') end -describe "Fog::Orchestration[:openstack] | stack requests" do +describe "Fog::OpenStack::Orchestration | stack requests" do @create_format_files = { 'id' => String, 'links' => Array, @@ -19,8 +19,8 @@ def travis? @data = YAML.load_file("stack_files_util_tests.yaml") @template_yaml = YAML.load_file("template.yaml") @local_yaml = YAML.load_file("local.yaml") - @orchestration = Fog::Orchestration[:openstack] - @file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + @orchestration = Fog::OpenStack::Orchestration.new + @file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) end after do Dir.chdir(@oldcwd) @@ -36,7 +36,7 @@ def travis? [{"get_file" => "foo.sh", "b" => "values"}, {'foo.sh'=>'# Just a mock'}], ] test_cases.each do |data, expected| - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) file_resolver.send(:get_file_contents, data, nil) assert_equal(file_resolver.files, expected) end @@ -53,7 +53,7 @@ def travis? test_cases.each do |data, expected| Fog::Logger.warning("Testing with #{data} #{expected}") expected = prefix_with_url(expected, @base_url) - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) file_resolver.send(:get_file_contents, data, @base_url) assert_equal(file_resolver.files.keys, expected) end @@ -65,7 +65,7 @@ def travis? end.compact test_cases.each do |data, _| assert_raises ArgumentError, URI::InvalidURIError do - Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) end end end @@ -76,7 +76,7 @@ def travis? [testcase['input'], testcase['expected']] end.compact test_cases.each do |data, expected| - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) assert_equal_set(file_resolver.files.keys, expected) end end @@ -90,13 +90,13 @@ def travis? test_cases.push([@local_yaml, ["local.yaml", "hot_1.yaml"]]) test_cases.each do |data, expected| expected = prefix_with_url(expected, @base_url) - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) assert_equal_set(file_resolver.files.keys, expected) end end it "#dont_modify_passed_template" do - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(@local_yaml) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(@local_yaml) template = file_resolver.template # The template argument should be modified. diff --git a/test/requests/orchestration/stack_tests.rb b/test/requests/orchestration/stack_tests.rb index ad6862667..4becd492d 100644 --- a/test/requests/orchestration/stack_tests.rb +++ b/test/requests/orchestration/stack_tests.rb @@ -1,15 +1,15 @@ require "test_helper" require 'fog/core' -describe "Fog::Orchestration[:openstack] | stack requests" do +describe "Fog::OpenStack::Orchestration | stack requests" do before do @oldcwd = Dir.pwd Dir.chdir("test/requests/orchestration") @base_url = "file://" + File.absolute_path(".") - @orchestration = Fog::Orchestration[:openstack] + @orchestration = Fog::OpenStack::Orchestration.new - @stack_mock = Fog::Orchestration::OpenStack::Stack.new( + @stack_mock = Fog::OpenStack::Orchestration::Stack.new( :template_name => "stack_mock", :id => "stack_id" ) diff --git a/test/requests/planning/plan_tests.rb b/test/requests/planning/plan_tests.rb index 83c987834..602ab706c 100644 --- a/test/requests/planning/plan_tests.rb +++ b/test/requests/planning/plan_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | Planning plan requests" do +describe "Fog::OpenStack::Planning | Planning plan requests" do before do @plan_format = { "created_at" => Fog::Nullable::String, @@ -14,9 +14,9 @@ } @plan_templates_format = Hash - @plans = Fog::OpenStack[:planning].list_plans.body + @plans = Fog::OpenStack::Planning.new.list_plans.body @instance = @plans.first - @role_instance = Fog::OpenStack[:planning].list_roles.body.first + @role_instance = Fog::OpenStack::Planning.new.list_roles.body.first end describe "success" do @@ -25,11 +25,11 @@ end it "#get_plan" do - Fog::OpenStack[:planning].get_plan(@instance['uuid']).body.must_match_schema(@plan_format) + Fog::OpenStack::Planning.new.get_plan(@instance['uuid']).body.must_match_schema(@plan_format) end it "#delete_plan" do - Fog::OpenStack[:planning].delete_plan(@instance['uuid']).status.must_equal 204 + Fog::OpenStack::Planning.new.delete_plan(@instance['uuid']).status.must_equal 204 end it "#create_plan" do @@ -37,19 +37,19 @@ :name => 'test-plan-name', :description => 'test-plan-desc', } - @instance = Fog::OpenStack[:planning].create_plan(plan_attributes).body + @instance = Fog::OpenStack::Planning.new.create_plan(plan_attributes).body @instance.must_match_schema(@plan_format) end it "#add_role_to_plan" do - Fog::OpenStack[:planning].add_role_to_plan( + Fog::OpenStack::Planning.new.add_role_to_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end it "#patch_plan" do - parameters = Fog::OpenStack[:planning].get_plan(@instance['uuid']). + parameters = Fog::OpenStack::Planning.new.get_plan(@instance['uuid']). body['parameters'][0..1] plan_parameters = parameters.collect do |parameter| { @@ -57,17 +57,17 @@ "value" => "test-#{parameter['name']}-value", } end - Fog::OpenStack[:planning].patch_plan(@instance['uuid'], plan_parameters).body. + Fog::OpenStack::Planning.new.patch_plan(@instance['uuid'], plan_parameters).body. must_match_schema(@plan_format) end it "#get_plan_templates" do - Fog::OpenStack[:planning].get_plan_templates(@instance['uuid']).body. + Fog::OpenStack::Planning.new.get_plan_templates(@instance['uuid']).body. must_match_schema(@plan_templates_format) end it "#remove_role_from_plan" do - Fog::OpenStack[:planning].remove_role_from_plan( + Fog::OpenStack::Planning.new.remove_role_from_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end diff --git a/test/requests/planning/role_tests.rb b/test/requests/planning/role_tests.rb index 56d790e46..0545482ea 100644 --- a/test/requests/planning/role_tests.rb +++ b/test/requests/planning/role_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | Planning role requests" do +describe "Fog::OpenStack::Planning | Planning role requests" do before do @role_format = { 'description' => Fog::Nullable::String, @@ -12,7 +12,7 @@ describe "success" do it "#list_roles" do - Fog::OpenStack[:planning].list_roles.body.must_match_schema([@role_format]) + Fog::OpenStack::Planning.new.list_roles.body.must_match_schema([@role_format]) end end end diff --git a/test/requests/shared_file_system/quota_tests.rb b/test/requests/shared_file_system/quota_tests.rb index 412af7dc0..d2fe3db20 100644 --- a/test/requests/shared_file_system/quota_tests.rb +++ b/test/requests/shared_file_system/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::SharedFileSystem::OpenStack | quota requests" do +describe "Fog::OpenStack::SharedFileSystem | quota requests" do before do - @manila = Fog::SharedFileSystem::OpenStack.new + @manila = Fog::OpenStack::SharedFileSystem.new @project_id = @manila.respond_to?(:current_tenant) ? @manila.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/storage/container_tests.rb b/test/requests/storage/container_tests.rb index 3a4603d55..148ded79f 100644 --- a/test/requests/storage/container_tests.rb +++ b/test/requests/storage/container_tests.rb @@ -1,16 +1,16 @@ require "test_helper" -describe "Fog::Storage[:openstack] | container requests" do +describe "Fog::OpenStack::Storage | container requests" do def cleanup_container return if Fog.mocking? if @storage.head_container(@container_name) @storage.delete_container(@container_name) end - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound end before do - @storage = Fog::Storage[:openstack] + @storage = Fog::OpenStack::Storage.new @container_format = [String] @container_name = 'fogcontainertests' @@ -85,7 +85,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.get_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end @@ -93,7 +93,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.head_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end @@ -101,7 +101,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.delete_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end end diff --git a/test/requests/storage/large_object_tests.rb b/test/requests/storage/large_object_tests.rb index b78eca059..cc8ca9803 100644 --- a/test/requests/storage/large_object_tests.rb +++ b/test/requests/storage/large_object_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Storage[:openstack] | large object requests" do +describe "Fog::OpenStack::Storage | large object requests" do before do - @storage = Fog::Storage[:openstack] + @storage = Fog::OpenStack::Storage.new unless Fog.mocking? @directory = @storage.directories.create(:key => 'foglargeobjecttests') @@ -280,7 +280,7 @@ unless Fog.mocking? proc do @storage.put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end end @@ -290,7 +290,7 @@ unless Fog.mocking? proc do @storage.put_static_obj_manifest('fognoncontainer', 'fog_large_object', []) - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end diff --git a/test/requests/storage/object_tests.rb b/test/requests/storage/object_tests.rb index b50e4c144..c7cdad329 100644 --- a/test/requests/storage/object_tests.rb +++ b/test/requests/storage/object_tests.rb @@ -9,10 +9,10 @@ def test_temp_url(url_s, time, desired_scheme) query_params.any? { |p| p == ['temp_url_expires', time.to_i.to_s] }.must_equal true end -describe "Fog::Storage[:openstack] | object requests" do +describe "Fog::OpenStack::Storage | object requests" do before do unless Fog.mocking? - @directory = Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests') + @directory = Fog::OpenStack::Storage.new.directories.create(:key => 'fogobjecttests') end module OpenStackStorageHelpers @@ -31,21 +31,21 @@ def override_path(path) describe "success" do it "#put_object('fogobjecttests', 'fog_object')" do - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file) + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', lorem_file) resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end describe "with_object" do before do file = lorem_file - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', file) file.close resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end it "#get_object('fogobjectests', 'fog_object')" do unless Fog.mocking? - resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_object') resp.body.must_equal lorem_file.read end end @@ -53,7 +53,7 @@ def override_path(path) it "#get_object('fogobjecttests', 'fog_object', &block)" do unless Fog.mocking? data = '' - Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| + Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| data << chunk end data.must_equal lorem_file.read @@ -62,33 +62,33 @@ def override_path(path) it "#public_url('fogobjectests', 'fog_object')" do unless Fog.mocking? - url = Fog::Storage[:openstack].directories.first.files.first.public_url + url = Fog::OpenStack::Storage.new.directories.first.files.first.public_url url.end_with?('/fogobjecttests/fog_object').must_equal true end end it "#public_url('fogobjectests')" do unless Fog.mocking? - url = Fog::Storage[:openstack].directories.first.public_url + url = Fog::OpenStack::Storage.new.directories.first.public_url url.end_with?('/fogobjecttests').must_equal true end end it "#head_object('fogobjectests', 'fog_object')" do unless Fog.mocking? - resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_object') resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end end it "#post_object('fogobjecttests', 'fog_object')" do unless Fog.mocking? - Fog::Storage[:openstack].post_object( + Fog::OpenStack::Storage.new.post_object( 'fogobjecttests', 'fog_object', 'X-Object-Meta-test-header' => 'fog-test-value' ) - resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_object') resp.headers.must_include 'X-Object-Meta-Test-Header' resp.headers['X-Object-Meta-Test-Header'].must_equal 'fog-test-value' end @@ -96,7 +96,7 @@ def override_path(path) it "#delete_object('fogobjecttests', 'fog_object')" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_object') resp.status.must_equal 204 end end @@ -104,7 +104,7 @@ def override_path(path) it "#get_object_http_url('directory.identity', 'fog_object', expiration timestamp)" do unless Fog.mocking? ts = Time.at(1_395_343_213) - url_s = Fog::Storage[:openstack].get_object_http_url(@directory.identity, 'fog_object', ts) + url_s = Fog::OpenStack::Storage.new.get_object_http_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'http') end end @@ -112,7 +112,7 @@ def override_path(path) it "#get_object_https_url('directory.identity', 'fog_object', expiration timestamp)" do unless Fog.mocking? ts = Time.at(1_395_343_213) - url_s = Fog::Storage[:openstack].get_object_https_url(@directory.identity, 'fog_object', ts) + url_s = Fog::OpenStack::Storage.new.get_object_https_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'https') end end @@ -132,7 +132,7 @@ def override_path(path) begin file = lorem_file buffer_size = file.stat.size / 2 # chop it up into two buffers - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_block_object', nil) do file.read(buffer_size).to_s end ensure @@ -144,7 +144,7 @@ def override_path(path) describe "with_object" do before do file = lorem_file - Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do + Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_block_object', nil) do file.read(file.stat.size).to_s end file.close @@ -152,14 +152,14 @@ def override_path(path) it "#get_object" do unless Fog.mocking? - resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_block_object') + resp = Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_block_object') resp.body.must_equal lorem_file.read end end it "#delete_object" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object') + resp = Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_block_object') resp.status.must_equal 204 end end @@ -169,10 +169,10 @@ def override_path(path) describe "deletes multiple objects" do before do unless Fog.mocking? - Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file) - Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object2', lorem_file) - Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests2') - Fog::Storage[:openstack].put_object('fogobjecttests2', 'fog_object', lorem_file) + Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', lorem_file) + Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object2', lorem_file) + Fog::OpenStack::Storage.new.directories.create(:key => 'fogobjecttests2') + Fog::OpenStack::Storage.new.put_object('fogobjecttests2', 'fog_object', lorem_file) end @expected = { @@ -186,7 +186,7 @@ def override_path(path) after do unless Fog.mocking? - dir2 = Fog::Storage[:openstack].directories.get('fogobjecttests2') + dir2 = Fog::OpenStack::Storage.new.directories.get('fogobjecttests2') unless dir2.nil? dir2.files.each(&:destroy) dir2.destroy @@ -196,7 +196,7 @@ def override_path(path) it "#delete_multiple_objects" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( 'fogobjecttests', %w[fog_object fog_object2] ) resp.body.must_equal @expected @@ -205,7 +205,7 @@ def override_path(path) it "deletes object and container" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( nil, ['fogobjecttests2/fog_object', 'fogobjecttests2'] ) @@ -219,56 +219,56 @@ def override_path(path) it "#get_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#get_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].get_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.get_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#head_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#head_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].head_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.head_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#post_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].post_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.post_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#delete_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#delete_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.delete_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end @@ -287,7 +287,7 @@ def override_path(path) it "reports missing objects" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( 'fogobjecttests', %w[fog_non_object fog_non_object2] ) resp.body.must_equal @expected @@ -296,7 +296,7 @@ def override_path(path) it "reports missing container" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( 'fognoncontainer', %w[fog_non_object fog_non_object2] ) resp.body.must_equal @expected @@ -306,7 +306,7 @@ def override_path(path) it "deleting non-empty container" do unless Fog.mocking? file = lorem_file - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', file) file.close resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' @@ -318,7 +318,7 @@ def override_path(path) "Response Body" => "" } - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( nil, %w[fogobjecttests] ) diff --git a/test/requests/volume/availability_zone_tests.rb b/test/requests/volume/availability_zone_tests.rb index 9d268c91e..43e1fc4b3 100644 --- a/test/requests/volume/availability_zone_tests.rb +++ b/test/requests/volume/availability_zone_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | availability zone requests" do +describe "Fog::OpenStack::Volume | availability zone requests" do before do @flavor_format = { 'zoneName' => String, @@ -10,7 +10,7 @@ describe "success" do it "#list_zones" do - Fog::Volume[:openstack].list_zones.body. + Fog::OpenStack::Volume.new.list_zones.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end end diff --git a/test/requests/volume/backup_tests.rb b/test/requests/volume/backup_tests.rb index 587f37e09..e8f335c23 100644 --- a/test/requests/volume/backup_tests.rb +++ b/test/requests/volume/backup_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | backup requests" do +describe "Fog::OpenStack::Volume | backup requests" do before do - @volume = Fog::Volume[:openstack] + @volume = Fog::OpenStack::Volume.new @backup_format = { 'id' => String, 'volume_id' => String, diff --git a/test/requests/volume/quota_tests.rb b/test/requests/volume/quota_tests.rb index d6e672dea..ca7648478 100644 --- a/test/requests/volume/quota_tests.rb +++ b/test/requests/volume/quota_tests.rb @@ -1,9 +1,9 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | quota requests" do +describe "Fog::OpenStack::Volume | quota requests" do before do - @volume = Fog::Volume[:openstack] - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @volume = Fog::OpenStack::Volume.new + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'volumes' => Fog::Nullable::Integer, diff --git a/test/requests/volume/volume_type_tests.rb b/test/requests/volume/volume_type_tests.rb index 242f02117..935deae68 100644 --- a/test/requests/volume/volume_type_tests.rb +++ b/test/requests/volume/volume_type_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | volume_type requests" do +describe "Fog::OpenStack::Volume | volume_type requests" do before do - @volume = Fog::Volume[:openstack] + @volume = Fog::OpenStack::Volume.new @volume_type_format = { 'name' => String, diff --git a/test/requests/workflow/workflow_tests.rb b/test/requests/workflow/workflow_tests.rb index 8c3d16726..9337931e8 100644 --- a/test/requests/workflow/workflow_tests.rb +++ b/test/requests/workflow/workflow_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -require 'fog/workflow/openstack' -require 'fog/workflow/openstack/v2' +require 'fog/openstack/workflow/workflow' +require 'fog/openstack/workflow/v2' -describe "Fog::Workflow::OpenStack | Workflow requests" do +describe "Fog::OpenStack::Workflow | Workflow requests" do before do - @workflow = Fog::Workflow::OpenStack.new + @workflow = Fog::OpenStack::Workflow.new @execution_id = Fog::UUID.uuid @workflow_name = "tripleo.plan_management.v1.create_default_deployment_plan" diff --git a/test/storage_tests.rb b/test/storage_tests.rb index 9c1bbf75f..e6f1f50a1 100644 --- a/test/storage_tests.rb +++ b/test/storage_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Storage[:openstack], ['openstack', 'storage']" do +describe "Fog::OpenStack::Storage, ['openstack', 'storage']" do before do - @storage = Fog::Storage[:openstack] + @storage = Fog::OpenStack::Storage.new @original_path = @storage.instance_variable_get :@path end diff --git a/test/volume_tests.rb b/test/volume_tests.rb index ceca9c4f7..3bf97d9ed 100644 --- a/test/volume_tests.rb +++ b/test/volume_tests.rb @@ -1,11 +1,11 @@ require 'test_helper' -require 'fog/volume/openstack' -require 'fog/volume/openstack/v1' -require 'fog/volume/openstack/v2' +require 'fog/openstack/volume/volume' +require 'fog/openstack/volume/v1' +require 'fog/openstack/volume/v2' -describe "Fog::Volume[:openstack], ['openstack', 'volume']" do - volume = Fog::Volume[:openstack] +describe "Fog::OpenStack::Volume, ['openstack', 'volume']" do + volume = Fog::OpenStack::Volume.new describe "Volumes collection" do %w{ volumes }.each do |collection| From fc009051a0e63f6d4429e1003ddcbf464ca63415 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 18 Sep 2018 22:57:18 +1000 Subject: [PATCH 066/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index cd626ac12..bbfe874d8 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.3.0'.freeze + VERSION = '0.3.1'.freeze end end From aa7c56d0734f79f99d1d5f35500255e7fa943e17 Mon Sep 17 00:00:00 2001 From: Igor Pavliv Date: Thu, 20 Sep 2018 15:13:37 +0300 Subject: [PATCH 067/129] Fix hash bug in Image model --- lib/fog/openstack/compute/models/image.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/compute/models/image.rb b/lib/fog/openstack/compute/models/image.rb index bc2b0c8cb..6498504b1 100644 --- a/lib/fog/openstack/compute/models/image.rb +++ b/lib/fog/openstack/compute/models/image.rb @@ -28,7 +28,7 @@ def metadata def metadata=(new_metadata = {}) metas = [] - new_metadata.each_pair { |k, v| metas << {"key" => k, "value" => v} } + new_metadata.to_hash.each_pair { |k, v| metas << {"key" => k, "value" => v} } metadata.load(metas) end From c7f41e90b102fa714c290980f456ecc0d43ad399 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 21 Sep 2018 10:38:17 +1000 Subject: [PATCH 068/129] Revert "Fix hash bug in Image model" This reverts commit aa7c56d0734f79f99d1d5f35500255e7fa943e17. --- lib/fog/openstack/compute/models/image.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/compute/models/image.rb b/lib/fog/openstack/compute/models/image.rb index 6498504b1..bc2b0c8cb 100644 --- a/lib/fog/openstack/compute/models/image.rb +++ b/lib/fog/openstack/compute/models/image.rb @@ -28,7 +28,7 @@ def metadata def metadata=(new_metadata = {}) metas = [] - new_metadata.to_hash.each_pair { |k, v| metas << {"key" => k, "value" => v} } + new_metadata.each_pair { |k, v| metas << {"key" => k, "value" => v} } metadata.load(metas) end From 68687a2632cf72397dce7aea98abff1178ef91b4 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 21 Sep 2018 10:39:01 +1000 Subject: [PATCH 069/129] Revert "Renames Fog::::OpenStack to Fog::OpenStack::" This reverts commit b312b3d35d8772daedb7f9a6525dc0f0bfccd79a. --- README.md | 58 +++++----- docs/compute.md | 70 ++++++------ docs/introspection.md | 4 +- docs/metering.md | 2 +- docs/network.md | 16 +-- docs/orchestration.md | 38 +++---- docs/planning.md | 4 +- docs/shared_file_system.md | 2 +- docs/storage.md | 8 +- docs/workflow.md | 2 +- examples/compute/block_device_mapping_v2.rb | 2 +- examples/container_infra/basics.rb | 2 +- examples/event/basics.rb | 2 +- examples/identity/basics.rb | 6 +- examples/identity/basics_v3.rb | 52 ++++----- examples/image/upload-test-image.rb | 30 ++--- examples/introspection/basics.rb | 4 +- examples/metric/basics.rb | 2 +- examples/network/network_rbac.rb | 4 +- examples/network/network_subnets_routers.rb | 2 +- examples/shared_file_system/basics.rb | 4 +- examples/storage/set-account-quota.rb | 4 +- examples/volume/backups.rb | 4 +- examples/workflow/workflow-examples.rb | 4 +- .../baremetal.rb => baremetal/openstack.rb} | 12 +- .../openstack}/models/chassis.rb | 4 +- .../openstack}/models/chassis_collection.rb | 8 +- .../openstack}/models/driver.rb | 4 +- .../openstack}/models/drivers.rb | 8 +- .../openstack}/models/node.rb | 4 +- .../openstack}/models/nodes.rb | 8 +- .../openstack}/models/port.rb | 4 +- .../openstack}/models/ports.rb | 8 +- .../openstack}/requests/create_chassis.rb | 4 +- .../openstack}/requests/create_node.rb | 4 +- .../openstack}/requests/create_port.rb | 4 +- .../openstack}/requests/delete_chassis.rb | 4 +- .../openstack}/requests/delete_node.rb | 4 +- .../openstack}/requests/delete_port.rb | 4 +- .../openstack}/requests/get_chassis.rb | 4 +- .../openstack}/requests/get_driver.rb | 4 +- .../requests/get_driver_properties.rb | 4 +- .../openstack}/requests/get_node.rb | 4 +- .../openstack}/requests/get_port.rb | 4 +- .../openstack}/requests/list_chassis.rb | 4 +- .../requests/list_chassis_detailed.rb | 4 +- .../openstack}/requests/list_drivers.rb | 4 +- .../openstack}/requests/list_nodes.rb | 4 +- .../requests/list_nodes_detailed.rb | 4 +- .../openstack}/requests/list_ports.rb | 4 +- .../requests/list_ports_detailed.rb | 4 +- .../openstack}/requests/patch_chassis.rb | 4 +- .../openstack}/requests/patch_node.rb | 4 +- .../openstack}/requests/patch_port.rb | 4 +- .../requests/set_node_maintenance.rb | 4 +- .../requests/set_node_power_state.rb | 4 +- .../requests/set_node_provision_state.rb | 4 +- .../requests/unset_node_maintenance.rb | 4 +- .../compute.rb => compute/openstack.rb} | 10 +- .../openstack}/models/address.rb | 4 +- .../openstack}/models/addresses.rb | 10 +- .../openstack}/models/aggregate.rb | 4 +- .../openstack}/models/aggregates.rb | 8 +- .../openstack}/models/availability_zone.rb | 4 +- .../openstack}/models/availability_zones.rb | 8 +- .../openstack}/models/flavor.rb | 12 +- .../openstack}/models/flavors.rb | 10 +- .../openstack}/models/host.rb | 8 +- .../openstack}/models/hosts.rb | 10 +- .../openstack}/models/image.rb | 8 +- .../openstack}/models/images.rb | 10 +- .../openstack}/models/key_pair.rb | 4 +- .../openstack}/models/key_pairs.rb | 10 +- .../openstack}/models/metadata.rb | 18 +-- .../openstack}/models/metadatum.rb | 6 +- .../openstack}/models/network.rb | 4 +- .../openstack}/models/networks.rb | 8 +- .../openstack}/models/os_interface.rb | 4 +- .../openstack}/models/os_interfaces.rb | 8 +- .../openstack}/models/security_group.rb | 12 +- .../openstack}/models/security_group_rule.rb | 4 +- .../openstack}/models/security_group_rules.rb | 10 +- .../openstack}/models/security_groups.rb | 10 +- .../openstack}/models/server.rb | 10 +- .../openstack}/models/server_group.rb | 4 +- .../openstack}/models/server_groups.rb | 10 +- .../openstack}/models/servers.rb | 20 ++-- .../openstack}/models/service.rb | 4 +- .../openstack}/models/services.rb | 10 +- .../openstack}/models/snapshot.rb | 6 +- .../openstack}/models/snapshots.rb | 10 +- .../openstack}/models/tenant.rb | 4 +- .../openstack}/models/tenants.rb | 8 +- .../openstack}/models/volume.rb | 6 +- .../openstack}/models/volume_attachment.rb | 4 +- .../openstack}/models/volume_attachments.rb | 8 +- .../openstack}/models/volumes.rb | 10 +- .../openstack}/requests/add_aggregate_host.rb | 4 +- .../openstack}/requests/add_fixed_ip.rb | 4 +- .../openstack}/requests/add_flavor_access.rb | 4 +- .../openstack}/requests/add_security_group.rb | 4 +- .../openstack}/requests/allocate_address.rb | 4 +- .../openstack}/requests/associate_address.rb | 4 +- .../openstack}/requests/attach_volume.rb | 4 +- .../openstack}/requests/boot_from_snapshot.rb | 4 +- .../requests/change_server_password.rb | 4 +- .../requests/confirm_resize_server.rb | 4 +- .../openstack}/requests/create_aggregate.rb | 4 +- .../openstack}/requests/create_flavor.rb | 4 +- .../requests/create_flavor_metadata.rb | 4 +- .../openstack}/requests/create_image.rb | 4 +- .../openstack}/requests/create_key_pair.rb | 4 +- .../requests/create_os_interface.rb | 4 +- .../requests/create_security_group.rb | 8 +- .../requests/create_security_group_rule.rb | 4 +- .../openstack}/requests/create_server.rb | 10 +- .../requests/create_server_group.rb | 8 +- .../openstack}/requests/create_snapshot.rb | 6 +- .../openstack}/requests/create_volume.rb | 4 +- .../openstack}/requests/delete_aggregate.rb | 4 +- .../openstack}/requests/delete_flavor.rb | 4 +- .../requests/delete_flavor_metadata.rb | 4 +- .../openstack}/requests/delete_image.rb | 4 +- .../openstack}/requests/delete_key_pair.rb | 4 +- .../openstack}/requests/delete_meta.rb | 8 +- .../openstack}/requests/delete_metadata.rb | 4 +- .../requests/delete_os_interface.rb | 4 +- .../requests/delete_security_group.rb | 4 +- .../requests/delete_security_group_rule.rb | 4 +- .../openstack}/requests/delete_server.rb | 6 +- .../requests/delete_server_group.rb | 4 +- .../openstack}/requests/delete_service.rb | 4 +- .../openstack}/requests/delete_snapshot.rb | 6 +- .../openstack}/requests/delete_volume.rb | 6 +- .../openstack}/requests/detach_volume.rb | 6 +- .../openstack}/requests/disable_service.rb | 4 +- .../requests/disable_service_log_reason.rb | 4 +- .../requests/disassociate_address.rb | 4 +- .../openstack}/requests/enable_service.rb | 4 +- .../openstack}/requests/evacuate_server.rb | 4 +- .../openstack}/requests/get_address.rb | 4 +- .../openstack}/requests/get_aggregate.rb | 4 +- .../openstack}/requests/get_console_output.rb | 4 +- .../openstack}/requests/get_flavor_details.rb | 6 +- .../requests/get_flavor_metadata.rb | 4 +- .../openstack}/requests/get_host_details.rb | 4 +- .../openstack}/requests/get_hypervisor.rb | 4 +- .../requests/get_hypervisor_statistics.rb | 4 +- .../openstack}/requests/get_image_details.rb | 6 +- .../openstack}/requests/get_key_pair.rb | 4 +- .../openstack}/requests/get_limits.rb | 4 +- .../openstack}/requests/get_metadata.rb | 4 +- .../openstack}/requests/get_os_interface.rb | 4 +- .../openstack}/requests/get_quota.rb | 4 +- .../openstack}/requests/get_quota_defaults.rb | 4 +- .../openstack}/requests/get_security_group.rb | 6 +- .../requests/get_security_group_rule.rb | 6 +- .../openstack}/requests/get_server_details.rb | 6 +- .../openstack}/requests/get_server_group.rb | 4 +- .../requests/get_server_password.rb | 6 +- .../openstack}/requests/get_server_volumes.rb | 4 +- .../requests/get_snapshot_details.rb | 6 +- .../openstack}/requests/get_usage.rb | 4 +- .../openstack}/requests/get_vnc_console.rb | 4 +- .../openstack}/requests/get_volume_details.rb | 6 +- .../openstack}/requests/list_address_pools.rb | 4 +- .../openstack}/requests/list_addresses.rb | 6 +- .../openstack}/requests/list_aggregates.rb | 4 +- .../openstack}/requests/list_all_addresses.rb | 4 +- .../requests/list_availability_zones.rb | 4 +- .../openstack}/requests/list_flavors.rb | 4 +- .../requests/list_flavors_detail.rb | 4 +- .../openstack}/requests/list_hosts.rb | 4 +- .../requests/list_hypervisor_servers.rb | 4 +- .../openstack}/requests/list_hypervisors.rb | 4 +- .../requests/list_hypervisors_detail.rb | 4 +- .../openstack}/requests/list_images.rb | 4 +- .../openstack}/requests/list_images_detail.rb | 4 +- .../openstack}/requests/list_key_pairs.rb | 4 +- .../openstack}/requests/list_metadata.rb | 4 +- .../openstack}/requests/list_os_interfaces.rb | 4 +- .../requests/list_private_addresses.rb | 6 +- .../requests/list_public_addresses.rb | 6 +- .../requests/list_security_groups.rb | 4 +- .../openstack}/requests/list_server_groups.rb | 4 +- .../openstack}/requests/list_servers.rb | 4 +- .../requests/list_servers_detail.rb | 4 +- .../openstack}/requests/list_services.rb | 4 +- .../openstack}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detail.rb | 4 +- .../list_tenants_with_flavor_access.rb | 4 +- .../openstack}/requests/list_usages.rb | 4 +- .../requests/list_volume_attachments.rb | 4 +- .../openstack}/requests/list_volumes.rb | 4 +- .../requests/list_volumes_detail.rb | 4 +- .../openstack}/requests/list_zones.rb | 4 +- .../requests/list_zones_detailed.rb | 4 +- .../requests/live_migrate_server.rb | 4 +- .../openstack}/requests/migrate_server.rb | 4 +- .../openstack}/requests/pause_server.rb | 4 +- .../openstack}/requests/reboot_server.rb | 4 +- .../openstack}/requests/rebuild_server.rb | 4 +- .../openstack}/requests/release_address.rb | 4 +- .../openstack}/requests/remote_consoles.rb | 4 +- .../requests/remove_aggregate_host.rb | 4 +- .../openstack}/requests/remove_fixed_ip.rb | 4 +- .../requests/remove_flavor_access.rb | 4 +- .../requests/remove_security_group.rb | 4 +- .../openstack}/requests/rescue_server.rb | 4 +- .../openstack}/requests/reset_server_state.rb | 4 +- .../openstack}/requests/resize_server.rb | 4 +- .../openstack}/requests/resume_server.rb | 4 +- .../requests/revert_resize_server.rb | 4 +- .../openstack}/requests/server_action.rb | 4 +- .../openstack}/requests/server_actions.rb | 4 +- .../openstack}/requests/server_diagnostics.rb | 4 +- .../openstack}/requests/set_metadata.rb | 8 +- .../openstack}/requests/set_tenant.rb | 4 +- .../requests/shelve_offload_server.rb | 4 +- .../openstack}/requests/shelve_server.rb | 4 +- .../openstack}/requests/start_server.rb | 4 +- .../openstack}/requests/stop_server.rb | 4 +- .../openstack}/requests/suspend_server.rb | 4 +- .../openstack}/requests/unpause_server.rb | 4 +- .../openstack}/requests/unshelve_server.rb | 4 +- .../openstack}/requests/update_aggregate.rb | 4 +- .../requests/update_aggregate_metadata.rb | 4 +- .../requests/update_flavor_metadata.rb | 4 +- .../openstack}/requests/update_meta.rb | 8 +- .../openstack}/requests/update_metadata.rb | 8 +- .../openstack}/requests/update_quota.rb | 4 +- .../openstack}/requests/update_server.rb | 6 +- .../openstack.rb} | 10 +- .../openstack}/models/base.rb | 10 +- .../openstack}/models/bay.rb | 6 +- .../openstack}/models/bay_model.rb | 8 +- .../openstack}/models/bay_models.rb | 10 +- .../openstack}/models/bays.rb | 10 +- .../openstack}/models/certificate.rb | 6 +- .../openstack}/models/certificates.rb | 10 +- .../openstack}/models/cluster.rb | 6 +- .../openstack}/models/cluster_template.rb | 8 +- .../openstack}/models/cluster_templates.rb | 10 +- .../openstack}/models/clusters.rb | 10 +- .../openstack}/requests/create_bay.rb | 4 +- .../openstack}/requests/create_bay_model.rb | 4 +- .../openstack}/requests/create_certificate.rb | 4 +- .../openstack}/requests/create_cluster.rb | 4 +- .../requests/create_cluster_template.rb | 4 +- .../openstack}/requests/delete_bay.rb | 4 +- .../openstack}/requests/delete_bay_model.rb | 4 +- .../openstack}/requests/delete_cluster.rb | 4 +- .../requests/delete_cluster_template.rb | 4 +- .../openstack}/requests/get_bay.rb | 4 +- .../openstack}/requests/get_bay_model.rb | 4 +- .../openstack}/requests/get_certificate.rb | 4 +- .../openstack}/requests/get_cluster.rb | 4 +- .../requests/get_cluster_template.rb | 4 +- .../openstack}/requests/list_bay_models.rb | 4 +- .../openstack}/requests/list_bays.rb | 4 +- .../requests/list_cluster_templates.rb | 4 +- .../openstack}/requests/list_clusters.rb | 4 +- .../openstack}/requests/update_bay.rb | 4 +- .../openstack}/requests/update_bay_model.rb | 4 +- .../openstack}/requests/update_cluster.rb | 4 +- .../requests/update_cluster_template.rb | 4 +- lib/fog/dns/openstack.rb | 21 ++++ .../{openstack/dns => dns/openstack}/v1.rb | 10 +- .../openstack}/v1/requests/get_quota.rb | 4 +- .../openstack}/v1/requests/list_domains.rb | 4 +- .../openstack}/v1/requests/update_quota.rb | 4 +- .../{openstack/dns => dns/openstack}/v2.rb | 12 +- .../dns => dns/openstack}/v2/models/pool.rb | 4 +- .../dns => dns/openstack}/v2/models/pools.rb | 8 +- .../openstack}/v2/models/recordset.rb | 4 +- .../openstack}/v2/models/recordsets.rb | 8 +- .../dns => dns/openstack}/v2/models/zone.rb | 4 +- .../v2/models/zone_transfer_accept.rb | 4 +- .../v2/models/zone_transfer_accepts.rb | 8 +- .../v2/models/zone_transfer_request.rb | 4 +- .../v2/models/zone_transfer_requests.rb | 8 +- .../dns => dns/openstack}/v2/models/zones.rb | 8 +- .../v2/requests/create_recordset.rb | 4 +- .../openstack}/v2/requests/create_zone.rb | 4 +- .../requests/create_zone_transfer_accept.rb | 6 +- .../requests/create_zone_transfer_request.rb | 4 +- .../v2/requests/delete_recordset.rb | 6 +- .../openstack}/v2/requests/delete_zone.rb | 6 +- .../requests/delete_zone_transfer_request.rb | 4 +- .../openstack}/v2/requests/get_pool.rb | 6 +- .../openstack}/v2/requests/get_quota.rb | 6 +- .../openstack}/v2/requests/get_recordset.rb | 6 +- .../openstack}/v2/requests/get_zone.rb | 6 +- .../v2/requests/get_zone_transfer_accept.rb | 4 +- .../v2/requests/get_zone_transfer_request.rb | 4 +- .../openstack}/v2/requests/list_pools.rb | 6 +- .../openstack}/v2/requests/list_recordsets.rb | 6 +- .../v2/requests/list_zone_transfer_accepts.rb | 4 +- .../requests/list_zone_transfer_requests.rb | 4 +- .../openstack}/v2/requests/list_zones.rb | 6 +- .../openstack}/v2/requests/update_quota.rb | 6 +- .../v2/requests/update_recordset.rb | 6 +- .../openstack}/v2/requests/update_zone.rb | 6 +- .../requests/update_zone_transfer_request.rb | 4 +- .../event/event.rb => event/openstack.rb} | 10 +- .../event => event/openstack}/models/event.rb | 4 +- .../openstack}/models/events.rb | 10 +- .../openstack}/requests/get_event.rb | 4 +- .../openstack}/requests/list_events.rb | 4 +- .../identity.rb => identity/openstack.rb} | 14 +-- .../identity => identity/openstack}/v2.rb | 12 +- .../openstack}/v2/models/ec2_credential.rb | 4 +- .../openstack}/v2/models/ec2_credentials.rb | 10 +- .../openstack}/v2/models/role.rb | 4 +- .../openstack}/v2/models/roles.rb | 8 +- .../openstack}/v2/models/tenant.rb | 4 +- .../openstack}/v2/models/tenants.rb | 10 +- .../openstack}/v2/models/user.rb | 4 +- .../openstack}/v2/models/users.rb | 12 +- .../v2/requests/add_user_to_tenant.rb | 4 +- .../openstack}/v2/requests/check_token.rb | 4 +- .../v2/requests/create_ec2_credential.rb | 4 +- .../openstack}/v2/requests/create_role.rb | 4 +- .../openstack}/v2/requests/create_tenant.rb | 4 +- .../openstack}/v2/requests/create_user.rb | 4 +- .../v2/requests/create_user_role.rb | 4 +- .../v2/requests/delete_ec2_credential.rb | 6 +- .../openstack}/v2/requests/delete_role.rb | 6 +- .../openstack}/v2/requests/delete_tenant.rb | 4 +- .../openstack}/v2/requests/delete_user.rb | 6 +- .../v2/requests/delete_user_role.rb | 4 +- .../v2/requests/get_ec2_credential.rb | 6 +- .../openstack}/v2/requests/get_role.rb | 6 +- .../openstack}/v2/requests/get_tenant.rb | 4 +- .../v2/requests/get_tenants_by_id.rb | 4 +- .../v2/requests/get_tenants_by_name.rb | 4 +- .../openstack}/v2/requests/get_user_by_id.rb | 4 +- .../v2/requests/get_user_by_name.rb | 4 +- .../v2/requests/list_ec2_credentials.rb | 4 +- .../v2/requests/list_endpoints_for_token.rb | 4 +- .../openstack}/v2/requests/list_roles.rb | 4 +- .../requests/list_roles_for_user_on_tenant.rb | 4 +- .../openstack}/v2/requests/list_tenants.rb | 4 +- .../v2/requests/list_user_global_roles.rb | 4 +- .../openstack}/v2/requests/list_users.rb | 4 +- .../v2/requests/remove_user_from_tenant.rb | 4 +- .../openstack}/v2/requests/set_tenant.rb | 4 +- .../openstack}/v2/requests/update_tenant.rb | 4 +- .../openstack}/v2/requests/update_user.rb | 6 +- .../openstack}/v2/requests/validate_token.rb | 4 +- .../identity => identity/openstack}/v3.rb | 12 +- .../openstack}/v3/models/domain.rb | 4 +- .../openstack}/v3/models/domains.rb | 22 ++-- .../openstack}/v3/models/endpoint.rb | 4 +- .../openstack}/v3/models/endpoints.rb | 10 +- .../openstack}/v3/models/group.rb | 8 +- .../openstack}/v3/models/groups.rb | 10 +- .../openstack}/v3/models/os_credential.rb | 4 +- .../openstack}/v3/models/os_credentials.rb | 10 +- .../openstack}/v3/models/policies.rb | 10 +- .../openstack}/v3/models/policy.rb | 4 +- .../openstack}/v3/models/project.rb | 8 +- .../openstack}/v3/models/projects.rb | 22 ++-- .../openstack}/v3/models/role.rb | 4 +- .../openstack}/v3/models/role_assignment.rb | 4 +- .../openstack}/v3/models/role_assignments.rb | 8 +- .../openstack}/v3/models/roles.rb | 10 +- .../openstack}/v3/models/service.rb | 4 +- .../openstack}/v3/models/services.rb | 10 +- .../openstack}/v3/models/token.rb | 4 +- .../openstack}/v3/models/tokens.rb | 12 +- .../openstack}/v3/models/user.rb | 6 +- .../openstack}/v3/models/users.rb | 10 +- .../v3/requests/add_user_to_group.rb | 4 +- .../openstack}/v3/requests/auth_domains.rb | 4 +- .../openstack}/v3/requests/auth_projects.rb | 4 +- .../v3/requests/check_domain_group_role.rb | 4 +- .../v3/requests/check_domain_user_role.rb | 4 +- .../v3/requests/check_project_group_role.rb | 4 +- .../v3/requests/check_project_user_role.rb | 4 +- .../openstack}/v3/requests/create_domain.rb | 4 +- .../openstack}/v3/requests/create_endpoint.rb | 4 +- .../openstack}/v3/requests/create_group.rb | 4 +- .../v3/requests/create_os_credential.rb | 4 +- .../openstack}/v3/requests/create_policy.rb | 4 +- .../openstack}/v3/requests/create_project.rb | 4 +- .../openstack}/v3/requests/create_role.rb | 4 +- .../openstack}/v3/requests/create_service.rb | 4 +- .../openstack}/v3/requests/create_user.rb | 4 +- .../openstack}/v3/requests/delete_domain.rb | 4 +- .../openstack}/v3/requests/delete_endpoint.rb | 4 +- .../openstack}/v3/requests/delete_group.rb | 4 +- .../v3/requests/delete_os_credential.rb | 4 +- .../openstack}/v3/requests/delete_policy.rb | 4 +- .../openstack}/v3/requests/delete_project.rb | 4 +- .../openstack}/v3/requests/delete_role.rb | 4 +- .../openstack}/v3/requests/delete_service.rb | 4 +- .../openstack}/v3/requests/delete_user.rb | 4 +- .../openstack}/v3/requests/get_domain.rb | 4 +- .../openstack}/v3/requests/get_endpoint.rb | 4 +- .../openstack}/v3/requests/get_group.rb | 4 +- .../v3/requests/get_os_credential.rb | 4 +- .../openstack}/v3/requests/get_policy.rb | 4 +- .../openstack}/v3/requests/get_project.rb | 4 +- .../openstack}/v3/requests/get_role.rb | 4 +- .../openstack}/v3/requests/get_service.rb | 4 +- .../openstack}/v3/requests/get_user.rb | 4 +- .../v3/requests/grant_domain_group_role.rb | 4 +- .../v3/requests/grant_domain_user_role.rb | 4 +- .../v3/requests/grant_project_group_role.rb | 4 +- .../v3/requests/grant_project_user_role.rb | 4 +- .../v3/requests/group_user_check.rb | 4 +- .../v3/requests/list_domain_group_roles.rb | 4 +- .../v3/requests/list_domain_user_roles.rb | 4 +- .../openstack}/v3/requests/list_domains.rb | 4 +- .../openstack}/v3/requests/list_endpoints.rb | 4 +- .../v3/requests/list_group_users.rb | 4 +- .../openstack}/v3/requests/list_groups.rb | 4 +- .../v3/requests/list_os_credentials.rb | 4 +- .../openstack}/v3/requests/list_policies.rb | 4 +- .../v3/requests/list_project_group_roles.rb | 4 +- .../v3/requests/list_project_user_roles.rb | 4 +- .../openstack}/v3/requests/list_projects.rb | 4 +- .../v3/requests/list_role_assignments.rb | 4 +- .../openstack}/v3/requests/list_roles.rb | 4 +- .../openstack}/v3/requests/list_services.rb | 4 +- .../v3/requests/list_user_groups.rb | 4 +- .../v3/requests/list_user_projects.rb | 4 +- .../openstack}/v3/requests/list_users.rb | 4 +- .../v3/requests/remove_user_from_group.rb | 4 +- .../v3/requests/revoke_domain_group_role.rb | 4 +- .../v3/requests/revoke_domain_user_role.rb | 4 +- .../v3/requests/revoke_project_group_role.rb | 4 +- .../v3/requests/revoke_project_user_role.rb | 4 +- .../v3/requests/token_authenticate.rb | 4 +- .../openstack}/v3/requests/token_check.rb | 4 +- .../openstack}/v3/requests/token_revoke.rb | 4 +- .../openstack}/v3/requests/token_validate.rb | 4 +- .../openstack}/v3/requests/update_domain.rb | 4 +- .../openstack}/v3/requests/update_endpoint.rb | 4 +- .../openstack}/v3/requests/update_group.rb | 4 +- .../v3/requests/update_os_credential.rb | 4 +- .../openstack}/v3/requests/update_policy.rb | 4 +- .../openstack}/v3/requests/update_project.rb | 4 +- .../openstack}/v3/requests/update_role.rb | 4 +- .../openstack}/v3/requests/update_service.rb | 4 +- .../openstack}/v3/requests/update_user.rb | 4 +- lib/fog/image/openstack.rb | 23 ++++ .../image => image/openstack}/v1.rb | 12 +- .../openstack}/v1/models/image.rb | 4 +- .../openstack}/v1/models/images.rb | 10 +- .../v1/requests/add_member_to_image.rb | 4 +- .../openstack}/v1/requests/create_image.rb | 4 +- .../openstack}/v1/requests/delete_image.rb | 4 +- .../openstack}/v1/requests/get_image.rb | 4 +- .../openstack}/v1/requests/get_image_by_id.rb | 4 +- .../v1/requests/get_image_members.rb | 4 +- .../v1/requests/get_shared_images.rb | 4 +- .../v1/requests/list_public_images.rb | 4 +- .../requests/list_public_images_detailed.rb | 4 +- .../v1/requests/remove_member_from_image.rb | 4 +- .../openstack}/v1/requests/set_tenant.rb | 4 +- .../openstack}/v1/requests/update_image.rb | 4 +- .../v1/requests/update_image_members.rb | 4 +- .../image => image/openstack}/v2.rb | 12 +- .../openstack}/v2/models/image.rb | 4 +- .../openstack}/v2/models/images.rb | 10 +- .../v2/requests/add_member_to_image.rb | 4 +- .../v2/requests/add_tag_to_image.rb | 4 +- .../openstack}/v2/requests/create_image.rb | 4 +- .../v2/requests/deactivate_image.rb | 4 +- .../openstack}/v2/requests/delete_image.rb | 4 +- .../openstack}/v2/requests/download_image.rb | 4 +- .../openstack}/v2/requests/get_image.rb | 4 +- .../openstack}/v2/requests/get_image_by_id.rb | 4 +- .../v2/requests/get_image_members.rb | 4 +- .../v2/requests/get_member_details.rb | 4 +- .../v2/requests/get_shared_images.rb | 4 +- .../openstack}/v2/requests/list_images.rb | 4 +- .../v2/requests/reactivate_image.rb | 4 +- .../v2/requests/remove_member_from_image.rb | 4 +- .../v2/requests/remove_tag_from_image.rb | 4 +- .../openstack}/v2/requests/set_tenant.rb | 4 +- .../openstack}/v2/requests/update_image.rb | 4 +- .../v2/requests/update_image_member.rb | 4 +- .../openstack}/v2/requests/upload_image.rb | 4 +- .../openstack.rb} | 14 +-- .../openstack}/models/rules.rb | 4 +- .../openstack}/models/rules_collection.rb | 10 +- .../requests/abort_introspection.rb | 4 +- .../requests/create_introspection.rb | 4 +- .../openstack}/requests/create_rules.rb | 4 +- .../openstack}/requests/delete_rules.rb | 4 +- .../openstack}/requests/delete_rules_all.rb | 4 +- .../openstack}/requests/get_introspection.rb | 4 +- .../requests/get_introspection_details.rb | 4 +- .../openstack}/requests/get_rules.rb | 4 +- .../openstack}/requests/list_rules.rb | 4 +- .../openstack.rb} | 10 +- .../openstack}/models/acl.rb | 4 +- .../openstack}/models/container.rb | 6 +- .../openstack}/models/containers.rb | 12 +- .../openstack}/models/secret.rb | 6 +- .../openstack}/models/secrets.rb | 12 +- .../openstack}/requests/create_container.rb | 6 +- .../openstack}/requests/create_secret.rb | 6 +- .../openstack}/requests/delete_container.rb | 6 +- .../requests/delete_container_acl.rb | 4 +- .../openstack}/requests/delete_secret.rb | 6 +- .../openstack}/requests/delete_secret_acl.rb | 4 +- .../openstack}/requests/get_container.rb | 6 +- .../openstack}/requests/get_container_acl.rb | 4 +- .../openstack}/requests/get_secret.rb | 6 +- .../openstack}/requests/get_secret_acl.rb | 4 +- .../requests/get_secret_metadata.rb | 6 +- .../openstack}/requests/get_secret_payload.rb | 6 +- .../openstack}/requests/list_containers.rb | 6 +- .../openstack}/requests/list_secrets.rb | 6 +- .../requests/replace_container_acl.rb | 4 +- .../openstack}/requests/replace_secret_acl.rb | 4 +- .../requests/update_container_acl.rb | 4 +- .../openstack}/requests/update_secret_acl.rb | 4 +- .../metering.rb => metering/openstack.rb} | 10 +- .../openstack}/models/event.rb | 4 +- .../openstack}/models/events.rb | 10 +- .../openstack}/models/meter.rb | 0 .../openstack}/models/meters.rb | 0 .../openstack}/models/resource.rb | 4 +- .../openstack}/models/resources.rb | 10 +- .../openstack}/requests/get_event.rb | 4 +- .../openstack}/requests/get_resource.rb | 4 +- .../openstack}/requests/get_samples.rb | 4 +- .../openstack}/requests/get_statistics.rb | 4 +- .../openstack}/requests/list_events.rb | 4 +- .../openstack}/requests/list_meters.rb | 4 +- .../openstack}/requests/list_resources.rb | 4 +- .../metric/metric.rb => metric/openstack.rb} | 10 +- .../openstack}/models/metric.rb | 4 +- .../openstack}/models/metrics.rb | 12 +- .../openstack}/models/resource.rb | 4 +- .../openstack}/models/resources.rb | 10 +- .../openstack}/requests/get_metric.rb | 4 +- .../requests/get_metric_measures.rb | 4 +- .../openstack}/requests/get_resource.rb | 4 +- .../requests/get_resource_metric_measures.rb | 4 +- .../openstack}/requests/list_metrics.rb | 4 +- .../openstack}/requests/list_resources.rb | 4 +- .../monitoring.rb => monitoring/openstack.rb} | 10 +- .../openstack}/models/alarm.rb | 4 +- .../openstack}/models/alarm_count.rb | 4 +- .../openstack}/models/alarm_counts.rb | 8 +- .../openstack}/models/alarm_definition.rb | 4 +- .../openstack}/models/alarm_definitions.rb | 10 +- .../openstack}/models/alarm_state.rb | 4 +- .../openstack}/models/alarm_states.rb | 8 +- .../openstack}/models/alarms.rb | 10 +- .../openstack}/models/dimension_value.rb | 4 +- .../openstack}/models/dimension_values.rb | 8 +- .../openstack}/models/measurement.rb | 4 +- .../openstack}/models/measurements.rb | 8 +- .../openstack}/models/metric.rb | 4 +- .../openstack}/models/metrics.rb | 12 +- .../openstack}/models/notification_method.rb | 4 +- .../openstack}/models/notification_methods.rb | 10 +- .../openstack}/models/statistic.rb | 4 +- .../openstack}/models/statistics.rb | 8 +- .../requests/create_alarm_definition.rb | 4 +- .../openstack}/requests/create_metric.rb | 4 +- .../requests/create_metric_array.rb | 4 +- .../requests/create_notification_method.rb | 4 +- .../openstack}/requests/delete_alarm.rb | 4 +- .../requests/delete_alarm_definition.rb | 4 +- .../requests/delete_notification_method.rb | 4 +- .../openstack}/requests/find_measurements.rb | 4 +- .../openstack}/requests/get_alarm.rb | 4 +- .../openstack}/requests/get_alarm_counts.rb | 4 +- .../requests/get_alarm_definition.rb | 4 +- .../requests/get_notification_method.rb | 4 +- .../requests/list_alarm_definitions.rb | 4 +- ...list_alarm_state_history_for_all_alarms.rb | 4 +- ..._alarm_state_history_for_specific_alarm.rb | 4 +- .../openstack}/requests/list_alarms.rb | 4 +- .../requests/list_dimension_values.rb | 4 +- .../openstack}/requests/list_metric_names.rb | 4 +- .../openstack}/requests/list_metrics.rb | 4 +- .../list_notification_method_types.rb | 4 +- .../requests/list_notification_methods.rb | 4 +- .../openstack}/requests/list_statistics.rb | 4 +- .../openstack}/requests/patch_alarm.rb | 4 +- .../requests/patch_alarm_definition.rb | 4 +- .../requests/patch_notification_method.rb | 4 +- .../requests/put_notification_method.rb | 4 +- .../openstack}/requests/update_alarm.rb | 4 +- .../requests/update_alarm_definition.rb | 4 +- .../network.rb => network/openstack.rb} | 10 +- .../openstack}/models/extension.rb | 4 +- .../openstack}/models/extensions.rb | 10 +- .../openstack}/models/floating_ip.rb | 4 +- .../openstack}/models/floating_ips.rb | 10 +- .../openstack}/models/ike_policies.rb | 10 +- .../openstack}/models/ike_policy.rb | 4 +- .../openstack}/models/ipsec_policies.rb | 10 +- .../openstack}/models/ipsec_policy.rb | 4 +- .../models/ipsec_site_connection.rb | 4 +- .../models/ipsec_site_connections.rb | 10 +- .../openstack}/models/lb_health_monitor.rb | 4 +- .../openstack}/models/lb_health_monitors.rb | 10 +- .../openstack}/models/lb_member.rb | 4 +- .../openstack}/models/lb_members.rb | 10 +- .../openstack}/models/lb_pool.rb | 4 +- .../openstack}/models/lb_pools.rb | 10 +- .../openstack}/models/lb_vip.rb | 4 +- .../openstack}/models/lb_vips.rb | 10 +- .../openstack}/models/network.rb | 4 +- .../models/network_ip_availabilities.rb | 10 +- .../models/network_ip_availability.rb | 4 +- .../openstack}/models/networks.rb | 10 +- .../openstack}/models/port.rb | 4 +- .../openstack}/models/ports.rb | 10 +- .../openstack}/models/rbac_policies.rb | 10 +- .../openstack}/models/rbac_policy.rb | 4 +- .../openstack}/models/router.rb | 6 +- .../openstack}/models/routers.rb | 10 +- .../openstack}/models/security_group.rb | 6 +- .../openstack}/models/security_group_rule.rb | 4 +- .../openstack}/models/security_group_rules.rb | 10 +- .../openstack}/models/security_groups.rb | 10 +- .../openstack}/models/subnet.rb | 4 +- .../openstack}/models/subnet_pool.rb | 4 +- .../openstack}/models/subnet_pools.rb | 10 +- .../openstack}/models/subnets.rb | 10 +- .../openstack}/models/vpn_service.rb | 4 +- .../openstack}/models/vpn_services.rb | 10 +- .../requests/add_router_interface.rb | 4 +- .../requests/associate_floating_ip.rb | 4 +- .../requests/associate_lb_health_monitor.rb | 6 +- .../openstack}/requests/create_floating_ip.rb | 4 +- .../openstack}/requests/create_ike_policy.rb | 4 +- .../requests/create_ipsec_policy.rb | 4 +- .../requests/create_ipsec_site_connection.rb | 4 +- .../requests/create_lb_health_monitor.rb | 4 +- .../openstack}/requests/create_lb_member.rb | 4 +- .../openstack}/requests/create_lb_pool.rb | 4 +- .../openstack}/requests/create_lb_vip.rb | 4 +- .../requests/create_lbaas_healthmonitor.rb | 4 +- .../requests/create_lbaas_l7policy.rb | 4 +- .../requests/create_lbaas_l7rule.rb | 4 +- .../requests/create_lbaas_listener.rb | 4 +- .../requests/create_lbaas_loadbalancer.rb | 4 +- .../openstack}/requests/create_lbaas_pool.rb | 4 +- .../requests/create_lbaas_pool_member.rb | 4 +- .../openstack}/requests/create_network.rb | 8 +- .../openstack}/requests/create_port.rb | 4 +- .../openstack}/requests/create_rbac_policy.rb | 4 +- .../openstack}/requests/create_router.rb | 8 +- .../requests/create_security_group.rb | 4 +- .../requests/create_security_group_rule.rb | 4 +- .../openstack}/requests/create_subnet.rb | 4 +- .../openstack}/requests/create_subnet_pool.rb | 4 +- .../openstack}/requests/create_vpn_service.rb | 4 +- .../openstack}/requests/delete_floating_ip.rb | 6 +- .../openstack}/requests/delete_ike_policy.rb | 6 +- .../requests/delete_ipsec_policy.rb | 6 +- .../requests/delete_ipsec_site_connection.rb | 6 +- .../requests/delete_lb_health_monitor.rb | 6 +- .../openstack}/requests/delete_lb_member.rb | 6 +- .../openstack}/requests/delete_lb_pool.rb | 6 +- .../openstack}/requests/delete_lb_vip.rb | 6 +- .../requests/delete_lbaas_healthmonitor.rb | 6 +- .../requests/delete_lbaas_l7policy.rb | 6 +- .../requests/delete_lbaas_l7rule.rb | 6 +- .../requests/delete_lbaas_listener.rb | 6 +- .../requests/delete_lbaas_loadbalancer.rb | 6 +- .../openstack}/requests/delete_lbaas_pool.rb | 6 +- .../requests/delete_lbaas_pool_member.rb | 6 +- .../openstack}/requests/delete_network.rb | 6 +- .../openstack}/requests/delete_port.rb | 6 +- .../openstack}/requests/delete_quota.rb | 4 +- .../openstack}/requests/delete_rbac_policy.rb | 6 +- .../openstack}/requests/delete_router.rb | 6 +- .../requests/delete_security_group.rb | 6 +- .../requests/delete_security_group_rule.rb | 6 +- .../openstack}/requests/delete_subnet.rb | 6 +- .../openstack}/requests/delete_subnet_pool.rb | 6 +- .../openstack}/requests/delete_vpn_service.rb | 6 +- .../requests/disassociate_floating_ip.rb | 4 +- .../disassociate_lb_health_monitor.rb | 6 +- .../openstack}/requests/get_extension.rb | 6 +- .../openstack}/requests/get_floating_ip.rb | 6 +- .../openstack}/requests/get_ike_policy.rb | 6 +- .../openstack}/requests/get_ipsec_policy.rb | 6 +- .../requests/get_ipsec_site_connection.rb | 6 +- .../requests/get_lb_health_monitor.rb | 6 +- .../openstack}/requests/get_lb_member.rb | 6 +- .../openstack}/requests/get_lb_pool.rb | 6 +- .../openstack}/requests/get_lb_pool_stats.rb | 6 +- .../openstack}/requests/get_lb_vip.rb | 6 +- .../requests/get_lbaas_healthmonitor.rb | 6 +- .../openstack}/requests/get_lbaas_l7policy.rb | 6 +- .../openstack}/requests/get_lbaas_l7rule.rb | 6 +- .../openstack}/requests/get_lbaas_listener.rb | 6 +- .../requests/get_lbaas_loadbalancer.rb | 6 +- .../openstack}/requests/get_lbaas_pool.rb | 6 +- .../requests/get_lbaas_pool_member.rb | 6 +- .../openstack}/requests/get_network.rb | 6 +- .../requests/get_network_ip_availability.rb | 6 +- .../openstack}/requests/get_port.rb | 6 +- .../openstack}/requests/get_quota.rb | 4 +- .../openstack}/requests/get_quotas.rb | 4 +- .../openstack}/requests/get_rbac_policy.rb | 6 +- .../openstack}/requests/get_router.rb | 6 +- .../openstack}/requests/get_security_group.rb | 6 +- .../requests/get_security_group_rule.rb | 6 +- .../openstack}/requests/get_subnet.rb | 6 +- .../openstack}/requests/get_subnet_pool.rb | 6 +- .../openstack}/requests/get_vpn_service.rb | 6 +- .../openstack}/requests/list_extensions.rb | 4 +- .../openstack}/requests/list_floating_ips.rb | 4 +- .../openstack}/requests/list_ike_policies.rb | 4 +- .../requests/list_ipsec_policies.rb | 4 +- .../requests/list_ipsec_site_connections.rb | 4 +- .../requests/list_lb_health_monitors.rb | 4 +- .../openstack}/requests/list_lb_members.rb | 4 +- .../openstack}/requests/list_lb_pools.rb | 4 +- .../openstack}/requests/list_lb_vips.rb | 4 +- .../requests/list_lbaas_healthmonitors.rb | 4 +- .../requests/list_lbaas_l7policies.rb | 4 +- .../openstack}/requests/list_lbaas_l7rules.rb | 4 +- .../requests/list_lbaas_listeners.rb | 4 +- .../requests/list_lbaas_loadbalancers.rb | 4 +- .../requests/list_lbaas_pool_members.rb | 4 +- .../openstack}/requests/list_lbaas_pools.rb | 4 +- .../list_network_ip_availabilities.rb | 6 +- .../openstack}/requests/list_networks.rb | 4 +- .../openstack}/requests/list_ports.rb | 4 +- .../openstack}/requests/list_rbac_policies.rb | 4 +- .../openstack}/requests/list_routers.rb | 4 +- .../requests/list_security_group_rules.rb | 4 +- .../requests/list_security_groups.rb | 4 +- .../openstack}/requests/list_subnet_pools.rb | 4 +- .../openstack}/requests/list_subnets.rb | 4 +- .../openstack}/requests/list_vpn_services.rb | 4 +- .../requests/remove_router_interface.rb | 4 +- .../openstack}/requests/set_tenant.rb | 4 +- .../openstack}/requests/update_ike_policy.rb | 6 +- .../requests/update_ipsec_policy.rb | 6 +- .../requests/update_ipsec_site_connection.rb | 6 +- .../requests/update_lb_health_monitor.rb | 6 +- .../openstack}/requests/update_lb_member.rb | 6 +- .../openstack}/requests/update_lb_pool.rb | 6 +- .../openstack}/requests/update_lb_vip.rb | 6 +- .../requests/update_lbaas_healthmonitor.rb | 6 +- .../requests/update_lbaas_l7policy.rb | 6 +- .../requests/update_lbaas_l7rule.rb | 6 +- .../requests/update_lbaas_listener.rb | 6 +- .../requests/update_lbaas_loadbalancer.rb | 6 +- .../openstack}/requests/update_lbaas_pool.rb | 6 +- .../requests/update_lbaas_pool_member.rb | 6 +- .../openstack}/requests/update_network.rb | 8 +- .../openstack}/requests/update_port.rb | 6 +- .../openstack}/requests/update_quota.rb | 4 +- .../openstack}/requests/update_rbac_policy.rb | 6 +- .../openstack}/requests/update_router.rb | 10 +- .../requests/update_security_group.rb | 6 +- .../openstack}/requests/update_subnet.rb | 6 +- .../openstack}/requests/update_subnet_pool.rb | 6 +- .../openstack}/requests/update_vpn_service.rb | 6 +- .../nfv/nfv.rb => nfv/openstack.rb} | 10 +- .../nfv => nfv/openstack}/models/vnf.rb | 4 +- .../nfv => nfv/openstack}/models/vnfd.rb | 4 +- .../nfv => nfv/openstack}/models/vnfds.rb | 10 +- .../nfv => nfv/openstack}/models/vnfs.rb | 10 +- .../openstack}/requests/create_vnf.rb | 4 +- .../openstack}/requests/create_vnfd.rb | 4 +- .../openstack}/requests/delete_vnf.rb | 4 +- .../openstack}/requests/delete_vnfd.rb | 4 +- .../nfv => nfv/openstack}/requests/get_vnf.rb | 4 +- .../openstack}/requests/get_vnfd.rb | 4 +- .../openstack}/requests/list_vnfds.rb | 4 +- .../openstack}/requests/list_vnfs.rb | 4 +- .../openstack}/requests/update_vnf.rb | 4 +- lib/fog/openstack.rb | 104 ++++++++++++++---- lib/fog/openstack/core.rb | 2 +- lib/fog/openstack/dns/dns.rb | 21 ---- lib/fog/openstack/image/image.rb | 23 ---- lib/fog/openstack/models/meta_parent.rb | 8 +- .../volume/v1/models/availability_zone.rb | 15 --- .../volume/v1/models/availability_zones.rb | 16 --- lib/fog/openstack/volume/v1/models/backups.rb | 16 --- .../openstack/volume/v1/models/snapshots.rb | 16 --- .../openstack/volume/v1/models/transfers.rb | 16 --- .../volume/v1/models/volume_types.rb | 16 --- lib/fog/openstack/volume/v1/models/volumes.rb | 16 --- .../volume/v1/requests/accept_transfer.rb | 2 - .../openstack/volume/v1/requests/action.rb | 2 - .../volume/v1/requests/create_backup.rb | 2 - .../volume/v1/requests/create_transfer.rb | 2 - .../volume/v1/requests/create_volume_type.rb | 2 - .../volume/v1/requests/delete_backup.rb | 2 - .../volume/v1/requests/delete_metadata.rb | 2 - .../volume/v1/requests/delete_snapshot.rb | 2 - .../v1/requests/delete_snapshot_metadata.rb | 2 - .../volume/v1/requests/delete_transfer.rb | 2 - .../volume/v1/requests/delete_volume.rb | 2 - .../volume/v1/requests/delete_volume_type.rb | 2 - .../volume/v1/requests/extend_volume.rb | 2 - .../volume/v1/requests/get_backup_details.rb | 2 - .../openstack/volume/v1/requests/get_quota.rb | 2 - .../volume/v1/requests/get_quota_defaults.rb | 2 - .../volume/v1/requests/get_quota_usage.rb | 2 - .../v1/requests/get_transfer_details.rb | 2 - .../v1/requests/get_volume_type_details.rb | 2 - .../volume/v1/requests/list_backups.rb | 2 - .../v1/requests/list_backups_detailed.rb | 2 - .../volume/v1/requests/list_snapshots.rb | 2 - .../v1/requests/list_snapshots_detailed.rb | 2 - .../volume/v1/requests/list_transfers.rb | 2 - .../v1/requests/list_transfers_detailed.rb | 2 - .../volume/v1/requests/list_volume_types.rb | 2 - .../volume/v1/requests/list_zones.rb | 2 - .../openstack/volume/v1/requests/real_mock.rb | 14 --- .../volume/v1/requests/replace_metadata.rb | 2 - .../volume/v1/requests/restore_backup.rb | 2 - .../volume/v1/requests/set_tenant.rb | 2 - .../volume/v1/requests/update_metadata.rb | 2 - .../volume/v1/requests/update_quota.rb | 2 - .../volume/v1/requests/update_snapshot.rb | 2 - .../v1/requests/update_snapshot_metadata.rb | 2 - .../volume/v1/requests/update_volume.rb | 2 - .../volume/v2/models/availability_zone.rb | 15 --- .../volume/v2/models/availability_zones.rb | 16 --- lib/fog/openstack/volume/v2/models/backups.rb | 16 --- .../openstack/volume/v2/models/snapshots.rb | 16 --- .../openstack/volume/v2/models/transfers.rb | 16 --- .../volume/v2/models/volume_types.rb | 16 --- lib/fog/openstack/volume/v2/models/volumes.rb | 16 --- .../volume/v2/requests/accept_transfer.rb | 2 - .../openstack/volume/v2/requests/action.rb | 2 - .../volume/v2/requests/create_backup.rb | 2 - .../volume/v2/requests/create_transfer.rb | 2 - .../volume/v2/requests/create_volume_type.rb | 2 - .../volume/v2/requests/delete_backup.rb | 2 - .../volume/v2/requests/delete_metadata.rb | 2 - .../volume/v2/requests/delete_snapshot.rb | 2 - .../v2/requests/delete_snapshot_metadata.rb | 2 - .../volume/v2/requests/delete_transfer.rb | 2 - .../volume/v2/requests/delete_volume.rb | 2 - .../volume/v2/requests/delete_volume_type.rb | 2 - .../volume/v2/requests/extend_volume.rb | 2 - .../volume/v2/requests/get_backup_details.rb | 2 - .../openstack/volume/v2/requests/get_quota.rb | 2 - .../volume/v2/requests/get_quota_defaults.rb | 2 - .../volume/v2/requests/get_quota_usage.rb | 2 - .../v2/requests/get_transfer_details.rb | 2 - .../v2/requests/get_volume_type_details.rb | 2 - .../volume/v2/requests/list_backups.rb | 2 - .../v2/requests/list_backups_detailed.rb | 2 - .../volume/v2/requests/list_snapshots.rb | 2 - .../v2/requests/list_snapshots_detailed.rb | 2 - .../volume/v2/requests/list_transfers.rb | 2 - .../v2/requests/list_transfers_detailed.rb | 2 - .../volume/v2/requests/list_volume_types.rb | 2 - .../volume/v2/requests/list_zones.rb | 2 - .../openstack/volume/v2/requests/real_mock.rb | 14 --- .../volume/v2/requests/replace_metadata.rb | 2 - .../volume/v2/requests/restore_backup.rb | 2 - .../volume/v2/requests/set_tenant.rb | 2 - .../volume/v2/requests/snapshot_action.rb | 2 - .../volume/v2/requests/update_metadata.rb | 2 - .../volume/v2/requests/update_quota.rb | 2 - .../volume/v2/requests/update_snapshot.rb | 2 - .../v2/requests/update_snapshot_metadata.rb | 2 - .../volume/v2/requests/update_volume.rb | 2 - .../volume/v2/requests/update_volume_type.rb | 2 - .../openstack.rb} | 12 +- .../openstack}/models/event.rb | 4 +- .../openstack}/models/events.rb | 10 +- .../openstack}/models/resource.rb | 4 +- .../openstack}/models/resource_schemas.rb | 6 +- .../openstack}/models/resources.rb | 12 +- .../openstack}/models/stack.rb | 6 +- .../openstack}/models/stacks.rb | 10 +- .../openstack}/models/template.rb | 4 +- .../openstack}/models/templates.rb | 10 +- .../openstack}/requests/abandon_stack.rb | 4 +- .../openstack}/requests/build_info.rb | 4 +- .../openstack}/requests/cancel_update.rb | 4 +- .../openstack}/requests/create_stack.rb | 6 +- .../openstack}/requests/delete_stack.rb | 4 +- .../openstack}/requests/get_stack_template.rb | 4 +- .../openstack}/requests/list_events.rb | 4 +- .../requests/list_resource_events.rb | 4 +- .../requests/list_resource_types.rb | 4 +- .../openstack}/requests/list_resources.rb | 4 +- .../openstack}/requests/list_stack_data.rb | 4 +- .../requests/list_stack_data_detailed.rb | 4 +- .../openstack}/requests/list_stack_events.rb | 4 +- .../openstack}/requests/patch_stack.rb | 6 +- .../openstack}/requests/preview_stack.rb | 4 +- .../openstack}/requests/show_event_details.rb | 4 +- .../openstack}/requests/show_resource_data.rb | 4 +- .../requests/show_resource_metadata.rb | 4 +- .../requests/show_resource_schema.rb | 4 +- .../requests/show_resource_template.rb | 4 +- .../openstack}/requests/show_stack_details.rb | 4 +- .../openstack}/requests/update_stack.rb | 6 +- .../openstack}/requests/validate_template.rb | 4 +- .../util/recursive_hot_file_loader.rb | 4 +- .../planning.rb => planning/openstack.rb} | 10 +- .../openstack}/models/plan.rb | 0 .../openstack}/models/plans.rb | 2 +- .../openstack}/models/role.rb | 0 .../openstack}/models/roles.rb | 2 +- .../openstack}/requests/add_role_to_plan.rb | 0 .../openstack}/requests/create_plan.rb | 0 .../openstack}/requests/delete_plan.rb | 0 .../openstack}/requests/get_plan.rb | 0 .../openstack}/requests/get_plan_templates.rb | 0 .../openstack}/requests/list_plans.rb | 0 .../openstack}/requests/list_roles.rb | 0 .../openstack}/requests/patch_plan.rb | 0 .../requests/remove_role_from_plan.rb | 0 .../openstack.rb} | 10 +- .../openstack}/models/availability_zone.rb | 4 +- .../openstack}/models/availability_zones.rb | 8 +- .../openstack}/models/network.rb | 4 +- .../openstack}/models/networks.rb | 8 +- .../openstack}/models/share.rb | 6 +- .../openstack}/models/share_access_rule.rb | 4 +- .../openstack}/models/share_access_rules.rb | 8 +- .../models/share_export_location.rb | 6 +- .../models/share_export_locations.rb | 12 +- .../openstack}/models/shares.rb | 8 +- .../openstack}/models/snapshot.rb | 4 +- .../openstack}/models/snapshots.rb | 8 +- .../add_security_service_to_share_network.rb | 4 +- .../requests/create_security_service.rb | 4 +- .../openstack}/requests/create_share.rb | 4 +- .../requests/create_share_network.rb | 4 +- .../openstack}/requests/create_snapshot.rb | 4 +- .../requests/delete_security_service.rb | 4 +- .../openstack}/requests/delete_share.rb | 4 +- .../requests/delete_share_network.rb | 4 +- .../openstack}/requests/delete_snapshot.rb | 4 +- .../openstack}/requests/extend_share.rb | 4 +- .../openstack}/requests/get_limits.rb | 4 +- .../openstack}/requests/get_quota.rb | 4 +- .../requests/get_security_service.rb | 4 +- .../openstack}/requests/get_share.rb | 4 +- .../requests/get_share_export_location.rb | 6 +- .../openstack}/requests/get_share_network.rb | 4 +- .../openstack}/requests/get_snapshot.rb | 4 +- .../openstack}/requests/grant_share_access.rb | 4 +- .../requests/list_availability_zones.rb | 4 +- .../requests/list_security_services.rb | 4 +- .../requests/list_security_services_detail.rb | 4 +- .../requests/list_share_access_rules.rb | 4 +- .../requests/list_share_export_locations.rb | 6 +- .../requests/list_share_networks.rb | 4 +- .../requests/list_share_networks_detail.rb | 4 +- .../openstack}/requests/list_shares.rb | 4 +- .../openstack}/requests/list_shares_detail.rb | 4 +- .../openstack}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detail.rb | 4 +- ...ove_security_service_from_share_network.rb | 4 +- .../requests/revoke_share_access.rb | 4 +- .../openstack}/requests/share_action.rb | 4 +- .../requests/share_network_action.rb | 4 +- .../openstack}/requests/shrink_share.rb | 4 +- .../openstack}/requests/update_quota.rb | 4 +- .../requests/update_security_service.rb | 4 +- .../openstack}/requests/update_share.rb | 4 +- .../requests/update_share_network.rb | 4 +- .../openstack}/requests/update_snapshot.rb | 4 +- .../storage.rb => storage/openstack.rb} | 12 +- .../openstack}/models/directories.rb | 10 +- .../openstack}/models/directory.rb | 10 +- .../openstack}/models/file.rb | 4 +- .../openstack}/models/files.rb | 12 +- .../openstack}/requests/copy_object.rb | 4 +- .../openstack}/requests/delete_container.rb | 4 +- .../requests/delete_multiple_objects.rb | 4 +- .../openstack}/requests/delete_object.rb | 4 +- .../requests/delete_static_large_object.rb | 4 +- .../openstack}/requests/get_container.rb | 4 +- .../openstack}/requests/get_containers.rb | 4 +- .../openstack}/requests/get_object.rb | 4 +- .../requests/get_object_http_url.rb | 4 +- .../requests/get_object_https_url.rb | 4 +- .../openstack}/requests/head_container.rb | 4 +- .../openstack}/requests/head_containers.rb | 4 +- .../openstack}/requests/head_object.rb | 4 +- .../openstack}/requests/post_object.rb | 4 +- .../requests/post_set_meta_temp_url_key.rb | 4 +- .../openstack}/requests/public_url.rb | 4 +- .../openstack}/requests/put_container.rb | 4 +- .../requests/put_dynamic_obj_manifest.rb | 6 +- .../openstack}/requests/put_object.rb | 4 +- .../requests/put_object_manifest.rb | 4 +- .../requests/put_static_obj_manifest.rb | 6 +- .../volume/volume.rb => volume/openstack.rb} | 14 +-- .../openstack}/models/availability_zone.rb | 4 +- .../openstack}/models/availability_zones.rb | 4 +- .../openstack}/models/backup.rb | 4 +- .../openstack}/models/backups.rb | 6 +- .../openstack}/models/snapshot.rb | 4 +- .../openstack}/models/snapshots.rb | 6 +- .../openstack}/models/transfer.rb | 4 +- .../openstack}/models/transfers.rb | 6 +- .../openstack}/models/volume.rb | 4 +- .../openstack}/models/volume_type.rb | 4 +- .../openstack}/models/volume_types.rb | 6 +- .../openstack}/models/volumes.rb | 6 +- .../openstack}/requests/accept_transfer.rb | 4 +- .../openstack}/requests/action.rb | 4 +- .../openstack}/requests/create_backup.rb | 4 +- .../openstack}/requests/create_snapshot.rb | 4 +- .../openstack}/requests/create_transfer.rb | 4 +- .../openstack}/requests/create_volume.rb | 4 +- .../openstack}/requests/create_volume_type.rb | 4 +- .../openstack}/requests/delete_backup.rb | 4 +- .../openstack}/requests/delete_metadata.rb | 4 +- .../openstack}/requests/delete_snapshot.rb | 4 +- .../requests/delete_snapshot_metadata.rb | 4 +- .../openstack}/requests/delete_transfer.rb | 4 +- .../openstack}/requests/delete_volume.rb | 4 +- .../openstack}/requests/delete_volume_type.rb | 4 +- .../openstack}/requests/extend_volume.rb | 4 +- .../openstack}/requests/get_backup_details.rb | 4 +- .../openstack}/requests/get_quota.rb | 4 +- .../openstack}/requests/get_quota_defaults.rb | 4 +- .../openstack}/requests/get_quota_usage.rb | 4 +- .../requests/get_snapshot_details.rb | 4 +- .../requests/get_transfer_details.rb | 4 +- .../openstack}/requests/get_volume_details.rb | 4 +- .../requests/get_volume_type_details.rb | 4 +- .../openstack}/requests/list_backups.rb | 4 +- .../requests/list_backups_detailed.rb | 4 +- .../openstack}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detailed.rb | 4 +- .../openstack}/requests/list_transfers.rb | 4 +- .../requests/list_transfers_detailed.rb | 4 +- .../openstack}/requests/list_volume_types.rb | 4 +- .../openstack}/requests/list_volumes.rb | 4 +- .../requests/list_volumes_detailed.rb | 4 +- .../openstack}/requests/list_zones.rb | 4 +- .../openstack}/requests/replace_metadata.rb | 4 +- .../openstack}/requests/restore_backup.rb | 4 +- .../openstack}/requests/set_tenant.rb | 4 +- .../openstack}/requests/snapshot_action.rb | 4 +- .../openstack}/requests/update_metadata.rb | 4 +- .../openstack}/requests/update_quota.rb | 4 +- .../openstack}/requests/update_snapshot.rb | 4 +- .../requests/update_snapshot_metadata.rb | 4 +- .../openstack}/requests/update_volume.rb | 4 +- .../openstack}/requests/update_volume_type.rb | 4 +- .../volume => volume/openstack}/v1.rb | 14 +-- .../openstack/v1/models/availability_zone.rb | 15 +++ .../openstack/v1/models/availability_zones.rb | 16 +++ .../openstack}/v1/models/backup.rb | 8 +- lib/fog/volume/openstack/v1/models/backups.rb | 16 +++ .../openstack}/v1/models/snapshot.rb | 8 +- .../volume/openstack/v1/models/snapshots.rb | 16 +++ .../openstack}/v1/models/transfer.rb | 8 +- .../volume/openstack/v1/models/transfers.rb | 16 +++ .../openstack}/v1/models/volume.rb | 8 +- .../openstack}/v1/models/volume_type.rb | 8 +- .../openstack/v1/models/volume_types.rb | 16 +++ lib/fog/volume/openstack/v1/models/volumes.rb | 16 +++ .../openstack/v1/requests/accept_transfer.rb | 2 + .../volume/openstack/v1/requests/action.rb | 2 + .../openstack/v1/requests/create_backup.rb | 2 + .../openstack}/v1/requests/create_snapshot.rb | 8 +- .../openstack/v1/requests/create_transfer.rb | 2 + .../openstack}/v1/requests/create_volume.rb | 8 +- .../v1/requests/create_volume_type.rb | 2 + .../openstack/v1/requests/delete_backup.rb | 2 + .../openstack/v1/requests/delete_metadata.rb | 2 + .../openstack/v1/requests/delete_snapshot.rb | 2 + .../v1/requests/delete_snapshot_metadata.rb | 2 + .../openstack/v1/requests/delete_transfer.rb | 2 + .../openstack/v1/requests/delete_volume.rb | 2 + .../v1/requests/delete_volume_type.rb | 2 + .../openstack/v1/requests/extend_volume.rb | 2 + .../v1/requests/get_backup_details.rb | 2 + .../volume/openstack/v1/requests/get_quota.rb | 2 + .../v1/requests/get_quota_defaults.rb | 2 + .../openstack/v1/requests/get_quota_usage.rb | 2 + .../v1/requests/get_snapshot_details.rb | 8 +- .../v1/requests/get_transfer_details.rb | 2 + .../v1/requests/get_volume_details.rb | 8 +- .../v1/requests/get_volume_type_details.rb | 2 + .../openstack/v1/requests/list_backups.rb | 2 + .../v1/requests/list_backups_detailed.rb | 2 + .../openstack/v1/requests/list_snapshots.rb | 2 + .../v1/requests/list_snapshots_detailed.rb | 2 + .../openstack/v1/requests/list_transfers.rb | 2 + .../v1/requests/list_transfers_detailed.rb | 2 + .../v1/requests/list_volume_types.rb | 2 + .../openstack}/v1/requests/list_volumes.rb | 8 +- .../v1/requests/list_volumes_detailed.rb | 8 +- .../openstack/v1/requests/list_zones.rb | 2 + .../openstack}/v1/requests/real.rb | 6 +- .../volume/openstack/v1/requests/real_mock.rb | 14 +++ .../openstack/v1/requests/replace_metadata.rb | 2 + .../openstack/v1/requests/restore_backup.rb | 2 + .../openstack/v1/requests/set_tenant.rb | 2 + .../openstack/v1/requests/update_metadata.rb | 2 + .../openstack/v1/requests/update_quota.rb | 2 + .../openstack/v1/requests/update_snapshot.rb | 2 + .../v1/requests/update_snapshot_metadata.rb | 2 + .../openstack/v1/requests/update_volume.rb | 2 + .../volume => volume/openstack}/v2.rb | 14 +-- .../openstack/v2/models/availability_zone.rb | 15 +++ .../openstack/v2/models/availability_zones.rb | 16 +++ .../openstack}/v2/models/backup.rb | 8 +- lib/fog/volume/openstack/v2/models/backups.rb | 16 +++ .../openstack}/v2/models/snapshot.rb | 8 +- .../volume/openstack/v2/models/snapshots.rb | 16 +++ .../openstack}/v2/models/transfer.rb | 8 +- .../volume/openstack/v2/models/transfers.rb | 16 +++ .../openstack}/v2/models/volume.rb | 8 +- .../openstack}/v2/models/volume_type.rb | 8 +- .../openstack/v2/models/volume_types.rb | 16 +++ lib/fog/volume/openstack/v2/models/volumes.rb | 16 +++ .../openstack/v2/requests/accept_transfer.rb | 2 + .../volume/openstack/v2/requests/action.rb | 2 + .../openstack/v2/requests/create_backup.rb | 2 + .../openstack}/v2/requests/create_snapshot.rb | 8 +- .../openstack/v2/requests/create_transfer.rb | 2 + .../openstack}/v2/requests/create_volume.rb | 8 +- .../v2/requests/create_volume_type.rb | 2 + .../openstack/v2/requests/delete_backup.rb | 2 + .../openstack/v2/requests/delete_metadata.rb | 2 + .../openstack/v2/requests/delete_snapshot.rb | 2 + .../v2/requests/delete_snapshot_metadata.rb | 2 + .../openstack/v2/requests/delete_transfer.rb | 2 + .../openstack/v2/requests/delete_volume.rb | 2 + .../v2/requests/delete_volume_type.rb | 2 + .../openstack/v2/requests/extend_volume.rb | 2 + .../v2/requests/get_backup_details.rb | 2 + .../volume/openstack/v2/requests/get_quota.rb | 2 + .../v2/requests/get_quota_defaults.rb | 2 + .../openstack/v2/requests/get_quota_usage.rb | 2 + .../v2/requests/get_snapshot_details.rb | 8 +- .../v2/requests/get_transfer_details.rb | 2 + .../v2/requests/get_volume_details.rb | 8 +- .../v2/requests/get_volume_type_details.rb | 2 + .../openstack/v2/requests/list_backups.rb | 2 + .../v2/requests/list_backups_detailed.rb | 2 + .../openstack/v2/requests/list_snapshots.rb | 2 + .../v2/requests/list_snapshots_detailed.rb | 2 + .../openstack/v2/requests/list_transfers.rb | 2 + .../v2/requests/list_transfers_detailed.rb | 2 + .../v2/requests/list_volume_types.rb | 2 + .../openstack}/v2/requests/list_volumes.rb | 8 +- .../v2/requests/list_volumes_detailed.rb | 8 +- .../openstack/v2/requests/list_zones.rb | 2 + .../openstack}/v2/requests/real.rb | 6 +- .../volume/openstack/v2/requests/real_mock.rb | 14 +++ .../openstack/v2/requests/replace_metadata.rb | 2 + .../openstack/v2/requests/restore_backup.rb | 2 + .../openstack/v2/requests/set_tenant.rb | 2 + .../openstack/v2/requests/snapshot_action.rb | 2 + .../openstack/v2/requests/update_metadata.rb | 2 + .../openstack/v2/requests/update_quota.rb | 2 + .../openstack/v2/requests/update_snapshot.rb | 2 + .../v2/requests/update_snapshot_metadata.rb | 2 + .../openstack/v2/requests/update_volume.rb | 2 + .../v2/requests/update_volume_type.rb | 2 + .../workflow.rb => workflow/openstack.rb} | 10 +- .../workflow => workflow/openstack}/v2.rb | 10 +- .../openstack}/v2/requests/create_action.rb | 4 +- .../v2/requests/create_action_execution.rb | 4 +- .../v2/requests/create_cron_trigger.rb | 4 +- .../v2/requests/create_environment.rb | 4 +- .../v2/requests/create_execution.rb | 4 +- .../openstack}/v2/requests/create_workbook.rb | 4 +- .../openstack}/v2/requests/create_workflow.rb | 4 +- .../openstack}/v2/requests/delete_action.rb | 4 +- .../v2/requests/delete_action_execution.rb | 4 +- .../v2/requests/delete_cron_trigger.rb | 4 +- .../v2/requests/delete_environment.rb | 4 +- .../v2/requests/delete_execution.rb | 4 +- .../openstack}/v2/requests/delete_workbook.rb | 4 +- .../openstack}/v2/requests/delete_workflow.rb | 4 +- .../openstack}/v2/requests/get_action.rb | 4 +- .../v2/requests/get_action_execution.rb | 4 +- .../v2/requests/get_cron_trigger.rb | 4 +- .../openstack}/v2/requests/get_environment.rb | 4 +- .../openstack}/v2/requests/get_execution.rb | 4 +- .../openstack}/v2/requests/get_task.rb | 4 +- .../openstack}/v2/requests/get_workbook.rb | 4 +- .../openstack}/v2/requests/get_workflow.rb | 4 +- .../v2/requests/list_action_executions.rb | 4 +- .../openstack}/v2/requests/list_actions.rb | 4 +- .../v2/requests/list_cron_triggers.rb | 4 +- .../v2/requests/list_environments.rb | 4 +- .../openstack}/v2/requests/list_executions.rb | 4 +- .../openstack}/v2/requests/list_services.rb | 4 +- .../openstack}/v2/requests/list_tasks.rb | 4 +- .../openstack}/v2/requests/list_workbooks.rb | 4 +- .../openstack}/v2/requests/list_workflows.rb | 4 +- .../openstack}/v2/requests/rerun_task.rb | 4 +- .../openstack}/v2/requests/update_action.rb | 4 +- .../v2/requests/update_action_execution.rb | 4 +- .../v2/requests/update_environment.rb | 4 +- .../v2/requests/update_execution.rb | 4 +- .../openstack}/v2/requests/update_workbook.rb | 4 +- .../openstack}/v2/requests/update_workflow.rb | 4 +- .../openstack}/v2/requests/validate_action.rb | 4 +- .../v2/requests/validate_workbook.rb | 4 +- .../v2/requests/validate_workflow.rb | 4 +- spec/dns_v2_spec.rb | 4 +- spec/identity_v3_spec.rb | 70 ++++++------ spec/image_v1_spec.rb | 4 +- spec/image_v2_spec.rb | 6 +- spec/image_v2_upload_spec.rb | 6 +- spec/monitoring_spec.rb | 12 +- spec/network_spec.rb | 8 +- spec/shared_context.rb | 4 +- spec/shared_file_system_spec.rb | 6 +- spec/volume_spec.rb | 44 ++++---- test/authenticate_tests.rb | 4 +- test/helpers/collection_helper.rb | 6 +- test/helpers/container_infra_helper.rb | 2 +- test/helpers/dns_v2_helper.rb | 2 +- test/helpers/network_helper.rb | 2 +- test/helpers/nfv_helper.rb | 2 +- test/identity_version_tests.rb | 4 +- test/models/compute/images_tests.rb | 4 +- test/models/compute/security_group_tests.rb | 4 +- test/models/compute/server_group_tests.rb | 6 +- test/models/compute/server_tests.rb | 6 +- test/models/compute/service_tests.rb | 6 +- .../models/container_infra/bay_model_tests.rb | 2 +- test/models/container_infra/bay_tests.rb | 2 +- .../container_infra/certificate_tests.rb | 2 +- .../container_infra/cluster_template_tests.rb | 2 +- test/models/container_infra/cluster_tests.rb | 2 +- test/models/identity/ec2_credential_tests.rb | 2 +- test/models/identity/ec2_credentials_tests.rb | 6 +- test/models/identity/role_tests.rb | 2 +- test/models/identity/roles_tests.rb | 4 +- test/models/identity/tenant_tests.rb | 2 +- test/models/identity/tenants_tests.rb | 8 +- test/models/identity/user_tests.rb | 2 +- test/models/identity/users_tests.rb | 8 +- test/models/image/image_tests.rb | 4 +- test/models/image/images_tests.rb | 10 +- test/models/network/floating_ip_tests.rb | 2 +- test/models/network/floating_ips_tests.rb | 2 +- test/models/network/ike_policies_tests.rb | 2 +- test/models/network/ike_policy_tests.rb | 2 +- test/models/network/ipsec_policies_tests.rb | 2 +- test/models/network/ipsec_policy_tests.rb | 2 +- .../network/ipsec_site_connection_tests.rb | 2 +- .../network/ipsec_site_connections_tests.rb | 2 +- .../models/network/lb_health_monitor_tests.rb | 2 +- .../network/lb_health_monitors_tests.rb | 2 +- test/models/network/lb_member_tests.rb | 2 +- test/models/network/lb_members_tests.rb | 2 +- test/models/network/lb_pool_tests.rb | 2 +- test/models/network/lb_pools_tests.rb | 2 +- test/models/network/lb_vip_tests.rb | 2 +- test/models/network/lb_vips_tests.rb | 2 +- test/models/network/network_tests.rb | 2 +- test/models/network/networks_tests.rb | 2 +- test/models/network/port_tests.rb | 2 +- test/models/network/ports_tests.rb | 2 +- test/models/network/router_tests.rb | 2 +- test/models/network/routers_tests.rb | 2 +- .../network/security_group_rule_tests.rb | 2 +- .../network/security_group_rules_tests.rb | 2 +- test/models/network/security_group_tests.rb | 2 +- test/models/network/security_groups_tests.rb | 2 +- test/models/network/subnet_pools_tests.rb | 2 +- test/models/network/subnet_tests.rb | 2 +- test/models/network/subnets_tests.rb | 2 +- test/models/network/vpn_service_tests.rb | 2 +- test/models/network/vpn_services_tests.rb | 2 +- test/models/planning/plan_tests.rb | 4 +- test/models/planning/plans_tests.rb | 4 +- test/models/planning/role_tests.rb | 6 +- test/models/storage/file_tests.rb | 2 +- test/requests/baremetal/chassis_tests.rb | 4 +- test/requests/baremetal/driver_tests.rb | 4 +- test/requests/baremetal/node_tests.rb | 4 +- test/requests/baremetal/port_tests.rb | 8 +- test/requests/compute/address_tests.rb | 4 +- test/requests/compute/aggregate_tests.rb | 4 +- .../compute/availability_zone_tests.rb | 6 +- test/requests/compute/flavor_tests.rb | 16 +-- test/requests/compute/helper.rb | 8 +- test/requests/compute/image_tests.rb | 10 +- test/requests/compute/keypair_tests.rb | 8 +- test/requests/compute/limit_tests.rb | 10 +- test/requests/compute/quota_tests.rb | 6 +- test/requests/compute/security_group_tests.rb | 2 +- test/requests/compute/server_tests.rb | 20 ++-- test/requests/compute/service_tests.rb | 10 +- test/requests/compute/tenant_tests.rb | 6 +- test/requests/compute/volume_tests.rb | 4 +- .../container_infra/bay_model_tests.rb | 2 +- test/requests/container_infra/bay_tests.rb | 2 +- .../container_infra/certificate_tests.rb | 2 +- .../container_infra/cluster_template_tests.rb | 2 +- .../requests/container_infra/cluster_tests.rb | 2 +- test/requests/dns_v1/domain_tests.rb | 4 +- test/requests/dns_v1/quota_tests.rb | 4 +- test/requests/dns_v2/pool_tests.rb | 2 +- test/requests/dns_v2/quota_tests.rb | 4 +- test/requests/dns_v2/recordset_tests.rb | 2 +- test/requests/dns_v2/zone_tests.rb | 2 +- test/requests/event/event_tests.rb | 4 +- .../identity/ec2_credentials_tests.rb | 2 +- test/requests/identity/role_tests.rb | 2 +- test/requests/identity/tenant_tests.rb | 2 +- test/requests/identity/user_tests.rb | 2 +- test/requests/image/image_tests.rb | 24 ++-- .../introspection/introspection_tests.rb | 4 +- test/requests/introspection/rules_tests.rb | 2 +- test/requests/metering/event_tests.rb | 4 +- test/requests/metering/meter_tests.rb | 4 +- test/requests/metering/resource_tests.rb | 4 +- test/requests/metric/metric_test.rb | 4 +- test/requests/metric/resource_test.rb | 4 +- test/requests/network/extension_tests.rb | 4 +- test/requests/network/ike_policy_tests.rb | 8 +- test/requests/network/ipsec_policy_tests.rb | 8 +- .../network/ipsec_site_connection_tests.rb | 8 +- .../network/lb_health_monitor_tests.rb | 12 +- test/requests/network/lb_member_tests.rb | 8 +- test/requests/network/lb_pool_tests.rb | 8 +- test/requests/network/lb_vip_tests.rb | 8 +- test/requests/network/network_tests.rb | 8 +- test/requests/network/port_tests.rb | 8 +- test/requests/network/quota_tests.rb | 4 +- test/requests/network/router_tests.rb | 8 +- .../network/security_group_rule_tests.rb | 6 +- test/requests/network/security_group_tests.rb | 6 +- test/requests/network/subnet_pool_tests.rb | 8 +- test/requests/network/subnet_tests.rb | 8 +- test/requests/network/vpn_service_tests.rb | 8 +- .../stack_files_util_helper_tests.rb | 6 +- .../orchestration/stack_files_util_tests.rb | 18 +-- test/requests/orchestration/stack_tests.rb | 6 +- test/requests/planning/plan_tests.rb | 22 ++-- test/requests/planning/role_tests.rb | 4 +- .../shared_file_system/quota_tests.rb | 4 +- test/requests/storage/container_tests.rb | 12 +- test/requests/storage/large_object_tests.rb | 8 +- test/requests/storage/object_tests.rb | 86 +++++++-------- .../volume/availability_zone_tests.rb | 4 +- test/requests/volume/backup_tests.rb | 4 +- test/requests/volume/quota_tests.rb | 6 +- test/requests/volume/volume_type_tests.rb | 4 +- test/requests/workflow/workflow_tests.rb | 8 +- test/storage_tests.rb | 4 +- test/volume_tests.rb | 10 +- 1360 files changed, 3774 insertions(+), 3712 deletions(-) rename lib/fog/{openstack/baremetal/baremetal.rb => baremetal/openstack.rb} (97%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/chassis.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/chassis_collection.rb (89%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/driver.rb (91%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/drivers.rb (72%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/node.rb (98%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/nodes.rb (89%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/port.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/models/ports.rb (89%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/create_chassis.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/create_node.rb (97%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/create_port.rb (97%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/delete_chassis.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/delete_node.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/delete_port.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/get_chassis.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/get_driver.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/get_driver_properties.rb (97%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/get_node.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/get_port.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_chassis.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_chassis_detailed.rb (93%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_drivers.rb (92%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_nodes.rb (95%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_nodes_detailed.rb (93%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_ports.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/list_ports_detailed.rb (93%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/patch_chassis.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/patch_node.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/patch_port.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/set_node_maintenance.rb (95%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/set_node_power_state.rb (95%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/set_node_provision_state.rb (96%) rename lib/fog/{openstack/baremetal => baremetal/openstack}/requests/unset_node_maintenance.rb (95%) rename lib/fog/{openstack/compute/compute.rb => compute/openstack.rb} (98%) rename lib/fog/{openstack/compute => compute/openstack}/models/address.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/models/addresses.rb (74%) rename lib/fog/{openstack/compute => compute/openstack}/models/aggregate.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/models/aggregates.rb (78%) rename lib/fog/{openstack/compute => compute/openstack}/models/availability_zone.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/models/availability_zones.rb (74%) rename lib/fog/{openstack/compute => compute/openstack}/models/flavor.rb (86%) rename lib/fog/{openstack/compute => compute/openstack}/models/flavors.rb (75%) rename lib/fog/{openstack/compute => compute/openstack}/models/host.rb (81%) rename lib/fog/{openstack/compute => compute/openstack}/models/hosts.rb (73%) rename lib/fog/{openstack/compute => compute/openstack}/models/image.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/models/images.rb (80%) rename lib/fog/{openstack/compute => compute/openstack}/models/key_pair.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/models/key_pairs.rb (74%) rename lib/fog/{openstack/compute => compute/openstack}/models/metadata.rb (79%) rename lib/fog/{openstack/compute => compute/openstack}/models/metadatum.rb (85%) rename lib/fog/{openstack/compute => compute/openstack}/models/network.rb (84%) rename lib/fog/{openstack/compute => compute/openstack}/models/networks.rb (81%) rename lib/fog/{openstack/compute => compute/openstack}/models/os_interface.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/models/os_interfaces.rb (78%) rename lib/fog/{openstack/compute => compute/openstack}/models/security_group.rb (85%) rename lib/fog/{openstack/compute => compute/openstack}/models/security_group_rule.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/models/security_group_rules.rb (65%) rename lib/fog/{openstack/compute => compute/openstack}/models/security_groups.rb (70%) rename lib/fog/{openstack/compute => compute/openstack}/models/server.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/models/server_group.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/models/server_groups.rb (74%) rename lib/fog/{openstack/compute => compute/openstack}/models/servers.rb (75%) rename lib/fog/{openstack/compute => compute/openstack}/models/service.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/models/services.rb (83%) rename lib/fog/{openstack/compute => compute/openstack}/models/snapshot.rb (90%) rename lib/fog/{openstack/compute => compute/openstack}/models/snapshots.rb (84%) rename lib/fog/{openstack/compute => compute/openstack}/models/tenant.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/models/tenants.rb (78%) rename lib/fog/{openstack/compute => compute/openstack}/models/volume.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/models/volume_attachment.rb (85%) rename lib/fog/{openstack/compute => compute/openstack}/models/volume_attachments.rb (71%) rename lib/fog/{openstack/compute => compute/openstack}/models/volumes.rb (84%) rename lib/fog/{openstack/compute => compute/openstack}/requests/add_aggregate_host.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/add_fixed_ip.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/add_flavor_access.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/add_security_group.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/requests/allocate_address.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/associate_address.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/attach_volume.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/boot_from_snapshot.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/change_server_password.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/confirm_resize_server.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_aggregate.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_flavor.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_flavor_metadata.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_image.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_key_pair.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_os_interface.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_security_group.rb (90%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_security_group_rule.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_server.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_server_group.rb (80%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_snapshot.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/create_volume.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_aggregate.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_flavor.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_flavor_metadata.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_image.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_key_pair.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_meta.rb (85%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_metadata.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_os_interface.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_security_group.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_security_group_rule.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_server_group.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_service.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_snapshot.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/requests/delete_volume.rb (86%) rename lib/fog/{openstack/compute => compute/openstack}/requests/detach_volume.rb (89%) rename lib/fog/{openstack/compute => compute/openstack}/requests/disable_service.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/disable_service_log_reason.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/disassociate_address.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/enable_service.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/evacuate_server.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_address.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_aggregate.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_console_output.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_flavor_details.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_flavor_metadata.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_host_details.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_hypervisor.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_hypervisor_statistics.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_image_details.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_key_pair.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_limits.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_metadata.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_os_interface.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_quota.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_quota_defaults.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_security_group.rb (90%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_security_group_rule.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_server_details.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_server_group.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_server_password.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_server_volumes.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_snapshot_details.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_usage.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_vnc_console.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/get_volume_details.rb (89%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_address_pools.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_addresses.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_aggregates.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_all_addresses.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_availability_zones.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_flavors.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_flavors_detail.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_hosts.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_hypervisor_servers.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_hypervisors.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_hypervisors_detail.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_images.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_images_detail.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_key_pairs.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_metadata.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_os_interfaces.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_private_addresses.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_public_addresses.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_security_groups.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_server_groups.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_servers.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_servers_detail.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_services.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_snapshots.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_snapshots_detail.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_tenants_with_flavor_access.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_usages.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_volume_attachments.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_volumes.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_volumes_detail.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_zones.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/list_zones_detailed.rb (98%) rename lib/fog/{openstack/compute => compute/openstack}/requests/live_migrate_server.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/migrate_server.rb (90%) rename lib/fog/{openstack/compute => compute/openstack}/requests/pause_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/reboot_server.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/requests/rebuild_server.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/release_address.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/remote_consoles.rb (97%) rename lib/fog/{openstack/compute => compute/openstack}/requests/remove_aggregate_host.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/remove_fixed_ip.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/remove_flavor_access.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/remove_security_group.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/requests/rescue_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/reset_server_state.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/resize_server.rb (91%) rename lib/fog/{openstack/compute => compute/openstack}/requests/resume_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/revert_resize_server.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/server_action.rb (89%) rename lib/fog/{openstack/compute => compute/openstack}/requests/server_actions.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/server_diagnostics.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/set_metadata.rb (86%) rename lib/fog/{openstack/compute => compute/openstack}/requests/set_tenant.rb (88%) rename lib/fog/{openstack/compute => compute/openstack}/requests/shelve_offload_server.rb (93%) rename lib/fog/{openstack/compute => compute/openstack}/requests/shelve_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/start_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/stop_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/suspend_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/unpause_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/unshelve_server.rb (92%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_aggregate.rb (96%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_aggregate_metadata.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_flavor_metadata.rb (95%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_meta.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_metadata.rb (87%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_quota.rb (94%) rename lib/fog/{openstack/compute => compute/openstack}/requests/update_server.rb (89%) rename lib/fog/{openstack/container_infra/container_infra.rb => container_infra/openstack.rb} (94%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/base.rb (76%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/bay.rb (92%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/bay_model.rb (93%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/bay_models.rb (64%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/bays.rb (63%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/certificate.rb (73%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/certificates.rb (64%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/cluster.rb (92%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/cluster_template.rb (93%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/cluster_templates.rb (65%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/models/clusters.rb (64%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/create_bay.rb (92%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/create_bay_model.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/create_certificate.rb (95%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/create_cluster.rb (92%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/create_cluster_template.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/delete_bay.rb (90%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/delete_bay_model.rb (91%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/delete_cluster.rb (91%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/delete_cluster_template.rb (91%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/get_bay.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/get_bay_model.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/get_certificate.rb (93%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/get_cluster.rb (96%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/get_cluster_template.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/list_bay_models.rb (98%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/list_bays.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/list_cluster_templates.rb (98%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/list_clusters.rb (95%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/update_bay.rb (92%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/update_bay_model.rb (97%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/update_cluster.rb (93%) rename lib/fog/{openstack/container_infra => container_infra/openstack}/requests/update_cluster_template.rb (97%) create mode 100644 lib/fog/dns/openstack.rb rename lib/fog/{openstack/dns => dns/openstack}/v1.rb (96%) rename lib/fog/{openstack/dns => dns/openstack}/v1/requests/get_quota.rb (94%) rename lib/fog/{openstack/dns => dns/openstack}/v1/requests/list_domains.rb (94%) rename lib/fog/{openstack/dns => dns/openstack}/v1/requests/update_quota.rb (95%) rename lib/fog/{openstack/dns => dns/openstack}/v2.rb (98%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/pool.rb (92%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/pools.rb (79%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/recordset.rb (97%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/recordsets.rb (83%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/zone.rb (97%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/zone_transfer_accept.rb (95%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/zone_transfer_accepts.rb (77%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/zone_transfer_request.rb (97%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/zone_transfer_requests.rb (80%) rename lib/fog/{openstack/dns => dns/openstack}/v2/models/zones.rb (82%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/create_recordset.rb (97%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/create_zone.rb (97%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/create_zone_transfer_accept.rb (90%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/create_zone_transfer_request.rb (96%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/delete_recordset.rb (91%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/delete_zone.rb (89%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/delete_zone_transfer_request.rb (94%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/get_pool.rb (86%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/get_quota.rb (86%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/get_recordset.rb (91%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/get_zone.rb (86%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/get_zone_transfer_accept.rb (95%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/get_zone_transfer_request.rb (95%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/list_pools.rb (85%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/list_recordsets.rb (94%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/list_zone_transfer_accepts.rb (94%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/list_zone_transfer_requests.rb (94%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/list_zones.rb (85%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/update_quota.rb (89%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/update_recordset.rb (92%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/update_zone.rb (91%) rename lib/fog/{openstack/dns => dns/openstack}/v2/requests/update_zone_transfer_request.rb (97%) rename lib/fog/{openstack/event/event.rb => event/openstack.rb} (93%) rename lib/fog/{openstack/event => event/openstack}/models/event.rb (88%) rename lib/fog/{openstack/event => event/openstack}/models/events.rb (67%) rename lib/fog/{openstack/event => event/openstack}/requests/get_event.rb (94%) rename lib/fog/{openstack/event => event/openstack}/requests/list_events.rb (96%) rename lib/fog/{openstack/identity/identity.rb => identity/openstack.rb} (85%) rename lib/fog/{openstack/identity => identity/openstack}/v2.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/ec2_credential.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/ec2_credentials.rb (85%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/role.rb (97%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/roles.rb (71%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/tenant.rb (97%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/tenants.rb (77%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/user.rb (97%) rename lib/fog/{openstack/identity => identity/openstack}/v2/models/users.rb (78%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/add_user_to_tenant.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/check_token.rb (92%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/create_ec2_credential.rb (97%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/create_role.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/create_tenant.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/create_user.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/create_user_role.rb (93%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/delete_ec2_credential.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/delete_role.rb (86%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/delete_tenant.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/delete_user.rb (87%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/delete_user_role.rb (93%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_ec2_credential.rb (94%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_role.rb (86%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_tenant.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_tenants_by_id.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_tenants_by_name.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_user_by_id.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/get_user_by_name.rb (94%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_ec2_credentials.rb (98%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_endpoints_for_token.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_roles.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_roles_for_user_on_tenant.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_tenants.rb (97%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_user_global_roles.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/list_users.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/remove_user_from_tenant.rb (92%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/set_tenant.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/update_tenant.rb (94%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/update_user.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v2/requests/validate_token.rb (92%) rename lib/fog/{openstack/identity => identity/openstack}/v3.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/domain.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/domains.rb (76%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/endpoint.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/endpoints.rb (74%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/group.rb (93%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/groups.rb (77%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/os_credential.rb (97%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/os_credentials.rb (77%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/policies.rb (77%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/policy.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/project.rb (94%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/projects.rb (81%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/role.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/role_assignment.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/role_assignments.rb (82%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/roles.rb (86%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/service.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/services.rb (77%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/token.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/tokens.rb (78%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/user.rb (95%) rename lib/fog/{openstack/identity => identity/openstack}/v3/models/users.rb (80%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/add_user_to_group.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/auth_domains.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/auth_projects.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/check_domain_group_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/check_domain_user_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/check_project_group_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/check_project_user_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_domain.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_endpoint.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_group.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_os_credential.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_policy.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_project.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_service.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/create_user.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_domain.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_endpoint.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_group.rb (88%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_os_credential.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_policy.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_project.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_role.rb (88%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_service.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/delete_user.rb (88%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_domain.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_endpoint.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_group.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_os_credential.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_policy.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_project.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_role.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_service.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/get_user.rb (89%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/grant_domain_group_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/grant_domain_user_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/grant_project_group_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/grant_project_user_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/group_user_check.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_domain_group_roles.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_domain_user_roles.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_domains.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_endpoints.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_group_users.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_groups.rb (94%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_os_credentials.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_policies.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_project_group_roles.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_project_user_roles.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_projects.rb (94%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_role_assignments.rb (96%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_roles.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_services.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_user_groups.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_user_projects.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/list_users.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/remove_user_from_group.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/revoke_domain_group_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/revoke_domain_user_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/revoke_project_group_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/revoke_project_user_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/token_authenticate.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/token_check.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/token_revoke.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/token_validate.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_domain.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_endpoint.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_group.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_os_credential.rb (91%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_policy.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_project.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_role.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_service.rb (90%) rename lib/fog/{openstack/identity => identity/openstack}/v3/requests/update_user.rb (90%) create mode 100644 lib/fog/image/openstack.rb rename lib/fog/{openstack/image => image/openstack}/v1.rb (94%) rename lib/fog/{openstack/image => image/openstack}/v1/models/image.rb (98%) rename lib/fog/{openstack/image => image/openstack}/v1/models/images.rb (94%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/add_member_to_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/create_image.rb (98%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/delete_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/get_image.rb (98%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/get_image_by_id.rb (97%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/get_image_members.rb (95%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/get_shared_images.rb (95%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/list_public_images.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/list_public_images_detailed.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/remove_member_from_image.rb (94%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/set_tenant.rb (90%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/update_image.rb (98%) rename lib/fog/{openstack/image => image/openstack}/v1/requests/update_image_members.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v2.rb (94%) rename lib/fog/{openstack/image => image/openstack}/v2/models/image.rb (99%) rename lib/fog/{openstack/image => image/openstack}/v2/models/images.rb (89%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/add_member_to_image.rb (94%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/add_tag_to_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/create_image.rb (97%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/deactivate_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/delete_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/download_image.rb (95%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/get_image.rb (98%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/get_image_by_id.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/get_image_members.rb (95%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/get_member_details.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/get_shared_images.rb (95%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/list_images.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/reactivate_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/remove_member_from_image.rb (94%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/remove_tag_from_image.rb (93%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/set_tenant.rb (90%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/update_image.rb (98%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/update_image_member.rb (96%) rename lib/fog/{openstack/image => image/openstack}/v2/requests/upload_image.rb (95%) rename lib/fog/{openstack/introspection/introspection.rb => introspection/openstack.rb} (85%) rename lib/fog/{openstack/introspection => introspection/openstack}/models/rules.rb (93%) rename lib/fog/{openstack/introspection => introspection/openstack}/models/rules_collection.rb (71%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/abort_introspection.rb (91%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/create_introspection.rb (94%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/create_rules.rb (94%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/delete_rules.rb (90%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/delete_rules_all.rb (89%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/get_introspection.rb (91%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/get_introspection_details.rb (92%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/get_rules.rb (91%) rename lib/fog/{openstack/introspection => introspection/openstack}/requests/list_rules.rb (90%) rename lib/fog/{openstack/key_manager/key_manager.rb => key_manager/openstack.rb} (94%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/models/acl.rb (90%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/models/container.rb (94%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/models/containers.rb (66%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/models/secret.rb (95%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/models/secrets.rb (66%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/create_container.rb (87%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/create_secret.rb (87%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/delete_container.rb (85%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/delete_container_acl.rb (91%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/delete_secret.rb (85%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/delete_secret_acl.rb (91%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/get_container.rb (85%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/get_container_acl.rb (94%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/get_secret.rb (85%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/get_secret_acl.rb (94%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/get_secret_metadata.rb (86%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/get_secret_payload.rb (88%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/list_containers.rb (87%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/list_secrets.rb (86%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/replace_container_acl.rb (94%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/replace_secret_acl.rb (93%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/update_container_acl.rb (94%) rename lib/fog/{openstack/key_manager => key_manager/openstack}/requests/update_secret_acl.rb (93%) rename lib/fog/{openstack/metering/metering.rb => metering/openstack.rb} (94%) rename lib/fog/{openstack/metering => metering/openstack}/models/event.rb (87%) rename lib/fog/{openstack/metering => metering/openstack}/models/events.rb (66%) rename lib/fog/{openstack/metering => metering/openstack}/models/meter.rb (100%) rename lib/fog/{openstack/metering => metering/openstack}/models/meters.rb (100%) rename lib/fog/{openstack/metering => metering/openstack}/models/resource.rb (86%) rename lib/fog/{openstack/metering => metering/openstack}/models/resources.rb (66%) rename lib/fog/{openstack/metering => metering/openstack}/requests/get_event.rb (93%) rename lib/fog/{openstack/metering => metering/openstack}/requests/get_resource.rb (94%) rename lib/fog/{openstack/metering => metering/openstack}/requests/get_samples.rb (97%) rename lib/fog/{openstack/metering => metering/openstack}/requests/get_statistics.rb (97%) rename lib/fog/{openstack/metering => metering/openstack}/requests/list_events.rb (95%) rename lib/fog/{openstack/metering => metering/openstack}/requests/list_meters.rb (96%) rename lib/fog/{openstack/metering => metering/openstack}/requests/list_resources.rb (94%) rename lib/fog/{openstack/metric/metric.rb => metric/openstack.rb} (94%) rename lib/fog/{openstack/metric => metric/openstack}/models/metric.rb (90%) rename lib/fog/{openstack/metric => metric/openstack}/models/metrics.rb (71%) rename lib/fog/{openstack/metric => metric/openstack}/models/resource.rb (88%) rename lib/fog/{openstack/metric => metric/openstack}/models/resources.rb (68%) rename lib/fog/{openstack/metric => metric/openstack}/requests/get_metric.rb (98%) rename lib/fog/{openstack/metric => metric/openstack}/requests/get_metric_measures.rb (96%) rename lib/fog/{openstack/metric => metric/openstack}/requests/get_resource.rb (97%) rename lib/fog/{openstack/metric => metric/openstack}/requests/get_resource_metric_measures.rb (96%) rename lib/fog/{openstack/metric => metric/openstack}/requests/list_metrics.rb (99%) rename lib/fog/{openstack/metric => metric/openstack}/requests/list_resources.rb (98%) rename lib/fog/{openstack/monitoring/monitoring.rb => monitoring/openstack.rb} (92%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm.rb (95%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm_count.rb (86%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm_counts.rb (61%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm_definition.rb (96%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm_definitions.rb (81%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm_state.rb (93%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarm_states.rb (75%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/alarms.rb (76%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/dimension_value.rb (87%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/dimension_values.rb (65%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/measurement.rb (88%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/measurements.rb (63%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/metric.rb (92%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/metrics.rb (74%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/notification_method.rb (96%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/notification_methods.rb (82%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/statistic.rb (88%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/models/statistics.rb (63%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/create_alarm_definition.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/create_metric.rb (93%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/create_metric_array.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/create_notification_method.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/delete_alarm.rb (86%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/delete_alarm_definition.rb (87%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/delete_notification_method.rb (87%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/find_measurements.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/get_alarm.rb (88%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/get_alarm_counts.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/get_alarm_definition.rb (87%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/get_notification_method.rb (87%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_alarm_definitions.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_alarm_state_history_for_all_alarms.rb (91%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_alarm_state_history_for_specific_alarm.rb (91%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_alarms.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_dimension_values.rb (92%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_metric_names.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_metrics.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_notification_method_types.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_notification_methods.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/list_statistics.rb (90%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/patch_alarm.rb (88%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/patch_alarm_definition.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/patch_notification_method.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/put_notification_method.rb (89%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/update_alarm.rb (88%) rename lib/fog/{openstack/monitoring => monitoring/openstack}/requests/update_alarm_definition.rb (89%) rename lib/fog/{openstack/network/network.rb => network/openstack.rb} (98%) rename lib/fog/{openstack/network => network/openstack}/models/extension.rb (87%) rename lib/fog/{openstack/network => network/openstack}/models/extensions.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/floating_ip.rb (97%) rename lib/fog/{openstack/network => network/openstack}/models/floating_ips.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/ike_policies.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/ike_policy.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/ipsec_policies.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/ipsec_policy.rb (97%) rename lib/fog/{openstack/network => network/openstack}/models/ipsec_site_connection.rb (97%) rename lib/fog/{openstack/network => network/openstack}/models/ipsec_site_connections.rb (77%) rename lib/fog/{openstack/network => network/openstack}/models/lb_health_monitor.rb (97%) rename lib/fog/{openstack/network => network/openstack}/models/lb_health_monitors.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/lb_member.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/lb_members.rb (75%) rename lib/fog/{openstack/network => network/openstack}/models/lb_pool.rb (97%) rename lib/fog/{openstack/network => network/openstack}/models/lb_pools.rb (75%) rename lib/fog/{openstack/network => network/openstack}/models/lb_vip.rb (97%) rename lib/fog/{openstack/network => network/openstack}/models/lb_vips.rb (75%) rename lib/fog/{openstack/network => network/openstack}/models/network.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/network_ip_availabilities.rb (70%) rename lib/fog/{openstack/network => network/openstack}/models/network_ip_availability.rb (90%) rename lib/fog/{openstack/network => network/openstack}/models/networks.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/port.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/ports.rb (75%) rename lib/fog/{openstack/network => network/openstack}/models/rbac_policies.rb (77%) rename lib/fog/{openstack/network => network/openstack}/models/rbac_policy.rb (95%) rename lib/fog/{openstack/network => network/openstack}/models/router.rb (92%) rename lib/fog/{openstack/network => network/openstack}/models/routers.rb (75%) rename lib/fog/{openstack/network => network/openstack}/models/security_group.rb (88%) rename lib/fog/{openstack/network => network/openstack}/models/security_group_rule.rb (95%) rename lib/fog/{openstack/network => network/openstack}/models/security_group_rules.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/security_groups.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/subnet.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/subnet_pool.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/subnet_pools.rb (76%) rename lib/fog/{openstack/network => network/openstack}/models/subnets.rb (75%) rename lib/fog/{openstack/network => network/openstack}/models/vpn_service.rb (96%) rename lib/fog/{openstack/network => network/openstack}/models/vpn_services.rb (76%) rename lib/fog/{openstack/network => network/openstack}/requests/add_router_interface.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/associate_floating_ip.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/associate_lb_health_monitor.rb (91%) rename lib/fog/{openstack/network => network/openstack}/requests/create_floating_ip.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_ike_policy.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_ipsec_policy.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_ipsec_site_connection.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lb_health_monitor.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lb_member.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lb_pool.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lb_vip.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_healthmonitor.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_l7policy.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_l7rule.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_listener.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_loadbalancer.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_pool.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_lbaas_pool_member.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_network.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/create_port.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_rbac_policy.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_router.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/create_security_group.rb (99%) rename lib/fog/{openstack/network => network/openstack}/requests/create_security_group_rule.rb (99%) rename lib/fog/{openstack/network => network/openstack}/requests/create_subnet.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/create_subnet_pool.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/create_vpn_service.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_floating_ip.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_ike_policy.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_ipsec_policy.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_ipsec_site_connection.rb (89%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lb_health_monitor.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lb_member.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lb_pool.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lb_vip.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_healthmonitor.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_l7policy.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_l7rule.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_listener.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_loadbalancer.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_pool.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_lbaas_pool_member.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_network.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_port.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_quota.rb (91%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_rbac_policy.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_router.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_security_group.rb (89%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_security_group_rule.rb (90%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_subnet.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_subnet_pool.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/delete_vpn_service.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/disassociate_floating_ip.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/disassociate_lb_health_monitor.rb (89%) rename lib/fog/{openstack/network => network/openstack}/requests/get_extension.rb (85%) rename lib/fog/{openstack/network => network/openstack}/requests/get_floating_ip.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/get_ike_policy.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/get_ipsec_policy.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_ipsec_site_connection.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lb_health_monitor.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lb_member.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lb_pool.rb (85%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lb_pool_stats.rb (89%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lb_vip.rb (85%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_healthmonitor.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_l7policy.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_l7rule.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_listener.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_loadbalancer.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_pool.rb (85%) rename lib/fog/{openstack/network => network/openstack}/requests/get_lbaas_pool_member.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_network.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/get_network_ip_availability.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_port.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/get_quota.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/get_quotas.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/get_rbac_policy.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/get_router.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_security_group.rb (96%) rename lib/fog/{openstack/network => network/openstack}/requests/get_security_group_rule.rb (95%) rename lib/fog/{openstack/network => network/openstack}/requests/get_subnet.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/get_subnet_pool.rb (87%) rename lib/fog/{openstack/network => network/openstack}/requests/get_vpn_service.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/list_extensions.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_floating_ips.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_ike_policies.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_ipsec_policies.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_ipsec_site_connections.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lb_health_monitors.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lb_members.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lb_pools.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lb_vips.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_healthmonitors.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_l7policies.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_l7rules.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_listeners.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_loadbalancers.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_pool_members.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_lbaas_pools.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_network_ip_availabilities.rb (86%) rename lib/fog/{openstack/network => network/openstack}/requests/list_networks.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_ports.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_rbac_policies.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_routers.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_security_group_rules.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/list_security_groups.rb (98%) rename lib/fog/{openstack/network => network/openstack}/requests/list_subnet_pools.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/list_subnets.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/list_vpn_services.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/remove_router_interface.rb (95%) rename lib/fog/{openstack/network => network/openstack}/requests/set_tenant.rb (88%) rename lib/fog/{openstack/network => network/openstack}/requests/update_ike_policy.rb (95%) rename lib/fog/{openstack/network => network/openstack}/requests/update_ipsec_policy.rb (95%) rename lib/fog/{openstack/network => network/openstack}/requests/update_ipsec_site_connection.rb (97%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lb_health_monitor.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lb_member.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lb_pool.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lb_vip.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_healthmonitor.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_l7policy.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_l7rule.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_listener.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_loadbalancer.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_pool.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/update_lbaas_pool_member.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/update_network.rb (90%) rename lib/fog/{openstack/network => network/openstack}/requests/update_port.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/update_quota.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/update_rbac_policy.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/update_router.rb (91%) rename lib/fog/{openstack/network => network/openstack}/requests/update_security_group.rb (92%) rename lib/fog/{openstack/network => network/openstack}/requests/update_subnet.rb (93%) rename lib/fog/{openstack/network => network/openstack}/requests/update_subnet_pool.rb (94%) rename lib/fog/{openstack/network => network/openstack}/requests/update_vpn_service.rb (94%) rename lib/fog/{openstack/nfv/nfv.rb => nfv/openstack.rb} (94%) rename lib/fog/{openstack/nfv => nfv/openstack}/models/vnf.rb (97%) rename lib/fog/{openstack/nfv => nfv/openstack}/models/vnfd.rb (97%) rename lib/fog/{openstack/nfv => nfv/openstack}/models/vnfds.rb (73%) rename lib/fog/{openstack/nfv => nfv/openstack}/models/vnfs.rb (73%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/create_vnf.rb (96%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/create_vnfd.rb (95%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/delete_vnf.rb (92%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/delete_vnfd.rb (92%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/get_vnf.rb (93%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/get_vnfd.rb (93%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/list_vnfds.rb (93%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/list_vnfs.rb (93%) rename lib/fog/{openstack/nfv => nfv/openstack}/requests/update_vnf.rb (95%) delete mode 100644 lib/fog/openstack/dns/dns.rb delete mode 100644 lib/fog/openstack/image/image.rb delete mode 100644 lib/fog/openstack/volume/v1/models/availability_zone.rb delete mode 100644 lib/fog/openstack/volume/v1/models/availability_zones.rb delete mode 100644 lib/fog/openstack/volume/v1/models/backups.rb delete mode 100644 lib/fog/openstack/volume/v1/models/snapshots.rb delete mode 100644 lib/fog/openstack/volume/v1/models/transfers.rb delete mode 100644 lib/fog/openstack/volume/v1/models/volume_types.rb delete mode 100644 lib/fog/openstack/volume/v1/models/volumes.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/accept_transfer.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/action.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/create_backup.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/create_transfer.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/create_volume_type.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_backup.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_metadata.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_snapshot.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_transfer.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_volume.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/delete_volume_type.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/extend_volume.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/get_backup_details.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/get_quota.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/get_quota_usage.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/get_transfer_details.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_backups.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_snapshots.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_transfers.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_volume_types.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/list_zones.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/real_mock.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/replace_metadata.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/restore_backup.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/set_tenant.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/update_metadata.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/update_quota.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/update_snapshot.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb delete mode 100644 lib/fog/openstack/volume/v1/requests/update_volume.rb delete mode 100644 lib/fog/openstack/volume/v2/models/availability_zone.rb delete mode 100644 lib/fog/openstack/volume/v2/models/availability_zones.rb delete mode 100644 lib/fog/openstack/volume/v2/models/backups.rb delete mode 100644 lib/fog/openstack/volume/v2/models/snapshots.rb delete mode 100644 lib/fog/openstack/volume/v2/models/transfers.rb delete mode 100644 lib/fog/openstack/volume/v2/models/volume_types.rb delete mode 100644 lib/fog/openstack/volume/v2/models/volumes.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/accept_transfer.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/action.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/create_backup.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/create_transfer.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/create_volume_type.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_backup.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_metadata.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_snapshot.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_transfer.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_volume.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/delete_volume_type.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/extend_volume.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/get_backup_details.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/get_quota.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/get_quota_usage.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/get_transfer_details.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_backups.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_snapshots.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_transfers.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_volume_types.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/list_zones.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/real_mock.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/replace_metadata.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/restore_backup.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/set_tenant.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/snapshot_action.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/update_metadata.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/update_quota.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/update_snapshot.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/update_volume.rb delete mode 100644 lib/fog/openstack/volume/v2/requests/update_volume_type.rb rename lib/fog/{openstack/orchestration/orchestration.rb => orchestration/openstack.rb} (94%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/event.rb (89%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/events.rb (79%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/resource.rb (94%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/resource_schemas.rb (73%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/resources.rb (76%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/stack.rb (96%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/stacks.rb (89%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/template.rb (85%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/models/templates.rb (85%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/abandon_stack.rb (86%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/build_info.rb (83%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/cancel_update.rb (92%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/create_stack.rb (95%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/delete_stack.rb (97%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/get_stack_template.rb (89%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_events.rb (97%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_resource_events.rb (95%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_resource_types.rb (92%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_resources.rb (97%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_stack_data.rb (92%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_stack_data_detailed.rb (98%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/list_stack_events.rb (95%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/patch_stack.rb (90%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/preview_stack.rb (87%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/show_event_details.rb (93%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/show_resource_data.rb (93%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/show_resource_metadata.rb (93%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/show_resource_schema.rb (85%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/show_resource_template.rb (88%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/show_stack_details.rb (91%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/update_stack.rb (97%) rename lib/fog/{openstack/orchestration => orchestration/openstack}/requests/validate_template.rb (87%) rename lib/fog/{openstack => }/orchestration/util/recursive_hot_file_loader.rb (99%) rename lib/fog/{openstack/planning/planning.rb => planning/openstack.rb} (96%) rename lib/fog/{openstack/planning => planning/openstack}/models/plan.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/models/plans.rb (93%) rename lib/fog/{openstack/planning => planning/openstack}/models/role.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/models/roles.rb (87%) rename lib/fog/{openstack/planning => planning/openstack}/requests/add_role_to_plan.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/create_plan.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/delete_plan.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/get_plan.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/get_plan_templates.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/list_plans.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/list_roles.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/patch_plan.rb (100%) rename lib/fog/{openstack/planning => planning/openstack}/requests/remove_role_from_plan.rb (100%) rename lib/fog/{openstack/shared_file_system/shared_file_system.rb => shared_file_system/openstack.rb} (98%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/availability_zone.rb (83%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/availability_zones.rb (59%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/network.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/networks.rb (77%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/share.rb (97%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/share_access_rule.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/share_access_rules.rb (76%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/share_export_location.rb (83%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/share_export_locations.rb (77%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/shares.rb (76%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/snapshot.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/models/snapshots.rb (77%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/add_security_service_to_share_network.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/create_security_service.rb (96%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/create_share.rb (96%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/create_share_network.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/create_snapshot.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/delete_security_service.rb (90%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/delete_share.rb (93%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/delete_share_network.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/delete_snapshot.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/extend_share.rb (90%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_limits.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_quota.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_security_service.rb (93%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_share.rb (91%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_share_export_location.rb (89%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_share_network.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/get_snapshot.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/grant_share_access.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_availability_zones.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_security_services.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_security_services_detail.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_share_access_rules.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_share_export_locations.rb (87%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_share_networks.rb (91%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_share_networks_detail.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_shares.rb (91%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_shares_detail.rb (91%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_snapshots.rb (91%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/list_snapshots_detail.rb (92%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/remove_security_service_from_share_network.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/revoke_share_access.rb (91%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/share_action.rb (87%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/share_network_action.rb (88%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/shrink_share.rb (90%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/update_quota.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/update_security_service.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/update_share.rb (95%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/update_share_network.rb (94%) rename lib/fog/{openstack/shared_file_system => shared_file_system/openstack}/requests/update_snapshot.rb (94%) rename lib/fog/{openstack/storage/storage.rb => storage/openstack.rb} (95%) rename lib/fog/{openstack/storage => storage/openstack}/models/directories.rb (82%) rename lib/fog/{openstack/storage => storage/openstack}/models/directory.rb (83%) rename lib/fog/{openstack/storage => storage/openstack}/models/file.rb (99%) rename lib/fog/{openstack/storage => storage/openstack}/models/files.rb (91%) rename lib/fog/{openstack/storage => storage/openstack}/requests/copy_object.rb (96%) rename lib/fog/{openstack/storage => storage/openstack}/requests/delete_container.rb (91%) rename lib/fog/{openstack/storage => storage/openstack}/requests/delete_multiple_objects.rb (98%) rename lib/fog/{openstack/storage => storage/openstack}/requests/delete_object.rb (93%) rename lib/fog/{openstack/storage => storage/openstack}/requests/delete_static_large_object.rb (98%) rename lib/fog/{openstack/storage => storage/openstack}/requests/get_container.rb (97%) rename lib/fog/{openstack/storage => storage/openstack}/requests/get_containers.rb (96%) rename lib/fog/{openstack/storage => storage/openstack}/requests/get_object.rb (94%) rename lib/fog/{openstack/storage => storage/openstack}/requests/get_object_http_url.rb (94%) rename lib/fog/{openstack/storage => storage/openstack}/requests/get_object_https_url.rb (98%) rename lib/fog/{openstack/storage => storage/openstack}/requests/head_container.rb (95%) rename lib/fog/{openstack/storage => storage/openstack}/requests/head_containers.rb (93%) rename lib/fog/{openstack/storage => storage/openstack}/requests/head_object.rb (93%) rename lib/fog/{openstack/storage => storage/openstack}/requests/post_object.rb (94%) rename lib/fog/{openstack/storage => storage/openstack}/requests/post_set_meta_temp_url_key.rb (96%) rename lib/fog/{openstack/storage => storage/openstack}/requests/public_url.rb (95%) rename lib/fog/{openstack/storage => storage/openstack}/requests/put_container.rb (94%) rename lib/fog/{openstack/storage => storage/openstack}/requests/put_dynamic_obj_manifest.rb (95%) rename lib/fog/{openstack/storage => storage/openstack}/requests/put_object.rb (98%) rename lib/fog/{openstack/storage => storage/openstack}/requests/put_object_manifest.rb (90%) rename lib/fog/{openstack/storage => storage/openstack}/requests/put_static_obj_manifest.rb (96%) rename lib/fog/{openstack/volume/volume.rb => volume/openstack.rb} (73%) rename lib/fog/{openstack/volume => volume/openstack}/models/availability_zone.rb (78%) rename lib/fog/{openstack/volume => volume/openstack}/models/availability_zones.rb (87%) rename lib/fog/{openstack/volume => volume/openstack}/models/backup.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/models/backups.rb (86%) rename lib/fog/{openstack/volume => volume/openstack}/models/snapshot.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/models/snapshots.rb (86%) rename lib/fog/{openstack/volume => volume/openstack}/models/transfer.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/models/transfers.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/models/volume.rb (98%) rename lib/fog/{openstack/volume => volume/openstack}/models/volume_type.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/models/volume_types.rb (84%) rename lib/fog/{openstack/volume => volume/openstack}/models/volumes.rb (93%) rename lib/fog/{openstack/volume => volume/openstack}/requests/accept_transfer.rb (92%) rename lib/fog/{openstack/volume => volume/openstack}/requests/action.rb (89%) rename lib/fog/{openstack/volume => volume/openstack}/requests/create_backup.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/requests/create_snapshot.rb (89%) rename lib/fog/{openstack/volume => volume/openstack}/requests/create_transfer.rb (93%) rename lib/fog/{openstack/volume => volume/openstack}/requests/create_volume.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/requests/create_volume_type.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_backup.rb (92%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_metadata.rb (88%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_snapshot.rb (92%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_snapshot_metadata.rb (89%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_transfer.rb (88%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_volume.rb (92%) rename lib/fog/{openstack/volume => volume/openstack}/requests/delete_volume_type.rb (92%) rename lib/fog/{openstack/volume => volume/openstack}/requests/extend_volume.rb (93%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_backup_details.rb (95%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_quota.rb (93%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_quota_defaults.rb (93%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_quota_usage.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_snapshot_details.rb (87%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_transfer_details.rb (89%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_volume_details.rb (87%) rename lib/fog/{openstack/volume => volume/openstack}/requests/get_volume_type_details.rb (95%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_backups.rb (88%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_backups_detailed.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_snapshots.rb (97%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_snapshots_detailed.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_transfers.rb (90%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_transfers_detailed.rb (90%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_volume_types.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_volumes.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_volumes_detailed.rb (88%) rename lib/fog/{openstack/volume => volume/openstack}/requests/list_zones.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/requests/replace_metadata.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/requests/restore_backup.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/requests/set_tenant.rb (89%) rename lib/fog/{openstack/volume => volume/openstack}/requests/snapshot_action.rb (89%) rename lib/fog/{openstack/volume => volume/openstack}/requests/update_metadata.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/requests/update_quota.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/requests/update_snapshot.rb (97%) rename lib/fog/{openstack/volume => volume/openstack}/requests/update_snapshot_metadata.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/requests/update_volume.rb (94%) rename lib/fog/{openstack/volume => volume/openstack}/requests/update_volume_type.rb (96%) rename lib/fog/{openstack/volume => volume/openstack}/v1.rb (94%) create mode 100644 lib/fog/volume/openstack/v1/models/availability_zone.rb create mode 100644 lib/fog/volume/openstack/v1/models/availability_zones.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/models/backup.rb (53%) create mode 100644 lib/fog/volume/openstack/v1/models/backups.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/models/snapshot.rb (89%) create mode 100644 lib/fog/volume/openstack/v1/models/snapshots.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/models/transfer.rb (66%) create mode 100644 lib/fog/volume/openstack/v1/models/transfers.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/models/volume.rb (87%) rename lib/fog/{openstack/volume => volume/openstack}/v1/models/volume_type.rb (51%) create mode 100644 lib/fog/volume/openstack/v1/models/volume_types.rb create mode 100644 lib/fog/volume/openstack/v1/models/volumes.rb create mode 100644 lib/fog/volume/openstack/v1/requests/accept_transfer.rb create mode 100644 lib/fog/volume/openstack/v1/requests/action.rb create mode 100644 lib/fog/volume/openstack/v1/requests/create_backup.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/create_snapshot.rb (89%) create mode 100644 lib/fog/volume/openstack/v1/requests/create_transfer.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/create_volume.rb (91%) create mode 100644 lib/fog/volume/openstack/v1/requests/create_volume_type.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_backup.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_metadata.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_snapshot.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_transfer.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_volume.rb create mode 100644 lib/fog/volume/openstack/v1/requests/delete_volume_type.rb create mode 100644 lib/fog/volume/openstack/v1/requests/extend_volume.rb create mode 100644 lib/fog/volume/openstack/v1/requests/get_backup_details.rb create mode 100644 lib/fog/volume/openstack/v1/requests/get_quota.rb create mode 100644 lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb create mode 100644 lib/fog/volume/openstack/v1/requests/get_quota_usage.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/get_snapshot_details.rb (83%) create mode 100644 lib/fog/volume/openstack/v1/requests/get_transfer_details.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/get_volume_details.rb (86%) create mode 100644 lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_backups.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_snapshots.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_transfers.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb create mode 100644 lib/fog/volume/openstack/v1/requests/list_volume_types.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/list_volumes.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/list_volumes_detailed.rb (90%) create mode 100644 lib/fog/volume/openstack/v1/requests/list_zones.rb rename lib/fog/{openstack/volume => volume/openstack}/v1/requests/real.rb (50%) create mode 100644 lib/fog/volume/openstack/v1/requests/real_mock.rb create mode 100644 lib/fog/volume/openstack/v1/requests/replace_metadata.rb create mode 100644 lib/fog/volume/openstack/v1/requests/restore_backup.rb create mode 100644 lib/fog/volume/openstack/v1/requests/set_tenant.rb create mode 100644 lib/fog/volume/openstack/v1/requests/update_metadata.rb create mode 100644 lib/fog/volume/openstack/v1/requests/update_quota.rb create mode 100644 lib/fog/volume/openstack/v1/requests/update_snapshot.rb create mode 100644 lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb create mode 100644 lib/fog/volume/openstack/v1/requests/update_volume.rb rename lib/fog/{openstack/volume => volume/openstack}/v2.rb (94%) create mode 100644 lib/fog/volume/openstack/v2/models/availability_zone.rb create mode 100644 lib/fog/volume/openstack/v2/models/availability_zones.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/models/backup.rb (53%) create mode 100644 lib/fog/volume/openstack/v2/models/backups.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/models/snapshot.rb (88%) create mode 100644 lib/fog/volume/openstack/v2/models/snapshots.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/models/transfer.rb (66%) create mode 100644 lib/fog/volume/openstack/v2/models/transfers.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/models/volume.rb (86%) rename lib/fog/{openstack/volume => volume/openstack}/v2/models/volume_type.rb (51%) create mode 100644 lib/fog/volume/openstack/v2/models/volume_types.rb create mode 100644 lib/fog/volume/openstack/v2/models/volumes.rb create mode 100644 lib/fog/volume/openstack/v2/requests/accept_transfer.rb create mode 100644 lib/fog/volume/openstack/v2/requests/action.rb create mode 100644 lib/fog/volume/openstack/v2/requests/create_backup.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/create_snapshot.rb (88%) create mode 100644 lib/fog/volume/openstack/v2/requests/create_transfer.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/create_volume.rb (90%) create mode 100644 lib/fog/volume/openstack/v2/requests/create_volume_type.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_backup.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_metadata.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_snapshot.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_transfer.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_volume.rb create mode 100644 lib/fog/volume/openstack/v2/requests/delete_volume_type.rb create mode 100644 lib/fog/volume/openstack/v2/requests/extend_volume.rb create mode 100644 lib/fog/volume/openstack/v2/requests/get_backup_details.rb create mode 100644 lib/fog/volume/openstack/v2/requests/get_quota.rb create mode 100644 lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb create mode 100644 lib/fog/volume/openstack/v2/requests/get_quota_usage.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/get_snapshot_details.rb (82%) create mode 100644 lib/fog/volume/openstack/v2/requests/get_transfer_details.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/get_volume_details.rb (86%) create mode 100644 lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_backups.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_snapshots.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_transfers.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb create mode 100644 lib/fog/volume/openstack/v2/requests/list_volume_types.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/list_volumes.rb (91%) rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/list_volumes_detailed.rb (90%) create mode 100644 lib/fog/volume/openstack/v2/requests/list_zones.rb rename lib/fog/{openstack/volume => volume/openstack}/v2/requests/real.rb (50%) create mode 100644 lib/fog/volume/openstack/v2/requests/real_mock.rb create mode 100644 lib/fog/volume/openstack/v2/requests/replace_metadata.rb create mode 100644 lib/fog/volume/openstack/v2/requests/restore_backup.rb create mode 100644 lib/fog/volume/openstack/v2/requests/set_tenant.rb create mode 100644 lib/fog/volume/openstack/v2/requests/snapshot_action.rb create mode 100644 lib/fog/volume/openstack/v2/requests/update_metadata.rb create mode 100644 lib/fog/volume/openstack/v2/requests/update_quota.rb create mode 100644 lib/fog/volume/openstack/v2/requests/update_snapshot.rb create mode 100644 lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb create mode 100644 lib/fog/volume/openstack/v2/requests/update_volume.rb create mode 100644 lib/fog/volume/openstack/v2/requests/update_volume_type.rb rename lib/fog/{openstack/workflow/workflow.rb => workflow/openstack.rb} (50%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_action.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_action_execution.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_cron_trigger.rb (97%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_environment.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_execution.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_workbook.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/create_workflow.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_action.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_action_execution.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_cron_trigger.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_environment.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_execution.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_workbook.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/delete_workflow.rb (92%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_action.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_action_execution.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_cron_trigger.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_environment.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_execution.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_task.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_workbook.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/get_workflow.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_action_executions.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_actions.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_cron_triggers.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_environments.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_executions.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_services.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_tasks.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_workbooks.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/list_workflows.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/rerun_task.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/update_action.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/update_action_execution.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/update_environment.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/update_execution.rb (95%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/update_workbook.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/update_workflow.rb (93%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/validate_action.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/validate_workbook.rb (94%) rename lib/fog/{openstack/workflow => workflow/openstack}/v2/requests/validate_workflow.rb (94%) diff --git a/README.md b/README.md index 844e65403..3d5d60ab9 100644 --- a/README.md +++ b/README.md @@ -82,18 +82,18 @@ The exception is if you're using Nova (and not Neutron) for your instance networ Initialise a connection to the compute service: ```ruby -compute = Fog::OpenStack::Compute.new(@connection_params) +compute = Fog::Compute::OpenStack.new(@connection_params) ``` Get a list of available images for use with booting new instances: ```ruby p compute.images -# => @@ -105,9 +105,9 @@ List available flavors so we can decide how powerful to make this instance: ```ruby p compute.flavors -# => , -# {:duration=>17.359134} p instance -# => [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:f4:75:ab", "version"=>4, "addr"=>"1.2.3.4", "OS-EXT-IPS:type"=>"fixed"}]}, @@ -177,11 +177,11 @@ Allow TCP traffic through port 22: ```ruby security_group = compute.security_groups.create name: "Test SSH", description: "Allow access to port 22" -# => @@ -502,7 +502,7 @@ Set up a project's public gateway (needed for external access): ```ruby -identity = Fog::OpenStack::Identity.new(@connection_params) +identity = Fog::Identity::OpenStack.new(@connection_params) tenants = identity.projects.select do |project| project.name == @connection_params[:openstack_project_name] @@ -510,7 +510,7 @@ end tenant_id = tenants[0].id -neutron = Fog::OpenStack::Network.new(@connection_params) +neutron = Fog::Network::OpenStack.new(@connection_params) network = neutron.networks.create name: "default", tenant_id: tenant_id diff --git a/docs/compute.md b/docs/compute.md index 675b10aea..18454e513 100644 --- a/docs/compute.md +++ b/docs/compute.md @@ -16,7 +16,7 @@ Once `irb` has launched you need to require the Fog library by executing: Next, create a connection to the Compute Service: - service = Fog::OpenStack::Compute.new({ + service = Fog::Compute::OpenStack.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id @@ -71,7 +71,7 @@ This will return: {"flavors"=>[{"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}], "name"=>"m1.tiny"}, {"id"=>"2", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"bookmark"}], "name"=>"m1.small"}, {"id"=>"3", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"bookmark"}], "name"=>"m1.medium"}, {"id"=>"4", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"bookmark"}], "name"=>"m1.large"}, {"id"=>"42", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"bookmark"}], "name"=>"m1.nano"}, {"id"=>"5", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"bookmark"}], "name"=>"m1.xlarge"}, {"id"=>"84", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"bookmark"}], "name"=>"m1.micro"}]} -To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/compute/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Compute/Openstack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -137,13 +137,13 @@ To retrieve a list of available images: service.images -This returns a collection of `Fog::OpenStack::Compute::Image` models: +This returns a collection of `Fog::Compute::OpenStack::Image` models: - , - @@ -167,7 +167,7 @@ This returns a collection of `Fog::OpenStack::Compute::Image` models: >, links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}] >, - , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}] @@ -190,9 +190,9 @@ To retrieve individual image: service.images.get "821e2b73-5aed-4f9d-aaa7-2f4f297779f3" -This returns an `Fog::OpenStack::Compute::Image` instance: +This returns an `Fog::Compute::OpenStack::Image` instance: - , - @@ -223,11 +223,11 @@ To retrieve a list of available flavors: service.flavors -This returns a collection of `Fog::OpenStack::Compute::Flavor` models: +This returns a collection of `Fog::Compute::OpenStack::Flavor` models: - , - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}], @@ -331,16 +331,16 @@ To return an individual server: service.servers.get "4572529c-0cfc-433e-8dbf-7cc383ed5b7c" -This returns a `Fog::OpenStack::Compute::Server` instance: +This returns a `Fog::Compute::OpenStack::Server` instance: - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}], @@ -380,16 +380,16 @@ To create a server: **Note**: The `:name`, `:flavor_ref`, and `image_ref` attributes are required for server creation. -This will return a `Fog::OpenStack::Compute::Server` instance: +This will return a `Fog::Compute::OpenStack::Server` instance: - , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"bookmark"}], @@ -423,14 +423,14 @@ Notice that your server contains several `nil` attributes. To see the latest sta You can see that the server is currently being built: - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:71:0d:c4", "version"=>4, "addr"=>"10.0.0.2", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"bookmark"}], @@ -464,7 +464,7 @@ Fog can wait for the server to become ready as follows: server.wait_for { ready? } -**Note**: The `Fog::OpenStack::Compute::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`. +**Note**: The `Fog::Compute::OpenStack::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`. ### Additional Parameters @@ -481,7 +481,7 @@ The `create` method also supports the following key values: :personality - Array of files to be injected onto the server. Please refer to the Fog personality API documentation for further information. + Array of files to be injected onto the server. Please refer to the Fog personality API documentation for further information. diff --git a/docs/introspection.md b/docs/introspection.md index 847b671be..56d7cd25e 100644 --- a/docs/introspection.md +++ b/docs/introspection.md @@ -92,7 +92,7 @@ require 'fog/openstack' Find the available Baremetal nodes. ```ruby -iron = Fog::OpenStack::Baremetal.new(@connection_params) +iron = Fog::Baremetal::OpenStack.new(@connection_params) nodes = iron.node_list ``` @@ -109,7 +109,7 @@ http://docs.openstack.org/developer/ironic/deploy/install-guide.html#hardware-in ```ruby node_id = nodes.body["nodes"][0]["uuid"] -inspector = Fog::OpenStack::Introspection.new(@connection_params) +inspector = Fog::Introspection::OpenStack.new(@connection_params) introspection1 = inspector.create_introspection(node_id) ``` diff --git a/docs/metering.md b/docs/metering.md index c486575d3..278b2df52 100644 --- a/docs/metering.md +++ b/docs/metering.md @@ -9,7 +9,7 @@ Fog uses the [OpenStack Metering API](http://docs.openstack.org/developer/ceilom Get a handle on the Metering service: ```ruby -service = Fog::OpenStack::Metering.new({ +service = Fog::Metering::OpenStack.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id diff --git a/docs/network.md b/docs/network.md index ab853620d..498e28c7c 100644 --- a/docs/network.md +++ b/docs/network.md @@ -16,7 +16,7 @@ require 'fog/openstack' Next, create a connection to the Network Service: ``` -service = Fog::OpenStack::Network.new( +service = Fog::Network::OpenStack.new( :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_domain_name => OPEN_STACK_DOMAIN, # Your OpenStack Domain name @@ -104,7 +104,7 @@ This will return: {"id"=>"e624a36d-762b-481f-9b50-4154ceb78bbb", "name"=>"network_1", "subnets"=>["2e4ec6a4-0150-47f5-8523-e899ac03026e"], "shared"=>false, "status"=>"ACTIVE", "admin_state_up"=>true, "tenant_id"=>"f8b26a6032bc47718a7702233ac708b9"}] } ``` -To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/fog/openstack/network/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/Fog/Network/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -182,14 +182,14 @@ networks = service.networks ``` This returns in the following `Fog::OpenStack::Model`: ``` -] + [] >, shared=true, status="ACTIVE", @@ -200,10 +200,10 @@ This returns in the following `Fog::OpenStack::Model`: provider_segmentation_id=nil, router_external=false >, - , diff --git a/docs/orchestration.md b/docs/orchestration.md index a661217fb..0051c1ecc 100644 --- a/docs/orchestration.md +++ b/docs/orchestration.md @@ -25,7 +25,7 @@ _Source: [OpenStack Wiki](https://wiki.openstack.org/wiki/Heat)_ Get a handle on the Orchestration service: ```ruby -service = Fog::OpenStack::Orchestration.new({ +service = Fog::Orchestration::OpenStack.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id @@ -46,9 +46,9 @@ service.stacks ``` This returns a list of stacks with minimum attributes, leaving other attributes empty ```ruby -=> ``` @@ -212,9 +212,9 @@ You can list `Events` of a `stack`: ```ruby stack.events -=> "http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}], @@ -260,7 +260,7 @@ An `event` has an associated `resource`: ```ruby resource = event.resource -=> 1}) -=> "http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}], @@ -332,7 +332,7 @@ You can validate a template (either HOT or CFN) before using it: ```ruby service.templates.validate(:template => content) -=> 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_domain_name => OPEN_STACK_DOMAIN, # Your OpenStack Domain name diff --git a/docs/storage.md b/docs/storage.md index 54b9276f4..fb1706a75 100644 --- a/docs/storage.md +++ b/docs/storage.md @@ -29,7 +29,7 @@ require 'fog/openstack' Next, create a connection to Swift: ```ruby -service = Fog::OpenStack::Storage.new({ +service = Fog::Storage::OpenStack.new({ :openstack_username => USERNAME, # Your OpenStack Username :openstack_api_key => PASSWORD, # Your OpenStack Password :openstack_auth_url => 'http://YOUR_OPENSTACK_ENDPOINT:PORT/v2.0/tokens', @@ -126,7 +126,7 @@ This will return: {"X-Account-Bytes-Used"=>"2563554", "Date"=>"Thu, 21 Feb 2013 21:57:02 GMT", "X-Account-Meta-Temp-Url-Key"=>"super_secret_key", "X-Timestamp"=>"1354552916.82056", "Content-Length"=>"0", "Content-Type"=>"application/json; charset=utf-8", "X-Trans-Id"=>"txe934924374a744c8a6c40dd8f29ab94a", "Accept-Ranges"=>"bytes", "X-Account-Container-Count"=>"7", "X-Account-Object-Count"=>"5"} ``` -To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/storage/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Storage/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -184,7 +184,7 @@ To retrieve a list of directories: service.directories ``` -This returns a collection of `Fog::OpenStack::Storage::Directory` models: +This returns a collection of `Fog::Storage::OpenStack::Directory` models: ## Get Directory @@ -194,7 +194,7 @@ To retrieve a specific directory: service.directories.get "blue" ``` -This returns a `Fog::OpenStack::Storage::Directory` instance: +This returns a `Fog::Storage::OpenStack::Directory` instance: ## Create Directory diff --git a/docs/workflow.md b/docs/workflow.md index 8577683c7..cb7544cf0 100644 --- a/docs/workflow.md +++ b/docs/workflow.md @@ -9,7 +9,7 @@ Fog uses the [OpenStack Mistral API](http://docs.openstack.org/developer/mistral Get a handle for the Workflow service: ```ruby -service = Fog::OpenStack::Workflow.new({ +service = Fog::Workflow::OpenStack.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id diff --git a/examples/compute/block_device_mapping_v2.rb b/examples/compute/block_device_mapping_v2.rb index b8f8c4abb..d59012fac 100644 --- a/examples/compute/block_device_mapping_v2.rb +++ b/examples/compute/block_device_mapping_v2.rb @@ -7,7 +7,7 @@ password = 'secret' tenant = 'My Compute Tenant' # String -compute_client ||= ::Fog::OpenStack::Compute.new( +compute_client ||= ::Fog::Compute::OpenStack.new( :openstack_api_key => password, :openstack_username => username, :openstack_auth_url => auth_url, diff --git a/examples/container_infra/basics.rb b/examples/container_infra/basics.rb index 1c1d4da44..9e4daac1a 100644 --- a/examples/container_infra/basics.rb +++ b/examples/container_infra/basics.rb @@ -12,7 +12,7 @@ container_infra = Fog::ContainerInfra::OpenStack.new(params) # Get the Fedora Atomic image -image = Fog::OpenStack::Image.new(params) +image = Fog::Image::OpenStack.new(params) unless image.images.map(&:name).include?("fedora-atomic-latest") puts "Couldn't find Fedora Atomic. Uploading to Glance..." diff --git a/examples/event/basics.rb b/examples/event/basics.rb index 93fbf5d73..b04082ca3 100644 --- a/examples/event/basics.rb +++ b/examples/event/basics.rb @@ -13,7 +13,7 @@ puts "### SERVICE CONNECTION ###" -event_service = Fog::OpenStack::Event.new(@connection_params) +event_service = Fog::Event::OpenStack.new(@connection_params) p event_service diff --git a/examples/identity/basics.rb b/examples/identity/basics.rb index a66320d3c..d0efd0f89 100644 --- a/examples/identity/basics.rb +++ b/examples/identity/basics.rb @@ -8,7 +8,7 @@ password = 'secret' tenant = 'admin' -keystone = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, +keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, :openstack_username => username, :openstack_api_key => password, :openstack_tenant => tenant @@ -19,7 +19,7 @@ # Listing keystone tenants # keystone.tenants.each do |tenant| - # auth_url, - :openstack_username => username, - :openstack_api_key => password, +keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, + :openstack_username => username, + :openstack_api_key => password, :openstack_project_name => project, - :openstack_domain_name => domain + :openstack_domain_name => domain # Optional, self-signed certs #:connection_options => { :ssl_verify_peer => false } @@ -21,17 +21,17 @@ # List keystone projects # keystone.projects.each do |project| - # "http://example.net:35357/..."}, - # parent_id=nil, - # subtree=nil, - # parents=nil - # > + #"http://example.net:35357/..."}, + # parent_id=nil, + # subtree=nil, + # parents=nil + #> # ... pp project end @@ -40,17 +40,17 @@ # List users # keystone.users.each do |user| - # "http://example.net:35357/..."}, - # password=nil - # > + #"http://example.net:35357/..."}, + # password=nil + #> # ... pp user end diff --git a/examples/image/upload-test-image.rb b/examples/image/upload-test-image.rb index 766415887..c57c8847e 100755 --- a/examples/image/upload-test-image.rb +++ b/examples/image/upload-test-image.rb @@ -43,32 +43,32 @@ end end -image_service = Fog::OpenStack::Image.new :openstack_api_key => ENV['OS_PASSWORD'], +image_service = Fog::Image::OpenStack.new :openstack_api_key => ENV['OS_PASSWORD'], :openstack_username => ENV["OS_USERNAME"], :openstack_auth_url => ENV["OS_AUTH_URL"] + "/tokens", - :openstack_tenant => ENV["OS_TENANT_NAME"] + :openstack_tenant => ENV["OS_TENANT_NAME"] puts "Uploading AKI..." -aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki', - :size => File.size(aki), - :disk_format => 'aki', +aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki', + :size => File.size(aki), + :disk_format => 'aki', :container_format => 'aki', - :location => aki + :location => aki puts "Uploading ARI..." -ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari', - :size => File.size(ari), - :disk_format => 'ari', +ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari', + :size => File.size(ari), + :disk_format => 'ari', :container_format => 'ari', - :location => ari + :location => ari puts "Uploading AMI..." -image_service.images.create :name => 'cirros-0.3.0-amd64', - :size => File.size(ami), - :disk_format => 'ami', +image_service.images.create :name => 'cirros-0.3.0-amd64', + :size => File.size(ami), + :disk_format => 'ami', :container_format => 'ami', - :location => ami, - :properties => { + :location => ami, + :properties => { 'kernel_id' => aki.id, 'ramdisk_id' => ari.id } diff --git a/examples/introspection/basics.rb b/examples/introspection/basics.rb index 0d17773e4..b76b75353 100644 --- a/examples/introspection/basics.rb +++ b/examples/introspection/basics.rb @@ -15,10 +15,10 @@ :openstack_domain_id => "default" } -inspector = Fog::OpenStack::Introspection.new(@connection_params) +inspector = Fog::Introspection::OpenStack.new(@connection_params) # Introspection of an Ironic node -ironic = Fog::OpenStack::Baremetal.new(@connection_params) +ironic = Fog::Baremetal::OpenStack.new(@connection_params) nodes = ironic.list_nodes node1_uuid = nodes.body["nodes"][0]["uuid"] diff --git a/examples/metric/basics.rb b/examples/metric/basics.rb index 3fe0083af..f001e2e6a 100644 --- a/examples/metric/basics.rb +++ b/examples/metric/basics.rb @@ -16,7 +16,7 @@ puts "### SERVICE CONNECTION ###" -metric = Fog::OpenStack::Metric.new(@connection_params) +metric = Fog::Metric::OpenStack.new(@connection_params) p metric diff --git a/examples/network/network_rbac.rb b/examples/network/network_rbac.rb index c22145f65..eb574625d 100644 --- a/examples/network/network_rbac.rb +++ b/examples/network/network_rbac.rb @@ -29,8 +29,8 @@ :connection_options => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'} } -identity_service = Fog::OpenStack::Identity::V3.new(auth_options) -network_service = Fog::OpenStack::Network.new(auth_options) +identity_service = Fog::Identity::OpenStack::V3.new(auth_options) +network_service = Fog::Network::OpenStack.new(auth_options) own_project = identity_service.projects.select { |p| p.name == ENV['OS_PROJECT_NAME'] }.first other_project = identity_service.projects.select { |p| p.name != ENV['OS_PROJECT_NAME'] }.first diff --git a/examples/network/network_subnets_routers.rb b/examples/network/network_subnets_routers.rb index a8067835e..746db7523 100644 --- a/examples/network/network_subnets_routers.rb +++ b/examples/network/network_subnets_routers.rb @@ -17,7 +17,7 @@ def create_tenant_network( tenant_name, subnet_gateway = '10.0.0.1', private_network_name = 'private' ) - network = Fog::OpenStack::Network.new + network = Fog::Network[:openstack] id = Fog::Identity[:openstack] tenant = id.tenants.find { |t| t.name == tenant_name } diff --git a/examples/shared_file_system/basics.rb b/examples/shared_file_system/basics.rb index a32b87f36..d24339b6c 100644 --- a/examples/shared_file_system/basics.rb +++ b/examples/shared_file_system/basics.rb @@ -29,8 +29,8 @@ :connection_options => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'} } -network_service = Fog::OpenStack::Network.new(auth_options) -share_service = Fog::OpenStack::SharedFileSystem.new(auth_options) +network_service = Fog::Network::OpenStack.new(auth_options) +share_service = Fog::SharedFileSystem::OpenStack.new(auth_options) net = network_service.networks.first raise 'no network exists' if net.nil? diff --git a/examples/storage/set-account-quota.rb b/examples/storage/set-account-quota.rb index f018f7191..a17b50b61 100644 --- a/examples/storage/set-account-quota.rb +++ b/examples/storage/set-account-quota.rb @@ -28,14 +28,14 @@ # to retrieve the list of tenants available and find # the tenant we want to set the quotas for. # -id = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, +id = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, :openstack_username => user, :openstack_api_key => password # # Storage service (Swift) # -st = Fog::OpenStack::Storage.new :openstack_auth_url => auth_url, +st = Fog::Storage::OpenStack.new :openstack_auth_url => auth_url, :openstack_username => user, :openstack_api_key => password diff --git a/examples/volume/backups.rb b/examples/volume/backups.rb index 5af221065..5ffa627fb 100644 --- a/examples/volume/backups.rb +++ b/examples/volume/backups.rb @@ -1,5 +1,5 @@ require 'fog/openstack' -require 'fog/openstack/workflow/v2' +require 'fog/workflow/openstack/v2' auth_url = "http://192.0.2.1:5000/v3/auth/tokens" username = "admin" @@ -14,7 +14,7 @@ :openstack_domain_id => "default", } -cinder = Fog::OpenStack::Volume.new(@connection_params) +cinder = Fog::Volume::OpenStack.new(@connection_params) puts "INFO: create backup of existing volume named test" diff --git a/examples/workflow/workflow-examples.rb b/examples/workflow/workflow-examples.rb index 24779b2cc..aca65554b 100644 --- a/examples/workflow/workflow-examples.rb +++ b/examples/workflow/workflow-examples.rb @@ -1,5 +1,5 @@ require 'fog/openstack' -require 'fog/openstack/workflow/v2' +require 'fog/workflow/openstack/v2' auth_url = "http://192.0.2.1:5000/v3/auth/tokens" username = "admin" @@ -14,7 +14,7 @@ :openstack_domain_id => "default", } -mistral = Fog::OpenStack::Workflow.new(@connection_params) +mistral = Fog::Workflow::OpenStack.new(@connection_params) puts "INFO: create_execution" diff --git a/lib/fog/openstack/baremetal/baremetal.rb b/lib/fog/baremetal/openstack.rb similarity index 97% rename from lib/fog/openstack/baremetal/baremetal.rb rename to lib/fog/baremetal/openstack.rb index c1ba2e52e..136911c3b 100644 --- a/lib/fog/openstack/baremetal/baremetal.rb +++ b/lib/fog/baremetal/openstack.rb @@ -1,6 +1,8 @@ + + module Fog - module OpenStack - class Baremetal < Fog::Service + module Baremetal + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /(.)*/ requires :openstack_auth_url @@ -17,7 +19,7 @@ class Baremetal < Fog::Service ## MODELS # - model_path 'fog/openstack/baremetal/models' + model_path 'fog/baremetal/openstack/models' model :chassis collection :chassis_collection model :driver @@ -29,7 +31,7 @@ class Baremetal < Fog::Service ## REQUESTS # - request_path 'fog/openstack/baremetal/requests' + request_path 'fog/baremetal/openstack/requests' # Node requests request :create_node @@ -248,7 +250,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Baremetal::NotFound + Fog::Baremetal::OpenStack::NotFound end def default_service_type diff --git a/lib/fog/openstack/baremetal/models/chassis.rb b/lib/fog/baremetal/openstack/models/chassis.rb similarity index 96% rename from lib/fog/openstack/baremetal/models/chassis.rb rename to lib/fog/baremetal/openstack/models/chassis.rb index e096109eb..006501962 100644 --- a/lib/fog/openstack/baremetal/models/chassis.rb +++ b/lib/fog/baremetal/openstack/models/chassis.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Chassis < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/openstack/baremetal/models/chassis_collection.rb b/lib/fog/baremetal/openstack/models/chassis_collection.rb similarity index 89% rename from lib/fog/openstack/baremetal/models/chassis_collection.rb rename to lib/fog/baremetal/openstack/models/chassis_collection.rb index cee1170f7..8d9176247 100644 --- a/lib/fog/openstack/baremetal/models/chassis_collection.rb +++ b/lib/fog/baremetal/openstack/models/chassis_collection.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/baremetal/models/chassis' +require 'fog/baremetal/openstack/models/chassis' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class ChassisCollection < Fog::OpenStack::Collection - model Fog::OpenStack::Baremetal::Chassis + model Fog::Baremetal::OpenStack::Chassis def all(options = {}) load_response(service.list_chassis_detailed(options), 'chassis') diff --git a/lib/fog/openstack/baremetal/models/driver.rb b/lib/fog/baremetal/openstack/models/driver.rb similarity index 91% rename from lib/fog/openstack/baremetal/models/driver.rb rename to lib/fog/baremetal/openstack/models/driver.rb index 8693ce329..529ae2224 100644 --- a/lib/fog/openstack/baremetal/models/driver.rb +++ b/lib/fog/baremetal/openstack/models/driver.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Driver < Fog::OpenStack::Model identity :name diff --git a/lib/fog/openstack/baremetal/models/drivers.rb b/lib/fog/baremetal/openstack/models/drivers.rb similarity index 72% rename from lib/fog/openstack/baremetal/models/drivers.rb rename to lib/fog/baremetal/openstack/models/drivers.rb index 567ba9549..9e6ca4dd4 100644 --- a/lib/fog/openstack/baremetal/models/drivers.rb +++ b/lib/fog/baremetal/openstack/models/drivers.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/baremetal/models/driver' +require 'fog/baremetal/openstack/models/driver' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Drivers < Fog::OpenStack::Collection - model Fog::OpenStack::Baremetal::Driver + model Fog::Baremetal::OpenStack::Driver def all(options = {}) load_response(service.list_drivers(options), 'drivers') diff --git a/lib/fog/openstack/baremetal/models/node.rb b/lib/fog/baremetal/openstack/models/node.rb similarity index 98% rename from lib/fog/openstack/baremetal/models/node.rb rename to lib/fog/baremetal/openstack/models/node.rb index 403485b52..774b34fdd 100644 --- a/lib/fog/openstack/baremetal/models/node.rb +++ b/lib/fog/baremetal/openstack/models/node.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Node < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/openstack/baremetal/models/nodes.rb b/lib/fog/baremetal/openstack/models/nodes.rb similarity index 89% rename from lib/fog/openstack/baremetal/models/nodes.rb rename to lib/fog/baremetal/openstack/models/nodes.rb index a9e8c58a0..972560e72 100644 --- a/lib/fog/openstack/baremetal/models/nodes.rb +++ b/lib/fog/baremetal/openstack/models/nodes.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/baremetal/models/node' +require 'fog/baremetal/openstack/models/node' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Nodes < Fog::OpenStack::Collection - model Fog::OpenStack::Baremetal::Node + model Fog::Baremetal::OpenStack::Node def all(options = {}) load_response(service.list_nodes_detailed(options), 'nodes') diff --git a/lib/fog/openstack/baremetal/models/port.rb b/lib/fog/baremetal/openstack/models/port.rb similarity index 96% rename from lib/fog/openstack/baremetal/models/port.rb rename to lib/fog/baremetal/openstack/models/port.rb index 479af5bd0..6170bb30c 100644 --- a/lib/fog/openstack/baremetal/models/port.rb +++ b/lib/fog/baremetal/openstack/models/port.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Port < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/openstack/baremetal/models/ports.rb b/lib/fog/baremetal/openstack/models/ports.rb similarity index 89% rename from lib/fog/openstack/baremetal/models/ports.rb rename to lib/fog/baremetal/openstack/models/ports.rb index d5322650c..4d9e79657 100644 --- a/lib/fog/openstack/baremetal/models/ports.rb +++ b/lib/fog/baremetal/openstack/models/ports.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/baremetal/models/port' +require 'fog/baremetal/openstack/models/port' module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Ports < Fog::OpenStack::Collection - model Fog::OpenStack::Baremetal::Port + model Fog::Baremetal::OpenStack::Port def all(options = {}) load_response(service.list_ports_detailed(options), 'ports') diff --git a/lib/fog/openstack/baremetal/requests/create_chassis.rb b/lib/fog/baremetal/openstack/requests/create_chassis.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/create_chassis.rb rename to lib/fog/baremetal/openstack/requests/create_chassis.rb index dc1da3d84..88d213b6b 100644 --- a/lib/fog/openstack/baremetal/requests/create_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/create_chassis.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real # Create a new chassis # diff --git a/lib/fog/openstack/baremetal/requests/create_node.rb b/lib/fog/baremetal/openstack/requests/create_node.rb similarity index 97% rename from lib/fog/openstack/baremetal/requests/create_node.rb rename to lib/fog/baremetal/openstack/requests/create_node.rb index 629e0614f..3f81ece30 100644 --- a/lib/fog/openstack/baremetal/requests/create_node.rb +++ b/lib/fog/baremetal/openstack/requests/create_node.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real # Create a new node # diff --git a/lib/fog/openstack/baremetal/requests/create_port.rb b/lib/fog/baremetal/openstack/requests/create_port.rb similarity index 97% rename from lib/fog/openstack/baremetal/requests/create_port.rb rename to lib/fog/baremetal/openstack/requests/create_port.rb index a980ed0ab..5bc678cb1 100644 --- a/lib/fog/openstack/baremetal/requests/create_port.rb +++ b/lib/fog/baremetal/openstack/requests/create_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real # Create a new port # diff --git a/lib/fog/openstack/baremetal/requests/delete_chassis.rb b/lib/fog/baremetal/openstack/requests/delete_chassis.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/delete_chassis.rb rename to lib/fog/baremetal/openstack/requests/delete_chassis.rb index a13ce5b7b..2b35cebcd 100644 --- a/lib/fog/openstack/baremetal/requests/delete_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/delete_chassis.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def delete_chassis(chassis_uuid) data = {:chassis_uuid => chassis_uuid} diff --git a/lib/fog/openstack/baremetal/requests/delete_node.rb b/lib/fog/baremetal/openstack/requests/delete_node.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/delete_node.rb rename to lib/fog/baremetal/openstack/requests/delete_node.rb index 522373555..260c1844d 100644 --- a/lib/fog/openstack/baremetal/requests/delete_node.rb +++ b/lib/fog/baremetal/openstack/requests/delete_node.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def delete_node(node_uuid) data = {:node_ident => node_uuid} diff --git a/lib/fog/openstack/baremetal/requests/delete_port.rb b/lib/fog/baremetal/openstack/requests/delete_port.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/delete_port.rb rename to lib/fog/baremetal/openstack/requests/delete_port.rb index 1faadb1d1..89e9a0c77 100644 --- a/lib/fog/openstack/baremetal/requests/delete_port.rb +++ b/lib/fog/baremetal/openstack/requests/delete_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def delete_port(port_uuid) data = {:port_uuid => port_uuid} diff --git a/lib/fog/openstack/baremetal/requests/get_chassis.rb b/lib/fog/baremetal/openstack/requests/get_chassis.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/get_chassis.rb rename to lib/fog/baremetal/openstack/requests/get_chassis.rb index def0f616b..88fa41d3d 100644 --- a/lib/fog/openstack/baremetal/requests/get_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/get_chassis.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def get_chassis(chassis_uuid) request( diff --git a/lib/fog/openstack/baremetal/requests/get_driver.rb b/lib/fog/baremetal/openstack/requests/get_driver.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/get_driver.rb rename to lib/fog/baremetal/openstack/requests/get_driver.rb index 915f03638..48f95940d 100644 --- a/lib/fog/openstack/baremetal/requests/get_driver.rb +++ b/lib/fog/baremetal/openstack/requests/get_driver.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def get_driver(driver_name) request( diff --git a/lib/fog/openstack/baremetal/requests/get_driver_properties.rb b/lib/fog/baremetal/openstack/requests/get_driver_properties.rb similarity index 97% rename from lib/fog/openstack/baremetal/requests/get_driver_properties.rb rename to lib/fog/baremetal/openstack/requests/get_driver_properties.rb index 3dc9e11ea..3404d53da 100644 --- a/lib/fog/openstack/baremetal/requests/get_driver_properties.rb +++ b/lib/fog/baremetal/openstack/requests/get_driver_properties.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def get_driver_properties(driver_name) data = {:driver_name => driver_name} diff --git a/lib/fog/openstack/baremetal/requests/get_node.rb b/lib/fog/baremetal/openstack/requests/get_node.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/get_node.rb rename to lib/fog/baremetal/openstack/requests/get_node.rb index 60d4be300..444909b87 100644 --- a/lib/fog/openstack/baremetal/requests/get_node.rb +++ b/lib/fog/baremetal/openstack/requests/get_node.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def get_node(node_id) request( diff --git a/lib/fog/openstack/baremetal/requests/get_port.rb b/lib/fog/baremetal/openstack/requests/get_port.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/get_port.rb rename to lib/fog/baremetal/openstack/requests/get_port.rb index bf34be34f..27c2fccb2 100644 --- a/lib/fog/openstack/baremetal/requests/get_port.rb +++ b/lib/fog/baremetal/openstack/requests/get_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def get_port(port_id) request( diff --git a/lib/fog/openstack/baremetal/requests/list_chassis.rb b/lib/fog/baremetal/openstack/requests/list_chassis.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/list_chassis.rb rename to lib/fog/baremetal/openstack/requests/list_chassis.rb index f7d5272cc..d9e583f7f 100644 --- a/lib/fog/openstack/baremetal/requests/list_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/list_chassis.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_chassis(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb b/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb similarity index 93% rename from lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb rename to lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb index 63a25d58b..cd59e91e4 100644 --- a/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb +++ b/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_chassis_detailed(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/list_drivers.rb b/lib/fog/baremetal/openstack/requests/list_drivers.rb similarity index 92% rename from lib/fog/openstack/baremetal/requests/list_drivers.rb rename to lib/fog/baremetal/openstack/requests/list_drivers.rb index bf0646520..c26ac48da 100644 --- a/lib/fog/openstack/baremetal/requests/list_drivers.rb +++ b/lib/fog/baremetal/openstack/requests/list_drivers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_drivers(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/list_nodes.rb b/lib/fog/baremetal/openstack/requests/list_nodes.rb similarity index 95% rename from lib/fog/openstack/baremetal/requests/list_nodes.rb rename to lib/fog/baremetal/openstack/requests/list_nodes.rb index ff2c63964..b3b8013ce 100644 --- a/lib/fog/openstack/baremetal/requests/list_nodes.rb +++ b/lib/fog/baremetal/openstack/requests/list_nodes.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_nodes(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb b/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb similarity index 93% rename from lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb rename to lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb index afbca74d5..0ab63c487 100644 --- a/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb +++ b/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_nodes_detailed(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/list_ports.rb b/lib/fog/baremetal/openstack/requests/list_ports.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/list_ports.rb rename to lib/fog/baremetal/openstack/requests/list_ports.rb index 0a68f4042..e31765644 100644 --- a/lib/fog/openstack/baremetal/requests/list_ports.rb +++ b/lib/fog/baremetal/openstack/requests/list_ports.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_ports(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb b/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb similarity index 93% rename from lib/fog/openstack/baremetal/requests/list_ports_detailed.rb rename to lib/fog/baremetal/openstack/requests/list_ports_detailed.rb index 768c40773..31216effa 100644 --- a/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb +++ b/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def list_ports_detailed(options = {}) request( diff --git a/lib/fog/openstack/baremetal/requests/patch_chassis.rb b/lib/fog/baremetal/openstack/requests/patch_chassis.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/patch_chassis.rb rename to lib/fog/baremetal/openstack/requests/patch_chassis.rb index ebfe87b66..a21904e44 100644 --- a/lib/fog/openstack/baremetal/requests/patch_chassis.rb +++ b/lib/fog/baremetal/openstack/requests/patch_chassis.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real # Patch a chassis # diff --git a/lib/fog/openstack/baremetal/requests/patch_node.rb b/lib/fog/baremetal/openstack/requests/patch_node.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/patch_node.rb rename to lib/fog/baremetal/openstack/requests/patch_node.rb index 445b15cc7..ba2143780 100644 --- a/lib/fog/openstack/baremetal/requests/patch_node.rb +++ b/lib/fog/baremetal/openstack/requests/patch_node.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real # Patch a node # diff --git a/lib/fog/openstack/baremetal/requests/patch_port.rb b/lib/fog/baremetal/openstack/requests/patch_port.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/patch_port.rb rename to lib/fog/baremetal/openstack/requests/patch_port.rb index ffe9da2ba..0a162aa30 100644 --- a/lib/fog/openstack/baremetal/requests/patch_port.rb +++ b/lib/fog/baremetal/openstack/requests/patch_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real # Patch a port # diff --git a/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb b/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb similarity index 95% rename from lib/fog/openstack/baremetal/requests/set_node_maintenance.rb rename to lib/fog/baremetal/openstack/requests/set_node_maintenance.rb index 8939b200b..fdcd584e5 100644 --- a/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb +++ b/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def set_node_maintenance(node_uuid, parameters = nil) request( diff --git a/lib/fog/openstack/baremetal/requests/set_node_power_state.rb b/lib/fog/baremetal/openstack/requests/set_node_power_state.rb similarity index 95% rename from lib/fog/openstack/baremetal/requests/set_node_power_state.rb rename to lib/fog/baremetal/openstack/requests/set_node_power_state.rb index f036c074f..360aed009 100644 --- a/lib/fog/openstack/baremetal/requests/set_node_power_state.rb +++ b/lib/fog/baremetal/openstack/requests/set_node_power_state.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def set_node_power_state(node_id, power_state) data = { diff --git a/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb b/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb similarity index 96% rename from lib/fog/openstack/baremetal/requests/set_node_provision_state.rb rename to lib/fog/baremetal/openstack/requests/set_node_provision_state.rb index f2ddc57dc..64328c7d6 100644 --- a/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb +++ b/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def set_node_provision_state(node_id, provision_state) data = { diff --git a/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb b/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb similarity index 95% rename from lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb rename to lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb index 7cdd20f76..a996d3098 100644 --- a/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb +++ b/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Baremetal + module Baremetal + class OpenStack class Real def unset_node_maintenance(node_uuid, parameters = nil) request( diff --git a/lib/fog/openstack/compute/compute.rb b/lib/fog/compute/openstack.rb similarity index 98% rename from lib/fog/openstack/compute/compute.rb rename to lib/fog/compute/openstack.rb index 38bc5a2ed..3d2049979 100644 --- a/lib/fog/openstack/compute/compute.rb +++ b/lib/fog/compute/openstack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute < Fog::Service + module Compute + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v2\.0|v2\.1/ SUPPORTED_MICROVERSION = '2.15'.freeze @@ -18,7 +18,7 @@ class Compute < Fog::Service ## MODELS # - model_path 'fog/openstack/compute/models' + model_path 'fog/compute/openstack/models' model :aggregate collection :aggregates model :availability_zone @@ -60,7 +60,7 @@ class Compute < Fog::Service ## REQUESTS # - request_path 'fog/openstack/compute/requests' + request_path 'fog/compute/openstack/requests' # Aggregate CRUD request :list_aggregates @@ -373,7 +373,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Compute::NotFound + Fog::Compute::OpenStack::NotFound end def default_service_type diff --git a/lib/fog/openstack/compute/models/address.rb b/lib/fog/compute/openstack/models/address.rb similarity index 97% rename from lib/fog/openstack/compute/models/address.rb rename to lib/fog/compute/openstack/models/address.rb index ac62ade97..a74160bbf 100644 --- a/lib/fog/openstack/compute/models/address.rb +++ b/lib/fog/compute/openstack/models/address.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Address < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/addresses.rb b/lib/fog/compute/openstack/models/addresses.rb similarity index 74% rename from lib/fog/openstack/compute/models/addresses.rb rename to lib/fog/compute/openstack/models/addresses.rb index 5969106a9..3fe6282fe 100644 --- a/lib/fog/openstack/compute/models/addresses.rb +++ b/lib/fog/compute/openstack/models/addresses.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/address' +require 'fog/compute/openstack/models/address' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Addresses < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Address + model Fog::Compute::OpenStack::Address def all(options = {}) load_response(service.list_all_addresses(options), 'floating_ips') @@ -15,7 +15,7 @@ def get(address_id) if address = service.get_address(address_id).body['floating_ip'] new(address) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/compute/models/aggregate.rb b/lib/fog/compute/openstack/models/aggregate.rb similarity index 97% rename from lib/fog/openstack/compute/models/aggregate.rb rename to lib/fog/compute/openstack/models/aggregate.rb index 1cafe5184..ffc77c819 100644 --- a/lib/fog/openstack/compute/models/aggregate.rb +++ b/lib/fog/compute/openstack/models/aggregate.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Aggregate < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/aggregates.rb b/lib/fog/compute/openstack/models/aggregates.rb similarity index 78% rename from lib/fog/openstack/compute/models/aggregates.rb rename to lib/fog/compute/openstack/models/aggregates.rb index 2e4126f57..956fb2468 100644 --- a/lib/fog/openstack/compute/models/aggregates.rb +++ b/lib/fog/compute/openstack/models/aggregates.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/aggregate' +require 'fog/compute/openstack/models/aggregate' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Aggregates < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Aggregate + model Fog::Compute::OpenStack::Aggregate def all(options = {}) load_response(service.list_aggregates(options), 'aggregates') diff --git a/lib/fog/openstack/compute/models/availability_zone.rb b/lib/fog/compute/openstack/models/availability_zone.rb similarity index 88% rename from lib/fog/openstack/compute/models/availability_zone.rb rename to lib/fog/compute/openstack/models/availability_zone.rb index fad9a1471..2f82201cb 100644 --- a/lib/fog/openstack/compute/models/availability_zone.rb +++ b/lib/fog/compute/openstack/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class AvailabilityZone < Fog::OpenStack::Model identity :zoneName diff --git a/lib/fog/openstack/compute/models/availability_zones.rb b/lib/fog/compute/openstack/models/availability_zones.rb similarity index 74% rename from lib/fog/openstack/compute/models/availability_zones.rb rename to lib/fog/compute/openstack/models/availability_zones.rb index b3be66cf7..b4befaea6 100644 --- a/lib/fog/openstack/compute/models/availability_zones.rb +++ b/lib/fog/compute/openstack/models/availability_zones.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/availability_zone' +require 'fog/compute/openstack/models/availability_zone' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class AvailabilityZones < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::AvailabilityZone + model Fog::Compute::OpenStack::AvailabilityZone def all(options = {}) data = service.list_zones_detailed(options) diff --git a/lib/fog/openstack/compute/models/flavor.rb b/lib/fog/compute/openstack/models/flavor.rb similarity index 86% rename from lib/fog/openstack/compute/models/flavor.rb rename to lib/fog/compute/openstack/models/flavor.rb index aa56fc297..553056aff 100644 --- a/lib/fog/openstack/compute/models/flavor.rb +++ b/lib/fog/compute/openstack/models/flavor.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Flavor < Fog::OpenStack::Model identity :id @@ -37,25 +37,25 @@ def destroy def metadata service.get_flavor_metadata(id).body['extra_specs'] - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end def create_metadata(metadata) service.create_flavor_metadata(id, metadata) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end def update_metadata(key, value) service.update_flavor_metadata(id, key, value) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end def delete_metadata(key) service.delete_flavor_metadata(id, key) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/flavors.rb b/lib/fog/compute/openstack/models/flavors.rb similarity index 75% rename from lib/fog/openstack/compute/models/flavors.rb rename to lib/fog/compute/openstack/models/flavors.rb index c4430e96c..e5d6b754f 100644 --- a/lib/fog/openstack/compute/models/flavors.rb +++ b/lib/fog/compute/openstack/models/flavors.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/flavor' +require 'fog/compute/openstack/models/flavor' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Flavors < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Flavor + model Fog::Compute::OpenStack::Flavor def all(options = {}) data = service.list_flavors_detail(options) @@ -20,7 +20,7 @@ def summary(options = {}) def get(flavor_id) data = service.get_flavor_details(flavor_id).body['flavor'] new(data) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/host.rb b/lib/fog/compute/openstack/models/host.rb similarity index 81% rename from lib/fog/openstack/compute/models/host.rb rename to lib/fog/compute/openstack/models/host.rb index bf79e813c..637d451ff 100644 --- a/lib/fog/openstack/compute/models/host.rb +++ b/lib/fog/compute/openstack/models/host.rb @@ -1,9 +1,9 @@ require 'fog/compute/models/server' -require 'fog/openstack/compute/models/metadata' +require 'fog/compute/openstack/models/metadata' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Host < Fog::OpenStack::Model attribute :host_name attribute :service_name @@ -19,7 +19,7 @@ def initialize(attributes) def details service.get_host_details(host_name).body['host'] - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/hosts.rb b/lib/fog/compute/openstack/models/hosts.rb similarity index 73% rename from lib/fog/openstack/compute/models/hosts.rb rename to lib/fog/compute/openstack/models/hosts.rb index 9baf1edc3..8cc8fa1b5 100644 --- a/lib/fog/openstack/compute/models/hosts.rb +++ b/lib/fog/compute/openstack/models/hosts.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/host' +require 'fog/compute/openstack/models/host' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Hosts < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Host + model Fog::Compute::OpenStack::Host def all(options = {}) data = service.list_hosts(options) @@ -17,7 +17,7 @@ def get(host_name) new('host_name' => host_name, 'details' => host) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/image.rb b/lib/fog/compute/openstack/models/image.rb similarity index 87% rename from lib/fog/openstack/compute/models/image.rb rename to lib/fog/compute/openstack/models/image.rb index bc2b0c8cb..cd9a41ff4 100644 --- a/lib/fog/openstack/compute/models/image.rb +++ b/lib/fog/compute/openstack/models/image.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/openstack/compute/models/metadata' +require 'fog/compute/openstack/models/metadata' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Image < Fog::OpenStack::Model identity :id @@ -21,7 +21,7 @@ class Image < Fog::OpenStack::Model def metadata @metadata ||= begin - Fog::OpenStack::Compute::Metadata.new(:service => service, + Fog::Compute::OpenStack::Metadata.new(:service => service, :parent => self) end end diff --git a/lib/fog/openstack/compute/models/images.rb b/lib/fog/compute/openstack/models/images.rb similarity index 80% rename from lib/fog/openstack/compute/models/images.rb rename to lib/fog/compute/openstack/models/images.rb index 5aecc5937..b1e00a84f 100644 --- a/lib/fog/openstack/compute/models/images.rb +++ b/lib/fog/compute/openstack/models/images.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/image' +require 'fog/compute/openstack/models/image' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Images < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Compute::Image + model Fog::Compute::OpenStack::Image attribute :server @@ -29,7 +29,7 @@ def all(filters_arg = filters) def get(image_id) data = service.get_image_details(image_id).body['image'] new(data) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/key_pair.rb b/lib/fog/compute/openstack/models/key_pair.rb similarity index 97% rename from lib/fog/openstack/compute/models/key_pair.rb rename to lib/fog/compute/openstack/models/key_pair.rb index 7a16a7a75..6cc30481f 100644 --- a/lib/fog/openstack/compute/models/key_pair.rb +++ b/lib/fog/compute/openstack/models/key_pair.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class KeyPair < Fog::OpenStack::Model identity :name diff --git a/lib/fog/openstack/compute/models/key_pairs.rb b/lib/fog/compute/openstack/models/key_pairs.rb similarity index 74% rename from lib/fog/openstack/compute/models/key_pairs.rb rename to lib/fog/compute/openstack/models/key_pairs.rb index 468d07ff9..fbbd98bf2 100644 --- a/lib/fog/openstack/compute/models/key_pairs.rb +++ b/lib/fog/compute/openstack/models/key_pairs.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/key_pair' +require 'fog/compute/openstack/models/key_pair' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class KeyPairs < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::KeyPair + model Fog::Compute::OpenStack::KeyPair def all(options = {}) items = [] @@ -20,7 +20,7 @@ def get(key_pair_name) if key_pair_name all.select { |kp| kp.name == key_pair_name }.first end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/metadata.rb b/lib/fog/compute/openstack/models/metadata.rb similarity index 79% rename from lib/fog/openstack/compute/models/metadata.rb rename to lib/fog/compute/openstack/models/metadata.rb index 50cfc70ec..0c42f3d67 100644 --- a/lib/fog/openstack/compute/models/metadata.rb +++ b/lib/fog/compute/openstack/models/metadata.rb @@ -1,16 +1,16 @@ require 'fog/openstack/models/collection' require 'fog/openstack/models/meta_parent' -require 'fog/openstack/compute/models/metadatum' -require 'fog/openstack/compute/models/image' -require 'fog/openstack/compute/models/server' +require 'fog/compute/openstack/models/metadatum' +require 'fog/compute/openstack/models/image' +require 'fog/compute/openstack/models/server' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Metadata < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Metadatum + model Fog::Compute::OpenStack::Metadatum - include Fog::OpenStack::Compute::MetaParent + include Fog::Compute::OpenStack::MetaParent def all requires :parent @@ -27,7 +27,7 @@ def get(key) metas = [] data.each_pair { |k, v| metas << {"key" => k, "value" => v} } new(metas[0]) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end @@ -50,7 +50,7 @@ def to_hash(data = nil) if data.nil? data = {} each do |meta| - if meta.kind_of?(Fog::OpenStack::Compute::Metadatum) + if meta.kind_of?(Fog::Compute::OpenStack::Metadatum) data.store(meta.key, meta.value) else data.store(meta["key"], meta["value"]) diff --git a/lib/fog/openstack/compute/models/metadatum.rb b/lib/fog/compute/openstack/models/metadatum.rb similarity index 85% rename from lib/fog/openstack/compute/models/metadatum.rb rename to lib/fog/compute/openstack/models/metadatum.rb index 431f70af4..d9c03f3ea 100644 --- a/lib/fog/openstack/compute/models/metadatum.rb +++ b/lib/fog/compute/openstack/models/metadatum.rb @@ -2,10 +2,10 @@ require 'fog/openstack/models/meta_parent' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Metadatum < Fog::OpenStack::Model - include Fog::OpenStack::Compute::MetaParent + include Fog::Compute::OpenStack::MetaParent identity :key attribute :value diff --git a/lib/fog/openstack/compute/models/network.rb b/lib/fog/compute/openstack/models/network.rb similarity index 84% rename from lib/fog/openstack/compute/models/network.rb rename to lib/fog/compute/openstack/models/network.rb index a25f39acb..f6d866ee2 100644 --- a/lib/fog/openstack/compute/models/network.rb +++ b/lib/fog/compute/openstack/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Network < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/openstack/compute/models/networks.rb b/lib/fog/compute/openstack/models/networks.rb similarity index 81% rename from lib/fog/openstack/compute/models/networks.rb rename to lib/fog/compute/openstack/models/networks.rb index 98d1224a0..06c57ae6c 100644 --- a/lib/fog/openstack/compute/models/networks.rb +++ b/lib/fog/compute/openstack/models/networks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/network' +require 'fog/compute/openstack/models/network' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Networks < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Network + model Fog::Compute::OpenStack::Network attribute :server diff --git a/lib/fog/openstack/compute/models/os_interface.rb b/lib/fog/compute/openstack/models/os_interface.rb similarity index 88% rename from lib/fog/openstack/compute/models/os_interface.rb rename to lib/fog/compute/openstack/models/os_interface.rb index dc47e446a..f685dddac 100644 --- a/lib/fog/openstack/compute/models/os_interface.rb +++ b/lib/fog/compute/openstack/models/os_interface.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class OsInterface < Fog::OpenStack::Model identity :port_id attribute :fixed_ips, :type => :array diff --git a/lib/fog/openstack/compute/models/os_interfaces.rb b/lib/fog/compute/openstack/models/os_interfaces.rb similarity index 78% rename from lib/fog/openstack/compute/models/os_interfaces.rb rename to lib/fog/compute/openstack/models/os_interfaces.rb index 32c69dc3f..c4140bbee 100644 --- a/lib/fog/openstack/compute/models/os_interfaces.rb +++ b/lib/fog/compute/openstack/models/os_interfaces.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/os_interface' +require 'fog/compute/openstack/models/os_interface' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class OsInterfaces < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::OsInterface + model Fog::Compute::OpenStack::OsInterface attribute :server diff --git a/lib/fog/openstack/compute/models/security_group.rb b/lib/fog/compute/openstack/models/security_group.rb similarity index 85% rename from lib/fog/openstack/compute/models/security_group.rb rename to lib/fog/compute/openstack/models/security_group.rb index 8a7305815..83057b9c2 100644 --- a/lib/fog/openstack/compute/models/security_group.rb +++ b/lib/fog/compute/openstack/models/security_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class SecurityGroup < Fog::OpenStack::Model identity :id @@ -12,7 +12,7 @@ class SecurityGroup < Fog::OpenStack::Model attribute :tenant_id def security_group_rules - Fog::OpenStack::Compute::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::Compute::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) end def rules @@ -23,7 +23,7 @@ def rules # no one should be calling this because it doesn't do anything # useful but we deprecated the rules attribute and need to maintain the API def rules=(new_rules) - Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRules collection to create new rules.') + Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.') attributes[:security_group_rules] = new_rules end @@ -41,13 +41,13 @@ def destroy end def create_security_group_rule(min, max, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id = nil) - Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRules collection to create new rules.') + Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.') requires :id service.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id) end def delete_security_group_rule(rule_id) - Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRule objects to destroy rules.') + Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRule objects to destroy rules.') service.delete_security_group_rule(rule_id) true end diff --git a/lib/fog/openstack/compute/models/security_group_rule.rb b/lib/fog/compute/openstack/models/security_group_rule.rb similarity index 95% rename from lib/fog/openstack/compute/models/security_group_rule.rb rename to lib/fog/compute/openstack/models/security_group_rule.rb index bcbf017b2..48e061b5a 100644 --- a/lib/fog/openstack/compute/models/security_group_rule.rb +++ b/lib/fog/compute/openstack/models/security_group_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class SecurityGroupRule < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/security_group_rules.rb b/lib/fog/compute/openstack/models/security_group_rules.rb similarity index 65% rename from lib/fog/openstack/compute/models/security_group_rules.rb rename to lib/fog/compute/openstack/models/security_group_rules.rb index bbf39d5f6..acab2e4dc 100644 --- a/lib/fog/openstack/compute/models/security_group_rules.rb +++ b/lib/fog/compute/openstack/models/security_group_rules.rb @@ -1,18 +1,18 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/security_group_rule' +require 'fog/compute/openstack/models/security_group_rule' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class SecurityGroupRules < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::SecurityGroupRule + model Fog::Compute::OpenStack::SecurityGroupRule def get(security_group_rule_id) if security_group_rule_id body = service.get_security_group_rule(security_group_rule_id).body new(body['security_group_rule']) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/security_groups.rb b/lib/fog/compute/openstack/models/security_groups.rb similarity index 70% rename from lib/fog/openstack/compute/models/security_groups.rb rename to lib/fog/compute/openstack/models/security_groups.rb index cbcf1f110..1a26414ad 100644 --- a/lib/fog/openstack/compute/models/security_groups.rb +++ b/lib/fog/compute/openstack/models/security_groups.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/security_group' +require 'fog/compute/openstack/models/security_group' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class SecurityGroups < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::SecurityGroup + model Fog::Compute::OpenStack::SecurityGroup def all(options = {}) load_response(service.list_security_groups(options), 'security_groups') @@ -15,7 +15,7 @@ def get(security_group_id) if security_group_id new(service.get_security_group(security_group_id).body['security_group']) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/server.rb b/lib/fog/compute/openstack/models/server.rb similarity index 98% rename from lib/fog/openstack/compute/models/server.rb rename to lib/fog/compute/openstack/models/server.rb index 66df13fa3..c0d698af7 100644 --- a/lib/fog/openstack/compute/models/server.rb +++ b/lib/fog/compute/openstack/models/server.rb @@ -1,9 +1,9 @@ require 'fog/compute/models/server' -require 'fog/openstack/compute/models/metadata' +require 'fog/compute/openstack/models/metadata' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Server < Fog::Compute::Server identity :id attribute :instance_name, :aliases => 'OS-EXT-SRV-ATTR:instance_name' @@ -74,7 +74,7 @@ def initialize(attributes = {}) def metadata @metadata ||= begin - Fog::OpenStack::Compute::Metadata.new(:service => service, + Fog::Compute::OpenStack::Metadata.new(:service => service, :parent => self) end end @@ -233,7 +233,7 @@ def security_groups groups = service.list_security_groups(:server_id => id).body['security_groups'] groups.map do |group| - Fog::OpenStack::Compute::SecurityGroup.new group.merge(:service => service) + Fog::Compute::OpenStack::SecurityGroup.new group.merge(:service => service) end else service.security_groups.all diff --git a/lib/fog/openstack/compute/models/server_group.rb b/lib/fog/compute/openstack/models/server_group.rb similarity index 94% rename from lib/fog/openstack/compute/models/server_group.rb rename to lib/fog/compute/openstack/models/server_group.rb index 73bca63b0..8514e1ad5 100644 --- a/lib/fog/openstack/compute/models/server_group.rb +++ b/lib/fog/compute/openstack/models/server_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class ServerGroup < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/openstack/compute/models/server_groups.rb b/lib/fog/compute/openstack/models/server_groups.rb similarity index 74% rename from lib/fog/openstack/compute/models/server_groups.rb rename to lib/fog/compute/openstack/models/server_groups.rb index 901657654..8b5d8ddca 100644 --- a/lib/fog/openstack/compute/models/server_groups.rb +++ b/lib/fog/compute/openstack/models/server_groups.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/server_group' +require 'fog/compute/openstack/models/server_group' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class ServerGroups < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::ServerGroup + model Fog::Compute::OpenStack::ServerGroup def all(options = {}) load_response(service.list_server_groups(options), 'server_groups') @@ -15,7 +15,7 @@ def get(server_group_id) if server_group_id new(service.get_server_group(server_group_id).body['server_group']) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/compute/models/servers.rb b/lib/fog/compute/openstack/models/servers.rb similarity index 75% rename from lib/fog/openstack/compute/models/servers.rb rename to lib/fog/compute/openstack/models/servers.rb index 8f1fed4c3..1f8e14a7e 100644 --- a/lib/fog/openstack/compute/models/servers.rb +++ b/lib/fog/compute/openstack/models/servers.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/server' +require 'fog/compute/openstack/models/server' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Servers < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Compute::Server + model Fog::Compute::OpenStack::Server def initialize(attributes) self.filters ||= {} @@ -27,11 +27,11 @@ def summary(filters_arg = filters) end # Creates a new server and populates ssh keys - # @return [Fog::OpenStack::Compute::Server] - # @raise [Fog::OpenStack::Compute::NotFound] - HTTP 404 - # @raise [Fog::OpenStack::Compute::BadRequest] - HTTP 400 - # @raise [Fog::OpenStack::Compute::InternalServerError] - HTTP 500 - # @raise [Fog::OpenStack::Compute::ServiceError] + # @return [Fog::Compute::OpenStack::Server] + # @raise [Fog::Compute::OpenStack::NotFound] - HTTP 404 + # @raise [Fog::Compute::OpenStack::BadRequest] - HTTP 400 + # @raise [Fog::Compute::OpenStack::InternalServerError] - HTTP 500 + # @raise [Fog::Compute::OpenStack::ServiceError] # @example # service.servers.bootstrap :name => 'bootstrap-server', # :flavor_ref => service.flavors.first.id, @@ -50,7 +50,7 @@ def get(server_id) if server = service.get_server_details(server_id).body['server'] new(server) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/service.rb b/lib/fog/compute/openstack/models/service.rb similarity index 95% rename from lib/fog/openstack/compute/models/service.rb rename to lib/fog/compute/openstack/models/service.rb index e36471dbb..7a9fcb1a7 100644 --- a/lib/fog/openstack/compute/models/service.rb +++ b/lib/fog/compute/openstack/models/service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Service < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/services.rb b/lib/fog/compute/openstack/models/services.rb similarity index 83% rename from lib/fog/openstack/compute/models/services.rb rename to lib/fog/compute/openstack/models/services.rb index 3331dbd02..d1a8ce8b7 100644 --- a/lib/fog/openstack/compute/models/services.rb +++ b/lib/fog/compute/openstack/models/services.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/service' +require 'fog/compute/openstack/models/service' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Services < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Service + model Fog::Compute::OpenStack::Service def all(options = {}) load_response(service.list_services(options), 'services') @@ -26,7 +26,7 @@ def get(service_id) s['id'] == service_id end new(serv) if serv - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/snapshot.rb b/lib/fog/compute/openstack/models/snapshot.rb similarity index 90% rename from lib/fog/openstack/compute/models/snapshot.rb rename to lib/fog/compute/openstack/models/snapshot.rb index a0bf1db9d..8ed587497 100644 --- a/lib/fog/openstack/compute/models/snapshot.rb +++ b/lib/fog/compute/openstack/models/snapshot.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/openstack/compute/models/metadata' +require 'fog/compute/openstack/models/metadata' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Snapshot < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/snapshots.rb b/lib/fog/compute/openstack/models/snapshots.rb similarity index 84% rename from lib/fog/openstack/compute/models/snapshots.rb rename to lib/fog/compute/openstack/models/snapshots.rb index 110da6e2a..9d1c21855 100644 --- a/lib/fog/openstack/compute/models/snapshots.rb +++ b/lib/fog/compute/openstack/models/snapshots.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/snapshot' +require 'fog/compute/openstack/models/snapshot' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Snapshots < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Snapshot + model Fog::Compute::OpenStack::Snapshot def all(options = {}) if !options.kind_of?(Hash) @@ -28,7 +28,7 @@ def get(snapshot_id) if snapshot = service.get_snapshot_details(snapshot_id).body['snapshot'] new(snapshot) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/tenant.rb b/lib/fog/compute/openstack/models/tenant.rb similarity index 91% rename from lib/fog/openstack/compute/models/tenant.rb rename to lib/fog/compute/openstack/models/tenant.rb index 7553297e7..2f6c50438 100644 --- a/lib/fog/openstack/compute/models/tenant.rb +++ b/lib/fog/compute/openstack/models/tenant.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Tenant < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/tenants.rb b/lib/fog/compute/openstack/models/tenants.rb similarity index 78% rename from lib/fog/openstack/compute/models/tenants.rb rename to lib/fog/compute/openstack/models/tenants.rb index a00d6c1f3..15d8645fb 100644 --- a/lib/fog/openstack/compute/models/tenants.rb +++ b/lib/fog/compute/openstack/models/tenants.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/tenant' +require 'fog/compute/openstack/models/tenant' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Tenants < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Tenant + model Fog::Compute::OpenStack::Tenant def all load_response(service.list_tenants, 'tenants') diff --git a/lib/fog/openstack/compute/models/volume.rb b/lib/fog/compute/openstack/models/volume.rb similarity index 94% rename from lib/fog/openstack/compute/models/volume.rb rename to lib/fog/compute/openstack/models/volume.rb index 0ac7293d9..cacbf5254 100644 --- a/lib/fog/openstack/compute/models/volume.rb +++ b/lib/fog/compute/openstack/models/volume.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/openstack/compute/models/metadata' +require 'fog/compute/openstack/models/metadata' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Volume < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/compute/models/volume_attachment.rb b/lib/fog/compute/openstack/models/volume_attachment.rb similarity index 85% rename from lib/fog/openstack/compute/models/volume_attachment.rb rename to lib/fog/compute/openstack/models/volume_attachment.rb index 41727a1f6..8297bd475 100644 --- a/lib/fog/openstack/compute/models/volume_attachment.rb +++ b/lib/fog/compute/openstack/models/volume_attachment.rb @@ -1,8 +1,8 @@ require 'fog/core/model' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class VolumeAttachment < Fog::Model identity :id diff --git a/lib/fog/openstack/compute/models/volume_attachments.rb b/lib/fog/compute/openstack/models/volume_attachments.rb similarity index 71% rename from lib/fog/openstack/compute/models/volume_attachments.rb rename to lib/fog/compute/openstack/models/volume_attachments.rb index 6c5046741..d67f68ba5 100644 --- a/lib/fog/openstack/compute/models/volume_attachments.rb +++ b/lib/fog/compute/openstack/models/volume_attachments.rb @@ -1,17 +1,17 @@ require 'fog/core/collection' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class VolumeAttachments < Fog::Collection - model Fog::OpenStack::Compute::VolumeAttachment + model Fog::Compute::OpenStack::VolumeAttachment def get(server_id) if server_id puts service.list_volume_attachments(server_id).body load(service.list_volume_attachments(server_id).body['volumeAttachments']) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/models/volumes.rb b/lib/fog/compute/openstack/models/volumes.rb similarity index 84% rename from lib/fog/openstack/compute/models/volumes.rb rename to lib/fog/compute/openstack/models/volumes.rb index 843cdf6db..8ffee8073 100644 --- a/lib/fog/openstack/compute/models/volumes.rb +++ b/lib/fog/compute/openstack/models/volumes.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/compute/models/volume' +require 'fog/compute/openstack/models/volume' module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Volumes < Fog::OpenStack::Collection - model Fog::OpenStack::Compute::Volume + model Fog::Compute::OpenStack::Volume def all(options = true) if !options.kind_of?(Hash) @@ -28,7 +28,7 @@ def get(volume_id) if volume = service.get_volume_details(volume_id).body['volume'] new(volume) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/compute/requests/add_aggregate_host.rb b/lib/fog/compute/openstack/requests/add_aggregate_host.rb similarity index 95% rename from lib/fog/openstack/compute/requests/add_aggregate_host.rb rename to lib/fog/compute/openstack/requests/add_aggregate_host.rb index 6775bd6a9..8b54bce0c 100644 --- a/lib/fog/openstack/compute/requests/add_aggregate_host.rb +++ b/lib/fog/compute/openstack/requests/add_aggregate_host.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def add_aggregate_host(uuid, host_uuid) data = {'add_host' => {'host' => host_uuid}} diff --git a/lib/fog/openstack/compute/requests/add_fixed_ip.rb b/lib/fog/compute/openstack/requests/add_fixed_ip.rb similarity index 94% rename from lib/fog/openstack/compute/requests/add_fixed_ip.rb rename to lib/fog/compute/openstack/requests/add_fixed_ip.rb index c3e6c4256..db4fa8461 100644 --- a/lib/fog/openstack/compute/requests/add_fixed_ip.rb +++ b/lib/fog/compute/openstack/requests/add_fixed_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Add an IP address on a network. # diff --git a/lib/fog/openstack/compute/requests/add_flavor_access.rb b/lib/fog/compute/openstack/requests/add_flavor_access.rb similarity index 95% rename from lib/fog/openstack/compute/requests/add_flavor_access.rb rename to lib/fog/compute/openstack/requests/add_flavor_access.rb index bd9c14e8c..cf73ba031 100644 --- a/lib/fog/openstack/compute/requests/add_flavor_access.rb +++ b/lib/fog/compute/openstack/requests/add_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def add_flavor_access(flavor_ref, tenant_id) request( diff --git a/lib/fog/openstack/compute/requests/add_security_group.rb b/lib/fog/compute/openstack/requests/add_security_group.rb similarity index 91% rename from lib/fog/openstack/compute/requests/add_security_group.rb rename to lib/fog/compute/openstack/requests/add_security_group.rb index 368e57416..13133d0bb 100644 --- a/lib/fog/openstack/compute/requests/add_security_group.rb +++ b/lib/fog/compute/openstack/requests/add_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def add_security_group(server_id, group_name) body = {'addSecurityGroup' => {"name" => group_name}} diff --git a/lib/fog/openstack/compute/requests/allocate_address.rb b/lib/fog/compute/openstack/requests/allocate_address.rb similarity index 96% rename from lib/fog/openstack/compute/requests/allocate_address.rb rename to lib/fog/compute/openstack/requests/allocate_address.rb index 20619b639..fdae56401 100644 --- a/lib/fog/openstack/compute/requests/allocate_address.rb +++ b/lib/fog/compute/openstack/requests/allocate_address.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def allocate_address(pool = nil) request( diff --git a/lib/fog/openstack/compute/requests/associate_address.rb b/lib/fog/compute/openstack/requests/associate_address.rb similarity index 95% rename from lib/fog/openstack/compute/requests/associate_address.rb rename to lib/fog/compute/openstack/requests/associate_address.rb index 00c69a048..259efd117 100644 --- a/lib/fog/openstack/compute/requests/associate_address.rb +++ b/lib/fog/compute/openstack/requests/associate_address.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def associate_address(server_id, ip_address) body = {"addFloatingIp" => {"address" => ip_address}} diff --git a/lib/fog/openstack/compute/requests/attach_volume.rb b/lib/fog/compute/openstack/requests/attach_volume.rb similarity index 96% rename from lib/fog/openstack/compute/requests/attach_volume.rb rename to lib/fog/compute/openstack/requests/attach_volume.rb index 186e06a32..1dcb04218 100644 --- a/lib/fog/openstack/compute/requests/attach_volume.rb +++ b/lib/fog/compute/openstack/requests/attach_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def attach_volume(volume_id, server_id, device) data = { diff --git a/lib/fog/openstack/compute/requests/boot_from_snapshot.rb b/lib/fog/compute/openstack/requests/boot_from_snapshot.rb similarity index 97% rename from lib/fog/openstack/compute/requests/boot_from_snapshot.rb rename to lib/fog/compute/openstack/requests/boot_from_snapshot.rb index 64fbed70b..a5e3b0231 100644 --- a/lib/fog/openstack/compute/requests/boot_from_snapshot.rb +++ b/lib/fog/compute/openstack/requests/boot_from_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def boot_from_snapshot(name, image_ref, flavor_ref, options = {}) data = { diff --git a/lib/fog/openstack/compute/requests/change_server_password.rb b/lib/fog/compute/openstack/requests/change_server_password.rb similarity index 92% rename from lib/fog/openstack/compute/requests/change_server_password.rb rename to lib/fog/compute/openstack/requests/change_server_password.rb index 533e0a3d3..362d6ea3a 100644 --- a/lib/fog/openstack/compute/requests/change_server_password.rb +++ b/lib/fog/compute/openstack/requests/change_server_password.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def change_server_password(server_id, admin_password) body = {'changePassword' => {'adminPass' => admin_password}} diff --git a/lib/fog/openstack/compute/requests/confirm_resize_server.rb b/lib/fog/compute/openstack/requests/confirm_resize_server.rb similarity index 91% rename from lib/fog/openstack/compute/requests/confirm_resize_server.rb rename to lib/fog/compute/openstack/requests/confirm_resize_server.rb index 0a202efbd..56188b99e 100644 --- a/lib/fog/openstack/compute/requests/confirm_resize_server.rb +++ b/lib/fog/compute/openstack/requests/confirm_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def confirm_resize_server(server_id) body = {'confirmResize' => nil} diff --git a/lib/fog/openstack/compute/requests/create_aggregate.rb b/lib/fog/compute/openstack/requests/create_aggregate.rb similarity index 96% rename from lib/fog/openstack/compute/requests/create_aggregate.rb rename to lib/fog/compute/openstack/requests/create_aggregate.rb index 1a023c603..a1efdc594 100644 --- a/lib/fog/openstack/compute/requests/create_aggregate.rb +++ b/lib/fog/compute/openstack/requests/create_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_aggregate(name, options = {}) data = { diff --git a/lib/fog/openstack/compute/requests/create_flavor.rb b/lib/fog/compute/openstack/requests/create_flavor.rb similarity index 98% rename from lib/fog/openstack/compute/requests/create_flavor.rb rename to lib/fog/compute/openstack/requests/create_flavor.rb index 76ac3ce01..7d7b9bbe0 100644 --- a/lib/fog/openstack/compute/requests/create_flavor.rb +++ b/lib/fog/compute/openstack/requests/create_flavor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # PARAMETERS # # name = Name of flavor diff --git a/lib/fog/openstack/compute/requests/create_flavor_metadata.rb b/lib/fog/compute/openstack/requests/create_flavor_metadata.rb similarity index 96% rename from lib/fog/openstack/compute/requests/create_flavor_metadata.rb rename to lib/fog/compute/openstack/requests/create_flavor_metadata.rb index 5b434cfc5..acdbe91e4 100644 --- a/lib/fog/openstack/compute/requests/create_flavor_metadata.rb +++ b/lib/fog/compute/openstack/requests/create_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_flavor_metadata(flavor_ref, metadata) data = { diff --git a/lib/fog/openstack/compute/requests/create_image.rb b/lib/fog/compute/openstack/requests/create_image.rb similarity index 97% rename from lib/fog/openstack/compute/requests/create_image.rb rename to lib/fog/compute/openstack/requests/create_image.rb index 6a8fb545a..bf4132a61 100644 --- a/lib/fog/openstack/compute/requests/create_image.rb +++ b/lib/fog/compute/openstack/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_image(server_id, name, metadata = {}) body = {'createImage' => { diff --git a/lib/fog/openstack/compute/requests/create_key_pair.rb b/lib/fog/compute/openstack/requests/create_key_pair.rb similarity index 98% rename from lib/fog/openstack/compute/requests/create_key_pair.rb rename to lib/fog/compute/openstack/requests/create_key_pair.rb index e90e0d854..b94d6a338 100644 --- a/lib/fog/openstack/compute/requests/create_key_pair.rb +++ b/lib/fog/compute/openstack/requests/create_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_key_pair(key_name, public_key = nil, user_id = nil) data = { diff --git a/lib/fog/openstack/compute/requests/create_os_interface.rb b/lib/fog/compute/openstack/requests/create_os_interface.rb similarity index 96% rename from lib/fog/openstack/compute/requests/create_os_interface.rb rename to lib/fog/compute/openstack/requests/create_os_interface.rb index b192d600a..128a18b21 100644 --- a/lib/fog/openstack/compute/requests/create_os_interface.rb +++ b/lib/fog/compute/openstack/requests/create_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # === Parameters # * server_id <~String> diff --git a/lib/fog/openstack/compute/requests/create_security_group.rb b/lib/fog/compute/openstack/requests/create_security_group.rb similarity index 90% rename from lib/fog/openstack/compute/requests/create_security_group.rb rename to lib/fog/compute/openstack/requests/create_security_group.rb index 3c5ebef75..01d7a348a 100644 --- a/lib/fog/openstack/compute/requests/create_security_group.rb +++ b/lib/fog/compute/openstack/requests/create_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_security_group(name, description) data = { @@ -21,8 +21,8 @@ def create_security_group(name, description) class Mock def create_security_group(name, description) - Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') - tenant_id = Fog::OpenStack::Identity::V2::Mock.data[current_tenant][:tenants].keys.first + Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first security_group_id = Fog::Mock.random_numbers(2).to_i + 1 data[:security_groups][security_group_id.to_s] = { 'tenant_id' => tenant_id, diff --git a/lib/fog/openstack/compute/requests/create_security_group_rule.rb b/lib/fog/compute/openstack/requests/create_security_group_rule.rb similarity index 98% rename from lib/fog/openstack/compute/requests/create_security_group_rule.rb rename to lib/fog/compute/openstack/requests/create_security_group_rule.rb index 7d591d44a..7a9908dbb 100644 --- a/lib/fog/openstack/compute/requests/create_security_group_rule.rb +++ b/lib/fog/compute/openstack/requests/create_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id = nil) data = { diff --git a/lib/fog/openstack/compute/requests/create_server.rb b/lib/fog/compute/openstack/requests/create_server.rb similarity index 97% rename from lib/fog/openstack/compute/requests/create_server.rb rename to lib/fog/compute/openstack/requests/create_server.rb index 7d64f97e7..c36d3a254 100644 --- a/lib/fog/openstack/compute/requests/create_server.rb +++ b/lib/fog/compute/openstack/requests/create_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_server(name, image_ref, flavor_ref, options = {}) data = { @@ -23,7 +23,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) # security names requires a hash with a name prefix data['server']['security_groups'] = Array(options['security_groups']).map do |sg| - name = if sg.kind_of?(Fog::OpenStack::Compute::SecurityGroup) + name = if sg.kind_of?(Fog::Compute::OpenStack::SecurityGroup) sg.name else sg @@ -94,7 +94,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) response.status = 202 server_id = Fog::Mock.random_numbers(6).to_s - identity = Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + identity = Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') user = identity.users.find do |u| u.name == @openstack_username end @@ -158,7 +158,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) security_groups = options['security_groups'] if security_groups groups = Array(security_groups).map do |sg| - if sg.kind_of?(Fog::OpenStack::Compute::SecurityGroup) + if sg.kind_of?(Fog::Compute::OpenStack::SecurityGroup) sg.name else sg diff --git a/lib/fog/openstack/compute/requests/create_server_group.rb b/lib/fog/compute/openstack/requests/create_server_group.rb similarity index 80% rename from lib/fog/openstack/compute/requests/create_server_group.rb rename to lib/fog/compute/openstack/requests/create_server_group.rb index 63a73591e..10a42b9b5 100644 --- a/lib/fog/openstack/compute/requests/create_server_group.rb +++ b/lib/fog/compute/openstack/requests/create_server_group.rb @@ -1,9 +1,9 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_server_group(name, policy) - Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy + Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy body = {'server_group' => { 'name' => name, @@ -20,7 +20,7 @@ def create_server_group(name, policy) class Mock def create_server_group(name, policy) - Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy + Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy id = SecureRandom.uuid data[:server_groups][id] = {:name => name, :policies => [policy], :members => []} get_server_group id diff --git a/lib/fog/openstack/compute/requests/create_snapshot.rb b/lib/fog/compute/openstack/requests/create_snapshot.rb similarity index 94% rename from lib/fog/openstack/compute/requests/create_snapshot.rb rename to lib/fog/compute/openstack/requests/create_snapshot.rb index 8df9ad038..c6d400b97 100644 --- a/lib/fog/openstack/compute/requests/create_snapshot.rb +++ b/lib/fog/compute/openstack/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def create_snapshot(volume_id, name, description, force = false) data = { @@ -26,7 +26,7 @@ def create_snapshot(volume_id, name, description, _force = false) volume_response = get_volume_details(volume_id) volume = volume_response.data[:body]['volume'] if volume.nil? - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound else response = Excon::Response.new data = { diff --git a/lib/fog/openstack/compute/requests/create_volume.rb b/lib/fog/compute/openstack/requests/create_volume.rb similarity index 97% rename from lib/fog/openstack/compute/requests/create_volume.rb rename to lib/fog/compute/openstack/requests/create_volume.rb index d90d439eb..4d39fde7c 100644 --- a/lib/fog/openstack/compute/requests/create_volume.rb +++ b/lib/fog/compute/openstack/requests/create_volume.rb @@ -1,7 +1,7 @@ # module Fog - module OpenStack - class Compute + module Compute + class OpenStack # class Real def create_volume(name, description, size, options = {}) diff --git a/lib/fog/openstack/compute/requests/delete_aggregate.rb b/lib/fog/compute/openstack/requests/delete_aggregate.rb similarity index 94% rename from lib/fog/openstack/compute/requests/delete_aggregate.rb rename to lib/fog/compute/openstack/requests/delete_aggregate.rb index fbd6ee4f1..e878ec6ee 100644 --- a/lib/fog/openstack/compute/requests/delete_aggregate.rb +++ b/lib/fog/compute/openstack/requests/delete_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_aggregate(uuid) request( diff --git a/lib/fog/openstack/compute/requests/delete_flavor.rb b/lib/fog/compute/openstack/requests/delete_flavor.rb similarity index 94% rename from lib/fog/openstack/compute/requests/delete_flavor.rb rename to lib/fog/compute/openstack/requests/delete_flavor.rb index 8cb4b2aa1..260c800c4 100644 --- a/lib/fog/openstack/compute/requests/delete_flavor.rb +++ b/lib/fog/compute/openstack/requests/delete_flavor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_flavor(flavor_id) request( diff --git a/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb b/lib/fog/compute/openstack/requests/delete_flavor_metadata.rb similarity index 95% rename from lib/fog/openstack/compute/requests/delete_flavor_metadata.rb rename to lib/fog/compute/openstack/requests/delete_flavor_metadata.rb index 609147148..fbb88dbb8 100644 --- a/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb +++ b/lib/fog/compute/openstack/requests/delete_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_flavor_metadata(flavor_ref, key) request( diff --git a/lib/fog/openstack/compute/requests/delete_image.rb b/lib/fog/compute/openstack/requests/delete_image.rb similarity index 96% rename from lib/fog/openstack/compute/requests/delete_image.rb rename to lib/fog/compute/openstack/requests/delete_image.rb index c5841497c..5b21ac423 100644 --- a/lib/fog/openstack/compute/requests/delete_image.rb +++ b/lib/fog/compute/openstack/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_image(image_id) request( diff --git a/lib/fog/openstack/compute/requests/delete_key_pair.rb b/lib/fog/compute/openstack/requests/delete_key_pair.rb similarity index 95% rename from lib/fog/openstack/compute/requests/delete_key_pair.rb rename to lib/fog/compute/openstack/requests/delete_key_pair.rb index c39152ed3..7b5e8568c 100644 --- a/lib/fog/openstack/compute/requests/delete_key_pair.rb +++ b/lib/fog/compute/openstack/requests/delete_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_key_pair(key_name, user_id = nil) options = {} diff --git a/lib/fog/openstack/compute/requests/delete_meta.rb b/lib/fog/compute/openstack/requests/delete_meta.rb similarity index 85% rename from lib/fog/openstack/compute/requests/delete_meta.rb rename to lib/fog/compute/openstack/requests/delete_meta.rb index cc7fdf007..a0ce4f837 100644 --- a/lib/fog/openstack/compute/requests/delete_meta.rb +++ b/lib/fog/compute/openstack/requests/delete_meta.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_meta(collection_name, parent_id, key) request( @@ -15,13 +15,13 @@ class Mock def delete_meta(collection_name, parent_id, _key) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end diff --git a/lib/fog/openstack/compute/requests/delete_metadata.rb b/lib/fog/compute/openstack/requests/delete_metadata.rb similarity index 93% rename from lib/fog/openstack/compute/requests/delete_metadata.rb rename to lib/fog/compute/openstack/requests/delete_metadata.rb index 0dd71329e..cc3d9960b 100644 --- a/lib/fog/openstack/compute/requests/delete_metadata.rb +++ b/lib/fog/compute/openstack/requests/delete_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_metadata(collection_name, parent_id, key) request( diff --git a/lib/fog/openstack/compute/requests/delete_os_interface.rb b/lib/fog/compute/openstack/requests/delete_os_interface.rb similarity index 92% rename from lib/fog/openstack/compute/requests/delete_os_interface.rb rename to lib/fog/compute/openstack/requests/delete_os_interface.rb index c70ded8ca..f5a053ae7 100644 --- a/lib/fog/openstack/compute/requests/delete_os_interface.rb +++ b/lib/fog/compute/openstack/requests/delete_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # === Parameters # * server_id <~String> diff --git a/lib/fog/openstack/compute/requests/delete_security_group.rb b/lib/fog/compute/openstack/requests/delete_security_group.rb similarity index 95% rename from lib/fog/openstack/compute/requests/delete_security_group.rb rename to lib/fog/compute/openstack/requests/delete_security_group.rb index aed82769c..f25801011 100644 --- a/lib/fog/openstack/compute/requests/delete_security_group.rb +++ b/lib/fog/compute/openstack/requests/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_security_group(security_group_id) request( diff --git a/lib/fog/openstack/compute/requests/delete_security_group_rule.rb b/lib/fog/compute/openstack/requests/delete_security_group_rule.rb similarity index 96% rename from lib/fog/openstack/compute/requests/delete_security_group_rule.rb rename to lib/fog/compute/openstack/requests/delete_security_group_rule.rb index 751fa8f67..c6bf309ad 100644 --- a/lib/fog/openstack/compute/requests/delete_security_group_rule.rb +++ b/lib/fog/compute/openstack/requests/delete_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_security_group_rule(security_group_rule_id) request( diff --git a/lib/fog/openstack/compute/requests/delete_server.rb b/lib/fog/compute/openstack/requests/delete_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/delete_server.rb rename to lib/fog/compute/openstack/requests/delete_server.rb index 9a7a381d2..dd2087ab6 100644 --- a/lib/fog/openstack/compute/requests/delete_server.rb +++ b/lib/fog/compute/openstack/requests/delete_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_server(server_id) request( @@ -31,7 +31,7 @@ def delete_server(server_id) end response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/delete_server_group.rb b/lib/fog/compute/openstack/requests/delete_server_group.rb similarity index 94% rename from lib/fog/openstack/compute/requests/delete_server_group.rb rename to lib/fog/compute/openstack/requests/delete_server_group.rb index 0e4212a0c..26a4ade92 100644 --- a/lib/fog/openstack/compute/requests/delete_server_group.rb +++ b/lib/fog/compute/openstack/requests/delete_server_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_server_group(group_id) request( diff --git a/lib/fog/openstack/compute/requests/delete_service.rb b/lib/fog/compute/openstack/requests/delete_service.rb similarity index 95% rename from lib/fog/openstack/compute/requests/delete_service.rb rename to lib/fog/compute/openstack/requests/delete_service.rb index 6193a3da9..24cfa4887 100644 --- a/lib/fog/openstack/compute/requests/delete_service.rb +++ b/lib/fog/compute/openstack/requests/delete_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_service(uuid, optional_params = nil) # Encode all params diff --git a/lib/fog/openstack/compute/requests/delete_snapshot.rb b/lib/fog/compute/openstack/requests/delete_snapshot.rb similarity index 87% rename from lib/fog/openstack/compute/requests/delete_snapshot.rb rename to lib/fog/compute/openstack/requests/delete_snapshot.rb index 76877e107..495264e2c 100644 --- a/lib/fog/openstack/compute/requests/delete_snapshot.rb +++ b/lib/fog/compute/openstack/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_snapshot(snapshot_id) request( @@ -18,7 +18,7 @@ def delete_snapshot(snapshot_id) if list_snapshots_detail.body['snapshots'].find { |snap| snap['id'] == snapshot_id } data[:snapshots].delete(snapshot_id) else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end response end diff --git a/lib/fog/openstack/compute/requests/delete_volume.rb b/lib/fog/compute/openstack/requests/delete_volume.rb similarity index 86% rename from lib/fog/openstack/compute/requests/delete_volume.rb rename to lib/fog/compute/openstack/requests/delete_volume.rb index 405aa85d4..24bd64ffc 100644 --- a/lib/fog/openstack/compute/requests/delete_volume.rb +++ b/lib/fog/compute/openstack/requests/delete_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def delete_volume(volume_id) request( @@ -19,7 +19,7 @@ def delete_volume(volume_id) response.status = 204 response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/detach_volume.rb b/lib/fog/compute/openstack/requests/detach_volume.rb similarity index 89% rename from lib/fog/openstack/compute/requests/detach_volume.rb rename to lib/fog/compute/openstack/requests/detach_volume.rb index 696ad3c85..908023ef0 100644 --- a/lib/fog/openstack/compute/requests/detach_volume.rb +++ b/lib/fog/compute/openstack/requests/detach_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def detach_volume(server_id, attachment_id) request( @@ -20,7 +20,7 @@ def detach_volume(server_id, attachment_id) response.status = 202 response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/disable_service.rb b/lib/fog/compute/openstack/requests/disable_service.rb similarity index 96% rename from lib/fog/openstack/compute/requests/disable_service.rb rename to lib/fog/compute/openstack/requests/disable_service.rb index cc20f0e4f..6dea8df79 100644 --- a/lib/fog/openstack/compute/requests/disable_service.rb +++ b/lib/fog/compute/openstack/requests/disable_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def disable_service(host, binary, optional_params = nil) data = {"host" => host, "binary" => binary} diff --git a/lib/fog/openstack/compute/requests/disable_service_log_reason.rb b/lib/fog/compute/openstack/requests/disable_service_log_reason.rb similarity index 96% rename from lib/fog/openstack/compute/requests/disable_service_log_reason.rb rename to lib/fog/compute/openstack/requests/disable_service_log_reason.rb index c18c834f6..e462c5e6a 100644 --- a/lib/fog/openstack/compute/requests/disable_service_log_reason.rb +++ b/lib/fog/compute/openstack/requests/disable_service_log_reason.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def disable_service_log_reason(host, binary, disabled_reason, optional_params = nil) data = {"host" => host, "binary" => binary, "disabled_reason" => disabled_reason} diff --git a/lib/fog/openstack/compute/requests/disassociate_address.rb b/lib/fog/compute/openstack/requests/disassociate_address.rb similarity index 94% rename from lib/fog/openstack/compute/requests/disassociate_address.rb rename to lib/fog/compute/openstack/requests/disassociate_address.rb index 7ec15b304..a11bac537 100644 --- a/lib/fog/openstack/compute/requests/disassociate_address.rb +++ b/lib/fog/compute/openstack/requests/disassociate_address.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def disassociate_address(server_id, ip_address) body = {"removeFloatingIp" => {"address" => ip_address}} diff --git a/lib/fog/openstack/compute/requests/enable_service.rb b/lib/fog/compute/openstack/requests/enable_service.rb similarity index 96% rename from lib/fog/openstack/compute/requests/enable_service.rb rename to lib/fog/compute/openstack/requests/enable_service.rb index cc146268c..bbdec5dba 100644 --- a/lib/fog/openstack/compute/requests/enable_service.rb +++ b/lib/fog/compute/openstack/requests/enable_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def enable_service(host, binary, optional_params = nil) data = {"host" => host, "binary" => binary} diff --git a/lib/fog/openstack/compute/requests/evacuate_server.rb b/lib/fog/compute/openstack/requests/evacuate_server.rb similarity index 95% rename from lib/fog/openstack/compute/requests/evacuate_server.rb rename to lib/fog/compute/openstack/requests/evacuate_server.rb index 87017d0e1..9efcc43c2 100644 --- a/lib/fog/openstack/compute/requests/evacuate_server.rb +++ b/lib/fog/compute/openstack/requests/evacuate_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_password = nil) evacuate = {} diff --git a/lib/fog/openstack/compute/requests/get_address.rb b/lib/fog/compute/openstack/requests/get_address.rb similarity index 96% rename from lib/fog/openstack/compute/requests/get_address.rb rename to lib/fog/compute/openstack/requests/get_address.rb index 14e1d4bdf..19debb1fa 100644 --- a/lib/fog/openstack/compute/requests/get_address.rb +++ b/lib/fog/compute/openstack/requests/get_address.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_address(address_id) request( diff --git a/lib/fog/openstack/compute/requests/get_aggregate.rb b/lib/fog/compute/openstack/requests/get_aggregate.rb similarity index 93% rename from lib/fog/openstack/compute/requests/get_aggregate.rb rename to lib/fog/compute/openstack/requests/get_aggregate.rb index be3589855..5dba4fde4 100644 --- a/lib/fog/openstack/compute/requests/get_aggregate.rb +++ b/lib/fog/compute/openstack/requests/get_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_aggregate(uuid) request( diff --git a/lib/fog/openstack/compute/requests/get_console_output.rb b/lib/fog/compute/openstack/requests/get_console_output.rb similarity index 92% rename from lib/fog/openstack/compute/requests/get_console_output.rb rename to lib/fog/compute/openstack/requests/get_console_output.rb index a29da59b2..f0b666a32 100644 --- a/lib/fog/openstack/compute/requests/get_console_output.rb +++ b/lib/fog/compute/openstack/requests/get_console_output.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_console_output(server_id, log_length) body = { diff --git a/lib/fog/openstack/compute/requests/get_flavor_details.rb b/lib/fog/compute/openstack/requests/get_flavor_details.rb similarity index 95% rename from lib/fog/openstack/compute/requests/get_flavor_details.rb rename to lib/fog/compute/openstack/requests/get_flavor_details.rb index 0d7b45309..fd94fd0ed 100644 --- a/lib/fog/openstack/compute/requests/get_flavor_details.rb +++ b/lib/fog/compute/openstack/requests/get_flavor_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_flavor_details(flavor_ref) request( @@ -30,7 +30,7 @@ def get_flavor_details(flavor_ref) } response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/get_flavor_metadata.rb b/lib/fog/compute/openstack/requests/get_flavor_metadata.rb similarity index 93% rename from lib/fog/openstack/compute/requests/get_flavor_metadata.rb rename to lib/fog/compute/openstack/requests/get_flavor_metadata.rb index 6aab20b3b..e54f4337d 100644 --- a/lib/fog/openstack/compute/requests/get_flavor_metadata.rb +++ b/lib/fog/compute/openstack/requests/get_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_flavor_metadata(flavor_ref) request( diff --git a/lib/fog/openstack/compute/requests/get_host_details.rb b/lib/fog/compute/openstack/requests/get_host_details.rb similarity index 97% rename from lib/fog/openstack/compute/requests/get_host_details.rb rename to lib/fog/compute/openstack/requests/get_host_details.rb index 7441bf711..ca43d14b1 100644 --- a/lib/fog/openstack/compute/requests/get_host_details.rb +++ b/lib/fog/compute/openstack/requests/get_host_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_host_details(host) request( diff --git a/lib/fog/openstack/compute/requests/get_hypervisor.rb b/lib/fog/compute/openstack/requests/get_hypervisor.rb similarity index 98% rename from lib/fog/openstack/compute/requests/get_hypervisor.rb rename to lib/fog/compute/openstack/requests/get_hypervisor.rb index 0358dd704..7834d5a0e 100644 --- a/lib/fog/openstack/compute/requests/get_hypervisor.rb +++ b/lib/fog/compute/openstack/requests/get_hypervisor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_hypervisor(hypervisor_id) request( diff --git a/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb b/lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb similarity index 96% rename from lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb rename to lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb index 511880b83..130f0c4fa 100644 --- a/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb +++ b/lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_hypervisor_statistics(_tenant_id) request( diff --git a/lib/fog/openstack/compute/requests/get_image_details.rb b/lib/fog/compute/openstack/requests/get_image_details.rb similarity index 87% rename from lib/fog/openstack/compute/requests/get_image_details.rb rename to lib/fog/compute/openstack/requests/get_image_details.rb index aa27f8ef8..cbb49670b 100644 --- a/lib/fog/openstack/compute/requests/get_image_details.rb +++ b/lib/fog/compute/openstack/requests/get_image_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_image_details(image_id) request( @@ -20,7 +20,7 @@ def get_image_details(image_id) response.body = {'image' => image} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/get_key_pair.rb b/lib/fog/compute/openstack/requests/get_key_pair.rb similarity index 98% rename from lib/fog/openstack/compute/requests/get_key_pair.rb rename to lib/fog/compute/openstack/requests/get_key_pair.rb index 46361d6c5..22710a658 100644 --- a/lib/fog/openstack/compute/requests/get_key_pair.rb +++ b/lib/fog/compute/openstack/requests/get_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_key_pair(key_name) request( diff --git a/lib/fog/openstack/compute/requests/get_limits.rb b/lib/fog/compute/openstack/requests/get_limits.rb similarity index 98% rename from lib/fog/openstack/compute/requests/get_limits.rb rename to lib/fog/compute/openstack/requests/get_limits.rb index cb8c0bc74..5dd7e8fd1 100644 --- a/lib/fog/openstack/compute/requests/get_limits.rb +++ b/lib/fog/compute/openstack/requests/get_limits.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack # http://developer.openstack.org/api-ref-compute-v2.1.html#showlimits class Real diff --git a/lib/fog/openstack/compute/requests/get_metadata.rb b/lib/fog/compute/openstack/requests/get_metadata.rb similarity index 93% rename from lib/fog/openstack/compute/requests/get_metadata.rb rename to lib/fog/compute/openstack/requests/get_metadata.rb index 9f7c37094..52db21f05 100644 --- a/lib/fog/openstack/compute/requests/get_metadata.rb +++ b/lib/fog/compute/openstack/requests/get_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_metadata(collection_name, parent_id, key) request( diff --git a/lib/fog/openstack/compute/requests/get_os_interface.rb b/lib/fog/compute/openstack/requests/get_os_interface.rb similarity index 93% rename from lib/fog/openstack/compute/requests/get_os_interface.rb rename to lib/fog/compute/openstack/requests/get_os_interface.rb index 424fca7a9..d6697fa09 100644 --- a/lib/fog/openstack/compute/requests/get_os_interface.rb +++ b/lib/fog/compute/openstack/requests/get_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_os_interface(server_id,port_id) request( diff --git a/lib/fog/openstack/compute/requests/get_quota.rb b/lib/fog/compute/openstack/requests/get_quota.rb similarity index 93% rename from lib/fog/openstack/compute/requests/get_quota.rb rename to lib/fog/compute/openstack/requests/get_quota.rb index 94c5caa01..a1a716924 100644 --- a/lib/fog/openstack/compute/requests/get_quota.rb +++ b/lib/fog/compute/openstack/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_quota(tenant_id) request( diff --git a/lib/fog/openstack/compute/requests/get_quota_defaults.rb b/lib/fog/compute/openstack/requests/get_quota_defaults.rb similarity index 93% rename from lib/fog/openstack/compute/requests/get_quota_defaults.rb rename to lib/fog/compute/openstack/requests/get_quota_defaults.rb index 9469b2c0f..1cf1ace87 100644 --- a/lib/fog/openstack/compute/requests/get_quota_defaults.rb +++ b/lib/fog/compute/openstack/requests/get_quota_defaults.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_quota_defaults(tenant_id) request( diff --git a/lib/fog/openstack/compute/requests/get_security_group.rb b/lib/fog/compute/openstack/requests/get_security_group.rb similarity index 90% rename from lib/fog/openstack/compute/requests/get_security_group.rb rename to lib/fog/compute/openstack/requests/get_security_group.rb index 7641bd5db..e82139a8f 100644 --- a/lib/fog/openstack/compute/requests/get_security_group.rb +++ b/lib/fog/compute/openstack/requests/get_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_security_group(security_group_id) request( @@ -27,7 +27,7 @@ def get_security_group(security_group_id) "security_group" => security_group } else - raise Fog::OpenStack::Compute::NotFound, "Security group #{security_group_id} does not exist" + raise Fog::Compute::OpenStack::NotFound, "Security group #{security_group_id} does not exist" end response end diff --git a/lib/fog/openstack/compute/requests/get_security_group_rule.rb b/lib/fog/compute/openstack/requests/get_security_group_rule.rb similarity index 92% rename from lib/fog/openstack/compute/requests/get_security_group_rule.rb rename to lib/fog/compute/openstack/requests/get_security_group_rule.rb index ee52de5fd..738eec005 100644 --- a/lib/fog/openstack/compute/requests/get_security_group_rule.rb +++ b/lib/fog/compute/openstack/requests/get_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_security_group_rule(security_group_rule_id) request( @@ -28,7 +28,7 @@ def get_security_group_rule(security_group_rule_id) "security_group_rule" => security_group_rule } else - raise Fog::OpenStack::Compute::NotFound, "Security group rule #{security_group_rule_id} does not exist" + raise Fog::Compute::OpenStack::NotFound, "Security group rule #{security_group_rule_id} does not exist" end response end diff --git a/lib/fog/openstack/compute/requests/get_server_details.rb b/lib/fog/compute/openstack/requests/get_server_details.rb similarity index 87% rename from lib/fog/openstack/compute/requests/get_server_details.rb rename to lib/fog/compute/openstack/requests/get_server_details.rb index 28b1405e2..6a732aad4 100644 --- a/lib/fog/openstack/compute/requests/get_server_details.rb +++ b/lib/fog/compute/openstack/requests/get_server_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_server_details(server_id) request( @@ -20,7 +20,7 @@ def get_server_details(server_id) response.body = {'server' => server} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/get_server_group.rb b/lib/fog/compute/openstack/requests/get_server_group.rb similarity index 96% rename from lib/fog/openstack/compute/requests/get_server_group.rb rename to lib/fog/compute/openstack/requests/get_server_group.rb index 8ebb01cfa..df89e5a57 100644 --- a/lib/fog/openstack/compute/requests/get_server_group.rb +++ b/lib/fog/compute/openstack/requests/get_server_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_server_group(group_id) request( diff --git a/lib/fog/openstack/compute/requests/get_server_password.rb b/lib/fog/compute/openstack/requests/get_server_password.rb similarity index 88% rename from lib/fog/openstack/compute/requests/get_server_password.rb rename to lib/fog/compute/openstack/requests/get_server_password.rb index 2496f0f10..aebf0ec87 100644 --- a/lib/fog/openstack/compute/requests/get_server_password.rb +++ b/lib/fog/compute/openstack/requests/get_server_password.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_server_password(server_id) request( @@ -20,7 +20,7 @@ def get_server_password(server_id) response.body = {'server' => server} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/get_server_volumes.rb b/lib/fog/compute/openstack/requests/get_server_volumes.rb similarity index 95% rename from lib/fog/openstack/compute/requests/get_server_volumes.rb rename to lib/fog/compute/openstack/requests/get_server_volumes.rb index 8322b6709..0f2117dfb 100644 --- a/lib/fog/openstack/compute/requests/get_server_volumes.rb +++ b/lib/fog/compute/openstack/requests/get_server_volumes.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_server_volumes(server_id) request( diff --git a/lib/fog/openstack/compute/requests/get_snapshot_details.rb b/lib/fog/compute/openstack/requests/get_snapshot_details.rb similarity index 88% rename from lib/fog/openstack/compute/requests/get_snapshot_details.rb rename to lib/fog/compute/openstack/requests/get_snapshot_details.rb index 3ec669e6f..0ab0c58df 100644 --- a/lib/fog/openstack/compute/requests/get_snapshot_details.rb +++ b/lib/fog/compute/openstack/requests/get_snapshot_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_snapshot_details(snapshot_id) request( @@ -21,7 +21,7 @@ def get_snapshot_details(snapshot_id) response.body = {'snapshot' => snapshot} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/get_usage.rb b/lib/fog/compute/openstack/requests/get_usage.rb similarity index 98% rename from lib/fog/openstack/compute/requests/get_usage.rb rename to lib/fog/compute/openstack/requests/get_usage.rb index 71428bc6c..5f7908b3f 100644 --- a/lib/fog/openstack/compute/requests/get_usage.rb +++ b/lib/fog/compute/openstack/requests/get_usage.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_usage(tenant_id, date_start, date_end) params = {} diff --git a/lib/fog/openstack/compute/requests/get_vnc_console.rb b/lib/fog/compute/openstack/requests/get_vnc_console.rb similarity index 97% rename from lib/fog/openstack/compute/requests/get_vnc_console.rb rename to lib/fog/compute/openstack/requests/get_vnc_console.rb index 22b387e28..01e4c3f71 100644 --- a/lib/fog/openstack/compute/requests/get_vnc_console.rb +++ b/lib/fog/compute/openstack/requests/get_vnc_console.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Get a vnc console for an instance. # For microversion < 2.6 as it has been replaced with remote-consoles diff --git a/lib/fog/openstack/compute/requests/get_volume_details.rb b/lib/fog/compute/openstack/requests/get_volume_details.rb similarity index 89% rename from lib/fog/openstack/compute/requests/get_volume_details.rb rename to lib/fog/compute/openstack/requests/get_volume_details.rb index f7ee4eb4f..560290e0f 100644 --- a/lib/fog/openstack/compute/requests/get_volume_details.rb +++ b/lib/fog/compute/openstack/requests/get_volume_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def get_volume_details(volume_id) request( @@ -23,7 +23,7 @@ def get_volume_details(volume_id) response.body = {'volume' => data} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/list_address_pools.rb b/lib/fog/compute/openstack/requests/list_address_pools.rb similarity index 93% rename from lib/fog/openstack/compute/requests/list_address_pools.rb rename to lib/fog/compute/openstack/requests/list_address_pools.rb index f8998cef3..961142b4f 100644 --- a/lib/fog/openstack/compute/requests/list_address_pools.rb +++ b/lib/fog/compute/openstack/requests/list_address_pools.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_address_pools request( diff --git a/lib/fog/openstack/compute/requests/list_addresses.rb b/lib/fog/compute/openstack/requests/list_addresses.rb similarity index 87% rename from lib/fog/openstack/compute/requests/list_addresses.rb rename to lib/fog/compute/openstack/requests/list_addresses.rb index 1428dc754..994787fb6 100644 --- a/lib/fog/openstack/compute/requests/list_addresses.rb +++ b/lib/fog/compute/openstack/requests/list_addresses.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_addresses(server_id) response.body = {'addresses' => server['addresses']} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/list_aggregates.rb b/lib/fog/compute/openstack/requests/list_aggregates.rb similarity index 96% rename from lib/fog/openstack/compute/requests/list_aggregates.rb rename to lib/fog/compute/openstack/requests/list_aggregates.rb index 97c78a034..2e4dcee21 100644 --- a/lib/fog/openstack/compute/requests/list_aggregates.rb +++ b/lib/fog/compute/openstack/requests/list_aggregates.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_aggregates(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_all_addresses.rb b/lib/fog/compute/openstack/requests/list_all_addresses.rb similarity index 97% rename from lib/fog/openstack/compute/requests/list_all_addresses.rb rename to lib/fog/compute/openstack/requests/list_all_addresses.rb index bce5aaf68..9c77b74ff 100644 --- a/lib/fog/openstack/compute/requests/list_all_addresses.rb +++ b/lib/fog/compute/openstack/requests/list_all_addresses.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_all_addresses(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_availability_zones.rb b/lib/fog/compute/openstack/requests/list_availability_zones.rb similarity index 91% rename from lib/fog/openstack/compute/requests/list_availability_zones.rb rename to lib/fog/compute/openstack/requests/list_availability_zones.rb index c069a6a8c..274026ae5 100644 --- a/lib/fog/openstack/compute/requests/list_availability_zones.rb +++ b/lib/fog/compute/openstack/requests/list_availability_zones.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_availability_zones(options = {}) params = options diff --git a/lib/fog/openstack/compute/requests/list_flavors.rb b/lib/fog/compute/openstack/requests/list_flavors.rb similarity index 97% rename from lib/fog/openstack/compute/requests/list_flavors.rb rename to lib/fog/compute/openstack/requests/list_flavors.rb index 906733b9b..d8b5d3949 100644 --- a/lib/fog/openstack/compute/requests/list_flavors.rb +++ b/lib/fog/compute/openstack/requests/list_flavors.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_flavors(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_flavors_detail.rb b/lib/fog/compute/openstack/requests/list_flavors_detail.rb similarity index 97% rename from lib/fog/openstack/compute/requests/list_flavors_detail.rb rename to lib/fog/compute/openstack/requests/list_flavors_detail.rb index 33d1b648c..67ea9e78b 100644 --- a/lib/fog/openstack/compute/requests/list_flavors_detail.rb +++ b/lib/fog/compute/openstack/requests/list_flavors_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_flavors_detail(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_hosts.rb b/lib/fog/compute/openstack/requests/list_hosts.rb similarity index 94% rename from lib/fog/openstack/compute/requests/list_hosts.rb rename to lib/fog/compute/openstack/requests/list_hosts.rb index 263368a36..0f7c4d50b 100644 --- a/lib/fog/openstack/compute/requests/list_hosts.rb +++ b/lib/fog/compute/openstack/requests/list_hosts.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_hosts(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb b/lib/fog/compute/openstack/requests/list_hypervisor_servers.rb similarity index 96% rename from lib/fog/openstack/compute/requests/list_hypervisor_servers.rb rename to lib/fog/compute/openstack/requests/list_hypervisor_servers.rb index 2e704033c..926def05f 100644 --- a/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb +++ b/lib/fog/compute/openstack/requests/list_hypervisor_servers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_hypervisor_servers(hypervisor_id, options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_hypervisors.rb b/lib/fog/compute/openstack/requests/list_hypervisors.rb similarity index 94% rename from lib/fog/openstack/compute/requests/list_hypervisors.rb rename to lib/fog/compute/openstack/requests/list_hypervisors.rb index cab7a5813..ed07af72a 100644 --- a/lib/fog/openstack/compute/requests/list_hypervisors.rb +++ b/lib/fog/compute/openstack/requests/list_hypervisors.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_hypervisors(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb b/lib/fog/compute/openstack/requests/list_hypervisors_detail.rb similarity index 98% rename from lib/fog/openstack/compute/requests/list_hypervisors_detail.rb rename to lib/fog/compute/openstack/requests/list_hypervisors_detail.rb index 5840e4ab6..3d1a1ac0a 100644 --- a/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb +++ b/lib/fog/compute/openstack/requests/list_hypervisors_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_hypervisors_detail(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_images.rb b/lib/fog/compute/openstack/requests/list_images.rb similarity index 94% rename from lib/fog/openstack/compute/requests/list_images.rb rename to lib/fog/compute/openstack/requests/list_images.rb index f3faa629e..cd467014d 100644 --- a/lib/fog/openstack/compute/requests/list_images.rb +++ b/lib/fog/compute/openstack/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_images request( diff --git a/lib/fog/openstack/compute/requests/list_images_detail.rb b/lib/fog/compute/openstack/requests/list_images_detail.rb similarity index 96% rename from lib/fog/openstack/compute/requests/list_images_detail.rb rename to lib/fog/compute/openstack/requests/list_images_detail.rb index 2884a3956..9e43ebb65 100644 --- a/lib/fog/openstack/compute/requests/list_images_detail.rb +++ b/lib/fog/compute/openstack/requests/list_images_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_images_detail(filters = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_key_pairs.rb b/lib/fog/compute/openstack/requests/list_key_pairs.rb similarity index 97% rename from lib/fog/openstack/compute/requests/list_key_pairs.rb rename to lib/fog/compute/openstack/requests/list_key_pairs.rb index 40a6cce4e..99861421c 100644 --- a/lib/fog/openstack/compute/requests/list_key_pairs.rb +++ b/lib/fog/compute/openstack/requests/list_key_pairs.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_key_pairs(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_metadata.rb b/lib/fog/compute/openstack/requests/list_metadata.rb similarity index 93% rename from lib/fog/openstack/compute/requests/list_metadata.rb rename to lib/fog/compute/openstack/requests/list_metadata.rb index ea81fe543..b1c1a82ae 100644 --- a/lib/fog/openstack/compute/requests/list_metadata.rb +++ b/lib/fog/compute/openstack/requests/list_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_metadata(collection_name, parent_id) request( diff --git a/lib/fog/openstack/compute/requests/list_os_interfaces.rb b/lib/fog/compute/openstack/requests/list_os_interfaces.rb similarity index 93% rename from lib/fog/openstack/compute/requests/list_os_interfaces.rb rename to lib/fog/compute/openstack/requests/list_os_interfaces.rb index 5e861e098..06fa5948b 100644 --- a/lib/fog/openstack/compute/requests/list_os_interfaces.rb +++ b/lib/fog/compute/openstack/requests/list_os_interfaces.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_os_interfaces(server_id) request( diff --git a/lib/fog/openstack/compute/requests/list_private_addresses.rb b/lib/fog/compute/openstack/requests/list_private_addresses.rb similarity index 88% rename from lib/fog/openstack/compute/requests/list_private_addresses.rb rename to lib/fog/compute/openstack/requests/list_private_addresses.rb index bc6787503..ef0c7033e 100644 --- a/lib/fog/openstack/compute/requests/list_private_addresses.rb +++ b/lib/fog/compute/openstack/requests/list_private_addresses.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_private_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_private_addresses(server_id) response.body = {'private' => server['addresses']['private']} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/list_public_addresses.rb b/lib/fog/compute/openstack/requests/list_public_addresses.rb similarity index 88% rename from lib/fog/openstack/compute/requests/list_public_addresses.rb rename to lib/fog/compute/openstack/requests/list_public_addresses.rb index ccc2f0260..c662f6991 100644 --- a/lib/fog/openstack/compute/requests/list_public_addresses.rb +++ b/lib/fog/compute/openstack/requests/list_public_addresses.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_public_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_public_addresses(server_id) response.body = {'public' => server['addresses']['public']} response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/compute/requests/list_security_groups.rb b/lib/fog/compute/openstack/requests/list_security_groups.rb similarity index 98% rename from lib/fog/openstack/compute/requests/list_security_groups.rb rename to lib/fog/compute/openstack/requests/list_security_groups.rb index f5db8f0d8..1c0dc2a34 100644 --- a/lib/fog/openstack/compute/requests/list_security_groups.rb +++ b/lib/fog/compute/openstack/requests/list_security_groups.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_security_groups(options = {}) path = "os-security-groups" diff --git a/lib/fog/openstack/compute/requests/list_server_groups.rb b/lib/fog/compute/openstack/requests/list_server_groups.rb similarity index 94% rename from lib/fog/openstack/compute/requests/list_server_groups.rb rename to lib/fog/compute/openstack/requests/list_server_groups.rb index 642552012..a69cbd163 100644 --- a/lib/fog/openstack/compute/requests/list_server_groups.rb +++ b/lib/fog/compute/openstack/requests/list_server_groups.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_server_groups(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_servers.rb b/lib/fog/compute/openstack/requests/list_servers.rb similarity index 95% rename from lib/fog/openstack/compute/requests/list_servers.rb rename to lib/fog/compute/openstack/requests/list_servers.rb index 7f8ddddd4..23df0ea3b 100644 --- a/lib/fog/openstack/compute/requests/list_servers.rb +++ b/lib/fog/compute/openstack/requests/list_servers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_servers(options = {}) params = options.dup diff --git a/lib/fog/openstack/compute/requests/list_servers_detail.rb b/lib/fog/compute/openstack/requests/list_servers_detail.rb similarity index 96% rename from lib/fog/openstack/compute/requests/list_servers_detail.rb rename to lib/fog/compute/openstack/requests/list_servers_detail.rb index 0210db8b1..e4e4be2ab 100644 --- a/lib/fog/openstack/compute/requests/list_servers_detail.rb +++ b/lib/fog/compute/openstack/requests/list_servers_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Available filters: name, status, image, flavor, changes_since, reservation_id def list_servers_detail(options = {}) diff --git a/lib/fog/openstack/compute/requests/list_services.rb b/lib/fog/compute/openstack/requests/list_services.rb similarity index 98% rename from lib/fog/openstack/compute/requests/list_services.rb rename to lib/fog/compute/openstack/requests/list_services.rb index 289d305b6..74156035e 100644 --- a/lib/fog/openstack/compute/requests/list_services.rb +++ b/lib/fog/compute/openstack/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_services(parameters = nil) request( diff --git a/lib/fog/openstack/compute/requests/list_snapshots.rb b/lib/fog/compute/openstack/requests/list_snapshots.rb similarity index 96% rename from lib/fog/openstack/compute/requests/list_snapshots.rb rename to lib/fog/compute/openstack/requests/list_snapshots.rb index 9933f80d6..f96824f89 100644 --- a/lib/fog/openstack/compute/requests/list_snapshots.rb +++ b/lib/fog/compute/openstack/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_snapshots(options = true) if options.kind_of?(Hash) diff --git a/lib/fog/openstack/compute/requests/list_snapshots_detail.rb b/lib/fog/compute/openstack/requests/list_snapshots_detail.rb similarity index 93% rename from lib/fog/openstack/compute/requests/list_snapshots_detail.rb rename to lib/fog/compute/openstack/requests/list_snapshots_detail.rb index 5acd89803..2bf652454 100644 --- a/lib/fog/openstack/compute/requests/list_snapshots_detail.rb +++ b/lib/fog/compute/openstack/requests/list_snapshots_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_snapshots_detail(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb b/lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb similarity index 94% rename from lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb rename to lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb index 63dc99015..deb7e3cd9 100644 --- a/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb +++ b/lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_tenants_with_flavor_access(flavor_ref) request( diff --git a/lib/fog/openstack/compute/requests/list_usages.rb b/lib/fog/compute/openstack/requests/list_usages.rb similarity index 97% rename from lib/fog/openstack/compute/requests/list_usages.rb rename to lib/fog/compute/openstack/requests/list_usages.rb index aeac14242..f4d2d7150 100644 --- a/lib/fog/openstack/compute/requests/list_usages.rb +++ b/lib/fog/compute/openstack/requests/list_usages.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_usages(date_start = nil, date_end = nil, detailed = false) params = {} diff --git a/lib/fog/openstack/compute/requests/list_volume_attachments.rb b/lib/fog/compute/openstack/requests/list_volume_attachments.rb similarity index 95% rename from lib/fog/openstack/compute/requests/list_volume_attachments.rb rename to lib/fog/compute/openstack/requests/list_volume_attachments.rb index 21bc0298a..3e7f4122c 100644 --- a/lib/fog/openstack/compute/requests/list_volume_attachments.rb +++ b/lib/fog/compute/openstack/requests/list_volume_attachments.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_volume_attachments(server_id) request( diff --git a/lib/fog/openstack/compute/requests/list_volumes.rb b/lib/fog/compute/openstack/requests/list_volumes.rb similarity index 96% rename from lib/fog/openstack/compute/requests/list_volumes.rb rename to lib/fog/compute/openstack/requests/list_volumes.rb index dacd8aa66..91cdd6e88 100644 --- a/lib/fog/openstack/compute/requests/list_volumes.rb +++ b/lib/fog/compute/openstack/requests/list_volumes.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_volumes(options = true) if options.kind_of?(Hash) diff --git a/lib/fog/openstack/compute/requests/list_volumes_detail.rb b/lib/fog/compute/openstack/requests/list_volumes_detail.rb similarity index 93% rename from lib/fog/openstack/compute/requests/list_volumes_detail.rb rename to lib/fog/compute/openstack/requests/list_volumes_detail.rb index 29316eaf6..8fbb044dc 100644 --- a/lib/fog/openstack/compute/requests/list_volumes_detail.rb +++ b/lib/fog/compute/openstack/requests/list_volumes_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_volumes_detail(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_zones.rb b/lib/fog/compute/openstack/requests/list_zones.rb similarity index 94% rename from lib/fog/openstack/compute/requests/list_zones.rb rename to lib/fog/compute/openstack/requests/list_zones.rb index 50a084be9..f1971c735 100644 --- a/lib/fog/openstack/compute/requests/list_zones.rb +++ b/lib/fog/compute/openstack/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_zones(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/list_zones_detailed.rb b/lib/fog/compute/openstack/requests/list_zones_detailed.rb similarity index 98% rename from lib/fog/openstack/compute/requests/list_zones_detailed.rb rename to lib/fog/compute/openstack/requests/list_zones_detailed.rb index 375f70d03..754f82861 100644 --- a/lib/fog/openstack/compute/requests/list_zones_detailed.rb +++ b/lib/fog/compute/openstack/requests/list_zones_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def list_zones_detailed(options = {}) request( diff --git a/lib/fog/openstack/compute/requests/live_migrate_server.rb b/lib/fog/compute/openstack/requests/live_migrate_server.rb similarity index 94% rename from lib/fog/openstack/compute/requests/live_migrate_server.rb rename to lib/fog/compute/openstack/requests/live_migrate_server.rb index e749a7632..26bbfe14e 100644 --- a/lib/fog/openstack/compute/requests/live_migrate_server.rb +++ b/lib/fog/compute/openstack/requests/live_migrate_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def live_migrate_server(server_id, host, block_migration, disk_over_commit) body = { diff --git a/lib/fog/openstack/compute/requests/migrate_server.rb b/lib/fog/compute/openstack/requests/migrate_server.rb similarity index 90% rename from lib/fog/openstack/compute/requests/migrate_server.rb rename to lib/fog/compute/openstack/requests/migrate_server.rb index a4c61fb9a..909d95a10 100644 --- a/lib/fog/openstack/compute/requests/migrate_server.rb +++ b/lib/fog/compute/openstack/requests/migrate_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def migrate_server(server_id) body = {'migrate' => nil} diff --git a/lib/fog/openstack/compute/requests/pause_server.rb b/lib/fog/compute/openstack/requests/pause_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/pause_server.rb rename to lib/fog/compute/openstack/requests/pause_server.rb index 77a02c04e..a5b8bab7f 100644 --- a/lib/fog/openstack/compute/requests/pause_server.rb +++ b/lib/fog/compute/openstack/requests/pause_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Pause the server. # diff --git a/lib/fog/openstack/compute/requests/reboot_server.rb b/lib/fog/compute/openstack/requests/reboot_server.rb similarity index 91% rename from lib/fog/openstack/compute/requests/reboot_server.rb rename to lib/fog/compute/openstack/requests/reboot_server.rb index 8ed24c712..30cf812d7 100644 --- a/lib/fog/openstack/compute/requests/reboot_server.rb +++ b/lib/fog/compute/openstack/requests/reboot_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def reboot_server(server_id, type = 'SOFT') body = {'reboot' => {'type' => type}} diff --git a/lib/fog/openstack/compute/requests/rebuild_server.rb b/lib/fog/compute/openstack/requests/rebuild_server.rb similarity index 96% rename from lib/fog/openstack/compute/requests/rebuild_server.rb rename to lib/fog/compute/openstack/requests/rebuild_server.rb index 43adb63ec..b519620c3 100644 --- a/lib/fog/openstack/compute/requests/rebuild_server.rb +++ b/lib/fog/compute/openstack/requests/rebuild_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def rebuild_server(server_id, image_ref, name, admin_pass = nil, metadata = nil, personality = nil) body = {'rebuild' => { diff --git a/lib/fog/openstack/compute/requests/release_address.rb b/lib/fog/compute/openstack/requests/release_address.rb similarity index 94% rename from lib/fog/openstack/compute/requests/release_address.rb rename to lib/fog/compute/openstack/requests/release_address.rb index ee563c5e7..9b7b68fdb 100644 --- a/lib/fog/openstack/compute/requests/release_address.rb +++ b/lib/fog/compute/openstack/requests/release_address.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def release_address(address_id) request( diff --git a/lib/fog/openstack/compute/requests/remote_consoles.rb b/lib/fog/compute/openstack/requests/remote_consoles.rb similarity index 97% rename from lib/fog/openstack/compute/requests/remote_consoles.rb rename to lib/fog/compute/openstack/requests/remote_consoles.rb index d4efe40e7..3c869acd0 100644 --- a/lib/fog/openstack/compute/requests/remote_consoles.rb +++ b/lib/fog/compute/openstack/requests/remote_consoles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Get a vnc console for an instance. # For microversion >= 2.6 diff --git a/lib/fog/openstack/compute/requests/remove_aggregate_host.rb b/lib/fog/compute/openstack/requests/remove_aggregate_host.rb similarity index 95% rename from lib/fog/openstack/compute/requests/remove_aggregate_host.rb rename to lib/fog/compute/openstack/requests/remove_aggregate_host.rb index 9cef36b6b..8a0879f91 100644 --- a/lib/fog/openstack/compute/requests/remove_aggregate_host.rb +++ b/lib/fog/compute/openstack/requests/remove_aggregate_host.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def remove_aggregate_host(uuid, host_uuid) data = {'remove_host' => {'host' => host_uuid}} diff --git a/lib/fog/openstack/compute/requests/remove_fixed_ip.rb b/lib/fog/compute/openstack/requests/remove_fixed_ip.rb similarity index 94% rename from lib/fog/openstack/compute/requests/remove_fixed_ip.rb rename to lib/fog/compute/openstack/requests/remove_fixed_ip.rb index d35add92b..ea1024145 100644 --- a/lib/fog/openstack/compute/requests/remove_fixed_ip.rb +++ b/lib/fog/compute/openstack/requests/remove_fixed_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Remove an IP address. # diff --git a/lib/fog/openstack/compute/requests/remove_flavor_access.rb b/lib/fog/compute/openstack/requests/remove_flavor_access.rb similarity index 95% rename from lib/fog/openstack/compute/requests/remove_flavor_access.rb rename to lib/fog/compute/openstack/requests/remove_flavor_access.rb index d15628914..b26cb94ec 100644 --- a/lib/fog/openstack/compute/requests/remove_flavor_access.rb +++ b/lib/fog/compute/openstack/requests/remove_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def remove_flavor_access(flavor_ref, tenant_id) request( diff --git a/lib/fog/openstack/compute/requests/remove_security_group.rb b/lib/fog/compute/openstack/requests/remove_security_group.rb similarity index 91% rename from lib/fog/openstack/compute/requests/remove_security_group.rb rename to lib/fog/compute/openstack/requests/remove_security_group.rb index 3fabe564a..9dd118fde 100644 --- a/lib/fog/openstack/compute/requests/remove_security_group.rb +++ b/lib/fog/compute/openstack/requests/remove_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def remove_security_group(server_id, group_name) body = {'removeSecurityGroup' => {"name" => group_name}} diff --git a/lib/fog/openstack/compute/requests/rescue_server.rb b/lib/fog/compute/openstack/requests/rescue_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/rescue_server.rb rename to lib/fog/compute/openstack/requests/rescue_server.rb index c23ca54ca..936926e1e 100644 --- a/lib/fog/openstack/compute/requests/rescue_server.rb +++ b/lib/fog/compute/openstack/requests/rescue_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Rescue the server. # diff --git a/lib/fog/openstack/compute/requests/reset_server_state.rb b/lib/fog/compute/openstack/requests/reset_server_state.rb similarity index 92% rename from lib/fog/openstack/compute/requests/reset_server_state.rb rename to lib/fog/compute/openstack/requests/reset_server_state.rb index 5287047f1..d70ae954e 100644 --- a/lib/fog/openstack/compute/requests/reset_server_state.rb +++ b/lib/fog/compute/openstack/requests/reset_server_state.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def reset_server_state(server_id, status) body = {'os-resetState' => {'state' => status}} diff --git a/lib/fog/openstack/compute/requests/resize_server.rb b/lib/fog/compute/openstack/requests/resize_server.rb similarity index 91% rename from lib/fog/openstack/compute/requests/resize_server.rb rename to lib/fog/compute/openstack/requests/resize_server.rb index e7eea5837..a90f2dde1 100644 --- a/lib/fog/openstack/compute/requests/resize_server.rb +++ b/lib/fog/compute/openstack/requests/resize_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def resize_server(server_id, flavor_ref) body = {'resize' => {'flavorRef' => flavor_ref}} diff --git a/lib/fog/openstack/compute/requests/resume_server.rb b/lib/fog/compute/openstack/requests/resume_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/resume_server.rb rename to lib/fog/compute/openstack/requests/resume_server.rb index d33638930..44274d381 100644 --- a/lib/fog/openstack/compute/requests/resume_server.rb +++ b/lib/fog/compute/openstack/requests/resume_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Resume the server. # diff --git a/lib/fog/openstack/compute/requests/revert_resize_server.rb b/lib/fog/compute/openstack/requests/revert_resize_server.rb similarity index 94% rename from lib/fog/openstack/compute/requests/revert_resize_server.rb rename to lib/fog/compute/openstack/requests/revert_resize_server.rb index 83fb61b89..047921122 100644 --- a/lib/fog/openstack/compute/requests/revert_resize_server.rb +++ b/lib/fog/compute/openstack/requests/revert_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def revert_resize_server(server_id) body = {'revertResize' => nil} diff --git a/lib/fog/openstack/compute/requests/server_action.rb b/lib/fog/compute/openstack/requests/server_action.rb similarity index 89% rename from lib/fog/openstack/compute/requests/server_action.rb rename to lib/fog/compute/openstack/requests/server_action.rb index e735efd78..99f32c394 100644 --- a/lib/fog/openstack/compute/requests/server_action.rb +++ b/lib/fog/compute/openstack/requests/server_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def server_action(server_id, body, expects = [200, 202]) request( diff --git a/lib/fog/openstack/compute/requests/server_actions.rb b/lib/fog/compute/openstack/requests/server_actions.rb similarity index 96% rename from lib/fog/openstack/compute/requests/server_actions.rb rename to lib/fog/compute/openstack/requests/server_actions.rb index 006fa5301..6eb119c50 100644 --- a/lib/fog/openstack/compute/requests/server_actions.rb +++ b/lib/fog/compute/openstack/requests/server_actions.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Retrieve server actions. # diff --git a/lib/fog/openstack/compute/requests/server_diagnostics.rb b/lib/fog/compute/openstack/requests/server_diagnostics.rb similarity index 93% rename from lib/fog/openstack/compute/requests/server_diagnostics.rb rename to lib/fog/compute/openstack/requests/server_diagnostics.rb index 45b995693..d6e6c52a7 100644 --- a/lib/fog/openstack/compute/requests/server_diagnostics.rb +++ b/lib/fog/compute/openstack/requests/server_diagnostics.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Retrieve server diagnostics. # diff --git a/lib/fog/openstack/compute/requests/set_metadata.rb b/lib/fog/compute/openstack/requests/set_metadata.rb similarity index 86% rename from lib/fog/openstack/compute/requests/set_metadata.rb rename to lib/fog/compute/openstack/requests/set_metadata.rb index dba2f091d..976c4bd9b 100644 --- a/lib/fog/openstack/compute/requests/set_metadata.rb +++ b/lib/fog/compute/openstack/requests/set_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def set_metadata(collection_name, parent_id, metadata = {}) request( @@ -16,13 +16,13 @@ class Mock def set_metadata(collection_name, parent_id, metadata = {}) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end diff --git a/lib/fog/openstack/compute/requests/set_tenant.rb b/lib/fog/compute/openstack/requests/set_tenant.rb similarity index 88% rename from lib/fog/openstack/compute/requests/set_tenant.rb rename to lib/fog/compute/openstack/requests/set_tenant.rb index e3ae500dc..620d74c7e 100644 --- a/lib/fog/openstack/compute/requests/set_tenant.rb +++ b/lib/fog/compute/openstack/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/openstack/compute/requests/shelve_offload_server.rb b/lib/fog/compute/openstack/requests/shelve_offload_server.rb similarity index 93% rename from lib/fog/openstack/compute/requests/shelve_offload_server.rb rename to lib/fog/compute/openstack/requests/shelve_offload_server.rb index 3964a411c..045ebfe4d 100644 --- a/lib/fog/openstack/compute/requests/shelve_offload_server.rb +++ b/lib/fog/compute/openstack/requests/shelve_offload_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Shelve Off load the server. Data and resource associations are deleted. # diff --git a/lib/fog/openstack/compute/requests/shelve_server.rb b/lib/fog/compute/openstack/requests/shelve_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/shelve_server.rb rename to lib/fog/compute/openstack/requests/shelve_server.rb index c12867981..7ba422f98 100644 --- a/lib/fog/openstack/compute/requests/shelve_server.rb +++ b/lib/fog/compute/openstack/requests/shelve_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Shelve the server. # diff --git a/lib/fog/openstack/compute/requests/start_server.rb b/lib/fog/compute/openstack/requests/start_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/start_server.rb rename to lib/fog/compute/openstack/requests/start_server.rb index 9bcb326e4..1d1286e58 100644 --- a/lib/fog/openstack/compute/requests/start_server.rb +++ b/lib/fog/compute/openstack/requests/start_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Start the server. # diff --git a/lib/fog/openstack/compute/requests/stop_server.rb b/lib/fog/compute/openstack/requests/stop_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/stop_server.rb rename to lib/fog/compute/openstack/requests/stop_server.rb index 8948bc18f..7addb0bf0 100644 --- a/lib/fog/openstack/compute/requests/stop_server.rb +++ b/lib/fog/compute/openstack/requests/stop_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Stop the server. # diff --git a/lib/fog/openstack/compute/requests/suspend_server.rb b/lib/fog/compute/openstack/requests/suspend_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/suspend_server.rb rename to lib/fog/compute/openstack/requests/suspend_server.rb index 05f8ecb41..780b1a5a1 100644 --- a/lib/fog/openstack/compute/requests/suspend_server.rb +++ b/lib/fog/compute/openstack/requests/suspend_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Suspend the server. # diff --git a/lib/fog/openstack/compute/requests/unpause_server.rb b/lib/fog/compute/openstack/requests/unpause_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/unpause_server.rb rename to lib/fog/compute/openstack/requests/unpause_server.rb index 69aec04dc..d60c11d20 100644 --- a/lib/fog/openstack/compute/requests/unpause_server.rb +++ b/lib/fog/compute/openstack/requests/unpause_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Unpause the server. # diff --git a/lib/fog/openstack/compute/requests/unshelve_server.rb b/lib/fog/compute/openstack/requests/unshelve_server.rb similarity index 92% rename from lib/fog/openstack/compute/requests/unshelve_server.rb rename to lib/fog/compute/openstack/requests/unshelve_server.rb index b8589b04f..c5b80b0bb 100644 --- a/lib/fog/openstack/compute/requests/unshelve_server.rb +++ b/lib/fog/compute/openstack/requests/unshelve_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real # Unshelve the server. # diff --git a/lib/fog/openstack/compute/requests/update_aggregate.rb b/lib/fog/compute/openstack/requests/update_aggregate.rb similarity index 96% rename from lib/fog/openstack/compute/requests/update_aggregate.rb rename to lib/fog/compute/openstack/requests/update_aggregate.rb index 3d0a777b9..ab63235c1 100644 --- a/lib/fog/openstack/compute/requests/update_aggregate.rb +++ b/lib/fog/compute/openstack/requests/update_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_aggregate(uuid, options = {}) vanilla_options = [:name, :availability_zone] diff --git a/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb b/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb similarity index 95% rename from lib/fog/openstack/compute/requests/update_aggregate_metadata.rb rename to lib/fog/compute/openstack/requests/update_aggregate_metadata.rb index a1718a93a..08b65638e 100644 --- a/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb +++ b/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_aggregate_metadata(uuid, metadata = {}) data = {'set_metadata' => {'metadata' => metadata}} diff --git a/lib/fog/openstack/compute/requests/update_flavor_metadata.rb b/lib/fog/compute/openstack/requests/update_flavor_metadata.rb similarity index 95% rename from lib/fog/openstack/compute/requests/update_flavor_metadata.rb rename to lib/fog/compute/openstack/requests/update_flavor_metadata.rb index a63c59c39..1c4b2d835 100644 --- a/lib/fog/openstack/compute/requests/update_flavor_metadata.rb +++ b/lib/fog/compute/openstack/requests/update_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_flavor_metadata(flavor_ref, key, value) data = {key => value} diff --git a/lib/fog/openstack/compute/requests/update_meta.rb b/lib/fog/compute/openstack/requests/update_meta.rb similarity index 87% rename from lib/fog/openstack/compute/requests/update_meta.rb rename to lib/fog/compute/openstack/requests/update_meta.rb index 0eba6aadf..ba3c71475 100644 --- a/lib/fog/openstack/compute/requests/update_meta.rb +++ b/lib/fog/compute/openstack/requests/update_meta.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_meta(collection_name, parent_id, key, value) request( @@ -16,13 +16,13 @@ class Mock def update_meta(collection_name, parent_id, key, value) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end diff --git a/lib/fog/openstack/compute/requests/update_metadata.rb b/lib/fog/compute/openstack/requests/update_metadata.rb similarity index 87% rename from lib/fog/openstack/compute/requests/update_metadata.rb rename to lib/fog/compute/openstack/requests/update_metadata.rb index 18c5af67c..ca7ae6251 100644 --- a/lib/fog/openstack/compute/requests/update_metadata.rb +++ b/lib/fog/compute/openstack/requests/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_metadata(collection_name, parent_id, metadata = {}) request( @@ -16,13 +16,13 @@ class Mock def update_metadata(collection_name, parent_id, metadata = {}) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end diff --git a/lib/fog/openstack/compute/requests/update_quota.rb b/lib/fog/compute/openstack/requests/update_quota.rb similarity index 94% rename from lib/fog/openstack/compute/requests/update_quota.rb rename to lib/fog/compute/openstack/requests/update_quota.rb index 7acc88d80..ad518e5bc 100644 --- a/lib/fog/openstack/compute/requests/update_quota.rb +++ b/lib/fog/compute/openstack/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/openstack/compute/requests/update_server.rb b/lib/fog/compute/openstack/requests/update_server.rb similarity index 89% rename from lib/fog/openstack/compute/requests/update_server.rb rename to lib/fog/compute/openstack/requests/update_server.rb index 5485ad820..482431fc8 100644 --- a/lib/fog/openstack/compute/requests/update_server.rb +++ b/lib/fog/compute/openstack/requests/update_server.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack class Real def update_server(server_id, options = {}) request( @@ -23,7 +23,7 @@ def update_server(server_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Compute::NotFound + raise Fog::Compute::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/container_infra/container_infra.rb b/lib/fog/container_infra/openstack.rb similarity index 94% rename from lib/fog/openstack/container_infra/container_infra.rb rename to lib/fog/container_infra/openstack.rb index 30a9f1e14..cc5daa073 100644 --- a/lib/fog/openstack/container_infra/container_infra.rb +++ b/lib/fog/container_infra/openstack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra < Fog::Service + module ContainerInfra + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v1/ SUPPORTED_MICROVERSION = '1.3' @@ -16,7 +16,7 @@ class ContainerInfra < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/container_infra/models' + model_path 'fog/container_infra/openstack/models' model :bay collection :bays @@ -29,7 +29,7 @@ class ContainerInfra < Fog::Service model :cluster_template collection :cluster_templates - request_path 'fog/openstack/container_infra/requests' + request_path 'fog/container_infra/openstack/requests' # Bay CRUD request :create_bay @@ -123,7 +123,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::ContainerInfra::NotFound + Fog::ContainerInfra::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/container_infra/models/base.rb b/lib/fog/container_infra/openstack/models/base.rb similarity index 76% rename from lib/fog/openstack/container_infra/models/base.rb rename to lib/fog/container_infra/openstack/models/base.rb index 55094626d..265e5ec35 100644 --- a/lib/fog/openstack/container_infra/models/base.rb +++ b/lib/fog/container_infra/openstack/models/base.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class ContainerInfra - class Base < Fog::OpenStack::Model + module ContainerInfra + class OpenStack + class Base < Fog::OpenStack::Model def convert_update_params(params) params = params.map do |key, value| { @@ -11,9 +11,9 @@ def convert_update_params(params) "op" => value ? "replace" : "remove" }.merge(value ? {"value" => value} : {}) end - params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} + params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} end end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/container_infra/models/bay.rb b/lib/fog/container_infra/openstack/models/bay.rb similarity index 92% rename from lib/fog/openstack/container_infra/models/bay.rb rename to lib/fog/container_infra/openstack/models/bay.rb index 5cdc9aa71..9465aed9d 100644 --- a/lib/fog/openstack/container_infra/models/bay.rb +++ b/lib/fog/container_infra/openstack/models/bay.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module OpenStack - class ContainerInfra - class Bay < Fog::OpenStack::ContainerInfra::Base + module ContainerInfra + class OpenStack + class Bay < Fog::ContainerInfra::OpenStack::Base identity :uuid attribute :api_address diff --git a/lib/fog/openstack/container_infra/models/bay_model.rb b/lib/fog/container_infra/openstack/models/bay_model.rb similarity index 93% rename from lib/fog/openstack/container_infra/models/bay_model.rb rename to lib/fog/container_infra/openstack/models/bay_model.rb index 738066630..50bb59a2f 100644 --- a/lib/fog/openstack/container_infra/models/bay_model.rb +++ b/lib/fog/container_infra/openstack/models/bay_model.rb @@ -1,11 +1,11 @@ require_relative 'base' module Fog - module OpenStack - class ContainerInfra - class BayModel < Fog::OpenStack::ContainerInfra::Base + module ContainerInfra + class OpenStack + class BayModel < Fog::ContainerInfra::OpenStack::Base identity :uuid - + attribute :apiserver_port attribute :cluster_distro attribute :coe diff --git a/lib/fog/openstack/container_infra/models/bay_models.rb b/lib/fog/container_infra/openstack/models/bay_models.rb similarity index 64% rename from lib/fog/openstack/container_infra/models/bay_models.rb rename to lib/fog/container_infra/openstack/models/bay_models.rb index 29e8c9d45..82d9e8395 100644 --- a/lib/fog/openstack/container_infra/models/bay_models.rb +++ b/lib/fog/container_infra/openstack/models/bay_models.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/container_infra/models/bay_model' +require 'fog/container_infra/openstack/models/bay_model' module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class BayModels < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::BayModel + model Fog::ContainerInfra::OpenStack::BayModel def all load_response(service.list_bay_models, 'baymodels') @@ -14,7 +14,7 @@ def all def get(bay_model_uuid_or_name) resource = service.get_bay_model(bay_model_uuid_or_name).body new(resource) - rescue Fog::OpenStack::ContainerInfra::NotFound + rescue Fog::ContainerInfra::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/container_infra/models/bays.rb b/lib/fog/container_infra/openstack/models/bays.rb similarity index 63% rename from lib/fog/openstack/container_infra/models/bays.rb rename to lib/fog/container_infra/openstack/models/bays.rb index 03e23e19e..043c39663 100644 --- a/lib/fog/openstack/container_infra/models/bays.rb +++ b/lib/fog/container_infra/openstack/models/bays.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/container_infra/models/bay' +require 'fog/container_infra/openstack/models/bay' module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Bays < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::Bay + model Fog::ContainerInfra::OpenStack::Bay def all load_response(service.list_bays, "bays") @@ -14,7 +14,7 @@ def all def get(bay_uuid_or_name) resource = service.get_bay(bay_uuid_or_name).body new(resource) - rescue Fog::OpenStack::ContainerInfra::NotFound + rescue Fog::ContainerInfra::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/container_infra/models/certificate.rb b/lib/fog/container_infra/openstack/models/certificate.rb similarity index 73% rename from lib/fog/openstack/container_infra/models/certificate.rb rename to lib/fog/container_infra/openstack/models/certificate.rb index f6f80050f..7c452bb27 100644 --- a/lib/fog/openstack/container_infra/models/certificate.rb +++ b/lib/fog/container_infra/openstack/models/certificate.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module OpenStack - class ContainerInfra - class Certificate < Fog::OpenStack::ContainerInfra::Base + module ContainerInfra + class OpenStack + class Certificate < Fog::ContainerInfra::OpenStack::Base identity :bay_uuid attribute :pem diff --git a/lib/fog/openstack/container_infra/models/certificates.rb b/lib/fog/container_infra/openstack/models/certificates.rb similarity index 64% rename from lib/fog/openstack/container_infra/models/certificates.rb rename to lib/fog/container_infra/openstack/models/certificates.rb index ccd0d7621..74ba7595a 100644 --- a/lib/fog/openstack/container_infra/models/certificates.rb +++ b/lib/fog/container_infra/openstack/models/certificates.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/container_infra/models/certificate' +require 'fog/container_infra/openstack/models/certificate' module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Certificates < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::Certificate + model Fog::ContainerInfra::OpenStack::Certificate def create(bay_uuid) resource = service.create_certificate(bay_uuid).body @@ -16,7 +16,7 @@ def create(bay_uuid) def get(bay_uuid) resource = service.get_certificate(bay_uuid).body new(resource) - rescue Fog::OpenStack::ContainerInfra::NotFound + rescue Fog::ContainerInfra::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/container_infra/models/cluster.rb b/lib/fog/container_infra/openstack/models/cluster.rb similarity index 92% rename from lib/fog/openstack/container_infra/models/cluster.rb rename to lib/fog/container_infra/openstack/models/cluster.rb index d9bb73205..63500607f 100644 --- a/lib/fog/openstack/container_infra/models/cluster.rb +++ b/lib/fog/container_infra/openstack/models/cluster.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module OpenStack - class ContainerInfra - class Cluster < Fog::OpenStack::ContainerInfra::Base + module ContainerInfra + class OpenStack + class Cluster < Fog::ContainerInfra::OpenStack::Base identity :uuid attribute :api_address diff --git a/lib/fog/openstack/container_infra/models/cluster_template.rb b/lib/fog/container_infra/openstack/models/cluster_template.rb similarity index 93% rename from lib/fog/openstack/container_infra/models/cluster_template.rb rename to lib/fog/container_infra/openstack/models/cluster_template.rb index 1b8762970..42e60d16c 100644 --- a/lib/fog/openstack/container_infra/models/cluster_template.rb +++ b/lib/fog/container_infra/openstack/models/cluster_template.rb @@ -1,11 +1,11 @@ require_relative 'base' module Fog - module OpenStack - class ContainerInfra - class ClusterTemplate < Fog::OpenStack::ContainerInfra::Base + module ContainerInfra + class OpenStack + class ClusterTemplate < Fog::ContainerInfra::OpenStack::Base identity :uuid - + attribute :apiserver_port attribute :cluster_distro attribute :coe diff --git a/lib/fog/openstack/container_infra/models/cluster_templates.rb b/lib/fog/container_infra/openstack/models/cluster_templates.rb similarity index 65% rename from lib/fog/openstack/container_infra/models/cluster_templates.rb rename to lib/fog/container_infra/openstack/models/cluster_templates.rb index 01a2d9e33..fd549429f 100644 --- a/lib/fog/openstack/container_infra/models/cluster_templates.rb +++ b/lib/fog/container_infra/openstack/models/cluster_templates.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/container_infra/models/cluster_template' +require 'fog/container_infra/openstack/models/cluster_template' module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class ClusterTemplates < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::ClusterTemplate + model Fog::ContainerInfra::OpenStack::ClusterTemplate def all load_response(service.list_cluster_templates, 'clustertemplates') @@ -15,7 +15,7 @@ def all def get(cluster_template_uuid_or_name) resource = service.get_cluster_template(cluster_template_uuid_or_name).body new(resource) - rescue Fog::OpenStack::ContainerInfra::NotFound + rescue Fog::ContainerInfra::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/container_infra/models/clusters.rb b/lib/fog/container_infra/openstack/models/clusters.rb similarity index 64% rename from lib/fog/openstack/container_infra/models/clusters.rb rename to lib/fog/container_infra/openstack/models/clusters.rb index e0038aa55..8a8294f22 100644 --- a/lib/fog/openstack/container_infra/models/clusters.rb +++ b/lib/fog/container_infra/openstack/models/clusters.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/container_infra/models/cluster' +require 'fog/container_infra/openstack/models/cluster' module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Clusters < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::Cluster + model Fog::ContainerInfra::OpenStack::Cluster def all load_response(service.list_clusters, "clusters") @@ -15,7 +15,7 @@ def all def get(cluster_uuid_or_name) resource = service.get_cluster(cluster_uuid_or_name).body new(resource) - rescue Fog::OpenStack::ContainerInfra::NotFound + rescue Fog::ContainerInfra::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/container_infra/requests/create_bay.rb b/lib/fog/container_infra/openstack/requests/create_bay.rb similarity index 92% rename from lib/fog/openstack/container_infra/requests/create_bay.rb rename to lib/fog/container_infra/openstack/requests/create_bay.rb index 1f6e31100..82e84e335 100644 --- a/lib/fog/openstack/container_infra/requests/create_bay.rb +++ b/lib/fog/container_infra/openstack/requests/create_bay.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def create_bay(params) request( diff --git a/lib/fog/openstack/container_infra/requests/create_bay_model.rb b/lib/fog/container_infra/openstack/requests/create_bay_model.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/create_bay_model.rb rename to lib/fog/container_infra/openstack/requests/create_bay_model.rb index e080810c6..e6cac430d 100644 --- a/lib/fog/openstack/container_infra/requests/create_bay_model.rb +++ b/lib/fog/container_infra/openstack/requests/create_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def create_bay_model(params) request( diff --git a/lib/fog/openstack/container_infra/requests/create_certificate.rb b/lib/fog/container_infra/openstack/requests/create_certificate.rb similarity index 95% rename from lib/fog/openstack/container_infra/requests/create_certificate.rb rename to lib/fog/container_infra/openstack/requests/create_certificate.rb index ce81a2512..3f9e099da 100644 --- a/lib/fog/openstack/container_infra/requests/create_certificate.rb +++ b/lib/fog/container_infra/openstack/requests/create_certificate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def create_certificate(params) request( diff --git a/lib/fog/openstack/container_infra/requests/create_cluster.rb b/lib/fog/container_infra/openstack/requests/create_cluster.rb similarity index 92% rename from lib/fog/openstack/container_infra/requests/create_cluster.rb rename to lib/fog/container_infra/openstack/requests/create_cluster.rb index 8acd5897a..046d9f10a 100644 --- a/lib/fog/openstack/container_infra/requests/create_cluster.rb +++ b/lib/fog/container_infra/openstack/requests/create_cluster.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def create_cluster(params) request( diff --git a/lib/fog/openstack/container_infra/requests/create_cluster_template.rb b/lib/fog/container_infra/openstack/requests/create_cluster_template.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/create_cluster_template.rb rename to lib/fog/container_infra/openstack/requests/create_cluster_template.rb index a138fdcee..92d8ec476 100644 --- a/lib/fog/openstack/container_infra/requests/create_cluster_template.rb +++ b/lib/fog/container_infra/openstack/requests/create_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def create_cluster_template(params) request( diff --git a/lib/fog/openstack/container_infra/requests/delete_bay.rb b/lib/fog/container_infra/openstack/requests/delete_bay.rb similarity index 90% rename from lib/fog/openstack/container_infra/requests/delete_bay.rb rename to lib/fog/container_infra/openstack/requests/delete_bay.rb index 27826933d..bda6c49fb 100644 --- a/lib/fog/openstack/container_infra/requests/delete_bay.rb +++ b/lib/fog/container_infra/openstack/requests/delete_bay.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def delete_bay(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/delete_bay_model.rb b/lib/fog/container_infra/openstack/requests/delete_bay_model.rb similarity index 91% rename from lib/fog/openstack/container_infra/requests/delete_bay_model.rb rename to lib/fog/container_infra/openstack/requests/delete_bay_model.rb index 7231738a4..37cdff96e 100644 --- a/lib/fog/openstack/container_infra/requests/delete_bay_model.rb +++ b/lib/fog/container_infra/openstack/requests/delete_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def delete_bay_model(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/delete_cluster.rb b/lib/fog/container_infra/openstack/requests/delete_cluster.rb similarity index 91% rename from lib/fog/openstack/container_infra/requests/delete_cluster.rb rename to lib/fog/container_infra/openstack/requests/delete_cluster.rb index 459649aa4..a72e5f9dd 100644 --- a/lib/fog/openstack/container_infra/requests/delete_cluster.rb +++ b/lib/fog/container_infra/openstack/requests/delete_cluster.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def delete_cluster(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb b/lib/fog/container_infra/openstack/requests/delete_cluster_template.rb similarity index 91% rename from lib/fog/openstack/container_infra/requests/delete_cluster_template.rb rename to lib/fog/container_infra/openstack/requests/delete_cluster_template.rb index c2b0d16bc..099a8f3b8 100644 --- a/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb +++ b/lib/fog/container_infra/openstack/requests/delete_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def delete_cluster_template(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/get_bay.rb b/lib/fog/container_infra/openstack/requests/get_bay.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/get_bay.rb rename to lib/fog/container_infra/openstack/requests/get_bay.rb index 77df5b3d0..a0ee1ac4b 100644 --- a/lib/fog/openstack/container_infra/requests/get_bay.rb +++ b/lib/fog/container_infra/openstack/requests/get_bay.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def get_bay(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/get_bay_model.rb b/lib/fog/container_infra/openstack/requests/get_bay_model.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/get_bay_model.rb rename to lib/fog/container_infra/openstack/requests/get_bay_model.rb index 31017b396..b141c902c 100644 --- a/lib/fog/openstack/container_infra/requests/get_bay_model.rb +++ b/lib/fog/container_infra/openstack/requests/get_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def get_bay_model(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/get_certificate.rb b/lib/fog/container_infra/openstack/requests/get_certificate.rb similarity index 93% rename from lib/fog/openstack/container_infra/requests/get_certificate.rb rename to lib/fog/container_infra/openstack/requests/get_certificate.rb index 9fff2dcb9..d5bef95ca 100644 --- a/lib/fog/openstack/container_infra/requests/get_certificate.rb +++ b/lib/fog/container_infra/openstack/requests/get_certificate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def get_certificate(bay_uuid) request( diff --git a/lib/fog/openstack/container_infra/requests/get_cluster.rb b/lib/fog/container_infra/openstack/requests/get_cluster.rb similarity index 96% rename from lib/fog/openstack/container_infra/requests/get_cluster.rb rename to lib/fog/container_infra/openstack/requests/get_cluster.rb index 96b9e43c5..da4ea3912 100644 --- a/lib/fog/openstack/container_infra/requests/get_cluster.rb +++ b/lib/fog/container_infra/openstack/requests/get_cluster.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def get_cluster(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/get_cluster_template.rb b/lib/fog/container_infra/openstack/requests/get_cluster_template.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/get_cluster_template.rb rename to lib/fog/container_infra/openstack/requests/get_cluster_template.rb index afe36620c..7670cb159 100644 --- a/lib/fog/openstack/container_infra/requests/get_cluster_template.rb +++ b/lib/fog/container_infra/openstack/requests/get_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def get_cluster_template(uuid_or_name) request( diff --git a/lib/fog/openstack/container_infra/requests/list_bay_models.rb b/lib/fog/container_infra/openstack/requests/list_bay_models.rb similarity index 98% rename from lib/fog/openstack/container_infra/requests/list_bay_models.rb rename to lib/fog/container_infra/openstack/requests/list_bay_models.rb index d7faae6c5..0257dc095 100644 --- a/lib/fog/openstack/container_infra/requests/list_bay_models.rb +++ b/lib/fog/container_infra/openstack/requests/list_bay_models.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def list_bay_models request( diff --git a/lib/fog/openstack/container_infra/requests/list_bays.rb b/lib/fog/container_infra/openstack/requests/list_bays.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/list_bays.rb rename to lib/fog/container_infra/openstack/requests/list_bays.rb index 784913155..68d8e37df 100644 --- a/lib/fog/openstack/container_infra/requests/list_bays.rb +++ b/lib/fog/container_infra/openstack/requests/list_bays.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def list_bays request( diff --git a/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb b/lib/fog/container_infra/openstack/requests/list_cluster_templates.rb similarity index 98% rename from lib/fog/openstack/container_infra/requests/list_cluster_templates.rb rename to lib/fog/container_infra/openstack/requests/list_cluster_templates.rb index 7eb4a3c6d..52436b623 100644 --- a/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb +++ b/lib/fog/container_infra/openstack/requests/list_cluster_templates.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def list_cluster_templates request( diff --git a/lib/fog/openstack/container_infra/requests/list_clusters.rb b/lib/fog/container_infra/openstack/requests/list_clusters.rb similarity index 95% rename from lib/fog/openstack/container_infra/requests/list_clusters.rb rename to lib/fog/container_infra/openstack/requests/list_clusters.rb index 8f302f1a0..b81461ecc 100644 --- a/lib/fog/openstack/container_infra/requests/list_clusters.rb +++ b/lib/fog/container_infra/openstack/requests/list_clusters.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def list_clusters request( diff --git a/lib/fog/openstack/container_infra/requests/update_bay.rb b/lib/fog/container_infra/openstack/requests/update_bay.rb similarity index 92% rename from lib/fog/openstack/container_infra/requests/update_bay.rb rename to lib/fog/container_infra/openstack/requests/update_bay.rb index 306225c7e..4ed52fc75 100644 --- a/lib/fog/openstack/container_infra/requests/update_bay.rb +++ b/lib/fog/container_infra/openstack/requests/update_bay.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def update_bay(uuid_or_name, params) request( diff --git a/lib/fog/openstack/container_infra/requests/update_bay_model.rb b/lib/fog/container_infra/openstack/requests/update_bay_model.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/update_bay_model.rb rename to lib/fog/container_infra/openstack/requests/update_bay_model.rb index 8db575ba8..d08dbaf79 100644 --- a/lib/fog/openstack/container_infra/requests/update_bay_model.rb +++ b/lib/fog/container_infra/openstack/requests/update_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def update_bay_model(uuid_or_name, params) request( diff --git a/lib/fog/openstack/container_infra/requests/update_cluster.rb b/lib/fog/container_infra/openstack/requests/update_cluster.rb similarity index 93% rename from lib/fog/openstack/container_infra/requests/update_cluster.rb rename to lib/fog/container_infra/openstack/requests/update_cluster.rb index 0cc20bb90..d78926f8e 100644 --- a/lib/fog/openstack/container_infra/requests/update_cluster.rb +++ b/lib/fog/container_infra/openstack/requests/update_cluster.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def update_cluster(uuid_or_name, params) request( diff --git a/lib/fog/openstack/container_infra/requests/update_cluster_template.rb b/lib/fog/container_infra/openstack/requests/update_cluster_template.rb similarity index 97% rename from lib/fog/openstack/container_infra/requests/update_cluster_template.rb rename to lib/fog/container_infra/openstack/requests/update_cluster_template.rb index 78e8cbf66..c0b85f0e6 100644 --- a/lib/fog/openstack/container_infra/requests/update_cluster_template.rb +++ b/lib/fog/container_infra/openstack/requests/update_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class ContainerInfra + module ContainerInfra + class OpenStack class Real def update_cluster_template(uuid_or_name, params) request( diff --git a/lib/fog/dns/openstack.rb b/lib/fog/dns/openstack.rb new file mode 100644 index 000000000..0007a5d63 --- /dev/null +++ b/lib/fog/dns/openstack.rb @@ -0,0 +1,21 @@ +module Fog + module DNS + class OpenStack < Fog::Service + autoload :V1, 'fog/dns/openstack/v1' + autoload :V2, 'fog/dns/openstack/v2' + + # Fog::DNS::OpenStack.new() will return a Fog::DNS::OpenStack::V2 or a Fog::DNS::OpenStack::V1, + # choosing the latest available + def self.new(args = {}) + @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] + if inspect == 'Fog::DNS::OpenStack' + service = Fog::DNS::OpenStack::V2.new(args) unless args.empty? + service ||= Fog::DNS::OpenStack::V1.new(args) + else + service = Fog::Service.new(args) + end + service + end + end + end +end diff --git a/lib/fog/openstack/dns/v1.rb b/lib/fog/dns/openstack/v1.rb similarity index 96% rename from lib/fog/openstack/dns/v1.rb rename to lib/fog/dns/openstack/v1.rb index e645d5258..f42dda83b 100644 --- a/lib/fog/openstack/dns/v1.rb +++ b/lib/fog/dns/openstack/v1.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/dns/dns' +require 'fog/dns/openstack' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V1 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -16,7 +16,7 @@ class V1 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - request_path 'fog/openstack/dns/v1/requests' + request_path 'fog/dns/openstack/v1/requests' request :list_domains @@ -99,7 +99,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::DNS::NotFound + Fog::DNS::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/dns/v1/requests/get_quota.rb b/lib/fog/dns/openstack/v1/requests/get_quota.rb similarity index 94% rename from lib/fog/openstack/dns/v1/requests/get_quota.rb rename to lib/fog/dns/openstack/v1/requests/get_quota.rb index 38df7615a..ac9fe7c24 100644 --- a/lib/fog/openstack/dns/v1/requests/get_quota.rb +++ b/lib/fog/dns/openstack/v1/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V1 class Real def get_quota(project_id) diff --git a/lib/fog/openstack/dns/v1/requests/list_domains.rb b/lib/fog/dns/openstack/v1/requests/list_domains.rb similarity index 94% rename from lib/fog/openstack/dns/v1/requests/list_domains.rb rename to lib/fog/dns/openstack/v1/requests/list_domains.rb index 57e2db2c2..41cefa46c 100644 --- a/lib/fog/openstack/dns/v1/requests/list_domains.rb +++ b/lib/fog/dns/openstack/v1/requests/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V1 class Real def list_domains(options = {}) diff --git a/lib/fog/openstack/dns/v1/requests/update_quota.rb b/lib/fog/dns/openstack/v1/requests/update_quota.rb similarity index 95% rename from lib/fog/openstack/dns/v1/requests/update_quota.rb rename to lib/fog/dns/openstack/v1/requests/update_quota.rb index 0009f6e74..f19519163 100644 --- a/lib/fog/openstack/dns/v1/requests/update_quota.rb +++ b/lib/fog/dns/openstack/v1/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V1 class Real def update_quota(project_id, options = {}) diff --git a/lib/fog/openstack/dns/v2.rb b/lib/fog/dns/openstack/v2.rb similarity index 98% rename from lib/fog/openstack/dns/v2.rb rename to lib/fog/dns/openstack/v2.rb index 8be50f1d6..35cf9cfa3 100644 --- a/lib/fog/openstack/dns/v2.rb +++ b/lib/fog/dns/openstack/v2.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/dns/dns' +require 'fog/dns/openstack' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -18,7 +18,7 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - model_path 'fog/openstack/dns/v2/models' + model_path 'fog/dns/openstack/v2/models' model :zone collection :zones model :recordset @@ -30,7 +30,7 @@ class V2 < Fog::Service model :zone_transfer_accept collection :zone_transfer_accepts - request_path 'fog/openstack/dns/v2/requests' + request_path 'fog/dns/openstack/v2/requests' request :list_zones request :get_zone @@ -308,7 +308,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::DNS::NotFound + Fog::DNS::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/dns/v2/models/pool.rb b/lib/fog/dns/openstack/v2/models/pool.rb similarity index 92% rename from lib/fog/openstack/dns/v2/models/pool.rb rename to lib/fog/dns/openstack/v2/models/pool.rb index d390a4576..c9cd85ae7 100644 --- a/lib/fog/openstack/dns/v2/models/pool.rb +++ b/lib/fog/dns/openstack/v2/models/pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Pool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/dns/v2/models/pools.rb b/lib/fog/dns/openstack/v2/models/pools.rb similarity index 79% rename from lib/fog/openstack/dns/v2/models/pools.rb rename to lib/fog/dns/openstack/v2/models/pools.rb index 4c81a4118..bdf41c66b 100644 --- a/lib/fog/openstack/dns/v2/models/pools.rb +++ b/lib/fog/dns/openstack/v2/models/pools.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/dns/v2/models/pool' +require 'fog/dns/openstack/v2/models/pool' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Pools < Fog::OpenStack::Collection - model Fog::OpenStack::DNS::V2::Pool + model Fog::DNS::OpenStack::V2::Pool def all(options = {}) load_response(service.list_pools(options), 'pools') diff --git a/lib/fog/openstack/dns/v2/models/recordset.rb b/lib/fog/dns/openstack/v2/models/recordset.rb similarity index 97% rename from lib/fog/openstack/dns/v2/models/recordset.rb rename to lib/fog/dns/openstack/v2/models/recordset.rb index fca03eaf0..ad3f685ab 100644 --- a/lib/fog/openstack/dns/v2/models/recordset.rb +++ b/lib/fog/dns/openstack/v2/models/recordset.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Recordset < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/dns/v2/models/recordsets.rb b/lib/fog/dns/openstack/v2/models/recordsets.rb similarity index 83% rename from lib/fog/openstack/dns/v2/models/recordsets.rb rename to lib/fog/dns/openstack/v2/models/recordsets.rb index 293b56d29..ab6584b54 100644 --- a/lib/fog/openstack/dns/v2/models/recordsets.rb +++ b/lib/fog/dns/openstack/v2/models/recordsets.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/dns/v2/models/recordset' +require 'fog/dns/openstack/v2/models/recordset' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Recordsets < Fog::OpenStack::Collection - model Fog::OpenStack::DNS::V2::Recordset + model Fog::DNS::OpenStack::V2::Recordset def all(options = {}) load_response(service.list_recordsets(options), 'recordsets') diff --git a/lib/fog/openstack/dns/v2/models/zone.rb b/lib/fog/dns/openstack/v2/models/zone.rb similarity index 97% rename from lib/fog/openstack/dns/v2/models/zone.rb rename to lib/fog/dns/openstack/v2/models/zone.rb index 3fc16d48f..9e5fae992 100644 --- a/lib/fog/openstack/dns/v2/models/zone.rb +++ b/lib/fog/dns/openstack/v2/models/zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Zone < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb b/lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb similarity index 95% rename from lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb rename to lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb index 42931fc7f..3d27da7a7 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb +++ b/lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class ZoneTransferAccept < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb b/lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb similarity index 77% rename from lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb rename to lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb index 5a68159c7..2dceaa807 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb +++ b/lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/dns/v2/models/zone_transfer_accept' +require 'fog/dns/openstack/v2/models/zone_transfer_accept' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class ZoneTransferAccepts < Fog::OpenStack::Collection - model Fog::OpenStack::DNS::V2::ZoneTransferAccept + model Fog::DNS::OpenStack::V2::ZoneTransferAccept def all(options = {}) load_response(service.list_zone_transfer_accepts(options), 'transfer_accepts') diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb b/lib/fog/dns/openstack/v2/models/zone_transfer_request.rb similarity index 97% rename from lib/fog/openstack/dns/v2/models/zone_transfer_request.rb rename to lib/fog/dns/openstack/v2/models/zone_transfer_request.rb index 5610145d0..67c3b05ce 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb +++ b/lib/fog/dns/openstack/v2/models/zone_transfer_request.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class ZoneTransferRequest < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb b/lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb similarity index 80% rename from lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb rename to lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb index 66d4323b6..09da75767 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb +++ b/lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/dns/v2/models/zone_transfer_request' +require 'fog/dns/openstack/v2/models/zone_transfer_request' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class ZoneTransferRequests < Fog::OpenStack::Collection - model Fog::OpenStack::DNS::V2::ZoneTransferRequest + model Fog::DNS::OpenStack::V2::ZoneTransferRequest def all(options = {}) load_response(service.list_zone_transfer_requests(options), 'transfer_requests') diff --git a/lib/fog/openstack/dns/v2/models/zones.rb b/lib/fog/dns/openstack/v2/models/zones.rb similarity index 82% rename from lib/fog/openstack/dns/v2/models/zones.rb rename to lib/fog/dns/openstack/v2/models/zones.rb index 132cff248..150ee1135 100644 --- a/lib/fog/openstack/dns/v2/models/zones.rb +++ b/lib/fog/dns/openstack/v2/models/zones.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/dns/v2/models/zone' +require 'fog/dns/openstack/v2/models/zone' module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Zones < Fog::OpenStack::Collection - model Fog::OpenStack::DNS::V2::Zone + model Fog::DNS::OpenStack::V2::Zone def all(options = {}) load_response(service.list_zones(options), 'zones') diff --git a/lib/fog/openstack/dns/v2/requests/create_recordset.rb b/lib/fog/dns/openstack/v2/requests/create_recordset.rb similarity index 97% rename from lib/fog/openstack/dns/v2/requests/create_recordset.rb rename to lib/fog/dns/openstack/v2/requests/create_recordset.rb index d489b2698..fe508fe31 100644 --- a/lib/fog/openstack/dns/v2/requests/create_recordset.rb +++ b/lib/fog/dns/openstack/v2/requests/create_recordset.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def create_recordset(zone_id, name, type, records, options = {}) diff --git a/lib/fog/openstack/dns/v2/requests/create_zone.rb b/lib/fog/dns/openstack/v2/requests/create_zone.rb similarity index 97% rename from lib/fog/openstack/dns/v2/requests/create_zone.rb rename to lib/fog/dns/openstack/v2/requests/create_zone.rb index 311e72847..5346e8e89 100644 --- a/lib/fog/openstack/dns/v2/requests/create_zone.rb +++ b/lib/fog/dns/openstack/v2/requests/create_zone.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def create_zone(name, email, options = {}) diff --git a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb b/lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb similarity index 90% rename from lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb rename to lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb index 1b71288f3..1f7db40f2 100644 --- a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb +++ b/lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) @@ -9,7 +9,7 @@ def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) :zone_transfer_request_id => zone_transfer_request_id } - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :headers => headers, diff --git a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb b/lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb similarity index 96% rename from lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb rename to lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb index ba435a7ee..ce51ea8c8 100644 --- a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb +++ b/lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def create_zone_transfer_request(zone_id, options = {}) diff --git a/lib/fog/openstack/dns/v2/requests/delete_recordset.rb b/lib/fog/dns/openstack/v2/requests/delete_recordset.rb similarity index 91% rename from lib/fog/openstack/dns/v2/requests/delete_recordset.rb rename to lib/fog/dns/openstack/v2/requests/delete_recordset.rb index 4ea01a619..3a600ad48 100644 --- a/lib/fog/openstack/dns/v2/requests/delete_recordset.rb +++ b/lib/fog/dns/openstack/v2/requests/delete_recordset.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def delete_recordset(zone_id, id, options = {}) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 202, :method => 'DELETE', diff --git a/lib/fog/openstack/dns/v2/requests/delete_zone.rb b/lib/fog/dns/openstack/v2/requests/delete_zone.rb similarity index 89% rename from lib/fog/openstack/dns/v2/requests/delete_zone.rb rename to lib/fog/dns/openstack/v2/requests/delete_zone.rb index 566b8ed81..5574255a9 100644 --- a/lib/fog/openstack/dns/v2/requests/delete_zone.rb +++ b/lib/fog/dns/openstack/v2/requests/delete_zone.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def delete_zone(id, options = {}) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 202, :method => 'DELETE', diff --git a/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb b/lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb similarity index 94% rename from lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb rename to lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb index 957dc5f8b..c2b9799be 100644 --- a/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb +++ b/lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def delete_zone_transfer_request(zone_transfer_request_id) diff --git a/lib/fog/openstack/dns/v2/requests/get_pool.rb b/lib/fog/dns/openstack/v2/requests/get_pool.rb similarity index 86% rename from lib/fog/openstack/dns/v2/requests/get_pool.rb rename to lib/fog/dns/openstack/v2/requests/get_pool.rb index 780a6b19a..4a825b3f7 100644 --- a/lib/fog/openstack/dns/v2/requests/get_pool.rb +++ b/lib/fog/dns/openstack/v2/requests/get_pool.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def get_pool(id, options = {}) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/openstack/dns/v2/requests/get_quota.rb b/lib/fog/dns/openstack/v2/requests/get_quota.rb similarity index 86% rename from lib/fog/openstack/dns/v2/requests/get_quota.rb rename to lib/fog/dns/openstack/v2/requests/get_quota.rb index 584af54a8..3ad2f700f 100644 --- a/lib/fog/openstack/dns/v2/requests/get_quota.rb +++ b/lib/fog/dns/openstack/v2/requests/get_quota.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def get_quota(project_id = nil) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(:all_projects => !project_id.nil?) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(:all_projects => !project_id.nil?) request( :expects => 200, diff --git a/lib/fog/openstack/dns/v2/requests/get_recordset.rb b/lib/fog/dns/openstack/v2/requests/get_recordset.rb similarity index 91% rename from lib/fog/openstack/dns/v2/requests/get_recordset.rb rename to lib/fog/dns/openstack/v2/requests/get_recordset.rb index 2d8c64a60..2bc1dad50 100644 --- a/lib/fog/openstack/dns/v2/requests/get_recordset.rb +++ b/lib/fog/dns/openstack/v2/requests/get_recordset.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def get_recordset(zone_id, id, options = {}) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/openstack/dns/v2/requests/get_zone.rb b/lib/fog/dns/openstack/v2/requests/get_zone.rb similarity index 86% rename from lib/fog/openstack/dns/v2/requests/get_zone.rb rename to lib/fog/dns/openstack/v2/requests/get_zone.rb index ab0f42b8e..75ab7c2dc 100644 --- a/lib/fog/openstack/dns/v2/requests/get_zone.rb +++ b/lib/fog/dns/openstack/v2/requests/get_zone.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def get_zone(id, options = {}) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb b/lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb similarity index 95% rename from lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb rename to lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb index a4c57d490..36c69e021 100644 --- a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb +++ b/lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def get_zone_transfer_accept(zone_transfer_accept_id) diff --git a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb b/lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb similarity index 95% rename from lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb rename to lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb index d98e1a36a..33b138330 100644 --- a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb +++ b/lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def get_zone_transfer_request(zone_transfer_request_id) diff --git a/lib/fog/openstack/dns/v2/requests/list_pools.rb b/lib/fog/dns/openstack/v2/requests/list_pools.rb similarity index 85% rename from lib/fog/openstack/dns/v2/requests/list_pools.rb rename to lib/fog/dns/openstack/v2/requests/list_pools.rb index 5e30111e6..009e03372 100644 --- a/lib/fog/openstack/dns/v2/requests/list_pools.rb +++ b/lib/fog/dns/openstack/v2/requests/list_pools.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def list_pools(options = {}) - headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/openstack/dns/v2/requests/list_recordsets.rb b/lib/fog/dns/openstack/v2/requests/list_recordsets.rb similarity index 94% rename from lib/fog/openstack/dns/v2/requests/list_recordsets.rb rename to lib/fog/dns/openstack/v2/requests/list_recordsets.rb index 8f46c4d17..d67bf213c 100644 --- a/lib/fog/openstack/dns/v2/requests/list_recordsets.rb +++ b/lib/fog/dns/openstack/v2/requests/list_recordsets.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def list_recordsets(zone_id = nil, options = {}) @@ -19,7 +19,7 @@ def list_recordsets(zone_id = nil, options = {}) zone_id = options.delete(:zone_id) if zone_id.nil? path = zone_id.nil? ? 'recordsets' : "zones/#{zone_id}/recordsets" - headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb b/lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb similarity index 94% rename from lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb rename to lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb index d326b401f..09e96e807 100644 --- a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb +++ b/lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def list_zone_transfer_accepts(options={}) diff --git a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb b/lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb similarity index 94% rename from lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb rename to lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb index 8357c0f86..4c3d8a635 100644 --- a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb +++ b/lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def list_zone_transfer_requests(options={}) diff --git a/lib/fog/openstack/dns/v2/requests/list_zones.rb b/lib/fog/dns/openstack/v2/requests/list_zones.rb similarity index 85% rename from lib/fog/openstack/dns/v2/requests/list_zones.rb rename to lib/fog/dns/openstack/v2/requests/list_zones.rb index 498494700..9f0a54173 100644 --- a/lib/fog/openstack/dns/v2/requests/list_zones.rb +++ b/lib/fog/dns/openstack/v2/requests/list_zones.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def list_zones(options = {}) - headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/openstack/dns/v2/requests/update_quota.rb b/lib/fog/dns/openstack/v2/requests/update_quota.rb similarity index 89% rename from lib/fog/openstack/dns/v2/requests/update_quota.rb rename to lib/fog/dns/openstack/v2/requests/update_quota.rb index 3431c7988..bacac48cd 100644 --- a/lib/fog/openstack/dns/v2/requests/update_quota.rb +++ b/lib/fog/dns/openstack/v2/requests/update_quota.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def update_quota(project_id, options = {}) - headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/openstack/dns/v2/requests/update_recordset.rb b/lib/fog/dns/openstack/v2/requests/update_recordset.rb similarity index 92% rename from lib/fog/openstack/dns/v2/requests/update_recordset.rb rename to lib/fog/dns/openstack/v2/requests/update_recordset.rb index 654c4e2cd..460753d92 100644 --- a/lib/fog/openstack/dns/v2/requests/update_recordset.rb +++ b/lib/fog/dns/openstack/v2/requests/update_recordset.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def update_recordset(zone_id, id, options = {}) - headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/openstack/dns/v2/requests/update_zone.rb b/lib/fog/dns/openstack/v2/requests/update_zone.rb similarity index 91% rename from lib/fog/openstack/dns/v2/requests/update_zone.rb rename to lib/fog/dns/openstack/v2/requests/update_zone.rb index 345eaeab6..d592a1911 100644 --- a/lib/fog/openstack/dns/v2/requests/update_zone.rb +++ b/lib/fog/dns/openstack/v2/requests/update_zone.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def update_zone(id, options = {}) - headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) + headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb b/lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb similarity index 97% rename from lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb rename to lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb index 61980f621..bf99ca8c7 100644 --- a/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb +++ b/lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class DNS + module DNS + class OpenStack class V2 class Real def update_zone_transfer_request(zone_transfer_request_id,description,options={}) diff --git a/lib/fog/openstack/event/event.rb b/lib/fog/event/openstack.rb similarity index 93% rename from lib/fog/openstack/event/event.rb rename to lib/fog/event/openstack.rb index b03b41593..5317ecacd 100644 --- a/lib/fog/openstack/event/event.rb +++ b/lib/fog/event/openstack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Event < Fog::Service + module Event + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v2/ requires :openstack_auth_url @@ -15,12 +15,12 @@ class Event < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/event/models' + model_path 'fog/event/openstack/models' model :event collection :events - request_path 'fog/openstack/event/requests' + request_path 'fog/event/openstack/requests' request :get_event request :list_events @@ -85,7 +85,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Event::NotFound + Fog::Event::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/event/models/event.rb b/lib/fog/event/openstack/models/event.rb similarity index 88% rename from lib/fog/openstack/event/models/event.rb rename to lib/fog/event/openstack/models/event.rb index 29c04a05a..fffa54856 100644 --- a/lib/fog/openstack/event/models/event.rb +++ b/lib/fog/event/openstack/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Event + module Event + class OpenStack class Event < Fog::OpenStack::Model identity :message_id diff --git a/lib/fog/openstack/event/models/events.rb b/lib/fog/event/openstack/models/events.rb similarity index 67% rename from lib/fog/openstack/event/models/events.rb rename to lib/fog/event/openstack/models/events.rb index d8680c0b1..4dace3546 100644 --- a/lib/fog/openstack/event/models/events.rb +++ b/lib/fog/event/openstack/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/event/models/event' +require 'fog/event/openstack/models/event' module Fog - module OpenStack - class Event + module Event + class OpenStack class Events < Fog::OpenStack::Collection - model Fog::OpenStack::Event::Event + model Fog::Event::OpenStack::Event def all(q = []) load_response(service.list_events(q)) @@ -14,7 +14,7 @@ def all(q = []) def find_by_id(message_id) event = service.get_event(message_id).body new(event) - rescue Fog::OpenStack::Event::NotFound + rescue Fog::Event::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/event/requests/get_event.rb b/lib/fog/event/openstack/requests/get_event.rb similarity index 94% rename from lib/fog/openstack/event/requests/get_event.rb rename to lib/fog/event/openstack/requests/get_event.rb index 86c28f7e6..04bb58c66 100644 --- a/lib/fog/openstack/event/requests/get_event.rb +++ b/lib/fog/event/openstack/requests/get_event.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Event + module Event + class OpenStack class Real def get_event(message_id) request( diff --git a/lib/fog/openstack/event/requests/list_events.rb b/lib/fog/event/openstack/requests/list_events.rb similarity index 96% rename from lib/fog/openstack/event/requests/list_events.rb rename to lib/fog/event/openstack/requests/list_events.rb index 8172f75f8..679a3586f 100644 --- a/lib/fog/openstack/event/requests/list_events.rb +++ b/lib/fog/event/openstack/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Event + module Event + class OpenStack class Real def list_events(options = []) data = { diff --git a/lib/fog/openstack/identity/identity.rb b/lib/fog/identity/openstack.rb similarity index 85% rename from lib/fog/openstack/identity/identity.rb rename to lib/fog/identity/openstack.rb index cdbd4fca6..f657f6be4 100644 --- a/lib/fog/openstack/identity/identity.rb +++ b/lib/fog/identity/openstack.rb @@ -1,8 +1,8 @@ module Fog - module OpenStack - class Identity < Fog::Service - autoload :V2, 'fog/openstack/identity/v2' - autoload :V3, 'fog/openstack/identity/v3' + module Identity + class OpenStack < Fog::Service + autoload :V2, 'fog/identity/openstack/v2' + autoload :V3, 'fog/identity/openstack/v3' def self.new(args = {}) version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i @@ -25,9 +25,9 @@ def self.new(args = {}) case version when '2.0' - Fog::OpenStack::Identity::V2.new(args) + Fog::Identity::OpenStack::V2.new(args) else - Fog::OpenStack::Identity::V3.new(args) + Fog::Identity::OpenStack::V3.new(args) end end @@ -44,7 +44,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Identity::NotFound + Fog::Identity::OpenStack::NotFound end def config_service? diff --git a/lib/fog/openstack/identity/v2.rb b/lib/fog/identity/openstack/v2.rb similarity index 96% rename from lib/fog/openstack/identity/v2.rb rename to lib/fog/identity/openstack/v2.rb index 0ec570f2d..0eedb7b53 100644 --- a/lib/fog/openstack/identity/v2.rb +++ b/lib/fog/identity/openstack/v2.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/identity/identity' +require 'fog/identity/openstack' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -16,7 +16,7 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :no_path_prefix - model_path 'fog/openstack/identity/v2/models' + model_path 'fog/identity/openstack/v2/models' model :tenant collection :tenants model :user @@ -26,7 +26,7 @@ class V2 < Fog::Service model :ec2_credential collection :ec2_credentials - request_path 'fog/openstack/identity/v2/requests' + request_path 'fog/identity/openstack/v2/requests' request :check_token request :validate_token @@ -168,7 +168,7 @@ def credentials end end - class Real < Fog::OpenStack::Identity::Real + class Real < Fog::Identity::OpenStack::Real def initialize(args) @path_prefix = if args[:no_path_prefix] '' diff --git a/lib/fog/openstack/identity/v2/models/ec2_credential.rb b/lib/fog/identity/openstack/v2/models/ec2_credential.rb similarity index 95% rename from lib/fog/openstack/identity/v2/models/ec2_credential.rb rename to lib/fog/identity/openstack/v2/models/ec2_credential.rb index 705022df7..5b3098786 100644 --- a/lib/fog/openstack/identity/v2/models/ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/models/ec2_credential.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Ec2Credential < Fog::OpenStack::Model identity :access, :aliases => 'access_key' diff --git a/lib/fog/openstack/identity/v2/models/ec2_credentials.rb b/lib/fog/identity/openstack/v2/models/ec2_credentials.rb similarity index 85% rename from lib/fog/openstack/identity/v2/models/ec2_credentials.rb rename to lib/fog/identity/openstack/v2/models/ec2_credentials.rb index 8036608ab..f9d92bc33 100644 --- a/lib/fog/openstack/identity/v2/models/ec2_credentials.rb +++ b/lib/fog/identity/openstack/v2/models/ec2_credentials.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v2/models/ec2_credential' +require 'fog/identity/openstack/v2/models/ec2_credential' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Ec2Credentials < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V2::Ec2Credential + model Fog::Identity::OpenStack::V2::Ec2Credential attribute :user @@ -44,7 +44,7 @@ def find_by_access_key(access_key) body = response.body['credential'] body = body.merge 'service' => service - ec2_credential = Fog::OpenStack::Identity::V2::EC2Credential.new(body) + ec2_credential = Fog::Identity::OpenStack::V2::EC2Credential.new(body) end ec2_credential diff --git a/lib/fog/openstack/identity/v2/models/role.rb b/lib/fog/identity/openstack/v2/models/role.rb similarity index 97% rename from lib/fog/openstack/identity/v2/models/role.rb rename to lib/fog/identity/openstack/v2/models/role.rb index 3d428b556..683d701f3 100644 --- a/lib/fog/openstack/identity/v2/models/role.rb +++ b/lib/fog/identity/openstack/v2/models/role.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Role < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v2/models/roles.rb b/lib/fog/identity/openstack/v2/models/roles.rb similarity index 71% rename from lib/fog/openstack/identity/v2/models/roles.rb rename to lib/fog/identity/openstack/v2/models/roles.rb index 4da71e466..893cbe266 100644 --- a/lib/fog/openstack/identity/v2/models/roles.rb +++ b/lib/fog/identity/openstack/v2/models/roles.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v2/models/role' +require 'fog/identity/openstack/v2/models/role' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Roles < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V2::Role + model Fog::Identity::OpenStack::V2::Role def all(options = {}) load_response(service.list_roles(options), 'roles') diff --git a/lib/fog/openstack/identity/v2/models/tenant.rb b/lib/fog/identity/openstack/v2/models/tenant.rb similarity index 97% rename from lib/fog/openstack/identity/v2/models/tenant.rb rename to lib/fog/identity/openstack/v2/models/tenant.rb index 280bbfb36..c24c7e022 100644 --- a/lib/fog/openstack/identity/v2/models/tenant.rb +++ b/lib/fog/identity/openstack/v2/models/tenant.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Tenant < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v2/models/tenants.rb b/lib/fog/identity/openstack/v2/models/tenants.rb similarity index 77% rename from lib/fog/openstack/identity/v2/models/tenants.rb rename to lib/fog/identity/openstack/v2/models/tenants.rb index d779676ef..e74a16bb5 100644 --- a/lib/fog/openstack/identity/v2/models/tenants.rb +++ b/lib/fog/identity/openstack/v2/models/tenants.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v2/models/tenant' +require 'fog/identity/openstack/v2/models/tenant' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Tenants < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V2::Tenant + model Fog::Identity::OpenStack::V2::Tenant def all(options = {}) load_response(service.list_tenants(options), 'tenants') @@ -16,7 +16,7 @@ def find_by_id(id) cached_tenant = find { |tenant| tenant.id == id } return cached_tenant if cached_tenant tenant_hash = service.get_tenant(id).body['tenant'] - Fog::OpenStack::Identity::V2::Tenant.new( + Fog::Identity::OpenStack::V2::Tenant.new( tenant_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v2/models/user.rb b/lib/fog/identity/openstack/v2/models/user.rb similarity index 97% rename from lib/fog/openstack/identity/v2/models/user.rb rename to lib/fog/identity/openstack/v2/models/user.rb index df4740127..da35cb819 100644 --- a/lib/fog/openstack/identity/v2/models/user.rb +++ b/lib/fog/identity/openstack/v2/models/user.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class User < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v2/models/users.rb b/lib/fog/identity/openstack/v2/models/users.rb similarity index 78% rename from lib/fog/openstack/identity/v2/models/users.rb rename to lib/fog/identity/openstack/v2/models/users.rb index 7aa1f67de..40c17d228 100644 --- a/lib/fog/openstack/identity/v2/models/users.rb +++ b/lib/fog/identity/openstack/v2/models/users.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v2/models/user' +require 'fog/identity/openstack/v2/models/user' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Users < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V2::User + model Fog::Identity::OpenStack::V2::User attribute :tenant_id @@ -18,7 +18,7 @@ def all(options = {}) def find_by_id(id) find { |user| user.id == id } || - Fog::OpenStack::Identity::V2::User.new( + Fog::Identity::OpenStack::V2::User.new( service.get_user_by_id(id).body['user'].merge( 'service' => service ) @@ -27,7 +27,7 @@ def find_by_id(id) def find_by_name(name) find { |user| user.name == name } || - Fog::OpenStack::Identity::V2::User.new( + Fog::Identity::OpenStack::V2::User.new( service.get_user_by_name(name).body['user'].merge( 'service' => service ) diff --git a/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb b/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb similarity index 96% rename from lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb rename to lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb index 4674a5ed6..3926b7e1e 100644 --- a/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def add_user_to_tenant(tenant_id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v2/requests/check_token.rb b/lib/fog/identity/openstack/v2/requests/check_token.rb similarity index 92% rename from lib/fog/openstack/identity/v2/requests/check_token.rb rename to lib/fog/identity/openstack/v2/requests/check_token.rb index 15b234fe8..cf38bdb70 100644 --- a/lib/fog/openstack/identity/v2/requests/check_token.rb +++ b/lib/fog/identity/openstack/v2/requests/check_token.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def check_token(token_id, tenant_id = nil) diff --git a/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb b/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb similarity index 97% rename from lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb rename to lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb index ffe19f619..ee014ae26 100644 --- a/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real ## diff --git a/lib/fog/openstack/identity/v2/requests/create_role.rb b/lib/fog/identity/openstack/v2/requests/create_role.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/create_role.rb rename to lib/fog/identity/openstack/v2/requests/create_role.rb index 5a4ef4fce..dcf1bf80f 100644 --- a/lib/fog/openstack/identity/v2/requests/create_role.rb +++ b/lib/fog/identity/openstack/v2/requests/create_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def create_role(name) diff --git a/lib/fog/openstack/identity/v2/requests/create_tenant.rb b/lib/fog/identity/openstack/v2/requests/create_tenant.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/create_tenant.rb rename to lib/fog/identity/openstack/v2/requests/create_tenant.rb index cabb9f37f..ee1a49860 100644 --- a/lib/fog/openstack/identity/v2/requests/create_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/create_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def create_tenant(attributes) diff --git a/lib/fog/openstack/identity/v2/requests/create_user.rb b/lib/fog/identity/openstack/v2/requests/create_user.rb similarity index 96% rename from lib/fog/openstack/identity/v2/requests/create_user.rb rename to lib/fog/identity/openstack/v2/requests/create_user.rb index bf1c5b256..7f13f337c 100644 --- a/lib/fog/openstack/identity/v2/requests/create_user.rb +++ b/lib/fog/identity/openstack/v2/requests/create_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def create_user(name, password, email, tenantId = nil, enabled = true) diff --git a/lib/fog/openstack/identity/v2/requests/create_user_role.rb b/lib/fog/identity/openstack/v2/requests/create_user_role.rb similarity index 93% rename from lib/fog/openstack/identity/v2/requests/create_user_role.rb rename to lib/fog/identity/openstack/v2/requests/create_user_role.rb index 9a5e3c07c..b56f2fc22 100644 --- a/lib/fog/openstack/identity/v2/requests/create_user_role.rb +++ b/lib/fog/identity/openstack/v2/requests/create_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def create_user_role(tenant_id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb b/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb similarity index 91% rename from lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb rename to lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb index 9fc30ca5e..b487feee1 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real ## @@ -27,7 +27,7 @@ def delete_ec2_credential(user_id, access) class Mock def delete_ec2_credential(user_id, access) - raise Fog::OpenStack::Identity::NotFound unless data[:ec2_credentials][user_id][access] + raise Fog::Identity::OpenStack::NotFound unless data[:ec2_credentials][user_id][access] data[:ec2_credentials][user_id].delete access diff --git a/lib/fog/openstack/identity/v2/requests/delete_role.rb b/lib/fog/identity/openstack/v2/requests/delete_role.rb similarity index 86% rename from lib/fog/openstack/identity/v2/requests/delete_role.rb rename to lib/fog/identity/openstack/v2/requests/delete_role.rb index aecf3f2d9..28d36ee24 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_role.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def delete_role(role_id) @@ -20,7 +20,7 @@ def delete_role(role_id) response.status = 204 response else - raise Fog::OpenStack::Identity::NotFound + raise Fog::Identity::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/identity/v2/requests/delete_tenant.rb b/lib/fog/identity/openstack/v2/requests/delete_tenant.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/delete_tenant.rb rename to lib/fog/identity/openstack/v2/requests/delete_tenant.rb index e187d8438..c7410624b 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def delete_tenant(id) diff --git a/lib/fog/openstack/identity/v2/requests/delete_user.rb b/lib/fog/identity/openstack/v2/requests/delete_user.rb similarity index 87% rename from lib/fog/openstack/identity/v2/requests/delete_user.rb rename to lib/fog/identity/openstack/v2/requests/delete_user.rb index 3ccfcb258..1413c7655 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_user.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def delete_user(user_id) @@ -22,7 +22,7 @@ def delete_user(user_id) response.status = 204 response rescue - raise Fog::OpenStack::Identity::NotFound + raise Fog::Identity::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/identity/v2/requests/delete_user_role.rb b/lib/fog/identity/openstack/v2/requests/delete_user_role.rb similarity index 93% rename from lib/fog/openstack/identity/v2/requests/delete_user_role.rb rename to lib/fog/identity/openstack/v2/requests/delete_user_role.rb index 2f6a477d8..a9f9a45d7 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_user_role.rb +++ b/lib/fog/identity/openstack/v2/requests/delete_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def delete_user_role(tenant_id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb b/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb similarity index 94% rename from lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb rename to lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb index 800d04791..e7eed8295 100644 --- a/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb +++ b/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real ## @@ -28,7 +28,7 @@ def get_ec2_credential(user_id, access) :path => "users/#{user_id}/credentials/OS-EC2/#{access}" ) rescue Excon::Errors::Unauthorized - raise Fog::OpenStack::Identity::NotFound + raise Fog::Identity::OpenStack::NotFound end end diff --git a/lib/fog/openstack/identity/v2/requests/get_role.rb b/lib/fog/identity/openstack/v2/requests/get_role.rb similarity index 86% rename from lib/fog/openstack/identity/v2/requests/get_role.rb rename to lib/fog/identity/openstack/v2/requests/get_role.rb index defaac045..4ec42ef01 100644 --- a/lib/fog/openstack/identity/v2/requests/get_role.rb +++ b/lib/fog/identity/openstack/v2/requests/get_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def get_role(id) @@ -20,7 +20,7 @@ def get_role(id) response.body = {'role' => data} response else - raise Fog::OpenStack::Identity::NotFound + raise Fog::Identity::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/identity/v2/requests/get_tenant.rb b/lib/fog/identity/openstack/v2/requests/get_tenant.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/get_tenant.rb rename to lib/fog/identity/openstack/v2/requests/get_tenant.rb index 6b2676cdd..0a57bd7f8 100644 --- a/lib/fog/openstack/identity/v2/requests/get_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/get_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def get_tenant(id) diff --git a/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb b/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb similarity index 89% rename from lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb rename to lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb index df4a0fa03..7018ceaba 100644 --- a/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb +++ b/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def get_tenants_by_id(tenant_id) diff --git a/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb b/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb similarity index 89% rename from lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb rename to lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb index bdbefb7a8..c03b29d7d 100644 --- a/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb +++ b/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def get_tenants_by_name(name) diff --git a/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb b/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/get_user_by_id.rb rename to lib/fog/identity/openstack/v2/requests/get_user_by_id.rb index e8fbbb205..72bf390e9 100644 --- a/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb +++ b/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def get_user_by_id(user_id) diff --git a/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb b/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb similarity index 94% rename from lib/fog/openstack/identity/v2/requests/get_user_by_name.rb rename to lib/fog/identity/openstack/v2/requests/get_user_by_name.rb index 79233d995..d283d9167 100644 --- a/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb +++ b/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def get_user_by_name(name) diff --git a/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb b/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb similarity index 98% rename from lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb rename to lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb index 9277676df..e830a8222 100644 --- a/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb +++ b/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real ## diff --git a/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb b/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb similarity index 90% rename from lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb rename to lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb index c4fc28bd4..7d4c410c5 100644 --- a/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb +++ b/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def list_endpoints_for_token(token_id) diff --git a/lib/fog/openstack/identity/v2/requests/list_roles.rb b/lib/fog/identity/openstack/v2/requests/list_roles.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/list_roles.rb rename to lib/fog/identity/openstack/v2/requests/list_roles.rb index ee55cc72d..99332ebd3 100644 --- a/lib/fog/openstack/identity/v2/requests/list_roles.rb +++ b/lib/fog/identity/openstack/v2/requests/list_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def list_roles(options = {}) diff --git a/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb b/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb similarity index 95% rename from lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb rename to lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb index 3acfade1f..504b63d5c 100644 --- a/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def list_roles_for_user_on_tenant(tenant_id, user_id) diff --git a/lib/fog/openstack/identity/v2/requests/list_tenants.rb b/lib/fog/identity/openstack/v2/requests/list_tenants.rb similarity index 97% rename from lib/fog/openstack/identity/v2/requests/list_tenants.rb rename to lib/fog/identity/openstack/v2/requests/list_tenants.rb index bec98c056..015549631 100644 --- a/lib/fog/openstack/identity/v2/requests/list_tenants.rb +++ b/lib/fog/identity/openstack/v2/requests/list_tenants.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def list_tenants(options = nil, marker = nil) diff --git a/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb b/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb similarity index 89% rename from lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb rename to lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb index 2b3d493ac..c8f618b1d 100644 --- a/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb +++ b/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def list_user_global_roles(user_id) diff --git a/lib/fog/openstack/identity/v2/requests/list_users.rb b/lib/fog/identity/openstack/v2/requests/list_users.rb similarity index 96% rename from lib/fog/openstack/identity/v2/requests/list_users.rb rename to lib/fog/identity/openstack/v2/requests/list_users.rb index 55305f221..e57efdc71 100644 --- a/lib/fog/openstack/identity/v2/requests/list_users.rb +++ b/lib/fog/identity/openstack/v2/requests/list_users.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def list_users(options = {}) diff --git a/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb b/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb similarity index 92% rename from lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb rename to lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb index 8814dc518..d68ad4f54 100644 --- a/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def remove_user_from_tenant(tenant_id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v2/requests/set_tenant.rb b/lib/fog/identity/openstack/v2/requests/set_tenant.rb similarity index 90% rename from lib/fog/openstack/identity/v2/requests/set_tenant.rb rename to lib/fog/identity/openstack/v2/requests/set_tenant.rb index 7827c63dd..4beb72e84 100644 --- a/lib/fog/openstack/identity/v2/requests/set_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def set_tenant(tenant) diff --git a/lib/fog/openstack/identity/v2/requests/update_tenant.rb b/lib/fog/identity/openstack/v2/requests/update_tenant.rb similarity index 94% rename from lib/fog/openstack/identity/v2/requests/update_tenant.rb rename to lib/fog/identity/openstack/v2/requests/update_tenant.rb index 956b8fd01..e24a8d90d 100644 --- a/lib/fog/openstack/identity/v2/requests/update_tenant.rb +++ b/lib/fog/identity/openstack/v2/requests/update_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def update_tenant(id, attributes) diff --git a/lib/fog/openstack/identity/v2/requests/update_user.rb b/lib/fog/identity/openstack/v2/requests/update_user.rb similarity index 89% rename from lib/fog/openstack/identity/v2/requests/update_user.rb rename to lib/fog/identity/openstack/v2/requests/update_user.rb index 0d8622d1d..67709eb43 100644 --- a/lib/fog/openstack/identity/v2/requests/update_user.rb +++ b/lib/fog/identity/openstack/v2/requests/update_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def update_user(user_id, options = {}) @@ -24,7 +24,7 @@ def update_user(user_id, options) response.status = 200 response else - raise Fog::OpenStack::Identity::NotFound + raise Fog::Identity::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/identity/v2/requests/validate_token.rb b/lib/fog/identity/openstack/v2/requests/validate_token.rb similarity index 92% rename from lib/fog/openstack/identity/v2/requests/validate_token.rb rename to lib/fog/identity/openstack/v2/requests/validate_token.rb index a7d4a1cb7..c278558a6 100644 --- a/lib/fog/openstack/identity/v2/requests/validate_token.rb +++ b/lib/fog/identity/openstack/v2/requests/validate_token.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V2 class Real def validate_token(token_id, tenant_id = nil) diff --git a/lib/fog/openstack/identity/v3.rb b/lib/fog/identity/openstack/v3.rb similarity index 95% rename from lib/fog/openstack/identity/v3.rb rename to lib/fog/identity/openstack/v3.rb index 61da21d23..86d5345fa 100644 --- a/lib/fog/openstack/identity/v3.rb +++ b/lib/fog/identity/openstack/v3.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/identity/identity' +require 'fog/identity/openstack' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, @@ -15,7 +15,7 @@ class V3 < Fog::Service :current_user, :current_user_id, :current_tenant, :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix - model_path 'fog/openstack/identity/v3/models' + model_path 'fog/identity/openstack/v3/models' model :domain collection :domains model :endpoint @@ -39,7 +39,7 @@ class V3 < Fog::Service model :policy collection :policies - request_path 'fog/openstack/identity/v3/requests' + request_path 'fog/identity/openstack/v3/requests' request :list_users request :get_user @@ -141,7 +141,7 @@ def self.get_api_version(uri, connection_options = {}) version end - class Real < Fog::OpenStack::Identity::Real + class Real < Fog::Identity::OpenStack::Real def initialize(args) @path_prefix = if args[:no_path_prefix] '' diff --git a/lib/fog/openstack/identity/v3/models/domain.rb b/lib/fog/identity/openstack/v3/models/domain.rb similarity index 96% rename from lib/fog/openstack/identity/v3/models/domain.rb rename to lib/fog/identity/openstack/v3/models/domain.rb index fda46d176..7c182b7b1 100644 --- a/lib/fog/openstack/identity/v3/models/domain.rb +++ b/lib/fog/identity/openstack/v3/models/domain.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Domain < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v3/models/domains.rb b/lib/fog/identity/openstack/v3/models/domains.rb similarity index 76% rename from lib/fog/openstack/identity/v3/models/domains.rb rename to lib/fog/identity/openstack/v3/models/domains.rb index 43d33c12f..58c02e2be 100644 --- a/lib/fog/openstack/identity/v3/models/domains.rb +++ b/lib/fog/identity/openstack/v3/models/domains.rb @@ -1,26 +1,26 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/domain' +require 'fog/identity/openstack/v3/models/domain' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Domains < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Domain + model Fog::Identity::OpenStack::V3::Domain def all(options = {}) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, + cached_domain, expires = Fog::Identity::OpenStack::V3::Domain.cache[{:token => service.auth_token, :options => options}] return cached_domain if cached_domain && expires > Time.now end domain_to_cache = load_response(service.list_domains(options), 'domains') if service.openstack_cache_ttl > 0 - cache = Fog::OpenStack::Identity::V3::Domain.cache + cache = Fog::Identity::OpenStack::V3::Domain.cache cache[{:token => service.auth_token, :options => options}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] - Fog::OpenStack::Identity::V3::Domain.cache = cache + Fog::Identity::OpenStack::V3::Domain.cache = cache end domain_to_cache end @@ -35,19 +35,19 @@ def auth_domains(options = {}) def find_by_id(id) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, + cached_domain, expires = Fog::Identity::OpenStack::V3::Domain.cache[{:token => service.auth_token, :id => id}] return cached_domain if cached_domain && expires > Time.now end domain_hash = service.get_domain(id).body['domain'] - domain_to_cache = Fog::OpenStack::Identity::V3::Domain.new( + domain_to_cache = Fog::Identity::OpenStack::V3::Domain.new( domain_hash.merge(:service => service) ) if service.openstack_cache_ttl > 0 - cache = Fog::OpenStack::Identity::V3::Domain.cache + cache = Fog::Identity::OpenStack::V3::Domain.cache cache[{:token => service.auth_token, :id => id}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] - Fog::OpenStack::Identity::V3::Domain.cache = cache + Fog::Identity::OpenStack::V3::Domain.cache = cache end domain_to_cache end diff --git a/lib/fog/openstack/identity/v3/models/endpoint.rb b/lib/fog/identity/openstack/v3/models/endpoint.rb similarity index 96% rename from lib/fog/openstack/identity/v3/models/endpoint.rb rename to lib/fog/identity/openstack/v3/models/endpoint.rb index 1d735187b..5b71e7103 100644 --- a/lib/fog/openstack/identity/v3/models/endpoint.rb +++ b/lib/fog/identity/openstack/v3/models/endpoint.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Endpoint < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v3/models/endpoints.rb b/lib/fog/identity/openstack/v3/models/endpoints.rb similarity index 74% rename from lib/fog/openstack/identity/v3/models/endpoints.rb rename to lib/fog/identity/openstack/v3/models/endpoints.rb index 4351b5984..3ba08aaf9 100644 --- a/lib/fog/openstack/identity/v3/models/endpoints.rb +++ b/lib/fog/identity/openstack/v3/models/endpoints.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/service' +require 'fog/identity/openstack/v3/models/service' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Endpoints < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Endpoint + model Fog::Identity::OpenStack::V3::Endpoint def all(options = {}) load_response(service.list_endpoints(options), 'endpoints') @@ -16,7 +16,7 @@ def find_by_id(id) cached_endpoint = find { |endpoint| endpoint.id == id } return cached_endpoint if cached_endpoint endpoint_hash = service.get_endpoint(id).body['endpoint'] - Fog::OpenStack::Identity::V3::Endpoint.new( + Fog::Identity::OpenStack::V3::Endpoint.new( endpoint_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/models/group.rb b/lib/fog/identity/openstack/v3/models/group.rb similarity index 93% rename from lib/fog/openstack/identity/v3/models/group.rb rename to lib/fog/identity/openstack/v3/models/group.rb index 46b7c7a00..7448ec376 100644 --- a/lib/fog/openstack/identity/v3/models/group.rb +++ b/lib/fog/identity/openstack/v3/models/group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Group < Fog::OpenStack::Model identity :id @@ -52,7 +52,7 @@ def contains_user?(user_id) requires :id begin service.group_user_check(id, user_id) - rescue Fog::OpenStack::Identity::NotFound + rescue Fog::Identity::OpenStack::NotFound return false end true @@ -72,7 +72,7 @@ def check_role(role_id) requires :id, :domain_id begin service.check_domain_group_role(domain_id, id, role_id) - rescue Fog::OpenStack::Identity::NotFound + rescue Fog::Identity::OpenStack::NotFound return false end true diff --git a/lib/fog/openstack/identity/v3/models/groups.rb b/lib/fog/identity/openstack/v3/models/groups.rb similarity index 77% rename from lib/fog/openstack/identity/v3/models/groups.rb rename to lib/fog/identity/openstack/v3/models/groups.rb index 9af758aae..8185e1c9f 100644 --- a/lib/fog/openstack/identity/v3/models/groups.rb +++ b/lib/fog/identity/openstack/v3/models/groups.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/group' +require 'fog/identity/openstack/v3/models/group' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Groups < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Group + model Fog::Identity::OpenStack::V3::Group def all(options = {}) load_response(service.list_groups(options), 'groups') @@ -16,7 +16,7 @@ def find_by_id(id) cached_group = find { |group| group.id == id } return cached_group if cached_group group_hash = service.get_group(id).body['group'] - Fog::OpenStack::Identity::V3.group.new( + Fog::Identity::OpenStack::V3.group.new( group_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/models/os_credential.rb b/lib/fog/identity/openstack/v3/models/os_credential.rb similarity index 97% rename from lib/fog/openstack/identity/v3/models/os_credential.rb rename to lib/fog/identity/openstack/v3/models/os_credential.rb index 70efbf741..0b84470e8 100644 --- a/lib/fog/openstack/identity/v3/models/os_credential.rb +++ b/lib/fog/identity/openstack/v3/models/os_credential.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class OsCredential < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v3/models/os_credentials.rb b/lib/fog/identity/openstack/v3/models/os_credentials.rb similarity index 77% rename from lib/fog/openstack/identity/v3/models/os_credentials.rb rename to lib/fog/identity/openstack/v3/models/os_credentials.rb index afa764fdd..b8de44bde 100644 --- a/lib/fog/openstack/identity/v3/models/os_credentials.rb +++ b/lib/fog/identity/openstack/v3/models/os_credentials.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/os_credential' +require 'fog/identity/openstack/v3/models/os_credential' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class OsCredentials < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::OsCredential + model Fog::Identity::OpenStack::V3::OsCredential def all(options = {}) load_response(service.list_os_credentials(options), 'credentials') @@ -16,7 +16,7 @@ def find_by_id(id) cached_credential = find { |credential| credential.id == id } return cached_credential if cached_credential credential_hash = service.get_os_credential(id).body['credential'] - Fog::OpenStack::Identity::V3::Credential.new( + Fog::Identity::OpenStack::V3::Credential.new( credential_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/models/policies.rb b/lib/fog/identity/openstack/v3/models/policies.rb similarity index 77% rename from lib/fog/openstack/identity/v3/models/policies.rb rename to lib/fog/identity/openstack/v3/models/policies.rb index 9641bc30a..08dce3d0e 100644 --- a/lib/fog/openstack/identity/v3/models/policies.rb +++ b/lib/fog/identity/openstack/v3/models/policies.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/policy' +require 'fog/identity/openstack/v3/models/policy' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Policies < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Policy + model Fog::Identity::OpenStack::V3::Policy def all(options = {}) load_response(service.list_policies(options), 'policies') @@ -16,7 +16,7 @@ def find_by_id(id) cached_policy = find { |policy| policy.id == id } return cached_policy if cached_policy policy_hash = service.get_policy(id).body['policy'] - Fog::OpenStack::Identity::V3::Policy.new( + Fog::Identity::OpenStack::V3::Policy.new( policy_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/models/policy.rb b/lib/fog/identity/openstack/v3/models/policy.rb similarity index 95% rename from lib/fog/openstack/identity/v3/models/policy.rb rename to lib/fog/identity/openstack/v3/models/policy.rb index a642994a0..e136c6312 100644 --- a/lib/fog/openstack/identity/v3/models/policy.rb +++ b/lib/fog/identity/openstack/v3/models/policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Policy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v3/models/project.rb b/lib/fog/identity/openstack/v3/models/project.rb similarity index 94% rename from lib/fog/openstack/identity/v3/models/project.rb rename to lib/fog/identity/openstack/v3/models/project.rb index 5abcc3dca..b3d53ddb3 100644 --- a/lib/fog/openstack/identity/v3/models/project.rb +++ b/lib/fog/identity/openstack/v3/models/project.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Project < Fog::OpenStack::Model identity :id @@ -65,7 +65,7 @@ def check_user_role(user_id, role_id) requires :id begin service.check_project_user_role(id, user_id, role_id) - rescue Fog::OpenStack::Identity::NotFound + rescue Fog::Identity::OpenStack::NotFound return false end true @@ -92,7 +92,7 @@ def check_group_role(group_id, role_id) requires :id begin service.check_project_group_role(id, group_id, role_id) - rescue Fog::OpenStack::Identity::NotFound + rescue Fog::Identity::OpenStack::NotFound return false end true diff --git a/lib/fog/openstack/identity/v3/models/projects.rb b/lib/fog/identity/openstack/v3/models/projects.rb similarity index 81% rename from lib/fog/openstack/identity/v3/models/projects.rb rename to lib/fog/identity/openstack/v3/models/projects.rb index fd13515c3..b1d413221 100644 --- a/lib/fog/openstack/identity/v3/models/projects.rb +++ b/lib/fog/identity/openstack/v3/models/projects.rb @@ -1,26 +1,26 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/project' +require 'fog/identity/openstack/v3/models/project' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Projects < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Project + model Fog::Identity::OpenStack::V3::Project def all(options = {}) if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, + cached_project, expires = Fog::Identity::OpenStack::V3::Project.cache[{:token => service.auth_token, :options => options}] return cached_project if cached_project && expires > Time.now end project_to_cache = load_response(service.list_projects(options), 'projects') if service.openstack_cache_ttl > 0 - cache = Fog::OpenStack::Identity::V3::Project.cache + cache = Fog::Identity::OpenStack::V3::Project.cache cache[{:token => service.auth_token, :options => options}] = [project_to_cache, Time.now + service.openstack_cache_ttl] - Fog::OpenStack::Identity::V3::Project.cache = cache + Fog::Identity::OpenStack::V3::Project.cache = cache end project_to_cache end @@ -39,7 +39,7 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree end if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, + cached_project, expires = Fog::Identity::OpenStack::V3::Project.cache[{:token => service.auth_token, :id => id, :options => options}] return cached_project if cached_project && expires > Time.now @@ -54,11 +54,11 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree end if service.openstack_cache_ttl > 0 - cache = Fog::OpenStack::Identity::V3::Project.cache + cache = Fog::Identity::OpenStack::V3::Project.cache cache[{:token => service.auth_token, :id => id, :options => options}] = [ top_project, Time.now + service.openstack_cache_ttl ] - Fog::OpenStack::Identity::V3::Project.cache = cache + Fog::Identity::OpenStack::V3::Project.cache = cache end top_project end @@ -66,7 +66,7 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree private def project_from_hash(project_hash, service) - Fog::OpenStack::Identity::V3::Project.new(project_hash.merge(:service => service)) + Fog::Identity::OpenStack::V3::Project.new(project_hash.merge(:service => service)) end end end diff --git a/lib/fog/openstack/identity/v3/models/role.rb b/lib/fog/identity/openstack/v3/models/role.rb similarity index 95% rename from lib/fog/openstack/identity/v3/models/role.rb rename to lib/fog/identity/openstack/v3/models/role.rb index 67a4414a2..024b251b4 100644 --- a/lib/fog/openstack/identity/v3/models/role.rb +++ b/lib/fog/identity/openstack/v3/models/role.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Role < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v3/models/role_assignment.rb b/lib/fog/identity/openstack/v3/models/role_assignment.rb similarity index 90% rename from lib/fog/openstack/identity/v3/models/role_assignment.rb rename to lib/fog/identity/openstack/v3/models/role_assignment.rb index 2e8fc4df9..0fe981a00 100644 --- a/lib/fog/openstack/identity/v3/models/role_assignment.rb +++ b/lib/fog/identity/openstack/v3/models/role_assignment.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class RoleAssignment < Fog::OpenStack::Model attribute :scope diff --git a/lib/fog/openstack/identity/v3/models/role_assignments.rb b/lib/fog/identity/openstack/v3/models/role_assignments.rb similarity index 82% rename from lib/fog/openstack/identity/v3/models/role_assignments.rb rename to lib/fog/identity/openstack/v3/models/role_assignments.rb index e1777c25f..5ebaa7f01 100644 --- a/lib/fog/openstack/identity/v3/models/role_assignments.rb +++ b/lib/fog/identity/openstack/v3/models/role_assignments.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/role' +require 'fog/identity/openstack/v3/models/role' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class RoleAssignments < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::RoleAssignment + model Fog::Identity::OpenStack::V3::RoleAssignment def all(options = {}) load_response(service.list_role_assignments(options), 'role_assignments') diff --git a/lib/fog/openstack/identity/v3/models/roles.rb b/lib/fog/identity/openstack/v3/models/roles.rb similarity index 86% rename from lib/fog/openstack/identity/v3/models/roles.rb rename to lib/fog/identity/openstack/v3/models/roles.rb index 707fddc8d..0b6a8cfbe 100644 --- a/lib/fog/openstack/identity/v3/models/roles.rb +++ b/lib/fog/identity/openstack/v3/models/roles.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/role' +require 'fog/identity/openstack/v3/models/role' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Roles < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Role + model Fog::Identity::OpenStack::V3::Role def all(options = {}) load_response(service.list_roles(options), 'roles') @@ -24,7 +24,7 @@ def find_by_id(id) cached_role = find { |role| role.id == id } return cached_role if cached_role role_hash = service.get_role(id).body['role'] - Fog::OpenStack::Identity::V3.role.new( + Fog::Identity::OpenStack::V3.role.new( role_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/models/service.rb b/lib/fog/identity/openstack/v3/models/service.rb similarity index 96% rename from lib/fog/openstack/identity/v3/models/service.rb rename to lib/fog/identity/openstack/v3/models/service.rb index 15d0249ca..a06ef8a43 100644 --- a/lib/fog/openstack/identity/v3/models/service.rb +++ b/lib/fog/identity/openstack/v3/models/service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Service < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/identity/v3/models/services.rb b/lib/fog/identity/openstack/v3/models/services.rb similarity index 77% rename from lib/fog/openstack/identity/v3/models/services.rb rename to lib/fog/identity/openstack/v3/models/services.rb index c60569839..d9dc4a982 100644 --- a/lib/fog/openstack/identity/v3/models/services.rb +++ b/lib/fog/identity/openstack/v3/models/services.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/service' +require 'fog/identity/openstack/v3/models/service' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Services < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Service + model Fog::Identity::OpenStack::V3::Service def all(options = {}) load_response(service.list_services(options), 'services') @@ -16,7 +16,7 @@ def find_by_id(id) cached_service = find { |service| service.id == id } return cached_service if cached_service service_hash = service.get_service(id).body['service'] - Fog::OpenStack::Identity::V3::Service.new( + Fog::Identity::OpenStack::V3::Service.new( service_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/models/token.rb b/lib/fog/identity/openstack/v3/models/token.rb similarity index 91% rename from lib/fog/openstack/identity/v3/models/token.rb rename to lib/fog/identity/openstack/v3/models/token.rb index 7e15c5fc1..5c2392684 100644 --- a/lib/fog/openstack/identity/v3/models/token.rb +++ b/lib/fog/identity/openstack/v3/models/token.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Token < Fog::OpenStack::Model attribute :value diff --git a/lib/fog/openstack/identity/v3/models/tokens.rb b/lib/fog/identity/openstack/v3/models/tokens.rb similarity index 78% rename from lib/fog/openstack/identity/v3/models/tokens.rb rename to lib/fog/identity/openstack/v3/models/tokens.rb index 028eb9a8e..b07ea92ac 100644 --- a/lib/fog/openstack/identity/v3/models/tokens.rb +++ b/lib/fog/identity/openstack/v3/models/tokens.rb @@ -1,17 +1,17 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/service' +require 'fog/identity/openstack/v3/models/service' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Tokens < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::Token + model Fog::Identity::OpenStack::V3::Token def authenticate(auth) response = service.token_authenticate(auth) token_hash = response.body['token'] - Fog::OpenStack::Identity::V3::Token.new( + Fog::Identity::OpenStack::V3::Token.new( token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) ) end @@ -19,7 +19,7 @@ def authenticate(auth) def validate(subject_token) response = service.token_validate(subject_token) token_hash = response.body['token'] - Fog::OpenStack::Identity::V3::Token.new( + Fog::Identity::OpenStack::V3::Token.new( token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) ) end diff --git a/lib/fog/openstack/identity/v3/models/user.rb b/lib/fog/identity/openstack/v3/models/user.rb similarity index 95% rename from lib/fog/openstack/identity/v3/models/user.rb rename to lib/fog/identity/openstack/v3/models/user.rb index 70a677f90..cf2ee4b59 100644 --- a/lib/fog/openstack/identity/v3/models/user.rb +++ b/lib/fog/identity/openstack/v3/models/user.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class User < Fog::OpenStack::Model identity :id @@ -44,7 +44,7 @@ def check_role(role_id) requires :id, :domain_id begin service.check_domain_user_role(domain_id, id, role_id) - rescue Fog::OpenStack::Identity::NotFound + rescue Fog::Identity::OpenStack::NotFound return false end true diff --git a/lib/fog/openstack/identity/v3/models/users.rb b/lib/fog/identity/openstack/v3/models/users.rb similarity index 80% rename from lib/fog/openstack/identity/v3/models/users.rb rename to lib/fog/identity/openstack/v3/models/users.rb index 109476747..9dc92a22c 100644 --- a/lib/fog/openstack/identity/v3/models/users.rb +++ b/lib/fog/identity/openstack/v3/models/users.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/identity/v3/models/domain' +require 'fog/identity/openstack/v3/models/domain' module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Users < Fog::OpenStack::Collection - model Fog::OpenStack::Identity::V3::User + model Fog::Identity::OpenStack::V3::User def all(options = {}) load_response(service.list_users(options), 'users') @@ -16,7 +16,7 @@ def find_by_id(id) cached_user = find { |user| user.id == id } return cached_user if cached_user user_hash = service.get_user(id).body['user'] - Fog::OpenStack::Identity::V3::User.new( + Fog::Identity::OpenStack::V3::User.new( user_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb b/lib/fog/identity/openstack/v3/requests/add_user_to_group.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/add_user_to_group.rb rename to lib/fog/identity/openstack/v3/requests/add_user_to_group.rb index 852191bf0..03a55d02f 100644 --- a/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb +++ b/lib/fog/identity/openstack/v3/requests/add_user_to_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def add_user_to_group(group_id, user_id) diff --git a/lib/fog/openstack/identity/v3/requests/auth_domains.rb b/lib/fog/identity/openstack/v3/requests/auth_domains.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/auth_domains.rb rename to lib/fog/identity/openstack/v3/requests/auth_domains.rb index 883a386ed..176214f5a 100644 --- a/lib/fog/openstack/identity/v3/requests/auth_domains.rb +++ b/lib/fog/identity/openstack/v3/requests/auth_domains.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def auth_domains(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/auth_projects.rb b/lib/fog/identity/openstack/v3/requests/auth_projects.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/auth_projects.rb rename to lib/fog/identity/openstack/v3/requests/auth_projects.rb index f4861a39d..2cd4c3455 100644 --- a/lib/fog/openstack/identity/v3/requests/auth_projects.rb +++ b/lib/fog/identity/openstack/v3/requests/auth_projects.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def auth_projects(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb b/lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb rename to lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb index 63f84fd99..eb69a9dca 100644 --- a/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb +++ b/lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def check_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb b/lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb rename to lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb index ea40b6541..8c842b1e8 100644 --- a/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb +++ b/lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def check_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb b/lib/fog/identity/openstack/v3/requests/check_project_group_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/check_project_group_role.rb rename to lib/fog/identity/openstack/v3/requests/check_project_group_role.rb index d3a84af5b..22895db06 100644 --- a/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb +++ b/lib/fog/identity/openstack/v3/requests/check_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def check_project_group_role(id, group_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb b/lib/fog/identity/openstack/v3/requests/check_project_user_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/check_project_user_role.rb rename to lib/fog/identity/openstack/v3/requests/check_project_user_role.rb index 36da39e1a..1ee3415ee 100644 --- a/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb +++ b/lib/fog/identity/openstack/v3/requests/check_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def check_project_user_role(id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/create_domain.rb b/lib/fog/identity/openstack/v3/requests/create_domain.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_domain.rb rename to lib/fog/identity/openstack/v3/requests/create_domain.rb index cf2403dd9..aabe7d2fa 100644 --- a/lib/fog/openstack/identity/v3/requests/create_domain.rb +++ b/lib/fog/identity/openstack/v3/requests/create_domain.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_domain(domain) diff --git a/lib/fog/openstack/identity/v3/requests/create_endpoint.rb b/lib/fog/identity/openstack/v3/requests/create_endpoint.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_endpoint.rb rename to lib/fog/identity/openstack/v3/requests/create_endpoint.rb index d1f3e8017..ac57e58f4 100644 --- a/lib/fog/openstack/identity/v3/requests/create_endpoint.rb +++ b/lib/fog/identity/openstack/v3/requests/create_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_endpoint(endpoint) diff --git a/lib/fog/openstack/identity/v3/requests/create_group.rb b/lib/fog/identity/openstack/v3/requests/create_group.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_group.rb rename to lib/fog/identity/openstack/v3/requests/create_group.rb index 5411edcc4..74db0225b 100644 --- a/lib/fog/openstack/identity/v3/requests/create_group.rb +++ b/lib/fog/identity/openstack/v3/requests/create_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_group(group) diff --git a/lib/fog/openstack/identity/v3/requests/create_os_credential.rb b/lib/fog/identity/openstack/v3/requests/create_os_credential.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/create_os_credential.rb rename to lib/fog/identity/openstack/v3/requests/create_os_credential.rb index 61d555c16..9cfa4a030 100644 --- a/lib/fog/openstack/identity/v3/requests/create_os_credential.rb +++ b/lib/fog/identity/openstack/v3/requests/create_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_os_credential(credential) diff --git a/lib/fog/openstack/identity/v3/requests/create_policy.rb b/lib/fog/identity/openstack/v3/requests/create_policy.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_policy.rb rename to lib/fog/identity/openstack/v3/requests/create_policy.rb index 125d8354d..46e719ac4 100644 --- a/lib/fog/openstack/identity/v3/requests/create_policy.rb +++ b/lib/fog/identity/openstack/v3/requests/create_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_policy(policy) diff --git a/lib/fog/openstack/identity/v3/requests/create_project.rb b/lib/fog/identity/openstack/v3/requests/create_project.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_project.rb rename to lib/fog/identity/openstack/v3/requests/create_project.rb index 1fcf1e21a..729dab287 100644 --- a/lib/fog/openstack/identity/v3/requests/create_project.rb +++ b/lib/fog/identity/openstack/v3/requests/create_project.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_project(project) diff --git a/lib/fog/openstack/identity/v3/requests/create_role.rb b/lib/fog/identity/openstack/v3/requests/create_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_role.rb rename to lib/fog/identity/openstack/v3/requests/create_role.rb index e985bddae..5ca245be4 100644 --- a/lib/fog/openstack/identity/v3/requests/create_role.rb +++ b/lib/fog/identity/openstack/v3/requests/create_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_role(role) diff --git a/lib/fog/openstack/identity/v3/requests/create_service.rb b/lib/fog/identity/openstack/v3/requests/create_service.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_service.rb rename to lib/fog/identity/openstack/v3/requests/create_service.rb index d765fdbb1..6dc675a54 100644 --- a/lib/fog/openstack/identity/v3/requests/create_service.rb +++ b/lib/fog/identity/openstack/v3/requests/create_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_service(service) diff --git a/lib/fog/openstack/identity/v3/requests/create_user.rb b/lib/fog/identity/openstack/v3/requests/create_user.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/create_user.rb rename to lib/fog/identity/openstack/v3/requests/create_user.rb index 841d689d3..cd80365ef 100644 --- a/lib/fog/openstack/identity/v3/requests/create_user.rb +++ b/lib/fog/identity/openstack/v3/requests/create_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def create_user(user) diff --git a/lib/fog/openstack/identity/v3/requests/delete_domain.rb b/lib/fog/identity/openstack/v3/requests/delete_domain.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/delete_domain.rb rename to lib/fog/identity/openstack/v3/requests/delete_domain.rb index d2eb6d06c..e99823e14 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_domain.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_domain.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_domain(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb b/lib/fog/identity/openstack/v3/requests/delete_endpoint.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/delete_endpoint.rb rename to lib/fog/identity/openstack/v3/requests/delete_endpoint.rb index 57023a664..b86802d82 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_endpoint(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_group.rb b/lib/fog/identity/openstack/v3/requests/delete_group.rb similarity index 88% rename from lib/fog/openstack/identity/v3/requests/delete_group.rb rename to lib/fog/identity/openstack/v3/requests/delete_group.rb index d494c5794..1aad1f448 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_group.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_group(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb b/lib/fog/identity/openstack/v3/requests/delete_os_credential.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/delete_os_credential.rb rename to lib/fog/identity/openstack/v3/requests/delete_os_credential.rb index 45b9223f2..7caf39d2a 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_os_credential(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_policy.rb b/lib/fog/identity/openstack/v3/requests/delete_policy.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/delete_policy.rb rename to lib/fog/identity/openstack/v3/requests/delete_policy.rb index 3264965b4..e0a211aa1 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_policy.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_policy(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_project.rb b/lib/fog/identity/openstack/v3/requests/delete_project.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/delete_project.rb rename to lib/fog/identity/openstack/v3/requests/delete_project.rb index 634186beb..0cc3c07d0 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_project.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_project.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_project(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_role.rb b/lib/fog/identity/openstack/v3/requests/delete_role.rb similarity index 88% rename from lib/fog/openstack/identity/v3/requests/delete_role.rb rename to lib/fog/identity/openstack/v3/requests/delete_role.rb index 0a5baf05d..9b4e64244 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_role.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_role(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_service.rb b/lib/fog/identity/openstack/v3/requests/delete_service.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/delete_service.rb rename to lib/fog/identity/openstack/v3/requests/delete_service.rb index 16761e478..6ede4eb30 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_service.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_service(id) diff --git a/lib/fog/openstack/identity/v3/requests/delete_user.rb b/lib/fog/identity/openstack/v3/requests/delete_user.rb similarity index 88% rename from lib/fog/openstack/identity/v3/requests/delete_user.rb rename to lib/fog/identity/openstack/v3/requests/delete_user.rb index eef6ee128..b08fd457a 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_user.rb +++ b/lib/fog/identity/openstack/v3/requests/delete_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def delete_user(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_domain.rb b/lib/fog/identity/openstack/v3/requests/get_domain.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_domain.rb rename to lib/fog/identity/openstack/v3/requests/get_domain.rb index 0a2bd126f..3170fd640 100644 --- a/lib/fog/openstack/identity/v3/requests/get_domain.rb +++ b/lib/fog/identity/openstack/v3/requests/get_domain.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_domain(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_endpoint.rb b/lib/fog/identity/openstack/v3/requests/get_endpoint.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_endpoint.rb rename to lib/fog/identity/openstack/v3/requests/get_endpoint.rb index cd8fed07d..b4860d18e 100644 --- a/lib/fog/openstack/identity/v3/requests/get_endpoint.rb +++ b/lib/fog/identity/openstack/v3/requests/get_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_endpoint(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_group.rb b/lib/fog/identity/openstack/v3/requests/get_group.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_group.rb rename to lib/fog/identity/openstack/v3/requests/get_group.rb index 706cc4880..01b1fc210 100644 --- a/lib/fog/openstack/identity/v3/requests/get_group.rb +++ b/lib/fog/identity/openstack/v3/requests/get_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_group(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_os_credential.rb b/lib/fog/identity/openstack/v3/requests/get_os_credential.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_os_credential.rb rename to lib/fog/identity/openstack/v3/requests/get_os_credential.rb index ed42db756..2f049a51a 100644 --- a/lib/fog/openstack/identity/v3/requests/get_os_credential.rb +++ b/lib/fog/identity/openstack/v3/requests/get_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_os_credential(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_policy.rb b/lib/fog/identity/openstack/v3/requests/get_policy.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_policy.rb rename to lib/fog/identity/openstack/v3/requests/get_policy.rb index 3bfb57755..ffddca73e 100644 --- a/lib/fog/openstack/identity/v3/requests/get_policy.rb +++ b/lib/fog/identity/openstack/v3/requests/get_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_policy(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_project.rb b/lib/fog/identity/openstack/v3/requests/get_project.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_project.rb rename to lib/fog/identity/openstack/v3/requests/get_project.rb index 1d6494491..1c93ab78d 100644 --- a/lib/fog/openstack/identity/v3/requests/get_project.rb +++ b/lib/fog/identity/openstack/v3/requests/get_project.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_project(id, options = []) diff --git a/lib/fog/openstack/identity/v3/requests/get_role.rb b/lib/fog/identity/openstack/v3/requests/get_role.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/get_role.rb rename to lib/fog/identity/openstack/v3/requests/get_role.rb index fecf25b45..78031e027 100644 --- a/lib/fog/openstack/identity/v3/requests/get_role.rb +++ b/lib/fog/identity/openstack/v3/requests/get_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_role(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_service.rb b/lib/fog/identity/openstack/v3/requests/get_service.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/get_service.rb rename to lib/fog/identity/openstack/v3/requests/get_service.rb index 0a83c3e88..8c3408f54 100644 --- a/lib/fog/openstack/identity/v3/requests/get_service.rb +++ b/lib/fog/identity/openstack/v3/requests/get_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_service(id) diff --git a/lib/fog/openstack/identity/v3/requests/get_user.rb b/lib/fog/identity/openstack/v3/requests/get_user.rb similarity index 89% rename from lib/fog/openstack/identity/v3/requests/get_user.rb rename to lib/fog/identity/openstack/v3/requests/get_user.rb index 93f119a01..a2200b3bb 100644 --- a/lib/fog/openstack/identity/v3/requests/get_user.rb +++ b/lib/fog/identity/openstack/v3/requests/get_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def get_user(id) diff --git a/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb b/lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb rename to lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb index ed7d90405..c92301342 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb +++ b/lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def grant_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb b/lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb rename to lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb index b91bc7da4..e23129e5f 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb +++ b/lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def grant_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb b/lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb rename to lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb index 99a5939b8..ffe442f01 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb +++ b/lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def grant_project_group_role(id, group_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb b/lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb rename to lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb index 1dee70dba..27ecd63fc 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb +++ b/lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def grant_project_user_role(id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/group_user_check.rb b/lib/fog/identity/openstack/v3/requests/group_user_check.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/group_user_check.rb rename to lib/fog/identity/openstack/v3/requests/group_user_check.rb index 14a2b2001..193292877 100644 --- a/lib/fog/openstack/identity/v3/requests/group_user_check.rb +++ b/lib/fog/identity/openstack/v3/requests/group_user_check.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def group_user_check(group_id, user_id) diff --git a/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb b/lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb rename to lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb index 3e0ff8620..60126007b 100644 --- a/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb +++ b/lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_domain_group_roles(id, group_id) diff --git a/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb b/lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb rename to lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb index a11a8e053..26d7ce24f 100644 --- a/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb +++ b/lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_domain_user_roles(id, user_id) diff --git a/lib/fog/openstack/identity/v3/requests/list_domains.rb b/lib/fog/identity/openstack/v3/requests/list_domains.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_domains.rb rename to lib/fog/identity/openstack/v3/requests/list_domains.rb index 884002d33..f5a4d8480 100644 --- a/lib/fog/openstack/identity/v3/requests/list_domains.rb +++ b/lib/fog/identity/openstack/v3/requests/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_domains(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_endpoints.rb b/lib/fog/identity/openstack/v3/requests/list_endpoints.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_endpoints.rb rename to lib/fog/identity/openstack/v3/requests/list_endpoints.rb index c72e27f10..7faf83f81 100644 --- a/lib/fog/openstack/identity/v3/requests/list_endpoints.rb +++ b/lib/fog/identity/openstack/v3/requests/list_endpoints.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_endpoints(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_group_users.rb b/lib/fog/identity/openstack/v3/requests/list_group_users.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_group_users.rb rename to lib/fog/identity/openstack/v3/requests/list_group_users.rb index a474bced0..25e4b43ea 100644 --- a/lib/fog/openstack/identity/v3/requests/list_group_users.rb +++ b/lib/fog/identity/openstack/v3/requests/list_group_users.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_group_users(id, options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_groups.rb b/lib/fog/identity/openstack/v3/requests/list_groups.rb similarity index 94% rename from lib/fog/openstack/identity/v3/requests/list_groups.rb rename to lib/fog/identity/openstack/v3/requests/list_groups.rb index ab54244cd..d43290761 100644 --- a/lib/fog/openstack/identity/v3/requests/list_groups.rb +++ b/lib/fog/identity/openstack/v3/requests/list_groups.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_groups(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb b/lib/fog/identity/openstack/v3/requests/list_os_credentials.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_os_credentials.rb rename to lib/fog/identity/openstack/v3/requests/list_os_credentials.rb index bf74399fb..1aac07f95 100644 --- a/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb +++ b/lib/fog/identity/openstack/v3/requests/list_os_credentials.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_os_credentials(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_policies.rb b/lib/fog/identity/openstack/v3/requests/list_policies.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_policies.rb rename to lib/fog/identity/openstack/v3/requests/list_policies.rb index acd7be6ed..011234d83 100644 --- a/lib/fog/openstack/identity/v3/requests/list_policies.rb +++ b/lib/fog/identity/openstack/v3/requests/list_policies.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_policies(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb b/lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb rename to lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb index 87f37aa4b..138e6fa57 100644 --- a/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb +++ b/lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_project_group_roles(id, group_id) diff --git a/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb b/lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb rename to lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb index cdcdae06a..a715334f8 100644 --- a/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb +++ b/lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_project_user_roles(id, user_id) diff --git a/lib/fog/openstack/identity/v3/requests/list_projects.rb b/lib/fog/identity/openstack/v3/requests/list_projects.rb similarity index 94% rename from lib/fog/openstack/identity/v3/requests/list_projects.rb rename to lib/fog/identity/openstack/v3/requests/list_projects.rb index 25edd6a79..cd05fb71f 100644 --- a/lib/fog/openstack/identity/v3/requests/list_projects.rb +++ b/lib/fog/identity/openstack/v3/requests/list_projects.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_projects(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb b/lib/fog/identity/openstack/v3/requests/list_role_assignments.rb similarity index 96% rename from lib/fog/openstack/identity/v3/requests/list_role_assignments.rb rename to lib/fog/identity/openstack/v3/requests/list_role_assignments.rb index 49611fadd..3b64bfe81 100644 --- a/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb +++ b/lib/fog/identity/openstack/v3/requests/list_role_assignments.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_role_assignments(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_roles.rb b/lib/fog/identity/openstack/v3/requests/list_roles.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_roles.rb rename to lib/fog/identity/openstack/v3/requests/list_roles.rb index e9a538311..da2ddd31c 100644 --- a/lib/fog/openstack/identity/v3/requests/list_roles.rb +++ b/lib/fog/identity/openstack/v3/requests/list_roles.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_roles(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_services.rb b/lib/fog/identity/openstack/v3/requests/list_services.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_services.rb rename to lib/fog/identity/openstack/v3/requests/list_services.rb index b0e0c446f..a822a3779 100644 --- a/lib/fog/openstack/identity/v3/requests/list_services.rb +++ b/lib/fog/identity/openstack/v3/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_services(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_user_groups.rb b/lib/fog/identity/openstack/v3/requests/list_user_groups.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/list_user_groups.rb rename to lib/fog/identity/openstack/v3/requests/list_user_groups.rb index a6d6ac77e..7e6a90ed3 100644 --- a/lib/fog/openstack/identity/v3/requests/list_user_groups.rb +++ b/lib/fog/identity/openstack/v3/requests/list_user_groups.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_user_groups(user_id) diff --git a/lib/fog/openstack/identity/v3/requests/list_user_projects.rb b/lib/fog/identity/openstack/v3/requests/list_user_projects.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_user_projects.rb rename to lib/fog/identity/openstack/v3/requests/list_user_projects.rb index cf96a30a0..e4079e011 100644 --- a/lib/fog/openstack/identity/v3/requests/list_user_projects.rb +++ b/lib/fog/identity/openstack/v3/requests/list_user_projects.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_user_projects(user_id, options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/list_users.rb b/lib/fog/identity/openstack/v3/requests/list_users.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/list_users.rb rename to lib/fog/identity/openstack/v3/requests/list_users.rb index 0a5159a85..017496dcb 100644 --- a/lib/fog/openstack/identity/v3/requests/list_users.rb +++ b/lib/fog/identity/openstack/v3/requests/list_users.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def list_users(options = {}) diff --git a/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb b/lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb rename to lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb index f9b770883..8f162eb98 100644 --- a/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb +++ b/lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def remove_user_from_group(group_id, user_id) diff --git a/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb b/lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb rename to lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb index 0e69b4a2d..7f04ea149 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb +++ b/lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def revoke_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb b/lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb rename to lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb index 2aac1107f..ded732f45 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb +++ b/lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def revoke_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb b/lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb rename to lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb index f069db266..3bb8b6d86 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb +++ b/lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def revoke_project_group_role(id, group_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb b/lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb rename to lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb index 6262bfec9..e32e1b851 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb +++ b/lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def revoke_project_user_role(id, user_id, role_id) diff --git a/lib/fog/openstack/identity/v3/requests/token_authenticate.rb b/lib/fog/identity/openstack/v3/requests/token_authenticate.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/token_authenticate.rb rename to lib/fog/identity/openstack/v3/requests/token_authenticate.rb index d6facf733..b8135513c 100644 --- a/lib/fog/openstack/identity/v3/requests/token_authenticate.rb +++ b/lib/fog/identity/openstack/v3/requests/token_authenticate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def token_authenticate(auth) diff --git a/lib/fog/openstack/identity/v3/requests/token_check.rb b/lib/fog/identity/openstack/v3/requests/token_check.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/token_check.rb rename to lib/fog/identity/openstack/v3/requests/token_check.rb index 5f850af1d..d8d69ad8b 100644 --- a/lib/fog/openstack/identity/v3/requests/token_check.rb +++ b/lib/fog/identity/openstack/v3/requests/token_check.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def token_check(subject_token) diff --git a/lib/fog/openstack/identity/v3/requests/token_revoke.rb b/lib/fog/identity/openstack/v3/requests/token_revoke.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/token_revoke.rb rename to lib/fog/identity/openstack/v3/requests/token_revoke.rb index e1c0b6f97..c93c96040 100644 --- a/lib/fog/openstack/identity/v3/requests/token_revoke.rb +++ b/lib/fog/identity/openstack/v3/requests/token_revoke.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def token_revoke(subject_token) diff --git a/lib/fog/openstack/identity/v3/requests/token_validate.rb b/lib/fog/identity/openstack/v3/requests/token_validate.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/token_validate.rb rename to lib/fog/identity/openstack/v3/requests/token_validate.rb index c2b842753..f19d04b5f 100644 --- a/lib/fog/openstack/identity/v3/requests/token_validate.rb +++ b/lib/fog/identity/openstack/v3/requests/token_validate.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def token_validate(subject_token) diff --git a/lib/fog/openstack/identity/v3/requests/update_domain.rb b/lib/fog/identity/openstack/v3/requests/update_domain.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_domain.rb rename to lib/fog/identity/openstack/v3/requests/update_domain.rb index 7f430dec3..28e96ca71 100644 --- a/lib/fog/openstack/identity/v3/requests/update_domain.rb +++ b/lib/fog/identity/openstack/v3/requests/update_domain.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_domain(id, domain) diff --git a/lib/fog/openstack/identity/v3/requests/update_endpoint.rb b/lib/fog/identity/openstack/v3/requests/update_endpoint.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/update_endpoint.rb rename to lib/fog/identity/openstack/v3/requests/update_endpoint.rb index e54a9725b..e66bfb646 100644 --- a/lib/fog/openstack/identity/v3/requests/update_endpoint.rb +++ b/lib/fog/identity/openstack/v3/requests/update_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_endpoint(id, endpoint) diff --git a/lib/fog/openstack/identity/v3/requests/update_group.rb b/lib/fog/identity/openstack/v3/requests/update_group.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_group.rb rename to lib/fog/identity/openstack/v3/requests/update_group.rb index e93f851c2..8ea59f3bc 100644 --- a/lib/fog/openstack/identity/v3/requests/update_group.rb +++ b/lib/fog/identity/openstack/v3/requests/update_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_group(id, group) diff --git a/lib/fog/openstack/identity/v3/requests/update_os_credential.rb b/lib/fog/identity/openstack/v3/requests/update_os_credential.rb similarity index 91% rename from lib/fog/openstack/identity/v3/requests/update_os_credential.rb rename to lib/fog/identity/openstack/v3/requests/update_os_credential.rb index 74281369d..a547c3aae 100644 --- a/lib/fog/openstack/identity/v3/requests/update_os_credential.rb +++ b/lib/fog/identity/openstack/v3/requests/update_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_os_credential(id, credential) diff --git a/lib/fog/openstack/identity/v3/requests/update_policy.rb b/lib/fog/identity/openstack/v3/requests/update_policy.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_policy.rb rename to lib/fog/identity/openstack/v3/requests/update_policy.rb index ad2a19691..05653537b 100644 --- a/lib/fog/openstack/identity/v3/requests/update_policy.rb +++ b/lib/fog/identity/openstack/v3/requests/update_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_policy(id, policy) diff --git a/lib/fog/openstack/identity/v3/requests/update_project.rb b/lib/fog/identity/openstack/v3/requests/update_project.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_project.rb rename to lib/fog/identity/openstack/v3/requests/update_project.rb index 91e7e2150..aac584281 100644 --- a/lib/fog/openstack/identity/v3/requests/update_project.rb +++ b/lib/fog/identity/openstack/v3/requests/update_project.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_project(id, project) diff --git a/lib/fog/openstack/identity/v3/requests/update_role.rb b/lib/fog/identity/openstack/v3/requests/update_role.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_role.rb rename to lib/fog/identity/openstack/v3/requests/update_role.rb index a93e33291..be463ed0a 100644 --- a/lib/fog/openstack/identity/v3/requests/update_role.rb +++ b/lib/fog/identity/openstack/v3/requests/update_role.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_role(id, role) diff --git a/lib/fog/openstack/identity/v3/requests/update_service.rb b/lib/fog/identity/openstack/v3/requests/update_service.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_service.rb rename to lib/fog/identity/openstack/v3/requests/update_service.rb index bdfc39f8f..1cb56876d 100644 --- a/lib/fog/openstack/identity/v3/requests/update_service.rb +++ b/lib/fog/identity/openstack/v3/requests/update_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_service(id, service) diff --git a/lib/fog/openstack/identity/v3/requests/update_user.rb b/lib/fog/identity/openstack/v3/requests/update_user.rb similarity index 90% rename from lib/fog/openstack/identity/v3/requests/update_user.rb rename to lib/fog/identity/openstack/v3/requests/update_user.rb index 9d928493d..1d9595029 100644 --- a/lib/fog/openstack/identity/v3/requests/update_user.rb +++ b/lib/fog/identity/openstack/v3/requests/update_user.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Identity + module Identity + class OpenStack class V3 class Real def update_user(id, user) diff --git a/lib/fog/image/openstack.rb b/lib/fog/image/openstack.rb new file mode 100644 index 000000000..3aa4ed518 --- /dev/null +++ b/lib/fog/image/openstack.rb @@ -0,0 +1,23 @@ + + +module Fog + module Image + class OpenStack < Fog::Service + autoload :V1, 'fog/image/openstack/v1' + autoload :V2, 'fog/image/openstack/v2' + + # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V1, + # choosing the latest available + def self.new(args = {}) + @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] + if inspect == 'Fog::Image::OpenStack' + service = Fog::Image::OpenStack::V2.new(args) unless args.empty? + service ||= Fog::Image::OpenStack::V1.new(args) + else + service = Fog::Service.new(args) + end + service + end + end + end +end diff --git a/lib/fog/openstack/image/v1.rb b/lib/fog/image/openstack/v1.rb similarity index 94% rename from lib/fog/openstack/image/v1.rb rename to lib/fog/image/openstack/v1.rb index 5c0183a4e..a08d1e51b 100644 --- a/lib/fog/openstack/image/v1.rb +++ b/lib/fog/image/openstack/v1.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/image/image' +require 'fog/image/openstack' module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 < Fog::Service SUPPORTED_VERSIONS = /v1(\.(0|1))*/ @@ -18,12 +18,12 @@ class V1 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/image/v1/models' + model_path 'fog/image/openstack/v1/models' model :image collection :images - request_path 'fog/openstack/image/v1/requests' + request_path 'fog/image/openstack/v1/requests' request :list_public_images request :list_public_images_detailed @@ -99,7 +99,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Image::NotFound + Fog::Image::OpenStack::NotFound end def default_endpoint_type diff --git a/lib/fog/openstack/image/v1/models/image.rb b/lib/fog/image/openstack/v1/models/image.rb similarity index 98% rename from lib/fog/openstack/image/v1/models/image.rb rename to lib/fog/image/openstack/v1/models/image.rb index dfd3eae11..2d911e2a6 100644 --- a/lib/fog/openstack/image/v1/models/image.rb +++ b/lib/fog/image/openstack/v1/models/image.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Image < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/image/v1/models/images.rb b/lib/fog/image/openstack/v1/models/images.rb similarity index 94% rename from lib/fog/openstack/image/v1/models/images.rb rename to lib/fog/image/openstack/v1/models/images.rb index 095a3a4a3..dee79dcb9 100644 --- a/lib/fog/openstack/image/v1/models/images.rb +++ b/lib/fog/image/openstack/v1/models/images.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/image/v1/models/image' +require 'fog/image/openstack/v1/models/image' module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Images < Fog::OpenStack::Collection - model Fog::OpenStack::Image::V1::Image + model Fog::Image::OpenStack::V1::Image def all(options = {}) load_response(service.list_public_images_detailed(options), 'images') @@ -38,7 +38,7 @@ def find_by_id(id) params['properties'] = custom_properties new(params) - rescue Fog::OpenStack::Image::NotFound + rescue Fog::Image::OpenStack::NotFound nil end alias get find_by_id diff --git a/lib/fog/openstack/image/v1/requests/add_member_to_image.rb b/lib/fog/image/openstack/v1/requests/add_member_to_image.rb similarity index 93% rename from lib/fog/openstack/image/v1/requests/add_member_to_image.rb rename to lib/fog/image/openstack/v1/requests/add_member_to_image.rb index 9dec5a819..f6bbb33f0 100644 --- a/lib/fog/openstack/image/v1/requests/add_member_to_image.rb +++ b/lib/fog/image/openstack/v1/requests/add_member_to_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def add_member_to_image(image_id, tenant_id) diff --git a/lib/fog/openstack/image/v1/requests/create_image.rb b/lib/fog/image/openstack/v1/requests/create_image.rb similarity index 98% rename from lib/fog/openstack/image/v1/requests/create_image.rb rename to lib/fog/image/openstack/v1/requests/create_image.rb index 16306b353..23f515b45 100644 --- a/lib/fog/openstack/image/v1/requests/create_image.rb +++ b/lib/fog/image/openstack/v1/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def create_image(attributes) diff --git a/lib/fog/openstack/image/v1/requests/delete_image.rb b/lib/fog/image/openstack/v1/requests/delete_image.rb similarity index 93% rename from lib/fog/openstack/image/v1/requests/delete_image.rb rename to lib/fog/image/openstack/v1/requests/delete_image.rb index 36393e08b..5e64ecd0d 100644 --- a/lib/fog/openstack/image/v1/requests/delete_image.rb +++ b/lib/fog/image/openstack/v1/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def delete_image(image_id) diff --git a/lib/fog/openstack/image/v1/requests/get_image.rb b/lib/fog/image/openstack/v1/requests/get_image.rb similarity index 98% rename from lib/fog/openstack/image/v1/requests/get_image.rb rename to lib/fog/image/openstack/v1/requests/get_image.rb index 87a68789f..69db152ac 100644 --- a/lib/fog/openstack/image/v1/requests/get_image.rb +++ b/lib/fog/image/openstack/v1/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def get_image(image_id) diff --git a/lib/fog/openstack/image/v1/requests/get_image_by_id.rb b/lib/fog/image/openstack/v1/requests/get_image_by_id.rb similarity index 97% rename from lib/fog/openstack/image/v1/requests/get_image_by_id.rb rename to lib/fog/image/openstack/v1/requests/get_image_by_id.rb index ef9441edf..9c2c32e92 100644 --- a/lib/fog/openstack/image/v1/requests/get_image_by_id.rb +++ b/lib/fog/image/openstack/v1/requests/get_image_by_id.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def get_image_by_id(image_id) diff --git a/lib/fog/openstack/image/v1/requests/get_image_members.rb b/lib/fog/image/openstack/v1/requests/get_image_members.rb similarity index 95% rename from lib/fog/openstack/image/v1/requests/get_image_members.rb rename to lib/fog/image/openstack/v1/requests/get_image_members.rb index 89b479b53..55f4917c4 100644 --- a/lib/fog/openstack/image/v1/requests/get_image_members.rb +++ b/lib/fog/image/openstack/v1/requests/get_image_members.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def get_image_members(image_id) diff --git a/lib/fog/openstack/image/v1/requests/get_shared_images.rb b/lib/fog/image/openstack/v1/requests/get_shared_images.rb similarity index 95% rename from lib/fog/openstack/image/v1/requests/get_shared_images.rb rename to lib/fog/image/openstack/v1/requests/get_shared_images.rb index 5c25aac42..82a4bec92 100644 --- a/lib/fog/openstack/image/v1/requests/get_shared_images.rb +++ b/lib/fog/image/openstack/v1/requests/get_shared_images.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def get_shared_images(tenant_id) diff --git a/lib/fog/openstack/image/v1/requests/list_public_images.rb b/lib/fog/image/openstack/v1/requests/list_public_images.rb similarity index 96% rename from lib/fog/openstack/image/v1/requests/list_public_images.rb rename to lib/fog/image/openstack/v1/requests/list_public_images.rb index 34fd231ec..3e48e1557 100644 --- a/lib/fog/openstack/image/v1/requests/list_public_images.rb +++ b/lib/fog/image/openstack/v1/requests/list_public_images.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def list_public_images(options = {}) diff --git a/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb b/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb similarity index 96% rename from lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb rename to lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb index d6c18c623..3e3423553 100644 --- a/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb +++ b/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def list_public_images_detailed(options = {}, query_deprecated = nil) diff --git a/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb b/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb similarity index 94% rename from lib/fog/openstack/image/v1/requests/remove_member_from_image.rb rename to lib/fog/image/openstack/v1/requests/remove_member_from_image.rb index a40e457bb..c23bae900 100644 --- a/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb +++ b/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def remove_member_from_image(image_id, member_id) diff --git a/lib/fog/openstack/image/v1/requests/set_tenant.rb b/lib/fog/image/openstack/v1/requests/set_tenant.rb similarity index 90% rename from lib/fog/openstack/image/v1/requests/set_tenant.rb rename to lib/fog/image/openstack/v1/requests/set_tenant.rb index e973c9bfa..a65b20c12 100644 --- a/lib/fog/openstack/image/v1/requests/set_tenant.rb +++ b/lib/fog/image/openstack/v1/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def set_tenant(tenant) diff --git a/lib/fog/openstack/image/v1/requests/update_image.rb b/lib/fog/image/openstack/v1/requests/update_image.rb similarity index 98% rename from lib/fog/openstack/image/v1/requests/update_image.rb rename to lib/fog/image/openstack/v1/requests/update_image.rb index a7d0e238c..f0242576b 100644 --- a/lib/fog/openstack/image/v1/requests/update_image.rb +++ b/lib/fog/image/openstack/v1/requests/update_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def update_image(attributes) diff --git a/lib/fog/openstack/image/v1/requests/update_image_members.rb b/lib/fog/image/openstack/v1/requests/update_image_members.rb similarity index 96% rename from lib/fog/openstack/image/v1/requests/update_image_members.rb rename to lib/fog/image/openstack/v1/requests/update_image_members.rb index 65751cb34..3a2129ccd 100644 --- a/lib/fog/openstack/image/v1/requests/update_image_members.rb +++ b/lib/fog/image/openstack/v1/requests/update_image_members.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V1 class Real def update_image_members(image_id, members) diff --git a/lib/fog/openstack/image/v2.rb b/lib/fog/image/openstack/v2.rb similarity index 94% rename from lib/fog/openstack/image/v2.rb rename to lib/fog/image/openstack/v2.rb index f613988f9..b7cdc9f2e 100644 --- a/lib/fog/openstack/image/v2.rb +++ b/lib/fog/image/openstack/v2.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/image/image' +require 'fog/image/openstack' module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 < Fog::Service SUPPORTED_VERSIONS = /v2(\.(0|1|2|3))*/ @@ -18,12 +18,12 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/image/v2/models' + model_path 'fog/image/openstack/v2/models' model :image collection :images - request_path 'fog/openstack/image/v2/requests' + request_path 'fog/image/openstack/v2/requests' request :list_images request :get_image @@ -107,7 +107,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Image::NotFound + Fog::Image::OpenStack::NotFound end def default_endpoint_type diff --git a/lib/fog/openstack/image/v2/models/image.rb b/lib/fog/image/openstack/v2/models/image.rb similarity index 99% rename from lib/fog/openstack/image/v2/models/image.rb rename to lib/fog/image/openstack/v2/models/image.rb index 69fcc0c99..52a7b2768 100644 --- a/lib/fog/openstack/image/v2/models/image.rb +++ b/lib/fog/image/openstack/v2/models/image.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Image < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/image/v2/models/images.rb b/lib/fog/image/openstack/v2/models/images.rb similarity index 89% rename from lib/fog/openstack/image/v2/models/images.rb rename to lib/fog/image/openstack/v2/models/images.rb index 4030816ac..f17bdfedf 100644 --- a/lib/fog/openstack/image/v2/models/images.rb +++ b/lib/fog/image/openstack/v2/models/images.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/image/v2/models/image' +require 'fog/image/openstack/v2/models/image' module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Images < Fog::OpenStack::Collection - model Fog::OpenStack::Image::V2::Image + model Fog::Image::OpenStack::V2::Image def all(options = {}) load_response(service.list_images(options), 'images') @@ -18,7 +18,7 @@ def summary(options = {}) def find_by_id(id) new(service.get_image_by_id(id).body) - rescue Fog::OpenStack::Image::NotFound + rescue Fog::Image::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/image/v2/requests/add_member_to_image.rb b/lib/fog/image/openstack/v2/requests/add_member_to_image.rb similarity index 94% rename from lib/fog/openstack/image/v2/requests/add_member_to_image.rb rename to lib/fog/image/openstack/v2/requests/add_member_to_image.rb index 512392f23..1d867a234 100644 --- a/lib/fog/openstack/image/v2/requests/add_member_to_image.rb +++ b/lib/fog/image/openstack/v2/requests/add_member_to_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def add_member_to_image(image_id, tenant_id) diff --git a/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb b/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb similarity index 93% rename from lib/fog/openstack/image/v2/requests/add_tag_to_image.rb rename to lib/fog/image/openstack/v2/requests/add_tag_to_image.rb index 682bd64de..f22e6bdfb 100644 --- a/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb +++ b/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def add_tag_to_image(image_id, tag) diff --git a/lib/fog/openstack/image/v2/requests/create_image.rb b/lib/fog/image/openstack/v2/requests/create_image.rb similarity index 97% rename from lib/fog/openstack/image/v2/requests/create_image.rb rename to lib/fog/image/openstack/v2/requests/create_image.rb index 8c92fe7cb..a3864ee14 100644 --- a/lib/fog/openstack/image/v2/requests/create_image.rb +++ b/lib/fog/image/openstack/v2/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def create_image(image) diff --git a/lib/fog/openstack/image/v2/requests/deactivate_image.rb b/lib/fog/image/openstack/v2/requests/deactivate_image.rb similarity index 93% rename from lib/fog/openstack/image/v2/requests/deactivate_image.rb rename to lib/fog/image/openstack/v2/requests/deactivate_image.rb index 02f8c2c43..f6a7e37a1 100644 --- a/lib/fog/openstack/image/v2/requests/deactivate_image.rb +++ b/lib/fog/image/openstack/v2/requests/deactivate_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def deactivate_image(image_id) diff --git a/lib/fog/openstack/image/v2/requests/delete_image.rb b/lib/fog/image/openstack/v2/requests/delete_image.rb similarity index 93% rename from lib/fog/openstack/image/v2/requests/delete_image.rb rename to lib/fog/image/openstack/v2/requests/delete_image.rb index 8275cd351..257794741 100644 --- a/lib/fog/openstack/image/v2/requests/delete_image.rb +++ b/lib/fog/image/openstack/v2/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def delete_image(image_id) diff --git a/lib/fog/openstack/image/v2/requests/download_image.rb b/lib/fog/image/openstack/v2/requests/download_image.rb similarity index 95% rename from lib/fog/openstack/image/v2/requests/download_image.rb rename to lib/fog/image/openstack/v2/requests/download_image.rb index 76924090d..eb0d306cc 100644 --- a/lib/fog/openstack/image/v2/requests/download_image.rb +++ b/lib/fog/image/openstack/v2/requests/download_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def download_image(image_id, _content_range = nil, params) # TODO: implement content range handling diff --git a/lib/fog/openstack/image/v2/requests/get_image.rb b/lib/fog/image/openstack/v2/requests/get_image.rb similarity index 98% rename from lib/fog/openstack/image/v2/requests/get_image.rb rename to lib/fog/image/openstack/v2/requests/get_image.rb index d686ef716..0c84793f3 100644 --- a/lib/fog/openstack/image/v2/requests/get_image.rb +++ b/lib/fog/image/openstack/v2/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def get_image(image_id) diff --git a/lib/fog/openstack/image/v2/requests/get_image_by_id.rb b/lib/fog/image/openstack/v2/requests/get_image_by_id.rb similarity index 96% rename from lib/fog/openstack/image/v2/requests/get_image_by_id.rb rename to lib/fog/image/openstack/v2/requests/get_image_by_id.rb index 4f9943347..ef7dbcbb7 100644 --- a/lib/fog/openstack/image/v2/requests/get_image_by_id.rb +++ b/lib/fog/image/openstack/v2/requests/get_image_by_id.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def get_image_by_id(image_id) diff --git a/lib/fog/openstack/image/v2/requests/get_image_members.rb b/lib/fog/image/openstack/v2/requests/get_image_members.rb similarity index 95% rename from lib/fog/openstack/image/v2/requests/get_image_members.rb rename to lib/fog/image/openstack/v2/requests/get_image_members.rb index 9f788c7f4..37fa276ba 100644 --- a/lib/fog/openstack/image/v2/requests/get_image_members.rb +++ b/lib/fog/image/openstack/v2/requests/get_image_members.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def get_image_members(image_id) diff --git a/lib/fog/openstack/image/v2/requests/get_member_details.rb b/lib/fog/image/openstack/v2/requests/get_member_details.rb similarity index 96% rename from lib/fog/openstack/image/v2/requests/get_member_details.rb rename to lib/fog/image/openstack/v2/requests/get_member_details.rb index 6d8942ead..88bda499c 100644 --- a/lib/fog/openstack/image/v2/requests/get_member_details.rb +++ b/lib/fog/image/openstack/v2/requests/get_member_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def get_member_details(image_id, member_id) diff --git a/lib/fog/openstack/image/v2/requests/get_shared_images.rb b/lib/fog/image/openstack/v2/requests/get_shared_images.rb similarity index 95% rename from lib/fog/openstack/image/v2/requests/get_shared_images.rb rename to lib/fog/image/openstack/v2/requests/get_shared_images.rb index 9f9479b41..8812a5686 100644 --- a/lib/fog/openstack/image/v2/requests/get_shared_images.rb +++ b/lib/fog/image/openstack/v2/requests/get_shared_images.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def get_shared_images(tenant_id) diff --git a/lib/fog/openstack/image/v2/requests/list_images.rb b/lib/fog/image/openstack/v2/requests/list_images.rb similarity index 96% rename from lib/fog/openstack/image/v2/requests/list_images.rb rename to lib/fog/image/openstack/v2/requests/list_images.rb index e4ac2e794..cd95d7a5f 100644 --- a/lib/fog/openstack/image/v2/requests/list_images.rb +++ b/lib/fog/image/openstack/v2/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def list_images(options = {}) diff --git a/lib/fog/openstack/image/v2/requests/reactivate_image.rb b/lib/fog/image/openstack/v2/requests/reactivate_image.rb similarity index 93% rename from lib/fog/openstack/image/v2/requests/reactivate_image.rb rename to lib/fog/image/openstack/v2/requests/reactivate_image.rb index 49fc76802..b4877c8cd 100644 --- a/lib/fog/openstack/image/v2/requests/reactivate_image.rb +++ b/lib/fog/image/openstack/v2/requests/reactivate_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def reactivate_image(image_id) diff --git a/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb b/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb similarity index 94% rename from lib/fog/openstack/image/v2/requests/remove_member_from_image.rb rename to lib/fog/image/openstack/v2/requests/remove_member_from_image.rb index ef5ee7b76..a9b7fba3a 100644 --- a/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb +++ b/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def remove_member_from_image(image_id, member_id) diff --git a/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb b/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb similarity index 93% rename from lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb rename to lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb index e550f63d3..32a22f3b3 100644 --- a/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb +++ b/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def remove_tag_from_image(image_id, tag) diff --git a/lib/fog/openstack/image/v2/requests/set_tenant.rb b/lib/fog/image/openstack/v2/requests/set_tenant.rb similarity index 90% rename from lib/fog/openstack/image/v2/requests/set_tenant.rb rename to lib/fog/image/openstack/v2/requests/set_tenant.rb index 90e408571..56f1445b7 100644 --- a/lib/fog/openstack/image/v2/requests/set_tenant.rb +++ b/lib/fog/image/openstack/v2/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def set_tenant(tenant) diff --git a/lib/fog/openstack/image/v2/requests/update_image.rb b/lib/fog/image/openstack/v2/requests/update_image.rb similarity index 98% rename from lib/fog/openstack/image/v2/requests/update_image.rb rename to lib/fog/image/openstack/v2/requests/update_image.rb index cead9ed33..4891b1d53 100644 --- a/lib/fog/openstack/image/v2/requests/update_image.rb +++ b/lib/fog/image/openstack/v2/requests/update_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def update_image(id, json_patch) diff --git a/lib/fog/openstack/image/v2/requests/update_image_member.rb b/lib/fog/image/openstack/v2/requests/update_image_member.rb similarity index 96% rename from lib/fog/openstack/image/v2/requests/update_image_member.rb rename to lib/fog/image/openstack/v2/requests/update_image_member.rb index 40fa17a2e..eefc31a20 100644 --- a/lib/fog/openstack/image/v2/requests/update_image_member.rb +++ b/lib/fog/image/openstack/v2/requests/update_image_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def update_image_member(image_id, member) diff --git a/lib/fog/openstack/image/v2/requests/upload_image.rb b/lib/fog/image/openstack/v2/requests/upload_image.rb similarity index 95% rename from lib/fog/openstack/image/v2/requests/upload_image.rb rename to lib/fog/image/openstack/v2/requests/upload_image.rb index e0ef0906b..65d0b20db 100644 --- a/lib/fog/openstack/image/v2/requests/upload_image.rb +++ b/lib/fog/image/openstack/v2/requests/upload_image.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Image + module Image + class OpenStack class V2 class Real def upload_image(image_id, body, params = {}) diff --git a/lib/fog/openstack/introspection/introspection.rb b/lib/fog/introspection/openstack.rb similarity index 85% rename from lib/fog/openstack/introspection/introspection.rb rename to lib/fog/introspection/openstack.rb index 67430dd00..0bd02278a 100644 --- a/lib/fog/openstack/introspection/introspection.rb +++ b/lib/fog/introspection/openstack.rb @@ -1,8 +1,8 @@ require 'yaml' module Fog - module OpenStack - class Introspection < Fog::Service + module Introspection + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v1/ requires :openstack_auth_url @@ -19,7 +19,7 @@ class Introspection < Fog::Service ## REQUESTS # - request_path 'fog/openstack/introspection/requests' + request_path 'fog/introspection/openstack/requests' # Introspection requests request :create_introspection @@ -36,7 +36,7 @@ class Introspection < Fog::Service ## MODELS # - model_path 'fog/openstack/introspection/models' + model_path 'fog/introspection/openstack/models' model :rules collection :rules_collection @@ -44,8 +44,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| # Introspection data is *huge* we load it from a yaml file - file = "test/fixtures/introspection.yaml" - hash[key] = YAML.load(File.read(file)) + file = "../../../../test/fixtures/introspection.yaml" + hash[key] = YAML.load(File.read(File.expand_path(file, __FILE__))) end end @@ -73,7 +73,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Introspection::NotFound + Fog::Introspection::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/introspection/models/rules.rb b/lib/fog/introspection/openstack/models/rules.rb similarity index 93% rename from lib/fog/openstack/introspection/models/rules.rb rename to lib/fog/introspection/openstack/models/rules.rb index acdd3d037..3db449d57 100644 --- a/lib/fog/openstack/introspection/models/rules.rb +++ b/lib/fog/introspection/openstack/models/rules.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Rules < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/openstack/introspection/models/rules_collection.rb b/lib/fog/introspection/openstack/models/rules_collection.rb similarity index 71% rename from lib/fog/openstack/introspection/models/rules_collection.rb rename to lib/fog/introspection/openstack/models/rules_collection.rb index 6b7e8e0db..b6b437a0a 100644 --- a/lib/fog/openstack/introspection/models/rules_collection.rb +++ b/lib/fog/introspection/openstack/models/rules_collection.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/introspection/models/rules' +require 'fog/introspection/openstack/models/rules' module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class RulesCollection < Fog::OpenStack::Collection - model Fog::OpenStack::Introspection::Rules + model Fog::Introspection::OpenStack::Rules def all(_options = {}) load_response(service.list_rules, 'rules') @@ -14,7 +14,7 @@ def all(_options = {}) def get(uuid) data = service.get_rules(uuid).body new(data) - rescue Fog::OpenStack::Introspection::NotFound + rescue Fog::Introspection::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/introspection/requests/abort_introspection.rb b/lib/fog/introspection/openstack/requests/abort_introspection.rb similarity index 91% rename from lib/fog/openstack/introspection/requests/abort_introspection.rb rename to lib/fog/introspection/openstack/requests/abort_introspection.rb index 51f127952..61dcebc94 100644 --- a/lib/fog/openstack/introspection/requests/abort_introspection.rb +++ b/lib/fog/introspection/openstack/requests/abort_introspection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def abort_introspection(node_id) request( diff --git a/lib/fog/openstack/introspection/requests/create_introspection.rb b/lib/fog/introspection/openstack/requests/create_introspection.rb similarity index 94% rename from lib/fog/openstack/introspection/requests/create_introspection.rb rename to lib/fog/introspection/openstack/requests/create_introspection.rb index cc05eeb7c..46ad193ce 100644 --- a/lib/fog/openstack/introspection/requests/create_introspection.rb +++ b/lib/fog/introspection/openstack/requests/create_introspection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def create_introspection(node_id, options = {}) if options diff --git a/lib/fog/openstack/introspection/requests/create_rules.rb b/lib/fog/introspection/openstack/requests/create_rules.rb similarity index 94% rename from lib/fog/openstack/introspection/requests/create_rules.rb rename to lib/fog/introspection/openstack/requests/create_rules.rb index d3332186f..da921cf4a 100644 --- a/lib/fog/openstack/introspection/requests/create_rules.rb +++ b/lib/fog/introspection/openstack/requests/create_rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def create_rules(attributes) attributes_valid = [ diff --git a/lib/fog/openstack/introspection/requests/delete_rules.rb b/lib/fog/introspection/openstack/requests/delete_rules.rb similarity index 90% rename from lib/fog/openstack/introspection/requests/delete_rules.rb rename to lib/fog/introspection/openstack/requests/delete_rules.rb index 6a8eba027..fc254ed05 100644 --- a/lib/fog/openstack/introspection/requests/delete_rules.rb +++ b/lib/fog/introspection/openstack/requests/delete_rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def delete_rules(rule_id) request( diff --git a/lib/fog/openstack/introspection/requests/delete_rules_all.rb b/lib/fog/introspection/openstack/requests/delete_rules_all.rb similarity index 89% rename from lib/fog/openstack/introspection/requests/delete_rules_all.rb rename to lib/fog/introspection/openstack/requests/delete_rules_all.rb index 086296f73..9449e7f0e 100644 --- a/lib/fog/openstack/introspection/requests/delete_rules_all.rb +++ b/lib/fog/introspection/openstack/requests/delete_rules_all.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def delete_rules_all request( diff --git a/lib/fog/openstack/introspection/requests/get_introspection.rb b/lib/fog/introspection/openstack/requests/get_introspection.rb similarity index 91% rename from lib/fog/openstack/introspection/requests/get_introspection.rb rename to lib/fog/introspection/openstack/requests/get_introspection.rb index 04cacb96e..3e8dff436 100644 --- a/lib/fog/openstack/introspection/requests/get_introspection.rb +++ b/lib/fog/introspection/openstack/requests/get_introspection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def get_introspection(node_id) request( diff --git a/lib/fog/openstack/introspection/requests/get_introspection_details.rb b/lib/fog/introspection/openstack/requests/get_introspection_details.rb similarity index 92% rename from lib/fog/openstack/introspection/requests/get_introspection_details.rb rename to lib/fog/introspection/openstack/requests/get_introspection_details.rb index 610c86955..6a4d05d45 100644 --- a/lib/fog/openstack/introspection/requests/get_introspection_details.rb +++ b/lib/fog/introspection/openstack/requests/get_introspection_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def get_introspection_details(node_id) request( diff --git a/lib/fog/openstack/introspection/requests/get_rules.rb b/lib/fog/introspection/openstack/requests/get_rules.rb similarity index 91% rename from lib/fog/openstack/introspection/requests/get_rules.rb rename to lib/fog/introspection/openstack/requests/get_rules.rb index c5df3e31f..32e0ab150 100644 --- a/lib/fog/openstack/introspection/requests/get_rules.rb +++ b/lib/fog/introspection/openstack/requests/get_rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def get_rules(rule_id) request( diff --git a/lib/fog/openstack/introspection/requests/list_rules.rb b/lib/fog/introspection/openstack/requests/list_rules.rb similarity index 90% rename from lib/fog/openstack/introspection/requests/list_rules.rb rename to lib/fog/introspection/openstack/requests/list_rules.rb index c05261574..5439da840 100644 --- a/lib/fog/openstack/introspection/requests/list_rules.rb +++ b/lib/fog/introspection/openstack/requests/list_rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Introspection + module Introspection + class OpenStack class Real def list_rules request( diff --git a/lib/fog/openstack/key_manager/key_manager.rb b/lib/fog/key_manager/openstack.rb similarity index 94% rename from lib/fog/openstack/key_manager/key_manager.rb rename to lib/fog/key_manager/openstack.rb index 5c411cc31..dc56d3f90 100644 --- a/lib/fog/openstack/key_manager/key_manager.rb +++ b/lib/fog/key_manager/openstack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager < Fog::Service + module KeyManager + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v1(\.0)*/ requires :openstack_auth_url @@ -18,7 +18,7 @@ class KeyManager < Fog::Service ## MODELS # - model_path 'fog/openstack/key_manager/models' + model_path 'fog/key_manager/openstack/models' model :secret collection :secrets model :container @@ -28,7 +28,7 @@ class KeyManager < Fog::Service ## REQUESTS # secrets - request_path 'fog/openstack/key_manager/requests' + request_path 'fog/key_manager/openstack/requests' request :create_secret request :list_secrets request :get_secret @@ -93,7 +93,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::KeyManager::NotFound + Fog::KeyManager::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/key_manager/models/acl.rb b/lib/fog/key_manager/openstack/models/acl.rb similarity index 90% rename from lib/fog/openstack/key_manager/models/acl.rb rename to lib/fog/key_manager/openstack/models/acl.rb index 1b52d7cfa..9602e8451 100644 --- a/lib/fog/openstack/key_manager/models/acl.rb +++ b/lib/fog/key_manager/openstack/models/acl.rb @@ -2,8 +2,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class ACL < Fog::OpenStack::Model identity :acl_ref diff --git a/lib/fog/openstack/key_manager/models/container.rb b/lib/fog/key_manager/openstack/models/container.rb similarity index 94% rename from lib/fog/openstack/key_manager/models/container.rb rename to lib/fog/key_manager/openstack/models/container.rb index 4d5fb89ca..3ebd6511e 100644 --- a/lib/fog/openstack/key_manager/models/container.rb +++ b/lib/fog/key_manager/openstack/models/container.rb @@ -2,8 +2,8 @@ require 'uri' module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Container < Fog::OpenStack::Model identity :container_ref @@ -41,4 +41,4 @@ def destroy end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/models/containers.rb b/lib/fog/key_manager/openstack/models/containers.rb similarity index 66% rename from lib/fog/openstack/key_manager/models/containers.rb rename to lib/fog/key_manager/openstack/models/containers.rb index 0df3c9762..ea73a8d73 100644 --- a/lib/fog/openstack/key_manager/models/containers.rb +++ b/lib/fog/key_manager/openstack/models/containers.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/key_manager/models/container' +require 'fog/key_manager/openstack/models/container' module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Containers < Fog::OpenStack::Collection - model Fog::OpenStack::KeyManager::Container + model Fog::KeyManager::OpenStack::Container def all(options = {}) load_response(service.list_containers(options), 'containers') @@ -15,11 +15,11 @@ def get(secret_ref) if secret = service.get_container(secret_ref).body new(secret) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/models/secret.rb b/lib/fog/key_manager/openstack/models/secret.rb similarity index 95% rename from lib/fog/openstack/key_manager/models/secret.rb rename to lib/fog/key_manager/openstack/models/secret.rb index af55f07de..06c63652c 100644 --- a/lib/fog/openstack/key_manager/models/secret.rb +++ b/lib/fog/key_manager/openstack/models/secret.rb @@ -2,8 +2,8 @@ require 'uri' module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Secret < Fog::OpenStack::Model identity :secret_ref @@ -50,4 +50,4 @@ def destroy end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/models/secrets.rb b/lib/fog/key_manager/openstack/models/secrets.rb similarity index 66% rename from lib/fog/openstack/key_manager/models/secrets.rb rename to lib/fog/key_manager/openstack/models/secrets.rb index 5d133965d..6858b5e12 100644 --- a/lib/fog/openstack/key_manager/models/secrets.rb +++ b/lib/fog/key_manager/openstack/models/secrets.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/key_manager/models/secret' +require 'fog/key_manager/openstack/models/secret' module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Secrets < Fog::OpenStack::Collection - model Fog::OpenStack::KeyManager::Secret + model Fog::KeyManager::OpenStack::Secret def all(options = {}) load_response(service.list_secrets(options), 'secrets') @@ -15,11 +15,11 @@ def get(secret_ref) if secret = service.get_secret(secret_ref).body new(secret) end - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/create_container.rb b/lib/fog/key_manager/openstack/requests/create_container.rb similarity index 87% rename from lib/fog/openstack/key_manager/requests/create_container.rb rename to lib/fog/key_manager/openstack/requests/create_container.rb index 3ce4b3a0e..283e9b9a5 100644 --- a/lib/fog/openstack/key_manager/requests/create_container.rb +++ b/lib/fog/key_manager/openstack/requests/create_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def create_container(options) request( @@ -16,4 +16,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/create_secret.rb b/lib/fog/key_manager/openstack/requests/create_secret.rb similarity index 87% rename from lib/fog/openstack/key_manager/requests/create_secret.rb rename to lib/fog/key_manager/openstack/requests/create_secret.rb index fad47e055..03914933f 100644 --- a/lib/fog/openstack/key_manager/requests/create_secret.rb +++ b/lib/fog/key_manager/openstack/requests/create_secret.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def create_secret(options) request( @@ -16,4 +16,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/delete_container.rb b/lib/fog/key_manager/openstack/requests/delete_container.rb similarity index 85% rename from lib/fog/openstack/key_manager/requests/delete_container.rb rename to lib/fog/key_manager/openstack/requests/delete_container.rb index 571ae2a98..ef0fa356e 100644 --- a/lib/fog/openstack/key_manager/requests/delete_container.rb +++ b/lib/fog/key_manager/openstack/requests/delete_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def delete_container(id) request( @@ -15,4 +15,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/delete_container_acl.rb b/lib/fog/key_manager/openstack/requests/delete_container_acl.rb similarity index 91% rename from lib/fog/openstack/key_manager/requests/delete_container_acl.rb rename to lib/fog/key_manager/openstack/requests/delete_container_acl.rb index 803712bc8..bf19f5e2d 100644 --- a/lib/fog/openstack/key_manager/requests/delete_container_acl.rb +++ b/lib/fog/key_manager/openstack/requests/delete_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def delete_container_acl(uuid) request( diff --git a/lib/fog/openstack/key_manager/requests/delete_secret.rb b/lib/fog/key_manager/openstack/requests/delete_secret.rb similarity index 85% rename from lib/fog/openstack/key_manager/requests/delete_secret.rb rename to lib/fog/key_manager/openstack/requests/delete_secret.rb index d5f439c3a..5d4201187 100644 --- a/lib/fog/openstack/key_manager/requests/delete_secret.rb +++ b/lib/fog/key_manager/openstack/requests/delete_secret.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def delete_secret(id) request( @@ -15,4 +15,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb b/lib/fog/key_manager/openstack/requests/delete_secret_acl.rb similarity index 91% rename from lib/fog/openstack/key_manager/requests/delete_secret_acl.rb rename to lib/fog/key_manager/openstack/requests/delete_secret_acl.rb index 446d8ff4a..7ff365869 100644 --- a/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb +++ b/lib/fog/key_manager/openstack/requests/delete_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def delete_secret_acl(uuid) request( diff --git a/lib/fog/openstack/key_manager/requests/get_container.rb b/lib/fog/key_manager/openstack/requests/get_container.rb similarity index 85% rename from lib/fog/openstack/key_manager/requests/get_container.rb rename to lib/fog/key_manager/openstack/requests/get_container.rb index b8293f7ba..4b5684a74 100644 --- a/lib/fog/openstack/key_manager/requests/get_container.rb +++ b/lib/fog/key_manager/openstack/requests/get_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def get_container(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/get_container_acl.rb b/lib/fog/key_manager/openstack/requests/get_container_acl.rb similarity index 94% rename from lib/fog/openstack/key_manager/requests/get_container_acl.rb rename to lib/fog/key_manager/openstack/requests/get_container_acl.rb index 07c33ca93..3523a6f69 100644 --- a/lib/fog/openstack/key_manager/requests/get_container_acl.rb +++ b/lib/fog/key_manager/openstack/requests/get_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def get_container_acl(uuid) request( diff --git a/lib/fog/openstack/key_manager/requests/get_secret.rb b/lib/fog/key_manager/openstack/requests/get_secret.rb similarity index 85% rename from lib/fog/openstack/key_manager/requests/get_secret.rb rename to lib/fog/key_manager/openstack/requests/get_secret.rb index 52814f8f7..0085f75ec 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret.rb +++ b/lib/fog/key_manager/openstack/requests/get_secret.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def get_secret(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/get_secret_acl.rb b/lib/fog/key_manager/openstack/requests/get_secret_acl.rb similarity index 94% rename from lib/fog/openstack/key_manager/requests/get_secret_acl.rb rename to lib/fog/key_manager/openstack/requests/get_secret_acl.rb index 5205edecf..6f5c2f1c6 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret_acl.rb +++ b/lib/fog/key_manager/openstack/requests/get_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def get_secret_acl(uuid) request( diff --git a/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb b/lib/fog/key_manager/openstack/requests/get_secret_metadata.rb similarity index 86% rename from lib/fog/openstack/key_manager/requests/get_secret_metadata.rb rename to lib/fog/key_manager/openstack/requests/get_secret_metadata.rb index 05ae2fc98..a91a00391 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb +++ b/lib/fog/key_manager/openstack/requests/get_secret_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def get_secret_metadata(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/get_secret_payload.rb b/lib/fog/key_manager/openstack/requests/get_secret_payload.rb similarity index 88% rename from lib/fog/openstack/key_manager/requests/get_secret_payload.rb rename to lib/fog/key_manager/openstack/requests/get_secret_payload.rb index 042855c51..29a3ec0f2 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret_payload.rb +++ b/lib/fog/key_manager/openstack/requests/get_secret_payload.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def get_secret_payload(uuid) request( @@ -18,4 +18,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/list_containers.rb b/lib/fog/key_manager/openstack/requests/list_containers.rb similarity index 87% rename from lib/fog/openstack/key_manager/requests/list_containers.rb rename to lib/fog/key_manager/openstack/requests/list_containers.rb index f89b699c1..cd0f2cdbe 100644 --- a/lib/fog/openstack/key_manager/requests/list_containers.rb +++ b/lib/fog/key_manager/openstack/requests/list_containers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def list_containers(options = {}) request( @@ -16,4 +16,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/list_secrets.rb b/lib/fog/key_manager/openstack/requests/list_secrets.rb similarity index 86% rename from lib/fog/openstack/key_manager/requests/list_secrets.rb rename to lib/fog/key_manager/openstack/requests/list_secrets.rb index 612da0d7b..7bbbbce41 100644 --- a/lib/fog/openstack/key_manager/requests/list_secrets.rb +++ b/lib/fog/key_manager/openstack/requests/list_secrets.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def list_secrets(options = {}) request( @@ -16,4 +16,4 @@ class Mock end end end -end +end \ No newline at end of file diff --git a/lib/fog/openstack/key_manager/requests/replace_container_acl.rb b/lib/fog/key_manager/openstack/requests/replace_container_acl.rb similarity index 94% rename from lib/fog/openstack/key_manager/requests/replace_container_acl.rb rename to lib/fog/key_manager/openstack/requests/replace_container_acl.rb index 24ec6fb12..50000cec8 100644 --- a/lib/fog/openstack/key_manager/requests/replace_container_acl.rb +++ b/lib/fog/key_manager/openstack/requests/replace_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def replace_container_acl(uuid, options) request( diff --git a/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb b/lib/fog/key_manager/openstack/requests/replace_secret_acl.rb similarity index 93% rename from lib/fog/openstack/key_manager/requests/replace_secret_acl.rb rename to lib/fog/key_manager/openstack/requests/replace_secret_acl.rb index 62559ebaa..e4960c7b9 100644 --- a/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb +++ b/lib/fog/key_manager/openstack/requests/replace_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def replace_secret_acl(uuid, options) request( diff --git a/lib/fog/openstack/key_manager/requests/update_container_acl.rb b/lib/fog/key_manager/openstack/requests/update_container_acl.rb similarity index 94% rename from lib/fog/openstack/key_manager/requests/update_container_acl.rb rename to lib/fog/key_manager/openstack/requests/update_container_acl.rb index f65ccdff2..01657b1c9 100644 --- a/lib/fog/openstack/key_manager/requests/update_container_acl.rb +++ b/lib/fog/key_manager/openstack/requests/update_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def update_container_acl(uuid, options) request( diff --git a/lib/fog/openstack/key_manager/requests/update_secret_acl.rb b/lib/fog/key_manager/openstack/requests/update_secret_acl.rb similarity index 93% rename from lib/fog/openstack/key_manager/requests/update_secret_acl.rb rename to lib/fog/key_manager/openstack/requests/update_secret_acl.rb index 3bca98a31..d92bc55e1 100644 --- a/lib/fog/openstack/key_manager/requests/update_secret_acl.rb +++ b/lib/fog/key_manager/openstack/requests/update_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class KeyManager + module KeyManager + class OpenStack class Real def update_secret_acl(uuid, options) request( diff --git a/lib/fog/openstack/metering/metering.rb b/lib/fog/metering/openstack.rb similarity index 94% rename from lib/fog/openstack/metering/metering.rb rename to lib/fog/metering/openstack.rb index ab6d9c294..bd0f84d7f 100644 --- a/lib/fog/openstack/metering/metering.rb +++ b/lib/fog/metering/openstack.rb @@ -1,8 +1,8 @@ module Fog - module OpenStack - class Metering < Fog::Service + module Metering + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v2/ requires :openstack_auth_url @@ -17,7 +17,7 @@ class Metering < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/metering/models' + model_path 'fog/metering/openstack/models' model :resource collection :resources @@ -26,7 +26,7 @@ class Metering < Fog::Service model :event collection :events - request_path 'fog/openstack/metering/requests' + request_path 'fog/metering/openstack/requests' # Metering request :get_event @@ -97,7 +97,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Metering::NotFound + Fog::Metering::OpenStack::NotFound end def default_endpoint_type diff --git a/lib/fog/openstack/metering/models/event.rb b/lib/fog/metering/openstack/models/event.rb similarity index 87% rename from lib/fog/openstack/metering/models/event.rb rename to lib/fog/metering/openstack/models/event.rb index 7cf900642..606ebc0c1 100644 --- a/lib/fog/openstack/metering/models/event.rb +++ b/lib/fog/metering/openstack/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Event < Fog::OpenStack::Model identity :message_id diff --git a/lib/fog/openstack/metering/models/events.rb b/lib/fog/metering/openstack/models/events.rb similarity index 66% rename from lib/fog/openstack/metering/models/events.rb rename to lib/fog/metering/openstack/models/events.rb index 8b12e73e9..01af6f5a1 100644 --- a/lib/fog/openstack/metering/models/events.rb +++ b/lib/fog/metering/openstack/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/metering/models/event' +require 'fog/metering/openstack/models/event' module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Events < Fog::OpenStack::Collection - model Fog::OpenStack::Metering::Event + model Fog::Metering::OpenStack::Event def all(q = []) load_response(service.list_events(q)) @@ -14,7 +14,7 @@ def all(q = []) def find_by_id(message_id) event = service.get_event(message_id).body new(event) - rescue Fog::OpenStack::Metering::NotFound + rescue Fog::Metering::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/metering/models/meter.rb b/lib/fog/metering/openstack/models/meter.rb similarity index 100% rename from lib/fog/openstack/metering/models/meter.rb rename to lib/fog/metering/openstack/models/meter.rb diff --git a/lib/fog/openstack/metering/models/meters.rb b/lib/fog/metering/openstack/models/meters.rb similarity index 100% rename from lib/fog/openstack/metering/models/meters.rb rename to lib/fog/metering/openstack/models/meters.rb diff --git a/lib/fog/openstack/metering/models/resource.rb b/lib/fog/metering/openstack/models/resource.rb similarity index 86% rename from lib/fog/openstack/metering/models/resource.rb rename to lib/fog/metering/openstack/models/resource.rb index 78fe5086a..9d08cfe23 100644 --- a/lib/fog/openstack/metering/models/resource.rb +++ b/lib/fog/metering/openstack/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Resource < Fog::OpenStack::Model identity :resource_id diff --git a/lib/fog/openstack/metering/models/resources.rb b/lib/fog/metering/openstack/models/resources.rb similarity index 66% rename from lib/fog/openstack/metering/models/resources.rb rename to lib/fog/metering/openstack/models/resources.rb index 93acfb551..048861625 100644 --- a/lib/fog/openstack/metering/models/resources.rb +++ b/lib/fog/metering/openstack/models/resources.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/metering/models/resource' +require 'fog/metering/openstack/models/resource' module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Resources < Fog::OpenStack::Collection - model Fog::OpenStack::Metering::Resource + model Fog::Metering::OpenStack::Resource def all(_detailed = true) load_response(service.list_resources) @@ -14,7 +14,7 @@ def all(_detailed = true) def find_by_id(resource_id) resource = service.get_resource(resource_id).body new(resource) - rescue Fog::OpenStack::Metering::NotFound + rescue Fog::Metering::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/metering/requests/get_event.rb b/lib/fog/metering/openstack/requests/get_event.rb similarity index 93% rename from lib/fog/openstack/metering/requests/get_event.rb rename to lib/fog/metering/openstack/requests/get_event.rb index 26d92b355..6738f426c 100644 --- a/lib/fog/openstack/metering/requests/get_event.rb +++ b/lib/fog/metering/openstack/requests/get_event.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def get_event(message_id) request( diff --git a/lib/fog/openstack/metering/requests/get_resource.rb b/lib/fog/metering/openstack/requests/get_resource.rb similarity index 94% rename from lib/fog/openstack/metering/requests/get_resource.rb rename to lib/fog/metering/openstack/requests/get_resource.rb index 8a807c3a1..f878e4526 100644 --- a/lib/fog/openstack/metering/requests/get_resource.rb +++ b/lib/fog/metering/openstack/requests/get_resource.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def get_resource(resource_id) request( diff --git a/lib/fog/openstack/metering/requests/get_samples.rb b/lib/fog/metering/openstack/requests/get_samples.rb similarity index 97% rename from lib/fog/openstack/metering/requests/get_samples.rb rename to lib/fog/metering/openstack/requests/get_samples.rb index 791b6b9e7..58dd6707c 100644 --- a/lib/fog/openstack/metering/requests/get_samples.rb +++ b/lib/fog/metering/openstack/requests/get_samples.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def get_samples(meter_id, options = [], limit = 10000000) data = { diff --git a/lib/fog/openstack/metering/requests/get_statistics.rb b/lib/fog/metering/openstack/requests/get_statistics.rb similarity index 97% rename from lib/fog/openstack/metering/requests/get_statistics.rb rename to lib/fog/metering/openstack/requests/get_statistics.rb index 841666b96..b0905b7ee 100644 --- a/lib/fog/openstack/metering/requests/get_statistics.rb +++ b/lib/fog/metering/openstack/requests/get_statistics.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def get_statistics(meter_id, options = {}) data = { diff --git a/lib/fog/openstack/metering/requests/list_events.rb b/lib/fog/metering/openstack/requests/list_events.rb similarity index 95% rename from lib/fog/openstack/metering/requests/list_events.rb rename to lib/fog/metering/openstack/requests/list_events.rb index e94ac857b..06f3f927c 100644 --- a/lib/fog/openstack/metering/requests/list_events.rb +++ b/lib/fog/metering/openstack/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def list_events(options = []) data = { diff --git a/lib/fog/openstack/metering/requests/list_meters.rb b/lib/fog/metering/openstack/requests/list_meters.rb similarity index 96% rename from lib/fog/openstack/metering/requests/list_meters.rb rename to lib/fog/metering/openstack/requests/list_meters.rb index 728797d0d..99b857c45 100644 --- a/lib/fog/openstack/metering/requests/list_meters.rb +++ b/lib/fog/metering/openstack/requests/list_meters.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def list_meters(options = []) data = { diff --git a/lib/fog/openstack/metering/requests/list_resources.rb b/lib/fog/metering/openstack/requests/list_resources.rb similarity index 94% rename from lib/fog/openstack/metering/requests/list_resources.rb rename to lib/fog/metering/openstack/requests/list_resources.rb index 4b574fe9b..910ced8e1 100644 --- a/lib/fog/openstack/metering/requests/list_resources.rb +++ b/lib/fog/metering/openstack/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metering + module Metering + class OpenStack class Real def list_resources(_options = {}) request( diff --git a/lib/fog/openstack/metric/metric.rb b/lib/fog/metric/openstack.rb similarity index 94% rename from lib/fog/openstack/metric/metric.rb rename to lib/fog/metric/openstack.rb index 3feed8b09..08144e5eb 100644 --- a/lib/fog/openstack/metric/metric.rb +++ b/lib/fog/metric/openstack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric < Fog::Service + module Metric + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v1/ requires :openstack_auth_url @@ -15,14 +15,14 @@ class Metric < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/metric/models' + model_path 'fog/metric/openstack/models' model :metric collection :metrics model :resource collection :resources - request_path 'fog/openstack/metric/requests' + request_path 'fog/metric/openstack/requests' request :get_resource_metric_measures request :get_metric_measures @@ -95,7 +95,7 @@ def default_path_prefix end def self.not_found_class - Fog::OpenStack::Metric::NotFound + Fog::Metric::OpenStack::NotFound end def default_service_type diff --git a/lib/fog/openstack/metric/models/metric.rb b/lib/fog/metric/openstack/models/metric.rb similarity index 90% rename from lib/fog/openstack/metric/models/metric.rb rename to lib/fog/metric/openstack/models/metric.rb index fda7bce88..aedf0ca50 100644 --- a/lib/fog/openstack/metric/models/metric.rb +++ b/lib/fog/metric/openstack/models/metric.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Metric < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/metric/models/metrics.rb b/lib/fog/metric/openstack/models/metrics.rb similarity index 71% rename from lib/fog/openstack/metric/models/metrics.rb rename to lib/fog/metric/openstack/models/metrics.rb index 594e5c3ac..c68f8a12e 100644 --- a/lib/fog/openstack/metric/models/metrics.rb +++ b/lib/fog/metric/openstack/models/metrics.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/metric/models/metric' +require 'fog/metric/openstack/models/metric' module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Metrics < Fog::OpenStack::Collection - model Fog::OpenStack::Metric::Metric + model Fog::Metric::OpenStack::Metric def all(options = {}) load_response(service.list_metrics(options)) @@ -15,14 +15,14 @@ def all(options = {}) def find_by_id(metric_id) resource = service.get_metric(metric_id).body new(resource) - rescue Fog::OpenStack::Metric::NotFound + rescue Fog::Metric::OpenStack::NotFound nil end def find_measures_by_id(metric_id, options = {}) resource = service.get_metric_measures(metric_id, options).body new(resource) - rescue Fog::OpenStack::Metric::NotFound + rescue Fog::Metric::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/metric/models/resource.rb b/lib/fog/metric/openstack/models/resource.rb similarity index 88% rename from lib/fog/openstack/metric/models/resource.rb rename to lib/fog/metric/openstack/models/resource.rb index 5524c31a3..772d72a96 100644 --- a/lib/fog/openstack/metric/models/resource.rb +++ b/lib/fog/metric/openstack/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Resource < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/metric/models/resources.rb b/lib/fog/metric/openstack/models/resources.rb similarity index 68% rename from lib/fog/openstack/metric/models/resources.rb rename to lib/fog/metric/openstack/models/resources.rb index d58807c18..b0edaa6af 100644 --- a/lib/fog/openstack/metric/models/resources.rb +++ b/lib/fog/metric/openstack/models/resources.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/metric/models/resource' +require 'fog/metric/openstack/models/resource' module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Resources < Fog::OpenStack::Collection - model Fog::OpenStack::Metric::Resource + model Fog::Metric::OpenStack::Resource def all(options = {}) load_response(service.list_resources(options)) @@ -15,7 +15,7 @@ def all(options = {}) def find_by_id(resource_id) resource = service.get_resource(resource_id).body new(resource) - rescue Fog::OpenStack::Metric::NotFound + rescue Fog::Metric::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/metric/requests/get_metric.rb b/lib/fog/metric/openstack/requests/get_metric.rb similarity index 98% rename from lib/fog/openstack/metric/requests/get_metric.rb rename to lib/fog/metric/openstack/requests/get_metric.rb index 3bbfd904b..f2f7f7556 100644 --- a/lib/fog/openstack/metric/requests/get_metric.rb +++ b/lib/fog/metric/openstack/requests/get_metric.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Real def get_metric(metric_id) request( diff --git a/lib/fog/openstack/metric/requests/get_metric_measures.rb b/lib/fog/metric/openstack/requests/get_metric_measures.rb similarity index 96% rename from lib/fog/openstack/metric/requests/get_metric_measures.rb rename to lib/fog/metric/openstack/requests/get_metric_measures.rb index 21b207a42..9f8ee1374 100644 --- a/lib/fog/openstack/metric/requests/get_metric_measures.rb +++ b/lib/fog/metric/openstack/requests/get_metric_measures.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Real def get_metric_measures(metric_id, options = {}) request( diff --git a/lib/fog/openstack/metric/requests/get_resource.rb b/lib/fog/metric/openstack/requests/get_resource.rb similarity index 97% rename from lib/fog/openstack/metric/requests/get_resource.rb rename to lib/fog/metric/openstack/requests/get_resource.rb index 33f9f994e..486070bc0 100644 --- a/lib/fog/openstack/metric/requests/get_resource.rb +++ b/lib/fog/metric/openstack/requests/get_resource.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Real def get_resource(resource_id) request( diff --git a/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb b/lib/fog/metric/openstack/requests/get_resource_metric_measures.rb similarity index 96% rename from lib/fog/openstack/metric/requests/get_resource_metric_measures.rb rename to lib/fog/metric/openstack/requests/get_resource_metric_measures.rb index 91dbc33bb..c188a7a93 100644 --- a/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb +++ b/lib/fog/metric/openstack/requests/get_resource_metric_measures.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Real def get_resource_metric_measures(resource_id, metric_name, options = {}) request( diff --git a/lib/fog/openstack/metric/requests/list_metrics.rb b/lib/fog/metric/openstack/requests/list_metrics.rb similarity index 99% rename from lib/fog/openstack/metric/requests/list_metrics.rb rename to lib/fog/metric/openstack/requests/list_metrics.rb index 736fb9dd2..830d773b9 100644 --- a/lib/fog/openstack/metric/requests/list_metrics.rb +++ b/lib/fog/metric/openstack/requests/list_metrics.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Real def list_metrics(options = {}) request( diff --git a/lib/fog/openstack/metric/requests/list_resources.rb b/lib/fog/metric/openstack/requests/list_resources.rb similarity index 98% rename from lib/fog/openstack/metric/requests/list_resources.rb rename to lib/fog/metric/openstack/requests/list_resources.rb index 2b32f609e..57d59d9db 100644 --- a/lib/fog/openstack/metric/requests/list_resources.rb +++ b/lib/fog/metric/openstack/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Metric + module Metric + class OpenStack class Real def list_resources(type = "generic", options = {}) request( diff --git a/lib/fog/openstack/monitoring/monitoring.rb b/lib/fog/monitoring/openstack.rb similarity index 92% rename from lib/fog/openstack/monitoring/monitoring.rb rename to lib/fog/monitoring/openstack.rb index 85f60452b..bd8141c3c 100644 --- a/lib/fog/openstack/monitoring/monitoring.rb +++ b/lib/fog/monitoring/openstack.rb @@ -1,7 +1,7 @@ module Fog - module OpenStack - class Monitoring < Fog::Service + module Monitoring + class OpenStack < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -14,7 +14,7 @@ class Monitoring < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - model_path 'fog/openstack/monitoring/models' + model_path 'fog/monitoring/openstack/models' model :metric collection :metrics model :measurement @@ -33,7 +33,7 @@ class Monitoring < Fog::Service collection :alarm_counts model :dimension_value - request_path 'fog/openstack/monitoring/requests' + request_path 'fog/monitoring/openstack/requests' request :create_metric request :create_metric_array request :list_metrics @@ -75,7 +75,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Monitoring::NotFound + Fog::Monitoring::OpenStack::NotFound end def default_service_type diff --git a/lib/fog/openstack/monitoring/models/alarm.rb b/lib/fog/monitoring/openstack/models/alarm.rb similarity index 95% rename from lib/fog/openstack/monitoring/models/alarm.rb rename to lib/fog/monitoring/openstack/models/alarm.rb index eafba1074..c42f20ff4 100644 --- a/lib/fog/openstack/monitoring/models/alarm.rb +++ b/lib/fog/monitoring/openstack/models/alarm.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Alarm < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/alarm_count.rb b/lib/fog/monitoring/openstack/models/alarm_count.rb similarity index 86% rename from lib/fog/openstack/monitoring/models/alarm_count.rb rename to lib/fog/monitoring/openstack/models/alarm_count.rb index af982eec0..afd2d5aa3 100644 --- a/lib/fog/openstack/monitoring/models/alarm_count.rb +++ b/lib/fog/monitoring/openstack/models/alarm_count.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class AlarmCount < Fog::OpenStack::Model attribute :links attribute :columns diff --git a/lib/fog/openstack/monitoring/models/alarm_counts.rb b/lib/fog/monitoring/openstack/models/alarm_counts.rb similarity index 61% rename from lib/fog/openstack/monitoring/models/alarm_counts.rb rename to lib/fog/monitoring/openstack/models/alarm_counts.rb index 7e340e988..9b2070c87 100644 --- a/lib/fog/openstack/monitoring/models/alarm_counts.rb +++ b/lib/fog/monitoring/openstack/models/alarm_counts.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/alarm_count' +require 'fog/monitoring/openstack/models/alarm_count' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class AlarmCounts < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::AlarmCount + model Fog::Monitoring::OpenStack::AlarmCount def get(options = {}) load_response(service.get_alarm_counts(options)) diff --git a/lib/fog/openstack/monitoring/models/alarm_definition.rb b/lib/fog/monitoring/openstack/models/alarm_definition.rb similarity index 96% rename from lib/fog/openstack/monitoring/models/alarm_definition.rb rename to lib/fog/monitoring/openstack/models/alarm_definition.rb index af7ba6839..3938f0b8b 100644 --- a/lib/fog/openstack/monitoring/models/alarm_definition.rb +++ b/lib/fog/monitoring/openstack/models/alarm_definition.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class AlarmDefinition < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/alarm_definitions.rb b/lib/fog/monitoring/openstack/models/alarm_definitions.rb similarity index 81% rename from lib/fog/openstack/monitoring/models/alarm_definitions.rb rename to lib/fog/monitoring/openstack/models/alarm_definitions.rb index 0366033fe..a1b5451c0 100644 --- a/lib/fog/openstack/monitoring/models/alarm_definitions.rb +++ b/lib/fog/monitoring/openstack/models/alarm_definitions.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/alarm_definition' +require 'fog/monitoring/openstack/models/alarm_definition' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class AlarmDefinitions < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::AlarmDefinition + model Fog::Monitoring::OpenStack::AlarmDefinition def create(attributes) super(attributes) @@ -27,7 +27,7 @@ def find_by_id(id) cached_alarm_definition = detect { |alarm_definition| alarm_definition.id == id } return cached_alarm_definition if cached_alarm_definition alarm_definition_hash = service.get_alarm_definition(id).body - Fog::OpenStack::Monitoring::AlarmDefinition.new( + Fog::Monitoring::OpenStack::AlarmDefinition.new( alarm_definition_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/monitoring/models/alarm_state.rb b/lib/fog/monitoring/openstack/models/alarm_state.rb similarity index 93% rename from lib/fog/openstack/monitoring/models/alarm_state.rb rename to lib/fog/monitoring/openstack/models/alarm_state.rb index 0b5be8907..8dc34052e 100644 --- a/lib/fog/openstack/monitoring/models/alarm_state.rb +++ b/lib/fog/monitoring/openstack/models/alarm_state.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class AlarmState < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/alarm_states.rb b/lib/fog/monitoring/openstack/models/alarm_states.rb similarity index 75% rename from lib/fog/openstack/monitoring/models/alarm_states.rb rename to lib/fog/monitoring/openstack/models/alarm_states.rb index 4bef0a5a6..87fa6e5f0 100644 --- a/lib/fog/openstack/monitoring/models/alarm_states.rb +++ b/lib/fog/monitoring/openstack/models/alarm_states.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/alarm_state' +require 'fog/monitoring/openstack/models/alarm_state' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class AlarmStates < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::AlarmState + model Fog::Monitoring::OpenStack::AlarmState def all(options = {}) load_response(service.list_alarm_state_history_for_all_alarms(options), 'elements') diff --git a/lib/fog/openstack/monitoring/models/alarms.rb b/lib/fog/monitoring/openstack/models/alarms.rb similarity index 76% rename from lib/fog/openstack/monitoring/models/alarms.rb rename to lib/fog/monitoring/openstack/models/alarms.rb index f3aa14f1a..0a89ff5ea 100644 --- a/lib/fog/openstack/monitoring/models/alarms.rb +++ b/lib/fog/monitoring/openstack/models/alarms.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/alarm' +require 'fog/monitoring/openstack/models/alarm' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Alarms < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::Alarm + model Fog::Monitoring::OpenStack::Alarm def all(options = {}) load_response(service.list_alarms(options), 'elements') @@ -15,7 +15,7 @@ def find_by_id(id) cached_alarm = detect { |alarm| alarm.id == id } return cached_alarm if cached_alarm alarm_hash = service.get_alarm(id).body - Fog::OpenStack::Monitoring::Alarm.new( + Fog::Monitoring::OpenStack::Alarm.new( alarm_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/monitoring/models/dimension_value.rb b/lib/fog/monitoring/openstack/models/dimension_value.rb similarity index 87% rename from lib/fog/openstack/monitoring/models/dimension_value.rb rename to lib/fog/monitoring/openstack/models/dimension_value.rb index 4946bf798..8595f884a 100644 --- a/lib/fog/openstack/monitoring/models/dimension_value.rb +++ b/lib/fog/monitoring/openstack/models/dimension_value.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class DimensionValue < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/dimension_values.rb b/lib/fog/monitoring/openstack/models/dimension_values.rb similarity index 65% rename from lib/fog/openstack/monitoring/models/dimension_values.rb rename to lib/fog/monitoring/openstack/models/dimension_values.rb index d6457dab5..05fd95d8a 100644 --- a/lib/fog/openstack/monitoring/models/dimension_values.rb +++ b/lib/fog/monitoring/openstack/models/dimension_values.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/dimension_value' +require 'fog/monitoring/openstack/models/dimension_value' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class DimensionValues < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::DimensionValue + model Fog::Monitoring::OpenStack::DimensionValue def all(dimension_name, options = {}) load_response(service.list_dimension_values(dimension_name, options), 'elements') diff --git a/lib/fog/openstack/monitoring/models/measurement.rb b/lib/fog/monitoring/openstack/models/measurement.rb similarity index 88% rename from lib/fog/openstack/monitoring/models/measurement.rb rename to lib/fog/monitoring/openstack/models/measurement.rb index de2d72e5b..fdbc27c72 100644 --- a/lib/fog/openstack/monitoring/models/measurement.rb +++ b/lib/fog/monitoring/openstack/models/measurement.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Measurement < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/measurements.rb b/lib/fog/monitoring/openstack/models/measurements.rb similarity index 63% rename from lib/fog/openstack/monitoring/models/measurements.rb rename to lib/fog/monitoring/openstack/models/measurements.rb index c47f8f178..cc36c8f7e 100644 --- a/lib/fog/openstack/monitoring/models/measurements.rb +++ b/lib/fog/monitoring/openstack/models/measurements.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/measurement' +require 'fog/monitoring/openstack/models/measurement' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Measurements < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::Measurement + model Fog::Monitoring::OpenStack::Measurement def find(options = {}) load_response(service.find_measurements(options), 'elements') diff --git a/lib/fog/openstack/monitoring/models/metric.rb b/lib/fog/monitoring/openstack/models/metric.rb similarity index 92% rename from lib/fog/openstack/monitoring/models/metric.rb rename to lib/fog/monitoring/openstack/models/metric.rb index 9ed795398..9b8482272 100644 --- a/lib/fog/openstack/monitoring/models/metric.rb +++ b/lib/fog/monitoring/openstack/models/metric.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Metric < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/metrics.rb b/lib/fog/monitoring/openstack/models/metrics.rb similarity index 74% rename from lib/fog/openstack/monitoring/models/metrics.rb rename to lib/fog/monitoring/openstack/models/metrics.rb index 095a6a471..1b10f384f 100644 --- a/lib/fog/openstack/monitoring/models/metrics.rb +++ b/lib/fog/monitoring/openstack/models/metrics.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/metric' -require 'fog/openstack/monitoring/models/dimension_values' +require 'fog/monitoring/openstack/models/metric' +require 'fog/monitoring/openstack/models/dimension_values' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Metrics < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::Metric + model Fog::Monitoring::OpenStack::Metric def all(options = {}) load_response(service.list_metrics(options), 'elements') @@ -25,7 +25,7 @@ def create_metric_array(metrics_list = []) end def list_dimension_values(dimension_name, options = {}) - dimension_value = Fog::OpenStack::Monitoring::DimensionValues.new + dimension_value = Fog::Monitoring::OpenStack::DimensionValues.new dimension_value.load_response( service.list_dimension_values(dimension_name, options), 'elements' ) diff --git a/lib/fog/openstack/monitoring/models/notification_method.rb b/lib/fog/monitoring/openstack/models/notification_method.rb similarity index 96% rename from lib/fog/openstack/monitoring/models/notification_method.rb rename to lib/fog/monitoring/openstack/models/notification_method.rb index f2a1fbfdc..075e32333 100644 --- a/lib/fog/openstack/monitoring/models/notification_method.rb +++ b/lib/fog/monitoring/openstack/models/notification_method.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class NotificationMethod < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/notification_methods.rb b/lib/fog/monitoring/openstack/models/notification_methods.rb similarity index 82% rename from lib/fog/openstack/monitoring/models/notification_methods.rb rename to lib/fog/monitoring/openstack/models/notification_methods.rb index 4d1fbaa07..c8b8c711d 100644 --- a/lib/fog/openstack/monitoring/models/notification_methods.rb +++ b/lib/fog/monitoring/openstack/models/notification_methods.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/notification_method' +require 'fog/monitoring/openstack/models/notification_method' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class NotificationMethods < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::NotificationMethod + model Fog::Monitoring::OpenStack::NotificationMethod def all(options = {}) load_response(service.list_notification_methods(options), 'elements') @@ -23,7 +23,7 @@ def find_by_id(id) cached_notification_method = detect { |notification_method| notification_method.id == id } return cached_notification_method if cached_notification_method notification_method_hash = service.get_notification_method(id).body - Fog::OpenStack::Monitoring::NotificationMethod.new( + Fog::Monitoring::OpenStack::NotificationMethod.new( notification_method_hash.merge(:service => service) ) end diff --git a/lib/fog/openstack/monitoring/models/statistic.rb b/lib/fog/monitoring/openstack/models/statistic.rb similarity index 88% rename from lib/fog/openstack/monitoring/models/statistic.rb rename to lib/fog/monitoring/openstack/models/statistic.rb index 5bfcde135..e38ca7db2 100644 --- a/lib/fog/openstack/monitoring/models/statistic.rb +++ b/lib/fog/monitoring/openstack/models/statistic.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Statistic < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/monitoring/models/statistics.rb b/lib/fog/monitoring/openstack/models/statistics.rb similarity index 63% rename from lib/fog/openstack/monitoring/models/statistics.rb rename to lib/fog/monitoring/openstack/models/statistics.rb index 9bce67cc4..2098a2e4e 100644 --- a/lib/fog/openstack/monitoring/models/statistics.rb +++ b/lib/fog/monitoring/openstack/models/statistics.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/monitoring/models/statistic' +require 'fog/monitoring/openstack/models/statistic' module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Statistics < Fog::OpenStack::Collection - model Fog::OpenStack::Monitoring::Statistic + model Fog::Monitoring::OpenStack::Statistic def all(options = {}) load_response(service.list_statistics(options), 'elements') diff --git a/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb b/lib/fog/monitoring/openstack/requests/create_alarm_definition.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/create_alarm_definition.rb rename to lib/fog/monitoring/openstack/requests/create_alarm_definition.rb index 1a145cb8e..6bf1e1da2 100644 --- a/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb +++ b/lib/fog/monitoring/openstack/requests/create_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def create_alarm_definition(options) request( diff --git a/lib/fog/openstack/monitoring/requests/create_metric.rb b/lib/fog/monitoring/openstack/requests/create_metric.rb similarity index 93% rename from lib/fog/openstack/monitoring/requests/create_metric.rb rename to lib/fog/monitoring/openstack/requests/create_metric.rb index 569641d67..c84d56502 100644 --- a/lib/fog/openstack/monitoring/requests/create_metric.rb +++ b/lib/fog/monitoring/openstack/requests/create_metric.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def create_metric(options) data = options diff --git a/lib/fog/openstack/monitoring/requests/create_metric_array.rb b/lib/fog/monitoring/openstack/requests/create_metric_array.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/create_metric_array.rb rename to lib/fog/monitoring/openstack/requests/create_metric_array.rb index 87307b981..da23b278b 100644 --- a/lib/fog/openstack/monitoring/requests/create_metric_array.rb +++ b/lib/fog/monitoring/openstack/requests/create_metric_array.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def create_metric_array(metrics_list) request( diff --git a/lib/fog/openstack/monitoring/requests/create_notification_method.rb b/lib/fog/monitoring/openstack/requests/create_notification_method.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/create_notification_method.rb rename to lib/fog/monitoring/openstack/requests/create_notification_method.rb index 33b21d8b0..b2456b56a 100644 --- a/lib/fog/openstack/monitoring/requests/create_notification_method.rb +++ b/lib/fog/monitoring/openstack/requests/create_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def create_notification_method(options) request( diff --git a/lib/fog/openstack/monitoring/requests/delete_alarm.rb b/lib/fog/monitoring/openstack/requests/delete_alarm.rb similarity index 86% rename from lib/fog/openstack/monitoring/requests/delete_alarm.rb rename to lib/fog/monitoring/openstack/requests/delete_alarm.rb index ec16a8c0b..27a12ff9c 100644 --- a/lib/fog/openstack/monitoring/requests/delete_alarm.rb +++ b/lib/fog/monitoring/openstack/requests/delete_alarm.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def delete_alarm(id) request( diff --git a/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb b/lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb similarity index 87% rename from lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb rename to lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb index 396544111..8a51ad390 100644 --- a/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb +++ b/lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def delete_alarm_definition(id) request( diff --git a/lib/fog/openstack/monitoring/requests/delete_notification_method.rb b/lib/fog/monitoring/openstack/requests/delete_notification_method.rb similarity index 87% rename from lib/fog/openstack/monitoring/requests/delete_notification_method.rb rename to lib/fog/monitoring/openstack/requests/delete_notification_method.rb index 9bee9bf3a..5df23eb78 100644 --- a/lib/fog/openstack/monitoring/requests/delete_notification_method.rb +++ b/lib/fog/monitoring/openstack/requests/delete_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def delete_notification_method(id) request( diff --git a/lib/fog/openstack/monitoring/requests/find_measurements.rb b/lib/fog/monitoring/openstack/requests/find_measurements.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/find_measurements.rb rename to lib/fog/monitoring/openstack/requests/find_measurements.rb index 31e123df7..fd96c8ed2 100644 --- a/lib/fog/openstack/monitoring/requests/find_measurements.rb +++ b/lib/fog/monitoring/openstack/requests/find_measurements.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def find_measurements(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/get_alarm.rb b/lib/fog/monitoring/openstack/requests/get_alarm.rb similarity index 88% rename from lib/fog/openstack/monitoring/requests/get_alarm.rb rename to lib/fog/monitoring/openstack/requests/get_alarm.rb index b20a0c049..1bff9afba 100644 --- a/lib/fog/openstack/monitoring/requests/get_alarm.rb +++ b/lib/fog/monitoring/openstack/requests/get_alarm.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def get_alarm(id) request( diff --git a/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb b/lib/fog/monitoring/openstack/requests/get_alarm_counts.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/get_alarm_counts.rb rename to lib/fog/monitoring/openstack/requests/get_alarm_counts.rb index 42da01d93..8fd9e07cb 100644 --- a/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb +++ b/lib/fog/monitoring/openstack/requests/get_alarm_counts.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def get_alarm_counts(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb b/lib/fog/monitoring/openstack/requests/get_alarm_definition.rb similarity index 87% rename from lib/fog/openstack/monitoring/requests/get_alarm_definition.rb rename to lib/fog/monitoring/openstack/requests/get_alarm_definition.rb index 656ed7350..206cab92b 100644 --- a/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb +++ b/lib/fog/monitoring/openstack/requests/get_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def get_alarm_definition(id) request( diff --git a/lib/fog/openstack/monitoring/requests/get_notification_method.rb b/lib/fog/monitoring/openstack/requests/get_notification_method.rb similarity index 87% rename from lib/fog/openstack/monitoring/requests/get_notification_method.rb rename to lib/fog/monitoring/openstack/requests/get_notification_method.rb index ad42e476e..69207e2a1 100644 --- a/lib/fog/openstack/monitoring/requests/get_notification_method.rb +++ b/lib/fog/monitoring/openstack/requests/get_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def get_notification_method(id) request( diff --git a/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb b/lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb rename to lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb index b76ab5a31..ebecef2ab 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb +++ b/lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_alarm_definitions(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb b/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb similarity index 91% rename from lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb rename to lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb index 770a11f31..20f65e754 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb +++ b/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_alarm_state_history_for_all_alarms(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb b/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb similarity index 91% rename from lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb rename to lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb index 2fb5c4a54..9fa40ad0f 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb +++ b/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_alarm_state_history_for_specific_alarm(id, options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_alarms.rb b/lib/fog/monitoring/openstack/requests/list_alarms.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/list_alarms.rb rename to lib/fog/monitoring/openstack/requests/list_alarms.rb index 3288b1f54..34bae7338 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarms.rb +++ b/lib/fog/monitoring/openstack/requests/list_alarms.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_alarms(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_dimension_values.rb b/lib/fog/monitoring/openstack/requests/list_dimension_values.rb similarity index 92% rename from lib/fog/openstack/monitoring/requests/list_dimension_values.rb rename to lib/fog/monitoring/openstack/requests/list_dimension_values.rb index 0e29b215e..3655b294c 100644 --- a/lib/fog/openstack/monitoring/requests/list_dimension_values.rb +++ b/lib/fog/monitoring/openstack/requests/list_dimension_values.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_dimension_values(dimension_name, options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_metric_names.rb b/lib/fog/monitoring/openstack/requests/list_metric_names.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/list_metric_names.rb rename to lib/fog/monitoring/openstack/requests/list_metric_names.rb index 2aae310cc..7d7eab855 100644 --- a/lib/fog/openstack/monitoring/requests/list_metric_names.rb +++ b/lib/fog/monitoring/openstack/requests/list_metric_names.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_metric_names(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_metrics.rb b/lib/fog/monitoring/openstack/requests/list_metrics.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/list_metrics.rb rename to lib/fog/monitoring/openstack/requests/list_metrics.rb index c2baeb595..ec36e4cee 100644 --- a/lib/fog/openstack/monitoring/requests/list_metrics.rb +++ b/lib/fog/monitoring/openstack/requests/list_metrics.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_metrics(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb b/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/list_notification_method_types.rb rename to lib/fog/monitoring/openstack/requests/list_notification_method_types.rb index 74b8c1bfa..6d3da6e83 100644 --- a/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb +++ b/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_notification_method_types request( diff --git a/lib/fog/openstack/monitoring/requests/list_notification_methods.rb b/lib/fog/monitoring/openstack/requests/list_notification_methods.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/list_notification_methods.rb rename to lib/fog/monitoring/openstack/requests/list_notification_methods.rb index 21639c200..904ac4655 100644 --- a/lib/fog/openstack/monitoring/requests/list_notification_methods.rb +++ b/lib/fog/monitoring/openstack/requests/list_notification_methods.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_notification_methods(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/list_statistics.rb b/lib/fog/monitoring/openstack/requests/list_statistics.rb similarity index 90% rename from lib/fog/openstack/monitoring/requests/list_statistics.rb rename to lib/fog/monitoring/openstack/requests/list_statistics.rb index 03df6c7fe..ab39fd904 100644 --- a/lib/fog/openstack/monitoring/requests/list_statistics.rb +++ b/lib/fog/monitoring/openstack/requests/list_statistics.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def list_statistics(options = {}) request( diff --git a/lib/fog/openstack/monitoring/requests/patch_alarm.rb b/lib/fog/monitoring/openstack/requests/patch_alarm.rb similarity index 88% rename from lib/fog/openstack/monitoring/requests/patch_alarm.rb rename to lib/fog/monitoring/openstack/requests/patch_alarm.rb index aa5df3082..2d3bdfd78 100644 --- a/lib/fog/openstack/monitoring/requests/patch_alarm.rb +++ b/lib/fog/monitoring/openstack/requests/patch_alarm.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def patch_alarm(id, options) request( diff --git a/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb b/lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb rename to lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb index 3e3354d08..8e887722e 100644 --- a/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb +++ b/lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def patch_alarm_definition(id, alarm_definition) request( diff --git a/lib/fog/openstack/monitoring/requests/patch_notification_method.rb b/lib/fog/monitoring/openstack/requests/patch_notification_method.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/patch_notification_method.rb rename to lib/fog/monitoring/openstack/requests/patch_notification_method.rb index 34a3b92f5..4f995ed49 100644 --- a/lib/fog/openstack/monitoring/requests/patch_notification_method.rb +++ b/lib/fog/monitoring/openstack/requests/patch_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def update_notification_method(id, notification) request( diff --git a/lib/fog/openstack/monitoring/requests/put_notification_method.rb b/lib/fog/monitoring/openstack/requests/put_notification_method.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/put_notification_method.rb rename to lib/fog/monitoring/openstack/requests/put_notification_method.rb index 219d97144..3f0397e38 100644 --- a/lib/fog/openstack/monitoring/requests/put_notification_method.rb +++ b/lib/fog/monitoring/openstack/requests/put_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def put_notification_method(id, notification) request( diff --git a/lib/fog/openstack/monitoring/requests/update_alarm.rb b/lib/fog/monitoring/openstack/requests/update_alarm.rb similarity index 88% rename from lib/fog/openstack/monitoring/requests/update_alarm.rb rename to lib/fog/monitoring/openstack/requests/update_alarm.rb index cbd4384b2..a8910dd1d 100644 --- a/lib/fog/openstack/monitoring/requests/update_alarm.rb +++ b/lib/fog/monitoring/openstack/requests/update_alarm.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def update_alarm(id, options) request( diff --git a/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb b/lib/fog/monitoring/openstack/requests/update_alarm_definition.rb similarity index 89% rename from lib/fog/openstack/monitoring/requests/update_alarm_definition.rb rename to lib/fog/monitoring/openstack/requests/update_alarm_definition.rb index 3e5fb81fe..925404cae 100644 --- a/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb +++ b/lib/fog/monitoring/openstack/requests/update_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Monitoring + module Monitoring + class OpenStack class Real def update_alarm_definition(id, alarm_definition) request( diff --git a/lib/fog/openstack/network/network.rb b/lib/fog/network/openstack.rb similarity index 98% rename from lib/fog/openstack/network/network.rb rename to lib/fog/network/openstack.rb index 10070d4d3..f0c1e0f3c 100644 --- a/lib/fog/openstack/network/network.rb +++ b/lib/fog/network/openstack.rb @@ -1,8 +1,8 @@ module Fog - module OpenStack - class Network < Fog::Service + module Network + class OpenStack < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -17,7 +17,7 @@ class Network < Fog::Service ## MODELS # - model_path 'fog/openstack/network/models' + model_path 'fog/network/openstack/models' model :extension collection :extensions model :network @@ -59,7 +59,7 @@ class Network < Fog::Service ## REQUESTS # - request_path 'fog/openstack/network/requests' + request_path 'fog/network/openstack/requests' # Neutron Extensions request :list_extensions @@ -442,7 +442,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Network::NotFound + Fog::Network::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/network/models/extension.rb b/lib/fog/network/openstack/models/extension.rb similarity index 87% rename from lib/fog/openstack/network/models/extension.rb rename to lib/fog/network/openstack/models/extension.rb index 1b95bd752..745aa2b8f 100644 --- a/lib/fog/openstack/network/models/extension.rb +++ b/lib/fog/network/openstack/models/extension.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class Extension < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/openstack/network/models/extensions.rb b/lib/fog/network/openstack/models/extensions.rb similarity index 76% rename from lib/fog/openstack/network/models/extensions.rb rename to lib/fog/network/openstack/models/extensions.rb index f105ce488..6c01bbe7f 100644 --- a/lib/fog/openstack/network/models/extensions.rb +++ b/lib/fog/network/openstack/models/extensions.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/extension' +require 'fog/network/openstack/models/extension' module Fog - module OpenStack - class Network + module Network + class OpenStack class Extensions < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::Extension + model Fog::Network::OpenStack::Extension def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(extension_id) if extension = service.get_extension(extension_id).body['extension'] new(extension) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/floating_ip.rb b/lib/fog/network/openstack/models/floating_ip.rb similarity index 97% rename from lib/fog/openstack/network/models/floating_ip.rb rename to lib/fog/network/openstack/models/floating_ip.rb index 434ebe7f3..de836fc9d 100644 --- a/lib/fog/openstack/network/models/floating_ip.rb +++ b/lib/fog/network/openstack/models/floating_ip.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class FloatingIp < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/floating_ips.rb b/lib/fog/network/openstack/models/floating_ips.rb similarity index 76% rename from lib/fog/openstack/network/models/floating_ips.rb rename to lib/fog/network/openstack/models/floating_ips.rb index 764b8f183..dfeb12b6e 100644 --- a/lib/fog/openstack/network/models/floating_ips.rb +++ b/lib/fog/network/openstack/models/floating_ips.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/floating_ip' +require 'fog/network/openstack/models/floating_ip' module Fog - module OpenStack - class Network + module Network + class OpenStack class FloatingIps < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::FloatingIp + model Fog::Network::OpenStack::FloatingIp def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(floating_network_id) if floating_ip = service.get_floating_ip(floating_network_id).body['floatingip'] new(floating_ip) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/ike_policies.rb b/lib/fog/network/openstack/models/ike_policies.rb similarity index 76% rename from lib/fog/openstack/network/models/ike_policies.rb rename to lib/fog/network/openstack/models/ike_policies.rb index d659af701..39caae444 100644 --- a/lib/fog/openstack/network/models/ike_policies.rb +++ b/lib/fog/network/openstack/models/ike_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/ike_policy' +require 'fog/network/openstack/models/ike_policy' module Fog - module OpenStack - class Network + module Network + class OpenStack class IkePolicies < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::IkePolicy + model Fog::Network::OpenStack::IkePolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(ike_policy_id) if ike_policy = service.get_ike_policy(ike_policy_id).body['ikepolicy'] new(ike_policy) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/ike_policy.rb b/lib/fog/network/openstack/models/ike_policy.rb similarity index 96% rename from lib/fog/openstack/network/models/ike_policy.rb rename to lib/fog/network/openstack/models/ike_policy.rb index 47b7ed3bd..1cff0e650 100644 --- a/lib/fog/openstack/network/models/ike_policy.rb +++ b/lib/fog/network/openstack/models/ike_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class IkePolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/ipsec_policies.rb b/lib/fog/network/openstack/models/ipsec_policies.rb similarity index 76% rename from lib/fog/openstack/network/models/ipsec_policies.rb rename to lib/fog/network/openstack/models/ipsec_policies.rb index 99e52a8be..5c4afe956 100644 --- a/lib/fog/openstack/network/models/ipsec_policies.rb +++ b/lib/fog/network/openstack/models/ipsec_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/ipsec_policy' +require 'fog/network/openstack/models/ipsec_policy' module Fog - module OpenStack - class Network + module Network + class OpenStack class IpsecPolicies < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::IpsecPolicy + model Fog::Network::OpenStack::IpsecPolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(ipsec_policy_id) if ipsec_policy = service.get_ipsec_policy(ipsec_policy_id).body['ipsecpolicy'] new(ipsec_policy) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/ipsec_policy.rb b/lib/fog/network/openstack/models/ipsec_policy.rb similarity index 97% rename from lib/fog/openstack/network/models/ipsec_policy.rb rename to lib/fog/network/openstack/models/ipsec_policy.rb index d7c5b4360..3368d37b8 100644 --- a/lib/fog/openstack/network/models/ipsec_policy.rb +++ b/lib/fog/network/openstack/models/ipsec_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class IpsecPolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/ipsec_site_connection.rb b/lib/fog/network/openstack/models/ipsec_site_connection.rb similarity index 97% rename from lib/fog/openstack/network/models/ipsec_site_connection.rb rename to lib/fog/network/openstack/models/ipsec_site_connection.rb index b5cf87f71..ec17a60f2 100644 --- a/lib/fog/openstack/network/models/ipsec_site_connection.rb +++ b/lib/fog/network/openstack/models/ipsec_site_connection.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class IpsecSiteConnection < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/ipsec_site_connections.rb b/lib/fog/network/openstack/models/ipsec_site_connections.rb similarity index 77% rename from lib/fog/openstack/network/models/ipsec_site_connections.rb rename to lib/fog/network/openstack/models/ipsec_site_connections.rb index e560bc424..15df5e80f 100644 --- a/lib/fog/openstack/network/models/ipsec_site_connections.rb +++ b/lib/fog/network/openstack/models/ipsec_site_connections.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/ipsec_site_connection' +require 'fog/network/openstack/models/ipsec_site_connection' module Fog - module OpenStack - class Network + module Network + class OpenStack class IpsecSiteConnections < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::IpsecSiteConnection + model Fog::Network::OpenStack::IpsecSiteConnection def initialize(attributes) self.filters ||= {} @@ -24,7 +24,7 @@ def get(ipsec_site_connection_id) if connection new(connection) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/lb_health_monitor.rb b/lib/fog/network/openstack/models/lb_health_monitor.rb similarity index 97% rename from lib/fog/openstack/network/models/lb_health_monitor.rb rename to lib/fog/network/openstack/models/lb_health_monitor.rb index ef64acfc4..479533f18 100644 --- a/lib/fog/openstack/network/models/lb_health_monitor.rb +++ b/lib/fog/network/openstack/models/lb_health_monitor.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbHealthMonitor < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/lb_health_monitors.rb b/lib/fog/network/openstack/models/lb_health_monitors.rb similarity index 76% rename from lib/fog/openstack/network/models/lb_health_monitors.rb rename to lib/fog/network/openstack/models/lb_health_monitors.rb index 30ab428cb..5fcb7c271 100644 --- a/lib/fog/openstack/network/models/lb_health_monitors.rb +++ b/lib/fog/network/openstack/models/lb_health_monitors.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/lb_health_monitor' +require 'fog/network/openstack/models/lb_health_monitor' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbHealthMonitors < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::LbHealthMonitor + model Fog::Network::OpenStack::LbHealthMonitor def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(health_monitor_id) if health_monitor = service.get_lb_health_monitor(health_monitor_id).body['health_monitor'] new(health_monitor) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/lb_member.rb b/lib/fog/network/openstack/models/lb_member.rb similarity index 96% rename from lib/fog/openstack/network/models/lb_member.rb rename to lib/fog/network/openstack/models/lb_member.rb index da8a44dbd..e19db01a7 100644 --- a/lib/fog/openstack/network/models/lb_member.rb +++ b/lib/fog/network/openstack/models/lb_member.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbMember < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/lb_members.rb b/lib/fog/network/openstack/models/lb_members.rb similarity index 75% rename from lib/fog/openstack/network/models/lb_members.rb rename to lib/fog/network/openstack/models/lb_members.rb index fd74508bb..a897f82ad 100644 --- a/lib/fog/openstack/network/models/lb_members.rb +++ b/lib/fog/network/openstack/models/lb_members.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/lb_member' +require 'fog/network/openstack/models/lb_member' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbMembers < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::LbMember + model Fog::Network::OpenStack::LbMember def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(member_id) if member = service.get_lb_member(member_id).body['member'] new(member) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/lb_pool.rb b/lib/fog/network/openstack/models/lb_pool.rb similarity index 97% rename from lib/fog/openstack/network/models/lb_pool.rb rename to lib/fog/network/openstack/models/lb_pool.rb index fbac5b226..9edf37d65 100644 --- a/lib/fog/openstack/network/models/lb_pool.rb +++ b/lib/fog/network/openstack/models/lb_pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbPool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/lb_pools.rb b/lib/fog/network/openstack/models/lb_pools.rb similarity index 75% rename from lib/fog/openstack/network/models/lb_pools.rb rename to lib/fog/network/openstack/models/lb_pools.rb index 8a0f7adf5..218d486d2 100644 --- a/lib/fog/openstack/network/models/lb_pools.rb +++ b/lib/fog/network/openstack/models/lb_pools.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/lb_pool' +require 'fog/network/openstack/models/lb_pool' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbPools < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::LbPool + model Fog::Network::OpenStack::LbPool def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(pool_id) if pool = service.get_lb_pool(pool_id).body['pool'] new(pool) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/lb_vip.rb b/lib/fog/network/openstack/models/lb_vip.rb similarity index 97% rename from lib/fog/openstack/network/models/lb_vip.rb rename to lib/fog/network/openstack/models/lb_vip.rb index 928bb0674..18039149e 100644 --- a/lib/fog/openstack/network/models/lb_vip.rb +++ b/lib/fog/network/openstack/models/lb_vip.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbVip < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/lb_vips.rb b/lib/fog/network/openstack/models/lb_vips.rb similarity index 75% rename from lib/fog/openstack/network/models/lb_vips.rb rename to lib/fog/network/openstack/models/lb_vips.rb index ee44aa639..24f00e48f 100644 --- a/lib/fog/openstack/network/models/lb_vips.rb +++ b/lib/fog/network/openstack/models/lb_vips.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/lb_vip' +require 'fog/network/openstack/models/lb_vip' module Fog - module OpenStack - class Network + module Network + class OpenStack class LbVips < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::LbVip + model Fog::Network::OpenStack::LbVip def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(vip_id) if vip = service.get_lb_vip(vip_id).body['vip'] new(vip) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/network.rb b/lib/fog/network/openstack/models/network.rb similarity index 96% rename from lib/fog/openstack/network/models/network.rb rename to lib/fog/network/openstack/models/network.rb index 7daec5c02..36afb31c9 100644 --- a/lib/fog/openstack/network/models/network.rb +++ b/lib/fog/network/openstack/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class Network < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/network_ip_availabilities.rb b/lib/fog/network/openstack/models/network_ip_availabilities.rb similarity index 70% rename from lib/fog/openstack/network/models/network_ip_availabilities.rb rename to lib/fog/network/openstack/models/network_ip_availabilities.rb index ac285856b..b9dc84abe 100644 --- a/lib/fog/openstack/network/models/network_ip_availabilities.rb +++ b/lib/fog/network/openstack/models/network_ip_availabilities.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/network_ip_availability' +require 'fog/network/openstack/models/network_ip_availability' module Fog - module OpenStack - class Network + module Network + class OpenStack class NetworkIpAvailabilities < Fog::OpenStack::Collection - model Fog::OpenStack::Network::NetworkIpAvailability + model Fog::Network::OpenStack::NetworkIpAvailability def all load_response(service.list_network_ip_availabilities, 'network_ip_availabilities') @@ -15,7 +15,7 @@ def get(network_id) if network_ip_availability = service.get_network_ip_availability(network_id).body['network_ip_availability'] new(network_ip_availability) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/network_ip_availability.rb b/lib/fog/network/openstack/models/network_ip_availability.rb similarity index 90% rename from lib/fog/openstack/network/models/network_ip_availability.rb rename to lib/fog/network/openstack/models/network_ip_availability.rb index 86b32de8c..18c263f11 100644 --- a/lib/fog/openstack/network/models/network_ip_availability.rb +++ b/lib/fog/network/openstack/models/network_ip_availability.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class NetworkIpAvailability < Fog::OpenStack::Model attribute :used_ips attribute :subnet_ip_availability diff --git a/lib/fog/openstack/network/models/networks.rb b/lib/fog/network/openstack/models/networks.rb similarity index 76% rename from lib/fog/openstack/network/models/networks.rb rename to lib/fog/network/openstack/models/networks.rb index 4ff5cf06c..2a6e061e5 100644 --- a/lib/fog/openstack/network/models/networks.rb +++ b/lib/fog/network/openstack/models/networks.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/network' +require 'fog/network/openstack/models/network' module Fog - module OpenStack - class Network + module Network + class OpenStack class Networks < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::Network + model Fog::Network::OpenStack::Network def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(network_id) if network = service.get_network(network_id).body['network'] new(network) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/port.rb b/lib/fog/network/openstack/models/port.rb similarity index 96% rename from lib/fog/openstack/network/models/port.rb rename to lib/fog/network/openstack/models/port.rb index c5a02df4a..1d3bbb88f 100644 --- a/lib/fog/openstack/network/models/port.rb +++ b/lib/fog/network/openstack/models/port.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class Port < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/ports.rb b/lib/fog/network/openstack/models/ports.rb similarity index 75% rename from lib/fog/openstack/network/models/ports.rb rename to lib/fog/network/openstack/models/ports.rb index e81e61ba6..b92c00310 100644 --- a/lib/fog/openstack/network/models/ports.rb +++ b/lib/fog/network/openstack/models/ports.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/port' +require 'fog/network/openstack/models/port' module Fog - module OpenStack - class Network + module Network + class OpenStack class Ports < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::Port + model Fog::Network::OpenStack::Port def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(port_id) if port = service.get_port(port_id).body['port'] new(port) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/rbac_policies.rb b/lib/fog/network/openstack/models/rbac_policies.rb similarity index 77% rename from lib/fog/openstack/network/models/rbac_policies.rb rename to lib/fog/network/openstack/models/rbac_policies.rb index 11e6bdcaa..c25ce357f 100644 --- a/lib/fog/openstack/network/models/rbac_policies.rb +++ b/lib/fog/network/openstack/models/rbac_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/rbac_policy' +require 'fog/network/openstack/models/rbac_policy' module Fog - module OpenStack - class Network + module Network + class OpenStack class RbacPolicies < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::RbacPolicy + model Fog::Network::OpenStack::RbacPolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(rbac_policy_id) if rbac_policy = service.get_rbac_policy(rbac_policy_id).body['rbac_policy'] new(rbac_policy) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end alias find_by_id get diff --git a/lib/fog/openstack/network/models/rbac_policy.rb b/lib/fog/network/openstack/models/rbac_policy.rb similarity index 95% rename from lib/fog/openstack/network/models/rbac_policy.rb rename to lib/fog/network/openstack/models/rbac_policy.rb index 5ed353695..f315384cf 100644 --- a/lib/fog/openstack/network/models/rbac_policy.rb +++ b/lib/fog/network/openstack/models/rbac_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class RbacPolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/router.rb b/lib/fog/network/openstack/models/router.rb similarity index 92% rename from lib/fog/openstack/network/models/router.rb rename to lib/fog/network/openstack/models/router.rb index e7059ee8a..f1d86a012 100644 --- a/lib/fog/openstack/network/models/router.rb +++ b/lib/fog/network/openstack/models/router.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack # The Layer-3 Networking Extensions (router) # # A logical entity for forwarding packets across internal @@ -47,7 +47,7 @@ def options options = attributes.dup if options[:external_gateway_info] - if options[:external_gateway_info].kind_of?(Fog::OpenStack::Network::Network) + if options[:external_gateway_info].kind_of?(Fog::Network::OpenStack::Network) options[:external_gateway_info] = {:network_id => options[:external_gateway_info].id} else options[:external_gateway_info] = {:network_id => options[:external_gateway_info]} diff --git a/lib/fog/openstack/network/models/routers.rb b/lib/fog/network/openstack/models/routers.rb similarity index 75% rename from lib/fog/openstack/network/models/routers.rb rename to lib/fog/network/openstack/models/routers.rb index e9bcea262..3f5f49a49 100644 --- a/lib/fog/openstack/network/models/routers.rb +++ b/lib/fog/network/openstack/models/routers.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/router' +require 'fog/network/openstack/models/router' module Fog - module OpenStack - class Network + module Network + class OpenStack class Routers < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::Router + model Fog::Network::OpenStack::Router def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(router_id) if router = service.get_router(router_id).body['router'] new(router) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/security_group.rb b/lib/fog/network/openstack/models/security_group.rb similarity index 88% rename from lib/fog/openstack/network/models/security_group.rb rename to lib/fog/network/openstack/models/security_group.rb index 307b412b1..55bc842fb 100644 --- a/lib/fog/openstack/network/models/security_group.rb +++ b/lib/fog/network/openstack/models/security_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class SecurityGroup < Fog::OpenStack::Model identity :id @@ -18,7 +18,7 @@ def destroy end def security_group_rules - Fog::OpenStack::Network::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::Network::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) end def save diff --git a/lib/fog/openstack/network/models/security_group_rule.rb b/lib/fog/network/openstack/models/security_group_rule.rb similarity index 95% rename from lib/fog/openstack/network/models/security_group_rule.rb rename to lib/fog/network/openstack/models/security_group_rule.rb index 73f67ae53..15ecff135 100644 --- a/lib/fog/openstack/network/models/security_group_rule.rb +++ b/lib/fog/network/openstack/models/security_group_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class SecurityGroupRule < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/security_group_rules.rb b/lib/fog/network/openstack/models/security_group_rules.rb similarity index 76% rename from lib/fog/openstack/network/models/security_group_rules.rb rename to lib/fog/network/openstack/models/security_group_rules.rb index 138985b89..de8486a4e 100644 --- a/lib/fog/openstack/network/models/security_group_rules.rb +++ b/lib/fog/network/openstack/models/security_group_rules.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/security_group_rule' +require 'fog/network/openstack/models/security_group_rule' module Fog - module OpenStack - class Network + module Network + class OpenStack class SecurityGroupRules < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::SecurityGroupRule + model Fog::Network::OpenStack::SecurityGroupRule def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(sec_group_rule_id) if sec_group_rule = service.get_security_group_rule(sec_group_rule_id).body['security_group_rule'] new(sec_group_rule) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/security_groups.rb b/lib/fog/network/openstack/models/security_groups.rb similarity index 76% rename from lib/fog/openstack/network/models/security_groups.rb rename to lib/fog/network/openstack/models/security_groups.rb index 35bfe2b97..cd79a446a 100644 --- a/lib/fog/openstack/network/models/security_groups.rb +++ b/lib/fog/network/openstack/models/security_groups.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/security_group' +require 'fog/network/openstack/models/security_group' module Fog - module OpenStack - class Network + module Network + class OpenStack class SecurityGroups < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::SecurityGroup + model Fog::Network::OpenStack::SecurityGroup def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(security_group_id) if security_group = service.get_security_group(security_group_id).body['security_group'] new(security_group) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/subnet.rb b/lib/fog/network/openstack/models/subnet.rb similarity index 96% rename from lib/fog/openstack/network/models/subnet.rb rename to lib/fog/network/openstack/models/subnet.rb index cbec2ba14..377a68c9e 100644 --- a/lib/fog/openstack/network/models/subnet.rb +++ b/lib/fog/network/openstack/models/subnet.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class Subnet < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/subnet_pool.rb b/lib/fog/network/openstack/models/subnet_pool.rb similarity index 96% rename from lib/fog/openstack/network/models/subnet_pool.rb rename to lib/fog/network/openstack/models/subnet_pool.rb index c14208b18..bade0636a 100644 --- a/lib/fog/openstack/network/models/subnet_pool.rb +++ b/lib/fog/network/openstack/models/subnet_pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class SubnetPool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/subnet_pools.rb b/lib/fog/network/openstack/models/subnet_pools.rb similarity index 76% rename from lib/fog/openstack/network/models/subnet_pools.rb rename to lib/fog/network/openstack/models/subnet_pools.rb index 414cad0f8..fa8006430 100644 --- a/lib/fog/openstack/network/models/subnet_pools.rb +++ b/lib/fog/network/openstack/models/subnet_pools.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/subnet_pool' +require 'fog/network/openstack/models/subnet_pool' module Fog - module OpenStack - class Network + module Network + class OpenStack class SubnetPools < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::SubnetPool + model Fog::Network::OpenStack::SubnetPool def initialize(attributes) self.filters ||= {} @@ -24,7 +24,7 @@ def get(subnet_pool_id) if subnet_pool new(subnet_pool) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/subnets.rb b/lib/fog/network/openstack/models/subnets.rb similarity index 75% rename from lib/fog/openstack/network/models/subnets.rb rename to lib/fog/network/openstack/models/subnets.rb index 7f7b8dff2..f7df5f7f1 100644 --- a/lib/fog/openstack/network/models/subnets.rb +++ b/lib/fog/network/openstack/models/subnets.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/subnet' +require 'fog/network/openstack/models/subnet' module Fog - module OpenStack - class Network + module Network + class OpenStack class Subnets < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::Subnet + model Fog::Network::OpenStack::Subnet def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(subnet_id) if subnet = service.get_subnet(subnet_id).body['subnet'] new(subnet) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/models/vpn_service.rb b/lib/fog/network/openstack/models/vpn_service.rb similarity index 96% rename from lib/fog/openstack/network/models/vpn_service.rb rename to lib/fog/network/openstack/models/vpn_service.rb index 8dbb990c5..41217aadf 100644 --- a/lib/fog/openstack/network/models/vpn_service.rb +++ b/lib/fog/network/openstack/models/vpn_service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Network + module Network + class OpenStack class VpnService < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/network/models/vpn_services.rb b/lib/fog/network/openstack/models/vpn_services.rb similarity index 76% rename from lib/fog/openstack/network/models/vpn_services.rb rename to lib/fog/network/openstack/models/vpn_services.rb index c062a2fa0..af8baea7d 100644 --- a/lib/fog/openstack/network/models/vpn_services.rb +++ b/lib/fog/network/openstack/models/vpn_services.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/network/models/vpn_service' +require 'fog/network/openstack/models/vpn_service' module Fog - module OpenStack - class Network + module Network + class OpenStack class VpnServices < Fog::OpenStack::Collection attribute :filters - model Fog::OpenStack::Network::VpnService + model Fog::Network::OpenStack::VpnService def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(vpn_service_id) if vpn_service = service.get_vpn_service(vpn_service_id).body['vpnservice'] new(vpn_service) end - rescue Fog::OpenStack::Network::NotFound + rescue Fog::Network::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/network/requests/add_router_interface.rb b/lib/fog/network/openstack/requests/add_router_interface.rb similarity index 97% rename from lib/fog/openstack/network/requests/add_router_interface.rb rename to lib/fog/network/openstack/requests/add_router_interface.rb index ad6f8748d..e3c566128 100644 --- a/lib/fog/openstack/network/requests/add_router_interface.rb +++ b/lib/fog/network/openstack/requests/add_router_interface.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def add_router_interface(router_id, subnet_id_or_options) if subnet_id_or_options.kind_of? String diff --git a/lib/fog/openstack/network/requests/associate_floating_ip.rb b/lib/fog/network/openstack/requests/associate_floating_ip.rb similarity index 97% rename from lib/fog/openstack/network/requests/associate_floating_ip.rb rename to lib/fog/network/openstack/requests/associate_floating_ip.rb index 6ffa8d498..bb1b306a4 100644 --- a/lib/fog/openstack/network/requests/associate_floating_ip.rb +++ b/lib/fog/network/openstack/requests/associate_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def associate_floating_ip(floating_ip_id, port_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb b/lib/fog/network/openstack/requests/associate_lb_health_monitor.rb similarity index 91% rename from lib/fog/openstack/network/requests/associate_lb_health_monitor.rb rename to lib/fog/network/openstack/requests/associate_lb_health_monitor.rb index 523310005..ad575e507 100644 --- a/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb +++ b/lib/fog/network/openstack/requests/associate_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def associate_lb_health_monitor(pool_id, health_monitor_id) data = { @@ -28,7 +28,7 @@ def associate_lb_health_monitor(pool_id, health_monitor_id) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/create_floating_ip.rb b/lib/fog/network/openstack/requests/create_floating_ip.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_floating_ip.rb rename to lib/fog/network/openstack/requests/create_floating_ip.rb index ec71f30a4..5074ae40b 100644 --- a/lib/fog/openstack/network/requests/create_floating_ip.rb +++ b/lib/fog/network/openstack/requests/create_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_floating_ip(floating_network_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_ike_policy.rb b/lib/fog/network/openstack/requests/create_ike_policy.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_ike_policy.rb rename to lib/fog/network/openstack/requests/create_ike_policy.rb index 28b33df7f..7d2296cc5 100644 --- a/lib/fog/openstack/network/requests/create_ike_policy.rb +++ b/lib/fog/network/openstack/requests/create_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_ike_policy(options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_ipsec_policy.rb b/lib/fog/network/openstack/requests/create_ipsec_policy.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_ipsec_policy.rb rename to lib/fog/network/openstack/requests/create_ipsec_policy.rb index 0a0fd904d..8072890cd 100644 --- a/lib/fog/openstack/network/requests/create_ipsec_policy.rb +++ b/lib/fog/network/openstack/requests/create_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_ipsec_policy(options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb b/lib/fog/network/openstack/requests/create_ipsec_site_connection.rb similarity index 98% rename from lib/fog/openstack/network/requests/create_ipsec_site_connection.rb rename to lib/fog/network/openstack/requests/create_ipsec_site_connection.rb index a5b674a13..fde20bca8 100644 --- a/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb +++ b/lib/fog/network/openstack/requests/create_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lb_health_monitor.rb b/lib/fog/network/openstack/requests/create_lb_health_monitor.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lb_health_monitor.rb rename to lib/fog/network/openstack/requests/create_lb_health_monitor.rb index 944c40cd6..eb3498c81 100644 --- a/lib/fog/openstack/network/requests/create_lb_health_monitor.rb +++ b/lib/fog/network/openstack/requests/create_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lb_member.rb b/lib/fog/network/openstack/requests/create_lb_member.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lb_member.rb rename to lib/fog/network/openstack/requests/create_lb_member.rb index 262201a48..64443d13d 100644 --- a/lib/fog/openstack/network/requests/create_lb_member.rb +++ b/lib/fog/network/openstack/requests/create_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lb_member(pool_id, address, protocol_port, weight, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lb_pool.rb b/lib/fog/network/openstack/requests/create_lb_pool.rb similarity index 98% rename from lib/fog/openstack/network/requests/create_lb_pool.rb rename to lib/fog/network/openstack/requests/create_lb_pool.rb index e4ebd5cd1..6a03b6d78 100644 --- a/lib/fog/openstack/network/requests/create_lb_pool.rb +++ b/lib/fog/network/openstack/requests/create_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lb_pool(subnet_id, protocol, lb_method, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lb_vip.rb b/lib/fog/network/openstack/requests/create_lb_vip.rb similarity index 98% rename from lib/fog/openstack/network/requests/create_lb_vip.rb rename to lib/fog/network/openstack/requests/create_lb_vip.rb index 70a3358e7..3344c2716 100644 --- a/lib/fog/openstack/network/requests/create_lb_vip.rb +++ b/lib/fog/network/openstack/requests/create_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb b/lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb similarity index 98% rename from lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb rename to lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb index be0a68f66..98be085b7 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_healthmonitor(pool_id, type, delay, timeout, max_retries, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb b/lib/fog/network/openstack/requests/create_lbaas_l7policy.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lbaas_l7policy.rb rename to lib/fog/network/openstack/requests/create_lbaas_l7policy.rb index 7ef1c2333..aac267e48 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_l7policy(listener_id, action, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb b/lib/fog/network/openstack/requests/create_lbaas_l7rule.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lbaas_l7rule.rb rename to lib/fog/network/openstack/requests/create_lbaas_l7rule.rb index e2992aa8e..869670308 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_l7rule(l7policy_id, type, compare_type, value, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_listener.rb b/lib/fog/network/openstack/requests/create_lbaas_listener.rb similarity index 98% rename from lib/fog/openstack/network/requests/create_lbaas_listener.rb rename to lib/fog/network/openstack/requests/create_lbaas_listener.rb index 5abeccaac..dcec8c92f 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_listener.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_listener(loadbalancer_id, protocol, protocol_port, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb b/lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb rename to lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb index dd7d61118..aa8fb2afc 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_loadbalancer(vip_subnet_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_pool.rb b/lib/fog/network/openstack/requests/create_lbaas_pool.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lbaas_pool.rb rename to lib/fog/network/openstack/requests/create_lbaas_pool.rb index cddffc9bd..c539862ff 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_pool.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_pool(listener_id, protocol, lb_algorithm, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb b/lib/fog/network/openstack/requests/create_lbaas_pool_member.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_lbaas_pool_member.rb rename to lib/fog/network/openstack/requests/create_lbaas_pool_member.rb index 547158991..8e73b2d8d 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb +++ b/lib/fog/network/openstack/requests/create_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_lbaas_pool_member(pool_id, address, protocol_port, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_network.rb b/lib/fog/network/openstack/requests/create_network.rb similarity index 94% rename from lib/fog/openstack/network/requests/create_network.rb rename to lib/fog/network/openstack/requests/create_network.rb index bee8dc484..035e284b5 100644 --- a/lib/fog/openstack/network/requests/create_network.rb +++ b/lib/fog/network/openstack/requests/create_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real CREATE_OPTIONS = [ :name, @@ -25,7 +25,7 @@ class Real :router_external, ].freeze - # Map Fog::OpenStack::Network::Network + # Map Fog::Network::OpenStack::Network # model attributes to OpenStack provider attributes ALIASES = { :provider_network_type => 'provider:network_type', @@ -77,7 +77,7 @@ def create_network(options = {}) 'qos_policy_id' => options[:qos_policy_id], 'port_security_enabled' => options[:port_security_enabled] || false } - data.merge!(Fog::OpenStack::Network::Real.create(options)) + data.merge!(Fog::Network::OpenStack::Real.create(options)) self.data[:networks][data['id']] = data response.body = {'network' => data} response diff --git a/lib/fog/openstack/network/requests/create_port.rb b/lib/fog/network/openstack/requests/create_port.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_port.rb rename to lib/fog/network/openstack/requests/create_port.rb index 75d41a049..f915d977e 100644 --- a/lib/fog/openstack/network/requests/create_port.rb +++ b/lib/fog/network/openstack/requests/create_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_port(network_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_rbac_policy.rb b/lib/fog/network/openstack/requests/create_rbac_policy.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_rbac_policy.rb rename to lib/fog/network/openstack/requests/create_rbac_policy.rb index 661dd5ae8..bf9b34392 100644 --- a/lib/fog/openstack/network/requests/create_rbac_policy.rb +++ b/lib/fog/network/openstack/requests/create_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_rbac_policy(options = {}) data = {'rbac_policy' => {}} diff --git a/lib/fog/openstack/network/requests/create_router.rb b/lib/fog/network/openstack/requests/create_router.rb similarity index 93% rename from lib/fog/openstack/network/requests/create_router.rb rename to lib/fog/network/openstack/requests/create_router.rb index d02b67be8..489666099 100644 --- a/lib/fog/openstack/network/requests/create_router.rb +++ b/lib/fog/network/openstack/requests/create_router.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_router(name, options = {}) data = { @@ -23,7 +23,7 @@ def create_router(name, options = {}) # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::OpenStack::Network::Network) + if egi.kind_of?(Fog::Network::OpenStack::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" data['router'][:external_gateway_info] = {:network_id => egi.id} @@ -50,7 +50,7 @@ def create_router(name, options = {}) # remove this in a future egi = options[:external_gateway_info] - if egi && egi.kind_of?(Fog::OpenStack::Network::Network) + if egi && egi.kind_of?(Fog::Network::OpenStack::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" egi = {:network_id => egi.id} diff --git a/lib/fog/openstack/network/requests/create_security_group.rb b/lib/fog/network/openstack/requests/create_security_group.rb similarity index 99% rename from lib/fog/openstack/network/requests/create_security_group.rb rename to lib/fog/network/openstack/requests/create_security_group.rb index 84800e80b..024f557e1 100644 --- a/lib/fog/openstack/network/requests/create_security_group.rb +++ b/lib/fog/network/openstack/requests/create_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Create a new security group # diff --git a/lib/fog/openstack/network/requests/create_security_group_rule.rb b/lib/fog/network/openstack/requests/create_security_group_rule.rb similarity index 99% rename from lib/fog/openstack/network/requests/create_security_group_rule.rb rename to lib/fog/network/openstack/requests/create_security_group_rule.rb index 3de620781..d80a5911f 100644 --- a/lib/fog/openstack/network/requests/create_security_group_rule.rb +++ b/lib/fog/network/openstack/requests/create_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Create a new security group rule # diff --git a/lib/fog/openstack/network/requests/create_subnet.rb b/lib/fog/network/openstack/requests/create_subnet.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_subnet.rb rename to lib/fog/network/openstack/requests/create_subnet.rb index 1d49b1a34..610fcb09b 100644 --- a/lib/fog/openstack/network/requests/create_subnet.rb +++ b/lib/fog/network/openstack/requests/create_subnet.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_subnet(network_id, cidr, ip_version, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_subnet_pool.rb b/lib/fog/network/openstack/requests/create_subnet_pool.rb similarity index 98% rename from lib/fog/openstack/network/requests/create_subnet_pool.rb rename to lib/fog/network/openstack/requests/create_subnet_pool.rb index 3b56580f7..f2064879a 100644 --- a/lib/fog/openstack/network/requests/create_subnet_pool.rb +++ b/lib/fog/network/openstack/requests/create_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_subnet_pool(name, prefixes, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/create_vpn_service.rb b/lib/fog/network/openstack/requests/create_vpn_service.rb similarity index 97% rename from lib/fog/openstack/network/requests/create_vpn_service.rb rename to lib/fog/network/openstack/requests/create_vpn_service.rb index 811658e66..b607e239f 100644 --- a/lib/fog/openstack/network/requests/create_vpn_service.rb +++ b/lib/fog/network/openstack/requests/create_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def create_vpn_service(subnet_id, router_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/delete_floating_ip.rb b/lib/fog/network/openstack/requests/delete_floating_ip.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_floating_ip.rb rename to lib/fog/network/openstack/requests/delete_floating_ip.rb index a5ed2249b..3410ae317 100644 --- a/lib/fog/openstack/network/requests/delete_floating_ip.rb +++ b/lib/fog/network/openstack/requests/delete_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_floating_ip(floating_ip_id) request( @@ -19,7 +19,7 @@ def delete_floating_ip(floating_ip_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_ike_policy.rb b/lib/fog/network/openstack/requests/delete_ike_policy.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_ike_policy.rb rename to lib/fog/network/openstack/requests/delete_ike_policy.rb index 7ded4a686..fc798c3ae 100644 --- a/lib/fog/openstack/network/requests/delete_ike_policy.rb +++ b/lib/fog/network/openstack/requests/delete_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_ike_policy(ike_policy_id) request( @@ -19,7 +19,7 @@ def delete_ike_policy(ike_policy_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_ipsec_policy.rb b/lib/fog/network/openstack/requests/delete_ipsec_policy.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_ipsec_policy.rb rename to lib/fog/network/openstack/requests/delete_ipsec_policy.rb index ab38153de..b9ca9bf95 100644 --- a/lib/fog/openstack/network/requests/delete_ipsec_policy.rb +++ b/lib/fog/network/openstack/requests/delete_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_ipsec_policy(ipsec_policy_id) request( @@ -19,7 +19,7 @@ def delete_ipsec_policy(ipsec_policy_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb b/lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb similarity index 89% rename from lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb rename to lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb index 685b2201e..fd24837c9 100644 --- a/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb +++ b/lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_ipsec_site_connection(ipsec_site_connection_id) request( @@ -20,7 +20,7 @@ def delete_ipsec_site_connection(ipsec_site_connection_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb b/lib/fog/network/openstack/requests/delete_lb_health_monitor.rb similarity index 88% rename from lib/fog/openstack/network/requests/delete_lb_health_monitor.rb rename to lib/fog/network/openstack/requests/delete_lb_health_monitor.rb index bcda68445..53759f2c8 100644 --- a/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb +++ b/lib/fog/network/openstack/requests/delete_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lb_health_monitor(health_monitor_id) request( @@ -19,7 +19,7 @@ def delete_lb_health_monitor(health_monitor_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lb_member.rb b/lib/fog/network/openstack/requests/delete_lb_member.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_lb_member.rb rename to lib/fog/network/openstack/requests/delete_lb_member.rb index 5f59c5b87..d7dc2f956 100644 --- a/lib/fog/openstack/network/requests/delete_lb_member.rb +++ b/lib/fog/network/openstack/requests/delete_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lb_member(member_id) request( @@ -19,7 +19,7 @@ def delete_lb_member(member_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lb_pool.rb b/lib/fog/network/openstack/requests/delete_lb_pool.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_lb_pool.rb rename to lib/fog/network/openstack/requests/delete_lb_pool.rb index c74ddf3e9..2028cfe49 100644 --- a/lib/fog/openstack/network/requests/delete_lb_pool.rb +++ b/lib/fog/network/openstack/requests/delete_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lb_pool(pool_id) request( @@ -19,7 +19,7 @@ def delete_lb_pool(pool_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lb_vip.rb b/lib/fog/network/openstack/requests/delete_lb_vip.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_lb_vip.rb rename to lib/fog/network/openstack/requests/delete_lb_vip.rb index feb25b5fc..5a413684c 100644 --- a/lib/fog/openstack/network/requests/delete_lb_vip.rb +++ b/lib/fog/network/openstack/requests/delete_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lb_vip(vip_id) request( @@ -19,7 +19,7 @@ def delete_lb_vip(vip_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb b/lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb similarity index 88% rename from lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb rename to lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb index 54987f35a..31e41356b 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_healthmonitor(healthmonitor_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_healthmonitor(healthmonitor_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb b/lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb rename to lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb index 932da19e1..bafde224d 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_l7policy(l7policy_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_l7policy(l7policy_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb b/lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb similarity index 88% rename from lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb rename to lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb index e8c238b53..dec806767 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_l7rule(l7policy_id, l7rule_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_l7rule(l7policy_id, l7rule_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_listener.rb b/lib/fog/network/openstack/requests/delete_lbaas_listener.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_lbaas_listener.rb rename to lib/fog/network/openstack/requests/delete_lbaas_listener.rb index 757f4dbd6..3f4e73465 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_listener.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_listener(listener_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_listener(listener_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb b/lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb similarity index 88% rename from lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb rename to lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb index 86bd24c1e..e73cd61d4 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_loadbalancer(loadbalancer_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_loadbalancer(loadbalancer_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_pool.rb b/lib/fog/network/openstack/requests/delete_lbaas_pool.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_lbaas_pool.rb rename to lib/fog/network/openstack/requests/delete_lbaas_pool.rb index 3034c130a..8c0e5cf93 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_pool.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_pool(pool_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_pool(pool_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb b/lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb similarity index 88% rename from lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb rename to lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb index 82ef9e421..17e547efb 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb +++ b/lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_lbaas_pool_member(pool_id, member_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_pool_member(pool_id, member_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_network.rb b/lib/fog/network/openstack/requests/delete_network.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_network.rb rename to lib/fog/network/openstack/requests/delete_network.rb index abd10a4c0..0bee8e6c1 100644 --- a/lib/fog/openstack/network/requests/delete_network.rb +++ b/lib/fog/network/openstack/requests/delete_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_network(network_id) request( @@ -19,7 +19,7 @@ def delete_network(network_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_port.rb b/lib/fog/network/openstack/requests/delete_port.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_port.rb rename to lib/fog/network/openstack/requests/delete_port.rb index 270b5eb25..16b91a740 100644 --- a/lib/fog/openstack/network/requests/delete_port.rb +++ b/lib/fog/network/openstack/requests/delete_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_port(port_id) request( @@ -19,7 +19,7 @@ def delete_port(port_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_quota.rb b/lib/fog/network/openstack/requests/delete_quota.rb similarity index 91% rename from lib/fog/openstack/network/requests/delete_quota.rb rename to lib/fog/network/openstack/requests/delete_quota.rb index 8cb55f731..1336ab448 100644 --- a/lib/fog/openstack/network/requests/delete_quota.rb +++ b/lib/fog/network/openstack/requests/delete_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_quota(tenant_id) request( diff --git a/lib/fog/openstack/network/requests/delete_rbac_policy.rb b/lib/fog/network/openstack/requests/delete_rbac_policy.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_rbac_policy.rb rename to lib/fog/network/openstack/requests/delete_rbac_policy.rb index 61ab9a190..f051160e3 100644 --- a/lib/fog/openstack/network/requests/delete_rbac_policy.rb +++ b/lib/fog/network/openstack/requests/delete_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_rbac_policy(rbac_policy_id) request( @@ -19,7 +19,7 @@ def delete_rbac_policy(rbac_policy_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_router.rb b/lib/fog/network/openstack/requests/delete_router.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_router.rb rename to lib/fog/network/openstack/requests/delete_router.rb index 40b558328..313ce92d5 100644 --- a/lib/fog/openstack/network/requests/delete_router.rb +++ b/lib/fog/network/openstack/requests/delete_router.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_router(router_id) request( @@ -19,7 +19,7 @@ def delete_router(router_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_security_group.rb b/lib/fog/network/openstack/requests/delete_security_group.rb similarity index 89% rename from lib/fog/openstack/network/requests/delete_security_group.rb rename to lib/fog/network/openstack/requests/delete_security_group.rb index d467dc440..9dadd9b2f 100644 --- a/lib/fog/openstack/network/requests/delete_security_group.rb +++ b/lib/fog/network/openstack/requests/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Delete a security group # @@ -23,7 +23,7 @@ def delete_security_group(security_group_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_security_group_rule.rb b/lib/fog/network/openstack/requests/delete_security_group_rule.rb similarity index 90% rename from lib/fog/openstack/network/requests/delete_security_group_rule.rb rename to lib/fog/network/openstack/requests/delete_security_group_rule.rb index 0ad7a8ac5..2651982d9 100644 --- a/lib/fog/openstack/network/requests/delete_security_group_rule.rb +++ b/lib/fog/network/openstack/requests/delete_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Delete a security group rule # @@ -23,7 +23,7 @@ def delete_security_group_rule(security_group_rule_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_subnet.rb b/lib/fog/network/openstack/requests/delete_subnet.rb similarity index 86% rename from lib/fog/openstack/network/requests/delete_subnet.rb rename to lib/fog/network/openstack/requests/delete_subnet.rb index 0d47b2563..86d3e4a64 100644 --- a/lib/fog/openstack/network/requests/delete_subnet.rb +++ b/lib/fog/network/openstack/requests/delete_subnet.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_subnet(subnet_id) request( @@ -19,7 +19,7 @@ def delete_subnet(subnet_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_subnet_pool.rb b/lib/fog/network/openstack/requests/delete_subnet_pool.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_subnet_pool.rb rename to lib/fog/network/openstack/requests/delete_subnet_pool.rb index ed2f970c2..9c985d0ce 100644 --- a/lib/fog/openstack/network/requests/delete_subnet_pool.rb +++ b/lib/fog/network/openstack/requests/delete_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_subnet_pool(subnet_pool_id) request( @@ -19,7 +19,7 @@ def delete_subnet_pool(subnet_pool_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/delete_vpn_service.rb b/lib/fog/network/openstack/requests/delete_vpn_service.rb similarity index 87% rename from lib/fog/openstack/network/requests/delete_vpn_service.rb rename to lib/fog/network/openstack/requests/delete_vpn_service.rb index 37665346e..99fd4a866 100644 --- a/lib/fog/openstack/network/requests/delete_vpn_service.rb +++ b/lib/fog/network/openstack/requests/delete_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def delete_vpn_service(vpn_service_id) request( @@ -19,7 +19,7 @@ def delete_vpn_service(vpn_service_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/disassociate_floating_ip.rb b/lib/fog/network/openstack/requests/disassociate_floating_ip.rb similarity index 97% rename from lib/fog/openstack/network/requests/disassociate_floating_ip.rb rename to lib/fog/network/openstack/requests/disassociate_floating_ip.rb index f82c61378..048e11ea2 100644 --- a/lib/fog/openstack/network/requests/disassociate_floating_ip.rb +++ b/lib/fog/network/openstack/requests/disassociate_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def disassociate_floating_ip(floating_ip_id, options = {}) data = { diff --git a/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb b/lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb similarity index 89% rename from lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb rename to lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb index 473fa2ffe..3cafc56f4 100644 --- a/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb +++ b/lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def disassociate_lb_health_monitor(pool_id, health_monitor_id) request( @@ -20,7 +20,7 @@ def disassociate_lb_health_monitor(pool_id, health_monitor_id) response.status = 204 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_extension.rb b/lib/fog/network/openstack/requests/get_extension.rb similarity index 85% rename from lib/fog/openstack/network/requests/get_extension.rb rename to lib/fog/network/openstack/requests/get_extension.rb index 4bf4bd7c1..9cef9ec26 100644 --- a/lib/fog/openstack/network/requests/get_extension.rb +++ b/lib/fog/network/openstack/requests/get_extension.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_extension(name) request( @@ -19,7 +19,7 @@ def get_extension(name) response.body = {'extension' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_floating_ip.rb b/lib/fog/network/openstack/requests/get_floating_ip.rb similarity index 92% rename from lib/fog/openstack/network/requests/get_floating_ip.rb rename to lib/fog/network/openstack/requests/get_floating_ip.rb index 4bd6ac2a5..2ec92555e 100644 --- a/lib/fog/openstack/network/requests/get_floating_ip.rb +++ b/lib/fog/network/openstack/requests/get_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_floating_ip(floating_ip_id) request( @@ -30,7 +30,7 @@ def get_floating_ip(floating_ip_id) } response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_ike_policy.rb b/lib/fog/network/openstack/requests/get_ike_policy.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_ike_policy.rb rename to lib/fog/network/openstack/requests/get_ike_policy.rb index 4eacb6261..da81eb114 100644 --- a/lib/fog/openstack/network/requests/get_ike_policy.rb +++ b/lib/fog/network/openstack/requests/get_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_ike_policy(ike_policy_id) request( @@ -19,7 +19,7 @@ def get_ike_policy(ike_policy_id) response.body = {'ikepolicy' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_ipsec_policy.rb b/lib/fog/network/openstack/requests/get_ipsec_policy.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_ipsec_policy.rb rename to lib/fog/network/openstack/requests/get_ipsec_policy.rb index b8c7d7b2f..4d6336f45 100644 --- a/lib/fog/openstack/network/requests/get_ipsec_policy.rb +++ b/lib/fog/network/openstack/requests/get_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_ipsec_policy(ipsec_policy_id) request( @@ -19,7 +19,7 @@ def get_ipsec_policy(ipsec_policy_id) response.body = {'ipsecpolicy' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb b/lib/fog/network/openstack/requests/get_ipsec_site_connection.rb similarity index 88% rename from lib/fog/openstack/network/requests/get_ipsec_site_connection.rb rename to lib/fog/network/openstack/requests/get_ipsec_site_connection.rb index e100d18b4..5b1774b64 100644 --- a/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb +++ b/lib/fog/network/openstack/requests/get_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_ipsec_site_connection(ipsec_site_connection_id) request( @@ -19,7 +19,7 @@ def get_ipsec_site_connection(ipsec_site_connection_id) response.body = {'ipsec_site_connection' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lb_health_monitor.rb b/lib/fog/network/openstack/requests/get_lb_health_monitor.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_lb_health_monitor.rb rename to lib/fog/network/openstack/requests/get_lb_health_monitor.rb index 1ac983470..6af8dadcf 100644 --- a/lib/fog/openstack/network/requests/get_lb_health_monitor.rb +++ b/lib/fog/network/openstack/requests/get_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lb_health_monitor(health_monitor_id) request( @@ -19,7 +19,7 @@ def get_lb_health_monitor(health_monitor_id) response.body = {'health_monitor' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lb_member.rb b/lib/fog/network/openstack/requests/get_lb_member.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_lb_member.rb rename to lib/fog/network/openstack/requests/get_lb_member.rb index cd18a27d7..f6e0d0e38 100644 --- a/lib/fog/openstack/network/requests/get_lb_member.rb +++ b/lib/fog/network/openstack/requests/get_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lb_member(member_id) request( @@ -19,7 +19,7 @@ def get_lb_member(member_id) response.body = {'member' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lb_pool.rb b/lib/fog/network/openstack/requests/get_lb_pool.rb similarity index 85% rename from lib/fog/openstack/network/requests/get_lb_pool.rb rename to lib/fog/network/openstack/requests/get_lb_pool.rb index 93668dd60..c32746c83 100644 --- a/lib/fog/openstack/network/requests/get_lb_pool.rb +++ b/lib/fog/network/openstack/requests/get_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lb_pool(pool_id) request( @@ -19,7 +19,7 @@ def get_lb_pool(pool_id) response.body = {'pool' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb b/lib/fog/network/openstack/requests/get_lb_pool_stats.rb similarity index 89% rename from lib/fog/openstack/network/requests/get_lb_pool_stats.rb rename to lib/fog/network/openstack/requests/get_lb_pool_stats.rb index 385cec020..2e50f9425 100644 --- a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb +++ b/lib/fog/network/openstack/requests/get_lb_pool_stats.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lb_pool_stats(pool_id) request( @@ -24,7 +24,7 @@ def get_lb_pool_stats(pool_id) response.body = {'stats' => stats} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lb_vip.rb b/lib/fog/network/openstack/requests/get_lb_vip.rb similarity index 85% rename from lib/fog/openstack/network/requests/get_lb_vip.rb rename to lib/fog/network/openstack/requests/get_lb_vip.rb index 54b85101a..97c8bb13e 100644 --- a/lib/fog/openstack/network/requests/get_lb_vip.rb +++ b/lib/fog/network/openstack/requests/get_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lb_vip(vip_id) request( @@ -19,7 +19,7 @@ def get_lb_vip(vip_id) response.body = {'vip' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb b/lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb rename to lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb index 6a02762b6..5c7fcbf87 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_healthmonitor(healthmonitor_id) request( @@ -19,7 +19,7 @@ def get_lbaas_healthmonitor(healthmonitor_id) response.body = {'healthmonitor' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb b/lib/fog/network/openstack/requests/get_lbaas_l7policy.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_lbaas_l7policy.rb rename to lib/fog/network/openstack/requests/get_lbaas_l7policy.rb index e1a319869..44d87105c 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_l7policy(l7policy_id) request( @@ -19,7 +19,7 @@ def get_lbaas_l7policy(l7policy_id) response.body = {'l7policy' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb b/lib/fog/network/openstack/requests/get_lbaas_l7rule.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_lbaas_l7rule.rb rename to lib/fog/network/openstack/requests/get_lbaas_l7rule.rb index 5f628dd1d..e63b527d6 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_l7rule(l7policy_id, l7rule_id) request( @@ -19,7 +19,7 @@ def get_lbaas_l7rule(l7policy_id, l7rule_id) response.body = {'rule' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_listener.rb b/lib/fog/network/openstack/requests/get_lbaas_listener.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_lbaas_listener.rb rename to lib/fog/network/openstack/requests/get_lbaas_listener.rb index 2e3e9c360..2bfc10b78 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_listener.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_listener(listener_id) request( @@ -19,7 +19,7 @@ def get_lbaas_listener(listener_id) response.body = {'listener' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb b/lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb rename to lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb index 9adbc292f..e9c5f790b 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_loadbalancer(loadbalancer_id) request( @@ -19,7 +19,7 @@ def get_lbaas_loadbalancer(loadbalancer_id) response.body = {'loadbalancer' => data[:lbaas_loadbalancer]} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_pool.rb b/lib/fog/network/openstack/requests/get_lbaas_pool.rb similarity index 85% rename from lib/fog/openstack/network/requests/get_lbaas_pool.rb rename to lib/fog/network/openstack/requests/get_lbaas_pool.rb index 7ee764d14..8342fe7c2 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_pool.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_pool(pool_id) request( @@ -19,7 +19,7 @@ def get_lbaas_pool(pool_id) response.body = {'pool' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb b/lib/fog/network/openstack/requests/get_lbaas_pool_member.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_lbaas_pool_member.rb rename to lib/fog/network/openstack/requests/get_lbaas_pool_member.rb index d91f8358c..88b89ac97 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb +++ b/lib/fog/network/openstack/requests/get_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_lbaas_pool_member(pool_id, member_id) request( @@ -19,7 +19,7 @@ def get_lbaas_pool_member(pool_id, member_id) response.body = {'member' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_network.rb b/lib/fog/network/openstack/requests/get_network.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_network.rb rename to lib/fog/network/openstack/requests/get_network.rb index 86968552d..44acd5d1c 100644 --- a/lib/fog/openstack/network/requests/get_network.rb +++ b/lib/fog/network/openstack/requests/get_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_network(network_id) request( @@ -19,7 +19,7 @@ def get_network(network_id) response.body = {'network' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_network_ip_availability.rb b/lib/fog/network/openstack/requests/get_network_ip_availability.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_network_ip_availability.rb rename to lib/fog/network/openstack/requests/get_network_ip_availability.rb index 08c2319cb..ad09682db 100644 --- a/lib/fog/openstack/network/requests/get_network_ip_availability.rb +++ b/lib/fog/network/openstack/requests/get_network_ip_availability.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_network_ip_availability(network_id) request( @@ -19,7 +19,7 @@ def get_network_ip_availability(network_id) response.body = {'network_ip_availability' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_port.rb b/lib/fog/network/openstack/requests/get_port.rb similarity index 94% rename from lib/fog/openstack/network/requests/get_port.rb rename to lib/fog/network/openstack/requests/get_port.rb index da6159748..f8210265e 100644 --- a/lib/fog/openstack/network/requests/get_port.rb +++ b/lib/fog/network/openstack/requests/get_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_port(port_id) request( @@ -42,7 +42,7 @@ def get_port(port_id) } response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_quota.rb b/lib/fog/network/openstack/requests/get_quota.rb similarity index 93% rename from lib/fog/openstack/network/requests/get_quota.rb rename to lib/fog/network/openstack/requests/get_quota.rb index 7caa56c36..629c8db6b 100644 --- a/lib/fog/openstack/network/requests/get_quota.rb +++ b/lib/fog/network/openstack/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_quota(tenant_id) request( diff --git a/lib/fog/openstack/network/requests/get_quotas.rb b/lib/fog/network/openstack/requests/get_quotas.rb similarity index 92% rename from lib/fog/openstack/network/requests/get_quotas.rb rename to lib/fog/network/openstack/requests/get_quotas.rb index 295caca5a..b13d9b530 100644 --- a/lib/fog/openstack/network/requests/get_quotas.rb +++ b/lib/fog/network/openstack/requests/get_quotas.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_quotas request( diff --git a/lib/fog/openstack/network/requests/get_rbac_policy.rb b/lib/fog/network/openstack/requests/get_rbac_policy.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_rbac_policy.rb rename to lib/fog/network/openstack/requests/get_rbac_policy.rb index c42f505d9..6b0ba0f7b 100644 --- a/lib/fog/openstack/network/requests/get_rbac_policy.rb +++ b/lib/fog/network/openstack/requests/get_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_rbac_policy(rbac_policy_id) request( @@ -19,7 +19,7 @@ def get_rbac_policy(rbac_policy_id) response.body = {'rbac_policy' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_router.rb b/lib/fog/network/openstack/requests/get_router.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_router.rb rename to lib/fog/network/openstack/requests/get_router.rb index dc69e2be8..7791dc996 100644 --- a/lib/fog/openstack/network/requests/get_router.rb +++ b/lib/fog/network/openstack/requests/get_router.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_router(router_id) request( @@ -21,7 +21,7 @@ def get_router(router_id) } response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_security_group.rb b/lib/fog/network/openstack/requests/get_security_group.rb similarity index 96% rename from lib/fog/openstack/network/requests/get_security_group.rb rename to lib/fog/network/openstack/requests/get_security_group.rb index 7ef1c916d..86e10a088 100644 --- a/lib/fog/openstack/network/requests/get_security_group.rb +++ b/lib/fog/network/openstack/requests/get_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Get details about a security group # @@ -43,7 +43,7 @@ def get_security_group(security_group_id) response.body = {"security_group" => sec_group} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_security_group_rule.rb b/lib/fog/network/openstack/requests/get_security_group_rule.rb similarity index 95% rename from lib/fog/openstack/network/requests/get_security_group_rule.rb rename to lib/fog/network/openstack/requests/get_security_group_rule.rb index ac746088e..67204e8ec 100644 --- a/lib/fog/openstack/network/requests/get_security_group_rule.rb +++ b/lib/fog/network/openstack/requests/get_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Get details about a security group rule # @@ -38,7 +38,7 @@ def get_security_group_rule(security_group_rule_id) response.body = {"security_group_rule" => sec_group_rule} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_subnet.rb b/lib/fog/network/openstack/requests/get_subnet.rb similarity index 93% rename from lib/fog/openstack/network/requests/get_subnet.rb rename to lib/fog/network/openstack/requests/get_subnet.rb index 8271a4dbf..cac3ed4b4 100644 --- a/lib/fog/openstack/network/requests/get_subnet.rb +++ b/lib/fog/network/openstack/requests/get_subnet.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_subnet(subnet_id) request( @@ -38,7 +38,7 @@ def get_subnet(subnet_id) } response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_subnet_pool.rb b/lib/fog/network/openstack/requests/get_subnet_pool.rb similarity index 87% rename from lib/fog/openstack/network/requests/get_subnet_pool.rb rename to lib/fog/network/openstack/requests/get_subnet_pool.rb index c1159b4ed..dcbd84491 100644 --- a/lib/fog/openstack/network/requests/get_subnet_pool.rb +++ b/lib/fog/network/openstack/requests/get_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_subnet_pool(subnet_pool_id) request( @@ -20,7 +20,7 @@ def get_subnet_pool(subnet_pool_id) response.body = {'subnetpool' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/get_vpn_service.rb b/lib/fog/network/openstack/requests/get_vpn_service.rb similarity index 86% rename from lib/fog/openstack/network/requests/get_vpn_service.rb rename to lib/fog/network/openstack/requests/get_vpn_service.rb index ac0825e43..3e8858e00 100644 --- a/lib/fog/openstack/network/requests/get_vpn_service.rb +++ b/lib/fog/network/openstack/requests/get_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def get_vpn_service(vpn_service_id) request( @@ -19,7 +19,7 @@ def get_vpn_service(vpn_service_id) response.body = {'vpnservice' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/list_extensions.rb b/lib/fog/network/openstack/requests/list_extensions.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_extensions.rb rename to lib/fog/network/openstack/requests/list_extensions.rb index 2eee193a2..2b8f7c7d7 100644 --- a/lib/fog/openstack/network/requests/list_extensions.rb +++ b/lib/fog/network/openstack/requests/list_extensions.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_extensions(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_floating_ips.rb b/lib/fog/network/openstack/requests/list_floating_ips.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_floating_ips.rb rename to lib/fog/network/openstack/requests/list_floating_ips.rb index 5932a7e87..58664a180 100644 --- a/lib/fog/openstack/network/requests/list_floating_ips.rb +++ b/lib/fog/network/openstack/requests/list_floating_ips.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_floating_ips(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_ike_policies.rb b/lib/fog/network/openstack/requests/list_ike_policies.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_ike_policies.rb rename to lib/fog/network/openstack/requests/list_ike_policies.rb index ede627f96..b3a5f265d 100644 --- a/lib/fog/openstack/network/requests/list_ike_policies.rb +++ b/lib/fog/network/openstack/requests/list_ike_policies.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_ike_policies(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_ipsec_policies.rb b/lib/fog/network/openstack/requests/list_ipsec_policies.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_ipsec_policies.rb rename to lib/fog/network/openstack/requests/list_ipsec_policies.rb index 9cca1ca17..07bb6a6d7 100644 --- a/lib/fog/openstack/network/requests/list_ipsec_policies.rb +++ b/lib/fog/network/openstack/requests/list_ipsec_policies.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_ipsec_policies(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb b/lib/fog/network/openstack/requests/list_ipsec_site_connections.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_ipsec_site_connections.rb rename to lib/fog/network/openstack/requests/list_ipsec_site_connections.rb index cd50b9e5a..de7a105a4 100644 --- a/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb +++ b/lib/fog/network/openstack/requests/list_ipsec_site_connections.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_ipsec_site_connections(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lb_health_monitors.rb b/lib/fog/network/openstack/requests/list_lb_health_monitors.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lb_health_monitors.rb rename to lib/fog/network/openstack/requests/list_lb_health_monitors.rb index 60a1a9532..e9d532375 100644 --- a/lib/fog/openstack/network/requests/list_lb_health_monitors.rb +++ b/lib/fog/network/openstack/requests/list_lb_health_monitors.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lb_health_monitors(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lb_members.rb b/lib/fog/network/openstack/requests/list_lb_members.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_lb_members.rb rename to lib/fog/network/openstack/requests/list_lb_members.rb index 0c4c1f53e..b8e893c1e 100644 --- a/lib/fog/openstack/network/requests/list_lb_members.rb +++ b/lib/fog/network/openstack/requests/list_lb_members.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lb_members(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lb_pools.rb b/lib/fog/network/openstack/requests/list_lb_pools.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_lb_pools.rb rename to lib/fog/network/openstack/requests/list_lb_pools.rb index aaa853b3f..3987cc27b 100644 --- a/lib/fog/openstack/network/requests/list_lb_pools.rb +++ b/lib/fog/network/openstack/requests/list_lb_pools.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lb_pools(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lb_vips.rb b/lib/fog/network/openstack/requests/list_lb_vips.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_lb_vips.rb rename to lib/fog/network/openstack/requests/list_lb_vips.rb index 0e1749afc..d6e7fa018 100644 --- a/lib/fog/openstack/network/requests/list_lb_vips.rb +++ b/lib/fog/network/openstack/requests/list_lb_vips.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lb_vips(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb b/lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb rename to lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb index 17e68f45b..63e8e77df 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_healthmonitors(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb b/lib/fog/network/openstack/requests/list_lbaas_l7policies.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lbaas_l7policies.rb rename to lib/fog/network/openstack/requests/list_lbaas_l7policies.rb index c3e12db3f..b2a9415a1 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_l7policies.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_l7policies(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb b/lib/fog/network/openstack/requests/list_lbaas_l7rules.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lbaas_l7rules.rb rename to lib/fog/network/openstack/requests/list_lbaas_l7rules.rb index 49321df5d..d716a7245 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_l7rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_l7rules(l7policy_id, filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_listeners.rb b/lib/fog/network/openstack/requests/list_lbaas_listeners.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lbaas_listeners.rb rename to lib/fog/network/openstack/requests/list_lbaas_listeners.rb index f6c4cf266..ff5dd4c9d 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_listeners.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_listeners.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_listeners(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb b/lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb rename to lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb index c548296ec..78dcc433b 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_loadbalancers(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb b/lib/fog/network/openstack/requests/list_lbaas_pool_members.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_lbaas_pool_members.rb rename to lib/fog/network/openstack/requests/list_lbaas_pool_members.rb index 8bf197228..84ea68244 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_pool_members.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_pool_members(pool_id, filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_lbaas_pools.rb b/lib/fog/network/openstack/requests/list_lbaas_pools.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_lbaas_pools.rb rename to lib/fog/network/openstack/requests/list_lbaas_pools.rb index d792cb075..d4a59342b 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_pools.rb +++ b/lib/fog/network/openstack/requests/list_lbaas_pools.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_lbaas_pools(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb b/lib/fog/network/openstack/requests/list_network_ip_availabilities.rb similarity index 86% rename from lib/fog/openstack/network/requests/list_network_ip_availabilities.rb rename to lib/fog/network/openstack/requests/list_network_ip_availabilities.rb index df4269d78..119fa612f 100644 --- a/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb +++ b/lib/fog/network/openstack/requests/list_network_ip_availabilities.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_network_ip_availabilities request( @@ -19,7 +19,7 @@ def list_network_ip_availabilities response.body = {'network_ip_availabilities' => data} response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/list_networks.rb b/lib/fog/network/openstack/requests/list_networks.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_networks.rb rename to lib/fog/network/openstack/requests/list_networks.rb index e21c89971..2f2d163fb 100644 --- a/lib/fog/openstack/network/requests/list_networks.rb +++ b/lib/fog/network/openstack/requests/list_networks.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_networks(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_ports.rb b/lib/fog/network/openstack/requests/list_ports.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_ports.rb rename to lib/fog/network/openstack/requests/list_ports.rb index 46fe03b6c..4a70473e7 100644 --- a/lib/fog/openstack/network/requests/list_ports.rb +++ b/lib/fog/network/openstack/requests/list_ports.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_ports(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_rbac_policies.rb b/lib/fog/network/openstack/requests/list_rbac_policies.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_rbac_policies.rb rename to lib/fog/network/openstack/requests/list_rbac_policies.rb index 0e2b95e70..7140a3ce6 100644 --- a/lib/fog/openstack/network/requests/list_rbac_policies.rb +++ b/lib/fog/network/openstack/requests/list_rbac_policies.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_rbac_policies(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_routers.rb b/lib/fog/network/openstack/requests/list_routers.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_routers.rb rename to lib/fog/network/openstack/requests/list_routers.rb index 3c9010c6f..510ba2875 100644 --- a/lib/fog/openstack/network/requests/list_routers.rb +++ b/lib/fog/network/openstack/requests/list_routers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_routers(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_security_group_rules.rb b/lib/fog/network/openstack/requests/list_security_group_rules.rb similarity index 97% rename from lib/fog/openstack/network/requests/list_security_group_rules.rb rename to lib/fog/network/openstack/requests/list_security_group_rules.rb index d985d6fdd..ac126c807 100644 --- a/lib/fog/openstack/network/requests/list_security_group_rules.rb +++ b/lib/fog/network/openstack/requests/list_security_group_rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # List all security group rules # diff --git a/lib/fog/openstack/network/requests/list_security_groups.rb b/lib/fog/network/openstack/requests/list_security_groups.rb similarity index 98% rename from lib/fog/openstack/network/requests/list_security_groups.rb rename to lib/fog/network/openstack/requests/list_security_groups.rb index ceb16c9da..9a4ee79b4 100644 --- a/lib/fog/openstack/network/requests/list_security_groups.rb +++ b/lib/fog/network/openstack/requests/list_security_groups.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # List all security groups # diff --git a/lib/fog/openstack/network/requests/list_subnet_pools.rb b/lib/fog/network/openstack/requests/list_subnet_pools.rb similarity index 93% rename from lib/fog/openstack/network/requests/list_subnet_pools.rb rename to lib/fog/network/openstack/requests/list_subnet_pools.rb index eee578c22..0e8fe3f29 100644 --- a/lib/fog/openstack/network/requests/list_subnet_pools.rb +++ b/lib/fog/network/openstack/requests/list_subnet_pools.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_subnet_pools(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_subnets.rb b/lib/fog/network/openstack/requests/list_subnets.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_subnets.rb rename to lib/fog/network/openstack/requests/list_subnets.rb index aae439beb..7de67fd1e 100644 --- a/lib/fog/openstack/network/requests/list_subnets.rb +++ b/lib/fog/network/openstack/requests/list_subnets.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_subnets(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/list_vpn_services.rb b/lib/fog/network/openstack/requests/list_vpn_services.rb similarity index 92% rename from lib/fog/openstack/network/requests/list_vpn_services.rb rename to lib/fog/network/openstack/requests/list_vpn_services.rb index 277c447f9..f37c445c5 100644 --- a/lib/fog/openstack/network/requests/list_vpn_services.rb +++ b/lib/fog/network/openstack/requests/list_vpn_services.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def list_vpn_services(filters = {}) request( diff --git a/lib/fog/openstack/network/requests/remove_router_interface.rb b/lib/fog/network/openstack/requests/remove_router_interface.rb similarity index 95% rename from lib/fog/openstack/network/requests/remove_router_interface.rb rename to lib/fog/network/openstack/requests/remove_router_interface.rb index 81de8ea05..86343ba30 100644 --- a/lib/fog/openstack/network/requests/remove_router_interface.rb +++ b/lib/fog/network/openstack/requests/remove_router_interface.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def remove_router_interface(router_id, subnet_id, _options = {}) data = { diff --git a/lib/fog/openstack/network/requests/set_tenant.rb b/lib/fog/network/openstack/requests/set_tenant.rb similarity index 88% rename from lib/fog/openstack/network/requests/set_tenant.rb rename to lib/fog/network/openstack/requests/set_tenant.rb index 805f37521..81dba7308 100644 --- a/lib/fog/openstack/network/requests/set_tenant.rb +++ b/lib/fog/network/openstack/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/openstack/network/requests/update_ike_policy.rb b/lib/fog/network/openstack/requests/update_ike_policy.rb similarity index 95% rename from lib/fog/openstack/network/requests/update_ike_policy.rb rename to lib/fog/network/openstack/requests/update_ike_policy.rb index feb337958..53fa86f02 100644 --- a/lib/fog/openstack/network/requests/update_ike_policy.rb +++ b/lib/fog/network/openstack/requests/update_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_ike_policy(ike_policy_id, options = {}) data = {'ikepolicy' => {}} @@ -39,7 +39,7 @@ def update_ike_policy(ike_policy_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_ipsec_policy.rb b/lib/fog/network/openstack/requests/update_ipsec_policy.rb similarity index 95% rename from lib/fog/openstack/network/requests/update_ipsec_policy.rb rename to lib/fog/network/openstack/requests/update_ipsec_policy.rb index db3ea1344..e41c9f5aa 100644 --- a/lib/fog/openstack/network/requests/update_ipsec_policy.rb +++ b/lib/fog/network/openstack/requests/update_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_ipsec_policy(ipsec_policy_id, options = {}) data = {'ipsecpolicy' => {}} @@ -42,7 +42,7 @@ def update_ipsec_policy(ipsec_policy_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb b/lib/fog/network/openstack/requests/update_ipsec_site_connection.rb similarity index 97% rename from lib/fog/openstack/network/requests/update_ipsec_site_connection.rb rename to lib/fog/network/openstack/requests/update_ipsec_site_connection.rb index 894e65041..ae43af2d3 100644 --- a/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb +++ b/lib/fog/network/openstack/requests/update_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) data = {'ipsec_site_connection' => {}} @@ -54,7 +54,7 @@ def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lb_health_monitor.rb b/lib/fog/network/openstack/requests/update_lb_health_monitor.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_lb_health_monitor.rb rename to lib/fog/network/openstack/requests/update_lb_health_monitor.rb index 7c4bfcf7c..f84f4080a 100644 --- a/lib/fog/openstack/network/requests/update_lb_health_monitor.rb +++ b/lib/fog/network/openstack/requests/update_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lb_health_monitor(health_monitor_id, options = {}) data = {'health_monitor' => {}} @@ -34,7 +34,7 @@ def update_lb_health_monitor(health_monitor_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lb_member.rb b/lib/fog/network/openstack/requests/update_lb_member.rb similarity index 92% rename from lib/fog/openstack/network/requests/update_lb_member.rb rename to lib/fog/network/openstack/requests/update_lb_member.rb index c12aa1e98..212096751 100644 --- a/lib/fog/openstack/network/requests/update_lb_member.rb +++ b/lib/fog/network/openstack/requests/update_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lb_member(member_id, options = {}) data = {'member' => {}} @@ -30,7 +30,7 @@ def update_lb_member(member_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lb_pool.rb b/lib/fog/network/openstack/requests/update_lb_pool.rb similarity index 92% rename from lib/fog/openstack/network/requests/update_lb_pool.rb rename to lib/fog/network/openstack/requests/update_lb_pool.rb index 5bb101a04..2e20cd78f 100644 --- a/lib/fog/openstack/network/requests/update_lb_pool.rb +++ b/lib/fog/network/openstack/requests/update_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lb_pool(pool_id, options = {}) data = {'pool' => {}} @@ -31,7 +31,7 @@ def update_lb_pool(pool_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lb_vip.rb b/lib/fog/network/openstack/requests/update_lb_vip.rb similarity index 93% rename from lib/fog/openstack/network/requests/update_lb_vip.rb rename to lib/fog/network/openstack/requests/update_lb_vip.rb index 103f2bb5d..e3aa77586 100644 --- a/lib/fog/openstack/network/requests/update_lb_vip.rb +++ b/lib/fog/network/openstack/requests/update_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lb_vip(vip_id, options = {}) data = {'vip' => {}} @@ -33,7 +33,7 @@ def update_lb_vip(vip_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb b/lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb rename to lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb index 6289ad379..474188e63 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_healthmonitor(healthmonitor_id, options = {}) data = {'healthmonitor' => {}} @@ -34,7 +34,7 @@ def update_lbaas_healthmonitor(healthmonitor_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb b/lib/fog/network/openstack/requests/update_lbaas_l7policy.rb similarity index 93% rename from lib/fog/openstack/network/requests/update_lbaas_l7policy.rb rename to lib/fog/network/openstack/requests/update_lbaas_l7policy.rb index 2f17e8bf6..bc21a9e95 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_l7policy(l7policy_id, options = {}) @@ -34,7 +34,7 @@ def update_lbaas_l7rule(l7policy_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb b/lib/fog/network/openstack/requests/update_lbaas_l7rule.rb similarity index 93% rename from lib/fog/openstack/network/requests/update_lbaas_l7rule.rb rename to lib/fog/network/openstack/requests/update_lbaas_l7rule.rb index c464c2e11..e7a0be425 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) @@ -33,7 +33,7 @@ def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_listener.rb b/lib/fog/network/openstack/requests/update_lbaas_listener.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_lbaas_listener.rb rename to lib/fog/network/openstack/requests/update_lbaas_listener.rb index 02b46fb77..6417c3429 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_listener.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_listener(listener_id, options = {}) @@ -35,7 +35,7 @@ def update_lbaas_listener(listener_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb b/lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb similarity index 93% rename from lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb rename to lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb index 8a6aeb255..8933875e8 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_loadbalancer(loadbalancer_id, options = {}) data = { @@ -32,7 +32,7 @@ def update_lbaas_loadbalancer(loadbalancer_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_pool.rb b/lib/fog/network/openstack/requests/update_lbaas_pool.rb similarity index 92% rename from lib/fog/openstack/network/requests/update_lbaas_pool.rb rename to lib/fog/network/openstack/requests/update_lbaas_pool.rb index 9e4e30dd5..cc7c79b4a 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_pool.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_pool(pool_id, options = {}) data = {'pool' => {}} @@ -31,7 +31,7 @@ def update_lbaas_pool(pool_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb b/lib/fog/network/openstack/requests/update_lbaas_pool_member.rb similarity index 92% rename from lib/fog/openstack/network/requests/update_lbaas_pool_member.rb rename to lib/fog/network/openstack/requests/update_lbaas_pool_member.rb index 78c0a5a13..507cd2348 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb +++ b/lib/fog/network/openstack/requests/update_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_lbaas_pool_member(pool_id, member_id, options = {}) data = {'member' => {}} @@ -30,7 +30,7 @@ def update_lbaas_pool_member(pool_id, member_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_network.rb b/lib/fog/network/openstack/requests/update_network.rb similarity index 90% rename from lib/fog/openstack/network/requests/update_network.rb rename to lib/fog/network/openstack/requests/update_network.rb index fa88d8d04..23536ca0c 100644 --- a/lib/fog/openstack/network/requests/update_network.rb +++ b/lib/fog/network/openstack/requests/update_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Not all options can be updated UPDATE_OPTIONS = [ @@ -44,12 +44,12 @@ class Mock def update_network(network_id, options = {}) response = Excon::Response.new if network = list_networks.body['networks'].find { |_| _['id'] == network_id } - network.merge!(Fog::OpenStack::Network::Real.update(options)) + network.merge!(Fog::Network::OpenStack::Real.update(options)) response.body = {'network' => network} response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_port.rb b/lib/fog/network/openstack/requests/update_port.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_port.rb rename to lib/fog/network/openstack/requests/update_port.rb index b3ffcaed5..8b5014f66 100644 --- a/lib/fog/openstack/network/requests/update_port.rb +++ b/lib/fog/network/openstack/requests/update_port.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_port(port_id, options = {}) data = {'port' => {}} @@ -35,7 +35,7 @@ def update_port(port_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_quota.rb b/lib/fog/network/openstack/requests/update_quota.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_quota.rb rename to lib/fog/network/openstack/requests/update_quota.rb index 9d774b016..7f52ed709 100644 --- a/lib/fog/openstack/network/requests/update_quota.rb +++ b/lib/fog/network/openstack/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/openstack/network/requests/update_rbac_policy.rb b/lib/fog/network/openstack/requests/update_rbac_policy.rb similarity index 92% rename from lib/fog/openstack/network/requests/update_rbac_policy.rb rename to lib/fog/network/openstack/requests/update_rbac_policy.rb index 98fd3483f..dfb0721ec 100644 --- a/lib/fog/openstack/network/requests/update_rbac_policy.rb +++ b/lib/fog/network/openstack/requests/update_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_rbac_policy(rbac_policy_id, options = {}) data = {'rbac_policy' => {}} @@ -32,7 +32,7 @@ def update_rbac_policy(rbac_policy_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_router.rb b/lib/fog/network/openstack/requests/update_router.rb similarity index 91% rename from lib/fog/openstack/network/requests/update_router.rb rename to lib/fog/network/openstack/requests/update_router.rb index cf76566cf..48724d81d 100644 --- a/lib/fog/openstack/network/requests/update_router.rb +++ b/lib/fog/network/openstack/requests/update_router.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real # Update Router # @@ -18,7 +18,7 @@ def update_router(router_id, options = {}) # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::OpenStack::Network::Network) + if egi.kind_of?(Fog::Network::OpenStack::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" data['router'][:external_gateway_info] = {:network_id => egi.id} @@ -43,14 +43,14 @@ def update_router(router_id, options = {}) response = Excon::Response.new router = list_routers.body['routers'].find { |r| r[:id] == router_id } - raise Fog::OpenStack::Network::NotFound unless router + raise Fog::Network::OpenStack::NotFound unless router options.keys.each { |k| router[k] = options[k] } # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::OpenStack::Network::Network) + if egi.kind_of?(Fog::Network::OpenStack::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" router[:external_gateway_info] = { :network_id => egi.id } diff --git a/lib/fog/openstack/network/requests/update_security_group.rb b/lib/fog/network/openstack/requests/update_security_group.rb similarity index 92% rename from lib/fog/openstack/network/requests/update_security_group.rb rename to lib/fog/network/openstack/requests/update_security_group.rb index 69824e119..27aaae122 100644 --- a/lib/fog/openstack/network/requests/update_security_group.rb +++ b/lib/fog/network/openstack/requests/update_security_group.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_security_group(security_group_id, options = {}) data = {'security_group' => {}} @@ -32,7 +32,7 @@ def update_security_group(security_group_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_subnet.rb b/lib/fog/network/openstack/requests/update_subnet.rb similarity index 93% rename from lib/fog/openstack/network/requests/update_subnet.rb rename to lib/fog/network/openstack/requests/update_subnet.rb index 11e886890..10f5743c1 100644 --- a/lib/fog/openstack/network/requests/update_subnet.rb +++ b/lib/fog/network/openstack/requests/update_subnet.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_subnet(subnet_id, options = {}) data = {'subnet' => {}} @@ -34,7 +34,7 @@ def update_subnet(subnet_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_subnet_pool.rb b/lib/fog/network/openstack/requests/update_subnet_pool.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_subnet_pool.rb rename to lib/fog/network/openstack/requests/update_subnet_pool.rb index 8833a2568..b0a0ee546 100644 --- a/lib/fog/openstack/network/requests/update_subnet_pool.rb +++ b/lib/fog/network/openstack/requests/update_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_subnet_pool(subnet_pool_id, options = {}) data = {'subnetpool' => {}} @@ -37,7 +37,7 @@ def update_subnet_pool(subnet_pool_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/network/requests/update_vpn_service.rb b/lib/fog/network/openstack/requests/update_vpn_service.rb similarity index 94% rename from lib/fog/openstack/network/requests/update_vpn_service.rb rename to lib/fog/network/openstack/requests/update_vpn_service.rb index 8a65c83b9..87e3ef458 100644 --- a/lib/fog/openstack/network/requests/update_vpn_service.rb +++ b/lib/fog/network/openstack/requests/update_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Network + module Network + class OpenStack class Real def update_vpn_service(vpn_service_id, options = {}) data = {'vpnservice' => {}} @@ -37,7 +37,7 @@ def update_vpn_service(vpn_service_id, options = {}) response.status = 200 response else - raise Fog::OpenStack::Network::NotFound + raise Fog::Network::OpenStack::NotFound end end end diff --git a/lib/fog/openstack/nfv/nfv.rb b/lib/fog/nfv/openstack.rb similarity index 94% rename from lib/fog/openstack/nfv/nfv.rb rename to lib/fog/nfv/openstack.rb index b0cd206fc..857cacc19 100644 --- a/lib/fog/openstack/nfv/nfv.rb +++ b/lib/fog/nfv/openstack.rb @@ -1,8 +1,8 @@ require 'yaml' module Fog - module OpenStack - class NFV < Fog::Service + module NFV + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v1.0/ requires :openstack_auth_url @@ -19,7 +19,7 @@ class NFV < Fog::Service ## REQUESTS # - request_path 'fog/openstack/nfv/requests' + request_path 'fog/nfv/openstack/requests' # vnfds requests request :list_vnfds @@ -36,7 +36,7 @@ class NFV < Fog::Service ## MODELS # - model_path 'fog/openstack/nfv/models' + model_path 'fog/nfv/openstack/models' model :vnfd collection :vnfds model :vnf @@ -98,7 +98,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::NFV::NotFound + Fog::NFV::OpenStack::NotFound end def default_path_prefix diff --git a/lib/fog/openstack/nfv/models/vnf.rb b/lib/fog/nfv/openstack/models/vnf.rb similarity index 97% rename from lib/fog/openstack/nfv/models/vnf.rb rename to lib/fog/nfv/openstack/models/vnf.rb index 8229f4992..6373e172f 100644 --- a/lib/fog/openstack/nfv/models/vnf.rb +++ b/lib/fog/nfv/openstack/models/vnf.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Vnf < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/nfv/models/vnfd.rb b/lib/fog/nfv/openstack/models/vnfd.rb similarity index 97% rename from lib/fog/openstack/nfv/models/vnfd.rb rename to lib/fog/nfv/openstack/models/vnfd.rb index ebcda3ec1..1c39c0b2a 100644 --- a/lib/fog/openstack/nfv/models/vnfd.rb +++ b/lib/fog/nfv/openstack/models/vnfd.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Vnfd < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/nfv/models/vnfds.rb b/lib/fog/nfv/openstack/models/vnfds.rb similarity index 73% rename from lib/fog/openstack/nfv/models/vnfds.rb rename to lib/fog/nfv/openstack/models/vnfds.rb index 9d213f235..924df6e43 100644 --- a/lib/fog/openstack/nfv/models/vnfds.rb +++ b/lib/fog/nfv/openstack/models/vnfds.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/nfv/models/vnfd' +require 'fog/nfv/openstack/models/vnfd' module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Vnfds < Fog::OpenStack::Collection - model Fog::OpenStack::NFV::Vnfd + model Fog::NFV::OpenStack::Vnfd def all(options = {}) load_response(service.list_vnfds(options), 'vnfds') @@ -14,7 +14,7 @@ def all(options = {}) def get(uuid) data = service.get_vnfd(uuid).body['vnfd'] new(data) - rescue Fog::OpenStack::NFV::NotFound + rescue Fog::NFV::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/nfv/models/vnfs.rb b/lib/fog/nfv/openstack/models/vnfs.rb similarity index 73% rename from lib/fog/openstack/nfv/models/vnfs.rb rename to lib/fog/nfv/openstack/models/vnfs.rb index 73813b470..6db6c11dc 100644 --- a/lib/fog/openstack/nfv/models/vnfs.rb +++ b/lib/fog/nfv/openstack/models/vnfs.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/nfv/models/vnf' +require 'fog/nfv/openstack/models/vnf' module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Vnfs < Fog::OpenStack::Collection - model Fog::OpenStack::NFV::Vnf + model Fog::NFV::OpenStack::Vnf def all(options = {}) load_response(service.list_vnfs(options), 'vnfs') @@ -14,7 +14,7 @@ def all(options = {}) def get(uuid) data = service.get_vnf(uuid).body['vnf'] new(data) - rescue Fog::OpenStack::NFV::NotFound + rescue Fog::NFV::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/nfv/requests/create_vnf.rb b/lib/fog/nfv/openstack/requests/create_vnf.rb similarity index 96% rename from lib/fog/openstack/nfv/requests/create_vnf.rb rename to lib/fog/nfv/openstack/requests/create_vnf.rb index ca6220d8e..69f0d7b4a 100644 --- a/lib/fog/openstack/nfv/requests/create_vnf.rb +++ b/lib/fog/nfv/openstack/requests/create_vnf.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def create_vnf(options) options_valid = [ diff --git a/lib/fog/openstack/nfv/requests/create_vnfd.rb b/lib/fog/nfv/openstack/requests/create_vnfd.rb similarity index 95% rename from lib/fog/openstack/nfv/requests/create_vnfd.rb rename to lib/fog/nfv/openstack/requests/create_vnfd.rb index 3cc9f441d..44dbaf6ab 100644 --- a/lib/fog/openstack/nfv/requests/create_vnfd.rb +++ b/lib/fog/nfv/openstack/requests/create_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def create_vnfd(options) options_valid = [ diff --git a/lib/fog/openstack/nfv/requests/delete_vnf.rb b/lib/fog/nfv/openstack/requests/delete_vnf.rb similarity index 92% rename from lib/fog/openstack/nfv/requests/delete_vnf.rb rename to lib/fog/nfv/openstack/requests/delete_vnf.rb index 979c6cfa3..71f89a4bf 100644 --- a/lib/fog/openstack/nfv/requests/delete_vnf.rb +++ b/lib/fog/nfv/openstack/requests/delete_vnf.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def delete_vnf(vnf_id) request( diff --git a/lib/fog/openstack/nfv/requests/delete_vnfd.rb b/lib/fog/nfv/openstack/requests/delete_vnfd.rb similarity index 92% rename from lib/fog/openstack/nfv/requests/delete_vnfd.rb rename to lib/fog/nfv/openstack/requests/delete_vnfd.rb index f8d1ec581..3efdd7672 100644 --- a/lib/fog/openstack/nfv/requests/delete_vnfd.rb +++ b/lib/fog/nfv/openstack/requests/delete_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def delete_vnfd(vnfd_id) request( diff --git a/lib/fog/openstack/nfv/requests/get_vnf.rb b/lib/fog/nfv/openstack/requests/get_vnf.rb similarity index 93% rename from lib/fog/openstack/nfv/requests/get_vnf.rb rename to lib/fog/nfv/openstack/requests/get_vnf.rb index 62a7df092..f204ee7b2 100644 --- a/lib/fog/openstack/nfv/requests/get_vnf.rb +++ b/lib/fog/nfv/openstack/requests/get_vnf.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def get_vnf(vnf_id) request( diff --git a/lib/fog/openstack/nfv/requests/get_vnfd.rb b/lib/fog/nfv/openstack/requests/get_vnfd.rb similarity index 93% rename from lib/fog/openstack/nfv/requests/get_vnfd.rb rename to lib/fog/nfv/openstack/requests/get_vnfd.rb index 5e47de284..f5f0e5781 100644 --- a/lib/fog/openstack/nfv/requests/get_vnfd.rb +++ b/lib/fog/nfv/openstack/requests/get_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def get_vnfd(vnfd_id) request( diff --git a/lib/fog/openstack/nfv/requests/list_vnfds.rb b/lib/fog/nfv/openstack/requests/list_vnfds.rb similarity index 93% rename from lib/fog/openstack/nfv/requests/list_vnfds.rb rename to lib/fog/nfv/openstack/requests/list_vnfds.rb index f1a7793ed..a74aa33e9 100644 --- a/lib/fog/openstack/nfv/requests/list_vnfds.rb +++ b/lib/fog/nfv/openstack/requests/list_vnfds.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def list_vnfds(options = {}) request( diff --git a/lib/fog/openstack/nfv/requests/list_vnfs.rb b/lib/fog/nfv/openstack/requests/list_vnfs.rb similarity index 93% rename from lib/fog/openstack/nfv/requests/list_vnfs.rb rename to lib/fog/nfv/openstack/requests/list_vnfs.rb index a89b6723e..1f08060fd 100644 --- a/lib/fog/openstack/nfv/requests/list_vnfs.rb +++ b/lib/fog/nfv/openstack/requests/list_vnfs.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def list_vnfs(options = {}) request( diff --git a/lib/fog/openstack/nfv/requests/update_vnf.rb b/lib/fog/nfv/openstack/requests/update_vnf.rb similarity index 95% rename from lib/fog/openstack/nfv/requests/update_vnf.rb rename to lib/fog/nfv/openstack/requests/update_vnf.rb index 47d1fcde8..37766efa7 100644 --- a/lib/fog/openstack/nfv/requests/update_vnf.rb +++ b/lib/fog/nfv/openstack/requests/update_vnf.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class NFV + module NFV + class OpenStack class Real def update_vnf(id, options) options_valid = [ diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index f61a00ee4..2b5a4cc42 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -2,6 +2,87 @@ require 'fog/json' module Fog + module Baremetal + autoload :OpenStack, 'fog/baremetal/openstack' + end + + module Compute + autoload :OpenStack, 'fog/compute/openstack' + end + + module ContainerInfra + autoload :OpenStack, 'fog/container_infra/openstack' + end + + module DNS + autoload :OpenStack, 'fog/dns/openstack' + end + + module Event + autoload :OpenStack, 'fog/event/openstack' + end + + module Identity + autoload :OpenStack, 'fog/identity/openstack' + end + + module Image + autoload :OpenStack, 'fog/image/openstack' + end + + module Introspection + autoload :OpenStack, 'fog/introspection/openstack' + end + + module KeyManager + autoload :OpenStack, 'fog/key_manager/openstack' + end + + module Metering + autoload :OpenStack, 'fog/metering/openstack' + end + + module Metric + autoload :OpenStack, 'fog/metric/openstack' + end + + module Monitoring + autoload :OpenStack, 'fog/monitoring/openstack' + end + + module Network + autoload :OpenStack, 'fog/network/openstack' + end + + module NFV + autoload :OpenStack, 'fog/nfv/openstack' + end + + module Orchestration + autoload :OpenStack, 'fog/orchestration/openstack' + autoload :Util, 'fog/orchestration/util/recursive_hot_file_loader' + end + + module SharedFileSystem + autoload :OpenStack, 'fog/shared_file_system/openstack' + end + + module Storage + autoload :OpenStack, 'fog/storage/openstack' + end + + module Volume + autoload :OpenStack, 'fog/volume/openstack' + end + + module Workflow + autoload :OpenStack, 'fog/workflow/openstack' + + class OpenStack + autoload :V2, 'fog/workflow/openstack/v2' + end + end + module OpenStack require 'fog/openstack/auth/token' @@ -9,28 +90,7 @@ module OpenStack autoload :Core, 'fog/openstack/core' autoload :Errors, 'fog/openstack/errors' - - autoload :Baremetal, 'fog/openstack/baremetal/baremetal' - autoload :Compute, 'fog/openstack/compute/compute' - autoload :ContainerInfra, 'fog/openstack/container_infra/container_infra' - autoload :DNS, 'fog/openstack/dns/dns' - autoload :Event, 'fog/openstack/event/event' - autoload :Identity, 'fog/openstack/identity/identity' - autoload :Image, 'fog/openstack/image/image' - autoload :Introspection, 'fog/openstack/introspection/introspection' - autoload :KeyManager, 'fog/openstack/key_manager/key_manager' - autoload :Metering, 'fog/openstack/metering/metering' - autoload :Metric, 'fog/openstack/metric/metric' - autoload :Monitoring, 'fog/openstack/monitoring/monitoring' - autoload :Network, 'fog/openstack/network/network' - autoload :NFV, 'fog/openstack/nfv/nfv' - autoload :Orchestration, 'fog/openstack/orchestration/orchestration' - autoload :OrchestrationUtil, 'fog/openstack/orchestration/util/recursive_hot_file_loader' - autoload :Planning, 'fog/openstack/planning/planning' - autoload :SharedFileSystem, 'fog/openstack/shared_file_system/shared_file_system' - autoload :Storage, 'fog/openstack/storage/storage' - autoload :Workflow, 'fog/openstack/workflow/workflow' - autoload :Volume, 'fog/openstack/volume/volume' + autoload :Planning, 'fog/planning/openstack' extend Fog::Provider diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index d013838a3..a0ad1f9c0 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -19,7 +19,7 @@ module Core # fallback def self.not_found_class - Fog::OpenStack::Compute::NotFound + Fog::Compute::OpenStack::NotFound end def credentials diff --git a/lib/fog/openstack/dns/dns.rb b/lib/fog/openstack/dns/dns.rb deleted file mode 100644 index 34a072a1a..000000000 --- a/lib/fog/openstack/dns/dns.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Fog - module OpenStack - class DNS < Fog::Service - autoload :V1, 'fog/openstack/dns/v1' - autoload :V2, 'fog/openstack/dns/v2' - - # Fog::OpenStack::DNS.new() will return a Fog::OpenStack::DNS::V2 or a Fog::OpenStack::DNS::V1, - # choosing the latest available - def self.new(args = {}) - @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - if inspect == 'Fog::OpenStack::DNS' - service = Fog::OpenStack::DNS::V2.new(args) unless args.empty? - service ||= Fog::OpenStack::DNS::V1.new(args) - else - service = Fog::Service.new(args) - end - service - end - end - end -end diff --git a/lib/fog/openstack/image/image.rb b/lib/fog/openstack/image/image.rb deleted file mode 100644 index 7d9d9a20d..000000000 --- a/lib/fog/openstack/image/image.rb +++ /dev/null @@ -1,23 +0,0 @@ - - -module Fog - module OpenStack - class Image < Fog::Service - autoload :V1, 'fog/openstack/image/v1' - autoload :V2, 'fog/openstack/image/v2' - - # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Image::V2 or a Fog::OpenStack::Image::V1, - # choosing the latest available - def self.new(args = {}) - @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - if inspect == 'Fog::OpenStack::Image' - service = Fog::OpenStack::Image::V2.new(args) unless args.empty? - service ||= Fog::OpenStack::Image::V1.new(args) - else - service = Fog::Service.new(args) - end - service - end - end - end -end diff --git a/lib/fog/openstack/models/meta_parent.rb b/lib/fog/openstack/models/meta_parent.rb index b9b624330..b90b6e5b1 100644 --- a/lib/fog/openstack/models/meta_parent.rb +++ b/lib/fog/openstack/models/meta_parent.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Compute + module Compute + class OpenStack module MetaParent def parent @parent @@ -11,9 +11,9 @@ def parent=(new_parent) end def collection_name - if @parent.class == Fog::OpenStack::Compute::Image + if @parent.class == Fog::Compute::OpenStack::Image return "images" - elsif @parent.class == Fog::OpenStack::Compute::Server + elsif @parent.class == Fog::Compute::OpenStack::Server return "servers" else raise "Metadata is not supported for this model type." diff --git a/lib/fog/openstack/volume/v1/models/availability_zone.rb b/lib/fog/openstack/volume/v1/models/availability_zone.rb deleted file mode 100644 index e46cbd50f..000000000 --- a/lib/fog/openstack/volume/v1/models/availability_zone.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'fog/openstack/volume/models/availability_zone' - -module Fog - module OpenStack - class Volume - class V1 - class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone - identity :zoneName - - attribute :zoneState - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/models/availability_zones.rb b/lib/fog/openstack/volume/v1/models/availability_zones.rb deleted file mode 100644 index c8411fcb2..000000000 --- a/lib/fog/openstack/volume/v1/models/availability_zones.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v1/models/availability_zone' -require 'fog/openstack/volume/models/availability_zones' - -module Fog - module OpenStack - class Volume - class V1 - class AvailabilityZones < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V1::AvailabilityZone - include Fog::OpenStack::Volume::AvailabilityZones - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/models/backups.rb b/lib/fog/openstack/volume/v1/models/backups.rb deleted file mode 100644 index f986fe81c..000000000 --- a/lib/fog/openstack/volume/v1/models/backups.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v1/models/backup' -require 'fog/openstack/volume/models/backups' - -module Fog - module OpenStack - class Volume - class V1 - class Backups < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V1::Backup - include Fog::OpenStack::Volume::Backups - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/models/snapshots.rb b/lib/fog/openstack/volume/v1/models/snapshots.rb deleted file mode 100644 index 43a7694d4..000000000 --- a/lib/fog/openstack/volume/v1/models/snapshots.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v1/models/snapshot' -require 'fog/openstack/volume/models/snapshots' - -module Fog - module OpenStack - class Volume - class V1 - class Snapshots < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V1::Snapshot - include Fog::OpenStack::Volume::Snapshots - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/models/transfers.rb b/lib/fog/openstack/volume/v1/models/transfers.rb deleted file mode 100644 index 8dfede857..000000000 --- a/lib/fog/openstack/volume/v1/models/transfers.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v1/models/transfer' -require 'fog/openstack/volume/models/transfers' - -module Fog - module OpenStack - class Volume - class V1 - class Transfers < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V1::Transfer - include Fog::OpenStack::Volume::Transfers - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/models/volume_types.rb b/lib/fog/openstack/volume/v1/models/volume_types.rb deleted file mode 100644 index 2e336a1e6..000000000 --- a/lib/fog/openstack/volume/v1/models/volume_types.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v1/models/volume_type' -require 'fog/openstack/volume/models/volume_types' - -module Fog - module OpenStack - class Volume - class V1 - class VolumeTypes < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V1::VolumeType - include Fog::OpenStack::Volume::VolumeTypes - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/models/volumes.rb b/lib/fog/openstack/volume/v1/models/volumes.rb deleted file mode 100644 index 3c66ccdad..000000000 --- a/lib/fog/openstack/volume/v1/models/volumes.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v1/models/volume' -require 'fog/openstack/volume/models/volumes' - -module Fog - module OpenStack - class Volume - class V1 - class Volumes < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V1::Volume - include Fog::OpenStack::Volume::Volumes - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/requests/accept_transfer.rb b/lib/fog/openstack/volume/v1/requests/accept_transfer.rb deleted file mode 100644 index 0bdc678ff..000000000 --- a/lib/fog/openstack/volume/v1/requests/accept_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/accept_transfer' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/action.rb b/lib/fog/openstack/volume/v1/requests/action.rb deleted file mode 100644 index e49b96818..000000000 --- a/lib/fog/openstack/volume/v1/requests/action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/action' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_backup.rb b/lib/fog/openstack/volume/v1/requests/create_backup.rb deleted file mode 100644 index 1135e30ea..000000000 --- a/lib/fog/openstack/volume/v1/requests/create_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/create_backup' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_transfer.rb b/lib/fog/openstack/volume/v1/requests/create_transfer.rb deleted file mode 100644 index 90f2ebe26..000000000 --- a/lib/fog/openstack/volume/v1/requests/create_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/create_transfer' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_volume_type.rb b/lib/fog/openstack/volume/v1/requests/create_volume_type.rb deleted file mode 100644 index b0be257c7..000000000 --- a/lib/fog/openstack/volume/v1/requests/create_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/create_volume_type' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_backup.rb b/lib/fog/openstack/volume/v1/requests/delete_backup.rb deleted file mode 100644 index a801dceaa..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_backup' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_metadata.rb b/lib/fog/openstack/volume/v1/requests/delete_metadata.rb deleted file mode 100644 index 924d1c2ed..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_metadata' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb b/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb deleted file mode 100644 index 4ed627842..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_snapshot' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb deleted file mode 100644 index c2f24ba75..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_snapshot_metadata' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_transfer.rb b/lib/fog/openstack/volume/v1/requests/delete_transfer.rb deleted file mode 100644 index 2394932c4..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_transfer' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_volume.rb b/lib/fog/openstack/volume/v1/requests/delete_volume.rb deleted file mode 100644 index f5dbbe801..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_volume' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb b/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb deleted file mode 100644 index e14b2e3d7..000000000 --- a/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_volume_type' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/extend_volume.rb b/lib/fog/openstack/volume/v1/requests/extend_volume.rb deleted file mode 100644 index 1b2bc73ae..000000000 --- a/lib/fog/openstack/volume/v1/requests/extend_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/extend_volume' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_backup_details.rb b/lib/fog/openstack/volume/v1/requests/get_backup_details.rb deleted file mode 100644 index d92ca3a94..000000000 --- a/lib/fog/openstack/volume/v1/requests/get_backup_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_backup_details' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota.rb b/lib/fog/openstack/volume/v1/requests/get_quota.rb deleted file mode 100644 index b909d6de5..000000000 --- a/lib/fog/openstack/volume/v1/requests/get_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_quota' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb deleted file mode 100644 index 406b1542b..000000000 --- a/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_quota_defaults' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb b/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb deleted file mode 100644 index cde513e68..000000000 --- a/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_quota_usage' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb b/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb deleted file mode 100644 index 75b32b293..000000000 --- a/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_transfer_details' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb deleted file mode 100644 index e3c124195..000000000 --- a/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_volume_type_details' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_backups.rb b/lib/fog/openstack/volume/v1/requests/list_backups.rb deleted file mode 100644 index 8db51bc44..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_backups.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_backups' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb deleted file mode 100644 index c8418b0ee..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_backups_detailed' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_snapshots.rb b/lib/fog/openstack/volume/v1/requests/list_snapshots.rb deleted file mode 100644 index 8fcfee35c..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_snapshots.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_snapshots' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb deleted file mode 100644 index df242787d..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_snapshots_detailed' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_transfers.rb b/lib/fog/openstack/volume/v1/requests/list_transfers.rb deleted file mode 100644 index 2535a2589..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_transfers.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_transfers' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb deleted file mode 100644 index fd94ac7a3..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_transfers_detailed' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_volume_types.rb b/lib/fog/openstack/volume/v1/requests/list_volume_types.rb deleted file mode 100644 index ea52d0e1a..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_volume_types.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_volume_types' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_zones.rb b/lib/fog/openstack/volume/v1/requests/list_zones.rb deleted file mode 100644 index ec96a724e..000000000 --- a/lib/fog/openstack/volume/v1/requests/list_zones.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_zones' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/real_mock.rb b/lib/fog/openstack/volume/v1/requests/real_mock.rb deleted file mode 100644 index 8856c5ab5..000000000 --- a/lib/fog/openstack/volume/v1/requests/real_mock.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Fog - module OpenStack - class Volume - class V1 - class Real - include Fog::OpenStack::Volume::Real - end - class Mock - include Fog::OpenStack::Volume::Mock - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v1/requests/replace_metadata.rb b/lib/fog/openstack/volume/v1/requests/replace_metadata.rb deleted file mode 100644 index f27a16398..000000000 --- a/lib/fog/openstack/volume/v1/requests/replace_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/replace_metadata' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/restore_backup.rb b/lib/fog/openstack/volume/v1/requests/restore_backup.rb deleted file mode 100644 index f186448f9..000000000 --- a/lib/fog/openstack/volume/v1/requests/restore_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/restore_backup' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/set_tenant.rb b/lib/fog/openstack/volume/v1/requests/set_tenant.rb deleted file mode 100644 index 19dac303b..000000000 --- a/lib/fog/openstack/volume/v1/requests/set_tenant.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/set_tenant' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/update_metadata.rb b/lib/fog/openstack/volume/v1/requests/update_metadata.rb deleted file mode 100644 index c5454974d..000000000 --- a/lib/fog/openstack/volume/v1/requests/update_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_metadata' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_quota.rb b/lib/fog/openstack/volume/v1/requests/update_quota.rb deleted file mode 100644 index 671b65e6a..000000000 --- a/lib/fog/openstack/volume/v1/requests/update_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_quota' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/update_snapshot.rb b/lib/fog/openstack/volume/v1/requests/update_snapshot.rb deleted file mode 100644 index 8a9a231e7..000000000 --- a/lib/fog/openstack/volume/v1/requests/update_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_snapshot' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb deleted file mode 100644 index f98829982..000000000 --- a/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_snapshot_metadata' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_volume.rb b/lib/fog/openstack/volume/v1/requests/update_volume.rb deleted file mode 100644 index e57109738..000000000 --- a/lib/fog/openstack/volume/v1/requests/update_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_volume' -require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v2/models/availability_zone.rb b/lib/fog/openstack/volume/v2/models/availability_zone.rb deleted file mode 100644 index c0e4c528d..000000000 --- a/lib/fog/openstack/volume/v2/models/availability_zone.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'fog/openstack/volume/models/availability_zone' - -module Fog - module OpenStack - class Volume - class V2 - class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone - identity :zoneName - - attribute :zoneState - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/models/availability_zones.rb b/lib/fog/openstack/volume/v2/models/availability_zones.rb deleted file mode 100644 index 1c028c819..000000000 --- a/lib/fog/openstack/volume/v2/models/availability_zones.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v2/models/availability_zone' -require 'fog/openstack/volume/models/availability_zones' - -module Fog - module OpenStack - class Volume - class V2 - class AvailabilityZones < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V2::AvailabilityZone - include Fog::OpenStack::Volume::AvailabilityZones - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/models/backups.rb b/lib/fog/openstack/volume/v2/models/backups.rb deleted file mode 100644 index 75f53a770..000000000 --- a/lib/fog/openstack/volume/v2/models/backups.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v2/models/backup' -require 'fog/openstack/volume/models/backups' - -module Fog - module OpenStack - class Volume - class V2 - class Backups < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V2::Backup - include Fog::OpenStack::Volume::Backups - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/models/snapshots.rb b/lib/fog/openstack/volume/v2/models/snapshots.rb deleted file mode 100644 index 653c0bc98..000000000 --- a/lib/fog/openstack/volume/v2/models/snapshots.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v2/models/snapshot' -require 'fog/openstack/volume/models/snapshots' - -module Fog - module OpenStack - class Volume - class V2 - class Snapshots < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V2::Snapshot - include Fog::OpenStack::Volume::Snapshots - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/models/transfers.rb b/lib/fog/openstack/volume/v2/models/transfers.rb deleted file mode 100644 index cbee48f5e..000000000 --- a/lib/fog/openstack/volume/v2/models/transfers.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v2/models/transfer' -require 'fog/openstack/volume/models/transfers' - -module Fog - module OpenStack - class Volume - class V2 - class Transfers < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V2::Transfer - include Fog::OpenStack::Volume::Transfers - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/models/volume_types.rb b/lib/fog/openstack/volume/v2/models/volume_types.rb deleted file mode 100644 index 33e118c1b..000000000 --- a/lib/fog/openstack/volume/v2/models/volume_types.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v2/models/volume_type' -require 'fog/openstack/volume/models/volume_types' - -module Fog - module OpenStack - class Volume - class V2 - class VolumeTypes < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V2::VolumeType - include Fog::OpenStack::Volume::VolumeTypes - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/models/volumes.rb b/lib/fog/openstack/volume/v2/models/volumes.rb deleted file mode 100644 index d0a2dfe95..000000000 --- a/lib/fog/openstack/volume/v2/models/volumes.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/openstack/volume/v2/models/volume' -require 'fog/openstack/volume/models/volumes' - -module Fog - module OpenStack - class Volume - class V2 - class Volumes < Fog::OpenStack::Collection - model Fog::OpenStack::Volume::V2::Volume - include Fog::OpenStack::Volume::Volumes - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/requests/accept_transfer.rb b/lib/fog/openstack/volume/v2/requests/accept_transfer.rb deleted file mode 100644 index b0c99657c..000000000 --- a/lib/fog/openstack/volume/v2/requests/accept_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/accept_transfer' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/action.rb b/lib/fog/openstack/volume/v2/requests/action.rb deleted file mode 100644 index ccc36a89e..000000000 --- a/lib/fog/openstack/volume/v2/requests/action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/action' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_backup.rb b/lib/fog/openstack/volume/v2/requests/create_backup.rb deleted file mode 100644 index e2099585b..000000000 --- a/lib/fog/openstack/volume/v2/requests/create_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/create_backup' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_transfer.rb b/lib/fog/openstack/volume/v2/requests/create_transfer.rb deleted file mode 100644 index 250ab3f55..000000000 --- a/lib/fog/openstack/volume/v2/requests/create_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/create_transfer' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_volume_type.rb b/lib/fog/openstack/volume/v2/requests/create_volume_type.rb deleted file mode 100644 index e5c10b5c8..000000000 --- a/lib/fog/openstack/volume/v2/requests/create_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/create_volume_type' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_backup.rb b/lib/fog/openstack/volume/v2/requests/delete_backup.rb deleted file mode 100644 index bb6ea632c..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_backup' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_metadata.rb b/lib/fog/openstack/volume/v2/requests/delete_metadata.rb deleted file mode 100644 index 6174c85dc..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_metadata' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb b/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb deleted file mode 100644 index 7e55826a9..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_snapshot' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb deleted file mode 100644 index a674e33a7..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_snapshot_metadata' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_transfer.rb b/lib/fog/openstack/volume/v2/requests/delete_transfer.rb deleted file mode 100644 index a743af6bb..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_transfer' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_volume.rb b/lib/fog/openstack/volume/v2/requests/delete_volume.rb deleted file mode 100644 index ace5f64f7..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_volume' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb b/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb deleted file mode 100644 index 4a923106d..000000000 --- a/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/delete_volume_type' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/extend_volume.rb b/lib/fog/openstack/volume/v2/requests/extend_volume.rb deleted file mode 100644 index e5b0cec1e..000000000 --- a/lib/fog/openstack/volume/v2/requests/extend_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/extend_volume' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_backup_details.rb b/lib/fog/openstack/volume/v2/requests/get_backup_details.rb deleted file mode 100644 index b7b580b0b..000000000 --- a/lib/fog/openstack/volume/v2/requests/get_backup_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_backup_details' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota.rb b/lib/fog/openstack/volume/v2/requests/get_quota.rb deleted file mode 100644 index c5bd543de..000000000 --- a/lib/fog/openstack/volume/v2/requests/get_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_quota' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb deleted file mode 100644 index fdda9129f..000000000 --- a/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_quota_defaults' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb b/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb deleted file mode 100644 index 9487a898e..000000000 --- a/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_quota_usage' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb b/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb deleted file mode 100644 index b4db93b7f..000000000 --- a/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_transfer_details' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb deleted file mode 100644 index 500ff567e..000000000 --- a/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/get_volume_type_details' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_backups.rb b/lib/fog/openstack/volume/v2/requests/list_backups.rb deleted file mode 100644 index 9db231553..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_backups.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_backups' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb deleted file mode 100644 index 0350a0033..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_backups_detailed' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_snapshots.rb b/lib/fog/openstack/volume/v2/requests/list_snapshots.rb deleted file mode 100644 index 9fe012b85..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_snapshots.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_snapshots' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb deleted file mode 100644 index 5fcbf469a..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_snapshots_detailed' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_transfers.rb b/lib/fog/openstack/volume/v2/requests/list_transfers.rb deleted file mode 100644 index 26681aa7a..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_transfers.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_transfers' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb deleted file mode 100644 index 31157701c..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_transfers_detailed' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_volume_types.rb b/lib/fog/openstack/volume/v2/requests/list_volume_types.rb deleted file mode 100644 index f67411696..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_volume_types.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_volume_types' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_zones.rb b/lib/fog/openstack/volume/v2/requests/list_zones.rb deleted file mode 100644 index e07fafc5f..000000000 --- a/lib/fog/openstack/volume/v2/requests/list_zones.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/list_zones' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/real_mock.rb b/lib/fog/openstack/volume/v2/requests/real_mock.rb deleted file mode 100644 index cc2fca322..000000000 --- a/lib/fog/openstack/volume/v2/requests/real_mock.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Fog - module OpenStack - class Volume - class V2 - class Real - include Fog::OpenStack::Volume::Real - end - class Mock - include Fog::OpenStack::Volume::Mock - end - end - end - end -end diff --git a/lib/fog/openstack/volume/v2/requests/replace_metadata.rb b/lib/fog/openstack/volume/v2/requests/replace_metadata.rb deleted file mode 100644 index ea96993a5..000000000 --- a/lib/fog/openstack/volume/v2/requests/replace_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/replace_metadata' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/restore_backup.rb b/lib/fog/openstack/volume/v2/requests/restore_backup.rb deleted file mode 100644 index 6e5d56df8..000000000 --- a/lib/fog/openstack/volume/v2/requests/restore_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/restore_backup' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/set_tenant.rb b/lib/fog/openstack/volume/v2/requests/set_tenant.rb deleted file mode 100644 index 9c7ce462c..000000000 --- a/lib/fog/openstack/volume/v2/requests/set_tenant.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/set_tenant' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/snapshot_action.rb b/lib/fog/openstack/volume/v2/requests/snapshot_action.rb deleted file mode 100644 index 34e77445f..000000000 --- a/lib/fog/openstack/volume/v2/requests/snapshot_action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/snapshot_action' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_metadata.rb b/lib/fog/openstack/volume/v2/requests/update_metadata.rb deleted file mode 100644 index 325ebabd3..000000000 --- a/lib/fog/openstack/volume/v2/requests/update_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_metadata' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_quota.rb b/lib/fog/openstack/volume/v2/requests/update_quota.rb deleted file mode 100644 index 671b65e6a..000000000 --- a/lib/fog/openstack/volume/v2/requests/update_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_quota' -require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/update_snapshot.rb b/lib/fog/openstack/volume/v2/requests/update_snapshot.rb deleted file mode 100644 index ca8f66113..000000000 --- a/lib/fog/openstack/volume/v2/requests/update_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_snapshot' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb deleted file mode 100644 index becbf026f..000000000 --- a/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_snapshot_metadata' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_volume.rb b/lib/fog/openstack/volume/v2/requests/update_volume.rb deleted file mode 100644 index 58a077081..000000000 --- a/lib/fog/openstack/volume/v2/requests/update_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_volume' -require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_volume_type.rb b/lib/fog/openstack/volume/v2/requests/update_volume_type.rb deleted file mode 100644 index 7e696c055..000000000 --- a/lib/fog/openstack/volume/v2/requests/update_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/openstack/volume/requests/update_volume_type' -require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/orchestration/orchestration.rb b/lib/fog/orchestration/openstack.rb similarity index 94% rename from lib/fog/openstack/orchestration/orchestration.rb rename to lib/fog/orchestration/openstack.rb index 8542a7760..18be8177f 100644 --- a/lib/fog/openstack/orchestration/orchestration.rb +++ b/lib/fog/orchestration/openstack.rb @@ -1,6 +1,8 @@ + + module Fog - module OpenStack - class Orchestration < Fog::Service + module Orchestration + class OpenStack < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -13,7 +15,7 @@ class Orchestration < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/openstack/orchestration/models' + model_path 'fog/orchestration/openstack/models' model :stack collection :stacks @@ -28,7 +30,7 @@ class Orchestration < Fog::Service model :template collection :templates - request_path 'fog/openstack/orchestration/requests' + request_path 'fog/orchestration/openstack/requests' request :abandon_stack request :build_info request :create_stack @@ -125,7 +127,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Orchestration::NotFound + Fog::Orchestration::OpenStack::NotFound end def default_service_type diff --git a/lib/fog/openstack/orchestration/models/event.rb b/lib/fog/orchestration/openstack/models/event.rb similarity index 89% rename from lib/fog/openstack/orchestration/models/event.rb rename to lib/fog/orchestration/openstack/models/event.rb index 283f9c476..8debd856a 100644 --- a/lib/fog/openstack/orchestration/models/event.rb +++ b/lib/fog/orchestration/openstack/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Event < Fog::OpenStack::Model include Reflectable diff --git a/lib/fog/openstack/orchestration/models/events.rb b/lib/fog/orchestration/openstack/models/events.rb similarity index 79% rename from lib/fog/openstack/orchestration/models/events.rb rename to lib/fog/orchestration/openstack/models/events.rb index b2a823fe1..2d5ddd7f0 100644 --- a/lib/fog/openstack/orchestration/models/events.rb +++ b/lib/fog/orchestration/openstack/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/orchestration/models/event' +require 'fog/orchestration/openstack/models/event' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Events < Fog::OpenStack::Collection - model Fog::OpenStack::Orchestration::Event + model Fog::Orchestration::OpenStack::Event def all(options = {}, options_deprecated = {}) data = if options.kind_of?(Stack) @@ -22,7 +22,7 @@ def all(options = {}, options_deprecated = {}) def get(stack, resource, event_id) data = service.show_event_details(stack, resource, event_id).body['event'] new(data) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/orchestration/models/resource.rb b/lib/fog/orchestration/openstack/models/resource.rb similarity index 94% rename from lib/fog/openstack/orchestration/models/resource.rb rename to lib/fog/orchestration/openstack/models/resource.rb index 705e93e07..6d8574cf6 100644 --- a/lib/fog/openstack/orchestration/models/resource.rb +++ b/lib/fog/orchestration/openstack/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Resource < Fog::OpenStack::Model include Reflectable diff --git a/lib/fog/openstack/orchestration/models/resource_schemas.rb b/lib/fog/orchestration/openstack/models/resource_schemas.rb similarity index 73% rename from lib/fog/openstack/orchestration/models/resource_schemas.rb rename to lib/fog/orchestration/openstack/models/resource_schemas.rb index bd177115c..f0131c84b 100644 --- a/lib/fog/openstack/orchestration/models/resource_schemas.rb +++ b/lib/fog/orchestration/openstack/models/resource_schemas.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class ResourceSchemas < Fog::OpenStack::Collection def get(resource_type) service.show_resource_schema(resource_type).body - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/orchestration/models/resources.rb b/lib/fog/orchestration/openstack/models/resources.rb similarity index 76% rename from lib/fog/openstack/orchestration/models/resources.rb rename to lib/fog/orchestration/openstack/models/resources.rb index fbc3f1988..6a9f7867c 100644 --- a/lib/fog/openstack/orchestration/models/resources.rb +++ b/lib/fog/orchestration/openstack/models/resources.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/orchestration/models/resource' +require 'fog/orchestration/openstack/models/resource' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Resources < Fog::OpenStack::Collection - model Fog::OpenStack::Orchestration::Resource + model Fog::Orchestration::OpenStack::Resource def types service.list_resource_types.body['resource_types'].sort @@ -20,13 +20,13 @@ def get(resource_name, stack = nil) stack = first.stack if stack.nil? data = service.show_resource_data(stack.stack_name, stack.id, resource_name).body['resource'] new(data) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end def metadata(stack_name, stack_id, resource_name) service.show_resource_metadata(stack_name, stack_id, resource_name).body['resource'] - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/orchestration/models/stack.rb b/lib/fog/orchestration/openstack/models/stack.rb similarity index 96% rename from lib/fog/openstack/orchestration/models/stack.rb rename to lib/fog/orchestration/openstack/models/stack.rb index 7c54a6e33..a21f070ee 100644 --- a/lib/fog/openstack/orchestration/models/stack.rb +++ b/lib/fog/orchestration/openstack/models/stack.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Stack < Fog::OpenStack::Model identity :id @@ -105,7 +105,7 @@ def timeout_in_minutes=(minutes) # build options to create or update stack def default_options template_content = - if template && template.kind_of?(Fog::OpenStack::Orchestration::Template) + if template && template.kind_of?(Fog::Orchestration::OpenStack::Template) template.content else template diff --git a/lib/fog/openstack/orchestration/models/stacks.rb b/lib/fog/orchestration/openstack/models/stacks.rb similarity index 89% rename from lib/fog/openstack/orchestration/models/stacks.rb rename to lib/fog/orchestration/openstack/models/stacks.rb index 176b6c824..1a4e8b0b8 100644 --- a/lib/fog/openstack/orchestration/models/stacks.rb +++ b/lib/fog/orchestration/openstack/models/stacks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/orchestration/models/stack' +require 'fog/orchestration/openstack/models/stack' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Stacks < Fog::OpenStack::Collection - model Fog::OpenStack::Orchestration::Stack + model Fog::Orchestration::OpenStack::Stack def all(options = {}) # TODO(lsmola) we can uncomment this when https://bugs.launchpad.net/heat/+bug/1468318 is fixed, till then @@ -38,7 +38,7 @@ def get(arg1, arg2 = nil) id = arg2 data = service.show_stack_details(name, id).body['stack'] new(data) - rescue Fog::OpenStack::Compute::NotFound + rescue Fog::Compute::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/orchestration/models/template.rb b/lib/fog/orchestration/openstack/models/template.rb similarity index 85% rename from lib/fog/openstack/orchestration/models/template.rb rename to lib/fog/orchestration/openstack/models/template.rb index 5f16d20ba..b99687efb 100644 --- a/lib/fog/openstack/orchestration/models/template.rb +++ b/lib/fog/orchestration/openstack/models/template.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Template < Fog::OpenStack::Model %w(format description template_version parameters resources content).each do |a| attribute a.to_sym diff --git a/lib/fog/openstack/orchestration/models/templates.rb b/lib/fog/orchestration/openstack/models/templates.rb similarity index 85% rename from lib/fog/openstack/orchestration/models/templates.rb rename to lib/fog/orchestration/openstack/models/templates.rb index b1d0dbd52..9d1182666 100644 --- a/lib/fog/openstack/orchestration/models/templates.rb +++ b/lib/fog/orchestration/openstack/models/templates.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/orchestration/models/template' +require 'fog/orchestration/openstack/models/template' module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Templates < Fog::OpenStack::Collection - model Fog::OpenStack::Orchestration::Template + model Fog::Orchestration::OpenStack::Template def get(obj) data = if obj.kind_of?(Stack) @@ -28,7 +28,7 @@ def get(obj) end new(data) - rescue Fog::OpenStack::Orchestration::NotFound + rescue Fog::Orchestration::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/orchestration/requests/abandon_stack.rb b/lib/fog/orchestration/openstack/requests/abandon_stack.rb similarity index 86% rename from lib/fog/openstack/orchestration/requests/abandon_stack.rb rename to lib/fog/orchestration/openstack/requests/abandon_stack.rb index c0a8a0f44..370be9f31 100644 --- a/lib/fog/openstack/orchestration/requests/abandon_stack.rb +++ b/lib/fog/orchestration/openstack/requests/abandon_stack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def abandon_stack(stack) request( diff --git a/lib/fog/openstack/orchestration/requests/build_info.rb b/lib/fog/orchestration/openstack/requests/build_info.rb similarity index 83% rename from lib/fog/openstack/orchestration/requests/build_info.rb rename to lib/fog/orchestration/openstack/requests/build_info.rb index cb0ae3482..0f65d96ab 100644 --- a/lib/fog/openstack/orchestration/requests/build_info.rb +++ b/lib/fog/orchestration/openstack/requests/build_info.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def build_info request( diff --git a/lib/fog/openstack/orchestration/requests/cancel_update.rb b/lib/fog/orchestration/openstack/requests/cancel_update.rb similarity index 92% rename from lib/fog/openstack/orchestration/requests/cancel_update.rb rename to lib/fog/orchestration/openstack/requests/cancel_update.rb index 878326cd2..ca1627ee1 100644 --- a/lib/fog/openstack/orchestration/requests/cancel_update.rb +++ b/lib/fog/orchestration/openstack/requests/cancel_update.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def cancel_update(stack) request( diff --git a/lib/fog/openstack/orchestration/requests/create_stack.rb b/lib/fog/orchestration/openstack/requests/create_stack.rb similarity index 95% rename from lib/fog/openstack/orchestration/requests/create_stack.rb rename to lib/fog/orchestration/openstack/requests/create_stack.rb index 9377719fc..ed82afec7 100644 --- a/lib/fog/openstack/orchestration/requests/create_stack.rb +++ b/lib/fog/orchestration/openstack/requests/create_stack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real # Create a stack. # @@ -87,7 +87,7 @@ def create_stack(arg1, arg2 = nil) end if options.key?(:template) || options.key?(:template_url) - file_resolver = OrchestrationUtil::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) + file_resolver = Util::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) response.body['files'] = file_resolver.files unless file_resolver.files.empty? end diff --git a/lib/fog/openstack/orchestration/requests/delete_stack.rb b/lib/fog/orchestration/openstack/requests/delete_stack.rb similarity index 97% rename from lib/fog/openstack/orchestration/requests/delete_stack.rb rename to lib/fog/orchestration/openstack/requests/delete_stack.rb index ba2e917aa..b236e9b35 100644 --- a/lib/fog/openstack/orchestration/requests/delete_stack.rb +++ b/lib/fog/orchestration/openstack/requests/delete_stack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real # Delete a stack. # diff --git a/lib/fog/openstack/orchestration/requests/get_stack_template.rb b/lib/fog/orchestration/openstack/requests/get_stack_template.rb similarity index 89% rename from lib/fog/openstack/orchestration/requests/get_stack_template.rb rename to lib/fog/orchestration/openstack/requests/get_stack_template.rb index b053a5150..8551f778c 100644 --- a/lib/fog/openstack/orchestration/requests/get_stack_template.rb +++ b/lib/fog/orchestration/openstack/requests/get_stack_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def get_stack_template(stack) request( diff --git a/lib/fog/openstack/orchestration/requests/list_events.rb b/lib/fog/orchestration/openstack/requests/list_events.rb similarity index 97% rename from lib/fog/openstack/orchestration/requests/list_events.rb rename to lib/fog/orchestration/openstack/requests/list_events.rb index 1dedd2f1c..7e456b8b0 100644 --- a/lib/fog/openstack/orchestration/requests/list_events.rb +++ b/lib/fog/orchestration/openstack/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_events(options = {}) if !options.key?(:stack) && !(options.key?(:stack_name) && options.key?(:stack_id)) diff --git a/lib/fog/openstack/orchestration/requests/list_resource_events.rb b/lib/fog/orchestration/openstack/requests/list_resource_events.rb similarity index 95% rename from lib/fog/openstack/orchestration/requests/list_resource_events.rb rename to lib/fog/orchestration/openstack/requests/list_resource_events.rb index d82e77a7b..c2736f13d 100644 --- a/lib/fog/openstack/orchestration/requests/list_resource_events.rb +++ b/lib/fog/orchestration/openstack/requests/list_resource_events.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_resource_events(stack, resource, options = {}) Fog::Logger.deprecation('Calling OpenStack[:orchestration].list_resource_events(stack, resource, options)'\ diff --git a/lib/fog/openstack/orchestration/requests/list_resource_types.rb b/lib/fog/orchestration/openstack/requests/list_resource_types.rb similarity index 92% rename from lib/fog/openstack/orchestration/requests/list_resource_types.rb rename to lib/fog/orchestration/openstack/requests/list_resource_types.rb index 7de2aef4b..358239b2f 100644 --- a/lib/fog/openstack/orchestration/requests/list_resource_types.rb +++ b/lib/fog/orchestration/openstack/requests/list_resource_types.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_resource_types(_options = {}) request( diff --git a/lib/fog/openstack/orchestration/requests/list_resources.rb b/lib/fog/orchestration/openstack/requests/list_resources.rb similarity index 97% rename from lib/fog/openstack/orchestration/requests/list_resources.rb rename to lib/fog/orchestration/openstack/requests/list_resources.rb index e8826638c..2565d91e6 100644 --- a/lib/fog/openstack/orchestration/requests/list_resources.rb +++ b/lib/fog/orchestration/openstack/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_resources(options = {}, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/openstack/orchestration/requests/list_stack_data.rb b/lib/fog/orchestration/openstack/requests/list_stack_data.rb similarity index 92% rename from lib/fog/openstack/orchestration/requests/list_stack_data.rb rename to lib/fog/orchestration/openstack/requests/list_stack_data.rb index b5d12a8ef..7dfd23276 100644 --- a/lib/fog/openstack/orchestration/requests/list_stack_data.rb +++ b/lib/fog/orchestration/openstack/requests/list_stack_data.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_stack_data(options = {}) request( diff --git a/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb b/lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb similarity index 98% rename from lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb rename to lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb index 1bf382733..401712562 100644 --- a/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb +++ b/lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_stack_data_detailed(options = {}) request( diff --git a/lib/fog/openstack/orchestration/requests/list_stack_events.rb b/lib/fog/orchestration/openstack/requests/list_stack_events.rb similarity index 95% rename from lib/fog/openstack/orchestration/requests/list_stack_events.rb rename to lib/fog/orchestration/openstack/requests/list_stack_events.rb index 61d9979cb..b9c848789 100644 --- a/lib/fog/openstack/orchestration/requests/list_stack_events.rb +++ b/lib/fog/orchestration/openstack/requests/list_stack_events.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def list_stack_events(stack, options = {}) Fog::Logger.deprecation('Calling OpenStack[:orchestration].list_stack_events(stack, options)'\ diff --git a/lib/fog/openstack/orchestration/requests/patch_stack.rb b/lib/fog/orchestration/openstack/requests/patch_stack.rb similarity index 90% rename from lib/fog/openstack/orchestration/requests/patch_stack.rb rename to lib/fog/orchestration/openstack/requests/patch_stack.rb index 2a25511a5..bcaaa59be 100644 --- a/lib/fog/openstack/orchestration/requests/patch_stack.rb +++ b/lib/fog/orchestration/openstack/requests/patch_stack.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real # patch a stack. # - # @param [Fog::OpenStack::Orchestration::Stack] the stack to patch. + # @param [Fog::Orchestration::OpenStack::Stack] the stack to patch. # @param [Hash] options # * :template [String] Structure containing the template body. # or (one of the two Template parameters is required) diff --git a/lib/fog/openstack/orchestration/requests/preview_stack.rb b/lib/fog/orchestration/openstack/requests/preview_stack.rb similarity index 87% rename from lib/fog/openstack/orchestration/requests/preview_stack.rb rename to lib/fog/orchestration/openstack/requests/preview_stack.rb index 440ed4da4..c4fe397f9 100644 --- a/lib/fog/openstack/orchestration/requests/preview_stack.rb +++ b/lib/fog/orchestration/openstack/requests/preview_stack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def preview_stack(options = {}) request( diff --git a/lib/fog/openstack/orchestration/requests/show_event_details.rb b/lib/fog/orchestration/openstack/requests/show_event_details.rb similarity index 93% rename from lib/fog/openstack/orchestration/requests/show_event_details.rb rename to lib/fog/orchestration/openstack/requests/show_event_details.rb index 739666e43..a86649b2b 100644 --- a/lib/fog/openstack/orchestration/requests/show_event_details.rb +++ b/lib/fog/orchestration/openstack/requests/show_event_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def show_event_details(stack, resource, event_id) request( diff --git a/lib/fog/openstack/orchestration/requests/show_resource_data.rb b/lib/fog/orchestration/openstack/requests/show_resource_data.rb similarity index 93% rename from lib/fog/openstack/orchestration/requests/show_resource_data.rb rename to lib/fog/orchestration/openstack/requests/show_resource_data.rb index 9225efd5d..a6b902b22 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_data.rb +++ b/lib/fog/orchestration/openstack/requests/show_resource_data.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def show_resource_data(stack_name, stack_id, resource_name) request( diff --git a/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb b/lib/fog/orchestration/openstack/requests/show_resource_metadata.rb similarity index 93% rename from lib/fog/openstack/orchestration/requests/show_resource_metadata.rb rename to lib/fog/orchestration/openstack/requests/show_resource_metadata.rb index 486259bfc..0142882e6 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb +++ b/lib/fog/orchestration/openstack/requests/show_resource_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def show_resource_metadata(stack, resource_name) request( diff --git a/lib/fog/openstack/orchestration/requests/show_resource_schema.rb b/lib/fog/orchestration/openstack/requests/show_resource_schema.rb similarity index 85% rename from lib/fog/openstack/orchestration/requests/show_resource_schema.rb rename to lib/fog/orchestration/openstack/requests/show_resource_schema.rb index 7df1b5fe3..822fcc11a 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_schema.rb +++ b/lib/fog/orchestration/openstack/requests/show_resource_schema.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def show_resource_schema(name) request( diff --git a/lib/fog/openstack/orchestration/requests/show_resource_template.rb b/lib/fog/orchestration/openstack/requests/show_resource_template.rb similarity index 88% rename from lib/fog/openstack/orchestration/requests/show_resource_template.rb rename to lib/fog/orchestration/openstack/requests/show_resource_template.rb index 496cbe568..60f23c81c 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_template.rb +++ b/lib/fog/orchestration/openstack/requests/show_resource_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def show_resource_template(name) request( diff --git a/lib/fog/openstack/orchestration/requests/show_stack_details.rb b/lib/fog/orchestration/openstack/requests/show_stack_details.rb similarity index 91% rename from lib/fog/openstack/orchestration/requests/show_stack_details.rb rename to lib/fog/orchestration/openstack/requests/show_stack_details.rb index 3568a669e..c4868cafe 100644 --- a/lib/fog/openstack/orchestration/requests/show_stack_details.rb +++ b/lib/fog/orchestration/openstack/requests/show_stack_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def show_stack_details(name, id) request( diff --git a/lib/fog/openstack/orchestration/requests/update_stack.rb b/lib/fog/orchestration/openstack/requests/update_stack.rb similarity index 97% rename from lib/fog/openstack/orchestration/requests/update_stack.rb rename to lib/fog/orchestration/openstack/requests/update_stack.rb index 585a7f63f..913c2e26b 100644 --- a/lib/fog/openstack/orchestration/requests/update_stack.rb +++ b/lib/fog/orchestration/openstack/requests/update_stack.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real # Update a stack. # - # @param [Fog::OpenStack::Orchestration::Stack] the stack to update. + # @param [Fog::Orchestration::OpenStack::Stack] the stack to update. # @param [Hash] options # * :template [String] Structure containing the template body. # or (one of the two Template parameters is required) diff --git a/lib/fog/openstack/orchestration/requests/validate_template.rb b/lib/fog/orchestration/openstack/requests/validate_template.rb similarity index 87% rename from lib/fog/openstack/orchestration/requests/validate_template.rb rename to lib/fog/orchestration/openstack/requests/validate_template.rb index c0c962376..f203cad88 100644 --- a/lib/fog/openstack/orchestration/requests/validate_template.rb +++ b/lib/fog/orchestration/openstack/requests/validate_template.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Orchestration + module Orchestration + class OpenStack class Real def validate_template(options = {}) request( diff --git a/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb b/lib/fog/orchestration/util/recursive_hot_file_loader.rb similarity index 99% rename from lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb rename to lib/fog/orchestration/util/recursive_hot_file_loader.rb index 826f51b4a..74af237e7 100644 --- a/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb +++ b/lib/fog/orchestration/util/recursive_hot_file_loader.rb @@ -5,8 +5,8 @@ require 'fog/core' module Fog - module OpenStack - module OrchestrationUtil + module Orchestration + module Util # # Resolve get_file resources found in a HOT template populating # a files Hash conforming to Heat Specs diff --git a/lib/fog/openstack/planning/planning.rb b/lib/fog/planning/openstack.rb similarity index 96% rename from lib/fog/openstack/planning/planning.rb rename to lib/fog/planning/openstack.rb index e7253a2ad..eb5f75cd8 100644 --- a/lib/fog/openstack/planning/planning.rb +++ b/lib/fog/planning/openstack.rb @@ -1,3 +1,5 @@ + + module Fog module OpenStack class Planning < Fog::Service @@ -17,7 +19,7 @@ class Planning < Fog::Service ## MODELS # - model_path 'fog/openstack/planning/models' + model_path 'fog/planning/openstack/models' model :role collection :roles model :plan @@ -25,7 +27,7 @@ class Planning < Fog::Service ## REQUESTS # - request_path 'fog/openstack/planning/requests' + request_path 'fog/planning/openstack/requests' # Role requests request :list_roles @@ -120,12 +122,10 @@ def self.[](service) end def self.new(attributes) - require 'pry-byebug' - binding.pry - attributes = attributes.dup # Prevent delete from having side effects service = attributes.delete(:service).to_s.downcase.to_sym if services.include?(service) + require "fog/#{service}/openstack" return Fog::OpenStack.const_get(service.to_s.capitalize).new(attributes) end raise ArgumentError, "Openstack has no #{service} service" diff --git a/lib/fog/openstack/planning/models/plan.rb b/lib/fog/planning/openstack/models/plan.rb similarity index 100% rename from lib/fog/openstack/planning/models/plan.rb rename to lib/fog/planning/openstack/models/plan.rb diff --git a/lib/fog/openstack/planning/models/plans.rb b/lib/fog/planning/openstack/models/plans.rb similarity index 93% rename from lib/fog/openstack/planning/models/plans.rb rename to lib/fog/planning/openstack/models/plans.rb index cc0c915a5..dec602896 100644 --- a/lib/fog/openstack/planning/models/plans.rb +++ b/lib/fog/planning/openstack/models/plans.rb @@ -1,5 +1,5 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/planning/models/plan' +require 'fog/planning/openstack/models/plan' module Fog module OpenStack diff --git a/lib/fog/openstack/planning/models/role.rb b/lib/fog/planning/openstack/models/role.rb similarity index 100% rename from lib/fog/openstack/planning/models/role.rb rename to lib/fog/planning/openstack/models/role.rb diff --git a/lib/fog/openstack/planning/models/roles.rb b/lib/fog/planning/openstack/models/roles.rb similarity index 87% rename from lib/fog/openstack/planning/models/roles.rb rename to lib/fog/planning/openstack/models/roles.rb index 61cb22c69..19dffd8bf 100644 --- a/lib/fog/openstack/planning/models/roles.rb +++ b/lib/fog/planning/openstack/models/roles.rb @@ -1,5 +1,5 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/planning/models/role' +require 'fog/planning/openstack/models/role' module Fog module OpenStack diff --git a/lib/fog/openstack/planning/requests/add_role_to_plan.rb b/lib/fog/planning/openstack/requests/add_role_to_plan.rb similarity index 100% rename from lib/fog/openstack/planning/requests/add_role_to_plan.rb rename to lib/fog/planning/openstack/requests/add_role_to_plan.rb diff --git a/lib/fog/openstack/planning/requests/create_plan.rb b/lib/fog/planning/openstack/requests/create_plan.rb similarity index 100% rename from lib/fog/openstack/planning/requests/create_plan.rb rename to lib/fog/planning/openstack/requests/create_plan.rb diff --git a/lib/fog/openstack/planning/requests/delete_plan.rb b/lib/fog/planning/openstack/requests/delete_plan.rb similarity index 100% rename from lib/fog/openstack/planning/requests/delete_plan.rb rename to lib/fog/planning/openstack/requests/delete_plan.rb diff --git a/lib/fog/openstack/planning/requests/get_plan.rb b/lib/fog/planning/openstack/requests/get_plan.rb similarity index 100% rename from lib/fog/openstack/planning/requests/get_plan.rb rename to lib/fog/planning/openstack/requests/get_plan.rb diff --git a/lib/fog/openstack/planning/requests/get_plan_templates.rb b/lib/fog/planning/openstack/requests/get_plan_templates.rb similarity index 100% rename from lib/fog/openstack/planning/requests/get_plan_templates.rb rename to lib/fog/planning/openstack/requests/get_plan_templates.rb diff --git a/lib/fog/openstack/planning/requests/list_plans.rb b/lib/fog/planning/openstack/requests/list_plans.rb similarity index 100% rename from lib/fog/openstack/planning/requests/list_plans.rb rename to lib/fog/planning/openstack/requests/list_plans.rb diff --git a/lib/fog/openstack/planning/requests/list_roles.rb b/lib/fog/planning/openstack/requests/list_roles.rb similarity index 100% rename from lib/fog/openstack/planning/requests/list_roles.rb rename to lib/fog/planning/openstack/requests/list_roles.rb diff --git a/lib/fog/openstack/planning/requests/patch_plan.rb b/lib/fog/planning/openstack/requests/patch_plan.rb similarity index 100% rename from lib/fog/openstack/planning/requests/patch_plan.rb rename to lib/fog/planning/openstack/requests/patch_plan.rb diff --git a/lib/fog/openstack/planning/requests/remove_role_from_plan.rb b/lib/fog/planning/openstack/requests/remove_role_from_plan.rb similarity index 100% rename from lib/fog/openstack/planning/requests/remove_role_from_plan.rb rename to lib/fog/planning/openstack/requests/remove_role_from_plan.rb diff --git a/lib/fog/openstack/shared_file_system/shared_file_system.rb b/lib/fog/shared_file_system/openstack.rb similarity index 98% rename from lib/fog/openstack/shared_file_system/shared_file_system.rb rename to lib/fog/shared_file_system/openstack.rb index 1f70859de..556df1739 100644 --- a/lib/fog/openstack/shared_file_system/shared_file_system.rb +++ b/lib/fog/shared_file_system/openstack.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem < Fog::Service + module SharedFileSystem + class OpenStack < Fog::Service SUPPORTED_VERSIONS = /v2(\.0)*/ SUPPORTED_MICROVERSION = '2.15'.freeze @@ -16,7 +16,7 @@ class SharedFileSystem < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_shared_file_system_microversion - model_path 'fog/openstack/shared_file_system/models' + model_path 'fog/shared_file_system/openstack/models' model :network collection :networks model :share @@ -30,7 +30,7 @@ class SharedFileSystem < Fog::Service model :availability_zone collection :availability_zones - request_path 'fog/openstack/shared_file_system/requests' + request_path 'fog/shared_file_system/openstack/requests' # share networks request :list_share_networks request :list_share_networks_detail @@ -348,7 +348,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::SharedFileSystem::NotFound + Fog::SharedFileSystem::OpenStack::NotFound end def action_prefix diff --git a/lib/fog/openstack/shared_file_system/models/availability_zone.rb b/lib/fog/shared_file_system/openstack/models/availability_zone.rb similarity index 83% rename from lib/fog/openstack/shared_file_system/models/availability_zone.rb rename to lib/fog/shared_file_system/openstack/models/availability_zone.rb index 10c2c463f..73a5f5526 100644 --- a/lib/fog/openstack/shared_file_system/models/availability_zone.rb +++ b/lib/fog/shared_file_system/openstack/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class AvailabilityZone < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/shared_file_system/models/availability_zones.rb b/lib/fog/shared_file_system/openstack/models/availability_zones.rb similarity index 59% rename from lib/fog/openstack/shared_file_system/models/availability_zones.rb rename to lib/fog/shared_file_system/openstack/models/availability_zones.rb index 47ee8eb43..d63442b8b 100644 --- a/lib/fog/openstack/shared_file_system/models/availability_zones.rb +++ b/lib/fog/shared_file_system/openstack/models/availability_zones.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/shared_file_system/models/availability_zone' +require 'fog/shared_file_system/openstack/models/availability_zone' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class AvailabilityZones < Fog::OpenStack::Collection - model Fog::OpenStack::SharedFileSystem::AvailabilityZone + model Fog::SharedFileSystem::OpenStack::AvailabilityZone def all load_response(service.list_availability_zones(), 'availability_zones') diff --git a/lib/fog/openstack/shared_file_system/models/network.rb b/lib/fog/shared_file_system/openstack/models/network.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/models/network.rb rename to lib/fog/shared_file_system/openstack/models/network.rb index 7787cdf2a..62d2a574a 100644 --- a/lib/fog/openstack/shared_file_system/models/network.rb +++ b/lib/fog/shared_file_system/openstack/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Network < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/shared_file_system/models/networks.rb b/lib/fog/shared_file_system/openstack/models/networks.rb similarity index 77% rename from lib/fog/openstack/shared_file_system/models/networks.rb rename to lib/fog/shared_file_system/openstack/models/networks.rb index 4bdd9026c..84fe46937 100644 --- a/lib/fog/openstack/shared_file_system/models/networks.rb +++ b/lib/fog/shared_file_system/openstack/models/networks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/shared_file_system/models/network' +require 'fog/shared_file_system/openstack/models/network' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Networks < Fog::OpenStack::Collection - model Fog::OpenStack::SharedFileSystem::Network + model Fog::SharedFileSystem::OpenStack::Network def all(options = {}) load_response(service.list_share_networks_detail(options), 'share_networks') diff --git a/lib/fog/openstack/shared_file_system/models/share.rb b/lib/fog/shared_file_system/openstack/models/share.rb similarity index 97% rename from lib/fog/openstack/shared_file_system/models/share.rb rename to lib/fog/shared_file_system/openstack/models/share.rb index bfedd2b9a..26bf7b7c3 100644 --- a/lib/fog/openstack/shared_file_system/models/share.rb +++ b/lib/fog/shared_file_system/openstack/models/share.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Share < Fog::OpenStack::Model identity :id @@ -85,7 +85,7 @@ def revoke_access(access_id) def access_rules service.share_access_rules(:share => self) end - + def export_locations service.share_export_locations(:share => self) end diff --git a/lib/fog/openstack/shared_file_system/models/share_access_rule.rb b/lib/fog/shared_file_system/openstack/models/share_access_rule.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/models/share_access_rule.rb rename to lib/fog/shared_file_system/openstack/models/share_access_rule.rb index 923efa78f..932e01ec6 100644 --- a/lib/fog/openstack/shared_file_system/models/share_access_rule.rb +++ b/lib/fog/shared_file_system/openstack/models/share_access_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class ShareAccessRule < Fog::OpenStack::Model attr_accessor :share diff --git a/lib/fog/openstack/shared_file_system/models/share_access_rules.rb b/lib/fog/shared_file_system/openstack/models/share_access_rules.rb similarity index 76% rename from lib/fog/openstack/shared_file_system/models/share_access_rules.rb rename to lib/fog/shared_file_system/openstack/models/share_access_rules.rb index 88ce81d50..d35020e06 100644 --- a/lib/fog/openstack/shared_file_system/models/share_access_rules.rb +++ b/lib/fog/shared_file_system/openstack/models/share_access_rules.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/shared_file_system/models/share_access_rule' +require 'fog/shared_file_system/openstack/models/share_access_rule' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class ShareAccessRules < Fog::OpenStack::Collection - model Fog::OpenStack::SharedFileSystem::ShareAccessRule + model Fog::SharedFileSystem::OpenStack::ShareAccessRule attr_accessor :share diff --git a/lib/fog/openstack/shared_file_system/models/share_export_location.rb b/lib/fog/shared_file_system/openstack/models/share_export_location.rb similarity index 83% rename from lib/fog/openstack/shared_file_system/models/share_export_location.rb rename to lib/fog/shared_file_system/openstack/models/share_export_location.rb index e25dd6d5d..6c0975381 100644 --- a/lib/fog/openstack/shared_file_system/models/share_export_location.rb +++ b/lib/fog/shared_file_system/openstack/models/share_export_location.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class ShareExportLocation < Fog::OpenStack::Model identity :id - + attribute :share_instance_id attribute :path attribute :is_admin_only diff --git a/lib/fog/openstack/shared_file_system/models/share_export_locations.rb b/lib/fog/shared_file_system/openstack/models/share_export_locations.rb similarity index 77% rename from lib/fog/openstack/shared_file_system/models/share_export_locations.rb rename to lib/fog/shared_file_system/openstack/models/share_export_locations.rb index 49bf13206..39cdadbaf 100644 --- a/lib/fog/openstack/shared_file_system/models/share_export_locations.rb +++ b/lib/fog/shared_file_system/openstack/models/share_export_locations.rb @@ -1,14 +1,14 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/shared_file_system/models/share_access_rule' +require 'fog/shared_file_system/openstack/models/share_access_rule' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class ShareExportLocations < Fog::OpenStack::Collection - model Fog::OpenStack::SharedFileSystem::ShareExportLocation + model Fog::SharedFileSystem::OpenStack::ShareExportLocation attr_accessor :share - + def all requires :share load_response(service.list_share_export_locations(@share.id), 'export_locations') @@ -20,7 +20,7 @@ def find_by_id(id) end alias get find_by_id - + def new(attributes = {}) requires :share super({:share => @share}.merge!(attributes)) diff --git a/lib/fog/openstack/shared_file_system/models/shares.rb b/lib/fog/shared_file_system/openstack/models/shares.rb similarity index 76% rename from lib/fog/openstack/shared_file_system/models/shares.rb rename to lib/fog/shared_file_system/openstack/models/shares.rb index 06e4ae729..6f512b000 100644 --- a/lib/fog/openstack/shared_file_system/models/shares.rb +++ b/lib/fog/shared_file_system/openstack/models/shares.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/shared_file_system/models/share' +require 'fog/shared_file_system/openstack/models/share' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Shares < Fog::OpenStack::Collection - model Fog::OpenStack::SharedFileSystem::Share + model Fog::SharedFileSystem::OpenStack::Share def all(options = {}) load_response(service.list_shares_detail(options), 'shares') diff --git a/lib/fog/openstack/shared_file_system/models/snapshot.rb b/lib/fog/shared_file_system/openstack/models/snapshot.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/models/snapshot.rb rename to lib/fog/shared_file_system/openstack/models/snapshot.rb index 6fefca9be..8f831a75a 100644 --- a/lib/fog/openstack/shared_file_system/models/snapshot.rb +++ b/lib/fog/shared_file_system/openstack/models/snapshot.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Snapshot < Fog::OpenStack::Model identity :id diff --git a/lib/fog/openstack/shared_file_system/models/snapshots.rb b/lib/fog/shared_file_system/openstack/models/snapshots.rb similarity index 77% rename from lib/fog/openstack/shared_file_system/models/snapshots.rb rename to lib/fog/shared_file_system/openstack/models/snapshots.rb index 3a6756f7c..e8a0ad749 100644 --- a/lib/fog/openstack/shared_file_system/models/snapshots.rb +++ b/lib/fog/shared_file_system/openstack/models/snapshots.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/shared_file_system/models/snapshot' +require 'fog/shared_file_system/openstack/models/snapshot' module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Snapshots < Fog::OpenStack::Collection - model Fog::OpenStack::SharedFileSystem::Snapshot + model Fog::SharedFileSystem::OpenStack::Snapshot def all(options = {}) load_response(service.list_snapshots_detail(options), 'snapshots') diff --git a/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb b/lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb rename to lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb index 8ad8537e1..c80ede107 100644 --- a/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb +++ b/lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def add_security_service_to_share_network(security_service_id, share_network_id) action = { diff --git a/lib/fog/openstack/shared_file_system/requests/create_security_service.rb b/lib/fog/shared_file_system/openstack/requests/create_security_service.rb similarity index 96% rename from lib/fog/openstack/shared_file_system/requests/create_security_service.rb rename to lib/fog/shared_file_system/openstack/requests/create_security_service.rb index a32ce1b09..bfc3bb543 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_security_service.rb +++ b/lib/fog/shared_file_system/openstack/requests/create_security_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def create_security_service(type, name, options = {}) data = { diff --git a/lib/fog/openstack/shared_file_system/requests/create_share.rb b/lib/fog/shared_file_system/openstack/requests/create_share.rb similarity index 96% rename from lib/fog/openstack/shared_file_system/requests/create_share.rb rename to lib/fog/shared_file_system/openstack/requests/create_share.rb index 8222a6465..cd8535110 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_share.rb +++ b/lib/fog/shared_file_system/openstack/requests/create_share.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def create_share(protocol, size, options = {}) data = { diff --git a/lib/fog/openstack/shared_file_system/requests/create_share_network.rb b/lib/fog/shared_file_system/openstack/requests/create_share_network.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/requests/create_share_network.rb rename to lib/fog/shared_file_system/openstack/requests/create_share_network.rb index 6a38d5b9c..21c11285c 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_share_network.rb +++ b/lib/fog/shared_file_system/openstack/requests/create_share_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def create_share_network(options = {}) data = {} diff --git a/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb b/lib/fog/shared_file_system/openstack/requests/create_snapshot.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/requests/create_snapshot.rb rename to lib/fog/shared_file_system/openstack/requests/create_snapshot.rb index 9e4befabd..4c9fff6e8 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb +++ b/lib/fog/shared_file_system/openstack/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def create_snapshot(share_id, options = {}) data = { diff --git a/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb b/lib/fog/shared_file_system/openstack/requests/delete_security_service.rb similarity index 90% rename from lib/fog/openstack/shared_file_system/requests/delete_security_service.rb rename to lib/fog/shared_file_system/openstack/requests/delete_security_service.rb index b304d2d22..036057124 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb +++ b/lib/fog/shared_file_system/openstack/requests/delete_security_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def delete_security_service(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/delete_share.rb b/lib/fog/shared_file_system/openstack/requests/delete_share.rb similarity index 93% rename from lib/fog/openstack/shared_file_system/requests/delete_share.rb rename to lib/fog/shared_file_system/openstack/requests/delete_share.rb index 41c1113d2..f18126418 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_share.rb +++ b/lib/fog/shared_file_system/openstack/requests/delete_share.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def delete_share(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb b/lib/fog/shared_file_system/openstack/requests/delete_share_network.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/delete_share_network.rb rename to lib/fog/shared_file_system/openstack/requests/delete_share_network.rb index 3211b2cf2..73bb098dc 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb +++ b/lib/fog/shared_file_system/openstack/requests/delete_share_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def delete_share_network(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb b/lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb rename to lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb index e48dfd759..48ca62beb 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb +++ b/lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def delete_snapshot(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/extend_share.rb b/lib/fog/shared_file_system/openstack/requests/extend_share.rb similarity index 90% rename from lib/fog/openstack/shared_file_system/requests/extend_share.rb rename to lib/fog/shared_file_system/openstack/requests/extend_share.rb index 723db63ce..6fd4fcd99 100644 --- a/lib/fog/openstack/shared_file_system/requests/extend_share.rb +++ b/lib/fog/shared_file_system/openstack/requests/extend_share.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def extend_share(share_id, new_size) action = { diff --git a/lib/fog/openstack/shared_file_system/requests/get_limits.rb b/lib/fog/shared_file_system/openstack/requests/get_limits.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/requests/get_limits.rb rename to lib/fog/shared_file_system/openstack/requests/get_limits.rb index eea8774ca..c4421586c 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_limits.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_limits.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def get_limits request( diff --git a/lib/fog/openstack/shared_file_system/requests/get_quota.rb b/lib/fog/shared_file_system/openstack/requests/get_quota.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/get_quota.rb rename to lib/fog/shared_file_system/openstack/requests/get_quota.rb index 28dff4787..c381abd93 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_quota.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def get_quota(project_id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/get_security_service.rb b/lib/fog/shared_file_system/openstack/requests/get_security_service.rb similarity index 93% rename from lib/fog/openstack/shared_file_system/requests/get_security_service.rb rename to lib/fog/shared_file_system/openstack/requests/get_security_service.rb index 42682244e..86c134319 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_security_service.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_security_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def get_security_service(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/get_share.rb b/lib/fog/shared_file_system/openstack/requests/get_share.rb similarity index 91% rename from lib/fog/openstack/shared_file_system/requests/get_share.rb rename to lib/fog/shared_file_system/openstack/requests/get_share.rb index 60103a993..f37a5ac26 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_share.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_share.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def get_share(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb b/lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb similarity index 89% rename from lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb rename to lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb index 8c3400ef3..1c5319ec7 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb @@ -1,8 +1,8 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real - # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). + # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns the export location detail. def get_share_export_location(share_id,export_location_id) diff --git a/lib/fog/openstack/shared_file_system/requests/get_share_network.rb b/lib/fog/shared_file_system/openstack/requests/get_share_network.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/get_share_network.rb rename to lib/fog/shared_file_system/openstack/requests/get_share_network.rb index befa8fb1a..b8fb78218 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_share_network.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_share_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def get_share_network(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb b/lib/fog/shared_file_system/openstack/requests/get_snapshot.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/get_snapshot.rb rename to lib/fog/shared_file_system/openstack/requests/get_snapshot.rb index b9acf812a..b39ca1604 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb +++ b/lib/fog/shared_file_system/openstack/requests/get_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def get_snapshot(id) request( diff --git a/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb b/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/requests/grant_share_access.rb rename to lib/fog/shared_file_system/openstack/requests/grant_share_access.rb index 92b3136a9..c428e5821 100644 --- a/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb +++ b/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def grant_share_access(share_id, access_to = '0.0.0.0/0', access_type = 'ip', access_level = 'rw') action = { diff --git a/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb b/lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb rename to lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb index a2b8639b2..1752876db 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_availability_zones() request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_security_services.rb b/lib/fog/shared_file_system/openstack/requests/list_security_services.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/list_security_services.rb rename to lib/fog/shared_file_system/openstack/requests/list_security_services.rb index e6588d094..7495481e0 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_security_services.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_security_services.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_security_services(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb b/lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb rename to lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb index 5d9750b6d..9e47a0e04 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_security_services_detail(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb b/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb rename to lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb index b232a1de6..c22da2865 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_share_access_rules(share_id) action = { diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb b/lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb similarity index 87% rename from lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb rename to lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb index b2c283432..54cebbffb 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb @@ -1,8 +1,8 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real - # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). + # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns a list of the export locations. def list_share_export_locations(share_id) diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb b/lib/fog/shared_file_system/openstack/requests/list_share_networks.rb similarity index 91% rename from lib/fog/openstack/shared_file_system/requests/list_share_networks.rb rename to lib/fog/shared_file_system/openstack/requests/list_share_networks.rb index eec063415..263ba803c 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_share_networks.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_share_networks(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb b/lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb rename to lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb index 1555248f4..a73ff21f4 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_share_networks_detail(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_shares.rb b/lib/fog/shared_file_system/openstack/requests/list_shares.rb similarity index 91% rename from lib/fog/openstack/shared_file_system/requests/list_shares.rb rename to lib/fog/shared_file_system/openstack/requests/list_shares.rb index 13fd4e2a0..090c91b52 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_shares.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_shares.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_shares(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb b/lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb similarity index 91% rename from lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb rename to lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb index 30abb0331..a3f722fd8 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_shares_detail(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb b/lib/fog/shared_file_system/openstack/requests/list_snapshots.rb similarity index 91% rename from lib/fog/openstack/shared_file_system/requests/list_snapshots.rb rename to lib/fog/shared_file_system/openstack/requests/list_snapshots.rb index b62e978ab..59a8b50b3 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_snapshots(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb b/lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb similarity index 92% rename from lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb rename to lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb index 15e69cad1..786449924 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb +++ b/lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def list_snapshots_detail(options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb b/lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb rename to lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb index a2072ddd4..000154d94 100644 --- a/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb +++ b/lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def remove_security_service_from_share_network(security_service_id, share_network_id) action = { diff --git a/lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb b/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb similarity index 91% rename from lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb rename to lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb index 47610ee97..3f7016dd3 100644 --- a/lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb +++ b/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def revoke_share_access(share_id, access_id) action = { diff --git a/lib/fog/openstack/shared_file_system/requests/share_action.rb b/lib/fog/shared_file_system/openstack/requests/share_action.rb similarity index 87% rename from lib/fog/openstack/shared_file_system/requests/share_action.rb rename to lib/fog/shared_file_system/openstack/requests/share_action.rb index c5c3cd97a..5cb3f0ba2 100644 --- a/lib/fog/openstack/shared_file_system/requests/share_action.rb +++ b/lib/fog/shared_file_system/openstack/requests/share_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def share_action(id, options = {}, expects_status = 202) request( diff --git a/lib/fog/openstack/shared_file_system/requests/share_network_action.rb b/lib/fog/shared_file_system/openstack/requests/share_network_action.rb similarity index 88% rename from lib/fog/openstack/shared_file_system/requests/share_network_action.rb rename to lib/fog/shared_file_system/openstack/requests/share_network_action.rb index 9d78c1fe0..d788f5ec5 100644 --- a/lib/fog/openstack/shared_file_system/requests/share_network_action.rb +++ b/lib/fog/shared_file_system/openstack/requests/share_network_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def share_network_action(id, options = {}, expects_status = 200) request( diff --git a/lib/fog/openstack/shared_file_system/requests/shrink_share.rb b/lib/fog/shared_file_system/openstack/requests/shrink_share.rb similarity index 90% rename from lib/fog/openstack/shared_file_system/requests/shrink_share.rb rename to lib/fog/shared_file_system/openstack/requests/shrink_share.rb index e0ebe59fc..377b8ddb1 100644 --- a/lib/fog/openstack/shared_file_system/requests/shrink_share.rb +++ b/lib/fog/shared_file_system/openstack/requests/shrink_share.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def shrink_share(share_id, new_size) action = { diff --git a/lib/fog/openstack/shared_file_system/requests/update_quota.rb b/lib/fog/shared_file_system/openstack/requests/update_quota.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/update_quota.rb rename to lib/fog/shared_file_system/openstack/requests/update_quota.rb index 55392410d..cfd9eef46 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_quota.rb +++ b/lib/fog/shared_file_system/openstack/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def update_quota(project_id, options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/update_security_service.rb b/lib/fog/shared_file_system/openstack/requests/update_security_service.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/update_security_service.rb rename to lib/fog/shared_file_system/openstack/requests/update_security_service.rb index a1be0a855..132e9d12c 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_security_service.rb +++ b/lib/fog/shared_file_system/openstack/requests/update_security_service.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def update_security_service(id, options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/update_share.rb b/lib/fog/shared_file_system/openstack/requests/update_share.rb similarity index 95% rename from lib/fog/openstack/shared_file_system/requests/update_share.rb rename to lib/fog/shared_file_system/openstack/requests/update_share.rb index d283878b6..08f2fceeb 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_share.rb +++ b/lib/fog/shared_file_system/openstack/requests/update_share.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def update_share(id, options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/update_share_network.rb b/lib/fog/shared_file_system/openstack/requests/update_share_network.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/update_share_network.rb rename to lib/fog/shared_file_system/openstack/requests/update_share_network.rb index b5c55dac1..d90187a77 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_share_network.rb +++ b/lib/fog/shared_file_system/openstack/requests/update_share_network.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def update_share_network(id, options = {}) request( diff --git a/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb b/lib/fog/shared_file_system/openstack/requests/update_snapshot.rb similarity index 94% rename from lib/fog/openstack/shared_file_system/requests/update_snapshot.rb rename to lib/fog/shared_file_system/openstack/requests/update_snapshot.rb index 3898a9715..46a77677f 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb +++ b/lib/fog/shared_file_system/openstack/requests/update_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class SharedFileSystem + module SharedFileSystem + class OpenStack class Real def update_snapshot(id, options = {}) request( diff --git a/lib/fog/openstack/storage/storage.rb b/lib/fog/storage/openstack.rb similarity index 95% rename from lib/fog/openstack/storage/storage.rb rename to lib/fog/storage/openstack.rb index c369f0753..cca6d65a4 100644 --- a/lib/fog/openstack/storage/storage.rb +++ b/lib/fog/storage/openstack.rb @@ -1,8 +1,8 @@ module Fog - module OpenStack - class Storage < Fog::Service + module Storage + class OpenStack < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -15,13 +15,13 @@ class Storage < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key - model_path 'fog/openstack/storage/models' + model_path 'fog/storage/openstack/models' model :directory collection :directories model :file collection :files - request_path 'fog/openstack/storage/requests' + request_path 'fog/storage/openstack/requests' request :copy_object request :delete_container request :delete_object @@ -105,7 +105,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Storage::NotFound + Fog::Storage::OpenStack::NotFound end def default_service_type @@ -125,7 +125,7 @@ def initialize(options = {}) # For example: # # # List current user account details - # service = Fog::OpenStack::Storage.new + # service = Fog::Storage[:openstack] # service.request :method => 'HEAD' # # Would return something like: diff --git a/lib/fog/openstack/storage/models/directories.rb b/lib/fog/storage/openstack/models/directories.rb similarity index 82% rename from lib/fog/openstack/storage/models/directories.rb rename to lib/fog/storage/openstack/models/directories.rb index f4dd7e6be..d912cda10 100644 --- a/lib/fog/openstack/storage/models/directories.rb +++ b/lib/fog/storage/openstack/models/directories.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/storage/models/directory' +require 'fog/storage/openstack/models/directory' module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Directories < Fog::OpenStack::Collection - model Fog::OpenStack::Storage::Directory + model Fog::Storage::OpenStack::Directory def all(options = {}) data = service.get_containers(options) @@ -27,7 +27,7 @@ def get(key, options = {}) directory.files << directory.files.new(file) end directory - rescue Fog::OpenStack::Storage::NotFound + rescue Fog::Storage::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/storage/models/directory.rb b/lib/fog/storage/openstack/models/directory.rb similarity index 83% rename from lib/fog/openstack/storage/models/directory.rb rename to lib/fog/storage/openstack/models/directory.rb index 9d2f4ccbb..b6a6ba8b1 100644 --- a/lib/fog/openstack/storage/models/directory.rb +++ b/lib/fog/storage/openstack/models/directory.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/openstack/storage/models/files' +require 'fog/storage/openstack/models/files' module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Directory < Fog::OpenStack::Model identity :key, :aliases => 'name' @@ -22,7 +22,7 @@ def destroy def files @files ||= begin - Fog::OpenStack::Storage::Files.new( + Fog::Storage::OpenStack::Files.new( :directory => self, :service => service ) @@ -34,7 +34,7 @@ def public_url @public_url ||= begin service.public_url(key) - rescue Fog::OpenStack::Storage::NotFound => err + rescue Fog::Storage::OpenStack::NotFound => err nil end end diff --git a/lib/fog/openstack/storage/models/file.rb b/lib/fog/storage/openstack/models/file.rb similarity index 99% rename from lib/fog/openstack/storage/models/file.rb rename to lib/fog/storage/openstack/models/file.rb index 8096f3e94..1650a27f8 100644 --- a/lib/fog/openstack/storage/models/file.rb +++ b/lib/fog/storage/openstack/models/file.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Storage + module Storage + class OpenStack class File < Fog::OpenStack::Model identity :key, :aliases => 'name' diff --git a/lib/fog/openstack/storage/models/files.rb b/lib/fog/storage/openstack/models/files.rb similarity index 91% rename from lib/fog/openstack/storage/models/files.rb rename to lib/fog/storage/openstack/models/files.rb index 9b4437830..141242948 100644 --- a/lib/fog/openstack/storage/models/files.rb +++ b/lib/fog/storage/openstack/models/files.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/collection' -require 'fog/openstack/storage/models/file' +require 'fog/storage/openstack/models/file' module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Files < Fog::OpenStack::Collection attribute :directory attribute :limit @@ -11,7 +11,7 @@ class Files < Fog::OpenStack::Collection attribute :path attribute :prefix - model Fog::OpenStack::Storage::File + model Fog::Storage::OpenStack::File def all(options = {}) requires :directory @@ -55,7 +55,7 @@ def get(key, &block) file_data = data.headers.merge(:body => data.body, :key => key) new(file_data) - rescue Fog::OpenStack::Storage::NotFound + rescue Fog::Storage::OpenStack::NotFound nil end @@ -81,7 +81,7 @@ def head(key, _options = {}) data = service.head_object(directory.key, key) file_data = data.headers.merge(:key => key) new(file_data) - rescue Fog::OpenStack::Storage::NotFound + rescue Fog::Storage::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/storage/requests/copy_object.rb b/lib/fog/storage/openstack/requests/copy_object.rb similarity index 96% rename from lib/fog/openstack/storage/requests/copy_object.rb rename to lib/fog/storage/openstack/requests/copy_object.rb index db518bead..2e98e523f 100644 --- a/lib/fog/openstack/storage/requests/copy_object.rb +++ b/lib/fog/storage/openstack/requests/copy_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Copy object # diff --git a/lib/fog/openstack/storage/requests/delete_container.rb b/lib/fog/storage/openstack/requests/delete_container.rb similarity index 91% rename from lib/fog/openstack/storage/requests/delete_container.rb rename to lib/fog/storage/openstack/requests/delete_container.rb index 2fa501eb3..5023110f5 100644 --- a/lib/fog/openstack/storage/requests/delete_container.rb +++ b/lib/fog/storage/openstack/requests/delete_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Delete an existing container # diff --git a/lib/fog/openstack/storage/requests/delete_multiple_objects.rb b/lib/fog/storage/openstack/requests/delete_multiple_objects.rb similarity index 98% rename from lib/fog/openstack/storage/requests/delete_multiple_objects.rb rename to lib/fog/storage/openstack/requests/delete_multiple_objects.rb index ca69fecfa..a91d5a245 100644 --- a/lib/fog/openstack/storage/requests/delete_multiple_objects.rb +++ b/lib/fog/storage/openstack/requests/delete_multiple_objects.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Deletes multiple objects or containers with a single request. # diff --git a/lib/fog/openstack/storage/requests/delete_object.rb b/lib/fog/storage/openstack/requests/delete_object.rb similarity index 93% rename from lib/fog/openstack/storage/requests/delete_object.rb rename to lib/fog/storage/openstack/requests/delete_object.rb index 7b6954cea..bbc344cda 100644 --- a/lib/fog/openstack/storage/requests/delete_object.rb +++ b/lib/fog/storage/openstack/requests/delete_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Delete an existing object # diff --git a/lib/fog/openstack/storage/requests/delete_static_large_object.rb b/lib/fog/storage/openstack/requests/delete_static_large_object.rb similarity index 98% rename from lib/fog/openstack/storage/requests/delete_static_large_object.rb rename to lib/fog/storage/openstack/requests/delete_static_large_object.rb index 50e6dd0f1..4acddd449 100644 --- a/lib/fog/openstack/storage/requests/delete_static_large_object.rb +++ b/lib/fog/storage/openstack/requests/delete_static_large_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Delete a static large object. # diff --git a/lib/fog/openstack/storage/requests/get_container.rb b/lib/fog/storage/openstack/requests/get_container.rb similarity index 97% rename from lib/fog/openstack/storage/requests/get_container.rb rename to lib/fog/storage/openstack/requests/get_container.rb index 8f8f2b1c2..27b93da95 100644 --- a/lib/fog/openstack/storage/requests/get_container.rb +++ b/lib/fog/storage/openstack/requests/get_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Get details for container and total bytes stored # diff --git a/lib/fog/openstack/storage/requests/get_containers.rb b/lib/fog/storage/openstack/requests/get_containers.rb similarity index 96% rename from lib/fog/openstack/storage/requests/get_containers.rb rename to lib/fog/storage/openstack/requests/get_containers.rb index b3d0835f4..254cd0d9a 100644 --- a/lib/fog/openstack/storage/requests/get_containers.rb +++ b/lib/fog/storage/openstack/requests/get_containers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # List existing storage containers # diff --git a/lib/fog/openstack/storage/requests/get_object.rb b/lib/fog/storage/openstack/requests/get_object.rb similarity index 94% rename from lib/fog/openstack/storage/requests/get_object.rb rename to lib/fog/storage/openstack/requests/get_object.rb index 479038723..bdfa1b02a 100644 --- a/lib/fog/openstack/storage/requests/get_object.rb +++ b/lib/fog/storage/openstack/requests/get_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Get details for object # diff --git a/lib/fog/openstack/storage/requests/get_object_http_url.rb b/lib/fog/storage/openstack/requests/get_object_http_url.rb similarity index 94% rename from lib/fog/openstack/storage/requests/get_object_http_url.rb rename to lib/fog/storage/openstack/requests/get_object_http_url.rb index ef79757d4..0e8582417 100644 --- a/lib/fog/openstack/storage/requests/get_object_http_url.rb +++ b/lib/fog/storage/openstack/requests/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Get an expiring object http url # diff --git a/lib/fog/openstack/storage/requests/get_object_https_url.rb b/lib/fog/storage/openstack/requests/get_object_https_url.rb similarity index 98% rename from lib/fog/openstack/storage/requests/get_object_https_url.rb rename to lib/fog/storage/openstack/requests/get_object_https_url.rb index 5b8cd50e7..4f9a418d2 100644 --- a/lib/fog/openstack/storage/requests/get_object_https_url.rb +++ b/lib/fog/storage/openstack/requests/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Get an expiring object https url from Cloud Files # diff --git a/lib/fog/openstack/storage/requests/head_container.rb b/lib/fog/storage/openstack/requests/head_container.rb similarity index 95% rename from lib/fog/openstack/storage/requests/head_container.rb rename to lib/fog/storage/openstack/requests/head_container.rb index 141e4cb04..c42b83ca9 100644 --- a/lib/fog/openstack/storage/requests/head_container.rb +++ b/lib/fog/storage/openstack/requests/head_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # List number of objects and total bytes stored # diff --git a/lib/fog/openstack/storage/requests/head_containers.rb b/lib/fog/storage/openstack/requests/head_containers.rb similarity index 93% rename from lib/fog/openstack/storage/requests/head_containers.rb rename to lib/fog/storage/openstack/requests/head_containers.rb index 1cbdffe18..d4dea719a 100644 --- a/lib/fog/openstack/storage/requests/head_containers.rb +++ b/lib/fog/storage/openstack/requests/head_containers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # List number of containers and total bytes stored # diff --git a/lib/fog/openstack/storage/requests/head_object.rb b/lib/fog/storage/openstack/requests/head_object.rb similarity index 93% rename from lib/fog/openstack/storage/requests/head_object.rb rename to lib/fog/storage/openstack/requests/head_object.rb index 647e289e6..c38095991 100644 --- a/lib/fog/openstack/storage/requests/head_object.rb +++ b/lib/fog/storage/openstack/requests/head_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Get headers for object # diff --git a/lib/fog/openstack/storage/requests/post_object.rb b/lib/fog/storage/openstack/requests/post_object.rb similarity index 94% rename from lib/fog/openstack/storage/requests/post_object.rb rename to lib/fog/storage/openstack/requests/post_object.rb index 2b66db150..418d93820 100644 --- a/lib/fog/openstack/storage/requests/post_object.rb +++ b/lib/fog/storage/openstack/requests/post_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Update object metadata # diff --git a/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb b/lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb similarity index 96% rename from lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb rename to lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb index c5ca3a455..45cc2dc8b 100644 --- a/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb +++ b/lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Set the account wide Temp URL Key. This is a secret key that's # used to generate signed expiring URLs. diff --git a/lib/fog/openstack/storage/requests/public_url.rb b/lib/fog/storage/openstack/requests/public_url.rb similarity index 95% rename from lib/fog/openstack/storage/requests/public_url.rb rename to lib/fog/storage/openstack/requests/public_url.rb index ca2261863..c95c8d7e3 100644 --- a/lib/fog/openstack/storage/requests/public_url.rb +++ b/lib/fog/storage/openstack/requests/public_url.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack module PublicUrl # Get public_url for an object # diff --git a/lib/fog/openstack/storage/requests/put_container.rb b/lib/fog/storage/openstack/requests/put_container.rb similarity index 94% rename from lib/fog/openstack/storage/requests/put_container.rb rename to lib/fog/storage/openstack/requests/put_container.rb index ba09d8f5d..4b3c976d2 100644 --- a/lib/fog/openstack/storage/requests/put_container.rb +++ b/lib/fog/storage/openstack/requests/put_container.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Create a new container # diff --git a/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb b/lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb similarity index 95% rename from lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb rename to lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb index 4c0124ab5..b35f20e5a 100644 --- a/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb +++ b/lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Create a new dynamic large object manifest # @@ -19,7 +19,7 @@ class Real # @param options [Hash] Config headers for +object+. # @option options [String] 'X-Object-Manifest' ("container/object") "/" for segment objects. # - # @raise [Fog::OpenStack::Storage::NotFound] HTTP 404 + # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404 # @raise [Excon::Errors::BadRequest] HTTP 400 # @raise [Excon::Errors::Unauthorized] HTTP 401 # @raise [Excon::Errors::HTTPStatusError] diff --git a/lib/fog/openstack/storage/requests/put_object.rb b/lib/fog/storage/openstack/requests/put_object.rb similarity index 98% rename from lib/fog/openstack/storage/requests/put_object.rb rename to lib/fog/storage/openstack/requests/put_object.rb index 57007cc02..3057510d1 100644 --- a/lib/fog/openstack/storage/requests/put_object.rb +++ b/lib/fog/storage/openstack/requests/put_object.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Create a new object # diff --git a/lib/fog/openstack/storage/requests/put_object_manifest.rb b/lib/fog/storage/openstack/requests/put_object_manifest.rb similarity index 90% rename from lib/fog/openstack/storage/requests/put_object_manifest.rb rename to lib/fog/storage/openstack/requests/put_object_manifest.rb index e52456217..1fe01c6d8 100644 --- a/lib/fog/openstack/storage/requests/put_object_manifest.rb +++ b/lib/fog/storage/openstack/requests/put_object_manifest.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Create a new dynamic large object manifest # diff --git a/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb b/lib/fog/storage/openstack/requests/put_static_obj_manifest.rb similarity index 96% rename from lib/fog/openstack/storage/requests/put_static_obj_manifest.rb rename to lib/fog/storage/openstack/requests/put_static_obj_manifest.rb index f031c1093..23b18a260 100644 --- a/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb +++ b/lib/fog/storage/openstack/requests/put_static_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Storage + module Storage + class OpenStack class Real # Create a new static large object manifest. # @@ -33,7 +33,7 @@ class Real # @param segments [Array] Segment data for the object. # @param options [Hash] Config headers for +object+. # - # @raise [Fog::OpenStack::Storage::NotFound] HTTP 404 + # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404 # @raise [Excon::Errors::BadRequest] HTTP 400 # @raise [Excon::Errors::Unauthorized] HTTP 401 # @raise [Excon::Errors::HTTPStatusError] diff --git a/lib/fog/openstack/volume/volume.rb b/lib/fog/volume/openstack.rb similarity index 73% rename from lib/fog/openstack/volume/volume.rb rename to lib/fog/volume/openstack.rb index 6fc49815c..fbc961d42 100644 --- a/lib/fog/openstack/volume/volume.rb +++ b/lib/fog/volume/openstack.rb @@ -1,10 +1,10 @@ module Fog - module OpenStack - class Volume < Fog::Service - autoload :V1, 'fog/openstack/volume/v1' - autoload :V2, 'fog/openstack/volume/v2' + module Volume + class OpenStack < Fog::Service + autoload :V1, 'fog/volume/openstack/v1' + autoload :V2, 'fog/volume/openstack/v2' @@recognizes = [:openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -17,12 +17,12 @@ class Volume < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version] - # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Volume::V2 or a Fog::OpenStack::Volume::V1, + # Fog::Image::OpenStack.new() will return a Fog::Volume::OpenStack::V2 or a Fog::Volume::OpenStack::V1, # choosing the V2 by default, as V1 is deprecated since OpenStack Juno def self.new(args = {}) @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - service = if inspect == 'Fog::OpenStack::Volume' - Fog::OpenStack::Volume::V2.new(args) || Fog::OpenStack::Volume::V1.new(args) + service = if inspect == 'Fog::Volume::OpenStack' + Fog::Volume::OpenStack::V2.new(args) || Fog::Volume::OpenStack::V1.new(args) else super end diff --git a/lib/fog/openstack/volume/models/availability_zone.rb b/lib/fog/volume/openstack/models/availability_zone.rb similarity index 78% rename from lib/fog/openstack/volume/models/availability_zone.rb rename to lib/fog/volume/openstack/models/availability_zone.rb index bdbe24823..e1b34cf14 100644 --- a/lib/fog/openstack/volume/models/availability_zone.rb +++ b/lib/fog/volume/openstack/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class AvailabilityZone < Fog::OpenStack::Model end end diff --git a/lib/fog/openstack/volume/models/availability_zones.rb b/lib/fog/volume/openstack/models/availability_zones.rb similarity index 87% rename from lib/fog/openstack/volume/models/availability_zones.rb rename to lib/fog/volume/openstack/models/availability_zones.rb index 413e5b2c8..42563cee7 100644 --- a/lib/fog/openstack/volume/models/availability_zones.rb +++ b/lib/fog/volume/openstack/models/availability_zones.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Volume + module Volume + class OpenStack module AvailabilityZones def all(options = {}) data = service.list_zones(options) diff --git a/lib/fog/openstack/volume/models/backup.rb b/lib/fog/volume/openstack/models/backup.rb similarity index 96% rename from lib/fog/openstack/volume/models/backup.rb rename to lib/fog/volume/openstack/models/backup.rb index bb76a2bc7..676a16c78 100644 --- a/lib/fog/openstack/volume/models/backup.rb +++ b/lib/fog/volume/openstack/models/backup.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class Backup < Fog::OpenStack::Model attribute :availability_zone attribute :container diff --git a/lib/fog/openstack/volume/models/backups.rb b/lib/fog/volume/openstack/models/backups.rb similarity index 86% rename from lib/fog/openstack/volume/models/backups.rb rename to lib/fog/volume/openstack/models/backups.rb index 3315bcd18..a7e29aeb2 100644 --- a/lib/fog/openstack/volume/models/backups.rb +++ b/lib/fog/volume/openstack/models/backups.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Backups def all(options = {}) load_response(service.list_backups_detailed(options), 'backups') @@ -17,7 +17,7 @@ def get(backup_id) if backup new(backup) end - rescue Fog::OpenStack::Volume::NotFound + rescue Fog::Volume::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/volume/models/snapshot.rb b/lib/fog/volume/openstack/models/snapshot.rb similarity index 96% rename from lib/fog/openstack/volume/models/snapshot.rb rename to lib/fog/volume/openstack/models/snapshot.rb index 83b4363e8..e4ee978f1 100644 --- a/lib/fog/openstack/volume/models/snapshot.rb +++ b/lib/fog/volume/openstack/models/snapshot.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class Snapshot < Fog::OpenStack::Model def update(data) requires :id diff --git a/lib/fog/openstack/volume/models/snapshots.rb b/lib/fog/volume/openstack/models/snapshots.rb similarity index 86% rename from lib/fog/openstack/volume/models/snapshots.rb rename to lib/fog/volume/openstack/models/snapshots.rb index 2537440e7..77d92a9e7 100644 --- a/lib/fog/openstack/volume/models/snapshots.rb +++ b/lib/fog/volume/openstack/models/snapshots.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Snapshots def all(options = {}) load_response(service.list_snapshots_detailed(options), 'snapshots') @@ -17,7 +17,7 @@ def get(snapshots_id) if snapshot new(snapshot) end - rescue Fog::OpenStack::Volume::NotFound + rescue Fog::Volume::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/volume/models/transfer.rb b/lib/fog/volume/openstack/models/transfer.rb similarity index 94% rename from lib/fog/openstack/volume/models/transfer.rb rename to lib/fog/volume/openstack/models/transfer.rb index fc711e972..773cdd15d 100644 --- a/lib/fog/openstack/volume/models/transfer.rb +++ b/lib/fog/volume/openstack/models/transfer.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class Transfer < Fog::OpenStack::Model def save requires :name, :volume_id diff --git a/lib/fog/openstack/volume/models/transfers.rb b/lib/fog/volume/openstack/models/transfers.rb similarity index 91% rename from lib/fog/openstack/volume/models/transfers.rb rename to lib/fog/volume/openstack/models/transfers.rb index 5118419eb..824c21cd7 100644 --- a/lib/fog/openstack/volume/models/transfers.rb +++ b/lib/fog/volume/openstack/models/transfers.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Transfers def all(options = {}) load_response(service.list_transfers_detailed(options), 'transfers') @@ -16,7 +16,7 @@ def get(transfer_id) if transfer = service.get_transfer_details(transfer_id).body['transfer'] new(transfer) end - rescue Fog::OpenStack::Volume::NotFound + rescue Fog::Volume::OpenStack::NotFound nil end diff --git a/lib/fog/openstack/volume/models/volume.rb b/lib/fog/volume/openstack/models/volume.rb similarity index 98% rename from lib/fog/openstack/volume/models/volume.rb rename to lib/fog/volume/openstack/models/volume.rb index 565e71c09..531862350 100644 --- a/lib/fog/openstack/volume/models/volume.rb +++ b/lib/fog/volume/openstack/models/volume.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class Volume < Fog::OpenStack::Model attribute :metadata attribute :status diff --git a/lib/fog/openstack/volume/models/volume_type.rb b/lib/fog/volume/openstack/models/volume_type.rb similarity index 94% rename from lib/fog/openstack/volume/models/volume_type.rb rename to lib/fog/volume/openstack/models/volume_type.rb index 6f23d4082..843188950 100644 --- a/lib/fog/openstack/volume/models/volume_type.rb +++ b/lib/fog/volume/openstack/models/volume_type.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class VolumeType < Fog::OpenStack::Model attribute :extra_specs diff --git a/lib/fog/openstack/volume/models/volume_types.rb b/lib/fog/volume/openstack/models/volume_types.rb similarity index 84% rename from lib/fog/openstack/volume/models/volume_types.rb rename to lib/fog/volume/openstack/models/volume_types.rb index 3e1cd9851..3e58e0a77 100644 --- a/lib/fog/openstack/volume/models/volume_types.rb +++ b/lib/fog/volume/openstack/models/volume_types.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Volume + module Volume + class OpenStack module VolumeTypes def all(options = {}) response = service.list_volume_types(options) @@ -13,7 +13,7 @@ def get(volume_type_id) if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type'] new(volume_type) end - rescue Fog::OpenStack::Volume::NotFound + rescue Fog::Volume::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/volume/models/volumes.rb b/lib/fog/volume/openstack/models/volumes.rb similarity index 93% rename from lib/fog/openstack/volume/models/volumes.rb rename to lib/fog/volume/openstack/models/volumes.rb index 7efa2ad6f..03fbc8be1 100644 --- a/lib/fog/openstack/volume/models/volumes.rb +++ b/lib/fog/volume/openstack/models/volumes.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Volumes def all(options = {}) # the parameter has been "detailed = true" before. Make sure we are @@ -26,7 +26,7 @@ def get(volume_id) if volume = service.get_volume_details(volume_id).body['volume'] new(volume) end - rescue Fog::OpenStack::Volume::NotFound + rescue Fog::Volume::OpenStack::NotFound nil end end diff --git a/lib/fog/openstack/volume/requests/accept_transfer.rb b/lib/fog/volume/openstack/requests/accept_transfer.rb similarity index 92% rename from lib/fog/openstack/volume/requests/accept_transfer.rb rename to lib/fog/volume/openstack/requests/accept_transfer.rb index aaceb873b..965ba4843 100644 --- a/lib/fog/openstack/volume/requests/accept_transfer.rb +++ b/lib/fog/volume/openstack/requests/accept_transfer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def accept_transfer(transfer_id, auth_key) data = { diff --git a/lib/fog/openstack/volume/requests/action.rb b/lib/fog/volume/openstack/requests/action.rb similarity index 89% rename from lib/fog/openstack/volume/requests/action.rb rename to lib/fog/volume/openstack/requests/action.rb index 1b9addcc7..d9a6116f2 100644 --- a/lib/fog/openstack/volume/requests/action.rb +++ b/lib/fog/volume/openstack/requests/action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def action(id, data) request( diff --git a/lib/fog/openstack/volume/requests/create_backup.rb b/lib/fog/volume/openstack/requests/create_backup.rb similarity index 96% rename from lib/fog/openstack/volume/requests/create_backup.rb rename to lib/fog/volume/openstack/requests/create_backup.rb index 8e5278191..eb68bc50a 100644 --- a/lib/fog/openstack/volume/requests/create_backup.rb +++ b/lib/fog/volume/openstack/requests/create_backup.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def create_backup(attributes) desired_options = [ diff --git a/lib/fog/openstack/volume/requests/create_snapshot.rb b/lib/fog/volume/openstack/requests/create_snapshot.rb similarity index 89% rename from lib/fog/openstack/volume/requests/create_snapshot.rb rename to lib/fog/volume/openstack/requests/create_snapshot.rb index 1d6c394a3..0af0b86f5 100644 --- a/lib/fog/openstack/volume/requests/create_snapshot.rb +++ b/lib/fog/volume/openstack/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real private diff --git a/lib/fog/openstack/volume/requests/create_transfer.rb b/lib/fog/volume/openstack/requests/create_transfer.rb similarity index 93% rename from lib/fog/openstack/volume/requests/create_transfer.rb rename to lib/fog/volume/openstack/requests/create_transfer.rb index 94e2e2857..a4453af12 100644 --- a/lib/fog/openstack/volume/requests/create_transfer.rb +++ b/lib/fog/volume/openstack/requests/create_transfer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def create_transfer(volume_id, options = {}) data = { diff --git a/lib/fog/openstack/volume/requests/create_volume.rb b/lib/fog/volume/openstack/requests/create_volume.rb similarity index 94% rename from lib/fog/openstack/volume/requests/create_volume.rb rename to lib/fog/volume/openstack/requests/create_volume.rb index c639dde0e..2b8cf3281 100644 --- a/lib/fog/openstack/volume/requests/create_volume.rb +++ b/lib/fog/volume/openstack/requests/create_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real private diff --git a/lib/fog/openstack/volume/requests/create_volume_type.rb b/lib/fog/volume/openstack/requests/create_volume_type.rb similarity index 96% rename from lib/fog/openstack/volume/requests/create_volume_type.rb rename to lib/fog/volume/openstack/requests/create_volume_type.rb index b0eca9574..24ce2f868 100644 --- a/lib/fog/openstack/volume/requests/create_volume_type.rb +++ b/lib/fog/volume/openstack/requests/create_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def create_volume_type(options = {}) data = { diff --git a/lib/fog/openstack/volume/requests/delete_backup.rb b/lib/fog/volume/openstack/requests/delete_backup.rb similarity index 92% rename from lib/fog/openstack/volume/requests/delete_backup.rb rename to lib/fog/volume/openstack/requests/delete_backup.rb index bf76b0ffa..52d07a675 100644 --- a/lib/fog/openstack/volume/requests/delete_backup.rb +++ b/lib/fog/volume/openstack/requests/delete_backup.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_backup(backup_id) request( diff --git a/lib/fog/openstack/volume/requests/delete_metadata.rb b/lib/fog/volume/openstack/requests/delete_metadata.rb similarity index 88% rename from lib/fog/openstack/volume/requests/delete_metadata.rb rename to lib/fog/volume/openstack/requests/delete_metadata.rb index e93ba9e92..972f116ec 100644 --- a/lib/fog/openstack/volume/requests/delete_metadata.rb +++ b/lib/fog/volume/openstack/requests/delete_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_metadata(volume_id, key_name) request( diff --git a/lib/fog/openstack/volume/requests/delete_snapshot.rb b/lib/fog/volume/openstack/requests/delete_snapshot.rb similarity index 92% rename from lib/fog/openstack/volume/requests/delete_snapshot.rb rename to lib/fog/volume/openstack/requests/delete_snapshot.rb index e03d3fefb..f252f9327 100644 --- a/lib/fog/openstack/volume/requests/delete_snapshot.rb +++ b/lib/fog/volume/openstack/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_snapshot(snapshot_id) request( diff --git a/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb similarity index 89% rename from lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb rename to lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb index 69bb6fda1..a4143134f 100644 --- a/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb +++ b/lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_snapshot_metadata(snapshot_id, key_name) request( diff --git a/lib/fog/openstack/volume/requests/delete_transfer.rb b/lib/fog/volume/openstack/requests/delete_transfer.rb similarity index 88% rename from lib/fog/openstack/volume/requests/delete_transfer.rb rename to lib/fog/volume/openstack/requests/delete_transfer.rb index 84ceedbbd..6f49251a8 100644 --- a/lib/fog/openstack/volume/requests/delete_transfer.rb +++ b/lib/fog/volume/openstack/requests/delete_transfer.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_transfer(transfer_id) request( diff --git a/lib/fog/openstack/volume/requests/delete_volume.rb b/lib/fog/volume/openstack/requests/delete_volume.rb similarity index 92% rename from lib/fog/openstack/volume/requests/delete_volume.rb rename to lib/fog/volume/openstack/requests/delete_volume.rb index fbc0748c3..7ebe8c137 100644 --- a/lib/fog/openstack/volume/requests/delete_volume.rb +++ b/lib/fog/volume/openstack/requests/delete_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_volume(volume_id) request( diff --git a/lib/fog/openstack/volume/requests/delete_volume_type.rb b/lib/fog/volume/openstack/requests/delete_volume_type.rb similarity index 92% rename from lib/fog/openstack/volume/requests/delete_volume_type.rb rename to lib/fog/volume/openstack/requests/delete_volume_type.rb index 2313d5559..57abf0fc7 100644 --- a/lib/fog/openstack/volume/requests/delete_volume_type.rb +++ b/lib/fog/volume/openstack/requests/delete_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def delete_volume_type(volume_type_id) request( diff --git a/lib/fog/openstack/volume/requests/extend_volume.rb b/lib/fog/volume/openstack/requests/extend_volume.rb similarity index 93% rename from lib/fog/openstack/volume/requests/extend_volume.rb rename to lib/fog/volume/openstack/requests/extend_volume.rb index 421cc40dd..24c089aa7 100644 --- a/lib/fog/openstack/volume/requests/extend_volume.rb +++ b/lib/fog/volume/openstack/requests/extend_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def extend_volume(volume_id, size) body = {'os-extend' => {'new_size' => size}} diff --git a/lib/fog/openstack/volume/requests/get_backup_details.rb b/lib/fog/volume/openstack/requests/get_backup_details.rb similarity index 95% rename from lib/fog/openstack/volume/requests/get_backup_details.rb rename to lib/fog/volume/openstack/requests/get_backup_details.rb index 1f5a346be..a001a09d7 100644 --- a/lib/fog/openstack/volume/requests/get_backup_details.rb +++ b/lib/fog/volume/openstack/requests/get_backup_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_backup_details(backup_id) request( diff --git a/lib/fog/openstack/volume/requests/get_quota.rb b/lib/fog/volume/openstack/requests/get_quota.rb similarity index 93% rename from lib/fog/openstack/volume/requests/get_quota.rb rename to lib/fog/volume/openstack/requests/get_quota.rb index 1e25662c8..6e2569b06 100644 --- a/lib/fog/openstack/volume/requests/get_quota.rb +++ b/lib/fog/volume/openstack/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_quota(tenant_id) request( diff --git a/lib/fog/openstack/volume/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/requests/get_quota_defaults.rb similarity index 93% rename from lib/fog/openstack/volume/requests/get_quota_defaults.rb rename to lib/fog/volume/openstack/requests/get_quota_defaults.rb index 101cfa266..ae2830e6c 100644 --- a/lib/fog/openstack/volume/requests/get_quota_defaults.rb +++ b/lib/fog/volume/openstack/requests/get_quota_defaults.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_quota_defaults(tenant_id) request( diff --git a/lib/fog/openstack/volume/requests/get_quota_usage.rb b/lib/fog/volume/openstack/requests/get_quota_usage.rb similarity index 96% rename from lib/fog/openstack/volume/requests/get_quota_usage.rb rename to lib/fog/volume/openstack/requests/get_quota_usage.rb index 18431fe33..42d8511a9 100644 --- a/lib/fog/openstack/volume/requests/get_quota_usage.rb +++ b/lib/fog/volume/openstack/requests/get_quota_usage.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_quota_usage(tenant_id) request( diff --git a/lib/fog/openstack/volume/requests/get_snapshot_details.rb b/lib/fog/volume/openstack/requests/get_snapshot_details.rb similarity index 87% rename from lib/fog/openstack/volume/requests/get_snapshot_details.rb rename to lib/fog/volume/openstack/requests/get_snapshot_details.rb index 46a198a90..47f3fbb31 100644 --- a/lib/fog/openstack/volume/requests/get_snapshot_details.rb +++ b/lib/fog/volume/openstack/requests/get_snapshot_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_snapshot_details(snapshot_id) request( diff --git a/lib/fog/openstack/volume/requests/get_transfer_details.rb b/lib/fog/volume/openstack/requests/get_transfer_details.rb similarity index 89% rename from lib/fog/openstack/volume/requests/get_transfer_details.rb rename to lib/fog/volume/openstack/requests/get_transfer_details.rb index 58ac36d37..35db96484 100644 --- a/lib/fog/openstack/volume/requests/get_transfer_details.rb +++ b/lib/fog/volume/openstack/requests/get_transfer_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/openstack/volume/requests/get_volume_details.rb b/lib/fog/volume/openstack/requests/get_volume_details.rb similarity index 87% rename from lib/fog/openstack/volume/requests/get_volume_details.rb rename to lib/fog/volume/openstack/requests/get_volume_details.rb index 7e9e85fdc..facb196cc 100644 --- a/lib/fog/openstack/volume/requests/get_volume_details.rb +++ b/lib/fog/volume/openstack/requests/get_volume_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_volume_details(volume_id) request( diff --git a/lib/fog/openstack/volume/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/requests/get_volume_type_details.rb similarity index 95% rename from lib/fog/openstack/volume/requests/get_volume_type_details.rb rename to lib/fog/volume/openstack/requests/get_volume_type_details.rb index 57cd39aa0..701796cf4 100644 --- a/lib/fog/openstack/volume/requests/get_volume_type_details.rb +++ b/lib/fog/volume/openstack/requests/get_volume_type_details.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def get_volume_type_details(volume_type_id) request( diff --git a/lib/fog/openstack/volume/requests/list_backups.rb b/lib/fog/volume/openstack/requests/list_backups.rb similarity index 88% rename from lib/fog/openstack/volume/requests/list_backups.rb rename to lib/fog/volume/openstack/requests/list_backups.rb index 74fcec90c..229ce1125 100644 --- a/lib/fog/openstack/volume/requests/list_backups.rb +++ b/lib/fog/volume/openstack/requests/list_backups.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_backups(options = {}) request( diff --git a/lib/fog/openstack/volume/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/requests/list_backups_detailed.rb similarity index 96% rename from lib/fog/openstack/volume/requests/list_backups_detailed.rb rename to lib/fog/volume/openstack/requests/list_backups_detailed.rb index b9f425523..9c9f66e0f 100644 --- a/lib/fog/openstack/volume/requests/list_backups_detailed.rb +++ b/lib/fog/volume/openstack/requests/list_backups_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_backups_detailed(options = {}) request( diff --git a/lib/fog/openstack/volume/requests/list_snapshots.rb b/lib/fog/volume/openstack/requests/list_snapshots.rb similarity index 97% rename from lib/fog/openstack/volume/requests/list_snapshots.rb rename to lib/fog/volume/openstack/requests/list_snapshots.rb index acc7242d5..d20eba97a 100644 --- a/lib/fog/openstack/volume/requests/list_snapshots.rb +++ b/lib/fog/volume/openstack/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_snapshots(options = true, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/requests/list_snapshots_detailed.rb similarity index 94% rename from lib/fog/openstack/volume/requests/list_snapshots_detailed.rb rename to lib/fog/volume/openstack/requests/list_snapshots_detailed.rb index 3879ecf97..ff04452ef 100644 --- a/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb +++ b/lib/fog/volume/openstack/requests/list_snapshots_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_snapshots_detailed(options = {}) request( diff --git a/lib/fog/openstack/volume/requests/list_transfers.rb b/lib/fog/volume/openstack/requests/list_transfers.rb similarity index 90% rename from lib/fog/openstack/volume/requests/list_transfers.rb rename to lib/fog/volume/openstack/requests/list_transfers.rb index 52868e450..45f37b83e 100644 --- a/lib/fog/openstack/volume/requests/list_transfers.rb +++ b/lib/fog/volume/openstack/requests/list_transfers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/openstack/volume/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/requests/list_transfers_detailed.rb similarity index 90% rename from lib/fog/openstack/volume/requests/list_transfers_detailed.rb rename to lib/fog/volume/openstack/requests/list_transfers_detailed.rb index 824e2c477..afb1d9972 100644 --- a/lib/fog/openstack/volume/requests/list_transfers_detailed.rb +++ b/lib/fog/volume/openstack/requests/list_transfers_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/openstack/volume/requests/list_volume_types.rb b/lib/fog/volume/openstack/requests/list_volume_types.rb similarity index 96% rename from lib/fog/openstack/volume/requests/list_volume_types.rb rename to lib/fog/volume/openstack/requests/list_volume_types.rb index ef76d8e1e..e9ab78da8 100644 --- a/lib/fog/openstack/volume/requests/list_volume_types.rb +++ b/lib/fog/volume/openstack/requests/list_volume_types.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_volume_types(options = {}) request( diff --git a/lib/fog/openstack/volume/requests/list_volumes.rb b/lib/fog/volume/openstack/requests/list_volumes.rb similarity index 96% rename from lib/fog/openstack/volume/requests/list_volumes.rb rename to lib/fog/volume/openstack/requests/list_volumes.rb index 5f5e776d0..707465a3e 100644 --- a/lib/fog/openstack/volume/requests/list_volumes.rb +++ b/lib/fog/volume/openstack/requests/list_volumes.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_volumes(options = true, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/openstack/volume/requests/list_volumes_detailed.rb b/lib/fog/volume/openstack/requests/list_volumes_detailed.rb similarity index 88% rename from lib/fog/openstack/volume/requests/list_volumes_detailed.rb rename to lib/fog/volume/openstack/requests/list_volumes_detailed.rb index a2dc53479..d70110349 100644 --- a/lib/fog/openstack/volume/requests/list_volumes_detailed.rb +++ b/lib/fog/volume/openstack/requests/list_volumes_detailed.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_volumes_detailed(options = {}) request( diff --git a/lib/fog/openstack/volume/requests/list_zones.rb b/lib/fog/volume/openstack/requests/list_zones.rb similarity index 94% rename from lib/fog/openstack/volume/requests/list_zones.rb rename to lib/fog/volume/openstack/requests/list_zones.rb index f2f606050..67303472d 100644 --- a/lib/fog/openstack/volume/requests/list_zones.rb +++ b/lib/fog/volume/openstack/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def list_zones(options = {}) request( diff --git a/lib/fog/openstack/volume/requests/replace_metadata.rb b/lib/fog/volume/openstack/requests/replace_metadata.rb similarity index 91% rename from lib/fog/openstack/volume/requests/replace_metadata.rb rename to lib/fog/volume/openstack/requests/replace_metadata.rb index c03c45cc5..a46b43eea 100644 --- a/lib/fog/openstack/volume/requests/replace_metadata.rb +++ b/lib/fog/volume/openstack/requests/replace_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def replace_metadata(volume_id, metadata = {}) data = { diff --git a/lib/fog/openstack/volume/requests/restore_backup.rb b/lib/fog/volume/openstack/requests/restore_backup.rb similarity index 91% rename from lib/fog/openstack/volume/requests/restore_backup.rb rename to lib/fog/volume/openstack/requests/restore_backup.rb index 2b5298cc0..d71bd6287 100644 --- a/lib/fog/openstack/volume/requests/restore_backup.rb +++ b/lib/fog/volume/openstack/requests/restore_backup.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def restore_backup(backup_id, volume_id = nil, name = nil) data = {'restore' => {'volume_id' => volume_id, 'name' => name}} diff --git a/lib/fog/openstack/volume/requests/set_tenant.rb b/lib/fog/volume/openstack/requests/set_tenant.rb similarity index 89% rename from lib/fog/openstack/volume/requests/set_tenant.rb rename to lib/fog/volume/openstack/requests/set_tenant.rb index 9853a01a2..6a04e8c45 100644 --- a/lib/fog/openstack/volume/requests/set_tenant.rb +++ b/lib/fog/volume/openstack/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/openstack/volume/requests/snapshot_action.rb b/lib/fog/volume/openstack/requests/snapshot_action.rb similarity index 89% rename from lib/fog/openstack/volume/requests/snapshot_action.rb rename to lib/fog/volume/openstack/requests/snapshot_action.rb index 6065298ba..b977cea89 100644 --- a/lib/fog/openstack/volume/requests/snapshot_action.rb +++ b/lib/fog/volume/openstack/requests/snapshot_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def snapshot_action(id, data) request( diff --git a/lib/fog/openstack/volume/requests/update_metadata.rb b/lib/fog/volume/openstack/requests/update_metadata.rb similarity index 91% rename from lib/fog/openstack/volume/requests/update_metadata.rb rename to lib/fog/volume/openstack/requests/update_metadata.rb index 18b480049..4b6d7c3a8 100644 --- a/lib/fog/openstack/volume/requests/update_metadata.rb +++ b/lib/fog/volume/openstack/requests/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def update_metadata(volume_id, metadata = {}) data = { diff --git a/lib/fog/openstack/volume/requests/update_quota.rb b/lib/fog/volume/openstack/requests/update_quota.rb similarity index 94% rename from lib/fog/openstack/volume/requests/update_quota.rb rename to lib/fog/volume/openstack/requests/update_quota.rb index 3fc2b86e3..01aa91918 100644 --- a/lib/fog/openstack/volume/requests/update_quota.rb +++ b/lib/fog/volume/openstack/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/openstack/volume/requests/update_snapshot.rb b/lib/fog/volume/openstack/requests/update_snapshot.rb similarity index 97% rename from lib/fog/openstack/volume/requests/update_snapshot.rb rename to lib/fog/volume/openstack/requests/update_snapshot.rb index 3c7703550..5ed42ef3f 100644 --- a/lib/fog/openstack/volume/requests/update_snapshot.rb +++ b/lib/fog/volume/openstack/requests/update_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def update_snapshot(snapshot_id, data = {}) request( diff --git a/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/requests/update_snapshot_metadata.rb similarity index 91% rename from lib/fog/openstack/volume/requests/update_snapshot_metadata.rb rename to lib/fog/volume/openstack/requests/update_snapshot_metadata.rb index 0ba7015f6..46497b145 100644 --- a/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb +++ b/lib/fog/volume/openstack/requests/update_snapshot_metadata.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def update_snapshot_metadata(snapshot_id, metadata = {}) data = { diff --git a/lib/fog/openstack/volume/requests/update_volume.rb b/lib/fog/volume/openstack/requests/update_volume.rb similarity index 94% rename from lib/fog/openstack/volume/requests/update_volume.rb rename to lib/fog/volume/openstack/requests/update_volume.rb index 224aaa30c..8ef96681c 100644 --- a/lib/fog/openstack/volume/requests/update_volume.rb +++ b/lib/fog/volume/openstack/requests/update_volume.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def update_volume(volume_id, data = {}) request( diff --git a/lib/fog/openstack/volume/requests/update_volume_type.rb b/lib/fog/volume/openstack/requests/update_volume_type.rb similarity index 96% rename from lib/fog/openstack/volume/requests/update_volume_type.rb rename to lib/fog/volume/openstack/requests/update_volume_type.rb index 5ba12c889..0420f1bde 100644 --- a/lib/fog/openstack/volume/requests/update_volume_type.rb +++ b/lib/fog/volume/openstack/requests/update_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack module Real def update_volume_type(volume_type_id, options = {}) data = { diff --git a/lib/fog/openstack/volume/v1.rb b/lib/fog/volume/openstack/v1.rb similarity index 94% rename from lib/fog/openstack/volume/v1.rb rename to lib/fog/volume/openstack/v1.rb index d3ed15e7a..03ed14513 100644 --- a/lib/fog/openstack/volume/v1.rb +++ b/lib/fog/volume/openstack/v1.rb @@ -1,17 +1,17 @@ require 'fog/openstack/core' -require 'fog/openstack/volume/volume' +require 'fog/volume/openstack' module Fog - module OpenStack - class Volume - class V1 < Fog::OpenStack::Volume + module Volume + class OpenStack + class V1 < Fog::Volume::OpenStack SUPPORTED_VERSIONS = /v1(\.(0-9))*/ requires :openstack_auth_url recognizes *@@recognizes - model_path 'fog/openstack/volume/v1/models' + model_path 'fog/volume/openstack/v1/models' model :volume collection :volumes @@ -31,7 +31,7 @@ class V1 < Fog::OpenStack::Volume model :backup collection :backups - request_path 'fog/openstack/volume/v1/requests' + request_path 'fog/volume/openstack/v1/requests' # Volume request :list_volumes @@ -149,7 +149,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Volume::NotFound + Fog::Volume::OpenStack::NotFound end def default_endtpoint_type diff --git a/lib/fog/volume/openstack/v1/models/availability_zone.rb b/lib/fog/volume/openstack/v1/models/availability_zone.rb new file mode 100644 index 000000000..35d6fdb2d --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/availability_zone.rb @@ -0,0 +1,15 @@ +require 'fog/volume/openstack/models/availability_zone' + +module Fog + module Volume + class OpenStack + class V1 + class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone + identity :zoneName + + attribute :zoneState + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/availability_zones.rb b/lib/fog/volume/openstack/v1/models/availability_zones.rb new file mode 100644 index 000000000..ab449952b --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/availability_zones.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v1/models/availability_zone' +require 'fog/volume/openstack/models/availability_zones' + +module Fog + module Volume + class OpenStack + class V1 + class AvailabilityZones < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V1::AvailabilityZone + include Fog::Volume::OpenStack::AvailabilityZones + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/backup.rb b/lib/fog/volume/openstack/v1/models/backup.rb similarity index 53% rename from lib/fog/openstack/volume/v1/models/backup.rb rename to lib/fog/volume/openstack/v1/models/backup.rb index 48e79cfe4..ff5a88382 100644 --- a/lib/fog/openstack/volume/v1/models/backup.rb +++ b/lib/fog/volume/openstack/v1/models/backup.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/backup' +require 'fog/volume/openstack/models/backup' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 - class Backup < Fog::OpenStack::Volume::Backup + class Backup < Fog::Volume::OpenStack::Backup identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/volume/openstack/v1/models/backups.rb b/lib/fog/volume/openstack/v1/models/backups.rb new file mode 100644 index 000000000..383fad71d --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/backups.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v1/models/backup' +require 'fog/volume/openstack/models/backups' + +module Fog + module Volume + class OpenStack + class V1 + class Backups < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V1::Backup + include Fog::Volume::OpenStack::Backups + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/snapshot.rb b/lib/fog/volume/openstack/v1/models/snapshot.rb similarity index 89% rename from lib/fog/openstack/volume/v1/models/snapshot.rb rename to lib/fog/volume/openstack/v1/models/snapshot.rb index 9dc1451fe..02f64f1de 100644 --- a/lib/fog/openstack/volume/v1/models/snapshot.rb +++ b/lib/fog/volume/openstack/v1/models/snapshot.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/snapshot' +require 'fog/volume/openstack/models/snapshot' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 - class Snapshot < Fog::OpenStack::Volume::Snapshot + class Snapshot < Fog::Volume::OpenStack::Snapshot identity :id attribute :display_name diff --git a/lib/fog/volume/openstack/v1/models/snapshots.rb b/lib/fog/volume/openstack/v1/models/snapshots.rb new file mode 100644 index 000000000..f12d1a85a --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/snapshots.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v1/models/snapshot' +require 'fog/volume/openstack/models/snapshots' + +module Fog + module Volume + class OpenStack + class V1 + class Snapshots < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V1::Snapshot + include Fog::Volume::OpenStack::Snapshots + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/transfer.rb b/lib/fog/volume/openstack/v1/models/transfer.rb similarity index 66% rename from lib/fog/openstack/volume/v1/models/transfer.rb rename to lib/fog/volume/openstack/v1/models/transfer.rb index 9ef55cd98..e9b68a6eb 100644 --- a/lib/fog/openstack/volume/v1/models/transfer.rb +++ b/lib/fog/volume/openstack/v1/models/transfer.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/transfer' +require 'fog/volume/openstack/models/transfer' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 - class Transfer < Fog::OpenStack::Volume::Transfer + class Transfer < Fog::Volume::OpenStack::Transfer identity :id attribute :auth_key, :aliases => 'authKey' diff --git a/lib/fog/volume/openstack/v1/models/transfers.rb b/lib/fog/volume/openstack/v1/models/transfers.rb new file mode 100644 index 000000000..c35a60914 --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/transfers.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v1/models/transfer' +require 'fog/volume/openstack/models/transfers' + +module Fog + module Volume + class OpenStack + class V1 + class Transfers < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V1::Transfer + include Fog::Volume::OpenStack::Transfers + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/volume.rb b/lib/fog/volume/openstack/v1/models/volume.rb similarity index 87% rename from lib/fog/openstack/volume/v1/models/volume.rb rename to lib/fog/volume/openstack/v1/models/volume.rb index 89aaa76e7..753f49d9d 100644 --- a/lib/fog/openstack/volume/v1/models/volume.rb +++ b/lib/fog/volume/openstack/v1/models/volume.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/volume' +require 'fog/volume/openstack/models/volume' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 - class Volume < Fog::OpenStack::Volume::Volume + class Volume < Fog::Volume::OpenStack::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/openstack/volume/v1/models/volume_type.rb b/lib/fog/volume/openstack/v1/models/volume_type.rb similarity index 51% rename from lib/fog/openstack/volume/v1/models/volume_type.rb rename to lib/fog/volume/openstack/v1/models/volume_type.rb index f30127c52..eb8c57c1a 100644 --- a/lib/fog/openstack/volume/v1/models/volume_type.rb +++ b/lib/fog/volume/openstack/v1/models/volume_type.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/volume_type' +require 'fog/volume/openstack/models/volume_type' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 - class VolumeType < Fog::OpenStack::Volume::VolumeType + class VolumeType < Fog::Volume::OpenStack::VolumeType identity :id attribute :name diff --git a/lib/fog/volume/openstack/v1/models/volume_types.rb b/lib/fog/volume/openstack/v1/models/volume_types.rb new file mode 100644 index 000000000..803e0c14c --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/volume_types.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v1/models/volume_type' +require 'fog/volume/openstack/models/volume_types' + +module Fog + module Volume + class OpenStack + class V1 + class VolumeTypes < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V1::VolumeType + include Fog::Volume::OpenStack::VolumeTypes + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/volumes.rb b/lib/fog/volume/openstack/v1/models/volumes.rb new file mode 100644 index 000000000..11dbb4b16 --- /dev/null +++ b/lib/fog/volume/openstack/v1/models/volumes.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v1/models/volume' +require 'fog/volume/openstack/models/volumes' + +module Fog + module Volume + class OpenStack + class V1 + class Volumes < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V1::Volume + include Fog::Volume::OpenStack::Volumes + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/requests/accept_transfer.rb b/lib/fog/volume/openstack/v1/requests/accept_transfer.rb new file mode 100644 index 000000000..22fb2e28b --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/accept_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/accept_transfer' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/action.rb b/lib/fog/volume/openstack/v1/requests/action.rb new file mode 100644 index 000000000..864515140 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/action.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/action' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_backup.rb b/lib/fog/volume/openstack/v1/requests/create_backup.rb new file mode 100644 index 000000000..87aee6107 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/create_backup.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/create_backup' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_snapshot.rb b/lib/fog/volume/openstack/v1/requests/create_snapshot.rb similarity index 89% rename from lib/fog/openstack/volume/v1/requests/create_snapshot.rb rename to lib/fog/volume/openstack/v1/requests/create_snapshot.rb index 7cfcfad93..35cdc9e4e 100644 --- a/lib/fog/openstack/volume/v1/requests/create_snapshot.rb +++ b/lib/fog/volume/openstack/v1/requests/create_snapshot.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/create_snapshot' +require 'fog/volume/openstack/requests/create_snapshot' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real def create_snapshot(volume_id, name, description, force = false) data = { diff --git a/lib/fog/volume/openstack/v1/requests/create_transfer.rb b/lib/fog/volume/openstack/v1/requests/create_transfer.rb new file mode 100644 index 000000000..589a96835 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/create_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/create_transfer' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_volume.rb b/lib/fog/volume/openstack/v1/requests/create_volume.rb similarity index 91% rename from lib/fog/openstack/volume/v1/requests/create_volume.rb rename to lib/fog/volume/openstack/v1/requests/create_volume.rb index 86c0d2ce1..5c3587379 100644 --- a/lib/fog/openstack/volume/v1/requests/create_volume.rb +++ b/lib/fog/volume/openstack/v1/requests/create_volume.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/volume/requests/create_volume' +require 'fog/volume/openstack/requests/create_volume' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real def create_volume(name, description, size, options = {}) @@ -17,7 +17,7 @@ def create_volume(name, description, size, options = {}) _create_volume(data, options) end - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v1/requests/create_volume_type.rb b/lib/fog/volume/openstack/v1/requests/create_volume_type.rb new file mode 100644 index 000000000..39fb7df50 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/create_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/create_volume_type' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_backup.rb b/lib/fog/volume/openstack/v1/requests/delete_backup.rb new file mode 100644 index 000000000..0c931e879 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_backup.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_backup' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_metadata.rb b/lib/fog/volume/openstack/v1/requests/delete_metadata.rb new file mode 100644 index 000000000..cd60fa7bb --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_metadata' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb b/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb new file mode 100644 index 000000000..735096720 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_snapshot' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb new file mode 100644 index 000000000..3399004e2 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_snapshot_metadata' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_transfer.rb b/lib/fog/volume/openstack/v1/requests/delete_transfer.rb new file mode 100644 index 000000000..d10c4f8d2 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_transfer' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_volume.rb b/lib/fog/volume/openstack/v1/requests/delete_volume.rb new file mode 100644 index 000000000..1b65c11b9 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_volume.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_volume' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb b/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb new file mode 100644 index 000000000..87b41422d --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_volume_type' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/extend_volume.rb b/lib/fog/volume/openstack/v1/requests/extend_volume.rb new file mode 100644 index 000000000..40b949a3d --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/extend_volume.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/extend_volume' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_backup_details.rb b/lib/fog/volume/openstack/v1/requests/get_backup_details.rb new file mode 100644 index 000000000..42018a151 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/get_backup_details.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_backup_details' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota.rb b/lib/fog/volume/openstack/v1/requests/get_quota.rb new file mode 100644 index 000000000..fb32eb165 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/get_quota.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_quota' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb new file mode 100644 index 000000000..a9b4f99b5 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_quota_defaults' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb b/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb new file mode 100644 index 000000000..dc6022759 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_quota_usage' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb b/lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb similarity index 83% rename from lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb rename to lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb index 6429db1cc..6980212e7 100644 --- a/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb +++ b/lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/get_snapshot_details' +require 'fog/volume/openstack/requests/get_snapshot_details' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb b/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb new file mode 100644 index 000000000..f5c6f0087 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_transfer_details' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/get_volume_details.rb b/lib/fog/volume/openstack/v1/requests/get_volume_details.rb similarity index 86% rename from lib/fog/openstack/volume/v1/requests/get_volume_details.rb rename to lib/fog/volume/openstack/v1/requests/get_volume_details.rb index cf43edf2c..78729f963 100644 --- a/lib/fog/openstack/volume/v1/requests/get_volume_details.rb +++ b/lib/fog/volume/openstack/v1/requests/get_volume_details.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/get_volume_details' +require 'fog/volume/openstack/requests/get_volume_details' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb new file mode 100644 index 000000000..7551a0536 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_volume_type_details' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_backups.rb b/lib/fog/volume/openstack/v1/requests/list_backups.rb new file mode 100644 index 000000000..7b8730232 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_backups.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_backups' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb new file mode 100644 index 000000000..b2af7b137 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_backups_detailed' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_snapshots.rb b/lib/fog/volume/openstack/v1/requests/list_snapshots.rb new file mode 100644 index 000000000..77a90414a --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_snapshots.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_snapshots' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb new file mode 100644 index 000000000..8538c572d --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_snapshots_detailed' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_transfers.rb b/lib/fog/volume/openstack/v1/requests/list_transfers.rb new file mode 100644 index 000000000..ad3207161 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_transfers.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_transfers' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb new file mode 100644 index 000000000..efa6efbe5 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_transfers_detailed' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_volume_types.rb b/lib/fog/volume/openstack/v1/requests/list_volume_types.rb new file mode 100644 index 000000000..293a84e0a --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_volume_types.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_volume_types' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_volumes.rb b/lib/fog/volume/openstack/v1/requests/list_volumes.rb similarity index 91% rename from lib/fog/openstack/volume/v1/requests/list_volumes.rb rename to lib/fog/volume/openstack/v1/requests/list_volumes.rb index 805cdd57d..26103e539 100644 --- a/lib/fog/openstack/volume/v1/requests/list_volumes.rb +++ b/lib/fog/volume/openstack/v1/requests/list_volumes.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/list_volumes' +require 'fog/volume/openstack/requests/list_volumes' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb similarity index 90% rename from lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb rename to lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb index 12c461552..d762e7c06 100644 --- a/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb +++ b/lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/list_volumes_detailed' +require 'fog/volume/openstack/requests/list_volumes_detailed' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v1/requests/list_zones.rb b/lib/fog/volume/openstack/v1/requests/list_zones.rb new file mode 100644 index 000000000..c1140f633 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/list_zones.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_zones' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/real.rb b/lib/fog/volume/openstack/v1/requests/real.rb similarity index 50% rename from lib/fog/openstack/volume/v1/requests/real.rb rename to lib/fog/volume/openstack/v1/requests/real.rb index c021f0318..2a37b535a 100644 --- a/lib/fog/openstack/volume/v1/requests/real.rb +++ b/lib/fog/volume/openstack/v1/requests/real.rb @@ -1,9 +1,9 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V1 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end end end diff --git a/lib/fog/volume/openstack/v1/requests/real_mock.rb b/lib/fog/volume/openstack/v1/requests/real_mock.rb new file mode 100644 index 000000000..e98f366ee --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/real_mock.rb @@ -0,0 +1,14 @@ +module Fog + module Volume + class OpenStack + class V1 + class Real + include Fog::Volume::OpenStack::Real + end + class Mock + include Fog::Volume::OpenStack::Mock + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/requests/replace_metadata.rb b/lib/fog/volume/openstack/v1/requests/replace_metadata.rb new file mode 100644 index 000000000..e9f99233d --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/replace_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/replace_metadata' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/restore_backup.rb b/lib/fog/volume/openstack/v1/requests/restore_backup.rb new file mode 100644 index 000000000..9bf58ae73 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/restore_backup.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/restore_backup' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/set_tenant.rb b/lib/fog/volume/openstack/v1/requests/set_tenant.rb new file mode 100644 index 000000000..542a550bb --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/set_tenant.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/set_tenant' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/update_metadata.rb b/lib/fog/volume/openstack/v1/requests/update_metadata.rb new file mode 100644 index 000000000..d1be8f383 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/update_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_metadata' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_quota.rb b/lib/fog/volume/openstack/v1/requests/update_quota.rb new file mode 100644 index 000000000..ea7bdc107 --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/update_quota.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_quota' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/update_snapshot.rb b/lib/fog/volume/openstack/v1/requests/update_snapshot.rb new file mode 100644 index 000000000..8465042cf --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/update_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_snapshot' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb new file mode 100644 index 000000000..8116b1dfa --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_snapshot_metadata' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_volume.rb b/lib/fog/volume/openstack/v1/requests/update_volume.rb new file mode 100644 index 000000000..161bf1c9e --- /dev/null +++ b/lib/fog/volume/openstack/v1/requests/update_volume.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_volume' +require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/openstack/volume/v2.rb b/lib/fog/volume/openstack/v2.rb similarity index 94% rename from lib/fog/openstack/volume/v2.rb rename to lib/fog/volume/openstack/v2.rb index 8aeed1483..64a1de788 100644 --- a/lib/fog/openstack/volume/v2.rb +++ b/lib/fog/volume/openstack/v2.rb @@ -1,17 +1,17 @@ require 'fog/openstack/core' -require 'fog/openstack/volume/volume' +require 'fog/volume/openstack' module Fog - module OpenStack - class Volume - class V2 < Fog::OpenStack::Volume + module Volume + class OpenStack + class V2 < Fog::Volume::OpenStack SUPPORTED_VERSIONS = /v2(\.(0-9))*/ requires :openstack_auth_url recognizes *@@recognizes - model_path 'fog/openstack/volume/v2/models' + model_path 'fog/volume/openstack/v2/models' model :volume collection :volumes @@ -31,7 +31,7 @@ class V2 < Fog::OpenStack::Volume model :backup collection :backups - request_path 'fog/openstack/volume/v2/requests' + request_path 'fog/volume/openstack/v2/requests' # Volume request :list_volumes @@ -151,7 +151,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::OpenStack::Volume::NotFound + Fog::Volume::OpenStack::NotFound end def default_endtpoint_type diff --git a/lib/fog/volume/openstack/v2/models/availability_zone.rb b/lib/fog/volume/openstack/v2/models/availability_zone.rb new file mode 100644 index 000000000..f7944c65d --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/availability_zone.rb @@ -0,0 +1,15 @@ +require 'fog/volume/openstack/models/availability_zone' + +module Fog + module Volume + class OpenStack + class V2 + class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone + identity :zoneName + + attribute :zoneState + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/availability_zones.rb b/lib/fog/volume/openstack/v2/models/availability_zones.rb new file mode 100644 index 000000000..c91554740 --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/availability_zones.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v2/models/availability_zone' +require 'fog/volume/openstack/models/availability_zones' + +module Fog + module Volume + class OpenStack + class V2 + class AvailabilityZones < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V2::AvailabilityZone + include Fog::Volume::OpenStack::AvailabilityZones + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/backup.rb b/lib/fog/volume/openstack/v2/models/backup.rb similarity index 53% rename from lib/fog/openstack/volume/v2/models/backup.rb rename to lib/fog/volume/openstack/v2/models/backup.rb index 5d9941cb3..a3f1fe943 100644 --- a/lib/fog/openstack/volume/v2/models/backup.rb +++ b/lib/fog/volume/openstack/v2/models/backup.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/backup' +require 'fog/volume/openstack/models/backup' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 - class Backup < Fog::OpenStack::Volume::Backup + class Backup < Fog::Volume::OpenStack::Backup identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/volume/openstack/v2/models/backups.rb b/lib/fog/volume/openstack/v2/models/backups.rb new file mode 100644 index 000000000..3c074ef16 --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/backups.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v2/models/backup' +require 'fog/volume/openstack/models/backups' + +module Fog + module Volume + class OpenStack + class V2 + class Backups < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V2::Backup + include Fog::Volume::OpenStack::Backups + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/snapshot.rb b/lib/fog/volume/openstack/v2/models/snapshot.rb similarity index 88% rename from lib/fog/openstack/volume/v2/models/snapshot.rb rename to lib/fog/volume/openstack/v2/models/snapshot.rb index 4a2a5bcd1..9ed9ff277 100644 --- a/lib/fog/openstack/volume/v2/models/snapshot.rb +++ b/lib/fog/volume/openstack/v2/models/snapshot.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/snapshot' +require 'fog/volume/openstack/models/snapshot' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 - class Snapshot < Fog::OpenStack::Volume::Snapshot + class Snapshot < Fog::Volume::OpenStack::Snapshot identity :id attribute :name diff --git a/lib/fog/volume/openstack/v2/models/snapshots.rb b/lib/fog/volume/openstack/v2/models/snapshots.rb new file mode 100644 index 000000000..f5eda7fa0 --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/snapshots.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v2/models/snapshot' +require 'fog/volume/openstack/models/snapshots' + +module Fog + module Volume + class OpenStack + class V2 + class Snapshots < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V2::Snapshot + include Fog::Volume::OpenStack::Snapshots + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/transfer.rb b/lib/fog/volume/openstack/v2/models/transfer.rb similarity index 66% rename from lib/fog/openstack/volume/v2/models/transfer.rb rename to lib/fog/volume/openstack/v2/models/transfer.rb index 2739831f5..ba2e5e51f 100644 --- a/lib/fog/openstack/volume/v2/models/transfer.rb +++ b/lib/fog/volume/openstack/v2/models/transfer.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/transfer' +require 'fog/volume/openstack/models/transfer' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 - class Transfer < Fog::OpenStack::Volume::Transfer + class Transfer < Fog::Volume::OpenStack::Transfer identity :id attribute :auth_key, :aliases => 'authKey' diff --git a/lib/fog/volume/openstack/v2/models/transfers.rb b/lib/fog/volume/openstack/v2/models/transfers.rb new file mode 100644 index 000000000..d12bb6ab7 --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/transfers.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v2/models/transfer' +require 'fog/volume/openstack/models/transfers' + +module Fog + module Volume + class OpenStack + class V2 + class Transfers < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V2::Transfer + include Fog::Volume::OpenStack::Transfers + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/volume.rb b/lib/fog/volume/openstack/v2/models/volume.rb similarity index 86% rename from lib/fog/openstack/volume/v2/models/volume.rb rename to lib/fog/volume/openstack/v2/models/volume.rb index d20c022dc..edc1464b9 100644 --- a/lib/fog/openstack/volume/v2/models/volume.rb +++ b/lib/fog/volume/openstack/v2/models/volume.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/volume' +require 'fog/volume/openstack/models/volume' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 - class Volume < Fog::OpenStack::Volume::Volume + class Volume < Fog::Volume::OpenStack::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/openstack/volume/v2/models/volume_type.rb b/lib/fog/volume/openstack/v2/models/volume_type.rb similarity index 51% rename from lib/fog/openstack/volume/v2/models/volume_type.rb rename to lib/fog/volume/openstack/v2/models/volume_type.rb index 13924bd76..9df096a7c 100644 --- a/lib/fog/openstack/volume/v2/models/volume_type.rb +++ b/lib/fog/volume/openstack/v2/models/volume_type.rb @@ -1,10 +1,10 @@ -require 'fog/openstack/volume/models/volume_type' +require 'fog/volume/openstack/models/volume_type' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 - class VolumeType < Fog::OpenStack::Volume::VolumeType + class VolumeType < Fog::Volume::OpenStack::VolumeType identity :id attribute :name diff --git a/lib/fog/volume/openstack/v2/models/volume_types.rb b/lib/fog/volume/openstack/v2/models/volume_types.rb new file mode 100644 index 000000000..c9ff191d5 --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/volume_types.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v2/models/volume_type' +require 'fog/volume/openstack/models/volume_types' + +module Fog + module Volume + class OpenStack + class V2 + class VolumeTypes < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V2::VolumeType + include Fog::Volume::OpenStack::VolumeTypes + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/volumes.rb b/lib/fog/volume/openstack/v2/models/volumes.rb new file mode 100644 index 000000000..6d732e1cd --- /dev/null +++ b/lib/fog/volume/openstack/v2/models/volumes.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/volume/openstack/v2/models/volume' +require 'fog/volume/openstack/models/volumes' + +module Fog + module Volume + class OpenStack + class V2 + class Volumes < Fog::OpenStack::Collection + model Fog::Volume::OpenStack::V2::Volume + include Fog::Volume::OpenStack::Volumes + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/requests/accept_transfer.rb b/lib/fog/volume/openstack/v2/requests/accept_transfer.rb new file mode 100644 index 000000000..90eeb4064 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/accept_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/accept_transfer' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/action.rb b/lib/fog/volume/openstack/v2/requests/action.rb new file mode 100644 index 000000000..22ea9c995 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/action.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/action' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_backup.rb b/lib/fog/volume/openstack/v2/requests/create_backup.rb new file mode 100644 index 000000000..85e520897 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/create_backup.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/create_backup' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_snapshot.rb b/lib/fog/volume/openstack/v2/requests/create_snapshot.rb similarity index 88% rename from lib/fog/openstack/volume/v2/requests/create_snapshot.rb rename to lib/fog/volume/openstack/v2/requests/create_snapshot.rb index 95fbd0efc..520990376 100644 --- a/lib/fog/openstack/volume/v2/requests/create_snapshot.rb +++ b/lib/fog/volume/openstack/v2/requests/create_snapshot.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/create_snapshot' +require 'fog/volume/openstack/requests/create_snapshot' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real def create_snapshot(volume_id, name, description, force = false) data = { diff --git a/lib/fog/volume/openstack/v2/requests/create_transfer.rb b/lib/fog/volume/openstack/v2/requests/create_transfer.rb new file mode 100644 index 000000000..421b04770 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/create_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/create_transfer' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_volume.rb b/lib/fog/volume/openstack/v2/requests/create_volume.rb similarity index 90% rename from lib/fog/openstack/volume/v2/requests/create_volume.rb rename to lib/fog/volume/openstack/v2/requests/create_volume.rb index ca5361214..0c0659558 100644 --- a/lib/fog/openstack/volume/v2/requests/create_volume.rb +++ b/lib/fog/volume/openstack/v2/requests/create_volume.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/volume/requests/create_volume' +require 'fog/volume/openstack/requests/create_volume' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real def create_volume(name, description, size, options = {}) @@ -17,7 +17,7 @@ def create_volume(name, description, size, options = {}) _create_volume(data, options) end - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v2/requests/create_volume_type.rb b/lib/fog/volume/openstack/v2/requests/create_volume_type.rb new file mode 100644 index 000000000..b0fed84ec --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/create_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/create_volume_type' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_backup.rb b/lib/fog/volume/openstack/v2/requests/delete_backup.rb new file mode 100644 index 000000000..c00284714 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_backup.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_backup' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_metadata.rb b/lib/fog/volume/openstack/v2/requests/delete_metadata.rb new file mode 100644 index 000000000..a8695156f --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_metadata' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb b/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb new file mode 100644 index 000000000..2b1ec6b66 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_snapshot' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb new file mode 100644 index 000000000..80580e28b --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_snapshot_metadata' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_transfer.rb b/lib/fog/volume/openstack/v2/requests/delete_transfer.rb new file mode 100644 index 000000000..b3f443cef --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_transfer' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_volume.rb b/lib/fog/volume/openstack/v2/requests/delete_volume.rb new file mode 100644 index 000000000..237600d3d --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_volume.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_volume' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb b/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb new file mode 100644 index 000000000..1cc6024ea --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/delete_volume_type' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/extend_volume.rb b/lib/fog/volume/openstack/v2/requests/extend_volume.rb new file mode 100644 index 000000000..78b79fdc2 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/extend_volume.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/extend_volume' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_backup_details.rb b/lib/fog/volume/openstack/v2/requests/get_backup_details.rb new file mode 100644 index 000000000..8cb7d5516 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/get_backup_details.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_backup_details' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota.rb b/lib/fog/volume/openstack/v2/requests/get_quota.rb new file mode 100644 index 000000000..0dcacd264 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/get_quota.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_quota' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb new file mode 100644 index 000000000..546ebad52 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_quota_defaults' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb b/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb new file mode 100644 index 000000000..b8aaa7936 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_quota_usage' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb b/lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb similarity index 82% rename from lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb rename to lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb index 8594d9ddb..c7c25303a 100644 --- a/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb +++ b/lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/get_snapshot_details' +require 'fog/volume/openstack/requests/get_snapshot_details' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb b/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb new file mode 100644 index 000000000..be4f9f0e2 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_transfer_details' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/get_volume_details.rb b/lib/fog/volume/openstack/v2/requests/get_volume_details.rb similarity index 86% rename from lib/fog/openstack/volume/v2/requests/get_volume_details.rb rename to lib/fog/volume/openstack/v2/requests/get_volume_details.rb index b87a61760..f8ca41d7b 100644 --- a/lib/fog/openstack/volume/v2/requests/get_volume_details.rb +++ b/lib/fog/volume/openstack/v2/requests/get_volume_details.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/get_volume_details' +require 'fog/volume/openstack/requests/get_volume_details' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb new file mode 100644 index 000000000..53f5ac17b --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/get_volume_type_details' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_backups.rb b/lib/fog/volume/openstack/v2/requests/list_backups.rb new file mode 100644 index 000000000..a6fec7b77 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_backups.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_backups' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb new file mode 100644 index 000000000..37bbea076 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_backups_detailed' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_snapshots.rb b/lib/fog/volume/openstack/v2/requests/list_snapshots.rb new file mode 100644 index 000000000..d089a8cb6 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_snapshots.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_snapshots' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb new file mode 100644 index 000000000..22c43a746 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_snapshots_detailed' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_transfers.rb b/lib/fog/volume/openstack/v2/requests/list_transfers.rb new file mode 100644 index 000000000..1b76af131 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_transfers.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_transfers' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb new file mode 100644 index 000000000..0ee3cbae8 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_transfers_detailed' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_volume_types.rb b/lib/fog/volume/openstack/v2/requests/list_volume_types.rb new file mode 100644 index 000000000..ebb0daee8 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_volume_types.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_volume_types' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_volumes.rb b/lib/fog/volume/openstack/v2/requests/list_volumes.rb similarity index 91% rename from lib/fog/openstack/volume/v2/requests/list_volumes.rb rename to lib/fog/volume/openstack/v2/requests/list_volumes.rb index c3e1b9363..4cbb9b28b 100644 --- a/lib/fog/openstack/volume/v2/requests/list_volumes.rb +++ b/lib/fog/volume/openstack/v2/requests/list_volumes.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/list_volumes' +require 'fog/volume/openstack/requests/list_volumes' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb similarity index 90% rename from lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb rename to lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb index 55565c2b7..a4c1b76b6 100644 --- a/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb +++ b/lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb @@ -1,11 +1,11 @@ -require 'fog/openstack/volume/requests/list_volumes_detailed' +require 'fog/volume/openstack/requests/list_volumes_detailed' module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end class Mock diff --git a/lib/fog/volume/openstack/v2/requests/list_zones.rb b/lib/fog/volume/openstack/v2/requests/list_zones.rb new file mode 100644 index 000000000..c45a1040d --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/list_zones.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/list_zones' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/real.rb b/lib/fog/volume/openstack/v2/requests/real.rb similarity index 50% rename from lib/fog/openstack/volume/v2/requests/real.rb rename to lib/fog/volume/openstack/v2/requests/real.rb index 016ac048b..174b38887 100644 --- a/lib/fog/openstack/volume/v2/requests/real.rb +++ b/lib/fog/volume/openstack/v2/requests/real.rb @@ -1,9 +1,9 @@ module Fog - module OpenStack - class Volume + module Volume + class OpenStack class V2 class Real - include Fog::OpenStack::Volume::Real + include Fog::Volume::OpenStack::Real end end end diff --git a/lib/fog/volume/openstack/v2/requests/real_mock.rb b/lib/fog/volume/openstack/v2/requests/real_mock.rb new file mode 100644 index 000000000..3a0a6e53b --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/real_mock.rb @@ -0,0 +1,14 @@ +module Fog + module Volume + class OpenStack + class V2 + class Real + include Fog::Volume::OpenStack::Real + end + class Mock + include Fog::Volume::OpenStack::Mock + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/requests/replace_metadata.rb b/lib/fog/volume/openstack/v2/requests/replace_metadata.rb new file mode 100644 index 000000000..7ea4e7678 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/replace_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/replace_metadata' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/restore_backup.rb b/lib/fog/volume/openstack/v2/requests/restore_backup.rb new file mode 100644 index 000000000..6268f26c1 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/restore_backup.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/restore_backup' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/set_tenant.rb b/lib/fog/volume/openstack/v2/requests/set_tenant.rb new file mode 100644 index 000000000..c1d386370 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/set_tenant.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/set_tenant' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/snapshot_action.rb b/lib/fog/volume/openstack/v2/requests/snapshot_action.rb new file mode 100644 index 000000000..12940e411 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/snapshot_action.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/snapshot_action' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_metadata.rb b/lib/fog/volume/openstack/v2/requests/update_metadata.rb new file mode 100644 index 000000000..ab49b90d5 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/update_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_metadata' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_quota.rb b/lib/fog/volume/openstack/v2/requests/update_quota.rb new file mode 100644 index 000000000..ea7bdc107 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/update_quota.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_quota' +require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/update_snapshot.rb b/lib/fog/volume/openstack/v2/requests/update_snapshot.rb new file mode 100644 index 000000000..fcece5db5 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/update_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_snapshot' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb new file mode 100644 index 000000000..87f5f9f7a --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_snapshot_metadata' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_volume.rb b/lib/fog/volume/openstack/v2/requests/update_volume.rb new file mode 100644 index 000000000..52f5d0902 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/update_volume.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_volume' +require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_volume_type.rb b/lib/fog/volume/openstack/v2/requests/update_volume_type.rb new file mode 100644 index 000000000..8006cf220 --- /dev/null +++ b/lib/fog/volume/openstack/v2/requests/update_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/volume/openstack/requests/update_volume_type' +require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/openstack/workflow/workflow.rb b/lib/fog/workflow/openstack.rb similarity index 50% rename from lib/fog/openstack/workflow/workflow.rb rename to lib/fog/workflow/openstack.rb index 23ba033cd..63b241672 100644 --- a/lib/fog/openstack/workflow/workflow.rb +++ b/lib/fog/workflow/openstack.rb @@ -1,13 +1,11 @@ module Fog - module OpenStack - class Workflow < Fog::Service - autoload :V2, 'fog/openstack/workflow/v2' - - # Fog::OpenStack::Workflow.new() will return a Fog::OpenStack::Workflow::V2 + module Workflow + class OpenStack < Fog::Service + # Fog::Workflow::OpenStack.new() will return a Fog::Workflow::OpenStack::V2 # Will choose the latest available once Mistral V3 is released. def self.new(args = {}) @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - Fog::OpenStack::Workflow::V2.new(args) + Fog::Workflow::OpenStack::V2.new(args) end end end diff --git a/lib/fog/openstack/workflow/v2.rb b/lib/fog/workflow/openstack/v2.rb similarity index 94% rename from lib/fog/openstack/workflow/v2.rb rename to lib/fog/workflow/openstack/v2.rb index b2896cd4b..fbd829b87 100644 --- a/lib/fog/openstack/workflow/v2.rb +++ b/lib/fog/workflow/openstack/v2.rb @@ -1,8 +1,8 @@ -require 'fog/openstack/workflow/workflow' +require 'fog/workflow/openstack' module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -12,7 +12,7 @@ class V2 < Fog::Service ## REQUESTS # - request_path 'fog/openstack/workflow/v2/requests' + request_path 'fog/workflow/openstack/v2/requests' # Workflow requests request :create_execution @@ -126,7 +126,7 @@ def request(params) rescue Excon::Errors::HTTPStatusError => error raise case error when Excon::Errors::NotFound - Fog::OpenStack::Workflow::NotFound.slurp(error) + Fog::Workflow::OpenStack::NotFound.slurp(error) else error end diff --git a/lib/fog/openstack/workflow/v2/requests/create_action.rb b/lib/fog/workflow/openstack/v2/requests/create_action.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/create_action.rb rename to lib/fog/workflow/openstack/v2/requests/create_action.rb index 4ee532b19..c122c544e 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_action.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_action(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb b/lib/fog/workflow/openstack/v2/requests/create_action_execution.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/create_action_execution.rb rename to lib/fog/workflow/openstack/v2/requests/create_action_execution.rb index baf281247..b8f650740 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_action_execution(action, input = {}, params = {}) diff --git a/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb b/lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb similarity index 97% rename from lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb rename to lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb index ad2032176..28f147197 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_cron_trigger(name, diff --git a/lib/fog/openstack/workflow/v2/requests/create_environment.rb b/lib/fog/workflow/openstack/v2/requests/create_environment.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/create_environment.rb rename to lib/fog/workflow/openstack/v2/requests/create_environment.rb index ec6b372d3..6a62874b8 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_environment.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_environment.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_environment(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/create_execution.rb b/lib/fog/workflow/openstack/v2/requests/create_execution.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/create_execution.rb rename to lib/fog/workflow/openstack/v2/requests/create_execution.rb index 56ac002c8..3fa4fb7c3 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_execution(workflow, input = {}) diff --git a/lib/fog/openstack/workflow/v2/requests/create_workbook.rb b/lib/fog/workflow/openstack/v2/requests/create_workbook.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/create_workbook.rb rename to lib/fog/workflow/openstack/v2/requests/create_workbook.rb index 52a44346f..ec6fc7169 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_workbook.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_workbook.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_workbook(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/create_workflow.rb b/lib/fog/workflow/openstack/v2/requests/create_workflow.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/create_workflow.rb rename to lib/fog/workflow/openstack/v2/requests/create_workflow.rb index 483ae8de1..2717e7990 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_workflow.rb +++ b/lib/fog/workflow/openstack/v2/requests/create_workflow.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def create_workflow(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_action.rb b/lib/fog/workflow/openstack/v2/requests/delete_action.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_action.rb rename to lib/fog/workflow/openstack/v2/requests/delete_action.rb index 4c4918980..9ca4b7938 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_action.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_action(name) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb b/lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb rename to lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb index c4e6e41c4..7ed4176b6 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_action_execution(id) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb b/lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb rename to lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb index 9cf48bc51..4f7a95051 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_cron_trigger(name) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_environment.rb b/lib/fog/workflow/openstack/v2/requests/delete_environment.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_environment.rb rename to lib/fog/workflow/openstack/v2/requests/delete_environment.rb index 21308810f..f7f493fba 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_environment.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_environment.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_environment(name) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_execution.rb b/lib/fog/workflow/openstack/v2/requests/delete_execution.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_execution.rb rename to lib/fog/workflow/openstack/v2/requests/delete_execution.rb index b43dc71b1..3ef3db279 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_execution(id) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb b/lib/fog/workflow/openstack/v2/requests/delete_workbook.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_workbook.rb rename to lib/fog/workflow/openstack/v2/requests/delete_workbook.rb index 649caea29..29d66e80e 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_workbook.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_workbook(name) diff --git a/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb b/lib/fog/workflow/openstack/v2/requests/delete_workflow.rb similarity index 92% rename from lib/fog/openstack/workflow/v2/requests/delete_workflow.rb rename to lib/fog/workflow/openstack/v2/requests/delete_workflow.rb index a2d7a3da8..8553b953b 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb +++ b/lib/fog/workflow/openstack/v2/requests/delete_workflow.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def delete_workflow(identifier) diff --git a/lib/fog/openstack/workflow/v2/requests/get_action.rb b/lib/fog/workflow/openstack/v2/requests/get_action.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/get_action.rb rename to lib/fog/workflow/openstack/v2/requests/get_action.rb index c937c48f7..468cb6fb7 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_action.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_action(name) diff --git a/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb b/lib/fog/workflow/openstack/v2/requests/get_action_execution.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/get_action_execution.rb rename to lib/fog/workflow/openstack/v2/requests/get_action_execution.rb index 6478d96b4..e19b118f3 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_action_execution(execution_id) diff --git a/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb b/lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb rename to lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb index 924362d6d..ccb3f236f 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_cron_trigger(name) diff --git a/lib/fog/openstack/workflow/v2/requests/get_environment.rb b/lib/fog/workflow/openstack/v2/requests/get_environment.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/get_environment.rb rename to lib/fog/workflow/openstack/v2/requests/get_environment.rb index 5bdad97db..977bc684d 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_environment.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_environment.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_environment(name) diff --git a/lib/fog/openstack/workflow/v2/requests/get_execution.rb b/lib/fog/workflow/openstack/v2/requests/get_execution.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/get_execution.rb rename to lib/fog/workflow/openstack/v2/requests/get_execution.rb index 9c499161f..88edc2c98 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_execution(execution_id) diff --git a/lib/fog/openstack/workflow/v2/requests/get_task.rb b/lib/fog/workflow/openstack/v2/requests/get_task.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/get_task.rb rename to lib/fog/workflow/openstack/v2/requests/get_task.rb index 09c1e4250..203530e8b 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_task.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_task.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_task(id) diff --git a/lib/fog/openstack/workflow/v2/requests/get_workbook.rb b/lib/fog/workflow/openstack/v2/requests/get_workbook.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/get_workbook.rb rename to lib/fog/workflow/openstack/v2/requests/get_workbook.rb index 33597a310..2c9cb6bdc 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_workbook.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_workbook.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_workbook(name) diff --git a/lib/fog/openstack/workflow/v2/requests/get_workflow.rb b/lib/fog/workflow/openstack/v2/requests/get_workflow.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/get_workflow.rb rename to lib/fog/workflow/openstack/v2/requests/get_workflow.rb index 27ca108a6..efe0b24a7 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_workflow.rb +++ b/lib/fog/workflow/openstack/v2/requests/get_workflow.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def get_workflow(identifier) diff --git a/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb b/lib/fog/workflow/openstack/v2/requests/list_action_executions.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_action_executions.rb rename to lib/fog/workflow/openstack/v2/requests/list_action_executions.rb index 16b08c121..c3a6b6a22 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_action_executions.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_action_executions diff --git a/lib/fog/openstack/workflow/v2/requests/list_actions.rb b/lib/fog/workflow/openstack/v2/requests/list_actions.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/list_actions.rb rename to lib/fog/workflow/openstack/v2/requests/list_actions.rb index 58dd4b73c..cf734cf4f 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_actions.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_actions.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_actions(params = {}) diff --git a/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb b/lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb rename to lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb index 6fce0012b..5422ec500 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_cron_triggers diff --git a/lib/fog/openstack/workflow/v2/requests/list_environments.rb b/lib/fog/workflow/openstack/v2/requests/list_environments.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_environments.rb rename to lib/fog/workflow/openstack/v2/requests/list_environments.rb index cefb642dd..5375dda8e 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_environments.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_environments.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_environments diff --git a/lib/fog/openstack/workflow/v2/requests/list_executions.rb b/lib/fog/workflow/openstack/v2/requests/list_executions.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_executions.rb rename to lib/fog/workflow/openstack/v2/requests/list_executions.rb index 8fe847e06..e95cc9210 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_executions.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_executions.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_executions diff --git a/lib/fog/openstack/workflow/v2/requests/list_services.rb b/lib/fog/workflow/openstack/v2/requests/list_services.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_services.rb rename to lib/fog/workflow/openstack/v2/requests/list_services.rb index bbed40bff..9b014921a 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_services.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_services diff --git a/lib/fog/openstack/workflow/v2/requests/list_tasks.rb b/lib/fog/workflow/openstack/v2/requests/list_tasks.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_tasks.rb rename to lib/fog/workflow/openstack/v2/requests/list_tasks.rb index 1bba660a6..c0fdae7f4 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_tasks.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_tasks.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_tasks(workflow_execution_id) diff --git a/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb b/lib/fog/workflow/openstack/v2/requests/list_workbooks.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/list_workbooks.rb rename to lib/fog/workflow/openstack/v2/requests/list_workbooks.rb index 0173cb87b..d429852a0 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_workbooks.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_workbooks diff --git a/lib/fog/openstack/workflow/v2/requests/list_workflows.rb b/lib/fog/workflow/openstack/v2/requests/list_workflows.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/list_workflows.rb rename to lib/fog/workflow/openstack/v2/requests/list_workflows.rb index 7fed8b8bb..397518c58 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_workflows.rb +++ b/lib/fog/workflow/openstack/v2/requests/list_workflows.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def list_workflows(params = {}) diff --git a/lib/fog/openstack/workflow/v2/requests/rerun_task.rb b/lib/fog/workflow/openstack/v2/requests/rerun_task.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/rerun_task.rb rename to lib/fog/workflow/openstack/v2/requests/rerun_task.rb index b999a925d..a45be6ece 100644 --- a/lib/fog/openstack/workflow/v2/requests/rerun_task.rb +++ b/lib/fog/workflow/openstack/v2/requests/rerun_task.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def rerun_task(task_ex_id) diff --git a/lib/fog/openstack/workflow/v2/requests/update_action.rb b/lib/fog/workflow/openstack/v2/requests/update_action.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/update_action.rb rename to lib/fog/workflow/openstack/v2/requests/update_action.rb index 4dfb8c003..6b338dfc6 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_action.rb +++ b/lib/fog/workflow/openstack/v2/requests/update_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def update_action(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb b/lib/fog/workflow/openstack/v2/requests/update_action_execution.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/update_action_execution.rb rename to lib/fog/workflow/openstack/v2/requests/update_action_execution.rb index f8620b015..fc12c0c71 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/update_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def update_action_execution(id, name, value) diff --git a/lib/fog/openstack/workflow/v2/requests/update_environment.rb b/lib/fog/workflow/openstack/v2/requests/update_environment.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/update_environment.rb rename to lib/fog/workflow/openstack/v2/requests/update_environment.rb index e428b1332..a127ef6e7 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_environment.rb +++ b/lib/fog/workflow/openstack/v2/requests/update_environment.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def update_environment(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/update_execution.rb b/lib/fog/workflow/openstack/v2/requests/update_execution.rb similarity index 95% rename from lib/fog/openstack/workflow/v2/requests/update_execution.rb rename to lib/fog/workflow/openstack/v2/requests/update_execution.rb index 121b9cc10..ee6635a33 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_execution.rb +++ b/lib/fog/workflow/openstack/v2/requests/update_execution.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def update_execution(id, name, value) diff --git a/lib/fog/openstack/workflow/v2/requests/update_workbook.rb b/lib/fog/workflow/openstack/v2/requests/update_workbook.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/update_workbook.rb rename to lib/fog/workflow/openstack/v2/requests/update_workbook.rb index 46f2abec2..2df428739 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_workbook.rb +++ b/lib/fog/workflow/openstack/v2/requests/update_workbook.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def update_workbook(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/update_workflow.rb b/lib/fog/workflow/openstack/v2/requests/update_workflow.rb similarity index 93% rename from lib/fog/openstack/workflow/v2/requests/update_workflow.rb rename to lib/fog/workflow/openstack/v2/requests/update_workflow.rb index 311fe9f22..f9f916d8b 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_workflow.rb +++ b/lib/fog/workflow/openstack/v2/requests/update_workflow.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def update_workflow(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/validate_action.rb b/lib/fog/workflow/openstack/v2/requests/validate_action.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/validate_action.rb rename to lib/fog/workflow/openstack/v2/requests/validate_action.rb index 81c62717c..bbf77bb04 100644 --- a/lib/fog/openstack/workflow/v2/requests/validate_action.rb +++ b/lib/fog/workflow/openstack/v2/requests/validate_action.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def validate_action(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb b/lib/fog/workflow/openstack/v2/requests/validate_workbook.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/validate_workbook.rb rename to lib/fog/workflow/openstack/v2/requests/validate_workbook.rb index 195997b5b..0f919612c 100644 --- a/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb +++ b/lib/fog/workflow/openstack/v2/requests/validate_workbook.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def validate_workbook(definition) diff --git a/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb b/lib/fog/workflow/openstack/v2/requests/validate_workflow.rb similarity index 94% rename from lib/fog/openstack/workflow/v2/requests/validate_workflow.rb rename to lib/fog/workflow/openstack/v2/requests/validate_workflow.rb index a4bbd3f43..c190439ba 100644 --- a/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb +++ b/lib/fog/workflow/openstack/v2/requests/validate_workflow.rb @@ -1,6 +1,6 @@ module Fog - module OpenStack - class Workflow + module Workflow + class OpenStack class V2 class Real def validate_workflow(definition) diff --git a/spec/dns_v2_spec.rb b/spec/dns_v2_spec.rb index a7cf05297..2fc9a5645 100644 --- a/spec/dns_v2_spec.rb +++ b/spec/dns_v2_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::OpenStack::DNS::V2 do +describe Fog::DNS::OpenStack::V2 do spec_data_folder = 'spec/fixtures/openstack/dns_v2' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::OpenStack::DNS # Fog to choose latest available version + :service_class => Fog::DNS::OpenStack # Fog to choose latest available version ) @service = openstack_vcr.service end diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index 899a587d4..6faf12dc5 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::OpenStack::Identity::V3 do +describe Fog::Identity::OpenStack::V3 do before :all do @openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/identity_v3', - :service_class => Fog::OpenStack::Identity::V3 + :service_class => Fog::Identity::OpenStack::V3 ) @service = @openstack_vcr.service @os_auth_url = @openstack_vcr.os_auth_url @@ -13,7 +13,7 @@ it 'authenticates with password, userid and domain_id' do VCR.use_cassette('authv3_a') do - Fog::OpenStack::Identity::V3.new( + Fog::Identity::OpenStack::V3.new( :openstack_domain_id => @openstack_vcr.domain_id, :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, @@ -25,7 +25,7 @@ it 'authenticates with password, username and domain_id' do VCR.use_cassette('authv3_b') do - Fog::OpenStack::Identity::V3.new( + Fog::Identity::OpenStack::V3.new( :openstack_domain_id => @openstack_vcr.domain_id, :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, @@ -37,7 +37,7 @@ it 'authenticates with password, username and domain_name' do VCR.use_cassette('authv3_c') do - Fog::OpenStack::Identity::V3.new( + Fog::Identity::OpenStack::V3.new( :openstack_user_domain => @openstack_vcr.domain_name, :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, @@ -55,7 +55,7 @@ unless endpoints_in_region.empty? VCR.use_cassette('idv3_other_region') do - @fog = Fog::OpenStack::Identity::V3.new( + @fog = Fog::Identity::OpenStack::V3.new( :openstack_region => @openstack_vcr.region_other, :openstack_auth_url => @os_auth_url, :openstack_userid => @openstack_vcr.user_id, @@ -68,7 +68,7 @@ it 'get an unscoped token, then reauthenticate with it' do VCR.use_cassette('authv3_unscoped_reauth') do - id_v3 = Fog::OpenStack::Identity::V3.new( + id_v3 = Fog::Identity::OpenStack::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, @@ -81,7 +81,7 @@ :openstack_auth_url => @os_auth_url, :openstack_region => @openstack_vcr.region } - @fog2 = Fog::OpenStack::Identity::V3.new(auth_params) + @fog2 = Fog::Identity::OpenStack::V3.new(auth_params) @fog2.wont_equal nil token = @fog2.credentials[:openstack_auth_token] @@ -91,7 +91,7 @@ it 'authenticates with project scope' do VCR.use_cassette('authv3_project') do - Fog::OpenStack::Identity::V3.new( + Fog::Identity::OpenStack::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, :openstack_api_key => @openstack_vcr.password, @@ -104,7 +104,7 @@ it 'get an unscoped token, then use it to get a scoped token' do VCR.use_cassette('authv3_unscoped') do - id_v3 = Fog::OpenStack::Identity::V3.new( + id_v3 = Fog::Identity::OpenStack::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, @@ -112,7 +112,7 @@ ) # Exchange it for a project-scoped token - auth = Fog::OpenStack::Identity::V3.new( + auth = Fog::Identity::OpenStack::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, :openstack_auth_token => id_v3.credentials[:openstack_auth_token], @@ -127,13 +127,13 @@ validated_token.wont_equal nil id_v3.tokens.check(token) - proc { id_v3.tokens.check('random-token') }.must_raise Fog::OpenStack::Identity::NotFound + proc { id_v3.tokens.check('random-token') }.must_raise Fog::Identity::OpenStack::NotFound end end it "find specific user, lists users" do VCR.use_cassette('idv3_users') do - proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::Identity::OpenStack::NotFound admin_user = @service.users.find_by_name @openstack_vcr.username admin_user.length.must_equal 1 @@ -195,7 +195,7 @@ # Delete the user baz_user.destroy # Check that the deletion worked - proc { @service.users.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.users.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound @service.users.all.select { |user| %w[foobar baz].include? user.name }.length.must_equal 0 @service.users.find_by_name('foobar').length.must_equal 0 @service.users.find_by_name('baz').length.must_equal 0 @@ -258,7 +258,7 @@ # Delete the group baz_group.destroy - proc { @service.groups.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.groups.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound @service.groups.all.select { |group| %w[foobar baz].include? group.name }.length.must_equal 0 end end @@ -296,7 +296,7 @@ @service.tokens.check(token.value) @service.tokens.revoke(token.value) - proc { @service.tokens.check(token.value) }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.tokens.check(token.value) }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -316,7 +316,7 @@ foobar_role = @service.roles.create(:name => 'foobar_role390') foobar_user.grant_role(foobar_role.id) - nonadmin_v3 = Fog::OpenStack::Identity::V3.new( + nonadmin_v3 = Fog::Identity::OpenStack::V3.new( :openstack_domain_id => foobar_user.domain_id, :openstack_api_key => 's3cret!', :openstack_username => 'foobar_385', @@ -324,8 +324,8 @@ :openstack_auth_url => auth_url ) - # Test - check the token validity by using it to create a new Fog::OpenStack::Identity::V3 instance - token_check = Fog::OpenStack::Identity::V3.new( + # Test - check the token validity by using it to create a new Fog::Identity::OpenStack::V3 instance + token_check = Fog::Identity::OpenStack::V3.new( :openstack_auth_token => nonadmin_v3.auth_token, :openstack_region => @openstack_vcr.region, :openstack_auth_url => auth_url @@ -334,7 +334,7 @@ token_check.wont_equal nil proc do - Fog::OpenStack::Identity::V3.new( + Fog::Identity::OpenStack::V3.new( :openstack_auth_token => 'blahblahblah', :openstack_region => @openstack_vcr.region, :openstack_auth_url => auth_url @@ -363,7 +363,7 @@ default_domain = @service.domains.find_by_id @openstack_vcr.domain_id default_domain.wont_equal nil - proc { @service.domains.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.domains.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -399,7 +399,7 @@ rescue end # Check that the deletion worked - proc { @service.domains.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id + proc { @service.domains.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id %w[foobar baz].each do |domain_name| @service.domains.all(:name => domain_name).length.must_equal 0 end @@ -531,7 +531,7 @@ role_by_id = @service.roles.find_by_id roles_all.first.id role_by_id.wont_equal nil - proc { @service.roles.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.roles.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -555,7 +555,7 @@ baz_role.destroy baz_role = nil # Check that the deletion worked - proc { @service.roles.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id + proc { @service.roles.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id %w[foobar23 baz23].each do |role_name| @service.roles.all(:name => role_name).length.must_equal 0 end @@ -582,7 +582,7 @@ project_byid = @service.projects.find_by_id projects_all.first.id project_byid.wont_equal nil - proc { @service.projects.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.projects.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -612,7 +612,7 @@ baz_project.destroy # Check that the deletion worked - proc { @service.projects.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound ['p-foobar46', 'p-baz46'].each do |project_name| @service.projects.all(:name => project_name).length.must_equal 0 end @@ -699,7 +699,7 @@ prj_role ||= @service.roles.all(:name => 'r-project67').first prj_role.destroy if prj_role # Check that the deletion worked - proc { @service.projects.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id + proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id ['p-booboo67', 'p-fooboo67', 'p-boo67', 'p-baz67', 'p-foobar67'].each do |project_name| prj = @service.projects.all(:name => project_name).first prj.destroy if prj @@ -812,7 +812,7 @@ some_service = @service.services.find_by_id services_all.first.id some_service.wont_equal nil - proc { @service.services.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.services.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -841,7 +841,7 @@ baz_service.destroy if baz_service # Check that the deletion worked - proc { @service.services.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id + proc { @service.services.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id @service.services.all.select { |service| %w[foobar baz].include? service.name }.length.must_equal 0 end end @@ -860,7 +860,7 @@ some_endpoint = @service.endpoints.find_by_id endpoints_all.first.id some_endpoint.wont_equal nil - proc { @service.endpoints.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.endpoints.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -900,7 +900,7 @@ baz_endpoint.destroy # Check that the deletion worked - proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound @service.endpoints.all.select { |endpoint| %w[foobar baz].include? endpoint.name }.length.must_equal 0 end end @@ -914,7 +914,7 @@ credentials_all = @service.os_credentials.all credentials_all.wont_equal nil - proc { @service.os_credentials.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.os_credentials.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -976,7 +976,7 @@ # Check that the deletion worked if credential_id - proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::Identity::OpenStack::NotFound end @service.os_credentials.all.select { |credential| credential.type == 'ec2' }.length.must_equal 0 end @@ -993,7 +993,7 @@ policies_all.wont_equal nil policies_all.length.must_equal 0 - proc { @service.policies.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.policies.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound end end @@ -1026,7 +1026,7 @@ updated_policy.destroy # Check that the deletion worked - proc { @service.policies.find_by_id policy_id }.must_raise Fog::OpenStack::Identity::NotFound + proc { @service.policies.find_by_id policy_id }.must_raise Fog::Identity::OpenStack::NotFound @service.policies.all.select { |policy| policy.type == 'application/json' }.length.must_equal 0 end end diff --git a/spec/image_v1_spec.rb b/spec/image_v1_spec.rb index 3e6fc6192..8b25b1342 100644 --- a/spec/image_v1_spec.rb +++ b/spec/image_v1_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::OpenStack::Image do +describe Fog::Image::OpenStack do before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/image_v1', - :service_class => Fog::OpenStack::Image::V1 + :service_class => Fog::Image::OpenStack::V1 ) @service = openstack_vcr.service end diff --git a/spec/image_v2_spec.rb b/spec/image_v2_spec.rb index f132fbb5e..b957f57a1 100644 --- a/spec/image_v2_spec.rb +++ b/spec/image_v2_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::OpenStack::Image do +describe Fog::Image::OpenStack do spec_data_folder = 'spec/fixtures/openstack/image_v2' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, - :service_class => Fog::OpenStack::Image # Fog to choose latest available version + :service_class => Fog::Image::OpenStack # Fog to choose latest available version ) @service = openstack_vcr.service end @@ -95,7 +95,7 @@ def cleanup_image(image, image_name = nil, image_id = nil) identifier = "11111111-2222-3333-aaaa-bbbbbbcccce2" begin # Create an image with a specified ID - foobar_image = Fog::OpenStack::Image::V2::Image.new( + foobar_image = Fog::Image::OpenStack::V2::Image.new( :name => 'original_name', :id => identifier, :service => @service, diff --git a/spec/image_v2_upload_spec.rb b/spec/image_v2_upload_spec.rb index 33d475d52..18763a7dd 100644 --- a/spec/image_v2_upload_spec.rb +++ b/spec/image_v2_upload_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Fog::OpenStack::Image do +describe Fog::Image::OpenStack do it "Upload/download image data using chunked IO" do # We only run this against a live system, # because VCR's use of Webmock stops Excon :response_block from working correctly @@ -12,7 +12,7 @@ Excon.defaults[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false' # setup the service object - @service ||= Fog::OpenStack::Image.new( + @service ||= Fog::Image::OpenStack.new( :openstack_auth_url => "#{@os_auth_url}/auth/tokens", :openstack_project_name => ENV.fetch('OS_PROJECT_NAME'), :openstack_username => ENV.fetch('OS_USERNAME'), @@ -65,7 +65,7 @@ if foobar_id proc do @service.images.find_by_id foobar_id - end.must_raise Fog::OpenStack::Image::NotFound + end.must_raise Fog::Image::OpenStack::NotFound end @service.images.all(:name => 'foobar_up2').length.must_equal 0 end diff --git a/spec/monitoring_spec.rb b/spec/monitoring_spec.rb index aa06eca84..bf7ee77f8 100644 --- a/spec/monitoring_spec.rb +++ b/spec/monitoring_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' require_relative './shared_context' -require 'fog/openstack/monitoring/models/metric' +require 'fog/monitoring/openstack/models/metric' require 'time' -describe Fog::OpenStack::Monitoring do +describe Fog::Monitoring::OpenStack do spec_data_folder = 'spec/fixtures/openstack/monitoring' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, - :service_class => Fog::OpenStack::Monitoring + :service_class => Fog::Monitoring::OpenStack ) @service = openstack_vcr.service @timestamp = 146_375_736_714_3 @@ -28,13 +28,13 @@ # create multiple metrics - metric_1 = Fog::OpenStack::Monitoring::Metric.new(:name => 'sample_metric_1', + metric_1 = Fog::Monitoring::OpenStack::Metric.new(:name => 'sample_metric_1', :timestamp => @timestamp, :dimensions => {"key1" => "value1"}, :value => 42, :value_meta => {"meta_key1" => "meta_value1"}) - metric_2 = Fog::OpenStack::Monitoring::Metric.new(:name => 'sample_metric_2', + metric_2 = Fog::Monitoring::OpenStack::Metric.new(:name => 'sample_metric_2', :timestamp => @timestamp, :dimensions => {"key1" => "value1"}, :value => 42, @@ -151,7 +151,7 @@ proc do @service.notification_methods.find_by_id('bogus_id') - end.must_raise Fog::OpenStack::Monitoring::NotFound + end.must_raise Fog::Monitoring::OpenStack::NotFound ensure notification_method.destroy if notification_method end diff --git a/spec/network_spec.rb b/spec/network_spec.rb index 659e129d1..5a8f16888 100644 --- a/spec/network_spec.rb +++ b/spec/network_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::OpenStack::Network do +describe Fog::Network::OpenStack do before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::OpenStack::Network, + :service_class => Fog::Network::OpenStack, :project_scoped => true ) @service = openstack_vcr.service @@ -13,7 +13,7 @@ openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::OpenStack::Identity::V3 + :service_class => Fog::Identity::OpenStack::V3 ) @identity_service = openstack_vcr.service end @@ -81,7 +81,7 @@ @auth_token = @identity_service.credentials[:openstack_auth_token] openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::OpenStack::Network, + :service_class => Fog::Network::OpenStack, :project_scoped => true, :token_auth => true, :token => @auth_token diff --git a/spec/shared_context.rb b/spec/shared_context.rb index 7de391f74..06f4d4c12 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -33,7 +33,7 @@ class OpenStackVCR # This method should be called in a "before :all" call to set everything up. # A properly configured instance of the service class (e.g. - # Fog::OpenStack::Volume) is then made available in @service. + # Fog::Volume::OpenStack) is then made available in @service. def initialize(options) # read arguments # must_be_kind_of String @@ -109,7 +109,7 @@ def initialize(options) end # TODO: remove - # if @service_class == Fog::OpenStack::Identity::V3 || @os_auth_url.end_with?('/v3') + # if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3') if @identity_version == 'v3' connection_options = { :openstack_auth_url => @os_auth_url, diff --git a/spec/shared_file_system_spec.rb b/spec/shared_file_system_spec.rb index 7db91ce67..1e00fb1fa 100644 --- a/spec/shared_file_system_spec.rb +++ b/spec/shared_file_system_spec.rb @@ -1,21 +1,21 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::OpenStack::SharedFileSystem do +describe Fog::SharedFileSystem::OpenStack do spec_data_folder = 'spec/fixtures/openstack/shared_file_system' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::OpenStack::SharedFileSystem + :service_class => Fog::SharedFileSystem::OpenStack ) @service = openstack_vcr.service net_openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::OpenStack::Network + :service_class => Fog::Network::OpenStack ) @network_service = net_openstack_vcr.service end diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 2c3896798..c2934aab0 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -2,15 +2,15 @@ require_relative './shared_context' [ - Fog::OpenStack::Volume, - Fog::OpenStack::Volume::V1, - Fog::OpenStack::Volume::V2 + Fog::Volume::OpenStack, + Fog::Volume::OpenStack::V1, + Fog::Volume::OpenStack::V2 ].delete_if { |the_class| ENV['TEST_CLASS'] && ENV['TEST_CLASS'] != the_class.name }.each do |service_class| describe service_class do before :all do - vcr_directory = 'spec/fixtures/openstack/volume' if service_class == Fog::OpenStack::Volume - vcr_directory = 'spec/fixtures/openstack/volume_v1' if service_class == Fog::OpenStack::Volume::V1 - vcr_directory = 'spec/fixtures/openstack/volume_v2' if service_class == Fog::OpenStack::Volume::V2 + vcr_directory = 'spec/fixtures/openstack/volume' if service_class == Fog::Volume::OpenStack + vcr_directory = 'spec/fixtures/openstack/volume_v1' if service_class == Fog::Volume::OpenStack::V1 + vcr_directory = 'spec/fixtures/openstack/volume_v2' if service_class == Fog::Volume::OpenStack::V2 openstack_vcr = OpenStackVCR.new( :vcr_directory => vcr_directory, @@ -28,7 +28,7 @@ end def v2? - @service.kind_of? Fog::OpenStack::Volume::V2::Real + @service.kind_of? Fog::Volume::OpenStack::V2::Real end def setup_test_object(options) @@ -116,7 +116,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume by ID..." if ENV['DEBUG_VERBOSE'] volume = @service.volumes.get(volume_id) - volume.must_be_kind_of Fog::OpenStack::Volume::Volume + volume.must_be_kind_of Fog::Volume::OpenStack::Volume volume.id.must_equal volume_id volume.display_name.must_equal volume_name unless v2? @@ -134,7 +134,7 @@ def cleanup_test_object(collection, id) volumes = @service.volumes.all(@name_param => volume_name) volumes.length.must_equal 1 volume = volumes[0] - volume.must_be_kind_of Fog::OpenStack::Volume::Volume + volume.must_be_kind_of Fog::Volume::OpenStack::Volume volume.id.must_equal volume_id volume.display_name.must_equal volume_name unless v2? @@ -148,7 +148,7 @@ def cleanup_test_object(collection, id) volumes = @service.volumes.all(@name_param => volume_new_name) volume = volumes.first - volume.must_be_kind_of Fog::OpenStack::Volume::Volume + volume.must_be_kind_of Fog::Volume::OpenStack::Volume volume.display_name.must_equal volume_new_name unless v2? volume.name.must_equal volume_new_name if v2? @@ -185,7 +185,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume type by ID..." if ENV['DEBUG_VERBOSE'] type = @service.volume_types.get(type_id) - type.must_be_kind_of Fog::OpenStack::Volume::VolumeType + type.must_be_kind_of Fog::Volume::OpenStack::VolumeType type.id.must_equal type_id type.name.must_equal type_name @@ -193,7 +193,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume type by name..." if ENV['DEBUG_VERBOSE'] type = @service.volume_types.all(type_name).first - type.must_be_kind_of Fog::OpenStack::Volume::VolumeType + type.must_be_kind_of Fog::Volume::OpenStack::VolumeType type.id.must_equal type_id type.name.must_equal type_name end @@ -230,7 +230,7 @@ def cleanup_test_object(collection, id) # check that extending a non-existing volume fails puts "Extending deleted volume should fail..." if ENV['DEBUG_VERBOSE'] - proc { @service.extend_volume(volume.id, volume_size_small) }.must_raise Fog::OpenStack::Volume::NotFound + proc { @service.extend_volume(volume.id, volume_size_small) }.must_raise Fog::Volume::OpenStack::NotFound end end end @@ -259,7 +259,7 @@ def cleanup_test_object(collection, id) puts 'Retrieving transfer by ID...' if ENV['DEBUG_VERBOSE'] transfer = @service.transfers.get(transfer_id) - transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer + transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name @@ -271,7 +271,7 @@ def cleanup_test_object(collection, id) transfers = @service.transfers.all(:name => transfer_name) transfers.length.must_equal 1 transfer = transfers[0] - transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer + transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name @@ -292,7 +292,7 @@ def cleanup_test_object(collection, id) other_service.transfers.all(:name => transfer_name).length.must_equal 0 # # check that recipient cannot see the volume before transfer - # proc { other_service.volumes.get(volume.id) }.must_raise Fog::OpenStack::Compute::NotFound + # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 # The recipient can inexplicably see the volume even before the @@ -302,23 +302,23 @@ def cleanup_test_object(collection, id) # check that accept_transfer fails without valid transfer ID and auth key bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR - proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::OpenStack::Volume::NotFound + proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest # accept transfer puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] transfer = other_service.transfers.accept(transfer.id, auth_key) - transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer + transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name # check that recipient can see the volume volume = other_service.volumes.get(volume.id) - volume.must_be_kind_of Fog::OpenStack::Volume::Volume + volume.must_be_kind_of Fog::Volume::OpenStack::Volume # # check that sender cannot see the volume anymore - # proc { @service.volumes.get(volume.id) }.must_raise Fog::OpenStack::Compute::NotFound + # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound # @service.volumes.all(@name_param => volume_name).length.must_equal 0 # As noted above, both users seem to be able to see the volume at all times. @@ -373,7 +373,7 @@ def cleanup_test_object(collection, id) # check that transfer cannot be accepted when it has been deleted puts 'Checking that accepting a deleted transfer fails...' if ENV['DEBUG_VERBOSE'] - proc { other_service.transfers.accept(transfer_id, auth_key) }.must_raise Fog::OpenStack::Volume::NotFound + proc { other_service.transfers.accept(transfer_id, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound ensure # cleanup volume cleanup_test_object(@service.volumes, volume.id) if volume @@ -429,7 +429,7 @@ def cleanup_test_object(collection, id) # cleanup volume begin snapshot.destroy if snapshot - rescue Fog::OpenStack::Volume::NotFound + rescue Fog::Volume::OpenStack::NotFound # Don't care if it doesn't exist end diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index ebc9dab21..0bc9d27ca 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -105,7 +105,7 @@ :openstack_auth_url => 'http://openstack:35357', :openstack_identity_api_version => 'v2.0' } - identity = Fog::OpenStack::Identity.new(creds) + identity = Fog::Identity::OpenStack.new(creds) identity.validate_token(@token, @tenant_token) identity.validate_token(@token) end @@ -115,7 +115,7 @@ :openstack_auth_url => 'http://openstack:35357', :openstack_identity_api_version => 'v2.0' } - identity = Fog::OpenStack::Identity.new(creds) + identity = Fog::Identity::OpenStack.new(creds) identity.check_token(@token, @tenant_token) identity.check_token(@token) end diff --git a/test/helpers/collection_helper.rb b/test/helpers/collection_helper.rb index 85260ad65..79275134c 100644 --- a/test/helpers/collection_helper.rb +++ b/test/helpers/collection_helper.rb @@ -16,7 +16,7 @@ def collection_tests(collection, params = {}) it "#create(#{params.inspect})" do unless Fog.mocking? - @instance.must_be_kind_of Fog::OpenStack::Network::SecurityGroup + @instance.must_be_kind_of Fog::Network::OpenStack::SecurityGroup end end @@ -27,13 +27,13 @@ def collection_tests(collection, params = {}) it "#all" do unless Fog.mocking? - collection.all.must_be_kind_of Fog::OpenStack::Network::SecurityGroups + collection.all.must_be_kind_of Fog::Network::OpenStack::SecurityGroups end end it "#get(#{@identity})" do unless Fog.mocking? - collection.get(@identity).must_be_kind_of Fog::OpenStack::Network::SecurityGroup + collection.get(@identity).must_be_kind_of Fog::Network::OpenStack::SecurityGroup end end diff --git a/test/helpers/container_infra_helper.rb b/test/helpers/container_infra_helper.rb index 69f34717a..d0e19b9bb 100644 --- a/test/helpers/container_infra_helper.rb +++ b/test/helpers/container_infra_helper.rb @@ -4,7 +4,7 @@ def self.container_infra class_variable_get(:@@container_infra) end - class_variable_set(:@@container_infra, Fog::OpenStack::ContainerInfra.new) + class_variable_set(:@@container_infra, Fog::ContainerInfra::OpenStack.new) end end diff --git a/test/helpers/dns_v2_helper.rb b/test/helpers/dns_v2_helper.rb index 3ccb8e72b..2d3c7d664 100644 --- a/test/helpers/dns_v2_helper.rb +++ b/test/helpers/dns_v2_helper.rb @@ -1,5 +1,5 @@ def set_dns_data - @dns = Fog::OpenStack::DNS::V2.new + @dns = Fog::DNS::OpenStack::V2.new @zone = @dns.create_zone('example.org', 'hostmaster@example.org') @zone_id = @zone.body['id'] diff --git a/test/helpers/network_helper.rb b/test/helpers/network_helper.rb index a15cf4eab..7d8f40e53 100644 --- a/test/helpers/network_helper.rb +++ b/test/helpers/network_helper.rb @@ -4,7 +4,7 @@ def self.network class_variable_get(:@@network) end - class_variable_set(:@@network, Fog::OpenStack::Network.new) + class_variable_set(:@@network, Fog::Network[:openstack]) end end diff --git a/test/helpers/nfv_helper.rb b/test/helpers/nfv_helper.rb index 0f7c66c3a..3c89e3c4d 100644 --- a/test/helpers/nfv_helper.rb +++ b/test/helpers/nfv_helper.rb @@ -1,5 +1,5 @@ def set_nfv_data - @nfv = Fog::OpenStack::NFV.new + @nfv = Fog::NFV::OpenStack.new @vnfd_data = { :attributes => { diff --git a/test/identity_version_tests.rb b/test/identity_version_tests.rb index 413fb144b..417b8a918 100644 --- a/test/identity_version_tests.rb +++ b/test/identity_version_tests.rb @@ -9,7 +9,7 @@ it "v2" do Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::OpenStack::Identity::V2::Real) do + assert(Fog::Identity::OpenStack::V2::Real) do Fog::Identity[:openstack].class end end @@ -17,7 +17,7 @@ it "v3" do Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::OpenStack::Identity::V3::Real) do + assert(Fog::Identity::OpenStack::V3::Real) do Fog::Identity[:openstack].class end end diff --git a/test/models/compute/images_tests.rb b/test/models/compute/images_tests.rb index 81e599882..58131faa0 100644 --- a/test/models/compute/images_tests.rb +++ b/test/models/compute/images_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack::Compute | images collection" do +describe "Fog::Compute[:openstack] | images collection" do describe "success" do describe "#all" do - let (:fog) { Fog::OpenStack::Compute.new } + let (:fog) { Fog::Compute[:openstack] } it "must be an Array" do fog.images.all.must_be_kind_of Array diff --git a/test/models/compute/security_group_tests.rb b/test/models/compute/security_group_tests.rb index ca287e30e..40d737fef 100644 --- a/test/models/compute/security_group_tests.rb +++ b/test/models/compute/security_group_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Compute | security_group" do +describe "Fog::Compute[:openstack] | security_group" do describe "success" do - let(:fog) { Fog::OpenStack::Compute.new } + let(:fog) { Fog::Compute[:openstack] } let(:security_group) do fog.security_groups.create( :name => 'my_group', diff --git a/test/models/compute/server_group_tests.rb b/test/models/compute/server_group_tests.rb index 91fbdeb2d..d5a13333b 100644 --- a/test/models/compute/server_group_tests.rb +++ b/test/models/compute/server_group_tests.rb @@ -1,16 +1,16 @@ require "test_helper" -describe "Fog::OpenStack::Compute::ServerGroup" do +describe "Fog::Compute::OpenStack::ServerGroup" do describe "validate_server_group_policy" do it "contains only allowed policies" do ['affinity', 'anti-affinity', 'soft-affinity', 'soft-anti-affinity'].each do |policy| - Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy(policy).must_equal true + Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy(policy).must_equal true end end it "raises an error" do assert_raises ArgumentError do - Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy('invalid-policy') + Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy('invalid-policy') end end end diff --git a/test/models/compute/server_tests.rb b/test/models/compute/server_tests.rb index 841a63685..90968657e 100644 --- a/test/models/compute/server_tests.rb +++ b/test/models/compute/server_tests.rb @@ -1,7 +1,7 @@ require "test_helper" -describe "Fog::OpenStack::Compute | server" do - let (:compute) { Fog::OpenStack::Compute.new } +describe "Fog::Compute[:openstack] | server" do + let (:compute) { Fog::Compute[:openstack] } describe "success" do it "#floating_ips" do @@ -14,7 +14,7 @@ ) server.save - ip1 = Fog::OpenStack::Network.new.floating_ips.create( + ip1 = Fog::Network[:openstack].floating_ips.create( :floating_network_id => 'f0000000-0000-0000-0000-000000000000', :fixed_ip_address => '192.168.11.3' ) diff --git a/test/models/compute/service_tests.rb b/test/models/compute/service_tests.rb index d692bdadc..ec75e1254 100644 --- a/test/models/compute/service_tests.rb +++ b/test/models/compute/service_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack::Compute | services" do +describe "Fog::Compute[:openstack] | services" do describe "success" do before do - services = Fog::OpenStack::Compute.new.services.all + services = Fog::Compute[:openstack].services.all @service = services.first end @@ -12,7 +12,7 @@ end it "#get" do - service = Fog::OpenStack::Compute.new.services.get(@service.id) + service = Fog::Compute[:openstack].services.get(@service.id) %w(id binary host).all? do |attr| attr1 = service.send(attr.to_sym) attr2 = @service.send(attr.to_sym) diff --git a/test/models/container_infra/bay_model_tests.rb b/test/models/container_infra/bay_model_tests.rb index a71cf4742..b20292b58 100644 --- a/test/models/container_infra/bay_model_tests.rb +++ b/test/models/container_infra/bay_model_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | bay model" do +describe "Fog::ContainerInfra[:openstack] | bay model" do describe "success" do before do @instance = container_infra.bay_models.create( diff --git a/test/models/container_infra/bay_tests.rb b/test/models/container_infra/bay_tests.rb index 409735be2..a375b1817 100644 --- a/test/models/container_infra/bay_tests.rb +++ b/test/models/container_infra/bay_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | bay" do +describe "Fog::ContainerInfra[:openstack] | bay" do describe "success" do before do @instance = container_infra.bays.create( diff --git a/test/models/container_infra/certificate_tests.rb b/test/models/container_infra/certificate_tests.rb index 4457a103e..c5e4cd742 100644 --- a/test/models/container_infra/certificate_tests.rb +++ b/test/models/container_infra/certificate_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | certificate" do +describe "Fog::ContainerInfra[:openstack] | certificate" do describe "success" do before do @instance = container_infra.certificates.create( diff --git a/test/models/container_infra/cluster_template_tests.rb b/test/models/container_infra/cluster_template_tests.rb index 828e3df5f..02ccfdda1 100644 --- a/test/models/container_infra/cluster_template_tests.rb +++ b/test/models/container_infra/cluster_template_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | cluster template" do +describe "Fog::ContainerInfra[:openstack] | cluster template" do describe "success" do before do @instance = container_infra.cluster_templates.create( diff --git a/test/models/container_infra/cluster_tests.rb b/test/models/container_infra/cluster_tests.rb index 349a92d20..a5ed37081 100644 --- a/test/models/container_infra/cluster_tests.rb +++ b/test/models/container_infra/cluster_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | cluster" do +describe "Fog::ContainerInfra[:openstack] | cluster" do describe "success" do before do @instance = container_infra.clusters.create( diff --git a/test/models/identity/ec2_credential_tests.rb b/test/models/identity/ec2_credential_tests.rb index 09b97863f..ed661a8a5 100644 --- a/test/models/identity/ec2_credential_tests.rb +++ b/test/models/identity/ec2_credential_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credential" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/ec2_credentials_tests.rb b/test/models/identity/ec2_credentials_tests.rb index 8f673d020..0b32d443e 100644 --- a/test/models/identity/ec2_credentials_tests.rb +++ b/test/models/identity/ec2_credentials_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credentials" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } @@ -47,7 +47,7 @@ unless Fog.mocking? proc do @user.ec2_credentials.find_by_access_key('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end @@ -55,7 +55,7 @@ unless Fog.mocking? proc do @user.ec2_credentials.destroy('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end end diff --git a/test/models/identity/role_tests.rb b/test/models/identity/role_tests.rb index b46adf880..c39c8671c 100644 --- a/test/models/identity/role_tests.rb +++ b/test/models/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.roles.new( :name => 'Role Name', :user_id => 1, diff --git a/test/models/identity/roles_tests.rb b/test/models/identity/roles_tests.rb index cef09c724..a3da03888 100644 --- a/test/models/identity/roles_tests.rb +++ b/test/models/identity/roles_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | roles" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant = @identity.tenants.create(:name => 'test_user') @user = @identity.users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof') @role = @identity.roles(:user => @user, :tenant => @tenant).create(:name => 'test_role') @@ -17,7 +17,7 @@ describe "success" do it "#all" do - @roles.all.must_be_kind_of Fog::OpenStack::Identity::V2::Roles + @roles.all.must_be_kind_of Fog::Identity::OpenStack::V2::Roles end it "#get" do diff --git a/test/models/identity/tenant_tests.rb b/test/models/identity/tenant_tests.rb index a883ea219..4d04467e6 100644 --- a/test/models/identity/tenant_tests.rb +++ b/test/models/identity/tenant_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | tenant" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') end describe "success" do diff --git a/test/models/identity/tenants_tests.rb b/test/models/identity/tenants_tests.rb index 17f1a3948..572960e37 100644 --- a/test/models/identity/tenants_tests.rb +++ b/test/models/identity/tenants_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Compute | tenants" do +describe "Fog::Compute[:openstack] | tenants" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.tenants.create(:name => 'test') end @@ -22,7 +22,7 @@ unless Fog.mocking? proc do @identity.tenants.find_by_id('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end @@ -30,7 +30,7 @@ unless Fog.mocking? proc do @identity.tenants.destroy('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end end diff --git a/test/models/identity/user_tests.rb b/test/models/identity/user_tests.rb index e4774fe7d..1d22aac7e 100644 --- a/test/models/identity/user_tests.rb +++ b/test/models/identity/user_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | user" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.new( :name => 'User Name', diff --git a/test/models/identity/users_tests.rb b/test/models/identity/users_tests.rb index bc1c750c4..125027076 100644 --- a/test/models/identity/users_tests.rb +++ b/test/models/identity/users_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | users" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.create( :name => 'foobar', @@ -34,7 +34,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.find_by_id('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end @@ -42,7 +42,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.find_by_name('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end @@ -50,7 +50,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.destroy('fake') - end.must_raise(Fog::OpenStack::Identity::NotFound) + end.must_raise(Fog::Identity::OpenStack::NotFound) end end end diff --git a/test/models/image/image_tests.rb b/test/models/image/image_tests.rb index 79e61b544..ad7cdc6fa 100644 --- a/test/models/image/image_tests.rb +++ b/test/models/image/image_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack::Image | image" do +describe "Fog::Image[:openstack] | image" do describe "success" do before do - @instance = Fog::OpenStack::Image.new.images.create(:name => 'test image') + @instance = Fog::Image[:openstack].images.create(:name => 'test image') end it "#create" do diff --git a/test/models/image/images_tests.rb b/test/models/image/images_tests.rb index 8b5f3eaf0..d61e90916 100644 --- a/test/models/image/images_tests.rb +++ b/test/models/image/images_tests.rb @@ -1,22 +1,22 @@ require "test_helper" -describe "Fog::OpenStack::Image | images" do +describe "Fog::Image[:openstack] | images" do before do - @instance = Fog::OpenStack::Image.new.create_image(:name => "model test image").body + @instance = Fog::Image[:openstack].create_image(:name => "model test image").body end describe "success" do it "#find_by_id" do - image = Fog::OpenStack::Image.new.images.find_by_id(@instance['image']['id']) + image = Fog::Image[:openstack].images.find_by_id(@instance['image']['id']) image.id.must_equal @instance['image']['id'] end it "#get" do - image = Fog::OpenStack::Image.new.images.get(@instance['image']['id']) + image = Fog::Image[:openstack].images.get(@instance['image']['id']) image.id.must_equal @instance['image']['id'] end it "#destroy" do - Fog::OpenStack::Image.new.images.destroy(@instance['image']['id']).must_equal true + Fog::Image[:openstack].images.destroy(@instance['image']['id']).must_equal true end end end diff --git a/test/models/network/floating_ip_tests.rb b/test/models/network/floating_ip_tests.rb index bf0656819..e12bd0a7a 100644 --- a/test/models/network/floating_ip_tests.rb +++ b/test/models/network/floating_ip_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | floating_ip" do +describe "Fog::Network[:openstack] | floating_ip" do describe "success" do let (:instance) do network.floating_ips.create( diff --git a/test/models/network/floating_ips_tests.rb b/test/models/network/floating_ips_tests.rb index ed349ad5b..c4d08fa8b 100644 --- a/test/models/network/floating_ips_tests.rb +++ b/test/models/network/floating_ips_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | floating_ips" do +describe "Fog::Network[:openstack] | floating_ips" do before do @floating_ip = network.floating_ips.create( :floating_network_id => 'f0000000-0000-0000-0000-000000000000' diff --git a/test/models/network/ike_policies_tests.rb b/test/models/network/ike_policies_tests.rb index 0149ffcc9..bff516124 100644 --- a/test/models/network/ike_policies_tests.rb +++ b/test/models/network/ike_policies_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ike_policies" do +describe "Fog::Network[:openstack] | ike_policies" do before do @ike_policy = network.ike_policies.create( :name => 'test-ike-policy', diff --git a/test/models/network/ike_policy_tests.rb b/test/models/network/ike_policy_tests.rb index fb82f19f8..ceeace123 100644 --- a/test/models/network/ike_policy_tests.rb +++ b/test/models/network/ike_policy_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ike_policy" do +describe "Fog::Network[:openstack] | ike_policy" do describe "success" do before do @instance = network.ike_policies.create( diff --git a/test/models/network/ipsec_policies_tests.rb b/test/models/network/ipsec_policies_tests.rb index 4a9911406..4c00bcf7f 100644 --- a/test/models/network/ipsec_policies_tests.rb +++ b/test/models/network/ipsec_policies_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ipsec_policies" do +describe "Fog::Network[:openstack] | ipsec_policies" do before do params = { :name => 'test-ipsec-policy', diff --git a/test/models/network/ipsec_policy_tests.rb b/test/models/network/ipsec_policy_tests.rb index bef9e84f4..f9bd4a353 100644 --- a/test/models/network/ipsec_policy_tests.rb +++ b/test/models/network/ipsec_policy_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ipsec_policy" do +describe "Fog::Network[:openstack] | ipsec_policy" do describe "success" do before do @instance = network.ipsec_policies.create( diff --git a/test/models/network/ipsec_site_connection_tests.rb b/test/models/network/ipsec_site_connection_tests.rb index 025a45160..79c87f675 100644 --- a/test/models/network/ipsec_site_connection_tests.rb +++ b/test/models/network/ipsec_site_connection_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ipsec_site_connection" do +describe "Fog::Network[:openstack] | ipsec_site_connection" do describe "success" do before do params = { diff --git a/test/models/network/ipsec_site_connections_tests.rb b/test/models/network/ipsec_site_connections_tests.rb index 02ff78e44..8dae7d416 100644 --- a/test/models/network/ipsec_site_connections_tests.rb +++ b/test/models/network/ipsec_site_connections_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ipsec_site_connections" do +describe "Fog::Network[:openstack] | ipsec_site_connections" do before do params = { :name => 'test-ipsec-site-connection', diff --git a/test/models/network/lb_health_monitor_tests.rb b/test/models/network/lb_health_monitor_tests.rb index 8aa96723e..ae39cc7b4 100644 --- a/test/models/network/lb_health_monitor_tests.rb +++ b/test/models/network/lb_health_monitor_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_health_monitor" do +describe "Fog::Network[:openstack] | lb_health_monitor" do describe "success" do before do @lb_pool = network.lb_pools.create( diff --git a/test/models/network/lb_health_monitors_tests.rb b/test/models/network/lb_health_monitors_tests.rb index 0546432cf..d0a3af737 100644 --- a/test/models/network/lb_health_monitors_tests.rb +++ b/test/models/network/lb_health_monitors_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_health_monitors" do +describe "Fog::Network[:openstack] | lb_health_monitors" do before do @lb_health_monitor = network.lb_health_monitors.create( :type => 'PING', diff --git a/test/models/network/lb_member_tests.rb b/test/models/network/lb_member_tests.rb index 69da26787..d952f8730 100644 --- a/test/models/network/lb_member_tests.rb +++ b/test/models/network/lb_member_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_member" do +describe "Fog::Network[:openstack] | lb_member" do describe "success" do before do @instance = network.lb_members.create( diff --git a/test/models/network/lb_members_tests.rb b/test/models/network/lb_members_tests.rb index c43161936..e47cefa95 100644 --- a/test/models/network/lb_members_tests.rb +++ b/test/models/network/lb_members_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_members" do +describe "Fog::Network[:openstack] | lb_members" do before do @lb_member = network.lb_members.create( :pool_id => 'pool_id', diff --git a/test/models/network/lb_pool_tests.rb b/test/models/network/lb_pool_tests.rb index 350ee2f4e..2c46a6f03 100644 --- a/test/models/network/lb_pool_tests.rb +++ b/test/models/network/lb_pool_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_pool" do +describe "Fog::Network[:openstack] | lb_pool" do describe "success" do before do @lb_health_monitor = network.lb_health_monitors.create( diff --git a/test/models/network/lb_pools_tests.rb b/test/models/network/lb_pools_tests.rb index 9ade42c74..67ce0e352 100644 --- a/test/models/network/lb_pools_tests.rb +++ b/test/models/network/lb_pools_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_pools" do +describe "Fog::Network[:openstack] | lb_pools" do before do @lb_pool = network.lb_pools.create( :subnet_id => 'subnet_id', diff --git a/test/models/network/lb_vip_tests.rb b/test/models/network/lb_vip_tests.rb index 37cadd52c..9553a9142 100644 --- a/test/models/network/lb_vip_tests.rb +++ b/test/models/network/lb_vip_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_vip" do +describe "Fog::Network[:openstack] | lb_vip" do describe "success" do before do attributes = { diff --git a/test/models/network/lb_vips_tests.rb b/test/models/network/lb_vips_tests.rb index 9adf25765..b428477b0 100644 --- a/test/models/network/lb_vips_tests.rb +++ b/test/models/network/lb_vips_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | lb_vips" do +describe "Fog::Network[:openstack] | lb_vips" do before do @lb_vip = network.lb_vips.create( :subnet_id => 'subnet_id', diff --git a/test/models/network/network_tests.rb b/test/models/network/network_tests.rb index 946bb7635..c94ee566f 100644 --- a/test/models/network/network_tests.rb +++ b/test/models/network/network_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | network" do +describe "Fog::Network[:openstack] | network" do describe "success" do before do @instance = network.networks.create( diff --git a/test/models/network/networks_tests.rb b/test/models/network/networks_tests.rb index abdb6214e..6f7970f43 100644 --- a/test/models/network/networks_tests.rb +++ b/test/models/network/networks_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | networks" do +describe "Fog::Network[:openstack] | networks" do before do @network = network.networks.create( :name => 'net_name', diff --git a/test/models/network/port_tests.rb b/test/models/network/port_tests.rb index e1f996ad6..c6db13aef 100644 --- a/test/models/network/port_tests.rb +++ b/test/models/network/port_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | port" do +describe "Fog::Network[:openstack] | port" do describe "success" do before do @instance = network.ports.create( diff --git a/test/models/network/ports_tests.rb b/test/models/network/ports_tests.rb index 2a7f7eb55..94a93479e 100644 --- a/test/models/network/ports_tests.rb +++ b/test/models/network/ports_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | ports" do +describe "Fog::Network[:openstack] | ports" do before do @port = network.ports.create( :name => 'port_name', diff --git a/test/models/network/router_tests.rb b/test/models/network/router_tests.rb index a1bf17621..09f806fdb 100644 --- a/test/models/network/router_tests.rb +++ b/test/models/network/router_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | router" do +describe "Fog::Network[:openstack] | router" do describe "success" do before do @instance = network.routers.create( diff --git a/test/models/network/routers_tests.rb b/test/models/network/routers_tests.rb index cbd0cae0b..2e81a8a2c 100644 --- a/test/models/network/routers_tests.rb +++ b/test/models/network/routers_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | routers" do +describe "Fog::Network[:openstack] | routers" do before do @router = network.routers.create( :name => 'router_name', diff --git a/test/models/network/security_group_rule_tests.rb b/test/models/network/security_group_rule_tests.rb index 39dbfaba3..c4894bd80 100644 --- a/test/models/network/security_group_rule_tests.rb +++ b/test/models/network/security_group_rule_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/model_helper" -describe "Fog::OpenStack::Network | security_group_rule model" do +describe "Fog::Network[:openstack] | security_group_rule model" do @secgroup = network.security_groups.create(:name => "fogsecgroup") attributes = {:security_group_id => @secgroup.id, :direction => "ingress"} model_tests(network.security_group_rules, attributes) diff --git a/test/models/network/security_group_rules_tests.rb b/test/models/network/security_group_rules_tests.rb index 8cb149e64..4c34fb69d 100644 --- a/test/models/network/security_group_rules_tests.rb +++ b/test/models/network/security_group_rules_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/collection_helper" -describe "Fog::OpenStack::Network | security_group_rules collection" do +describe "Fog::Network[:openstack] | security_group_rules collection" do @secgroup = network.security_groups.create(:name => "my_secgroup") attributes = {:security_group_id => @secgroup.id, :direction => "ingress"} collection_tests(network.security_group_rules, attributes) diff --git a/test/models/network/security_group_tests.rb b/test/models/network/security_group_tests.rb index d48319259..25d9b288c 100644 --- a/test/models/network/security_group_tests.rb +++ b/test/models/network/security_group_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/model_helper" -describe "Fog::OpenStack::Network | security_group model" do +describe "Fog::Network[:openstack] | security_group model" do model_tests(network.security_groups, :name => "fogsecgroup") describe "success" do diff --git a/test/models/network/security_groups_tests.rb b/test/models/network/security_groups_tests.rb index 06eda8e40..4f3cff179 100644 --- a/test/models/network/security_groups_tests.rb +++ b/test/models/network/security_groups_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/collection_helper" -describe "Fog::OpenStack::Network | security_groups collection" do +describe "Fog::Network[:openstack] | security_groups collection" do @attributes = { :name => "my_secgroup", :description => "my sec group desc" diff --git a/test/models/network/subnet_pools_tests.rb b/test/models/network/subnet_pools_tests.rb index 1aabc0d6b..d76f6720c 100644 --- a/test/models/network/subnet_pools_tests.rb +++ b/test/models/network/subnet_pools_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require "helpers/network_helper" -describe 'Fog::OpenStack::Network | subnet_pools' do +describe 'Fog::Network[:openstack] | subnet_pools' do describe 'success' do before do @subnet_pool = network.subnet_pools.create( diff --git a/test/models/network/subnet_tests.rb b/test/models/network/subnet_tests.rb index b4b217332..64a5b26ea 100644 --- a/test/models/network/subnet_tests.rb +++ b/test/models/network/subnet_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | subnet" do +describe "Fog::Network[:openstack] | subnet" do describe "success" do before do @instance = network.subnets.create( diff --git a/test/models/network/subnets_tests.rb b/test/models/network/subnets_tests.rb index 0f92c49e7..cb7ed4c91 100644 --- a/test/models/network/subnets_tests.rb +++ b/test/models/network/subnets_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | subnets" do +describe "Fog::Network[:openstack] | subnets" do describe "success" do before do @subnet = network.subnets.create( diff --git a/test/models/network/vpn_service_tests.rb b/test/models/network/vpn_service_tests.rb index af9b7dc3b..3c80baf72 100644 --- a/test/models/network/vpn_service_tests.rb +++ b/test/models/network/vpn_service_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | vpn_service" do +describe "Fog::Network[:openstack] | vpn_service" do describe "success" do before do @instance = network.vpn_services.create( diff --git a/test/models/network/vpn_services_tests.rb b/test/models/network/vpn_services_tests.rb index 35af8740f..ceeccf9ab 100644 --- a/test/models/network/vpn_services_tests.rb +++ b/test/models/network/vpn_services_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::OpenStack::Network | vpn_services" do +describe "Fog::Network[:openstack] | vpn_services" do before do @vpn_service = network.vpn_services.create( :subnet_id => 'foo', diff --git a/test/models/planning/plan_tests.rb b/test/models/planning/plan_tests.rb index 1a2bcf8a6..bada3ea61 100644 --- a/test/models/planning/plan_tests.rb +++ b/test/models/planning/plan_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack::Planning | plan" do +describe "Fog::OpenStack[:planning] | plan" do describe "success" do before do - @planning = Fog::OpenStack::Planning.new + @planning = Fog::OpenStack[:planning] @instance = @planning.plans.first @role = @planning.list_roles.body.first end diff --git a/test/models/planning/plans_tests.rb b/test/models/planning/plans_tests.rb index dba84e72b..c87d8f7d9 100644 --- a/test/models/planning/plans_tests.rb +++ b/test/models/planning/plans_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack::Planning | plans" do +describe "Fog::OpenStack[:planning] | plans" do describe "success" do before do - @planning = Fog::OpenStack::Planning.new + @planning = Fog::OpenStack[:planning] @instance = @planning.plans.all.first end diff --git a/test/models/planning/role_tests.rb b/test/models/planning/role_tests.rb index 1ee5d2600..8ed226937 100644 --- a/test/models/planning/role_tests.rb +++ b/test/models/planning/role_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -describe "Fog::OpenStack::Planning | plan" do +describe "Fog::OpenStack[:planning] | plan" do describe "success" do before do - @instance = Fog::OpenStack::Planning.new.roles.first - @plan = Fog::OpenStack::Planning.new.list_plans.body.first + @instance = Fog::OpenStack[:planning].roles.first + @plan = Fog::OpenStack[:planning].list_plans.body.first end it "#add_role" do diff --git a/test/models/storage/file_tests.rb b/test/models/storage/file_tests.rb index 48ca223c5..f5c1398c3 100644 --- a/test/models/storage/file_tests.rb +++ b/test/models/storage/file_tests.rb @@ -29,7 +29,7 @@ def clear_metadata :key => "fogfilestests-#{rand(65536)}" } - @directory = Fog::OpenStack::Storage.new.directories.create(directory_attributes) + @directory = Fog::Storage[:openstack].directories.create(directory_attributes) describe "Fog::OpenStack::Storage | file" do after do diff --git a/test/requests/baremetal/chassis_tests.rb b/test/requests/baremetal/chassis_tests.rb index b858dc3c0..43d659074 100644 --- a/test/requests/baremetal/chassis_tests.rb +++ b/test/requests/baremetal/chassis_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack::Baremetal | Baremetal chassis requests" do +describe "Fog::Baremetal[:openstack] | Baremetal chassis requests" do describe "success" do before do - @baremetal = Fog::OpenStack::Baremetal.new + @baremetal = Fog::Baremetal[:openstack] @chassis_format = { 'description' => String, diff --git a/test/requests/baremetal/driver_tests.rb b/test/requests/baremetal/driver_tests.rb index 6c976b9a8..34043581a 100644 --- a/test/requests/baremetal/driver_tests.rb +++ b/test/requests/baremetal/driver_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Baremetal | Baremetal driver requests" do +describe "Fog::Baremetal[:openstack] | Baremetal driver requests" do before do - @baremetal = Fog::OpenStack::Baremetal.new + @baremetal = Fog::Baremetal[:openstack] @driver_format = { 'hosts' => Array, diff --git a/test/requests/baremetal/node_tests.rb b/test/requests/baremetal/node_tests.rb index 99b61b308..a8226efcc 100644 --- a/test/requests/baremetal/node_tests.rb +++ b/test/requests/baremetal/node_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Baremetal | Baremetal node requests" do +describe "Fog::Baremetal[:openstack] | Baremetal node requests" do before do - @baremetal = Fog::OpenStack::Baremetal.new + @baremetal = Fog::Baremetal[:openstack] @node_format = { 'instance_uuid' => Fog::Nullable::String, 'maintenance' => Fog::Boolean, diff --git a/test/requests/baremetal/port_tests.rb b/test/requests/baremetal/port_tests.rb index 689b7d046..b408d69e2 100644 --- a/test/requests/baremetal/port_tests.rb +++ b/test/requests/baremetal/port_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Baremetal | Baremetal port requests" do +describe "Fog::Baremetal[:openstack] | Baremetal port requests" do before do - @baremetal = Fog::OpenStack::Baremetal.new + @baremetal = Fog::Baremetal[:openstack] @port_format = { 'address' => String, @@ -31,13 +31,13 @@ before do node_attributes = {:driver => 'pxe_ipmitool'} - @instance = Fog::OpenStack::Baremetal.new.create_node(node_attributes).body + @instance = Fog::Baremetal[:openstack].create_node(node_attributes).body port_attributes = { :address => '00:c2:08:85:de:ca', :node_uuid => @instance['uuid'] } - @port = Fog::OpenStack::Baremetal.new.create_port(port_attributes).body + @port = Fog::Baremetal[:openstack].create_port(port_attributes).body end it "#create_port" do diff --git a/test/requests/compute/address_tests.rb b/test/requests/compute/address_tests.rb index f43656aaf..39e4983c7 100644 --- a/test/requests/compute/address_tests.rb +++ b/test/requests/compute/address_tests.rb @@ -7,7 +7,7 @@ # such as "warning: class variable access from toplevel" which pollute the tests # output. The latter has been avoided using class_variable_set/get and class # methods to wrap them. -describe "Fog::OpenStack::Compute | address requests" do +describe "Fog::Compute[:openstack] | address requests" do def self.compute class_variable_get(:@@compute) end @@ -20,7 +20,7 @@ def self.data class_variable_get(:@@data) end - class_variable_set(:@@compute, Fog::OpenStack::Compute.new) + class_variable_set(:@@compute, Fog::Compute[:openstack]) class_variable_set(:@@server_id, compute.create_server("test_server", get_image_ref, diff --git a/test/requests/compute/aggregate_tests.rb b/test/requests/compute/aggregate_tests.rb index c21ce334a..a661da6a0 100644 --- a/test/requests/compute/aggregate_tests.rb +++ b/test/requests/compute/aggregate_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Compute | Compute aggregate requests" do +describe "Fog::Compute[:openstack] | Compute aggregate requests" do before do @aggregate_format = { "availability_zone" => Fog::Nullable::String, @@ -14,7 +14,7 @@ @detailed_aggregate_format = @aggregate_format.merge('hosts' => Array) @metadata_aggregate_format = @aggregate_format.merge("metadata" => Hash) - @compute = Fog::OpenStack::Compute.new + @compute = Fog::Compute[:openstack] @aggregate_body = @compute.create_aggregate('test_aggregate').body @aggregate = @aggregate_body['aggregate'] diff --git a/test/requests/compute/availability_zone_tests.rb b/test/requests/compute/availability_zone_tests.rb index 2da624419..6a2137ed0 100644 --- a/test/requests/compute/availability_zone_tests.rb +++ b/test/requests/compute/availability_zone_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Compute | availability zone requests" do +describe "Fog::Compute[:openstack] | availability zone requests" do before do @flavor_format = { 'zoneName' => String, @@ -11,12 +11,12 @@ describe "success" do it "#list_zones" do - Fog::OpenStack::Compute.new.list_zones.body. + Fog::Compute[:openstack].list_zones.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end it "#list_zones_detailed" do - Fog::OpenStack::Compute.new.list_zones_detailed.body. + Fog::Compute[:openstack].list_zones_detailed.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end end diff --git a/test/requests/compute/flavor_tests.rb b/test/requests/compute/flavor_tests.rb index 27052fd67..171fe10cf 100644 --- a/test/requests/compute/flavor_tests.rb +++ b/test/requests/compute/flavor_tests.rb @@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::OpenStack::Compute | flavor requests" do +describe "Fog::Compute[:openstack] | flavor requests" do before do @flavor_format = { 'id' => String, @@ -18,7 +18,7 @@ 'vcpus' => Integer } - @compute = Fog::OpenStack::Compute.new + @compute = Fog::Compute[:openstack] end describe "success" do @@ -89,14 +89,14 @@ it "#get_flavor_details(0)" do proc do @compute.get_flavor_details("0") - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end it "add_flavor_access(1234, 1)" do unless Fog.mocking? proc do @compute.add_flavor_access(1234, 1).body - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -104,7 +104,7 @@ unless Fog.mocking? proc do @compute.remove_flavor_access(1234, 1).body - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -112,7 +112,7 @@ unless Fog.mocking? proc do @compute.list_tenants_with_flavor_access(1234) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -120,7 +120,7 @@ unless Fog.mocking? proc do @compute.get_flavor_metadata("1234").body - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -129,7 +129,7 @@ proc do metadata = {:cpu_arch => 'x86_64'} @compute.create_flavor_metadata("1234", metadata).body - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end end diff --git a/test/requests/compute/helper.rb b/test/requests/compute/helper.rb index d549e69a2..ee4e0d547 100644 --- a/test/requests/compute/helper.rb +++ b/test/requests/compute/helper.rb @@ -11,15 +11,15 @@ module Formats end def get_flavor_ref - ENV['OPENSTACK_FLAVOR_REF'] || Fog::OpenStack::Compute.new.list_flavors.body['flavors'].first['id'] + ENV['OPENSTACK_FLAVOR_REF'] || Fog::Compute[:openstack].list_flavors.body['flavors'].first['id'] end def get_image_ref - ENV['OPENSTACK_IMAGE_REF'] || Fog::OpenStack::Compute.new.list_images.body['images'].first['id'] + ENV['OPENSTACK_IMAGE_REF'] || Fog::Compute[:openstack].list_images.body['images'].first['id'] end def get_volume_ref - ENV['OPENSTACK_VOLUME_REF'] || Fog::OpenStack::Compute.new.list_volumes.body['volumes'].first['id'] + ENV['OPENSTACK_VOLUME_REF'] || Fog::Compute[:openstack].list_volumes.body['volumes'].first['id'] end def get_flavor_ref_resize @@ -34,5 +34,5 @@ def set_password_enabled def get_security_group_ref ENV['OPENSTACK_SECURITY_GROUP_REF'] || - Fog::OpenStack::Compute.new.list_security_groups.body['security_groups'].first['name'] + Fog::Compute[:openstack].list_security_groups.body['security_groups'].first['name'] end diff --git a/test/requests/compute/image_tests.rb b/test/requests/compute/image_tests.rb index 6577314ca..b2d21675f 100644 --- a/test/requests/compute/image_tests.rb +++ b/test/requests/compute/image_tests.rb @@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::OpenStack::Compute | image requests" do +describe "Fog::Compute[:openstack] | image requests" do before do @image_format = { 'created' => Fog::Nullable::String, @@ -18,12 +18,12 @@ 'links' => Array } - @compute = Fog::OpenStack::Compute.new + @compute = Fog::Compute[:openstack] end describe "success" do before do - @image_id = Fog::OpenStack::Compute.new.images[0].id + @image_id = Fog::Compute[:openstack].images[0].id unless Fog.mocking? @compute.images.get(@image_id).wait_for { ready? } end @@ -58,7 +58,7 @@ unless Fog.mocking? proc do @compute.delete_image(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -66,7 +66,7 @@ unless Fog.mocking? proc do @compute.get_image_details(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end end diff --git a/test/requests/compute/keypair_tests.rb b/test/requests/compute/keypair_tests.rb index 8f5876eb0..3947bc8fe 100644 --- a/test/requests/compute/keypair_tests.rb +++ b/test/requests/compute/keypair_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Compute | keypair requests" do +describe "Fog::Compute[:openstack] | keypair requests" do before do @keypair_format = { "public_key" => String, @@ -19,17 +19,17 @@ describe "success" do it "#create_key_pair((key_name, public_key = nil))" do - Fog::OpenStack::Compute.new.create_key_pair('from_shindo_test').body. + Fog::Compute[:openstack].create_key_pair('from_shindo_test').body. must_match_schema("keypair" => @keypair_format) end it "#list_key_pairs" do - Fog::OpenStack::Compute.new.list_key_pairs.body. + Fog::Compute[:openstack].list_key_pairs.body. must_match_schema("keypairs" => [{"keypair" => @keypair_list_format}]) end it "#delete_key_pair(key_name)" do - Fog::OpenStack::Compute.new.delete_key_pair('from_shindo_test').status.must_equal 202 + Fog::Compute[:openstack].delete_key_pair('from_shindo_test').status.must_equal 202 end end end diff --git a/test/requests/compute/limit_tests.rb b/test/requests/compute/limit_tests.rb index c827dba8e..2d90621e3 100644 --- a/test/requests/compute/limit_tests.rb +++ b/test/requests/compute/limit_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Compute | limits requests" do +describe "Fog::Compute[:openstack] | limits requests" do before do @rate_limit_format = { 'regex' => String, @@ -44,22 +44,22 @@ describe "success" do describe "#get_limits" do it "format" do - Fog::OpenStack::Compute.new.get_limits.body['limits']. + Fog::Compute[:openstack].get_limits.body['limits']. must_match_schema(@limits_format) end it "rate limit format" do - Fog::OpenStack::Compute.new.get_limits.body['limits']['rate']. + Fog::Compute[:openstack].get_limits.body['limits']['rate']. first.must_match_schema(@rate_limit_format) end it "rate limit usage format" do - Fog::OpenStack::Compute.new.get_limits.body['limits']['rate']. + Fog::Compute[:openstack].get_limits.body['limits']['rate']. first['limit'].first.must_match_schema(@rate_limit_usage_format) end it "absolute limits format" do - Fog::OpenStack::Compute.new.get_limits.body['limits']['absolute']. + Fog::Compute[:openstack].get_limits.body['limits']['absolute']. must_match_schema(@absolute_limits_format) end end diff --git a/test/requests/compute/quota_tests.rb b/test/requests/compute/quota_tests.rb index 584622010..ef0657267 100644 --- a/test/requests/compute/quota_tests.rb +++ b/test/requests/compute/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Compute | quota requests" do +describe "Fog::Compute[:openstack] | quota requests" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'key_pairs' => Integer, @@ -21,7 +21,7 @@ 'id' => String } - @compute = Fog::OpenStack::Compute.new + @compute = Fog::Compute[:openstack] @quota = @compute.get_quota(@tenant_id).body['quota_set'] end diff --git a/test/requests/compute/security_group_tests.rb b/test/requests/compute/security_group_tests.rb index f776fd523..1767a6dc5 100644 --- a/test/requests/compute/security_group_tests.rb +++ b/test/requests/compute/security_group_tests.rb @@ -22,7 +22,7 @@ "parent_group_id" => Integer } - @compute = Fog::OpenStack::Compute.new + @compute = Fog::Compute[:openstack] @security_group = @compute.create_security_group('from_shindo_test', 'this is from the shindo test' ).body diff --git a/test/requests/compute/server_tests.rb b/test/requests/compute/server_tests.rb index 3d7b30c3f..3f57e4515 100644 --- a/test/requests/compute/server_tests.rb +++ b/test/requests/compute/server_tests.rb @@ -2,12 +2,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::OpenStack::Compute | server requests" do +describe "Fog::Compute[:openstack] | server requests" do def self.compute class_variable_get(:@@compute) end - class_variable_set(:@@compute, Fog::OpenStack::Compute.new) + class_variable_set(:@@compute, Fog::Compute[:openstack]) def compute self.class.compute @@ -153,7 +153,7 @@ def compute @data = compute.create_server("test", @image_id, @flavor_id).body['server'] @server_id = @data['id'] compute.servers.get(@server_id).wait_for { ready? } unless Fog.mocking? - # Fog::OpenStack::Compute.new.servers.get(@server_id).wait_for { ready? } + # Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } end it "#create_server('test', #{@image_id}, 19)" do @@ -331,7 +331,7 @@ def compute # DELETE IMAGE it "#delete_image(#{@snapshot_id})" do - Fog::OpenStack::Compute.new.servers.get(@server_id).wait_for { ready? } + Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } assert(compute.delete_image(@snapshot_id)) end end @@ -341,26 +341,26 @@ def compute it "#delete_server(0)" do proc do self.class.compute.delete_server(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end it "#get_server_details(0)" do proc do self.class.compute.get_server_details(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end it "#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')" do proc do self.class.compute.update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver') - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end it "#reboot_server(0)" do unless Fog.mocking? proc do self.class.compute.reboot_server(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -368,7 +368,7 @@ def compute unless Fog.mocking? proc do self.class.compute.start_server(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end @@ -376,7 +376,7 @@ def compute unless Fog.mocking? proc do self.class.compute.stop_server(0) - end.must_raise Fog::OpenStack::Compute::NotFound + end.must_raise Fog::Compute::OpenStack::NotFound end end end diff --git a/test/requests/compute/service_tests.rb b/test/requests/compute/service_tests.rb index 74f1a6063..5107caa6c 100644 --- a/test/requests/compute/service_tests.rb +++ b/test/requests/compute/service_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Shindo.tests('Fog::OpenStack::Compute.new | service requests" do +describe "Shindo.tests('Fog::Compute[:openstack] | service requests" do before do @service_format = { "id" => Integer, @@ -12,7 +12,7 @@ "zone" => String, 'disabled_reason' => Fog::Nullable::String } - @services = Fog::OpenStack::Compute.new.list_services.body + @services = Fog::Compute[:openstack].list_services.body @service = @services['services'].last end @@ -22,13 +22,13 @@ end it "#disable_service" do - Fog::OpenStack::Compute.new.disable_service( + Fog::Compute[:openstack].disable_service( @service['host'], @service['binary'] ).body["service"]["status"].must_equal "disabled" end it "#disable_service_log_reason" do - disabled_service = Fog::OpenStack::Compute.new.disable_service_log_reason( + disabled_service = Fog::Compute[:openstack].disable_service_log_reason( @service['host'], @service['binary'], 'reason' ).body disabled_service["service"]["status"].must_equal "disabled" @@ -36,7 +36,7 @@ end it "#enable_service" do - Fog::OpenStack::Compute.new.enable_service( + Fog::Compute[:openstack].enable_service( @service['host'], @service['binary'] ).body["service"]["status"].must_equal "enabled" end diff --git a/test/requests/compute/tenant_tests.rb b/test/requests/compute/tenant_tests.rb index ccc25cc02..b6804793d 100644 --- a/test/requests/compute/tenant_tests.rb +++ b/test/requests/compute/tenant_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Compute | tenant requests" do +describe "Fog::Compute[:openstack] | tenant requests" do before do @tenant_format = { 'id' => String, @@ -12,13 +12,13 @@ describe "success" do it "#list_tenants" do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') identity.list_tenants.body. must_match_schema('tenants_links' => Array, 'tenants' => [@tenant_format]) end it "#set_tenant admin" do - Fog::OpenStack::Compute.new.set_tenant("admin").must_equal true + Fog::Compute[:openstack].set_tenant("admin").must_equal true end end end diff --git a/test/requests/compute/volume_tests.rb b/test/requests/compute/volume_tests.rb index ec78c1409..1237d4878 100644 --- a/test/requests/compute/volume_tests.rb +++ b/test/requests/compute/volume_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Compute | volume requests" do +describe "Fog::Compute[:openstack] | volume requests" do before do @volume_format = { 'id' => String, @@ -16,7 +16,7 @@ 'metadata' => Hash } - @compute = Fog::OpenStack::Compute.new + @compute = Fog::Compute[:openstack] @volume = @compute.create_volume('loud', 'this is a loud volume', 3).body end diff --git a/test/requests/container_infra/bay_model_tests.rb b/test/requests/container_infra/bay_model_tests.rb index 677c26dff..903268315 100644 --- a/test/requests/container_infra/bay_model_tests.rb +++ b/test/requests/container_infra/bay_model_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | bay model requests" do +describe "Fog::ContainerInfra[:openstack] | bay model requests" do before do @bay_model_format = { "insecure_registry" => Fog::Nullable::String, diff --git a/test/requests/container_infra/bay_tests.rb b/test/requests/container_infra/bay_tests.rb index 3f0fe6713..83254a9b8 100644 --- a/test/requests/container_infra/bay_tests.rb +++ b/test/requests/container_infra/bay_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | bay requests" do +describe "Fog::ContainerInfra[:openstack] | bay requests" do before do @bay_format = { "status" => String, diff --git a/test/requests/container_infra/certificate_tests.rb b/test/requests/container_infra/certificate_tests.rb index 488bb3b5e..8dfff9dda 100644 --- a/test/requests/container_infra/certificate_tests.rb +++ b/test/requests/container_infra/certificate_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | certificate requests" do +describe "Fog::ContainerInfra[:openstack] | certificate requests" do before do @certificate_format = { "pem" => String, diff --git a/test/requests/container_infra/cluster_template_tests.rb b/test/requests/container_infra/cluster_template_tests.rb index 418a580a4..a8f495355 100644 --- a/test/requests/container_infra/cluster_template_tests.rb +++ b/test/requests/container_infra/cluster_template_tests.rb @@ -3,7 +3,7 @@ @cluster_templates = [] -describe "Fog::OpenStack::ContainerInfra | cluster template requests" do +describe "Fog::ContainerInfra[:openstack] | cluster template requests" do before do @cluster_template_format = { "insecure_registry" => Fog::Nullable::String, diff --git a/test/requests/container_infra/cluster_tests.rb b/test/requests/container_infra/cluster_tests.rb index 100a3c08a..63812e15d 100644 --- a/test/requests/container_infra/cluster_tests.rb +++ b/test/requests/container_infra/cluster_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::OpenStack::ContainerInfra | cluster requests" do +describe "Fog::ContainerInfra[:openstack] | cluster requests" do before do @cluster_format = { "status" => String, diff --git a/test/requests/dns_v1/domain_tests.rb b/test/requests/dns_v1/domain_tests.rb index 0774c6ccc..d714d7ae6 100644 --- a/test/requests/dns_v1/domain_tests.rb +++ b/test/requests/dns_v1/domain_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::DNS::V1 | domain requests" do +describe "Fog::DNS::OpenStack::V1 | domain requests" do before do - @dns = Fog::OpenStack::DNS::V1.new + @dns = Fog::DNS::OpenStack::V1.new @domain_format = { "id" => String, diff --git a/test/requests/dns_v1/quota_tests.rb b/test/requests/dns_v1/quota_tests.rb index 0733b5383..674b08323 100644 --- a/test/requests/dns_v1/quota_tests.rb +++ b/test/requests/dns_v1/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::DNS::V1 | quota requests" do +describe "Fog::DNS::OpenStack::V1 | quota requests" do before do - @dns = Fog::OpenStack::DNS::V1.new + @dns = Fog::DNS::OpenStack::V1.new @project_id = Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/dns_v2/pool_tests.rb b/test/requests/dns_v2/pool_tests.rb index e8a68ed4c..8714f1252 100644 --- a/test/requests/dns_v2/pool_tests.rb +++ b/test/requests/dns_v2/pool_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::OpenStack::DNS::V2 | pool requests" do +describe "Fog::DNS::OpenStack::V2 | pool requests" do before do @dns, = set_dns_data diff --git a/test/requests/dns_v2/quota_tests.rb b/test/requests/dns_v2/quota_tests.rb index aec0065d3..959983d31 100644 --- a/test/requests/dns_v2/quota_tests.rb +++ b/test/requests/dns_v2/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::DNS::V2 | quota requests" do +describe "Fog::DNS::OpenStack::V2 | quota requests" do before do - @dns = Fog::OpenStack::DNS::V2.new + @dns = Fog::DNS::OpenStack::V2.new @project_id = @dns.respond_to?(:current_tenant) ? @dns.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/dns_v2/recordset_tests.rb b/test/requests/dns_v2/recordset_tests.rb index 6d1b6295b..9289f69a1 100644 --- a/test/requests/dns_v2/recordset_tests.rb +++ b/test/requests/dns_v2/recordset_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::OpenStack::DNS::V2 | recordset requests" do +describe "Fog::DNS::OpenStack::V2 | recordset requests" do before do @dns, @zone, @zone_id = set_dns_data diff --git a/test/requests/dns_v2/zone_tests.rb b/test/requests/dns_v2/zone_tests.rb index 940777afb..53acbff4e 100644 --- a/test/requests/dns_v2/zone_tests.rb +++ b/test/requests/dns_v2/zone_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::OpenStack::DNS::V2 | zone requests" do +describe "Fog::DNS::OpenStack::V2 | zone requests" do before do @dns, @zone, @zone_id = set_dns_data diff --git a/test/requests/event/event_tests.rb b/test/requests/event/event_tests.rb index f171a334f..6e737213a 100644 --- a/test/requests/event/event_tests.rb +++ b/test/requests/event/event_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Event | event requests" do +describe "Fog::Event[:openstack] | event requests" do before do - @metering = Fog::OpenStack::Event.new + @metering = Fog::Event::OpenStack.new @event_format = { 'message_id' => String, 'event_type' => String diff --git a/test/requests/identity/ec2_credentials_tests.rb b/test/requests/identity/ec2_credentials_tests.rb index bf1891b54..6b627935b 100644 --- a/test/requests/identity/ec2_credentials_tests.rb +++ b/test/requests/identity/ec2_credentials_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | EC2 credential requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @credential_format = { 'access' => String, diff --git a/test/requests/identity/role_tests.rb b/test/requests/identity/role_tests.rb index 4ab969af3..39a433b8d 100644 --- a/test/requests/identity/role_tests.rb +++ b/test/requests/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @role_format = { 'id' => String, diff --git a/test/requests/identity/tenant_tests.rb b/test/requests/identity/tenant_tests.rb index e5158e26c..8aa2c7cfe 100644 --- a/test/requests/identity/tenant_tests.rb +++ b/test/requests/identity/tenant_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | tenant requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_format = { 'id' => String, diff --git a/test/requests/identity/user_tests.rb b/test/requests/identity/user_tests.rb index cedbce996..83ce1054b 100644 --- a/test/requests/identity/user_tests.rb +++ b/test/requests/identity/user_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | user requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @user_format = { 'id' => String, diff --git a/test/requests/image/image_tests.rb b/test/requests/image/image_tests.rb index 7a0fa2815..2843448b8 100644 --- a/test/requests/image/image_tests.rb +++ b/test/requests/image/image_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Image | image requests" do +describe "Fog::Image[:openstack] | image requests" do before(:all) do - openstack = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + openstack = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @image_attributes = { :name => 'new image', @@ -90,7 +90,7 @@ image_attributes[:location] = @test_iso.path end - @instance = Fog::OpenStack::Image.new.create_image(image_attributes).body + @instance = Fog::Image[:openstack].create_image(image_attributes).body end after do @@ -99,11 +99,11 @@ describe "success" do it "#list_public_images" do - Fog::OpenStack::Image.new.list_public_images.body.must_match_schema('images' => [@image_format]) + Fog::Image[:openstack].list_public_images.body.must_match_schema('images' => [@image_format]) end it "#list_public_images_detailed" do - Fog::OpenStack::Image.new.list_public_images_detailed.body. + Fog::Image[:openstack].list_public_images_detailed.body. must_match_schema('images' => [@detailed_image_format]) end @@ -112,12 +112,12 @@ end it "#get_image" do - Fog::OpenStack::Image.new.get_image(@instance['image']['id']).headers. + Fog::Image[:openstack].get_image(@instance['image']['id']).headers. must_match_schema(@image_meta_format) end it "#update_image" do - Fog::OpenStack::Image.new.update_image( + Fog::Image[:openstack].update_image( :id => @instance['image']['id'], :name => 'edit image' ).body['image'].must_match_schema(@detailed_image_format) @@ -125,30 +125,30 @@ it "#add_member_to_image" do [200, 204].must_include( - Fog::OpenStack::Image.new.add_member_to_image( + Fog::Image[:openstack].add_member_to_image( @instance['image']['id'], @instance['image']['owner'] ).status ) end it "#get_image_members" do - [200, 204].must_include(Fog::OpenStack::Image.new.get_image_members(@instance['image']['id']).status) + [200, 204].must_include(Fog::Image[:openstack].get_image_members(@instance['image']['id']).status) end it "#get_shared_images" do - [200, 204].must_include(Fog::OpenStack::Image.new.get_shared_images(@instance['image']['owner']).status) + [200, 204].must_include(Fog::Image[:openstack].get_shared_images(@instance['image']['owner']).status) end it "#remove_member_from_image" do [200, 204].must_include( - Fog::OpenStack::Image.new.remove_member_from_image( + Fog::Image[:openstack].remove_member_from_image( @instance['image']['id'], @instance['image']['owner'] ).status ) end it "#delete_image" do - Fog::OpenStack::Image.new.delete_image(@instance['image']['id']).status.must_equal 200 + Fog::Image[:openstack].delete_image(@instance['image']['id']).status.must_equal 200 end end end diff --git a/test/requests/introspection/introspection_tests.rb b/test/requests/introspection/introspection_tests.rb index 126b7e70d..14aaaa403 100644 --- a/test/requests/introspection/introspection_tests.rb +++ b/test/requests/introspection/introspection_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Introspection | Introspection requests" do +describe "Fog::Introspection::OpenStack | Introspection requests" do before do - @inspector = Fog::OpenStack::Introspection.new + @inspector = Fog::Introspection::OpenStack.new @node_uuid = Fog::UUID.uuid diff --git a/test/requests/introspection/rules_tests.rb b/test/requests/introspection/rules_tests.rb index 0835154d8..0cc4def6b 100644 --- a/test/requests/introspection/rules_tests.rb +++ b/test/requests/introspection/rules_tests.rb @@ -2,7 +2,7 @@ describe "@inspector | Introspection rules requests" do before do - @inspector = Fog::OpenStack::Introspection.new + @inspector = Fog::Introspection::OpenStack.new @rules_id = Fog::UUID.uuid @rules = { 'description' => Fog::Nullable::String, diff --git a/test/requests/metering/event_tests.rb b/test/requests/metering/event_tests.rb index c07553403..237c766f9 100644 --- a/test/requests/metering/event_tests.rb +++ b/test/requests/metering/event_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Metering | event requests" do +describe "Fog::Metering[:openstack] | event requests" do before do - @metering = Fog::OpenStack::Metering.new + @metering = Fog::Metering[:openstack] @event_format = { 'message_id' => String, 'event_type' => String diff --git a/test/requests/metering/meter_tests.rb b/test/requests/metering/meter_tests.rb index c41ec5763..890121dd5 100644 --- a/test/requests/metering/meter_tests.rb +++ b/test/requests/metering/meter_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Metering | meter requests" do +describe "Fog::Metering[:openstack] | meter requests" do before do - @metering = Fog::OpenStack::Metering.new + @metering = Fog::Metering[:openstack] @sample_format = { 'counter_name' => String, diff --git a/test/requests/metering/resource_tests.rb b/test/requests/metering/resource_tests.rb index 16b706ba1..0ac533eb8 100644 --- a/test/requests/metering/resource_tests.rb +++ b/test/requests/metering/resource_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Metering | resource requests" do +describe "Fog::Metering[:openstack] | resource requests" do before do - @metering = Fog::OpenStack::Metering.new + @metering = Fog::Metering[:openstack] @resource_format = { 'resource_id' => String, diff --git a/test/requests/metric/metric_test.rb b/test/requests/metric/metric_test.rb index 4918afdd6..a914a8f94 100644 --- a/test/requests/metric/metric_test.rb +++ b/test/requests/metric/metric_test.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Metric | metric requests" do +describe "Fog::Metric::OpenStack | metric requests" do before do - @metric = Fog::OpenStack::Metric.new + @metric = Fog::Metric::OpenStack.new end describe "success" do diff --git a/test/requests/metric/resource_test.rb b/test/requests/metric/resource_test.rb index d6b34f723..2a0cb9bf1 100644 --- a/test/requests/metric/resource_test.rb +++ b/test/requests/metric/resource_test.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Metric | metric requests" do +describe "Fog::Metric::OpenStack | metric requests" do before do - @metric = Fog::OpenStack::Metric.new + @metric = Fog::Metric::OpenStack.new end describe "success" do diff --git a/test/requests/network/extension_tests.rb b/test/requests/network/extension_tests.rb index 11fec830e..62e3770bd 100644 --- a/test/requests/network/extension_tests.rb +++ b/test/requests/network/extension_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | extension requests" do +describe "Fog::Network[:openstack] | extension requests" do before do @extension_format = { 'id' => String, @@ -28,7 +28,7 @@ it "#get_extension" do proc do network.get_extension(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/ike_policy_tests.rb b/test/requests/network/ike_policy_tests.rb index e76b67732..f328a04c5 100644 --- a/test/requests/network/ike_policy_tests.rb +++ b/test/requests/network/ike_policy_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | ike_policy requests" do +describe "Fog::Network[:openstack] | ike_policy requests" do describe "success" do before do @ike_policy_format = { @@ -74,19 +74,19 @@ it "#get_ike_policy" do proc do network.get_ike_policy(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_ike_policy" do proc do network.update_ike_policy(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_ike_policy" do proc do network.delete_ike_policy(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/ipsec_policy_tests.rb b/test/requests/network/ipsec_policy_tests.rb index f3c1d3873..8adb769e5 100644 --- a/test/requests/network/ipsec_policy_tests.rb +++ b/test/requests/network/ipsec_policy_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Network | ipsec_policy requests" do +describe "Fog::Network[:openstack] | ipsec_policy requests" do before do @ipsec_policy_format = { 'id' => String, @@ -76,19 +76,19 @@ it "#get_ipsec_policy" do proc do network.get_ipsec_policy(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_ipsec_policy" do proc do network.update_ipsec_policy(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_ipsec_policy" do proc do network.delete_ipsec_policy(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/ipsec_site_connection_tests.rb b/test/requests/network/ipsec_site_connection_tests.rb index 0912b07cc..d39abdd8a 100644 --- a/test/requests/network/ipsec_site_connection_tests.rb +++ b/test/requests/network/ipsec_site_connection_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | ipsec_site_connection requests" do +describe "Fog::Network[:openstack] | ipsec_site_connection requests" do before do @ipsec_site_connection_format = { 'id' => String, @@ -100,19 +100,19 @@ it "#get_ipsec_site_connection" do proc do network.get_ipsec_site_connection(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_ipsec_site_connection" do proc do network.update_ipsec_site_connection(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_ipsec_site_connection" do proc do network.delete_ipsec_site_connection(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/lb_health_monitor_tests.rb b/test/requests/network/lb_health_monitor_tests.rb index a0dc44547..9d18c48a7 100644 --- a/test/requests/network/lb_health_monitor_tests.rb +++ b/test/requests/network/lb_health_monitor_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | lb_health_monitor requests" do +describe "Fog::Network[:openstack] | lb_health_monitor requests" do before do @lb_health_monitor_format = { 'id' => String, @@ -98,31 +98,31 @@ it "#get_lb_health_monitor" do proc do network.get_lb_health_monitor(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_lb_health_monitor" do proc do network.update_lb_health_monitor(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#associate_lb_health_monitor" do proc do network.associate_lb_health_monitor(0, 0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#disassociate_lb_health_monitor" do proc do network.disassociate_lb_health_monitor(0, 0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_lb_health_monitor" do proc do network.delete_lb_health_monitor(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/lb_member_tests.rb b/test/requests/network/lb_member_tests.rb index eb734bfb9..4d8dfd8ae 100644 --- a/test/requests/network/lb_member_tests.rb +++ b/test/requests/network/lb_member_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | lb_member requests" do +describe "Fog::Network[:openstack] | lb_member requests" do describe "success" do before do @lb_member_format = { @@ -63,19 +63,19 @@ it "#get_lb_member" do proc do network.get_lb_member(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_lb_member" do proc do network.update_lb_member(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_lb_member" do proc do network.delete_lb_member(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/lb_pool_tests.rb b/test/requests/network/lb_pool_tests.rb index 4a56292a6..baa0065b6 100644 --- a/test/requests/network/lb_pool_tests.rb +++ b/test/requests/network/lb_pool_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | lb_pool requests" do +describe "Fog::Network[:openstack] | lb_pool requests" do before do @lb_pool_format = { 'id' => String, @@ -86,19 +86,19 @@ it "#get_lb_pool" do proc do network.get_lb_pool(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_lb_pool" do proc do network.update_lb_pool(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_lb_pool" do proc do network.delete_lb_pool(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/lb_vip_tests.rb b/test/requests/network/lb_vip_tests.rb index e92bc2e15..3926c4fe5 100644 --- a/test/requests/network/lb_vip_tests.rb +++ b/test/requests/network/lb_vip_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | lb_vip requests" do +describe "Fog::Network[:openstack] | lb_vip requests" do describe "success" do before do @lb_vip_format = { @@ -74,19 +74,19 @@ it "#get_lb_vip" do proc do network.get_lb_vip(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_lb_vip" do proc do network.update_lb_vip(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_lb_vip" do proc do network.delete_lb_vip(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/network_tests.rb b/test/requests/network/network_tests.rb index 57bdeab8b..dc486084a 100644 --- a/test/requests/network/network_tests.rb +++ b/test/requests/network/network_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/network_helper.rb' -describe "Fog::OpenStack::Network | network requests" do +describe "Fog::Network[:openstack] | network requests" do describe "success" do let(:network_format) do { @@ -124,19 +124,19 @@ it "#get_network" do proc do network.get_network(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_network" do proc do network.update_network(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_network" do proc do network.delete_network(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end diff --git a/test/requests/network/port_tests.rb b/test/requests/network/port_tests.rb index 8caf37014..76a75f69c 100644 --- a/test/requests/network/port_tests.rb +++ b/test/requests/network/port_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | port requests" do +describe "Fog::Network[:openstack] | port requests" do before do @port_format = { 'id' => String, @@ -75,19 +75,19 @@ it "#get_port" do proc do network.get_port(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_port" do proc do network.update_port(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_port" do proc do network.delete_port(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/quota_tests.rb b/test/requests/network/quota_tests.rb index e5d06c2cc..9c74e578d 100644 --- a/test/requests/network/quota_tests.rb +++ b/test/requests/network/quota_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::OpenStack::Network | quota requests" do +describe "Fog::Network[:openstack] | quota requests" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_format = { 'subnet' => Fog::Nullable::Integer, diff --git a/test/requests/network/router_tests.rb b/test/requests/network/router_tests.rb index 6b10de227..d50538a4a 100644 --- a/test/requests/network/router_tests.rb +++ b/test/requests/network/router_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | router requests" do +describe "Fog::Network[:openstack] | router requests" do before do @router_format = { :id => String, @@ -69,19 +69,19 @@ it "#get_router" do proc do network.get_router(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_router" do proc do network.update_router(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_router" do proc do network.delete_router(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/security_group_rule_tests.rb b/test/requests/network/security_group_rule_tests.rb index f8083255b..3bb12f1d4 100644 --- a/test/requests/network/security_group_rule_tests.rb +++ b/test/requests/network/security_group_rule_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | security_grouprule requests" do +describe "Fog::Network[:openstack] | security_grouprule requests" do before do @security_group_rule_format = { "id" => String, @@ -59,13 +59,13 @@ it "#get_security_group_rule(0)" do proc do network.get_security_group_rule(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_security_group_rule(0)" do proc do network.delete_security_group_rule(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/security_group_tests.rb b/test/requests/network/security_group_tests.rb index 6622e4fed..73e51b5de 100644 --- a/test/requests/network/security_group_tests.rb +++ b/test/requests/network/security_group_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/network_helper' -describe "Fog::OpenStack::Network | security_group requests" do +describe "Fog::Network[:openstack] | security_group requests" do before do @security_group_format = { "id" => String, @@ -54,13 +54,13 @@ it "#get_security_group(0)" do proc do network.get_security_group(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_security_group(0)" do proc do network.delete_security_group(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/subnet_pool_tests.rb b/test/requests/network/subnet_pool_tests.rb index 50005886f..72d11f828 100644 --- a/test/requests/network/subnet_pool_tests.rb +++ b/test/requests/network/subnet_pool_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | subnet_pool requests" do +describe "Fog::Network[:openstack] | subnet_pool requests" do before do @subnet_pool_format = { 'id' => String, @@ -59,19 +59,19 @@ it "#get_subnet_pool" do proc do network.get_subnet_pool(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_subnet_pool" do proc do network.update_subnet_pool(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_subnet_pool" do proc do network.delete_subnet_pool(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/subnet_tests.rb b/test/requests/network/subnet_tests.rb index e18338382..6463a0435 100644 --- a/test/requests/network/subnet_tests.rb +++ b/test/requests/network/subnet_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | subnet requests" do +describe "Fog::Network[:openstack] | subnet requests" do before do @subnet_format = { 'id' => String, @@ -70,19 +70,19 @@ it "#get_subnet" do proc do network.get_subnet(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_subnet" do proc do network.update_subnet(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_subnet" do proc do network.delete_subnet(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/network/vpn_service_tests.rb b/test/requests/network/vpn_service_tests.rb index 1145a03f6..52113ef4c 100644 --- a/test/requests/network/vpn_service_tests.rb +++ b/test/requests/network/vpn_service_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Network | vpn_service requests" do +describe "Fog::Network[:openstack] | vpn_service requests" do before do @vpn_service_format = { 'id' => String, @@ -68,19 +68,19 @@ it "#get_vpn_service" do proc do network.get_vpn_service(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#update_lb_pool" do proc do network.update_lb_pool(0, {}) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end it "#delete_vpn_service" do proc do network.delete_vpn_service(0) - end.must_raise Fog::OpenStack::Network::NotFound + end.must_raise Fog::Network::OpenStack::NotFound end end end diff --git a/test/requests/orchestration/stack_files_util_helper_tests.rb b/test/requests/orchestration/stack_files_util_helper_tests.rb index 1ade003a6..c520ec20e 100644 --- a/test/requests/orchestration/stack_files_util_helper_tests.rb +++ b/test/requests/orchestration/stack_files_util_helper_tests.rb @@ -2,7 +2,7 @@ require "yaml" require "open-uri" -describe "Fog::OpenStack::Orchestration | stack requests" do +describe "Fog::Orchestration[:openstack] | stack requests" do @create_format_files = { 'id' => String, 'links' => Array, @@ -15,8 +15,8 @@ @data = YAML.load_file("stack_files_util_tests.yaml") @template_yaml = YAML.load_file("template.yaml") @local_yaml = YAML.load_file("local.yaml") - @orchestration = Fog::OpenStack::Orchestration.new - @file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) + @orchestration = Fog::Orchestration[:openstack] + @file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) end after do Dir.chdir(@oldcwd) diff --git a/test/requests/orchestration/stack_files_util_tests.rb b/test/requests/orchestration/stack_files_util_tests.rb index fad89d19d..ca727e704 100644 --- a/test/requests/orchestration/stack_files_util_tests.rb +++ b/test/requests/orchestration/stack_files_util_tests.rb @@ -6,7 +6,7 @@ def travis? File.exist?('/home/travis/build/fog/fog-openstack') end -describe "Fog::OpenStack::Orchestration | stack requests" do +describe "Fog::Orchestration[:openstack] | stack requests" do @create_format_files = { 'id' => String, 'links' => Array, @@ -19,8 +19,8 @@ def travis? @data = YAML.load_file("stack_files_util_tests.yaml") @template_yaml = YAML.load_file("template.yaml") @local_yaml = YAML.load_file("local.yaml") - @orchestration = Fog::OpenStack::Orchestration.new - @file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) + @orchestration = Fog::Orchestration[:openstack] + @file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) end after do Dir.chdir(@oldcwd) @@ -36,7 +36,7 @@ def travis? [{"get_file" => "foo.sh", "b" => "values"}, {'foo.sh'=>'# Just a mock'}], ] test_cases.each do |data, expected| - file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) + file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) file_resolver.send(:get_file_contents, data, nil) assert_equal(file_resolver.files, expected) end @@ -53,7 +53,7 @@ def travis? test_cases.each do |data, expected| Fog::Logger.warning("Testing with #{data} #{expected}") expected = prefix_with_url(expected, @base_url) - file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) + file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) file_resolver.send(:get_file_contents, data, @base_url) assert_equal(file_resolver.files.keys, expected) end @@ -65,7 +65,7 @@ def travis? end.compact test_cases.each do |data, _| assert_raises ArgumentError, URI::InvalidURIError do - Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) + Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) end end end @@ -76,7 +76,7 @@ def travis? [testcase['input'], testcase['expected']] end.compact test_cases.each do |data, expected| - file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) + file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) assert_equal_set(file_resolver.files.keys, expected) end end @@ -90,13 +90,13 @@ def travis? test_cases.push([@local_yaml, ["local.yaml", "hot_1.yaml"]]) test_cases.each do |data, expected| expected = prefix_with_url(expected, @base_url) - file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) + file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) assert_equal_set(file_resolver.files.keys, expected) end end it "#dont_modify_passed_template" do - file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(@local_yaml) + file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(@local_yaml) template = file_resolver.template # The template argument should be modified. diff --git a/test/requests/orchestration/stack_tests.rb b/test/requests/orchestration/stack_tests.rb index 4becd492d..ad6862667 100644 --- a/test/requests/orchestration/stack_tests.rb +++ b/test/requests/orchestration/stack_tests.rb @@ -1,15 +1,15 @@ require "test_helper" require 'fog/core' -describe "Fog::OpenStack::Orchestration | stack requests" do +describe "Fog::Orchestration[:openstack] | stack requests" do before do @oldcwd = Dir.pwd Dir.chdir("test/requests/orchestration") @base_url = "file://" + File.absolute_path(".") - @orchestration = Fog::OpenStack::Orchestration.new + @orchestration = Fog::Orchestration[:openstack] - @stack_mock = Fog::OpenStack::Orchestration::Stack.new( + @stack_mock = Fog::Orchestration::OpenStack::Stack.new( :template_name => "stack_mock", :id => "stack_id" ) diff --git a/test/requests/planning/plan_tests.rb b/test/requests/planning/plan_tests.rb index 602ab706c..83c987834 100644 --- a/test/requests/planning/plan_tests.rb +++ b/test/requests/planning/plan_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Planning | Planning plan requests" do +describe "Fog::OpenStack[:planning] | Planning plan requests" do before do @plan_format = { "created_at" => Fog::Nullable::String, @@ -14,9 +14,9 @@ } @plan_templates_format = Hash - @plans = Fog::OpenStack::Planning.new.list_plans.body + @plans = Fog::OpenStack[:planning].list_plans.body @instance = @plans.first - @role_instance = Fog::OpenStack::Planning.new.list_roles.body.first + @role_instance = Fog::OpenStack[:planning].list_roles.body.first end describe "success" do @@ -25,11 +25,11 @@ end it "#get_plan" do - Fog::OpenStack::Planning.new.get_plan(@instance['uuid']).body.must_match_schema(@plan_format) + Fog::OpenStack[:planning].get_plan(@instance['uuid']).body.must_match_schema(@plan_format) end it "#delete_plan" do - Fog::OpenStack::Planning.new.delete_plan(@instance['uuid']).status.must_equal 204 + Fog::OpenStack[:planning].delete_plan(@instance['uuid']).status.must_equal 204 end it "#create_plan" do @@ -37,19 +37,19 @@ :name => 'test-plan-name', :description => 'test-plan-desc', } - @instance = Fog::OpenStack::Planning.new.create_plan(plan_attributes).body + @instance = Fog::OpenStack[:planning].create_plan(plan_attributes).body @instance.must_match_schema(@plan_format) end it "#add_role_to_plan" do - Fog::OpenStack::Planning.new.add_role_to_plan( + Fog::OpenStack[:planning].add_role_to_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end it "#patch_plan" do - parameters = Fog::OpenStack::Planning.new.get_plan(@instance['uuid']). + parameters = Fog::OpenStack[:planning].get_plan(@instance['uuid']). body['parameters'][0..1] plan_parameters = parameters.collect do |parameter| { @@ -57,17 +57,17 @@ "value" => "test-#{parameter['name']}-value", } end - Fog::OpenStack::Planning.new.patch_plan(@instance['uuid'], plan_parameters).body. + Fog::OpenStack[:planning].patch_plan(@instance['uuid'], plan_parameters).body. must_match_schema(@plan_format) end it "#get_plan_templates" do - Fog::OpenStack::Planning.new.get_plan_templates(@instance['uuid']).body. + Fog::OpenStack[:planning].get_plan_templates(@instance['uuid']).body. must_match_schema(@plan_templates_format) end it "#remove_role_from_plan" do - Fog::OpenStack::Planning.new.remove_role_from_plan( + Fog::OpenStack[:planning].remove_role_from_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end diff --git a/test/requests/planning/role_tests.rb b/test/requests/planning/role_tests.rb index 0545482ea..56d790e46 100644 --- a/test/requests/planning/role_tests.rb +++ b/test/requests/planning/role_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack::Planning | Planning role requests" do +describe "Fog::OpenStack[:planning] | Planning role requests" do before do @role_format = { 'description' => Fog::Nullable::String, @@ -12,7 +12,7 @@ describe "success" do it "#list_roles" do - Fog::OpenStack::Planning.new.list_roles.body.must_match_schema([@role_format]) + Fog::OpenStack[:planning].list_roles.body.must_match_schema([@role_format]) end end end diff --git a/test/requests/shared_file_system/quota_tests.rb b/test/requests/shared_file_system/quota_tests.rb index d2fe3db20..412af7dc0 100644 --- a/test/requests/shared_file_system/quota_tests.rb +++ b/test/requests/shared_file_system/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::SharedFileSystem | quota requests" do +describe "Fog::SharedFileSystem::OpenStack | quota requests" do before do - @manila = Fog::OpenStack::SharedFileSystem.new + @manila = Fog::SharedFileSystem::OpenStack.new @project_id = @manila.respond_to?(:current_tenant) ? @manila.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/storage/container_tests.rb b/test/requests/storage/container_tests.rb index 148ded79f..3a4603d55 100644 --- a/test/requests/storage/container_tests.rb +++ b/test/requests/storage/container_tests.rb @@ -1,16 +1,16 @@ require "test_helper" -describe "Fog::OpenStack::Storage | container requests" do +describe "Fog::Storage[:openstack] | container requests" do def cleanup_container return if Fog.mocking? if @storage.head_container(@container_name) @storage.delete_container(@container_name) end - rescue Fog::OpenStack::Storage::NotFound + rescue Fog::Storage::OpenStack::NotFound end before do - @storage = Fog::OpenStack::Storage.new + @storage = Fog::Storage[:openstack] @container_format = [String] @container_name = 'fogcontainertests' @@ -85,7 +85,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.get_container('fognoncontainer') - end.must_raise Fog::OpenStack::Storage::NotFound + end.must_raise Fog::Storage::OpenStack::NotFound end end @@ -93,7 +93,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.head_container('fognoncontainer') - end.must_raise Fog::OpenStack::Storage::NotFound + end.must_raise Fog::Storage::OpenStack::NotFound end end @@ -101,7 +101,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.delete_container('fognoncontainer') - end.must_raise Fog::OpenStack::Storage::NotFound + end.must_raise Fog::Storage::OpenStack::NotFound end end end diff --git a/test/requests/storage/large_object_tests.rb b/test/requests/storage/large_object_tests.rb index cc8ca9803..b78eca059 100644 --- a/test/requests/storage/large_object_tests.rb +++ b/test/requests/storage/large_object_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Storage | large object requests" do +describe "Fog::Storage[:openstack] | large object requests" do before do - @storage = Fog::OpenStack::Storage.new + @storage = Fog::Storage[:openstack] unless Fog.mocking? @directory = @storage.directories.create(:key => 'foglargeobjecttests') @@ -280,7 +280,7 @@ unless Fog.mocking? proc do @storage.put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object') - end.must_raise Fog::OpenStack::Storage::NotFound + end.must_raise Fog::Storage::OpenStack::NotFound end end end @@ -290,7 +290,7 @@ unless Fog.mocking? proc do @storage.put_static_obj_manifest('fognoncontainer', 'fog_large_object', []) - end.must_raise Fog::OpenStack::Storage::NotFound + end.must_raise Fog::Storage::OpenStack::NotFound end end diff --git a/test/requests/storage/object_tests.rb b/test/requests/storage/object_tests.rb index c7cdad329..b50e4c144 100644 --- a/test/requests/storage/object_tests.rb +++ b/test/requests/storage/object_tests.rb @@ -9,10 +9,10 @@ def test_temp_url(url_s, time, desired_scheme) query_params.any? { |p| p == ['temp_url_expires', time.to_i.to_s] }.must_equal true end -describe "Fog::OpenStack::Storage | object requests" do +describe "Fog::Storage[:openstack] | object requests" do before do unless Fog.mocking? - @directory = Fog::OpenStack::Storage.new.directories.create(:key => 'fogobjecttests') + @directory = Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests') end module OpenStackStorageHelpers @@ -31,21 +31,21 @@ def override_path(path) describe "success" do it "#put_object('fogobjecttests', 'fog_object')" do - resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', lorem_file) + resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file) resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end describe "with_object" do before do file = lorem_file - resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', file) + resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) file.close resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end it "#get_object('fogobjectests', 'fog_object')" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_object') + resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') resp.body.must_equal lorem_file.read end end @@ -53,7 +53,7 @@ def override_path(path) it "#get_object('fogobjecttests', 'fog_object', &block)" do unless Fog.mocking? data = '' - Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| + Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| data << chunk end data.must_equal lorem_file.read @@ -62,33 +62,33 @@ def override_path(path) it "#public_url('fogobjectests', 'fog_object')" do unless Fog.mocking? - url = Fog::OpenStack::Storage.new.directories.first.files.first.public_url + url = Fog::Storage[:openstack].directories.first.files.first.public_url url.end_with?('/fogobjecttests/fog_object').must_equal true end end it "#public_url('fogobjectests')" do unless Fog.mocking? - url = Fog::OpenStack::Storage.new.directories.first.public_url + url = Fog::Storage[:openstack].directories.first.public_url url.end_with?('/fogobjecttests').must_equal true end end it "#head_object('fogobjectests', 'fog_object')" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_object') + resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end end it "#post_object('fogobjecttests', 'fog_object')" do unless Fog.mocking? - Fog::OpenStack::Storage.new.post_object( + Fog::Storage[:openstack].post_object( 'fogobjecttests', 'fog_object', 'X-Object-Meta-test-header' => 'fog-test-value' ) - resp = Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_object') + resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') resp.headers.must_include 'X-Object-Meta-Test-Header' resp.headers['X-Object-Meta-Test-Header'].must_equal 'fog-test-value' end @@ -96,7 +96,7 @@ def override_path(path) it "#delete_object('fogobjecttests', 'fog_object')" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_object') + resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object') resp.status.must_equal 204 end end @@ -104,7 +104,7 @@ def override_path(path) it "#get_object_http_url('directory.identity', 'fog_object', expiration timestamp)" do unless Fog.mocking? ts = Time.at(1_395_343_213) - url_s = Fog::OpenStack::Storage.new.get_object_http_url(@directory.identity, 'fog_object', ts) + url_s = Fog::Storage[:openstack].get_object_http_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'http') end end @@ -112,7 +112,7 @@ def override_path(path) it "#get_object_https_url('directory.identity', 'fog_object', expiration timestamp)" do unless Fog.mocking? ts = Time.at(1_395_343_213) - url_s = Fog::OpenStack::Storage.new.get_object_https_url(@directory.identity, 'fog_object', ts) + url_s = Fog::Storage[:openstack].get_object_https_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'https') end end @@ -132,7 +132,7 @@ def override_path(path) begin file = lorem_file buffer_size = file.stat.size / 2 # chop it up into two buffers - resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_block_object', nil) do + resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do file.read(buffer_size).to_s end ensure @@ -144,7 +144,7 @@ def override_path(path) describe "with_object" do before do file = lorem_file - Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_block_object', nil) do + Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do file.read(file.stat.size).to_s end file.close @@ -152,14 +152,14 @@ def override_path(path) it "#get_object" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_block_object') + resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_block_object') resp.body.must_equal lorem_file.read end end it "#delete_object" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_block_object') + resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object') resp.status.must_equal 204 end end @@ -169,10 +169,10 @@ def override_path(path) describe "deletes multiple objects" do before do unless Fog.mocking? - Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', lorem_file) - Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object2', lorem_file) - Fog::OpenStack::Storage.new.directories.create(:key => 'fogobjecttests2') - Fog::OpenStack::Storage.new.put_object('fogobjecttests2', 'fog_object', lorem_file) + Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file) + Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object2', lorem_file) + Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests2') + Fog::Storage[:openstack].put_object('fogobjecttests2', 'fog_object', lorem_file) end @expected = { @@ -186,7 +186,7 @@ def override_path(path) after do unless Fog.mocking? - dir2 = Fog::OpenStack::Storage.new.directories.get('fogobjecttests2') + dir2 = Fog::Storage[:openstack].directories.get('fogobjecttests2') unless dir2.nil? dir2.files.each(&:destroy) dir2.destroy @@ -196,7 +196,7 @@ def override_path(path) it "#delete_multiple_objects" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.delete_multiple_objects( + resp = Fog::Storage[:openstack].delete_multiple_objects( 'fogobjecttests', %w[fog_object fog_object2] ) resp.body.must_equal @expected @@ -205,7 +205,7 @@ def override_path(path) it "deletes object and container" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.delete_multiple_objects( + resp = Fog::Storage[:openstack].delete_multiple_objects( nil, ['fogobjecttests2/fog_object', 'fogobjecttests2'] ) @@ -219,56 +219,56 @@ def override_path(path) it "#get_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end it "#get_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.get_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].get_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end it "#head_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end it "#head_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.head_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].head_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end it "#post_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.post_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].post_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end it "#delete_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end it "#delete_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::OpenStack::Storage.new.delete_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::OpenStack::Storage::NotFound) + Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::Storage::OpenStack::NotFound) end end @@ -287,7 +287,7 @@ def override_path(path) it "reports missing objects" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.delete_multiple_objects( + resp = Fog::Storage[:openstack].delete_multiple_objects( 'fogobjecttests', %w[fog_non_object fog_non_object2] ) resp.body.must_equal @expected @@ -296,7 +296,7 @@ def override_path(path) it "reports missing container" do unless Fog.mocking? - resp = Fog::OpenStack::Storage.new.delete_multiple_objects( + resp = Fog::Storage[:openstack].delete_multiple_objects( 'fognoncontainer', %w[fog_non_object fog_non_object2] ) resp.body.must_equal @expected @@ -306,7 +306,7 @@ def override_path(path) it "deleting non-empty container" do unless Fog.mocking? file = lorem_file - resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', file) + resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) file.close resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' @@ -318,7 +318,7 @@ def override_path(path) "Response Body" => "" } - resp = Fog::OpenStack::Storage.new.delete_multiple_objects( + resp = Fog::Storage[:openstack].delete_multiple_objects( nil, %w[fogobjecttests] ) diff --git a/test/requests/volume/availability_zone_tests.rb b/test/requests/volume/availability_zone_tests.rb index 43e1fc4b3..9d268c91e 100644 --- a/test/requests/volume/availability_zone_tests.rb +++ b/test/requests/volume/availability_zone_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::OpenStack::Volume | availability zone requests" do +describe "Fog::Volume[:openstack] | availability zone requests" do before do @flavor_format = { 'zoneName' => String, @@ -10,7 +10,7 @@ describe "success" do it "#list_zones" do - Fog::OpenStack::Volume.new.list_zones.body. + Fog::Volume[:openstack].list_zones.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end end diff --git a/test/requests/volume/backup_tests.rb b/test/requests/volume/backup_tests.rb index e8f335c23..587f37e09 100644 --- a/test/requests/volume/backup_tests.rb +++ b/test/requests/volume/backup_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::OpenStack::Volume | backup requests" do +describe "Fog::Volume[:openstack] | backup requests" do before do - @volume = Fog::OpenStack::Volume.new + @volume = Fog::Volume[:openstack] @backup_format = { 'id' => String, 'volume_id' => String, diff --git a/test/requests/volume/quota_tests.rb b/test/requests/volume/quota_tests.rb index ca7648478..d6e672dea 100644 --- a/test/requests/volume/quota_tests.rb +++ b/test/requests/volume/quota_tests.rb @@ -1,9 +1,9 @@ require 'test_helper' -describe "Fog::OpenStack::Volume | quota requests" do +describe "Fog::Volume[:openstack] | quota requests" do before do - @volume = Fog::OpenStack::Volume.new - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @volume = Fog::Volume[:openstack] + identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'volumes' => Fog::Nullable::Integer, diff --git a/test/requests/volume/volume_type_tests.rb b/test/requests/volume/volume_type_tests.rb index 935deae68..242f02117 100644 --- a/test/requests/volume/volume_type_tests.rb +++ b/test/requests/volume/volume_type_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::OpenStack::Volume | volume_type requests" do +describe "Fog::Volume[:openstack] | volume_type requests" do before do - @volume = Fog::OpenStack::Volume.new + @volume = Fog::Volume[:openstack] @volume_type_format = { 'name' => String, diff --git a/test/requests/workflow/workflow_tests.rb b/test/requests/workflow/workflow_tests.rb index 9337931e8..8c3d16726 100644 --- a/test/requests/workflow/workflow_tests.rb +++ b/test/requests/workflow/workflow_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -require 'fog/openstack/workflow/workflow' -require 'fog/openstack/workflow/v2' +require 'fog/workflow/openstack' +require 'fog/workflow/openstack/v2' -describe "Fog::OpenStack::Workflow | Workflow requests" do +describe "Fog::Workflow::OpenStack | Workflow requests" do before do - @workflow = Fog::OpenStack::Workflow.new + @workflow = Fog::Workflow::OpenStack.new @execution_id = Fog::UUID.uuid @workflow_name = "tripleo.plan_management.v1.create_default_deployment_plan" diff --git a/test/storage_tests.rb b/test/storage_tests.rb index e6f1f50a1..9c1bbf75f 100644 --- a/test/storage_tests.rb +++ b/test/storage_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::OpenStack::Storage, ['openstack', 'storage']" do +describe "Fog::Storage[:openstack], ['openstack', 'storage']" do before do - @storage = Fog::OpenStack::Storage.new + @storage = Fog::Storage[:openstack] @original_path = @storage.instance_variable_get :@path end diff --git a/test/volume_tests.rb b/test/volume_tests.rb index 3bf97d9ed..ceca9c4f7 100644 --- a/test/volume_tests.rb +++ b/test/volume_tests.rb @@ -1,11 +1,11 @@ require 'test_helper' -require 'fog/openstack/volume/volume' -require 'fog/openstack/volume/v1' -require 'fog/openstack/volume/v2' +require 'fog/volume/openstack' +require 'fog/volume/openstack/v1' +require 'fog/volume/openstack/v2' -describe "Fog::OpenStack::Volume, ['openstack', 'volume']" do - volume = Fog::OpenStack::Volume.new +describe "Fog::Volume[:openstack], ['openstack', 'volume']" do + volume = Fog::Volume[:openstack] describe "Volumes collection" do %w{ volumes }.each do |collection| From 8e78a109be1a73bb9b7c6f0540579570bf7a16be Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 21 Sep 2018 10:39:42 +1000 Subject: [PATCH 070/129] v0.3.2: Revert Namespace to v0.3.0 --- fog-openstack.gemspec | 2 +- lib/fog/openstack/version.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 0978f95da..2d201a5c2 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -21,7 +21,7 @@ Gem::Specification.new do |spec| spec.required_ruby_version = '>= 2.2.0' - spec.add_dependency 'fog-core', '~> 2.1.2' + spec.add_dependency 'fog-core', '~> 2.1' spec.add_dependency 'fog-json', '>= 1.0' spec.add_dependency 'ipaddress', '>= 0.8' diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index bbfe874d8..a5197ddbd 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.3.1'.freeze + VERSION = '0.3.2'.freeze end end From 391cda23afad6c0aa1ccd878e71250419a727edc Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 17 Sep 2018 10:59:40 +1000 Subject: [PATCH 071/129] Renames Fog::::OpenStack to Fog::OpenStack:: Moves the files accordingly (cherry picked from commit b312b3d35d8772daedb7f9a6525dc0f0bfccd79a) --- README.md | 58 +++++----- docs/compute.md | 70 ++++++------ docs/introspection.md | 4 +- docs/metering.md | 2 +- docs/network.md | 16 +-- docs/orchestration.md | 38 +++---- docs/planning.md | 4 +- docs/shared_file_system.md | 2 +- docs/storage.md | 8 +- docs/workflow.md | 2 +- examples/compute/block_device_mapping_v2.rb | 2 +- examples/container_infra/basics.rb | 2 +- examples/event/basics.rb | 2 +- examples/identity/basics.rb | 6 +- examples/identity/basics_v3.rb | 52 ++++----- examples/image/upload-test-image.rb | 30 ++--- examples/introspection/basics.rb | 4 +- examples/metric/basics.rb | 2 +- examples/network/network_rbac.rb | 4 +- examples/network/network_subnets_routers.rb | 2 +- examples/shared_file_system/basics.rb | 4 +- examples/storage/set-account-quota.rb | 4 +- examples/volume/backups.rb | 4 +- examples/workflow/workflow-examples.rb | 4 +- lib/fog/dns/openstack.rb | 21 ---- lib/fog/image/openstack.rb | 23 ---- lib/fog/openstack.rb | 104 ++++-------------- .../baremetal/baremetal.rb} | 12 +- .../baremetal}/models/chassis.rb | 4 +- .../baremetal}/models/chassis_collection.rb | 8 +- .../baremetal}/models/driver.rb | 4 +- .../baremetal}/models/drivers.rb | 8 +- .../baremetal}/models/node.rb | 4 +- .../baremetal}/models/nodes.rb | 8 +- .../baremetal}/models/port.rb | 4 +- .../baremetal}/models/ports.rb | 8 +- .../baremetal}/requests/create_chassis.rb | 4 +- .../baremetal}/requests/create_node.rb | 4 +- .../baremetal}/requests/create_port.rb | 4 +- .../baremetal}/requests/delete_chassis.rb | 4 +- .../baremetal}/requests/delete_node.rb | 4 +- .../baremetal}/requests/delete_port.rb | 4 +- .../baremetal}/requests/get_chassis.rb | 4 +- .../baremetal}/requests/get_driver.rb | 4 +- .../requests/get_driver_properties.rb | 4 +- .../baremetal}/requests/get_node.rb | 4 +- .../baremetal}/requests/get_port.rb | 4 +- .../baremetal}/requests/list_chassis.rb | 4 +- .../requests/list_chassis_detailed.rb | 4 +- .../baremetal}/requests/list_drivers.rb | 4 +- .../baremetal}/requests/list_nodes.rb | 4 +- .../requests/list_nodes_detailed.rb | 4 +- .../baremetal}/requests/list_ports.rb | 4 +- .../requests/list_ports_detailed.rb | 4 +- .../baremetal}/requests/patch_chassis.rb | 4 +- .../baremetal}/requests/patch_node.rb | 4 +- .../baremetal}/requests/patch_port.rb | 4 +- .../requests/set_node_maintenance.rb | 4 +- .../requests/set_node_power_state.rb | 4 +- .../requests/set_node_provision_state.rb | 4 +- .../requests/unset_node_maintenance.rb | 4 +- .../compute/compute.rb} | 10 +- .../compute}/models/address.rb | 4 +- .../compute}/models/addresses.rb | 10 +- .../compute}/models/aggregate.rb | 4 +- .../compute}/models/aggregates.rb | 8 +- .../compute}/models/availability_zone.rb | 4 +- .../compute}/models/availability_zones.rb | 8 +- .../compute}/models/flavor.rb | 12 +- .../compute}/models/flavors.rb | 10 +- .../compute}/models/host.rb | 8 +- .../compute}/models/hosts.rb | 10 +- .../compute}/models/image.rb | 8 +- .../compute}/models/images.rb | 10 +- .../compute}/models/key_pair.rb | 4 +- .../compute}/models/key_pairs.rb | 10 +- .../compute}/models/metadata.rb | 18 +-- .../compute}/models/metadatum.rb | 6 +- .../compute}/models/network.rb | 4 +- .../compute}/models/networks.rb | 8 +- .../compute}/models/os_interface.rb | 4 +- .../compute}/models/os_interfaces.rb | 8 +- .../compute}/models/security_group.rb | 12 +- .../compute}/models/security_group_rule.rb | 4 +- .../compute}/models/security_group_rules.rb | 10 +- .../compute}/models/security_groups.rb | 10 +- .../compute}/models/server.rb | 10 +- .../compute}/models/server_group.rb | 4 +- .../compute}/models/server_groups.rb | 10 +- .../compute}/models/servers.rb | 20 ++-- .../compute}/models/service.rb | 4 +- .../compute}/models/services.rb | 10 +- .../compute}/models/snapshot.rb | 6 +- .../compute}/models/snapshots.rb | 10 +- .../compute}/models/tenant.rb | 4 +- .../compute}/models/tenants.rb | 8 +- .../compute}/models/volume.rb | 6 +- .../compute}/models/volume_attachment.rb | 4 +- .../compute}/models/volume_attachments.rb | 8 +- .../compute}/models/volumes.rb | 10 +- .../compute}/requests/add_aggregate_host.rb | 4 +- .../compute}/requests/add_fixed_ip.rb | 4 +- .../compute}/requests/add_flavor_access.rb | 4 +- .../compute}/requests/add_security_group.rb | 4 +- .../compute}/requests/allocate_address.rb | 4 +- .../compute}/requests/associate_address.rb | 4 +- .../compute}/requests/attach_volume.rb | 4 +- .../compute}/requests/boot_from_snapshot.rb | 4 +- .../requests/change_server_password.rb | 4 +- .../requests/confirm_resize_server.rb | 4 +- .../compute}/requests/create_aggregate.rb | 4 +- .../compute}/requests/create_flavor.rb | 4 +- .../requests/create_flavor_metadata.rb | 4 +- .../compute}/requests/create_image.rb | 4 +- .../compute}/requests/create_key_pair.rb | 4 +- .../compute}/requests/create_os_interface.rb | 4 +- .../requests/create_security_group.rb | 8 +- .../requests/create_security_group_rule.rb | 4 +- .../compute}/requests/create_server.rb | 10 +- .../compute}/requests/create_server_group.rb | 8 +- .../compute}/requests/create_snapshot.rb | 6 +- .../compute}/requests/create_volume.rb | 4 +- .../compute}/requests/delete_aggregate.rb | 4 +- .../compute}/requests/delete_flavor.rb | 4 +- .../requests/delete_flavor_metadata.rb | 4 +- .../compute}/requests/delete_image.rb | 4 +- .../compute}/requests/delete_key_pair.rb | 4 +- .../compute}/requests/delete_meta.rb | 8 +- .../compute}/requests/delete_metadata.rb | 4 +- .../compute}/requests/delete_os_interface.rb | 4 +- .../requests/delete_security_group.rb | 4 +- .../requests/delete_security_group_rule.rb | 4 +- .../compute}/requests/delete_server.rb | 6 +- .../compute}/requests/delete_server_group.rb | 4 +- .../compute}/requests/delete_service.rb | 4 +- .../compute}/requests/delete_snapshot.rb | 6 +- .../compute}/requests/delete_volume.rb | 6 +- .../compute}/requests/detach_volume.rb | 6 +- .../compute}/requests/disable_service.rb | 4 +- .../requests/disable_service_log_reason.rb | 4 +- .../compute}/requests/disassociate_address.rb | 4 +- .../compute}/requests/enable_service.rb | 4 +- .../compute}/requests/evacuate_server.rb | 4 +- .../compute}/requests/get_address.rb | 4 +- .../compute}/requests/get_aggregate.rb | 4 +- .../compute}/requests/get_console_output.rb | 4 +- .../compute}/requests/get_flavor_details.rb | 6 +- .../compute}/requests/get_flavor_metadata.rb | 4 +- .../compute}/requests/get_host_details.rb | 4 +- .../compute}/requests/get_hypervisor.rb | 4 +- .../requests/get_hypervisor_statistics.rb | 4 +- .../compute}/requests/get_image_details.rb | 6 +- .../compute}/requests/get_key_pair.rb | 4 +- .../compute}/requests/get_limits.rb | 4 +- .../compute}/requests/get_metadata.rb | 4 +- .../compute}/requests/get_os_interface.rb | 4 +- .../compute}/requests/get_quota.rb | 4 +- .../compute}/requests/get_quota_defaults.rb | 4 +- .../compute}/requests/get_security_group.rb | 6 +- .../requests/get_security_group_rule.rb | 6 +- .../compute}/requests/get_server_details.rb | 6 +- .../compute}/requests/get_server_group.rb | 4 +- .../compute}/requests/get_server_password.rb | 6 +- .../compute}/requests/get_server_volumes.rb | 4 +- .../compute}/requests/get_snapshot_details.rb | 6 +- .../compute}/requests/get_usage.rb | 4 +- .../compute}/requests/get_vnc_console.rb | 4 +- .../compute}/requests/get_volume_details.rb | 6 +- .../compute}/requests/list_address_pools.rb | 4 +- .../compute}/requests/list_addresses.rb | 6 +- .../compute}/requests/list_aggregates.rb | 4 +- .../compute}/requests/list_all_addresses.rb | 4 +- .../requests/list_availability_zones.rb | 4 +- .../compute}/requests/list_flavors.rb | 4 +- .../compute}/requests/list_flavors_detail.rb | 4 +- .../compute}/requests/list_hosts.rb | 4 +- .../requests/list_hypervisor_servers.rb | 4 +- .../compute}/requests/list_hypervisors.rb | 4 +- .../requests/list_hypervisors_detail.rb | 4 +- .../compute}/requests/list_images.rb | 4 +- .../compute}/requests/list_images_detail.rb | 4 +- .../compute}/requests/list_key_pairs.rb | 4 +- .../compute}/requests/list_metadata.rb | 4 +- .../compute}/requests/list_os_interfaces.rb | 4 +- .../requests/list_private_addresses.rb | 6 +- .../requests/list_public_addresses.rb | 6 +- .../compute}/requests/list_security_groups.rb | 4 +- .../compute}/requests/list_server_groups.rb | 4 +- .../compute}/requests/list_servers.rb | 4 +- .../compute}/requests/list_servers_detail.rb | 4 +- .../compute}/requests/list_services.rb | 4 +- .../compute}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detail.rb | 4 +- .../list_tenants_with_flavor_access.rb | 4 +- .../compute}/requests/list_usages.rb | 4 +- .../requests/list_volume_attachments.rb | 4 +- .../compute}/requests/list_volumes.rb | 4 +- .../compute}/requests/list_volumes_detail.rb | 4 +- .../compute}/requests/list_zones.rb | 4 +- .../compute}/requests/list_zones_detailed.rb | 4 +- .../compute}/requests/live_migrate_server.rb | 4 +- .../compute}/requests/migrate_server.rb | 4 +- .../compute}/requests/pause_server.rb | 4 +- .../compute}/requests/reboot_server.rb | 4 +- .../compute}/requests/rebuild_server.rb | 4 +- .../compute}/requests/release_address.rb | 4 +- .../compute}/requests/remote_consoles.rb | 4 +- .../requests/remove_aggregate_host.rb | 4 +- .../compute}/requests/remove_fixed_ip.rb | 4 +- .../compute}/requests/remove_flavor_access.rb | 4 +- .../requests/remove_security_group.rb | 4 +- .../compute}/requests/rescue_server.rb | 4 +- .../compute}/requests/reset_server_state.rb | 4 +- .../compute}/requests/resize_server.rb | 4 +- .../compute}/requests/resume_server.rb | 4 +- .../compute}/requests/revert_resize_server.rb | 4 +- .../compute}/requests/server_action.rb | 4 +- .../compute}/requests/server_actions.rb | 4 +- .../compute}/requests/server_diagnostics.rb | 4 +- .../compute}/requests/set_metadata.rb | 8 +- .../compute}/requests/set_tenant.rb | 4 +- .../requests/shelve_offload_server.rb | 4 +- .../compute}/requests/shelve_server.rb | 4 +- .../compute}/requests/start_server.rb | 4 +- .../compute}/requests/stop_server.rb | 4 +- .../compute}/requests/suspend_server.rb | 4 +- .../compute}/requests/unpause_server.rb | 4 +- .../compute}/requests/unshelve_server.rb | 4 +- .../compute}/requests/update_aggregate.rb | 4 +- .../requests/update_aggregate_metadata.rb | 4 +- .../requests/update_flavor_metadata.rb | 4 +- .../compute}/requests/update_meta.rb | 8 +- .../compute}/requests/update_metadata.rb | 8 +- .../compute}/requests/update_quota.rb | 4 +- .../compute}/requests/update_server.rb | 6 +- .../container_infra/container_infra.rb} | 10 +- .../container_infra}/models/base.rb | 10 +- .../container_infra}/models/bay.rb | 6 +- .../container_infra}/models/bay_model.rb | 8 +- .../container_infra}/models/bay_models.rb | 10 +- .../container_infra}/models/bays.rb | 10 +- .../container_infra}/models/certificate.rb | 6 +- .../container_infra}/models/certificates.rb | 10 +- .../container_infra}/models/cluster.rb | 6 +- .../models/cluster_template.rb | 8 +- .../models/cluster_templates.rb | 10 +- .../container_infra}/models/clusters.rb | 10 +- .../container_infra}/requests/create_bay.rb | 4 +- .../requests/create_bay_model.rb | 4 +- .../requests/create_certificate.rb | 4 +- .../requests/create_cluster.rb | 4 +- .../requests/create_cluster_template.rb | 4 +- .../container_infra}/requests/delete_bay.rb | 4 +- .../requests/delete_bay_model.rb | 4 +- .../requests/delete_cluster.rb | 4 +- .../requests/delete_cluster_template.rb | 4 +- .../container_infra}/requests/get_bay.rb | 4 +- .../requests/get_bay_model.rb | 4 +- .../requests/get_certificate.rb | 4 +- .../container_infra}/requests/get_cluster.rb | 4 +- .../requests/get_cluster_template.rb | 4 +- .../requests/list_bay_models.rb | 4 +- .../container_infra}/requests/list_bays.rb | 4 +- .../requests/list_cluster_templates.rb | 4 +- .../requests/list_clusters.rb | 4 +- .../container_infra}/requests/update_bay.rb | 4 +- .../requests/update_bay_model.rb | 4 +- .../requests/update_cluster.rb | 4 +- .../requests/update_cluster_template.rb | 4 +- lib/fog/openstack/core.rb | 2 +- lib/fog/openstack/dns/dns.rb | 21 ++++ .../{dns/openstack => openstack/dns}/v1.rb | 10 +- .../dns}/v1/requests/get_quota.rb | 4 +- .../dns}/v1/requests/list_domains.rb | 4 +- .../dns}/v1/requests/update_quota.rb | 4 +- .../{dns/openstack => openstack/dns}/v2.rb | 12 +- .../dns}/v2/models/pool.rb | 4 +- .../dns}/v2/models/pools.rb | 8 +- .../dns}/v2/models/recordset.rb | 4 +- .../dns}/v2/models/recordsets.rb | 8 +- .../dns}/v2/models/zone.rb | 4 +- .../dns}/v2/models/zone_transfer_accept.rb | 4 +- .../dns}/v2/models/zone_transfer_accepts.rb | 8 +- .../dns}/v2/models/zone_transfer_request.rb | 4 +- .../dns}/v2/models/zone_transfer_requests.rb | 8 +- .../dns}/v2/models/zones.rb | 8 +- .../dns}/v2/requests/create_recordset.rb | 4 +- .../dns}/v2/requests/create_zone.rb | 4 +- .../requests/create_zone_transfer_accept.rb | 6 +- .../requests/create_zone_transfer_request.rb | 4 +- .../dns}/v2/requests/delete_recordset.rb | 6 +- .../dns}/v2/requests/delete_zone.rb | 6 +- .../requests/delete_zone_transfer_request.rb | 4 +- .../dns}/v2/requests/get_pool.rb | 6 +- .../dns}/v2/requests/get_quota.rb | 6 +- .../dns}/v2/requests/get_recordset.rb | 6 +- .../dns}/v2/requests/get_zone.rb | 6 +- .../v2/requests/get_zone_transfer_accept.rb | 4 +- .../v2/requests/get_zone_transfer_request.rb | 4 +- .../dns}/v2/requests/list_pools.rb | 6 +- .../dns}/v2/requests/list_recordsets.rb | 6 +- .../v2/requests/list_zone_transfer_accepts.rb | 4 +- .../requests/list_zone_transfer_requests.rb | 4 +- .../dns}/v2/requests/list_zones.rb | 6 +- .../dns}/v2/requests/update_quota.rb | 6 +- .../dns}/v2/requests/update_recordset.rb | 6 +- .../dns}/v2/requests/update_zone.rb | 6 +- .../requests/update_zone_transfer_request.rb | 4 +- .../openstack.rb => openstack/event/event.rb} | 10 +- .../event}/models/event.rb | 4 +- .../event}/models/events.rb | 10 +- .../event}/requests/get_event.rb | 4 +- .../event}/requests/list_events.rb | 4 +- .../identity/identity.rb} | 14 +-- .../openstack => openstack/identity}/v2.rb | 12 +- .../identity}/v2/models/ec2_credential.rb | 4 +- .../identity}/v2/models/ec2_credentials.rb | 10 +- .../identity}/v2/models/role.rb | 4 +- .../identity}/v2/models/roles.rb | 8 +- .../identity}/v2/models/tenant.rb | 4 +- .../identity}/v2/models/tenants.rb | 10 +- .../identity}/v2/models/user.rb | 4 +- .../identity}/v2/models/users.rb | 12 +- .../v2/requests/add_user_to_tenant.rb | 4 +- .../identity}/v2/requests/check_token.rb | 4 +- .../v2/requests/create_ec2_credential.rb | 4 +- .../identity}/v2/requests/create_role.rb | 4 +- .../identity}/v2/requests/create_tenant.rb | 4 +- .../identity}/v2/requests/create_user.rb | 4 +- .../identity}/v2/requests/create_user_role.rb | 4 +- .../v2/requests/delete_ec2_credential.rb | 6 +- .../identity}/v2/requests/delete_role.rb | 6 +- .../identity}/v2/requests/delete_tenant.rb | 4 +- .../identity}/v2/requests/delete_user.rb | 6 +- .../identity}/v2/requests/delete_user_role.rb | 4 +- .../v2/requests/get_ec2_credential.rb | 6 +- .../identity}/v2/requests/get_role.rb | 6 +- .../identity}/v2/requests/get_tenant.rb | 4 +- .../v2/requests/get_tenants_by_id.rb | 4 +- .../v2/requests/get_tenants_by_name.rb | 4 +- .../identity}/v2/requests/get_user_by_id.rb | 4 +- .../identity}/v2/requests/get_user_by_name.rb | 4 +- .../v2/requests/list_ec2_credentials.rb | 4 +- .../v2/requests/list_endpoints_for_token.rb | 4 +- .../identity}/v2/requests/list_roles.rb | 4 +- .../requests/list_roles_for_user_on_tenant.rb | 4 +- .../identity}/v2/requests/list_tenants.rb | 4 +- .../v2/requests/list_user_global_roles.rb | 4 +- .../identity}/v2/requests/list_users.rb | 4 +- .../v2/requests/remove_user_from_tenant.rb | 4 +- .../identity}/v2/requests/set_tenant.rb | 4 +- .../identity}/v2/requests/update_tenant.rb | 4 +- .../identity}/v2/requests/update_user.rb | 6 +- .../identity}/v2/requests/validate_token.rb | 4 +- .../openstack => openstack/identity}/v3.rb | 12 +- .../identity}/v3/models/domain.rb | 4 +- .../identity}/v3/models/domains.rb | 22 ++-- .../identity}/v3/models/endpoint.rb | 4 +- .../identity}/v3/models/endpoints.rb | 10 +- .../identity}/v3/models/group.rb | 8 +- .../identity}/v3/models/groups.rb | 10 +- .../identity}/v3/models/os_credential.rb | 4 +- .../identity}/v3/models/os_credentials.rb | 10 +- .../identity}/v3/models/policies.rb | 10 +- .../identity}/v3/models/policy.rb | 4 +- .../identity}/v3/models/project.rb | 8 +- .../identity}/v3/models/projects.rb | 22 ++-- .../identity}/v3/models/role.rb | 4 +- .../identity}/v3/models/role_assignment.rb | 4 +- .../identity}/v3/models/role_assignments.rb | 8 +- .../identity}/v3/models/roles.rb | 10 +- .../identity}/v3/models/service.rb | 4 +- .../identity}/v3/models/services.rb | 10 +- .../identity}/v3/models/token.rb | 4 +- .../identity}/v3/models/tokens.rb | 12 +- .../identity}/v3/models/user.rb | 6 +- .../identity}/v3/models/users.rb | 10 +- .../v3/requests/add_user_to_group.rb | 4 +- .../identity}/v3/requests/auth_domains.rb | 4 +- .../identity}/v3/requests/auth_projects.rb | 4 +- .../v3/requests/check_domain_group_role.rb | 4 +- .../v3/requests/check_domain_user_role.rb | 4 +- .../v3/requests/check_project_group_role.rb | 4 +- .../v3/requests/check_project_user_role.rb | 4 +- .../identity}/v3/requests/create_domain.rb | 4 +- .../identity}/v3/requests/create_endpoint.rb | 4 +- .../identity}/v3/requests/create_group.rb | 4 +- .../v3/requests/create_os_credential.rb | 4 +- .../identity}/v3/requests/create_policy.rb | 4 +- .../identity}/v3/requests/create_project.rb | 4 +- .../identity}/v3/requests/create_role.rb | 4 +- .../identity}/v3/requests/create_service.rb | 4 +- .../identity}/v3/requests/create_user.rb | 4 +- .../identity}/v3/requests/delete_domain.rb | 4 +- .../identity}/v3/requests/delete_endpoint.rb | 4 +- .../identity}/v3/requests/delete_group.rb | 4 +- .../v3/requests/delete_os_credential.rb | 4 +- .../identity}/v3/requests/delete_policy.rb | 4 +- .../identity}/v3/requests/delete_project.rb | 4 +- .../identity}/v3/requests/delete_role.rb | 4 +- .../identity}/v3/requests/delete_service.rb | 4 +- .../identity}/v3/requests/delete_user.rb | 4 +- .../identity}/v3/requests/get_domain.rb | 4 +- .../identity}/v3/requests/get_endpoint.rb | 4 +- .../identity}/v3/requests/get_group.rb | 4 +- .../v3/requests/get_os_credential.rb | 4 +- .../identity}/v3/requests/get_policy.rb | 4 +- .../identity}/v3/requests/get_project.rb | 4 +- .../identity}/v3/requests/get_role.rb | 4 +- .../identity}/v3/requests/get_service.rb | 4 +- .../identity}/v3/requests/get_user.rb | 4 +- .../v3/requests/grant_domain_group_role.rb | 4 +- .../v3/requests/grant_domain_user_role.rb | 4 +- .../v3/requests/grant_project_group_role.rb | 4 +- .../v3/requests/grant_project_user_role.rb | 4 +- .../identity}/v3/requests/group_user_check.rb | 4 +- .../v3/requests/list_domain_group_roles.rb | 4 +- .../v3/requests/list_domain_user_roles.rb | 4 +- .../identity}/v3/requests/list_domains.rb | 4 +- .../identity}/v3/requests/list_endpoints.rb | 4 +- .../identity}/v3/requests/list_group_users.rb | 4 +- .../identity}/v3/requests/list_groups.rb | 4 +- .../v3/requests/list_os_credentials.rb | 4 +- .../identity}/v3/requests/list_policies.rb | 4 +- .../v3/requests/list_project_group_roles.rb | 4 +- .../v3/requests/list_project_user_roles.rb | 4 +- .../identity}/v3/requests/list_projects.rb | 4 +- .../v3/requests/list_role_assignments.rb | 4 +- .../identity}/v3/requests/list_roles.rb | 4 +- .../identity}/v3/requests/list_services.rb | 4 +- .../identity}/v3/requests/list_user_groups.rb | 4 +- .../v3/requests/list_user_projects.rb | 4 +- .../identity}/v3/requests/list_users.rb | 4 +- .../v3/requests/remove_user_from_group.rb | 4 +- .../v3/requests/revoke_domain_group_role.rb | 4 +- .../v3/requests/revoke_domain_user_role.rb | 4 +- .../v3/requests/revoke_project_group_role.rb | 4 +- .../v3/requests/revoke_project_user_role.rb | 4 +- .../v3/requests/token_authenticate.rb | 4 +- .../identity}/v3/requests/token_check.rb | 4 +- .../identity}/v3/requests/token_revoke.rb | 4 +- .../identity}/v3/requests/token_validate.rb | 4 +- .../identity}/v3/requests/update_domain.rb | 4 +- .../identity}/v3/requests/update_endpoint.rb | 4 +- .../identity}/v3/requests/update_group.rb | 4 +- .../v3/requests/update_os_credential.rb | 4 +- .../identity}/v3/requests/update_policy.rb | 4 +- .../identity}/v3/requests/update_project.rb | 4 +- .../identity}/v3/requests/update_role.rb | 4 +- .../identity}/v3/requests/update_service.rb | 4 +- .../identity}/v3/requests/update_user.rb | 4 +- lib/fog/openstack/image/image.rb | 23 ++++ .../openstack => openstack/image}/v1.rb | 12 +- .../image}/v1/models/image.rb | 4 +- .../image}/v1/models/images.rb | 10 +- .../image}/v1/requests/add_member_to_image.rb | 4 +- .../image}/v1/requests/create_image.rb | 4 +- .../image}/v1/requests/delete_image.rb | 4 +- .../image}/v1/requests/get_image.rb | 4 +- .../image}/v1/requests/get_image_by_id.rb | 4 +- .../image}/v1/requests/get_image_members.rb | 4 +- .../image}/v1/requests/get_shared_images.rb | 4 +- .../image}/v1/requests/list_public_images.rb | 4 +- .../requests/list_public_images_detailed.rb | 4 +- .../v1/requests/remove_member_from_image.rb | 4 +- .../image}/v1/requests/set_tenant.rb | 4 +- .../image}/v1/requests/update_image.rb | 4 +- .../v1/requests/update_image_members.rb | 4 +- .../openstack => openstack/image}/v2.rb | 12 +- .../image}/v2/models/image.rb | 4 +- .../image}/v2/models/images.rb | 10 +- .../image}/v2/requests/add_member_to_image.rb | 4 +- .../image}/v2/requests/add_tag_to_image.rb | 4 +- .../image}/v2/requests/create_image.rb | 4 +- .../image}/v2/requests/deactivate_image.rb | 4 +- .../image}/v2/requests/delete_image.rb | 4 +- .../image}/v2/requests/download_image.rb | 4 +- .../image}/v2/requests/get_image.rb | 4 +- .../image}/v2/requests/get_image_by_id.rb | 4 +- .../image}/v2/requests/get_image_members.rb | 4 +- .../image}/v2/requests/get_member_details.rb | 4 +- .../image}/v2/requests/get_shared_images.rb | 4 +- .../image}/v2/requests/list_images.rb | 4 +- .../image}/v2/requests/reactivate_image.rb | 4 +- .../v2/requests/remove_member_from_image.rb | 4 +- .../v2/requests/remove_tag_from_image.rb | 4 +- .../image}/v2/requests/set_tenant.rb | 4 +- .../image}/v2/requests/update_image.rb | 4 +- .../image}/v2/requests/update_image_member.rb | 4 +- .../image}/v2/requests/upload_image.rb | 4 +- .../introspection/introspection.rb} | 14 +-- .../introspection}/models/rules.rb | 4 +- .../introspection}/models/rules_collection.rb | 10 +- .../requests/abort_introspection.rb | 4 +- .../requests/create_introspection.rb | 4 +- .../introspection}/requests/create_rules.rb | 4 +- .../introspection}/requests/delete_rules.rb | 4 +- .../requests/delete_rules_all.rb | 4 +- .../requests/get_introspection.rb | 4 +- .../requests/get_introspection_details.rb | 4 +- .../introspection}/requests/get_rules.rb | 4 +- .../introspection}/requests/list_rules.rb | 4 +- .../key_manager/key_manager.rb} | 10 +- .../key_manager}/models/acl.rb | 4 +- .../key_manager}/models/container.rb | 6 +- .../key_manager}/models/containers.rb | 12 +- .../key_manager}/models/secret.rb | 6 +- .../key_manager}/models/secrets.rb | 12 +- .../key_manager}/requests/create_container.rb | 6 +- .../key_manager}/requests/create_secret.rb | 6 +- .../key_manager}/requests/delete_container.rb | 6 +- .../requests/delete_container_acl.rb | 4 +- .../key_manager}/requests/delete_secret.rb | 6 +- .../requests/delete_secret_acl.rb | 4 +- .../key_manager}/requests/get_container.rb | 6 +- .../requests/get_container_acl.rb | 4 +- .../key_manager}/requests/get_secret.rb | 6 +- .../key_manager}/requests/get_secret_acl.rb | 4 +- .../requests/get_secret_metadata.rb | 6 +- .../requests/get_secret_payload.rb | 6 +- .../key_manager}/requests/list_containers.rb | 6 +- .../key_manager}/requests/list_secrets.rb | 6 +- .../requests/replace_container_acl.rb | 4 +- .../requests/replace_secret_acl.rb | 4 +- .../requests/update_container_acl.rb | 4 +- .../requests/update_secret_acl.rb | 4 +- .../metering/metering.rb} | 10 +- .../metering}/models/event.rb | 4 +- .../metering}/models/events.rb | 10 +- .../metering}/models/meter.rb | 0 .../metering}/models/meters.rb | 0 .../metering}/models/resource.rb | 4 +- .../metering}/models/resources.rb | 10 +- .../metering}/requests/get_event.rb | 4 +- .../metering}/requests/get_resource.rb | 4 +- .../metering}/requests/get_samples.rb | 4 +- .../metering}/requests/get_statistics.rb | 4 +- .../metering}/requests/list_events.rb | 4 +- .../metering}/requests/list_meters.rb | 4 +- .../metering}/requests/list_resources.rb | 4 +- .../metric/metric.rb} | 10 +- .../metric}/models/metric.rb | 4 +- .../metric}/models/metrics.rb | 12 +- .../metric}/models/resource.rb | 4 +- .../metric}/models/resources.rb | 10 +- .../metric}/requests/get_metric.rb | 4 +- .../metric}/requests/get_metric_measures.rb | 4 +- .../metric}/requests/get_resource.rb | 4 +- .../requests/get_resource_metric_measures.rb | 4 +- .../metric}/requests/list_metrics.rb | 4 +- .../metric}/requests/list_resources.rb | 4 +- lib/fog/openstack/models/meta_parent.rb | 8 +- .../monitoring}/models/alarm.rb | 4 +- .../monitoring}/models/alarm_count.rb | 4 +- .../monitoring}/models/alarm_counts.rb | 8 +- .../monitoring}/models/alarm_definition.rb | 4 +- .../monitoring}/models/alarm_definitions.rb | 10 +- .../monitoring}/models/alarm_state.rb | 4 +- .../monitoring}/models/alarm_states.rb | 8 +- .../monitoring}/models/alarms.rb | 10 +- .../monitoring}/models/dimension_value.rb | 4 +- .../monitoring}/models/dimension_values.rb | 8 +- .../monitoring}/models/measurement.rb | 4 +- .../monitoring}/models/measurements.rb | 8 +- .../monitoring}/models/metric.rb | 4 +- .../monitoring}/models/metrics.rb | 12 +- .../monitoring}/models/notification_method.rb | 4 +- .../models/notification_methods.rb | 10 +- .../monitoring}/models/statistic.rb | 4 +- .../monitoring}/models/statistics.rb | 8 +- .../monitoring/monitoring.rb} | 10 +- .../requests/create_alarm_definition.rb | 4 +- .../monitoring}/requests/create_metric.rb | 4 +- .../requests/create_metric_array.rb | 4 +- .../requests/create_notification_method.rb | 4 +- .../monitoring}/requests/delete_alarm.rb | 4 +- .../requests/delete_alarm_definition.rb | 4 +- .../requests/delete_notification_method.rb | 4 +- .../monitoring}/requests/find_measurements.rb | 4 +- .../monitoring}/requests/get_alarm.rb | 4 +- .../monitoring}/requests/get_alarm_counts.rb | 4 +- .../requests/get_alarm_definition.rb | 4 +- .../requests/get_notification_method.rb | 4 +- .../requests/list_alarm_definitions.rb | 4 +- ...list_alarm_state_history_for_all_alarms.rb | 4 +- ..._alarm_state_history_for_specific_alarm.rb | 4 +- .../monitoring}/requests/list_alarms.rb | 4 +- .../requests/list_dimension_values.rb | 4 +- .../monitoring}/requests/list_metric_names.rb | 4 +- .../monitoring}/requests/list_metrics.rb | 4 +- .../list_notification_method_types.rb | 4 +- .../requests/list_notification_methods.rb | 4 +- .../monitoring}/requests/list_statistics.rb | 4 +- .../monitoring}/requests/patch_alarm.rb | 4 +- .../requests/patch_alarm_definition.rb | 4 +- .../requests/patch_notification_method.rb | 4 +- .../requests/put_notification_method.rb | 4 +- .../monitoring}/requests/update_alarm.rb | 4 +- .../requests/update_alarm_definition.rb | 4 +- .../network}/models/extension.rb | 4 +- .../network}/models/extensions.rb | 10 +- .../network}/models/floating_ip.rb | 4 +- .../network}/models/floating_ips.rb | 10 +- .../network}/models/ike_policies.rb | 10 +- .../network}/models/ike_policy.rb | 4 +- .../network}/models/ipsec_policies.rb | 10 +- .../network}/models/ipsec_policy.rb | 4 +- .../network}/models/ipsec_site_connection.rb | 4 +- .../network}/models/ipsec_site_connections.rb | 10 +- .../network}/models/lb_health_monitor.rb | 4 +- .../network}/models/lb_health_monitors.rb | 10 +- .../network}/models/lb_member.rb | 4 +- .../network}/models/lb_members.rb | 10 +- .../network}/models/lb_pool.rb | 4 +- .../network}/models/lb_pools.rb | 10 +- .../network}/models/lb_vip.rb | 4 +- .../network}/models/lb_vips.rb | 10 +- .../network}/models/network.rb | 4 +- .../models/network_ip_availabilities.rb | 10 +- .../models/network_ip_availability.rb | 4 +- .../network}/models/networks.rb | 10 +- .../network}/models/port.rb | 4 +- .../network}/models/ports.rb | 10 +- .../network}/models/rbac_policies.rb | 10 +- .../network}/models/rbac_policy.rb | 4 +- .../network}/models/router.rb | 6 +- .../network}/models/routers.rb | 10 +- .../network}/models/security_group.rb | 6 +- .../network}/models/security_group_rule.rb | 4 +- .../network}/models/security_group_rules.rb | 10 +- .../network}/models/security_groups.rb | 10 +- .../network}/models/subnet.rb | 4 +- .../network}/models/subnet_pool.rb | 4 +- .../network}/models/subnet_pools.rb | 10 +- .../network}/models/subnets.rb | 10 +- .../network}/models/vpn_service.rb | 4 +- .../network}/models/vpn_services.rb | 10 +- .../network/network.rb} | 10 +- .../network}/requests/add_router_interface.rb | 4 +- .../requests/associate_floating_ip.rb | 4 +- .../requests/associate_lb_health_monitor.rb | 6 +- .../network}/requests/create_floating_ip.rb | 4 +- .../network}/requests/create_ike_policy.rb | 4 +- .../network}/requests/create_ipsec_policy.rb | 4 +- .../requests/create_ipsec_site_connection.rb | 4 +- .../requests/create_lb_health_monitor.rb | 4 +- .../network}/requests/create_lb_member.rb | 4 +- .../network}/requests/create_lb_pool.rb | 4 +- .../network}/requests/create_lb_vip.rb | 4 +- .../requests/create_lbaas_healthmonitor.rb | 4 +- .../requests/create_lbaas_l7policy.rb | 4 +- .../network}/requests/create_lbaas_l7rule.rb | 4 +- .../requests/create_lbaas_listener.rb | 4 +- .../requests/create_lbaas_loadbalancer.rb | 4 +- .../network}/requests/create_lbaas_pool.rb | 4 +- .../requests/create_lbaas_pool_member.rb | 4 +- .../network}/requests/create_network.rb | 8 +- .../network}/requests/create_port.rb | 4 +- .../network}/requests/create_rbac_policy.rb | 4 +- .../network}/requests/create_router.rb | 8 +- .../requests/create_security_group.rb | 4 +- .../requests/create_security_group_rule.rb | 4 +- .../network}/requests/create_subnet.rb | 4 +- .../network}/requests/create_subnet_pool.rb | 4 +- .../network}/requests/create_vpn_service.rb | 4 +- .../network}/requests/delete_floating_ip.rb | 6 +- .../network}/requests/delete_ike_policy.rb | 6 +- .../network}/requests/delete_ipsec_policy.rb | 6 +- .../requests/delete_ipsec_site_connection.rb | 6 +- .../requests/delete_lb_health_monitor.rb | 6 +- .../network}/requests/delete_lb_member.rb | 6 +- .../network}/requests/delete_lb_pool.rb | 6 +- .../network}/requests/delete_lb_vip.rb | 6 +- .../requests/delete_lbaas_healthmonitor.rb | 6 +- .../requests/delete_lbaas_l7policy.rb | 6 +- .../network}/requests/delete_lbaas_l7rule.rb | 6 +- .../requests/delete_lbaas_listener.rb | 6 +- .../requests/delete_lbaas_loadbalancer.rb | 6 +- .../network}/requests/delete_lbaas_pool.rb | 6 +- .../requests/delete_lbaas_pool_member.rb | 6 +- .../network}/requests/delete_network.rb | 6 +- .../network}/requests/delete_port.rb | 6 +- .../network}/requests/delete_quota.rb | 4 +- .../network}/requests/delete_rbac_policy.rb | 6 +- .../network}/requests/delete_router.rb | 6 +- .../requests/delete_security_group.rb | 6 +- .../requests/delete_security_group_rule.rb | 6 +- .../network}/requests/delete_subnet.rb | 6 +- .../network}/requests/delete_subnet_pool.rb | 6 +- .../network}/requests/delete_vpn_service.rb | 6 +- .../requests/disassociate_floating_ip.rb | 4 +- .../disassociate_lb_health_monitor.rb | 6 +- .../network}/requests/get_extension.rb | 6 +- .../network}/requests/get_floating_ip.rb | 6 +- .../network}/requests/get_ike_policy.rb | 6 +- .../network}/requests/get_ipsec_policy.rb | 6 +- .../requests/get_ipsec_site_connection.rb | 6 +- .../requests/get_lb_health_monitor.rb | 6 +- .../network}/requests/get_lb_member.rb | 6 +- .../network}/requests/get_lb_pool.rb | 6 +- .../network}/requests/get_lb_pool_stats.rb | 6 +- .../network}/requests/get_lb_vip.rb | 6 +- .../requests/get_lbaas_healthmonitor.rb | 6 +- .../network}/requests/get_lbaas_l7policy.rb | 6 +- .../network}/requests/get_lbaas_l7rule.rb | 6 +- .../network}/requests/get_lbaas_listener.rb | 6 +- .../requests/get_lbaas_loadbalancer.rb | 6 +- .../network}/requests/get_lbaas_pool.rb | 6 +- .../requests/get_lbaas_pool_member.rb | 6 +- .../network}/requests/get_network.rb | 6 +- .../requests/get_network_ip_availability.rb | 6 +- .../network}/requests/get_port.rb | 6 +- .../network}/requests/get_quota.rb | 4 +- .../network}/requests/get_quotas.rb | 4 +- .../network}/requests/get_rbac_policy.rb | 6 +- .../network}/requests/get_router.rb | 6 +- .../network}/requests/get_security_group.rb | 6 +- .../requests/get_security_group_rule.rb | 6 +- .../network}/requests/get_subnet.rb | 6 +- .../network}/requests/get_subnet_pool.rb | 6 +- .../network}/requests/get_vpn_service.rb | 6 +- .../network}/requests/list_extensions.rb | 4 +- .../network}/requests/list_floating_ips.rb | 4 +- .../network}/requests/list_ike_policies.rb | 4 +- .../network}/requests/list_ipsec_policies.rb | 4 +- .../requests/list_ipsec_site_connections.rb | 4 +- .../requests/list_lb_health_monitors.rb | 4 +- .../network}/requests/list_lb_members.rb | 4 +- .../network}/requests/list_lb_pools.rb | 4 +- .../network}/requests/list_lb_vips.rb | 4 +- .../requests/list_lbaas_healthmonitors.rb | 4 +- .../requests/list_lbaas_l7policies.rb | 4 +- .../network}/requests/list_lbaas_l7rules.rb | 4 +- .../network}/requests/list_lbaas_listeners.rb | 4 +- .../requests/list_lbaas_loadbalancers.rb | 4 +- .../requests/list_lbaas_pool_members.rb | 4 +- .../network}/requests/list_lbaas_pools.rb | 4 +- .../list_network_ip_availabilities.rb | 6 +- .../network}/requests/list_networks.rb | 4 +- .../network}/requests/list_ports.rb | 4 +- .../network}/requests/list_rbac_policies.rb | 4 +- .../network}/requests/list_routers.rb | 4 +- .../requests/list_security_group_rules.rb | 4 +- .../network}/requests/list_security_groups.rb | 4 +- .../network}/requests/list_subnet_pools.rb | 4 +- .../network}/requests/list_subnets.rb | 4 +- .../network}/requests/list_vpn_services.rb | 4 +- .../requests/remove_router_interface.rb | 4 +- .../network}/requests/set_tenant.rb | 4 +- .../network}/requests/update_ike_policy.rb | 6 +- .../network}/requests/update_ipsec_policy.rb | 6 +- .../requests/update_ipsec_site_connection.rb | 6 +- .../requests/update_lb_health_monitor.rb | 6 +- .../network}/requests/update_lb_member.rb | 6 +- .../network}/requests/update_lb_pool.rb | 6 +- .../network}/requests/update_lb_vip.rb | 6 +- .../requests/update_lbaas_healthmonitor.rb | 6 +- .../requests/update_lbaas_l7policy.rb | 6 +- .../network}/requests/update_lbaas_l7rule.rb | 6 +- .../requests/update_lbaas_listener.rb | 6 +- .../requests/update_lbaas_loadbalancer.rb | 6 +- .../network}/requests/update_lbaas_pool.rb | 6 +- .../requests/update_lbaas_pool_member.rb | 6 +- .../network}/requests/update_network.rb | 8 +- .../network}/requests/update_port.rb | 6 +- .../network}/requests/update_quota.rb | 4 +- .../network}/requests/update_rbac_policy.rb | 6 +- .../network}/requests/update_router.rb | 10 +- .../requests/update_security_group.rb | 6 +- .../network}/requests/update_subnet.rb | 6 +- .../network}/requests/update_subnet_pool.rb | 6 +- .../network}/requests/update_vpn_service.rb | 6 +- .../openstack => openstack/nfv}/models/vnf.rb | 4 +- .../nfv}/models/vnfd.rb | 4 +- .../nfv}/models/vnfds.rb | 10 +- .../nfv}/models/vnfs.rb | 10 +- .../openstack.rb => openstack/nfv/nfv.rb} | 10 +- .../nfv}/requests/create_vnf.rb | 4 +- .../nfv}/requests/create_vnfd.rb | 4 +- .../nfv}/requests/delete_vnf.rb | 4 +- .../nfv}/requests/delete_vnfd.rb | 4 +- .../nfv}/requests/get_vnf.rb | 4 +- .../nfv}/requests/get_vnfd.rb | 4 +- .../nfv}/requests/list_vnfds.rb | 4 +- .../nfv}/requests/list_vnfs.rb | 4 +- .../nfv}/requests/update_vnf.rb | 4 +- .../orchestration}/models/event.rb | 4 +- .../orchestration}/models/events.rb | 10 +- .../orchestration}/models/resource.rb | 4 +- .../orchestration}/models/resource_schemas.rb | 6 +- .../orchestration}/models/resources.rb | 12 +- .../orchestration}/models/stack.rb | 6 +- .../orchestration}/models/stacks.rb | 10 +- .../orchestration}/models/template.rb | 4 +- .../orchestration}/models/templates.rb | 10 +- .../orchestration/orchestration.rb} | 12 +- .../orchestration}/requests/abandon_stack.rb | 4 +- .../orchestration}/requests/build_info.rb | 4 +- .../orchestration}/requests/cancel_update.rb | 4 +- .../orchestration}/requests/create_stack.rb | 6 +- .../orchestration}/requests/delete_stack.rb | 4 +- .../requests/get_stack_template.rb | 4 +- .../orchestration}/requests/list_events.rb | 4 +- .../requests/list_resource_events.rb | 4 +- .../requests/list_resource_types.rb | 4 +- .../orchestration}/requests/list_resources.rb | 4 +- .../requests/list_stack_data.rb | 4 +- .../requests/list_stack_data_detailed.rb | 4 +- .../requests/list_stack_events.rb | 4 +- .../orchestration}/requests/patch_stack.rb | 6 +- .../orchestration}/requests/preview_stack.rb | 4 +- .../requests/show_event_details.rb | 4 +- .../requests/show_resource_data.rb | 4 +- .../requests/show_resource_metadata.rb | 4 +- .../requests/show_resource_schema.rb | 4 +- .../requests/show_resource_template.rb | 4 +- .../requests/show_stack_details.rb | 4 +- .../orchestration}/requests/update_stack.rb | 6 +- .../requests/validate_template.rb | 4 +- .../util/recursive_hot_file_loader.rb | 4 +- .../planning}/models/plan.rb | 0 .../planning}/models/plans.rb | 2 +- .../planning}/models/role.rb | 0 .../planning}/models/roles.rb | 2 +- .../planning/planning.rb} | 10 +- .../planning}/requests/add_role_to_plan.rb | 0 .../planning}/requests/create_plan.rb | 0 .../planning}/requests/delete_plan.rb | 0 .../planning}/requests/get_plan.rb | 0 .../planning}/requests/get_plan_templates.rb | 0 .../planning}/requests/list_plans.rb | 0 .../planning}/requests/list_roles.rb | 0 .../planning}/requests/patch_plan.rb | 0 .../requests/remove_role_from_plan.rb | 0 .../models/availability_zone.rb | 4 +- .../models/availability_zones.rb | 8 +- .../shared_file_system}/models/network.rb | 4 +- .../shared_file_system}/models/networks.rb | 8 +- .../shared_file_system}/models/share.rb | 6 +- .../models/share_access_rule.rb | 4 +- .../models/share_access_rules.rb | 8 +- .../models/share_export_location.rb | 6 +- .../models/share_export_locations.rb | 12 +- .../shared_file_system}/models/shares.rb | 8 +- .../shared_file_system}/models/snapshot.rb | 4 +- .../shared_file_system}/models/snapshots.rb | 8 +- .../add_security_service_to_share_network.rb | 4 +- .../requests/create_security_service.rb | 4 +- .../requests/create_share.rb | 4 +- .../requests/create_share_network.rb | 4 +- .../requests/create_snapshot.rb | 4 +- .../requests/delete_security_service.rb | 4 +- .../requests/delete_share.rb | 4 +- .../requests/delete_share_network.rb | 4 +- .../requests/delete_snapshot.rb | 4 +- .../requests/extend_share.rb | 4 +- .../requests/get_limits.rb | 4 +- .../shared_file_system}/requests/get_quota.rb | 4 +- .../requests/get_security_service.rb | 4 +- .../shared_file_system}/requests/get_share.rb | 4 +- .../requests/get_share_export_location.rb | 6 +- .../requests/get_share_network.rb | 4 +- .../requests/get_snapshot.rb | 4 +- .../requests/grant_share_access.rb | 4 +- .../requests/list_availability_zones.rb | 4 +- .../requests/list_security_services.rb | 4 +- .../requests/list_security_services_detail.rb | 4 +- .../requests/list_share_access_rules.rb | 4 +- .../requests/list_share_export_locations.rb | 6 +- .../requests/list_share_networks.rb | 4 +- .../requests/list_share_networks_detail.rb | 4 +- .../requests/list_shares.rb | 4 +- .../requests/list_shares_detail.rb | 4 +- .../requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detail.rb | 4 +- ...ove_security_service_from_share_network.rb | 4 +- .../requests/revoke_share_access.rb | 4 +- .../requests/share_action.rb | 4 +- .../requests/share_network_action.rb | 4 +- .../requests/shrink_share.rb | 4 +- .../requests/update_quota.rb | 4 +- .../requests/update_security_service.rb | 4 +- .../requests/update_share.rb | 4 +- .../requests/update_share_network.rb | 4 +- .../requests/update_snapshot.rb | 4 +- .../shared_file_system/shared_file_system.rb} | 10 +- .../storage}/models/directories.rb | 10 +- .../storage}/models/directory.rb | 10 +- .../storage}/models/file.rb | 4 +- .../storage}/models/files.rb | 12 +- .../storage}/requests/copy_object.rb | 4 +- .../storage}/requests/delete_container.rb | 4 +- .../requests/delete_multiple_objects.rb | 4 +- .../storage}/requests/delete_object.rb | 4 +- .../requests/delete_static_large_object.rb | 4 +- .../storage}/requests/get_container.rb | 4 +- .../storage}/requests/get_containers.rb | 4 +- .../storage}/requests/get_object.rb | 4 +- .../storage}/requests/get_object_http_url.rb | 4 +- .../storage}/requests/get_object_https_url.rb | 4 +- .../storage}/requests/head_container.rb | 4 +- .../storage}/requests/head_containers.rb | 4 +- .../storage}/requests/head_object.rb | 4 +- .../storage}/requests/post_object.rb | 4 +- .../requests/post_set_meta_temp_url_key.rb | 4 +- .../storage}/requests/public_url.rb | 4 +- .../storage}/requests/put_container.rb | 4 +- .../requests/put_dynamic_obj_manifest.rb | 6 +- .../storage}/requests/put_object.rb | 4 +- .../storage}/requests/put_object_manifest.rb | 4 +- .../requests/put_static_obj_manifest.rb | 6 +- .../storage/storage.rb} | 12 +- .../volume}/models/availability_zone.rb | 4 +- .../volume}/models/availability_zones.rb | 4 +- .../volume}/models/backup.rb | 4 +- .../volume}/models/backups.rb | 6 +- .../volume}/models/snapshot.rb | 4 +- .../volume}/models/snapshots.rb | 6 +- .../volume}/models/transfer.rb | 4 +- .../volume}/models/transfers.rb | 6 +- .../volume}/models/volume.rb | 4 +- .../volume}/models/volume_type.rb | 4 +- .../volume}/models/volume_types.rb | 6 +- .../volume}/models/volumes.rb | 6 +- .../volume}/requests/accept_transfer.rb | 4 +- .../volume}/requests/action.rb | 4 +- .../volume}/requests/create_backup.rb | 4 +- .../volume}/requests/create_snapshot.rb | 4 +- .../volume}/requests/create_transfer.rb | 4 +- .../volume}/requests/create_volume.rb | 4 +- .../volume}/requests/create_volume_type.rb | 4 +- .../volume}/requests/delete_backup.rb | 4 +- .../volume}/requests/delete_metadata.rb | 4 +- .../volume}/requests/delete_snapshot.rb | 4 +- .../requests/delete_snapshot_metadata.rb | 4 +- .../volume}/requests/delete_transfer.rb | 4 +- .../volume}/requests/delete_volume.rb | 4 +- .../volume}/requests/delete_volume_type.rb | 4 +- .../volume}/requests/extend_volume.rb | 4 +- .../volume}/requests/get_backup_details.rb | 4 +- .../volume}/requests/get_quota.rb | 4 +- .../volume}/requests/get_quota_defaults.rb | 4 +- .../volume}/requests/get_quota_usage.rb | 4 +- .../volume}/requests/get_snapshot_details.rb | 4 +- .../volume}/requests/get_transfer_details.rb | 4 +- .../volume}/requests/get_volume_details.rb | 4 +- .../requests/get_volume_type_details.rb | 4 +- .../volume}/requests/list_backups.rb | 4 +- .../volume}/requests/list_backups_detailed.rb | 4 +- .../volume}/requests/list_snapshots.rb | 4 +- .../requests/list_snapshots_detailed.rb | 4 +- .../volume}/requests/list_transfers.rb | 4 +- .../requests/list_transfers_detailed.rb | 4 +- .../volume}/requests/list_volume_types.rb | 4 +- .../volume}/requests/list_volumes.rb | 4 +- .../volume}/requests/list_volumes_detailed.rb | 4 +- .../volume}/requests/list_zones.rb | 4 +- .../volume}/requests/replace_metadata.rb | 4 +- .../volume}/requests/restore_backup.rb | 4 +- .../volume}/requests/set_tenant.rb | 4 +- .../volume}/requests/snapshot_action.rb | 4 +- .../volume}/requests/update_metadata.rb | 4 +- .../volume}/requests/update_quota.rb | 4 +- .../volume}/requests/update_snapshot.rb | 4 +- .../requests/update_snapshot_metadata.rb | 4 +- .../volume}/requests/update_volume.rb | 4 +- .../volume}/requests/update_volume_type.rb | 4 +- .../openstack => openstack/volume}/v1.rb | 14 +-- .../volume/v1/models/availability_zone.rb | 15 +++ .../volume/v1/models/availability_zones.rb | 16 +++ .../volume}/v1/models/backup.rb | 8 +- lib/fog/openstack/volume/v1/models/backups.rb | 16 +++ .../volume}/v1/models/snapshot.rb | 8 +- .../openstack/volume/v1/models/snapshots.rb | 16 +++ .../volume}/v1/models/transfer.rb | 8 +- .../openstack/volume/v1/models/transfers.rb | 16 +++ .../volume}/v1/models/volume.rb | 8 +- .../volume}/v1/models/volume_type.rb | 8 +- .../volume/v1/models/volume_types.rb | 16 +++ lib/fog/openstack/volume/v1/models/volumes.rb | 16 +++ .../volume/v1/requests/accept_transfer.rb | 2 + .../openstack/volume/v1/requests/action.rb | 2 + .../volume/v1/requests/create_backup.rb | 2 + .../volume}/v1/requests/create_snapshot.rb | 8 +- .../volume/v1/requests/create_transfer.rb | 2 + .../volume}/v1/requests/create_volume.rb | 8 +- .../volume/v1/requests/create_volume_type.rb | 2 + .../volume/v1/requests/delete_backup.rb | 2 + .../volume/v1/requests/delete_metadata.rb | 2 + .../volume/v1/requests/delete_snapshot.rb | 2 + .../v1/requests/delete_snapshot_metadata.rb | 2 + .../volume/v1/requests/delete_transfer.rb | 2 + .../volume/v1/requests/delete_volume.rb | 2 + .../volume/v1/requests/delete_volume_type.rb | 2 + .../volume/v1/requests/extend_volume.rb | 2 + .../volume/v1/requests/get_backup_details.rb | 2 + .../openstack/volume/v1/requests/get_quota.rb | 2 + .../volume/v1/requests/get_quota_defaults.rb | 2 + .../volume/v1/requests/get_quota_usage.rb | 2 + .../v1/requests/get_snapshot_details.rb | 8 +- .../v1/requests/get_transfer_details.rb | 2 + .../volume}/v1/requests/get_volume_details.rb | 8 +- .../v1/requests/get_volume_type_details.rb | 2 + .../volume/v1/requests/list_backups.rb | 2 + .../v1/requests/list_backups_detailed.rb | 2 + .../volume/v1/requests/list_snapshots.rb | 2 + .../v1/requests/list_snapshots_detailed.rb | 2 + .../volume/v1/requests/list_transfers.rb | 2 + .../v1/requests/list_transfers_detailed.rb | 2 + .../volume/v1/requests/list_volume_types.rb | 2 + .../volume}/v1/requests/list_volumes.rb | 8 +- .../v1/requests/list_volumes_detailed.rb | 8 +- .../volume/v1/requests/list_zones.rb | 2 + .../volume}/v1/requests/real.rb | 6 +- .../openstack/volume/v1/requests/real_mock.rb | 14 +++ .../volume/v1/requests/replace_metadata.rb | 2 + .../volume/v1/requests/restore_backup.rb | 2 + .../volume/v1/requests/set_tenant.rb | 2 + .../volume/v1/requests/update_metadata.rb | 2 + .../volume/v1/requests/update_quota.rb | 2 + .../volume/v1/requests/update_snapshot.rb | 2 + .../v1/requests/update_snapshot_metadata.rb | 2 + .../volume/v1/requests/update_volume.rb | 2 + .../openstack => openstack/volume}/v2.rb | 14 +-- .../volume/v2/models/availability_zone.rb | 15 +++ .../volume/v2/models/availability_zones.rb | 16 +++ .../volume}/v2/models/backup.rb | 8 +- lib/fog/openstack/volume/v2/models/backups.rb | 16 +++ .../volume}/v2/models/snapshot.rb | 8 +- .../openstack/volume/v2/models/snapshots.rb | 16 +++ .../volume}/v2/models/transfer.rb | 8 +- .../openstack/volume/v2/models/transfers.rb | 16 +++ .../volume}/v2/models/volume.rb | 8 +- .../volume}/v2/models/volume_type.rb | 8 +- .../volume/v2/models/volume_types.rb | 16 +++ lib/fog/openstack/volume/v2/models/volumes.rb | 16 +++ .../volume/v2/requests/accept_transfer.rb | 2 + .../openstack/volume/v2/requests/action.rb | 2 + .../volume/v2/requests/create_backup.rb | 2 + .../volume}/v2/requests/create_snapshot.rb | 8 +- .../volume/v2/requests/create_transfer.rb | 2 + .../volume}/v2/requests/create_volume.rb | 8 +- .../volume/v2/requests/create_volume_type.rb | 2 + .../volume/v2/requests/delete_backup.rb | 2 + .../volume/v2/requests/delete_metadata.rb | 2 + .../volume/v2/requests/delete_snapshot.rb | 2 + .../v2/requests/delete_snapshot_metadata.rb | 2 + .../volume/v2/requests/delete_transfer.rb | 2 + .../volume/v2/requests/delete_volume.rb | 2 + .../volume/v2/requests/delete_volume_type.rb | 2 + .../volume/v2/requests/extend_volume.rb | 2 + .../volume/v2/requests/get_backup_details.rb | 2 + .../openstack/volume/v2/requests/get_quota.rb | 2 + .../volume/v2/requests/get_quota_defaults.rb | 2 + .../volume/v2/requests/get_quota_usage.rb | 2 + .../v2/requests/get_snapshot_details.rb | 8 +- .../v2/requests/get_transfer_details.rb | 2 + .../volume}/v2/requests/get_volume_details.rb | 8 +- .../v2/requests/get_volume_type_details.rb | 2 + .../volume/v2/requests/list_backups.rb | 2 + .../v2/requests/list_backups_detailed.rb | 2 + .../volume/v2/requests/list_snapshots.rb | 2 + .../v2/requests/list_snapshots_detailed.rb | 2 + .../volume/v2/requests/list_transfers.rb | 2 + .../v2/requests/list_transfers_detailed.rb | 2 + .../volume/v2/requests/list_volume_types.rb | 2 + .../volume}/v2/requests/list_volumes.rb | 8 +- .../v2/requests/list_volumes_detailed.rb | 8 +- .../volume/v2/requests/list_zones.rb | 2 + .../volume}/v2/requests/real.rb | 6 +- .../openstack/volume/v2/requests/real_mock.rb | 14 +++ .../volume/v2/requests/replace_metadata.rb | 2 + .../volume/v2/requests/restore_backup.rb | 2 + .../volume/v2/requests/set_tenant.rb | 2 + .../volume/v2/requests/snapshot_action.rb | 2 + .../volume/v2/requests/update_metadata.rb | 2 + .../volume/v2/requests/update_quota.rb | 2 + .../volume/v2/requests/update_snapshot.rb | 2 + .../v2/requests/update_snapshot_metadata.rb | 2 + .../volume/v2/requests/update_volume.rb | 2 + .../volume/v2/requests/update_volume_type.rb | 2 + .../volume/volume.rb} | 14 +-- .../openstack => openstack/workflow}/v2.rb | 10 +- .../workflow}/v2/requests/create_action.rb | 4 +- .../v2/requests/create_action_execution.rb | 4 +- .../v2/requests/create_cron_trigger.rb | 4 +- .../v2/requests/create_environment.rb | 4 +- .../workflow}/v2/requests/create_execution.rb | 4 +- .../workflow}/v2/requests/create_workbook.rb | 4 +- .../workflow}/v2/requests/create_workflow.rb | 4 +- .../workflow}/v2/requests/delete_action.rb | 4 +- .../v2/requests/delete_action_execution.rb | 4 +- .../v2/requests/delete_cron_trigger.rb | 4 +- .../v2/requests/delete_environment.rb | 4 +- .../workflow}/v2/requests/delete_execution.rb | 4 +- .../workflow}/v2/requests/delete_workbook.rb | 4 +- .../workflow}/v2/requests/delete_workflow.rb | 4 +- .../workflow}/v2/requests/get_action.rb | 4 +- .../v2/requests/get_action_execution.rb | 4 +- .../workflow}/v2/requests/get_cron_trigger.rb | 4 +- .../workflow}/v2/requests/get_environment.rb | 4 +- .../workflow}/v2/requests/get_execution.rb | 4 +- .../workflow}/v2/requests/get_task.rb | 4 +- .../workflow}/v2/requests/get_workbook.rb | 4 +- .../workflow}/v2/requests/get_workflow.rb | 4 +- .../v2/requests/list_action_executions.rb | 4 +- .../workflow}/v2/requests/list_actions.rb | 4 +- .../v2/requests/list_cron_triggers.rb | 4 +- .../v2/requests/list_environments.rb | 4 +- .../workflow}/v2/requests/list_executions.rb | 4 +- .../workflow}/v2/requests/list_services.rb | 4 +- .../workflow}/v2/requests/list_tasks.rb | 4 +- .../workflow}/v2/requests/list_workbooks.rb | 4 +- .../workflow}/v2/requests/list_workflows.rb | 4 +- .../workflow}/v2/requests/rerun_task.rb | 4 +- .../workflow}/v2/requests/update_action.rb | 4 +- .../v2/requests/update_action_execution.rb | 4 +- .../v2/requests/update_environment.rb | 4 +- .../workflow}/v2/requests/update_execution.rb | 4 +- .../workflow}/v2/requests/update_workbook.rb | 4 +- .../workflow}/v2/requests/update_workflow.rb | 4 +- .../workflow}/v2/requests/validate_action.rb | 4 +- .../v2/requests/validate_workbook.rb | 4 +- .../v2/requests/validate_workflow.rb | 4 +- .../workflow/workflow.rb} | 10 +- .../openstack/v1/models/availability_zone.rb | 15 --- .../openstack/v1/models/availability_zones.rb | 16 --- lib/fog/volume/openstack/v1/models/backups.rb | 16 --- .../volume/openstack/v1/models/snapshots.rb | 16 --- .../volume/openstack/v1/models/transfers.rb | 16 --- .../openstack/v1/models/volume_types.rb | 16 --- lib/fog/volume/openstack/v1/models/volumes.rb | 16 --- .../openstack/v1/requests/accept_transfer.rb | 2 - .../volume/openstack/v1/requests/action.rb | 2 - .../openstack/v1/requests/create_backup.rb | 2 - .../openstack/v1/requests/create_transfer.rb | 2 - .../v1/requests/create_volume_type.rb | 2 - .../openstack/v1/requests/delete_backup.rb | 2 - .../openstack/v1/requests/delete_metadata.rb | 2 - .../openstack/v1/requests/delete_snapshot.rb | 2 - .../v1/requests/delete_snapshot_metadata.rb | 2 - .../openstack/v1/requests/delete_transfer.rb | 2 - .../openstack/v1/requests/delete_volume.rb | 2 - .../v1/requests/delete_volume_type.rb | 2 - .../openstack/v1/requests/extend_volume.rb | 2 - .../v1/requests/get_backup_details.rb | 2 - .../volume/openstack/v1/requests/get_quota.rb | 2 - .../v1/requests/get_quota_defaults.rb | 2 - .../openstack/v1/requests/get_quota_usage.rb | 2 - .../v1/requests/get_transfer_details.rb | 2 - .../v1/requests/get_volume_type_details.rb | 2 - .../openstack/v1/requests/list_backups.rb | 2 - .../v1/requests/list_backups_detailed.rb | 2 - .../openstack/v1/requests/list_snapshots.rb | 2 - .../v1/requests/list_snapshots_detailed.rb | 2 - .../openstack/v1/requests/list_transfers.rb | 2 - .../v1/requests/list_transfers_detailed.rb | 2 - .../v1/requests/list_volume_types.rb | 2 - .../openstack/v1/requests/list_zones.rb | 2 - .../volume/openstack/v1/requests/real_mock.rb | 14 --- .../openstack/v1/requests/replace_metadata.rb | 2 - .../openstack/v1/requests/restore_backup.rb | 2 - .../openstack/v1/requests/set_tenant.rb | 2 - .../openstack/v1/requests/update_metadata.rb | 2 - .../openstack/v1/requests/update_quota.rb | 2 - .../openstack/v1/requests/update_snapshot.rb | 2 - .../v1/requests/update_snapshot_metadata.rb | 2 - .../openstack/v1/requests/update_volume.rb | 2 - .../openstack/v2/models/availability_zone.rb | 15 --- .../openstack/v2/models/availability_zones.rb | 16 --- lib/fog/volume/openstack/v2/models/backups.rb | 16 --- .../volume/openstack/v2/models/snapshots.rb | 16 --- .../volume/openstack/v2/models/transfers.rb | 16 --- .../openstack/v2/models/volume_types.rb | 16 --- lib/fog/volume/openstack/v2/models/volumes.rb | 16 --- .../openstack/v2/requests/accept_transfer.rb | 2 - .../volume/openstack/v2/requests/action.rb | 2 - .../openstack/v2/requests/create_backup.rb | 2 - .../openstack/v2/requests/create_transfer.rb | 2 - .../v2/requests/create_volume_type.rb | 2 - .../openstack/v2/requests/delete_backup.rb | 2 - .../openstack/v2/requests/delete_metadata.rb | 2 - .../openstack/v2/requests/delete_snapshot.rb | 2 - .../v2/requests/delete_snapshot_metadata.rb | 2 - .../openstack/v2/requests/delete_transfer.rb | 2 - .../openstack/v2/requests/delete_volume.rb | 2 - .../v2/requests/delete_volume_type.rb | 2 - .../openstack/v2/requests/extend_volume.rb | 2 - .../v2/requests/get_backup_details.rb | 2 - .../volume/openstack/v2/requests/get_quota.rb | 2 - .../v2/requests/get_quota_defaults.rb | 2 - .../openstack/v2/requests/get_quota_usage.rb | 2 - .../v2/requests/get_transfer_details.rb | 2 - .../v2/requests/get_volume_type_details.rb | 2 - .../openstack/v2/requests/list_backups.rb | 2 - .../v2/requests/list_backups_detailed.rb | 2 - .../openstack/v2/requests/list_snapshots.rb | 2 - .../v2/requests/list_snapshots_detailed.rb | 2 - .../openstack/v2/requests/list_transfers.rb | 2 - .../v2/requests/list_transfers_detailed.rb | 2 - .../v2/requests/list_volume_types.rb | 2 - .../openstack/v2/requests/list_zones.rb | 2 - .../volume/openstack/v2/requests/real_mock.rb | 14 --- .../openstack/v2/requests/replace_metadata.rb | 2 - .../openstack/v2/requests/restore_backup.rb | 2 - .../openstack/v2/requests/set_tenant.rb | 2 - .../openstack/v2/requests/snapshot_action.rb | 2 - .../openstack/v2/requests/update_metadata.rb | 2 - .../openstack/v2/requests/update_quota.rb | 2 - .../openstack/v2/requests/update_snapshot.rb | 2 - .../v2/requests/update_snapshot_metadata.rb | 2 - .../openstack/v2/requests/update_volume.rb | 2 - .../v2/requests/update_volume_type.rb | 2 - spec/dns_v2_spec.rb | 4 +- spec/identity_v3_spec.rb | 70 ++++++------ spec/image_v1_spec.rb | 4 +- spec/image_v2_spec.rb | 6 +- spec/image_v2_upload_spec.rb | 6 +- spec/monitoring_spec.rb | 12 +- spec/network_spec.rb | 8 +- spec/shared_context.rb | 4 +- spec/shared_file_system_spec.rb | 6 +- spec/volume_spec.rb | 44 ++++---- test/authenticate_tests.rb | 4 +- test/helpers/collection_helper.rb | 6 +- test/helpers/container_infra_helper.rb | 2 +- test/helpers/dns_v2_helper.rb | 2 +- test/helpers/network_helper.rb | 2 +- test/helpers/nfv_helper.rb | 2 +- test/identity_version_tests.rb | 4 +- test/models/compute/images_tests.rb | 4 +- test/models/compute/security_group_tests.rb | 4 +- test/models/compute/server_group_tests.rb | 6 +- test/models/compute/server_tests.rb | 6 +- test/models/compute/service_tests.rb | 6 +- .../models/container_infra/bay_model_tests.rb | 2 +- test/models/container_infra/bay_tests.rb | 2 +- .../container_infra/certificate_tests.rb | 2 +- .../container_infra/cluster_template_tests.rb | 2 +- test/models/container_infra/cluster_tests.rb | 2 +- test/models/identity/ec2_credential_tests.rb | 2 +- test/models/identity/ec2_credentials_tests.rb | 6 +- test/models/identity/role_tests.rb | 2 +- test/models/identity/roles_tests.rb | 4 +- test/models/identity/tenant_tests.rb | 2 +- test/models/identity/tenants_tests.rb | 8 +- test/models/identity/user_tests.rb | 2 +- test/models/identity/users_tests.rb | 8 +- test/models/image/image_tests.rb | 4 +- test/models/image/images_tests.rb | 10 +- test/models/network/floating_ip_tests.rb | 2 +- test/models/network/floating_ips_tests.rb | 2 +- test/models/network/ike_policies_tests.rb | 2 +- test/models/network/ike_policy_tests.rb | 2 +- test/models/network/ipsec_policies_tests.rb | 2 +- test/models/network/ipsec_policy_tests.rb | 2 +- .../network/ipsec_site_connection_tests.rb | 2 +- .../network/ipsec_site_connections_tests.rb | 2 +- .../models/network/lb_health_monitor_tests.rb | 2 +- .../network/lb_health_monitors_tests.rb | 2 +- test/models/network/lb_member_tests.rb | 2 +- test/models/network/lb_members_tests.rb | 2 +- test/models/network/lb_pool_tests.rb | 2 +- test/models/network/lb_pools_tests.rb | 2 +- test/models/network/lb_vip_tests.rb | 2 +- test/models/network/lb_vips_tests.rb | 2 +- test/models/network/network_tests.rb | 2 +- test/models/network/networks_tests.rb | 2 +- test/models/network/port_tests.rb | 2 +- test/models/network/ports_tests.rb | 2 +- test/models/network/router_tests.rb | 2 +- test/models/network/routers_tests.rb | 2 +- .../network/security_group_rule_tests.rb | 2 +- .../network/security_group_rules_tests.rb | 2 +- test/models/network/security_group_tests.rb | 2 +- test/models/network/security_groups_tests.rb | 2 +- test/models/network/subnet_pools_tests.rb | 2 +- test/models/network/subnet_tests.rb | 2 +- test/models/network/subnets_tests.rb | 2 +- test/models/network/vpn_service_tests.rb | 2 +- test/models/network/vpn_services_tests.rb | 2 +- test/models/planning/plan_tests.rb | 4 +- test/models/planning/plans_tests.rb | 4 +- test/models/planning/role_tests.rb | 6 +- test/models/storage/file_tests.rb | 2 +- test/requests/baremetal/chassis_tests.rb | 4 +- test/requests/baremetal/driver_tests.rb | 4 +- test/requests/baremetal/node_tests.rb | 4 +- test/requests/baremetal/port_tests.rb | 8 +- test/requests/compute/address_tests.rb | 4 +- test/requests/compute/aggregate_tests.rb | 4 +- .../compute/availability_zone_tests.rb | 6 +- test/requests/compute/flavor_tests.rb | 16 +-- test/requests/compute/helper.rb | 8 +- test/requests/compute/image_tests.rb | 10 +- test/requests/compute/keypair_tests.rb | 8 +- test/requests/compute/limit_tests.rb | 10 +- test/requests/compute/quota_tests.rb | 6 +- test/requests/compute/security_group_tests.rb | 2 +- test/requests/compute/server_tests.rb | 20 ++-- test/requests/compute/service_tests.rb | 10 +- test/requests/compute/tenant_tests.rb | 6 +- test/requests/compute/volume_tests.rb | 4 +- .../container_infra/bay_model_tests.rb | 2 +- test/requests/container_infra/bay_tests.rb | 2 +- .../container_infra/certificate_tests.rb | 2 +- .../container_infra/cluster_template_tests.rb | 2 +- .../requests/container_infra/cluster_tests.rb | 2 +- test/requests/dns_v1/domain_tests.rb | 4 +- test/requests/dns_v1/quota_tests.rb | 4 +- test/requests/dns_v2/pool_tests.rb | 2 +- test/requests/dns_v2/quota_tests.rb | 4 +- test/requests/dns_v2/recordset_tests.rb | 2 +- test/requests/dns_v2/zone_tests.rb | 2 +- test/requests/event/event_tests.rb | 4 +- .../identity/ec2_credentials_tests.rb | 2 +- test/requests/identity/role_tests.rb | 2 +- test/requests/identity/tenant_tests.rb | 2 +- test/requests/identity/user_tests.rb | 2 +- test/requests/image/image_tests.rb | 24 ++-- .../introspection/introspection_tests.rb | 4 +- test/requests/introspection/rules_tests.rb | 2 +- test/requests/metering/event_tests.rb | 4 +- test/requests/metering/meter_tests.rb | 4 +- test/requests/metering/resource_tests.rb | 4 +- test/requests/metric/metric_test.rb | 4 +- test/requests/metric/resource_test.rb | 4 +- test/requests/network/extension_tests.rb | 4 +- test/requests/network/ike_policy_tests.rb | 8 +- test/requests/network/ipsec_policy_tests.rb | 8 +- .../network/ipsec_site_connection_tests.rb | 8 +- .../network/lb_health_monitor_tests.rb | 12 +- test/requests/network/lb_member_tests.rb | 8 +- test/requests/network/lb_pool_tests.rb | 8 +- test/requests/network/lb_vip_tests.rb | 8 +- test/requests/network/network_tests.rb | 8 +- test/requests/network/port_tests.rb | 8 +- test/requests/network/quota_tests.rb | 4 +- test/requests/network/router_tests.rb | 8 +- .../network/security_group_rule_tests.rb | 6 +- test/requests/network/security_group_tests.rb | 6 +- test/requests/network/subnet_pool_tests.rb | 8 +- test/requests/network/subnet_tests.rb | 8 +- test/requests/network/vpn_service_tests.rb | 8 +- .../stack_files_util_helper_tests.rb | 6 +- .../orchestration/stack_files_util_tests.rb | 18 +-- test/requests/orchestration/stack_tests.rb | 6 +- test/requests/planning/plan_tests.rb | 22 ++-- test/requests/planning/role_tests.rb | 4 +- .../shared_file_system/quota_tests.rb | 4 +- test/requests/storage/container_tests.rb | 12 +- test/requests/storage/large_object_tests.rb | 8 +- test/requests/storage/object_tests.rb | 86 +++++++-------- .../volume/availability_zone_tests.rb | 4 +- test/requests/volume/backup_tests.rb | 4 +- test/requests/volume/quota_tests.rb | 6 +- test/requests/volume/volume_type_tests.rb | 4 +- test/requests/workflow/workflow_tests.rb | 8 +- test/storage_tests.rb | 4 +- test/volume_tests.rb | 10 +- 1360 files changed, 3712 insertions(+), 3774 deletions(-) delete mode 100644 lib/fog/dns/openstack.rb delete mode 100644 lib/fog/image/openstack.rb rename lib/fog/{baremetal/openstack.rb => openstack/baremetal/baremetal.rb} (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/chassis_collection.rb (89%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/driver.rb (91%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/drivers.rb (72%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/node.rb (98%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/nodes.rb (89%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/port.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/models/ports.rb (89%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/create_chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/create_node.rb (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/create_port.rb (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/delete_chassis.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/delete_node.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/delete_port.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_chassis.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_driver.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_driver_properties.rb (97%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_node.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/get_port.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_chassis_detailed.rb (93%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_drivers.rb (92%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_nodes.rb (95%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_nodes_detailed.rb (93%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_ports.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/list_ports_detailed.rb (93%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/patch_chassis.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/patch_node.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/patch_port.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/set_node_maintenance.rb (95%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/set_node_power_state.rb (95%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/set_node_provision_state.rb (96%) rename lib/fog/{baremetal/openstack => openstack/baremetal}/requests/unset_node_maintenance.rb (95%) rename lib/fog/{compute/openstack.rb => openstack/compute/compute.rb} (98%) rename lib/fog/{compute/openstack => openstack/compute}/models/address.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/models/addresses.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/aggregate.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/models/aggregates.rb (78%) rename lib/fog/{compute/openstack => openstack/compute}/models/availability_zone.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/models/availability_zones.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/flavor.rb (86%) rename lib/fog/{compute/openstack => openstack/compute}/models/flavors.rb (75%) rename lib/fog/{compute/openstack => openstack/compute}/models/host.rb (81%) rename lib/fog/{compute/openstack => openstack/compute}/models/hosts.rb (73%) rename lib/fog/{compute/openstack => openstack/compute}/models/image.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/models/images.rb (80%) rename lib/fog/{compute/openstack => openstack/compute}/models/key_pair.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/models/key_pairs.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/metadata.rb (79%) rename lib/fog/{compute/openstack => openstack/compute}/models/metadatum.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/models/network.rb (84%) rename lib/fog/{compute/openstack => openstack/compute}/models/networks.rb (81%) rename lib/fog/{compute/openstack => openstack/compute}/models/os_interface.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/models/os_interfaces.rb (78%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_group.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_group_rule.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_group_rules.rb (65%) rename lib/fog/{compute/openstack => openstack/compute}/models/security_groups.rb (70%) rename lib/fog/{compute/openstack => openstack/compute}/models/server.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/models/server_group.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/models/server_groups.rb (74%) rename lib/fog/{compute/openstack => openstack/compute}/models/servers.rb (75%) rename lib/fog/{compute/openstack => openstack/compute}/models/service.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/models/services.rb (83%) rename lib/fog/{compute/openstack => openstack/compute}/models/snapshot.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/models/snapshots.rb (84%) rename lib/fog/{compute/openstack => openstack/compute}/models/tenant.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/models/tenants.rb (78%) rename lib/fog/{compute/openstack => openstack/compute}/models/volume.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/models/volume_attachment.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/models/volume_attachments.rb (71%) rename lib/fog/{compute/openstack => openstack/compute}/models/volumes.rb (84%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_aggregate_host.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_fixed_ip.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_flavor_access.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/add_security_group.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/allocate_address.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/associate_address.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/attach_volume.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/boot_from_snapshot.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/change_server_password.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/confirm_resize_server.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_aggregate.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_flavor.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_flavor_metadata.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_image.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_key_pair.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_os_interface.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_security_group.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_security_group_rule.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_server.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_server_group.rb (80%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_snapshot.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/create_volume.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_aggregate.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_flavor.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_flavor_metadata.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_image.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_key_pair.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_meta.rb (85%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_os_interface.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_security_group.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_security_group_rule.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_server_group.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_service.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_snapshot.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/delete_volume.rb (86%) rename lib/fog/{compute/openstack => openstack/compute}/requests/detach_volume.rb (89%) rename lib/fog/{compute/openstack => openstack/compute}/requests/disable_service.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/disable_service_log_reason.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/disassociate_address.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/enable_service.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/evacuate_server.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_address.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_aggregate.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_console_output.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_flavor_details.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_flavor_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_host_details.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_hypervisor.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_hypervisor_statistics.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_image_details.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_key_pair.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_limits.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_os_interface.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_quota.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_quota_defaults.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_security_group.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_security_group_rule.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_details.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_group.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_password.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_server_volumes.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_snapshot_details.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_usage.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_vnc_console.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/get_volume_details.rb (89%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_address_pools.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_addresses.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_aggregates.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_all_addresses.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_availability_zones.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_flavors.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_flavors_detail.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hosts.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hypervisor_servers.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hypervisors.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_hypervisors_detail.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_images.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_images_detail.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_key_pairs.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_metadata.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_os_interfaces.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_private_addresses.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_public_addresses.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_security_groups.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_server_groups.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_servers.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_servers_detail.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_services.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_snapshots.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_snapshots_detail.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_tenants_with_flavor_access.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_usages.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_volume_attachments.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_volumes.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_volumes_detail.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_zones.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/list_zones_detailed.rb (98%) rename lib/fog/{compute/openstack => openstack/compute}/requests/live_migrate_server.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/migrate_server.rb (90%) rename lib/fog/{compute/openstack => openstack/compute}/requests/pause_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/reboot_server.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/rebuild_server.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/release_address.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remote_consoles.rb (97%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_aggregate_host.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_fixed_ip.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_flavor_access.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/remove_security_group.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/rescue_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/reset_server_state.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/resize_server.rb (91%) rename lib/fog/{compute/openstack => openstack/compute}/requests/resume_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/revert_resize_server.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/server_action.rb (89%) rename lib/fog/{compute/openstack => openstack/compute}/requests/server_actions.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/server_diagnostics.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/set_metadata.rb (86%) rename lib/fog/{compute/openstack => openstack/compute}/requests/set_tenant.rb (88%) rename lib/fog/{compute/openstack => openstack/compute}/requests/shelve_offload_server.rb (93%) rename lib/fog/{compute/openstack => openstack/compute}/requests/shelve_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/start_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/stop_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/suspend_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/unpause_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/unshelve_server.rb (92%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_aggregate.rb (96%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_aggregate_metadata.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_flavor_metadata.rb (95%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_meta.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_metadata.rb (87%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_quota.rb (94%) rename lib/fog/{compute/openstack => openstack/compute}/requests/update_server.rb (89%) rename lib/fog/{container_infra/openstack.rb => openstack/container_infra/container_infra.rb} (94%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/base.rb (76%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bay.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bay_model.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bay_models.rb (64%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/bays.rb (63%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/certificate.rb (73%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/certificates.rb (64%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/cluster.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/cluster_template.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/cluster_templates.rb (65%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/models/clusters.rb (64%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_bay.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_bay_model.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_certificate.rb (95%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_cluster.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/create_cluster_template.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_bay.rb (90%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_bay_model.rb (91%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_cluster.rb (91%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/delete_cluster_template.rb (91%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_bay.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_bay_model.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_certificate.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_cluster.rb (96%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/get_cluster_template.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_bay_models.rb (98%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_bays.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_cluster_templates.rb (98%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/list_clusters.rb (95%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_bay.rb (92%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_bay_model.rb (97%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_cluster.rb (93%) rename lib/fog/{container_infra/openstack => openstack/container_infra}/requests/update_cluster_template.rb (97%) create mode 100644 lib/fog/openstack/dns/dns.rb rename lib/fog/{dns/openstack => openstack/dns}/v1.rb (96%) rename lib/fog/{dns/openstack => openstack/dns}/v1/requests/get_quota.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v1/requests/list_domains.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v1/requests/update_quota.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2.rb (98%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/pool.rb (92%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/pools.rb (79%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/recordset.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/recordsets.rb (83%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_accept.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_accepts.rb (77%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_request.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zone_transfer_requests.rb (80%) rename lib/fog/{dns/openstack => openstack/dns}/v2/models/zones.rb (82%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_recordset.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_zone.rb (97%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_zone_transfer_accept.rb (90%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/create_zone_transfer_request.rb (96%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/delete_recordset.rb (91%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/delete_zone.rb (89%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/delete_zone_transfer_request.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_pool.rb (86%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_quota.rb (86%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_recordset.rb (91%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_zone.rb (86%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_zone_transfer_accept.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/get_zone_transfer_request.rb (95%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_pools.rb (85%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_recordsets.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_zone_transfer_accepts.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_zone_transfer_requests.rb (94%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/list_zones.rb (85%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_quota.rb (89%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_recordset.rb (92%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_zone.rb (91%) rename lib/fog/{dns/openstack => openstack/dns}/v2/requests/update_zone_transfer_request.rb (97%) rename lib/fog/{event/openstack.rb => openstack/event/event.rb} (93%) rename lib/fog/{event/openstack => openstack/event}/models/event.rb (88%) rename lib/fog/{event/openstack => openstack/event}/models/events.rb (67%) rename lib/fog/{event/openstack => openstack/event}/requests/get_event.rb (94%) rename lib/fog/{event/openstack => openstack/event}/requests/list_events.rb (96%) rename lib/fog/{identity/openstack.rb => openstack/identity/identity.rb} (85%) rename lib/fog/{identity/openstack => openstack/identity}/v2.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/ec2_credential.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/ec2_credentials.rb (85%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/role.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/roles.rb (71%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/tenant.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/tenants.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/user.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/models/users.rb (78%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/add_user_to_tenant.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/check_token.rb (92%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_ec2_credential.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_role.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_user.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/create_user_role.rb (93%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_ec2_credential.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_role.rb (86%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_user.rb (87%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/delete_user_role.rb (93%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_ec2_credential.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_role.rb (86%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_tenants_by_id.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_tenants_by_name.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_user_by_id.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/get_user_by_name.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_ec2_credentials.rb (98%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_endpoints_for_token.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_roles.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_roles_for_user_on_tenant.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_tenants.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_user_global_roles.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/list_users.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/remove_user_from_tenant.rb (92%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/set_tenant.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/update_tenant.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/update_user.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v2/requests/validate_token.rb (92%) rename lib/fog/{identity/openstack => openstack/identity}/v3.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/domain.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/domains.rb (76%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/endpoint.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/endpoints.rb (74%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/group.rb (93%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/groups.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/os_credential.rb (97%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/os_credentials.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/policies.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/policy.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/project.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/projects.rb (81%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/role.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/role_assignment.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/role_assignments.rb (82%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/roles.rb (86%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/service.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/services.rb (77%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/token.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/tokens.rb (78%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/user.rb (95%) rename lib/fog/{identity/openstack => openstack/identity}/v3/models/users.rb (80%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/add_user_to_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/auth_domains.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/auth_projects.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_domain_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_domain_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_project_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/check_project_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_domain.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_endpoint.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_os_credential.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_policy.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_project.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_service.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/create_user.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_domain.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_endpoint.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_group.rb (88%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_os_credential.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_policy.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_project.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_role.rb (88%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_service.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/delete_user.rb (88%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_domain.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_endpoint.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_os_credential.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_policy.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_project.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_role.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_service.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/get_user.rb (89%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_domain_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_domain_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_project_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/grant_project_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/group_user_check.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_domain_group_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_domain_user_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_domains.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_endpoints.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_group_users.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_groups.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_os_credentials.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_policies.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_project_group_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_project_user_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_projects.rb (94%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_role_assignments.rb (96%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_roles.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_services.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_user_groups.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_user_projects.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/list_users.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/remove_user_from_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_domain_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_domain_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_project_group_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/revoke_project_user_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_authenticate.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_check.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_revoke.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/token_validate.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_domain.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_endpoint.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_group.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_os_credential.rb (91%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_policy.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_project.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_role.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_service.rb (90%) rename lib/fog/{identity/openstack => openstack/identity}/v3/requests/update_user.rb (90%) create mode 100644 lib/fog/openstack/image/image.rb rename lib/fog/{image/openstack => openstack/image}/v1.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v1/models/image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/models/images.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/add_member_to_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/create_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/delete_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_image_by_id.rb (97%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_image_members.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/get_shared_images.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/list_public_images.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/list_public_images_detailed.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/remove_member_from_image.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/set_tenant.rb (90%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/update_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v1/requests/update_image_members.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v2/models/image.rb (99%) rename lib/fog/{image/openstack => openstack/image}/v2/models/images.rb (89%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/add_member_to_image.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/add_tag_to_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/create_image.rb (97%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/deactivate_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/delete_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/download_image.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_image_by_id.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_image_members.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_member_details.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/get_shared_images.rb (95%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/list_images.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/reactivate_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/remove_member_from_image.rb (94%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/remove_tag_from_image.rb (93%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/set_tenant.rb (90%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/update_image.rb (98%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/update_image_member.rb (96%) rename lib/fog/{image/openstack => openstack/image}/v2/requests/upload_image.rb (95%) rename lib/fog/{introspection/openstack.rb => openstack/introspection/introspection.rb} (85%) rename lib/fog/{introspection/openstack => openstack/introspection}/models/rules.rb (93%) rename lib/fog/{introspection/openstack => openstack/introspection}/models/rules_collection.rb (71%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/abort_introspection.rb (91%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/create_introspection.rb (94%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/create_rules.rb (94%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/delete_rules.rb (90%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/delete_rules_all.rb (89%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/get_introspection.rb (91%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/get_introspection_details.rb (92%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/get_rules.rb (91%) rename lib/fog/{introspection/openstack => openstack/introspection}/requests/list_rules.rb (90%) rename lib/fog/{key_manager/openstack.rb => openstack/key_manager/key_manager.rb} (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/acl.rb (90%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/container.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/containers.rb (66%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/secret.rb (95%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/models/secrets.rb (66%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/create_container.rb (87%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/create_secret.rb (87%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_container.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_container_acl.rb (91%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_secret.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/delete_secret_acl.rb (91%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_container.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_container_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret.rb (85%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret_metadata.rb (86%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/get_secret_payload.rb (88%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/list_containers.rb (87%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/list_secrets.rb (86%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/replace_container_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/replace_secret_acl.rb (93%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/update_container_acl.rb (94%) rename lib/fog/{key_manager/openstack => openstack/key_manager}/requests/update_secret_acl.rb (93%) rename lib/fog/{metering/openstack.rb => openstack/metering/metering.rb} (94%) rename lib/fog/{metering/openstack => openstack/metering}/models/event.rb (87%) rename lib/fog/{metering/openstack => openstack/metering}/models/events.rb (66%) rename lib/fog/{metering/openstack => openstack/metering}/models/meter.rb (100%) rename lib/fog/{metering/openstack => openstack/metering}/models/meters.rb (100%) rename lib/fog/{metering/openstack => openstack/metering}/models/resource.rb (86%) rename lib/fog/{metering/openstack => openstack/metering}/models/resources.rb (66%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_event.rb (93%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_resource.rb (94%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_samples.rb (97%) rename lib/fog/{metering/openstack => openstack/metering}/requests/get_statistics.rb (97%) rename lib/fog/{metering/openstack => openstack/metering}/requests/list_events.rb (95%) rename lib/fog/{metering/openstack => openstack/metering}/requests/list_meters.rb (96%) rename lib/fog/{metering/openstack => openstack/metering}/requests/list_resources.rb (94%) rename lib/fog/{metric/openstack.rb => openstack/metric/metric.rb} (94%) rename lib/fog/{metric/openstack => openstack/metric}/models/metric.rb (90%) rename lib/fog/{metric/openstack => openstack/metric}/models/metrics.rb (71%) rename lib/fog/{metric/openstack => openstack/metric}/models/resource.rb (88%) rename lib/fog/{metric/openstack => openstack/metric}/models/resources.rb (68%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_metric.rb (98%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_metric_measures.rb (96%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_resource.rb (97%) rename lib/fog/{metric/openstack => openstack/metric}/requests/get_resource_metric_measures.rb (96%) rename lib/fog/{metric/openstack => openstack/metric}/requests/list_metrics.rb (99%) rename lib/fog/{metric/openstack => openstack/metric}/requests/list_resources.rb (98%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm.rb (95%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_count.rb (86%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_counts.rb (61%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_definition.rb (96%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_definitions.rb (81%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_state.rb (93%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarm_states.rb (75%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/alarms.rb (76%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/dimension_value.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/dimension_values.rb (65%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/measurement.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/measurements.rb (63%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/metric.rb (92%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/metrics.rb (74%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/notification_method.rb (96%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/notification_methods.rb (82%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/statistic.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/models/statistics.rb (63%) rename lib/fog/{monitoring/openstack.rb => openstack/monitoring/monitoring.rb} (92%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_alarm_definition.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_metric.rb (93%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_metric_array.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/create_notification_method.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/delete_alarm.rb (86%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/delete_alarm_definition.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/delete_notification_method.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/find_measurements.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_alarm.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_alarm_counts.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_alarm_definition.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/get_notification_method.rb (87%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarm_definitions.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarm_state_history_for_all_alarms.rb (91%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarm_state_history_for_specific_alarm.rb (91%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_alarms.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_dimension_values.rb (92%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_metric_names.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_metrics.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_notification_method_types.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_notification_methods.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/list_statistics.rb (90%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/patch_alarm.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/patch_alarm_definition.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/patch_notification_method.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/put_notification_method.rb (89%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/update_alarm.rb (88%) rename lib/fog/{monitoring/openstack => openstack/monitoring}/requests/update_alarm_definition.rb (89%) rename lib/fog/{network/openstack => openstack/network}/models/extension.rb (87%) rename lib/fog/{network/openstack => openstack/network}/models/extensions.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/floating_ips.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/ike_policies.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/ike_policy.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_policies.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_site_connection.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/ipsec_site_connections.rb (77%) rename lib/fog/{network/openstack => openstack/network}/models/lb_health_monitor.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/lb_health_monitors.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/lb_member.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/lb_members.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/lb_pool.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/lb_pools.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/lb_vip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/models/lb_vips.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/network.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/network_ip_availabilities.rb (70%) rename lib/fog/{network/openstack => openstack/network}/models/network_ip_availability.rb (90%) rename lib/fog/{network/openstack => openstack/network}/models/networks.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/port.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/ports.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/rbac_policies.rb (77%) rename lib/fog/{network/openstack => openstack/network}/models/rbac_policy.rb (95%) rename lib/fog/{network/openstack => openstack/network}/models/router.rb (92%) rename lib/fog/{network/openstack => openstack/network}/models/routers.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/security_group.rb (88%) rename lib/fog/{network/openstack => openstack/network}/models/security_group_rule.rb (95%) rename lib/fog/{network/openstack => openstack/network}/models/security_group_rules.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/security_groups.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/subnet.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/subnet_pool.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/subnet_pools.rb (76%) rename lib/fog/{network/openstack => openstack/network}/models/subnets.rb (75%) rename lib/fog/{network/openstack => openstack/network}/models/vpn_service.rb (96%) rename lib/fog/{network/openstack => openstack/network}/models/vpn_services.rb (76%) rename lib/fog/{network/openstack.rb => openstack/network/network.rb} (98%) rename lib/fog/{network/openstack => openstack/network}/requests/add_router_interface.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/associate_floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/associate_lb_health_monitor.rb (91%) rename lib/fog/{network/openstack => openstack/network}/requests/create_floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_ike_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_ipsec_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_ipsec_site_connection.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_health_monitor.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_member.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_pool.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lb_vip.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_healthmonitor.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_l7policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_l7rule.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_listener.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_loadbalancer.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_pool.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_lbaas_pool_member.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_network.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/create_port.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_rbac_policy.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_router.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/create_security_group.rb (99%) rename lib/fog/{network/openstack => openstack/network}/requests/create_security_group_rule.rb (99%) rename lib/fog/{network/openstack => openstack/network}/requests/create_subnet.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/create_subnet_pool.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/create_vpn_service.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_floating_ip.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_ike_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_ipsec_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_ipsec_site_connection.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_health_monitor.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_member.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_pool.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lb_vip.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_healthmonitor.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_l7policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_l7rule.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_listener.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_loadbalancer.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_pool.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_lbaas_pool_member.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_network.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_port.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_quota.rb (91%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_rbac_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_router.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_security_group.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_security_group_rule.rb (90%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_subnet.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_subnet_pool.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/delete_vpn_service.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/disassociate_floating_ip.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/disassociate_lb_health_monitor.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/get_extension.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_floating_ip.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/get_ike_policy.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_ipsec_policy.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_ipsec_site_connection.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_health_monitor.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_member.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_pool.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_pool_stats.rb (89%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lb_vip.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_healthmonitor.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_l7policy.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_l7rule.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_listener.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_loadbalancer.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_pool.rb (85%) rename lib/fog/{network/openstack => openstack/network}/requests/get_lbaas_pool_member.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_network.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_network_ip_availability.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_port.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/get_quota.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/get_quotas.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/get_rbac_policy.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/get_router.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_security_group.rb (96%) rename lib/fog/{network/openstack => openstack/network}/requests/get_security_group_rule.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/get_subnet.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/get_subnet_pool.rb (87%) rename lib/fog/{network/openstack => openstack/network}/requests/get_vpn_service.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/list_extensions.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_floating_ips.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ike_policies.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ipsec_policies.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ipsec_site_connections.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_health_monitors.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_members.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_pools.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lb_vips.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_healthmonitors.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_l7policies.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_l7rules.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_listeners.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_loadbalancers.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_pool_members.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_lbaas_pools.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_network_ip_availabilities.rb (86%) rename lib/fog/{network/openstack => openstack/network}/requests/list_networks.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_ports.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_rbac_policies.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_routers.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_security_group_rules.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/list_security_groups.rb (98%) rename lib/fog/{network/openstack => openstack/network}/requests/list_subnet_pools.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/list_subnets.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/list_vpn_services.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/remove_router_interface.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/set_tenant.rb (88%) rename lib/fog/{network/openstack => openstack/network}/requests/update_ike_policy.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/update_ipsec_policy.rb (95%) rename lib/fog/{network/openstack => openstack/network}/requests/update_ipsec_site_connection.rb (97%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_health_monitor.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_member.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_pool.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lb_vip.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_healthmonitor.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_l7policy.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_l7rule.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_listener.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_loadbalancer.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_pool.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_lbaas_pool_member.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_network.rb (90%) rename lib/fog/{network/openstack => openstack/network}/requests/update_port.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_quota.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_rbac_policy.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_router.rb (91%) rename lib/fog/{network/openstack => openstack/network}/requests/update_security_group.rb (92%) rename lib/fog/{network/openstack => openstack/network}/requests/update_subnet.rb (93%) rename lib/fog/{network/openstack => openstack/network}/requests/update_subnet_pool.rb (94%) rename lib/fog/{network/openstack => openstack/network}/requests/update_vpn_service.rb (94%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnf.rb (97%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnfd.rb (97%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnfds.rb (73%) rename lib/fog/{nfv/openstack => openstack/nfv}/models/vnfs.rb (73%) rename lib/fog/{nfv/openstack.rb => openstack/nfv/nfv.rb} (94%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/create_vnf.rb (96%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/create_vnfd.rb (95%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/delete_vnf.rb (92%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/delete_vnfd.rb (92%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/get_vnf.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/get_vnfd.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/list_vnfds.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/list_vnfs.rb (93%) rename lib/fog/{nfv/openstack => openstack/nfv}/requests/update_vnf.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/event.rb (89%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/events.rb (79%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/resource.rb (94%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/resource_schemas.rb (73%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/resources.rb (76%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/stack.rb (96%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/stacks.rb (89%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/template.rb (85%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/models/templates.rb (85%) rename lib/fog/{orchestration/openstack.rb => openstack/orchestration/orchestration.rb} (94%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/abandon_stack.rb (86%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/build_info.rb (83%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/cancel_update.rb (92%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/create_stack.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/delete_stack.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/get_stack_template.rb (89%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_events.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_resource_events.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_resource_types.rb (92%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_resources.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_stack_data.rb (92%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_stack_data_detailed.rb (98%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/list_stack_events.rb (95%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/patch_stack.rb (90%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/preview_stack.rb (87%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_event_details.rb (93%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_data.rb (93%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_metadata.rb (93%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_schema.rb (85%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_resource_template.rb (88%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/show_stack_details.rb (91%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/update_stack.rb (97%) rename lib/fog/{orchestration/openstack => openstack/orchestration}/requests/validate_template.rb (87%) rename lib/fog/{ => openstack}/orchestration/util/recursive_hot_file_loader.rb (99%) rename lib/fog/{planning/openstack => openstack/planning}/models/plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/models/plans.rb (93%) rename lib/fog/{planning/openstack => openstack/planning}/models/role.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/models/roles.rb (87%) rename lib/fog/{planning/openstack.rb => openstack/planning/planning.rb} (96%) rename lib/fog/{planning/openstack => openstack/planning}/requests/add_role_to_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/create_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/delete_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/get_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/get_plan_templates.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/list_plans.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/list_roles.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/patch_plan.rb (100%) rename lib/fog/{planning/openstack => openstack/planning}/requests/remove_role_from_plan.rb (100%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/availability_zone.rb (83%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/availability_zones.rb (59%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/network.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/networks.rb (77%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share.rb (97%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_access_rule.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_access_rules.rb (76%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_export_location.rb (83%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/share_export_locations.rb (77%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/shares.rb (76%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/snapshot.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/models/snapshots.rb (77%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/add_security_service_to_share_network.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_security_service.rb (96%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_share.rb (96%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_share_network.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/create_snapshot.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_security_service.rb (90%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_share.rb (93%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_share_network.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/delete_snapshot.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/extend_share.rb (90%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_limits.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_quota.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_security_service.rb (93%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_share.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_share_export_location.rb (89%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_share_network.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/get_snapshot.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/grant_share_access.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_availability_zones.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_security_services.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_security_services_detail.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_access_rules.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_export_locations.rb (87%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_networks.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_share_networks_detail.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_shares.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_shares_detail.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_snapshots.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/list_snapshots_detail.rb (92%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/remove_security_service_from_share_network.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/revoke_share_access.rb (91%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/share_action.rb (87%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/share_network_action.rb (88%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/shrink_share.rb (90%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_quota.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_security_service.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_share.rb (95%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_share_network.rb (94%) rename lib/fog/{shared_file_system/openstack => openstack/shared_file_system}/requests/update_snapshot.rb (94%) rename lib/fog/{shared_file_system/openstack.rb => openstack/shared_file_system/shared_file_system.rb} (98%) rename lib/fog/{storage/openstack => openstack/storage}/models/directories.rb (82%) rename lib/fog/{storage/openstack => openstack/storage}/models/directory.rb (83%) rename lib/fog/{storage/openstack => openstack/storage}/models/file.rb (99%) rename lib/fog/{storage/openstack => openstack/storage}/models/files.rb (91%) rename lib/fog/{storage/openstack => openstack/storage}/requests/copy_object.rb (96%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_container.rb (91%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_multiple_objects.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_object.rb (93%) rename lib/fog/{storage/openstack => openstack/storage}/requests/delete_static_large_object.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_container.rb (97%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_containers.rb (96%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_object.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_object_http_url.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/get_object_https_url.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/head_container.rb (95%) rename lib/fog/{storage/openstack => openstack/storage}/requests/head_containers.rb (93%) rename lib/fog/{storage/openstack => openstack/storage}/requests/head_object.rb (93%) rename lib/fog/{storage/openstack => openstack/storage}/requests/post_object.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/post_set_meta_temp_url_key.rb (96%) rename lib/fog/{storage/openstack => openstack/storage}/requests/public_url.rb (95%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_container.rb (94%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_dynamic_obj_manifest.rb (95%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_object.rb (98%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_object_manifest.rb (90%) rename lib/fog/{storage/openstack => openstack/storage}/requests/put_static_obj_manifest.rb (96%) rename lib/fog/{storage/openstack.rb => openstack/storage/storage.rb} (95%) rename lib/fog/{volume/openstack => openstack/volume}/models/availability_zone.rb (78%) rename lib/fog/{volume/openstack => openstack/volume}/models/availability_zones.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/models/backup.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/models/backups.rb (86%) rename lib/fog/{volume/openstack => openstack/volume}/models/snapshot.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/models/snapshots.rb (86%) rename lib/fog/{volume/openstack => openstack/volume}/models/transfer.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/models/transfers.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/models/volume.rb (98%) rename lib/fog/{volume/openstack => openstack/volume}/models/volume_type.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/models/volume_types.rb (84%) rename lib/fog/{volume/openstack => openstack/volume}/models/volumes.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/accept_transfer.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/action.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_backup.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_snapshot.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_transfer.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_volume.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/create_volume_type.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_backup.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_metadata.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_snapshot.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_snapshot_metadata.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_transfer.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_volume.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/delete_volume_type.rb (92%) rename lib/fog/{volume/openstack => openstack/volume}/requests/extend_volume.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_backup_details.rb (95%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_quota.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_quota_defaults.rb (93%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_quota_usage.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_snapshot_details.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_transfer_details.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_volume_details.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/requests/get_volume_type_details.rb (95%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_backups.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_backups_detailed.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_snapshots.rb (97%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_snapshots_detailed.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_transfers.rb (90%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_transfers_detailed.rb (90%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_volume_types.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_volumes.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_volumes_detailed.rb (88%) rename lib/fog/{volume/openstack => openstack/volume}/requests/list_zones.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/replace_metadata.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/restore_backup.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/set_tenant.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/snapshot_action.rb (89%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_metadata.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_quota.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_snapshot.rb (97%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_snapshot_metadata.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_volume.rb (94%) rename lib/fog/{volume/openstack => openstack/volume}/requests/update_volume_type.rb (96%) rename lib/fog/{volume/openstack => openstack/volume}/v1.rb (94%) create mode 100644 lib/fog/openstack/volume/v1/models/availability_zone.rb create mode 100644 lib/fog/openstack/volume/v1/models/availability_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/backup.rb (53%) create mode 100644 lib/fog/openstack/volume/v1/models/backups.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/snapshot.rb (89%) create mode 100644 lib/fog/openstack/volume/v1/models/snapshots.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/transfer.rb (66%) create mode 100644 lib/fog/openstack/volume/v1/models/transfers.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/models/volume.rb (87%) rename lib/fog/{volume/openstack => openstack/volume}/v1/models/volume_type.rb (51%) create mode 100644 lib/fog/openstack/volume/v1/models/volume_types.rb create mode 100644 lib/fog/openstack/volume/v1/models/volumes.rb create mode 100644 lib/fog/openstack/volume/v1/requests/accept_transfer.rb create mode 100644 lib/fog/openstack/volume/v1/requests/action.rb create mode 100644 lib/fog/openstack/volume/v1/requests/create_backup.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/create_snapshot.rb (89%) create mode 100644 lib/fog/openstack/volume/v1/requests/create_transfer.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/create_volume.rb (91%) create mode 100644 lib/fog/openstack/volume/v1/requests/create_volume_type.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_backup.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_snapshot.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_transfer.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_volume.rb create mode 100644 lib/fog/openstack/volume/v1/requests/delete_volume_type.rb create mode 100644 lib/fog/openstack/volume/v1/requests/extend_volume.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_backup_details.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_quota.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb create mode 100644 lib/fog/openstack/volume/v1/requests/get_quota_usage.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/get_snapshot_details.rb (83%) create mode 100644 lib/fog/openstack/volume/v1/requests/get_transfer_details.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/get_volume_details.rb (86%) create mode 100644 lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_backups.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_snapshots.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_transfers.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb create mode 100644 lib/fog/openstack/volume/v1/requests/list_volume_types.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/list_volumes.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/list_volumes_detailed.rb (90%) create mode 100644 lib/fog/openstack/volume/v1/requests/list_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v1/requests/real.rb (50%) create mode 100644 lib/fog/openstack/volume/v1/requests/real_mock.rb create mode 100644 lib/fog/openstack/volume/v1/requests/replace_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/restore_backup.rb create mode 100644 lib/fog/openstack/volume/v1/requests/set_tenant.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_quota.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_snapshot.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v1/requests/update_volume.rb rename lib/fog/{volume/openstack => openstack/volume}/v2.rb (94%) create mode 100644 lib/fog/openstack/volume/v2/models/availability_zone.rb create mode 100644 lib/fog/openstack/volume/v2/models/availability_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/backup.rb (53%) create mode 100644 lib/fog/openstack/volume/v2/models/backups.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/snapshot.rb (88%) create mode 100644 lib/fog/openstack/volume/v2/models/snapshots.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/transfer.rb (66%) create mode 100644 lib/fog/openstack/volume/v2/models/transfers.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/models/volume.rb (86%) rename lib/fog/{volume/openstack => openstack/volume}/v2/models/volume_type.rb (51%) create mode 100644 lib/fog/openstack/volume/v2/models/volume_types.rb create mode 100644 lib/fog/openstack/volume/v2/models/volumes.rb create mode 100644 lib/fog/openstack/volume/v2/requests/accept_transfer.rb create mode 100644 lib/fog/openstack/volume/v2/requests/action.rb create mode 100644 lib/fog/openstack/volume/v2/requests/create_backup.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/create_snapshot.rb (88%) create mode 100644 lib/fog/openstack/volume/v2/requests/create_transfer.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/create_volume.rb (90%) create mode 100644 lib/fog/openstack/volume/v2/requests/create_volume_type.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_backup.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_snapshot.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_transfer.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_volume.rb create mode 100644 lib/fog/openstack/volume/v2/requests/delete_volume_type.rb create mode 100644 lib/fog/openstack/volume/v2/requests/extend_volume.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_backup_details.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_quota.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb create mode 100644 lib/fog/openstack/volume/v2/requests/get_quota_usage.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/get_snapshot_details.rb (82%) create mode 100644 lib/fog/openstack/volume/v2/requests/get_transfer_details.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/get_volume_details.rb (86%) create mode 100644 lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_backups.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_snapshots.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_transfers.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb create mode 100644 lib/fog/openstack/volume/v2/requests/list_volume_types.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/list_volumes.rb (91%) rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/list_volumes_detailed.rb (90%) create mode 100644 lib/fog/openstack/volume/v2/requests/list_zones.rb rename lib/fog/{volume/openstack => openstack/volume}/v2/requests/real.rb (50%) create mode 100644 lib/fog/openstack/volume/v2/requests/real_mock.rb create mode 100644 lib/fog/openstack/volume/v2/requests/replace_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/restore_backup.rb create mode 100644 lib/fog/openstack/volume/v2/requests/set_tenant.rb create mode 100644 lib/fog/openstack/volume/v2/requests/snapshot_action.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_quota.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_snapshot.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_volume.rb create mode 100644 lib/fog/openstack/volume/v2/requests/update_volume_type.rb rename lib/fog/{volume/openstack.rb => openstack/volume/volume.rb} (73%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_action.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_action_execution.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_cron_trigger.rb (97%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_environment.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_execution.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_workbook.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/create_workflow.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_action.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_action_execution.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_cron_trigger.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_environment.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_execution.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_workbook.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/delete_workflow.rb (92%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_action.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_action_execution.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_cron_trigger.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_environment.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_execution.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_task.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_workbook.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/get_workflow.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_action_executions.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_actions.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_cron_triggers.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_environments.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_executions.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_services.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_tasks.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_workbooks.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/list_workflows.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/rerun_task.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_action.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_action_execution.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_environment.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_execution.rb (95%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_workbook.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/update_workflow.rb (93%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/validate_action.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/validate_workbook.rb (94%) rename lib/fog/{workflow/openstack => openstack/workflow}/v2/requests/validate_workflow.rb (94%) rename lib/fog/{workflow/openstack.rb => openstack/workflow/workflow.rb} (50%) delete mode 100644 lib/fog/volume/openstack/v1/models/availability_zone.rb delete mode 100644 lib/fog/volume/openstack/v1/models/availability_zones.rb delete mode 100644 lib/fog/volume/openstack/v1/models/backups.rb delete mode 100644 lib/fog/volume/openstack/v1/models/snapshots.rb delete mode 100644 lib/fog/volume/openstack/v1/models/transfers.rb delete mode 100644 lib/fog/volume/openstack/v1/models/volume_types.rb delete mode 100644 lib/fog/volume/openstack/v1/models/volumes.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/accept_transfer.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/action.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/create_backup.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/create_transfer.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/create_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_backup.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_transfer.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_volume.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/delete_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/extend_volume.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_backup_details.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_quota.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_quota_usage.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_transfer_details.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_backups.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_snapshots.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_transfers.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_volume_types.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/list_zones.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/real_mock.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/replace_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/restore_backup.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/set_tenant.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_quota.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v1/requests/update_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/models/availability_zone.rb delete mode 100644 lib/fog/volume/openstack/v2/models/availability_zones.rb delete mode 100644 lib/fog/volume/openstack/v2/models/backups.rb delete mode 100644 lib/fog/volume/openstack/v2/models/snapshots.rb delete mode 100644 lib/fog/volume/openstack/v2/models/transfers.rb delete mode 100644 lib/fog/volume/openstack/v2/models/volume_types.rb delete mode 100644 lib/fog/volume/openstack/v2/models/volumes.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/accept_transfer.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/action.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/create_backup.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/create_transfer.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/create_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_backup.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_transfer.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/delete_volume_type.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/extend_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_backup_details.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_quota.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_quota_usage.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_transfer_details.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_backups.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_snapshots.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_transfers.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_volume_types.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/list_zones.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/real_mock.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/replace_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/restore_backup.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/set_tenant.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/snapshot_action.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_quota.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_snapshot.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_volume.rb delete mode 100644 lib/fog/volume/openstack/v2/requests/update_volume_type.rb diff --git a/README.md b/README.md index 3d5d60ab9..844e65403 100644 --- a/README.md +++ b/README.md @@ -82,18 +82,18 @@ The exception is if you're using Nova (and not Neutron) for your instance networ Initialise a connection to the compute service: ```ruby -compute = Fog::Compute::OpenStack.new(@connection_params) +compute = Fog::OpenStack::Compute.new(@connection_params) ``` Get a list of available images for use with booting new instances: ```ruby p compute.images -# => @@ -105,9 +105,9 @@ List available flavors so we can decide how powerful to make this instance: ```ruby p compute.flavors -# => , -# {:duration=>17.359134} p instance -# => [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:f4:75:ab", "version"=>4, "addr"=>"1.2.3.4", "OS-EXT-IPS:type"=>"fixed"}]}, @@ -177,11 +177,11 @@ Allow TCP traffic through port 22: ```ruby security_group = compute.security_groups.create name: "Test SSH", description: "Allow access to port 22" -# => @@ -502,7 +502,7 @@ Set up a project's public gateway (needed for external access): ```ruby -identity = Fog::Identity::OpenStack.new(@connection_params) +identity = Fog::OpenStack::Identity.new(@connection_params) tenants = identity.projects.select do |project| project.name == @connection_params[:openstack_project_name] @@ -510,7 +510,7 @@ end tenant_id = tenants[0].id -neutron = Fog::Network::OpenStack.new(@connection_params) +neutron = Fog::OpenStack::Network.new(@connection_params) network = neutron.networks.create name: "default", tenant_id: tenant_id diff --git a/docs/compute.md b/docs/compute.md index 18454e513..675b10aea 100644 --- a/docs/compute.md +++ b/docs/compute.md @@ -16,7 +16,7 @@ Once `irb` has launched you need to require the Fog library by executing: Next, create a connection to the Compute Service: - service = Fog::Compute::OpenStack.new({ + service = Fog::OpenStack::Compute.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id @@ -71,7 +71,7 @@ This will return: {"flavors"=>[{"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}], "name"=>"m1.tiny"}, {"id"=>"2", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/2", "rel"=>"bookmark"}], "name"=>"m1.small"}, {"id"=>"3", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/3", "rel"=>"bookmark"}], "name"=>"m1.medium"}, {"id"=>"4", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/4", "rel"=>"bookmark"}], "name"=>"m1.large"}, {"id"=>"42", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/42", "rel"=>"bookmark"}], "name"=>"m1.nano"}, {"id"=>"5", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/5", "rel"=>"bookmark"}], "name"=>"m1.xlarge"}, {"id"=>"84", "links"=>[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/84", "rel"=>"bookmark"}], "name"=>"m1.micro"}]} -To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Compute/Openstack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about Compute request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/compute/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -137,13 +137,13 @@ To retrieve a list of available images: service.images -This returns a collection of `Fog::Compute::OpenStack::Image` models: +This returns a collection of `Fog::OpenStack::Compute::Image` models: - , - @@ -167,7 +167,7 @@ This returns a collection of `Fog::Compute::OpenStack::Image` models: >, links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}] >, - , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "rel"=>"bookmark"}, {"href"=>"http://localhost:9292/b5bf8e689bc64844b1d08094a2f2bdd5/images/e21af7e2-a181-403a-84a4-fd9df36cb963", "type"=>"application/vnd.openstack.image", "rel"=>"alternate"}] @@ -190,9 +190,9 @@ To retrieve individual image: service.images.get "821e2b73-5aed-4f9d-aaa7-2f4f297779f3" -This returns an `Fog::Compute::OpenStack::Image` instance: +This returns an `Fog::OpenStack::Compute::Image` instance: - , - @@ -223,11 +223,11 @@ To retrieve a list of available flavors: service.flavors -This returns a collection of `Fog::Compute::OpenStack::Flavor` models: +This returns a collection of `Fog::OpenStack::Compute::Flavor` models: - , - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}], @@ -331,16 +331,16 @@ To return an individual server: service.servers.get "4572529c-0cfc-433e-8dbf-7cc383ed5b7c" -This returns a `Fog::Compute::OpenStack::Server` instance: +This returns a `Fog::OpenStack::Compute::Server` instance: - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:14:34:b8", "version"=>4, "addr"=>"10.0.0.5", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/4572529c-0cfc-433e-8dbf-7cc383ed5b7c", "rel"=>"bookmark"}], @@ -380,16 +380,16 @@ To create a server: **Note**: The `:name`, `:flavor_ref`, and `image_ref` attributes are required for server creation. -This will return a `Fog::Compute::OpenStack::Server` instance: +This will return a `Fog::OpenStack::Compute::Server` instance: - , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/81746324-94ab-44fb-9aa9-ee0b4d95fa34", "rel"=>"bookmark"}], @@ -423,14 +423,14 @@ Notice that your server contains several `nil` attributes. To see the latest sta You can see that the server is currently being built: - [{"OS-EXT-IPS-MAC:mac_addr"=>"fa:16:3e:71:0d:c4", "version"=>4, "addr"=>"10.0.0.2", "OS-EXT-IPS:type"=>"fixed"}]}, flavor={"id"=>"1", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/flavors/1", "rel"=>"bookmark"}]}, host_id="bb705edc279c520d97ad6fbd0b8e75a5c716388616f58e527d0ff633", image={"id"=>"821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "links"=>[{"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/images/821e2b73-5aed-4f9d-aaa7-2f4f297779f3", "rel"=>"bookmark"}]}, - metadata= , links=[{"href"=>"http://localhost:8774/v2/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"self"}, {"href"=>"http://localhost:8774/b5bf8e689bc64844b1d08094a2f2bdd5/servers/5f50aeff-a745-4cbc-9f8b-0356142e6f95", "rel"=>"bookmark"}], @@ -464,7 +464,7 @@ Fog can wait for the server to become ready as follows: server.wait_for { ready? } -**Note**: The `Fog::Compute::OpenStack::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`. +**Note**: The `Fog::OpenStack::Compute::Server` instance returned from the create method contains a `password` attribute. The `password` attribute will NOT be present in subsequent retrievals either through `service.servers` or `service.servers.get my_server_id`. ### Additional Parameters @@ -481,7 +481,7 @@ The `create` method also supports the following key values: :personality - Array of files to be injected onto the server. Please refer to the Fog personality API documentation for further information. + Array of files to be injected onto the server. Please refer to the Fog personality API documentation for further information. diff --git a/docs/introspection.md b/docs/introspection.md index 56d7cd25e..847b671be 100644 --- a/docs/introspection.md +++ b/docs/introspection.md @@ -92,7 +92,7 @@ require 'fog/openstack' Find the available Baremetal nodes. ```ruby -iron = Fog::Baremetal::OpenStack.new(@connection_params) +iron = Fog::OpenStack::Baremetal.new(@connection_params) nodes = iron.node_list ``` @@ -109,7 +109,7 @@ http://docs.openstack.org/developer/ironic/deploy/install-guide.html#hardware-in ```ruby node_id = nodes.body["nodes"][0]["uuid"] -inspector = Fog::Introspection::OpenStack.new(@connection_params) +inspector = Fog::OpenStack::Introspection.new(@connection_params) introspection1 = inspector.create_introspection(node_id) ``` diff --git a/docs/metering.md b/docs/metering.md index 278b2df52..c486575d3 100644 --- a/docs/metering.md +++ b/docs/metering.md @@ -9,7 +9,7 @@ Fog uses the [OpenStack Metering API](http://docs.openstack.org/developer/ceilom Get a handle on the Metering service: ```ruby -service = Fog::Metering::OpenStack.new({ +service = Fog::OpenStack::Metering.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id diff --git a/docs/network.md b/docs/network.md index 498e28c7c..ab853620d 100644 --- a/docs/network.md +++ b/docs/network.md @@ -16,7 +16,7 @@ require 'fog/openstack' Next, create a connection to the Network Service: ``` -service = Fog::Network::OpenStack.new( +service = Fog::OpenStack::Network.new( :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_domain_name => OPEN_STACK_DOMAIN, # Your OpenStack Domain name @@ -104,7 +104,7 @@ This will return: {"id"=>"e624a36d-762b-481f-9b50-4154ceb78bbb", "name"=>"network_1", "subnets"=>["2e4ec6a4-0150-47f5-8523-e899ac03026e"], "shared"=>false, "status"=>"ACTIVE", "admin_state_up"=>true, "tenant_id"=>"f8b26a6032bc47718a7702233ac708b9"}] } ``` -To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/Fog/Network/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about Network request methods refer to [rdoc](http://www.rubydoc.info/gems/fog-openstack/fog/openstack/network/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -182,14 +182,14 @@ networks = service.networks ``` This returns in the following `Fog::OpenStack::Model`: ``` -] + [] >, shared=true, status="ACTIVE", @@ -200,10 +200,10 @@ This returns in the following `Fog::OpenStack::Model`: provider_segmentation_id=nil, router_external=false >, - , diff --git a/docs/orchestration.md b/docs/orchestration.md index 0051c1ecc..a661217fb 100644 --- a/docs/orchestration.md +++ b/docs/orchestration.md @@ -25,7 +25,7 @@ _Source: [OpenStack Wiki](https://wiki.openstack.org/wiki/Heat)_ Get a handle on the Orchestration service: ```ruby -service = Fog::Orchestration::OpenStack.new({ +service = Fog::OpenStack::Orchestration.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id @@ -46,9 +46,9 @@ service.stacks ``` This returns a list of stacks with minimum attributes, leaving other attributes empty ```ruby -=> ``` @@ -212,9 +212,9 @@ You can list `Events` of a `stack`: ```ruby stack.events -=> "http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}], @@ -260,7 +260,7 @@ An `event` has an associated `resource`: ```ruby resource = event.resource -=> 1}) -=> "http://10.8.96.4:8004/v1/5d139d95546240748508b2a518aa5bef/stacks/progenerated/0c9ee370-ef64-4a80-a6cc-65d2277caeb9", "rel"=>"self"}], @@ -332,7 +332,7 @@ You can validate a template (either HOT or CFN) before using it: ```ruby service.templates.validate(:template => content) -=> 'http://KEYSTONE_HOST:KEYSTONE_PORT/v3/auth/tokens', # OpenStack Keystone v3 endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_domain_name => OPEN_STACK_DOMAIN, # Your OpenStack Domain name diff --git a/docs/storage.md b/docs/storage.md index fb1706a75..54b9276f4 100644 --- a/docs/storage.md +++ b/docs/storage.md @@ -29,7 +29,7 @@ require 'fog/openstack' Next, create a connection to Swift: ```ruby -service = Fog::Storage::OpenStack.new({ +service = Fog::OpenStack::Storage.new({ :openstack_username => USERNAME, # Your OpenStack Username :openstack_api_key => PASSWORD, # Your OpenStack Password :openstack_auth_url => 'http://YOUR_OPENSTACK_ENDPOINT:PORT/v2.0/tokens', @@ -126,7 +126,7 @@ This will return: {"X-Account-Bytes-Used"=>"2563554", "Date"=>"Thu, 21 Feb 2013 21:57:02 GMT", "X-Account-Meta-Temp-Url-Key"=>"super_secret_key", "X-Timestamp"=>"1354552916.82056", "Content-Length"=>"0", "Content-Type"=>"application/json; charset=utf-8", "X-Trans-Id"=>"txe934924374a744c8a6c40dd8f29ab94a", "Accept-Ranges"=>"bytes", "X-Account-Container-Count"=>"7", "X-Account-Object-Count"=>"5"} ``` -To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/Fog/Storage/OpenStack/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). +To learn more about `Fog::Storage` request methods refer to [rdoc](http://rubydoc.info/gems/fog/fog/openstack/storage/Real). To learn more about Excon refer to [Excon GitHub repo](https://github.com/geemus/excon). ### Model Layer @@ -184,7 +184,7 @@ To retrieve a list of directories: service.directories ``` -This returns a collection of `Fog::Storage::OpenStack::Directory` models: +This returns a collection of `Fog::OpenStack::Storage::Directory` models: ## Get Directory @@ -194,7 +194,7 @@ To retrieve a specific directory: service.directories.get "blue" ``` -This returns a `Fog::Storage::OpenStack::Directory` instance: +This returns a `Fog::OpenStack::Storage::Directory` instance: ## Create Directory diff --git a/docs/workflow.md b/docs/workflow.md index cb7544cf0..8577683c7 100644 --- a/docs/workflow.md +++ b/docs/workflow.md @@ -9,7 +9,7 @@ Fog uses the [OpenStack Mistral API](http://docs.openstack.org/developer/mistral Get a handle for the Workflow service: ```ruby -service = Fog::Workflow::OpenStack.new({ +service = Fog::OpenStack::Workflow.new({ :openstack_auth_url => 'http://KEYSTONE_HOST:KEYSTONE_PORT/v2.0/tokens', # OpenStack Keystone endpoint :openstack_username => OPEN_STACK_USER, # Your OpenStack Username :openstack_tenant => OPEN_STACK_TENANT, # Your tenant id diff --git a/examples/compute/block_device_mapping_v2.rb b/examples/compute/block_device_mapping_v2.rb index d59012fac..b8f8c4abb 100644 --- a/examples/compute/block_device_mapping_v2.rb +++ b/examples/compute/block_device_mapping_v2.rb @@ -7,7 +7,7 @@ password = 'secret' tenant = 'My Compute Tenant' # String -compute_client ||= ::Fog::Compute::OpenStack.new( +compute_client ||= ::Fog::OpenStack::Compute.new( :openstack_api_key => password, :openstack_username => username, :openstack_auth_url => auth_url, diff --git a/examples/container_infra/basics.rb b/examples/container_infra/basics.rb index 9e4daac1a..1c1d4da44 100644 --- a/examples/container_infra/basics.rb +++ b/examples/container_infra/basics.rb @@ -12,7 +12,7 @@ container_infra = Fog::ContainerInfra::OpenStack.new(params) # Get the Fedora Atomic image -image = Fog::Image::OpenStack.new(params) +image = Fog::OpenStack::Image.new(params) unless image.images.map(&:name).include?("fedora-atomic-latest") puts "Couldn't find Fedora Atomic. Uploading to Glance..." diff --git a/examples/event/basics.rb b/examples/event/basics.rb index b04082ca3..93fbf5d73 100644 --- a/examples/event/basics.rb +++ b/examples/event/basics.rb @@ -13,7 +13,7 @@ puts "### SERVICE CONNECTION ###" -event_service = Fog::Event::OpenStack.new(@connection_params) +event_service = Fog::OpenStack::Event.new(@connection_params) p event_service diff --git a/examples/identity/basics.rb b/examples/identity/basics.rb index d0efd0f89..a66320d3c 100644 --- a/examples/identity/basics.rb +++ b/examples/identity/basics.rb @@ -8,7 +8,7 @@ password = 'secret' tenant = 'admin' -keystone = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, +keystone = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, :openstack_username => username, :openstack_api_key => password, :openstack_tenant => tenant @@ -19,7 +19,7 @@ # Listing keystone tenants # keystone.tenants.each do |tenant| - # auth_url, - :openstack_username => username, - :openstack_api_key => password, +keystone = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, + :openstack_username => username, + :openstack_api_key => password, :openstack_project_name => project, - :openstack_domain_name => domain + :openstack_domain_name => domain # Optional, self-signed certs #:connection_options => { :ssl_verify_peer => false } @@ -21,17 +21,17 @@ # List keystone projects # keystone.projects.each do |project| - #"http://example.net:35357/..."}, - # parent_id=nil, - # subtree=nil, - # parents=nil - #> + # "http://example.net:35357/..."}, + # parent_id=nil, + # subtree=nil, + # parents=nil + # > # ... pp project end @@ -40,17 +40,17 @@ # List users # keystone.users.each do |user| - #"http://example.net:35357/..."}, - # password=nil - #> + # "http://example.net:35357/..."}, + # password=nil + # > # ... pp user end diff --git a/examples/image/upload-test-image.rb b/examples/image/upload-test-image.rb index c57c8847e..766415887 100755 --- a/examples/image/upload-test-image.rb +++ b/examples/image/upload-test-image.rb @@ -43,32 +43,32 @@ end end -image_service = Fog::Image::OpenStack.new :openstack_api_key => ENV['OS_PASSWORD'], +image_service = Fog::OpenStack::Image.new :openstack_api_key => ENV['OS_PASSWORD'], :openstack_username => ENV["OS_USERNAME"], :openstack_auth_url => ENV["OS_AUTH_URL"] + "/tokens", - :openstack_tenant => ENV["OS_TENANT_NAME"] + :openstack_tenant => ENV["OS_TENANT_NAME"] puts "Uploading AKI..." -aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki', - :size => File.size(aki), - :disk_format => 'aki', +aki = image_service.images.create :name => 'cirros-0.3.0-amd64-aki', + :size => File.size(aki), + :disk_format => 'aki', :container_format => 'aki', - :location => aki + :location => aki puts "Uploading ARI..." -ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari', - :size => File.size(ari), - :disk_format => 'ari', +ari = image_service.images.create :name => 'cirros-0.3.0-amd64-ari', + :size => File.size(ari), + :disk_format => 'ari', :container_format => 'ari', - :location => ari + :location => ari puts "Uploading AMI..." -image_service.images.create :name => 'cirros-0.3.0-amd64', - :size => File.size(ami), - :disk_format => 'ami', +image_service.images.create :name => 'cirros-0.3.0-amd64', + :size => File.size(ami), + :disk_format => 'ami', :container_format => 'ami', - :location => ami, - :properties => { + :location => ami, + :properties => { 'kernel_id' => aki.id, 'ramdisk_id' => ari.id } diff --git a/examples/introspection/basics.rb b/examples/introspection/basics.rb index b76b75353..0d17773e4 100644 --- a/examples/introspection/basics.rb +++ b/examples/introspection/basics.rb @@ -15,10 +15,10 @@ :openstack_domain_id => "default" } -inspector = Fog::Introspection::OpenStack.new(@connection_params) +inspector = Fog::OpenStack::Introspection.new(@connection_params) # Introspection of an Ironic node -ironic = Fog::Baremetal::OpenStack.new(@connection_params) +ironic = Fog::OpenStack::Baremetal.new(@connection_params) nodes = ironic.list_nodes node1_uuid = nodes.body["nodes"][0]["uuid"] diff --git a/examples/metric/basics.rb b/examples/metric/basics.rb index f001e2e6a..3fe0083af 100644 --- a/examples/metric/basics.rb +++ b/examples/metric/basics.rb @@ -16,7 +16,7 @@ puts "### SERVICE CONNECTION ###" -metric = Fog::Metric::OpenStack.new(@connection_params) +metric = Fog::OpenStack::Metric.new(@connection_params) p metric diff --git a/examples/network/network_rbac.rb b/examples/network/network_rbac.rb index eb574625d..c22145f65 100644 --- a/examples/network/network_rbac.rb +++ b/examples/network/network_rbac.rb @@ -29,8 +29,8 @@ :connection_options => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'} } -identity_service = Fog::Identity::OpenStack::V3.new(auth_options) -network_service = Fog::Network::OpenStack.new(auth_options) +identity_service = Fog::OpenStack::Identity::V3.new(auth_options) +network_service = Fog::OpenStack::Network.new(auth_options) own_project = identity_service.projects.select { |p| p.name == ENV['OS_PROJECT_NAME'] }.first other_project = identity_service.projects.select { |p| p.name != ENV['OS_PROJECT_NAME'] }.first diff --git a/examples/network/network_subnets_routers.rb b/examples/network/network_subnets_routers.rb index 746db7523..a8067835e 100644 --- a/examples/network/network_subnets_routers.rb +++ b/examples/network/network_subnets_routers.rb @@ -17,7 +17,7 @@ def create_tenant_network( tenant_name, subnet_gateway = '10.0.0.1', private_network_name = 'private' ) - network = Fog::Network[:openstack] + network = Fog::OpenStack::Network.new id = Fog::Identity[:openstack] tenant = id.tenants.find { |t| t.name == tenant_name } diff --git a/examples/shared_file_system/basics.rb b/examples/shared_file_system/basics.rb index d24339b6c..a32b87f36 100644 --- a/examples/shared_file_system/basics.rb +++ b/examples/shared_file_system/basics.rb @@ -29,8 +29,8 @@ :connection_options => {:ssl_verify_peer => ENV['SSL_VERIFY'] != 'false'} } -network_service = Fog::Network::OpenStack.new(auth_options) -share_service = Fog::SharedFileSystem::OpenStack.new(auth_options) +network_service = Fog::OpenStack::Network.new(auth_options) +share_service = Fog::OpenStack::SharedFileSystem.new(auth_options) net = network_service.networks.first raise 'no network exists' if net.nil? diff --git a/examples/storage/set-account-quota.rb b/examples/storage/set-account-quota.rb index a17b50b61..f018f7191 100644 --- a/examples/storage/set-account-quota.rb +++ b/examples/storage/set-account-quota.rb @@ -28,14 +28,14 @@ # to retrieve the list of tenants available and find # the tenant we want to set the quotas for. # -id = Fog::Identity::OpenStack.new :openstack_auth_url => auth_url, +id = Fog::OpenStack::Identity.new :openstack_auth_url => auth_url, :openstack_username => user, :openstack_api_key => password # # Storage service (Swift) # -st = Fog::Storage::OpenStack.new :openstack_auth_url => auth_url, +st = Fog::OpenStack::Storage.new :openstack_auth_url => auth_url, :openstack_username => user, :openstack_api_key => password diff --git a/examples/volume/backups.rb b/examples/volume/backups.rb index 5ffa627fb..5af221065 100644 --- a/examples/volume/backups.rb +++ b/examples/volume/backups.rb @@ -1,5 +1,5 @@ require 'fog/openstack' -require 'fog/workflow/openstack/v2' +require 'fog/openstack/workflow/v2' auth_url = "http://192.0.2.1:5000/v3/auth/tokens" username = "admin" @@ -14,7 +14,7 @@ :openstack_domain_id => "default", } -cinder = Fog::Volume::OpenStack.new(@connection_params) +cinder = Fog::OpenStack::Volume.new(@connection_params) puts "INFO: create backup of existing volume named test" diff --git a/examples/workflow/workflow-examples.rb b/examples/workflow/workflow-examples.rb index aca65554b..24779b2cc 100644 --- a/examples/workflow/workflow-examples.rb +++ b/examples/workflow/workflow-examples.rb @@ -1,5 +1,5 @@ require 'fog/openstack' -require 'fog/workflow/openstack/v2' +require 'fog/openstack/workflow/v2' auth_url = "http://192.0.2.1:5000/v3/auth/tokens" username = "admin" @@ -14,7 +14,7 @@ :openstack_domain_id => "default", } -mistral = Fog::Workflow::OpenStack.new(@connection_params) +mistral = Fog::OpenStack::Workflow.new(@connection_params) puts "INFO: create_execution" diff --git a/lib/fog/dns/openstack.rb b/lib/fog/dns/openstack.rb deleted file mode 100644 index 0007a5d63..000000000 --- a/lib/fog/dns/openstack.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Fog - module DNS - class OpenStack < Fog::Service - autoload :V1, 'fog/dns/openstack/v1' - autoload :V2, 'fog/dns/openstack/v2' - - # Fog::DNS::OpenStack.new() will return a Fog::DNS::OpenStack::V2 or a Fog::DNS::OpenStack::V1, - # choosing the latest available - def self.new(args = {}) - @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - if inspect == 'Fog::DNS::OpenStack' - service = Fog::DNS::OpenStack::V2.new(args) unless args.empty? - service ||= Fog::DNS::OpenStack::V1.new(args) - else - service = Fog::Service.new(args) - end - service - end - end - end -end diff --git a/lib/fog/image/openstack.rb b/lib/fog/image/openstack.rb deleted file mode 100644 index 3aa4ed518..000000000 --- a/lib/fog/image/openstack.rb +++ /dev/null @@ -1,23 +0,0 @@ - - -module Fog - module Image - class OpenStack < Fog::Service - autoload :V1, 'fog/image/openstack/v1' - autoload :V2, 'fog/image/openstack/v2' - - # Fog::Image::OpenStack.new() will return a Fog::Image::OpenStack::V2 or a Fog::Image::OpenStack::V1, - # choosing the latest available - def self.new(args = {}) - @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - if inspect == 'Fog::Image::OpenStack' - service = Fog::Image::OpenStack::V2.new(args) unless args.empty? - service ||= Fog::Image::OpenStack::V1.new(args) - else - service = Fog::Service.new(args) - end - service - end - end - end -end diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index 2b5a4cc42..f61a00ee4 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -2,87 +2,6 @@ require 'fog/json' module Fog - module Baremetal - autoload :OpenStack, 'fog/baremetal/openstack' - end - - module Compute - autoload :OpenStack, 'fog/compute/openstack' - end - - module ContainerInfra - autoload :OpenStack, 'fog/container_infra/openstack' - end - - module DNS - autoload :OpenStack, 'fog/dns/openstack' - end - - module Event - autoload :OpenStack, 'fog/event/openstack' - end - - module Identity - autoload :OpenStack, 'fog/identity/openstack' - end - - module Image - autoload :OpenStack, 'fog/image/openstack' - end - - module Introspection - autoload :OpenStack, 'fog/introspection/openstack' - end - - module KeyManager - autoload :OpenStack, 'fog/key_manager/openstack' - end - - module Metering - autoload :OpenStack, 'fog/metering/openstack' - end - - module Metric - autoload :OpenStack, 'fog/metric/openstack' - end - - module Monitoring - autoload :OpenStack, 'fog/monitoring/openstack' - end - - module Network - autoload :OpenStack, 'fog/network/openstack' - end - - module NFV - autoload :OpenStack, 'fog/nfv/openstack' - end - - module Orchestration - autoload :OpenStack, 'fog/orchestration/openstack' - autoload :Util, 'fog/orchestration/util/recursive_hot_file_loader' - end - - module SharedFileSystem - autoload :OpenStack, 'fog/shared_file_system/openstack' - end - - module Storage - autoload :OpenStack, 'fog/storage/openstack' - end - - module Volume - autoload :OpenStack, 'fog/volume/openstack' - end - - module Workflow - autoload :OpenStack, 'fog/workflow/openstack' - - class OpenStack - autoload :V2, 'fog/workflow/openstack/v2' - end - end - module OpenStack require 'fog/openstack/auth/token' @@ -90,7 +9,28 @@ module OpenStack autoload :Core, 'fog/openstack/core' autoload :Errors, 'fog/openstack/errors' - autoload :Planning, 'fog/planning/openstack' + + autoload :Baremetal, 'fog/openstack/baremetal/baremetal' + autoload :Compute, 'fog/openstack/compute/compute' + autoload :ContainerInfra, 'fog/openstack/container_infra/container_infra' + autoload :DNS, 'fog/openstack/dns/dns' + autoload :Event, 'fog/openstack/event/event' + autoload :Identity, 'fog/openstack/identity/identity' + autoload :Image, 'fog/openstack/image/image' + autoload :Introspection, 'fog/openstack/introspection/introspection' + autoload :KeyManager, 'fog/openstack/key_manager/key_manager' + autoload :Metering, 'fog/openstack/metering/metering' + autoload :Metric, 'fog/openstack/metric/metric' + autoload :Monitoring, 'fog/openstack/monitoring/monitoring' + autoload :Network, 'fog/openstack/network/network' + autoload :NFV, 'fog/openstack/nfv/nfv' + autoload :Orchestration, 'fog/openstack/orchestration/orchestration' + autoload :OrchestrationUtil, 'fog/openstack/orchestration/util/recursive_hot_file_loader' + autoload :Planning, 'fog/openstack/planning/planning' + autoload :SharedFileSystem, 'fog/openstack/shared_file_system/shared_file_system' + autoload :Storage, 'fog/openstack/storage/storage' + autoload :Workflow, 'fog/openstack/workflow/workflow' + autoload :Volume, 'fog/openstack/volume/volume' extend Fog::Provider diff --git a/lib/fog/baremetal/openstack.rb b/lib/fog/openstack/baremetal/baremetal.rb similarity index 97% rename from lib/fog/baremetal/openstack.rb rename to lib/fog/openstack/baremetal/baremetal.rb index 136911c3b..c1ba2e52e 100644 --- a/lib/fog/baremetal/openstack.rb +++ b/lib/fog/openstack/baremetal/baremetal.rb @@ -1,8 +1,6 @@ - - module Fog - module Baremetal - class OpenStack < Fog::Service + module OpenStack + class Baremetal < Fog::Service SUPPORTED_VERSIONS = /(.)*/ requires :openstack_auth_url @@ -19,7 +17,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/baremetal/openstack/models' + model_path 'fog/openstack/baremetal/models' model :chassis collection :chassis_collection model :driver @@ -31,7 +29,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/baremetal/openstack/requests' + request_path 'fog/openstack/baremetal/requests' # Node requests request :create_node @@ -250,7 +248,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Baremetal::OpenStack::NotFound + Fog::OpenStack::Baremetal::NotFound end def default_service_type diff --git a/lib/fog/baremetal/openstack/models/chassis.rb b/lib/fog/openstack/baremetal/models/chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/models/chassis.rb rename to lib/fog/openstack/baremetal/models/chassis.rb index 006501962..e096109eb 100644 --- a/lib/fog/baremetal/openstack/models/chassis.rb +++ b/lib/fog/openstack/baremetal/models/chassis.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Chassis < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/baremetal/openstack/models/chassis_collection.rb b/lib/fog/openstack/baremetal/models/chassis_collection.rb similarity index 89% rename from lib/fog/baremetal/openstack/models/chassis_collection.rb rename to lib/fog/openstack/baremetal/models/chassis_collection.rb index 8d9176247..cee1170f7 100644 --- a/lib/fog/baremetal/openstack/models/chassis_collection.rb +++ b/lib/fog/openstack/baremetal/models/chassis_collection.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/chassis' +require 'fog/openstack/baremetal/models/chassis' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class ChassisCollection < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Chassis + model Fog::OpenStack::Baremetal::Chassis def all(options = {}) load_response(service.list_chassis_detailed(options), 'chassis') diff --git a/lib/fog/baremetal/openstack/models/driver.rb b/lib/fog/openstack/baremetal/models/driver.rb similarity index 91% rename from lib/fog/baremetal/openstack/models/driver.rb rename to lib/fog/openstack/baremetal/models/driver.rb index 529ae2224..8693ce329 100644 --- a/lib/fog/baremetal/openstack/models/driver.rb +++ b/lib/fog/openstack/baremetal/models/driver.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Driver < Fog::OpenStack::Model identity :name diff --git a/lib/fog/baremetal/openstack/models/drivers.rb b/lib/fog/openstack/baremetal/models/drivers.rb similarity index 72% rename from lib/fog/baremetal/openstack/models/drivers.rb rename to lib/fog/openstack/baremetal/models/drivers.rb index 9e6ca4dd4..567ba9549 100644 --- a/lib/fog/baremetal/openstack/models/drivers.rb +++ b/lib/fog/openstack/baremetal/models/drivers.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/driver' +require 'fog/openstack/baremetal/models/driver' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Drivers < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Driver + model Fog::OpenStack::Baremetal::Driver def all(options = {}) load_response(service.list_drivers(options), 'drivers') diff --git a/lib/fog/baremetal/openstack/models/node.rb b/lib/fog/openstack/baremetal/models/node.rb similarity index 98% rename from lib/fog/baremetal/openstack/models/node.rb rename to lib/fog/openstack/baremetal/models/node.rb index 774b34fdd..403485b52 100644 --- a/lib/fog/baremetal/openstack/models/node.rb +++ b/lib/fog/openstack/baremetal/models/node.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Node < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/baremetal/openstack/models/nodes.rb b/lib/fog/openstack/baremetal/models/nodes.rb similarity index 89% rename from lib/fog/baremetal/openstack/models/nodes.rb rename to lib/fog/openstack/baremetal/models/nodes.rb index 972560e72..a9e8c58a0 100644 --- a/lib/fog/baremetal/openstack/models/nodes.rb +++ b/lib/fog/openstack/baremetal/models/nodes.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/node' +require 'fog/openstack/baremetal/models/node' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Nodes < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Node + model Fog::OpenStack::Baremetal::Node def all(options = {}) load_response(service.list_nodes_detailed(options), 'nodes') diff --git a/lib/fog/baremetal/openstack/models/port.rb b/lib/fog/openstack/baremetal/models/port.rb similarity index 96% rename from lib/fog/baremetal/openstack/models/port.rb rename to lib/fog/openstack/baremetal/models/port.rb index 6170bb30c..479af5bd0 100644 --- a/lib/fog/baremetal/openstack/models/port.rb +++ b/lib/fog/openstack/baremetal/models/port.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Port < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/baremetal/openstack/models/ports.rb b/lib/fog/openstack/baremetal/models/ports.rb similarity index 89% rename from lib/fog/baremetal/openstack/models/ports.rb rename to lib/fog/openstack/baremetal/models/ports.rb index 4d9e79657..d5322650c 100644 --- a/lib/fog/baremetal/openstack/models/ports.rb +++ b/lib/fog/openstack/baremetal/models/ports.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/baremetal/openstack/models/port' +require 'fog/openstack/baremetal/models/port' module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Ports < Fog::OpenStack::Collection - model Fog::Baremetal::OpenStack::Port + model Fog::OpenStack::Baremetal::Port def all(options = {}) load_response(service.list_ports_detailed(options), 'ports') diff --git a/lib/fog/baremetal/openstack/requests/create_chassis.rb b/lib/fog/openstack/baremetal/requests/create_chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/create_chassis.rb rename to lib/fog/openstack/baremetal/requests/create_chassis.rb index 88d213b6b..dc1da3d84 100644 --- a/lib/fog/baremetal/openstack/requests/create_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/create_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Create a new chassis # diff --git a/lib/fog/baremetal/openstack/requests/create_node.rb b/lib/fog/openstack/baremetal/requests/create_node.rb similarity index 97% rename from lib/fog/baremetal/openstack/requests/create_node.rb rename to lib/fog/openstack/baremetal/requests/create_node.rb index 3f81ece30..629e0614f 100644 --- a/lib/fog/baremetal/openstack/requests/create_node.rb +++ b/lib/fog/openstack/baremetal/requests/create_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Create a new node # diff --git a/lib/fog/baremetal/openstack/requests/create_port.rb b/lib/fog/openstack/baremetal/requests/create_port.rb similarity index 97% rename from lib/fog/baremetal/openstack/requests/create_port.rb rename to lib/fog/openstack/baremetal/requests/create_port.rb index 5bc678cb1..a980ed0ab 100644 --- a/lib/fog/baremetal/openstack/requests/create_port.rb +++ b/lib/fog/openstack/baremetal/requests/create_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Create a new port # diff --git a/lib/fog/baremetal/openstack/requests/delete_chassis.rb b/lib/fog/openstack/baremetal/requests/delete_chassis.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/delete_chassis.rb rename to lib/fog/openstack/baremetal/requests/delete_chassis.rb index 2b35cebcd..a13ce5b7b 100644 --- a/lib/fog/baremetal/openstack/requests/delete_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/delete_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def delete_chassis(chassis_uuid) data = {:chassis_uuid => chassis_uuid} diff --git a/lib/fog/baremetal/openstack/requests/delete_node.rb b/lib/fog/openstack/baremetal/requests/delete_node.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/delete_node.rb rename to lib/fog/openstack/baremetal/requests/delete_node.rb index 260c1844d..522373555 100644 --- a/lib/fog/baremetal/openstack/requests/delete_node.rb +++ b/lib/fog/openstack/baremetal/requests/delete_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def delete_node(node_uuid) data = {:node_ident => node_uuid} diff --git a/lib/fog/baremetal/openstack/requests/delete_port.rb b/lib/fog/openstack/baremetal/requests/delete_port.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/delete_port.rb rename to lib/fog/openstack/baremetal/requests/delete_port.rb index 89e9a0c77..1faadb1d1 100644 --- a/lib/fog/baremetal/openstack/requests/delete_port.rb +++ b/lib/fog/openstack/baremetal/requests/delete_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def delete_port(port_uuid) data = {:port_uuid => port_uuid} diff --git a/lib/fog/baremetal/openstack/requests/get_chassis.rb b/lib/fog/openstack/baremetal/requests/get_chassis.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_chassis.rb rename to lib/fog/openstack/baremetal/requests/get_chassis.rb index 88fa41d3d..def0f616b 100644 --- a/lib/fog/baremetal/openstack/requests/get_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/get_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_chassis(chassis_uuid) request( diff --git a/lib/fog/baremetal/openstack/requests/get_driver.rb b/lib/fog/openstack/baremetal/requests/get_driver.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_driver.rb rename to lib/fog/openstack/baremetal/requests/get_driver.rb index 48f95940d..915f03638 100644 --- a/lib/fog/baremetal/openstack/requests/get_driver.rb +++ b/lib/fog/openstack/baremetal/requests/get_driver.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_driver(driver_name) request( diff --git a/lib/fog/baremetal/openstack/requests/get_driver_properties.rb b/lib/fog/openstack/baremetal/requests/get_driver_properties.rb similarity index 97% rename from lib/fog/baremetal/openstack/requests/get_driver_properties.rb rename to lib/fog/openstack/baremetal/requests/get_driver_properties.rb index 3404d53da..3dc9e11ea 100644 --- a/lib/fog/baremetal/openstack/requests/get_driver_properties.rb +++ b/lib/fog/openstack/baremetal/requests/get_driver_properties.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_driver_properties(driver_name) data = {:driver_name => driver_name} diff --git a/lib/fog/baremetal/openstack/requests/get_node.rb b/lib/fog/openstack/baremetal/requests/get_node.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_node.rb rename to lib/fog/openstack/baremetal/requests/get_node.rb index 444909b87..60d4be300 100644 --- a/lib/fog/baremetal/openstack/requests/get_node.rb +++ b/lib/fog/openstack/baremetal/requests/get_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_node(node_id) request( diff --git a/lib/fog/baremetal/openstack/requests/get_port.rb b/lib/fog/openstack/baremetal/requests/get_port.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/get_port.rb rename to lib/fog/openstack/baremetal/requests/get_port.rb index 27c2fccb2..bf34be34f 100644 --- a/lib/fog/baremetal/openstack/requests/get_port.rb +++ b/lib/fog/openstack/baremetal/requests/get_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def get_port(port_id) request( diff --git a/lib/fog/baremetal/openstack/requests/list_chassis.rb b/lib/fog/openstack/baremetal/requests/list_chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/list_chassis.rb rename to lib/fog/openstack/baremetal/requests/list_chassis.rb index d9e583f7f..f7d5272cc 100644 --- a/lib/fog/baremetal/openstack/requests/list_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/list_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_chassis(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb b/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb similarity index 93% rename from lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb rename to lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb index cd59e91e4..63a25d58b 100644 --- a/lib/fog/baremetal/openstack/requests/list_chassis_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_chassis_detailed(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_drivers.rb b/lib/fog/openstack/baremetal/requests/list_drivers.rb similarity index 92% rename from lib/fog/baremetal/openstack/requests/list_drivers.rb rename to lib/fog/openstack/baremetal/requests/list_drivers.rb index c26ac48da..bf0646520 100644 --- a/lib/fog/baremetal/openstack/requests/list_drivers.rb +++ b/lib/fog/openstack/baremetal/requests/list_drivers.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_drivers(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_nodes.rb b/lib/fog/openstack/baremetal/requests/list_nodes.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/list_nodes.rb rename to lib/fog/openstack/baremetal/requests/list_nodes.rb index b3b8013ce..ff2c63964 100644 --- a/lib/fog/baremetal/openstack/requests/list_nodes.rb +++ b/lib/fog/openstack/baremetal/requests/list_nodes.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_nodes(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb b/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb similarity index 93% rename from lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb rename to lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb index 0ab63c487..afbca74d5 100644 --- a/lib/fog/baremetal/openstack/requests/list_nodes_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_nodes_detailed(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_ports.rb b/lib/fog/openstack/baremetal/requests/list_ports.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/list_ports.rb rename to lib/fog/openstack/baremetal/requests/list_ports.rb index e31765644..0a68f4042 100644 --- a/lib/fog/baremetal/openstack/requests/list_ports.rb +++ b/lib/fog/openstack/baremetal/requests/list_ports.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_ports(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb b/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb similarity index 93% rename from lib/fog/baremetal/openstack/requests/list_ports_detailed.rb rename to lib/fog/openstack/baremetal/requests/list_ports_detailed.rb index 31216effa..768c40773 100644 --- a/lib/fog/baremetal/openstack/requests/list_ports_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def list_ports_detailed(options = {}) request( diff --git a/lib/fog/baremetal/openstack/requests/patch_chassis.rb b/lib/fog/openstack/baremetal/requests/patch_chassis.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/patch_chassis.rb rename to lib/fog/openstack/baremetal/requests/patch_chassis.rb index a21904e44..ebfe87b66 100644 --- a/lib/fog/baremetal/openstack/requests/patch_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/patch_chassis.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Patch a chassis # diff --git a/lib/fog/baremetal/openstack/requests/patch_node.rb b/lib/fog/openstack/baremetal/requests/patch_node.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/patch_node.rb rename to lib/fog/openstack/baremetal/requests/patch_node.rb index ba2143780..445b15cc7 100644 --- a/lib/fog/baremetal/openstack/requests/patch_node.rb +++ b/lib/fog/openstack/baremetal/requests/patch_node.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Patch a node # diff --git a/lib/fog/baremetal/openstack/requests/patch_port.rb b/lib/fog/openstack/baremetal/requests/patch_port.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/patch_port.rb rename to lib/fog/openstack/baremetal/requests/patch_port.rb index 0a162aa30..ffe9da2ba 100644 --- a/lib/fog/baremetal/openstack/requests/patch_port.rb +++ b/lib/fog/openstack/baremetal/requests/patch_port.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real # Patch a port # diff --git a/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb b/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/set_node_maintenance.rb rename to lib/fog/openstack/baremetal/requests/set_node_maintenance.rb index fdcd584e5..8939b200b 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_maintenance.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def set_node_maintenance(node_uuid, parameters = nil) request( diff --git a/lib/fog/baremetal/openstack/requests/set_node_power_state.rb b/lib/fog/openstack/baremetal/requests/set_node_power_state.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/set_node_power_state.rb rename to lib/fog/openstack/baremetal/requests/set_node_power_state.rb index 360aed009..f036c074f 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_power_state.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_power_state.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def set_node_power_state(node_id, power_state) data = { diff --git a/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb b/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb similarity index 96% rename from lib/fog/baremetal/openstack/requests/set_node_provision_state.rb rename to lib/fog/openstack/baremetal/requests/set_node_provision_state.rb index 64328c7d6..f2ddc57dc 100644 --- a/lib/fog/baremetal/openstack/requests/set_node_provision_state.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def set_node_provision_state(node_id, provision_state) data = { diff --git a/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb b/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb similarity index 95% rename from lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb rename to lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb index a996d3098..7cdd20f76 100644 --- a/lib/fog/baremetal/openstack/requests/unset_node_maintenance.rb +++ b/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb @@ -1,6 +1,6 @@ module Fog - module Baremetal - class OpenStack + module OpenStack + class Baremetal class Real def unset_node_maintenance(node_uuid, parameters = nil) request( diff --git a/lib/fog/compute/openstack.rb b/lib/fog/openstack/compute/compute.rb similarity index 98% rename from lib/fog/compute/openstack.rb rename to lib/fog/openstack/compute/compute.rb index 3d2049979..38bc5a2ed 100644 --- a/lib/fog/compute/openstack.rb +++ b/lib/fog/openstack/compute/compute.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack < Fog::Service + module OpenStack + class Compute < Fog::Service SUPPORTED_VERSIONS = /v2\.0|v2\.1/ SUPPORTED_MICROVERSION = '2.15'.freeze @@ -18,7 +18,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/compute/openstack/models' + model_path 'fog/openstack/compute/models' model :aggregate collection :aggregates model :availability_zone @@ -60,7 +60,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/compute/openstack/requests' + request_path 'fog/openstack/compute/requests' # Aggregate CRUD request :list_aggregates @@ -373,7 +373,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Compute::OpenStack::NotFound + Fog::OpenStack::Compute::NotFound end def default_service_type diff --git a/lib/fog/compute/openstack/models/address.rb b/lib/fog/openstack/compute/models/address.rb similarity index 97% rename from lib/fog/compute/openstack/models/address.rb rename to lib/fog/openstack/compute/models/address.rb index a74160bbf..ac62ade97 100644 --- a/lib/fog/compute/openstack/models/address.rb +++ b/lib/fog/openstack/compute/models/address.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Address < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/addresses.rb b/lib/fog/openstack/compute/models/addresses.rb similarity index 74% rename from lib/fog/compute/openstack/models/addresses.rb rename to lib/fog/openstack/compute/models/addresses.rb index 3fe6282fe..5969106a9 100644 --- a/lib/fog/compute/openstack/models/addresses.rb +++ b/lib/fog/openstack/compute/models/addresses.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/address' +require 'fog/openstack/compute/models/address' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Addresses < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Address + model Fog::OpenStack::Compute::Address def all(options = {}) load_response(service.list_all_addresses(options), 'floating_ips') @@ -15,7 +15,7 @@ def get(address_id) if address = service.get_address(address_id).body['floating_ip'] new(address) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end diff --git a/lib/fog/compute/openstack/models/aggregate.rb b/lib/fog/openstack/compute/models/aggregate.rb similarity index 97% rename from lib/fog/compute/openstack/models/aggregate.rb rename to lib/fog/openstack/compute/models/aggregate.rb index ffc77c819..1cafe5184 100644 --- a/lib/fog/compute/openstack/models/aggregate.rb +++ b/lib/fog/openstack/compute/models/aggregate.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Aggregate < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/aggregates.rb b/lib/fog/openstack/compute/models/aggregates.rb similarity index 78% rename from lib/fog/compute/openstack/models/aggregates.rb rename to lib/fog/openstack/compute/models/aggregates.rb index 956fb2468..2e4126f57 100644 --- a/lib/fog/compute/openstack/models/aggregates.rb +++ b/lib/fog/openstack/compute/models/aggregates.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/aggregate' +require 'fog/openstack/compute/models/aggregate' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Aggregates < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Aggregate + model Fog::OpenStack::Compute::Aggregate def all(options = {}) load_response(service.list_aggregates(options), 'aggregates') diff --git a/lib/fog/compute/openstack/models/availability_zone.rb b/lib/fog/openstack/compute/models/availability_zone.rb similarity index 88% rename from lib/fog/compute/openstack/models/availability_zone.rb rename to lib/fog/openstack/compute/models/availability_zone.rb index 2f82201cb..fad9a1471 100644 --- a/lib/fog/compute/openstack/models/availability_zone.rb +++ b/lib/fog/openstack/compute/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class AvailabilityZone < Fog::OpenStack::Model identity :zoneName diff --git a/lib/fog/compute/openstack/models/availability_zones.rb b/lib/fog/openstack/compute/models/availability_zones.rb similarity index 74% rename from lib/fog/compute/openstack/models/availability_zones.rb rename to lib/fog/openstack/compute/models/availability_zones.rb index b4befaea6..b3be66cf7 100644 --- a/lib/fog/compute/openstack/models/availability_zones.rb +++ b/lib/fog/openstack/compute/models/availability_zones.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/availability_zone' +require 'fog/openstack/compute/models/availability_zone' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class AvailabilityZones < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::AvailabilityZone + model Fog::OpenStack::Compute::AvailabilityZone def all(options = {}) data = service.list_zones_detailed(options) diff --git a/lib/fog/compute/openstack/models/flavor.rb b/lib/fog/openstack/compute/models/flavor.rb similarity index 86% rename from lib/fog/compute/openstack/models/flavor.rb rename to lib/fog/openstack/compute/models/flavor.rb index 553056aff..aa56fc297 100644 --- a/lib/fog/compute/openstack/models/flavor.rb +++ b/lib/fog/openstack/compute/models/flavor.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Flavor < Fog::OpenStack::Model identity :id @@ -37,25 +37,25 @@ def destroy def metadata service.get_flavor_metadata(id).body['extra_specs'] - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def create_metadata(metadata) service.create_flavor_metadata(id, metadata) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def update_metadata(key, value) service.update_flavor_metadata(id, key, value) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def delete_metadata(key) service.delete_flavor_metadata(id, key) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/flavors.rb b/lib/fog/openstack/compute/models/flavors.rb similarity index 75% rename from lib/fog/compute/openstack/models/flavors.rb rename to lib/fog/openstack/compute/models/flavors.rb index e5d6b754f..c4430e96c 100644 --- a/lib/fog/compute/openstack/models/flavors.rb +++ b/lib/fog/openstack/compute/models/flavors.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/flavor' +require 'fog/openstack/compute/models/flavor' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Flavors < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Flavor + model Fog::OpenStack::Compute::Flavor def all(options = {}) data = service.list_flavors_detail(options) @@ -20,7 +20,7 @@ def summary(options = {}) def get(flavor_id) data = service.get_flavor_details(flavor_id).body['flavor'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/host.rb b/lib/fog/openstack/compute/models/host.rb similarity index 81% rename from lib/fog/compute/openstack/models/host.rb rename to lib/fog/openstack/compute/models/host.rb index 637d451ff..bf79e813c 100644 --- a/lib/fog/compute/openstack/models/host.rb +++ b/lib/fog/openstack/compute/models/host.rb @@ -1,9 +1,9 @@ require 'fog/compute/models/server' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Host < Fog::OpenStack::Model attribute :host_name attribute :service_name @@ -19,7 +19,7 @@ def initialize(attributes) def details service.get_host_details(host_name).body['host'] - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/hosts.rb b/lib/fog/openstack/compute/models/hosts.rb similarity index 73% rename from lib/fog/compute/openstack/models/hosts.rb rename to lib/fog/openstack/compute/models/hosts.rb index 8cc8fa1b5..9baf1edc3 100644 --- a/lib/fog/compute/openstack/models/hosts.rb +++ b/lib/fog/openstack/compute/models/hosts.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/host' +require 'fog/openstack/compute/models/host' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Hosts < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Host + model Fog::OpenStack::Compute::Host def all(options = {}) data = service.list_hosts(options) @@ -17,7 +17,7 @@ def get(host_name) new('host_name' => host_name, 'details' => host) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/image.rb b/lib/fog/openstack/compute/models/image.rb similarity index 87% rename from lib/fog/compute/openstack/models/image.rb rename to lib/fog/openstack/compute/models/image.rb index cd9a41ff4..bc2b0c8cb 100644 --- a/lib/fog/compute/openstack/models/image.rb +++ b/lib/fog/openstack/compute/models/image.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Image < Fog::OpenStack::Model identity :id @@ -21,7 +21,7 @@ class Image < Fog::OpenStack::Model def metadata @metadata ||= begin - Fog::Compute::OpenStack::Metadata.new(:service => service, + Fog::OpenStack::Compute::Metadata.new(:service => service, :parent => self) end end diff --git a/lib/fog/compute/openstack/models/images.rb b/lib/fog/openstack/compute/models/images.rb similarity index 80% rename from lib/fog/compute/openstack/models/images.rb rename to lib/fog/openstack/compute/models/images.rb index b1e00a84f..5aecc5937 100644 --- a/lib/fog/compute/openstack/models/images.rb +++ b/lib/fog/openstack/compute/models/images.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/image' +require 'fog/openstack/compute/models/image' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Images < Fog::OpenStack::Collection attribute :filters - model Fog::Compute::OpenStack::Image + model Fog::OpenStack::Compute::Image attribute :server @@ -29,7 +29,7 @@ def all(filters_arg = filters) def get(image_id) data = service.get_image_details(image_id).body['image'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/key_pair.rb b/lib/fog/openstack/compute/models/key_pair.rb similarity index 97% rename from lib/fog/compute/openstack/models/key_pair.rb rename to lib/fog/openstack/compute/models/key_pair.rb index 6cc30481f..7a16a7a75 100644 --- a/lib/fog/compute/openstack/models/key_pair.rb +++ b/lib/fog/openstack/compute/models/key_pair.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class KeyPair < Fog::OpenStack::Model identity :name diff --git a/lib/fog/compute/openstack/models/key_pairs.rb b/lib/fog/openstack/compute/models/key_pairs.rb similarity index 74% rename from lib/fog/compute/openstack/models/key_pairs.rb rename to lib/fog/openstack/compute/models/key_pairs.rb index fbbd98bf2..468d07ff9 100644 --- a/lib/fog/compute/openstack/models/key_pairs.rb +++ b/lib/fog/openstack/compute/models/key_pairs.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/key_pair' +require 'fog/openstack/compute/models/key_pair' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class KeyPairs < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::KeyPair + model Fog::OpenStack::Compute::KeyPair def all(options = {}) items = [] @@ -20,7 +20,7 @@ def get(key_pair_name) if key_pair_name all.select { |kp| kp.name == key_pair_name }.first end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/metadata.rb b/lib/fog/openstack/compute/models/metadata.rb similarity index 79% rename from lib/fog/compute/openstack/models/metadata.rb rename to lib/fog/openstack/compute/models/metadata.rb index 0c42f3d67..50cfc70ec 100644 --- a/lib/fog/compute/openstack/models/metadata.rb +++ b/lib/fog/openstack/compute/models/metadata.rb @@ -1,16 +1,16 @@ require 'fog/openstack/models/collection' require 'fog/openstack/models/meta_parent' -require 'fog/compute/openstack/models/metadatum' -require 'fog/compute/openstack/models/image' -require 'fog/compute/openstack/models/server' +require 'fog/openstack/compute/models/metadatum' +require 'fog/openstack/compute/models/image' +require 'fog/openstack/compute/models/server' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Metadata < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Metadatum + model Fog::OpenStack::Compute::Metadatum - include Fog::Compute::OpenStack::MetaParent + include Fog::OpenStack::Compute::MetaParent def all requires :parent @@ -27,7 +27,7 @@ def get(key) metas = [] data.each_pair { |k, v| metas << {"key" => k, "value" => v} } new(metas[0]) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end @@ -50,7 +50,7 @@ def to_hash(data = nil) if data.nil? data = {} each do |meta| - if meta.kind_of?(Fog::Compute::OpenStack::Metadatum) + if meta.kind_of?(Fog::OpenStack::Compute::Metadatum) data.store(meta.key, meta.value) else data.store(meta["key"], meta["value"]) diff --git a/lib/fog/compute/openstack/models/metadatum.rb b/lib/fog/openstack/compute/models/metadatum.rb similarity index 85% rename from lib/fog/compute/openstack/models/metadatum.rb rename to lib/fog/openstack/compute/models/metadatum.rb index d9c03f3ea..431f70af4 100644 --- a/lib/fog/compute/openstack/models/metadatum.rb +++ b/lib/fog/openstack/compute/models/metadatum.rb @@ -2,10 +2,10 @@ require 'fog/openstack/models/meta_parent' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Metadatum < Fog::OpenStack::Model - include Fog::Compute::OpenStack::MetaParent + include Fog::OpenStack::Compute::MetaParent identity :key attribute :value diff --git a/lib/fog/compute/openstack/models/network.rb b/lib/fog/openstack/compute/models/network.rb similarity index 84% rename from lib/fog/compute/openstack/models/network.rb rename to lib/fog/openstack/compute/models/network.rb index f6d866ee2..a25f39acb 100644 --- a/lib/fog/compute/openstack/models/network.rb +++ b/lib/fog/openstack/compute/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Network < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/compute/openstack/models/networks.rb b/lib/fog/openstack/compute/models/networks.rb similarity index 81% rename from lib/fog/compute/openstack/models/networks.rb rename to lib/fog/openstack/compute/models/networks.rb index 06c57ae6c..98d1224a0 100644 --- a/lib/fog/compute/openstack/models/networks.rb +++ b/lib/fog/openstack/compute/models/networks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/network' +require 'fog/openstack/compute/models/network' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Networks < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Network + model Fog::OpenStack::Compute::Network attribute :server diff --git a/lib/fog/compute/openstack/models/os_interface.rb b/lib/fog/openstack/compute/models/os_interface.rb similarity index 88% rename from lib/fog/compute/openstack/models/os_interface.rb rename to lib/fog/openstack/compute/models/os_interface.rb index f685dddac..dc47e446a 100644 --- a/lib/fog/compute/openstack/models/os_interface.rb +++ b/lib/fog/openstack/compute/models/os_interface.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class OsInterface < Fog::OpenStack::Model identity :port_id attribute :fixed_ips, :type => :array diff --git a/lib/fog/compute/openstack/models/os_interfaces.rb b/lib/fog/openstack/compute/models/os_interfaces.rb similarity index 78% rename from lib/fog/compute/openstack/models/os_interfaces.rb rename to lib/fog/openstack/compute/models/os_interfaces.rb index c4140bbee..32c69dc3f 100644 --- a/lib/fog/compute/openstack/models/os_interfaces.rb +++ b/lib/fog/openstack/compute/models/os_interfaces.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/os_interface' +require 'fog/openstack/compute/models/os_interface' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class OsInterfaces < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::OsInterface + model Fog::OpenStack::Compute::OsInterface attribute :server diff --git a/lib/fog/compute/openstack/models/security_group.rb b/lib/fog/openstack/compute/models/security_group.rb similarity index 85% rename from lib/fog/compute/openstack/models/security_group.rb rename to lib/fog/openstack/compute/models/security_group.rb index 83057b9c2..8a7305815 100644 --- a/lib/fog/compute/openstack/models/security_group.rb +++ b/lib/fog/openstack/compute/models/security_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroup < Fog::OpenStack::Model identity :id @@ -12,7 +12,7 @@ class SecurityGroup < Fog::OpenStack::Model attribute :tenant_id def security_group_rules - Fog::Compute::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::OpenStack::Compute::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) end def rules @@ -23,7 +23,7 @@ def rules # no one should be calling this because it doesn't do anything # useful but we deprecated the rules attribute and need to maintain the API def rules=(new_rules) - Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.') + Fog::Logger.deprecation('#rules= is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRules collection to create new rules.') attributes[:security_group_rules] = new_rules end @@ -41,13 +41,13 @@ def destroy end def create_security_group_rule(min, max, ip_protocol = "tcp", cidr = "0.0.0.0/0", group_id = nil) - Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRules collection to create new rules.') + Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRules collection to create new rules.') requires :id service.create_security_group_rule(id, ip_protocol, min, max, cidr, group_id) end def delete_security_group_rule(rule_id) - Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::Compute::Openstack::SecurityGroupRule objects to destroy rules.') + Fog::Logger.deprecation('#create_security_group_rule is deprecated. Use the Fog::OpenStack::Compute::SecurityGroupRule objects to destroy rules.') service.delete_security_group_rule(rule_id) true end diff --git a/lib/fog/compute/openstack/models/security_group_rule.rb b/lib/fog/openstack/compute/models/security_group_rule.rb similarity index 95% rename from lib/fog/compute/openstack/models/security_group_rule.rb rename to lib/fog/openstack/compute/models/security_group_rule.rb index 48e061b5a..bcbf017b2 100644 --- a/lib/fog/compute/openstack/models/security_group_rule.rb +++ b/lib/fog/openstack/compute/models/security_group_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroupRule < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/security_group_rules.rb b/lib/fog/openstack/compute/models/security_group_rules.rb similarity index 65% rename from lib/fog/compute/openstack/models/security_group_rules.rb rename to lib/fog/openstack/compute/models/security_group_rules.rb index acab2e4dc..bbf39d5f6 100644 --- a/lib/fog/compute/openstack/models/security_group_rules.rb +++ b/lib/fog/openstack/compute/models/security_group_rules.rb @@ -1,18 +1,18 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/security_group_rule' +require 'fog/openstack/compute/models/security_group_rule' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroupRules < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::SecurityGroupRule + model Fog::OpenStack::Compute::SecurityGroupRule def get(security_group_rule_id) if security_group_rule_id body = service.get_security_group_rule(security_group_rule_id).body new(body['security_group_rule']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/security_groups.rb b/lib/fog/openstack/compute/models/security_groups.rb similarity index 70% rename from lib/fog/compute/openstack/models/security_groups.rb rename to lib/fog/openstack/compute/models/security_groups.rb index 1a26414ad..cbcf1f110 100644 --- a/lib/fog/compute/openstack/models/security_groups.rb +++ b/lib/fog/openstack/compute/models/security_groups.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/security_group' +require 'fog/openstack/compute/models/security_group' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class SecurityGroups < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::SecurityGroup + model Fog::OpenStack::Compute::SecurityGroup def all(options = {}) load_response(service.list_security_groups(options), 'security_groups') @@ -15,7 +15,7 @@ def get(security_group_id) if security_group_id new(service.get_security_group(security_group_id).body['security_group']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/server.rb b/lib/fog/openstack/compute/models/server.rb similarity index 98% rename from lib/fog/compute/openstack/models/server.rb rename to lib/fog/openstack/compute/models/server.rb index c0d698af7..66df13fa3 100644 --- a/lib/fog/compute/openstack/models/server.rb +++ b/lib/fog/openstack/compute/models/server.rb @@ -1,9 +1,9 @@ require 'fog/compute/models/server' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Server < Fog::Compute::Server identity :id attribute :instance_name, :aliases => 'OS-EXT-SRV-ATTR:instance_name' @@ -74,7 +74,7 @@ def initialize(attributes = {}) def metadata @metadata ||= begin - Fog::Compute::OpenStack::Metadata.new(:service => service, + Fog::OpenStack::Compute::Metadata.new(:service => service, :parent => self) end end @@ -233,7 +233,7 @@ def security_groups groups = service.list_security_groups(:server_id => id).body['security_groups'] groups.map do |group| - Fog::Compute::OpenStack::SecurityGroup.new group.merge(:service => service) + Fog::OpenStack::Compute::SecurityGroup.new group.merge(:service => service) end else service.security_groups.all diff --git a/lib/fog/compute/openstack/models/server_group.rb b/lib/fog/openstack/compute/models/server_group.rb similarity index 94% rename from lib/fog/compute/openstack/models/server_group.rb rename to lib/fog/openstack/compute/models/server_group.rb index 8514e1ad5..73bca63b0 100644 --- a/lib/fog/compute/openstack/models/server_group.rb +++ b/lib/fog/openstack/compute/models/server_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class ServerGroup < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/compute/openstack/models/server_groups.rb b/lib/fog/openstack/compute/models/server_groups.rb similarity index 74% rename from lib/fog/compute/openstack/models/server_groups.rb rename to lib/fog/openstack/compute/models/server_groups.rb index 8b5d8ddca..901657654 100644 --- a/lib/fog/compute/openstack/models/server_groups.rb +++ b/lib/fog/openstack/compute/models/server_groups.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/server_group' +require 'fog/openstack/compute/models/server_group' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class ServerGroups < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::ServerGroup + model Fog::OpenStack::Compute::ServerGroup def all(options = {}) load_response(service.list_server_groups(options), 'server_groups') @@ -15,7 +15,7 @@ def get(server_group_id) if server_group_id new(service.get_server_group(server_group_id).body['server_group']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end diff --git a/lib/fog/compute/openstack/models/servers.rb b/lib/fog/openstack/compute/models/servers.rb similarity index 75% rename from lib/fog/compute/openstack/models/servers.rb rename to lib/fog/openstack/compute/models/servers.rb index 1f8e14a7e..8f1fed4c3 100644 --- a/lib/fog/compute/openstack/models/servers.rb +++ b/lib/fog/openstack/compute/models/servers.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/server' +require 'fog/openstack/compute/models/server' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Servers < Fog::OpenStack::Collection attribute :filters - model Fog::Compute::OpenStack::Server + model Fog::OpenStack::Compute::Server def initialize(attributes) self.filters ||= {} @@ -27,11 +27,11 @@ def summary(filters_arg = filters) end # Creates a new server and populates ssh keys - # @return [Fog::Compute::OpenStack::Server] - # @raise [Fog::Compute::OpenStack::NotFound] - HTTP 404 - # @raise [Fog::Compute::OpenStack::BadRequest] - HTTP 400 - # @raise [Fog::Compute::OpenStack::InternalServerError] - HTTP 500 - # @raise [Fog::Compute::OpenStack::ServiceError] + # @return [Fog::OpenStack::Compute::Server] + # @raise [Fog::OpenStack::Compute::NotFound] - HTTP 404 + # @raise [Fog::OpenStack::Compute::BadRequest] - HTTP 400 + # @raise [Fog::OpenStack::Compute::InternalServerError] - HTTP 500 + # @raise [Fog::OpenStack::Compute::ServiceError] # @example # service.servers.bootstrap :name => 'bootstrap-server', # :flavor_ref => service.flavors.first.id, @@ -50,7 +50,7 @@ def get(server_id) if server = service.get_server_details(server_id).body['server'] new(server) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/service.rb b/lib/fog/openstack/compute/models/service.rb similarity index 95% rename from lib/fog/compute/openstack/models/service.rb rename to lib/fog/openstack/compute/models/service.rb index 7a9fcb1a7..e36471dbb 100644 --- a/lib/fog/compute/openstack/models/service.rb +++ b/lib/fog/openstack/compute/models/service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Service < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/services.rb b/lib/fog/openstack/compute/models/services.rb similarity index 83% rename from lib/fog/compute/openstack/models/services.rb rename to lib/fog/openstack/compute/models/services.rb index d1a8ce8b7..3331dbd02 100644 --- a/lib/fog/compute/openstack/models/services.rb +++ b/lib/fog/openstack/compute/models/services.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/service' +require 'fog/openstack/compute/models/service' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Services < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Service + model Fog::OpenStack::Compute::Service def all(options = {}) load_response(service.list_services(options), 'services') @@ -26,7 +26,7 @@ def get(service_id) s['id'] == service_id end new(serv) if serv - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/snapshot.rb b/lib/fog/openstack/compute/models/snapshot.rb similarity index 90% rename from lib/fog/compute/openstack/models/snapshot.rb rename to lib/fog/openstack/compute/models/snapshot.rb index 8ed587497..a0bf1db9d 100644 --- a/lib/fog/compute/openstack/models/snapshot.rb +++ b/lib/fog/openstack/compute/models/snapshot.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Snapshot < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/snapshots.rb b/lib/fog/openstack/compute/models/snapshots.rb similarity index 84% rename from lib/fog/compute/openstack/models/snapshots.rb rename to lib/fog/openstack/compute/models/snapshots.rb index 9d1c21855..110da6e2a 100644 --- a/lib/fog/compute/openstack/models/snapshots.rb +++ b/lib/fog/openstack/compute/models/snapshots.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/snapshot' +require 'fog/openstack/compute/models/snapshot' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Snapshots < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Snapshot + model Fog::OpenStack::Compute::Snapshot def all(options = {}) if !options.kind_of?(Hash) @@ -28,7 +28,7 @@ def get(snapshot_id) if snapshot = service.get_snapshot_details(snapshot_id).body['snapshot'] new(snapshot) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/tenant.rb b/lib/fog/openstack/compute/models/tenant.rb similarity index 91% rename from lib/fog/compute/openstack/models/tenant.rb rename to lib/fog/openstack/compute/models/tenant.rb index 2f6c50438..7553297e7 100644 --- a/lib/fog/compute/openstack/models/tenant.rb +++ b/lib/fog/openstack/compute/models/tenant.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Tenant < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/tenants.rb b/lib/fog/openstack/compute/models/tenants.rb similarity index 78% rename from lib/fog/compute/openstack/models/tenants.rb rename to lib/fog/openstack/compute/models/tenants.rb index 15d8645fb..a00d6c1f3 100644 --- a/lib/fog/compute/openstack/models/tenants.rb +++ b/lib/fog/openstack/compute/models/tenants.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/tenant' +require 'fog/openstack/compute/models/tenant' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Tenants < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Tenant + model Fog::OpenStack::Compute::Tenant def all load_response(service.list_tenants, 'tenants') diff --git a/lib/fog/compute/openstack/models/volume.rb b/lib/fog/openstack/compute/models/volume.rb similarity index 94% rename from lib/fog/compute/openstack/models/volume.rb rename to lib/fog/openstack/compute/models/volume.rb index cacbf5254..0ac7293d9 100644 --- a/lib/fog/compute/openstack/models/volume.rb +++ b/lib/fog/openstack/compute/models/volume.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/compute/openstack/models/metadata' +require 'fog/openstack/compute/models/metadata' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Volume < Fog::OpenStack::Model identity :id diff --git a/lib/fog/compute/openstack/models/volume_attachment.rb b/lib/fog/openstack/compute/models/volume_attachment.rb similarity index 85% rename from lib/fog/compute/openstack/models/volume_attachment.rb rename to lib/fog/openstack/compute/models/volume_attachment.rb index 8297bd475..41727a1f6 100644 --- a/lib/fog/compute/openstack/models/volume_attachment.rb +++ b/lib/fog/openstack/compute/models/volume_attachment.rb @@ -1,8 +1,8 @@ require 'fog/core/model' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class VolumeAttachment < Fog::Model identity :id diff --git a/lib/fog/compute/openstack/models/volume_attachments.rb b/lib/fog/openstack/compute/models/volume_attachments.rb similarity index 71% rename from lib/fog/compute/openstack/models/volume_attachments.rb rename to lib/fog/openstack/compute/models/volume_attachments.rb index d67f68ba5..6c5046741 100644 --- a/lib/fog/compute/openstack/models/volume_attachments.rb +++ b/lib/fog/openstack/compute/models/volume_attachments.rb @@ -1,17 +1,17 @@ require 'fog/core/collection' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class VolumeAttachments < Fog::Collection - model Fog::Compute::OpenStack::VolumeAttachment + model Fog::OpenStack::Compute::VolumeAttachment def get(server_id) if server_id puts service.list_volume_attachments(server_id).body load(service.list_volume_attachments(server_id).body['volumeAttachments']) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/models/volumes.rb b/lib/fog/openstack/compute/models/volumes.rb similarity index 84% rename from lib/fog/compute/openstack/models/volumes.rb rename to lib/fog/openstack/compute/models/volumes.rb index 8ffee8073..843cdf6db 100644 --- a/lib/fog/compute/openstack/models/volumes.rb +++ b/lib/fog/openstack/compute/models/volumes.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/compute/openstack/models/volume' +require 'fog/openstack/compute/models/volume' module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Volumes < Fog::OpenStack::Collection - model Fog::Compute::OpenStack::Volume + model Fog::OpenStack::Compute::Volume def all(options = true) if !options.kind_of?(Hash) @@ -28,7 +28,7 @@ def get(volume_id) if volume = service.get_volume_details(volume_id).body['volume'] new(volume) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/compute/openstack/requests/add_aggregate_host.rb b/lib/fog/openstack/compute/requests/add_aggregate_host.rb similarity index 95% rename from lib/fog/compute/openstack/requests/add_aggregate_host.rb rename to lib/fog/openstack/compute/requests/add_aggregate_host.rb index 8b54bce0c..6775bd6a9 100644 --- a/lib/fog/compute/openstack/requests/add_aggregate_host.rb +++ b/lib/fog/openstack/compute/requests/add_aggregate_host.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def add_aggregate_host(uuid, host_uuid) data = {'add_host' => {'host' => host_uuid}} diff --git a/lib/fog/compute/openstack/requests/add_fixed_ip.rb b/lib/fog/openstack/compute/requests/add_fixed_ip.rb similarity index 94% rename from lib/fog/compute/openstack/requests/add_fixed_ip.rb rename to lib/fog/openstack/compute/requests/add_fixed_ip.rb index db4fa8461..c3e6c4256 100644 --- a/lib/fog/compute/openstack/requests/add_fixed_ip.rb +++ b/lib/fog/openstack/compute/requests/add_fixed_ip.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Add an IP address on a network. # diff --git a/lib/fog/compute/openstack/requests/add_flavor_access.rb b/lib/fog/openstack/compute/requests/add_flavor_access.rb similarity index 95% rename from lib/fog/compute/openstack/requests/add_flavor_access.rb rename to lib/fog/openstack/compute/requests/add_flavor_access.rb index cf73ba031..bd9c14e8c 100644 --- a/lib/fog/compute/openstack/requests/add_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/add_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def add_flavor_access(flavor_ref, tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/add_security_group.rb b/lib/fog/openstack/compute/requests/add_security_group.rb similarity index 91% rename from lib/fog/compute/openstack/requests/add_security_group.rb rename to lib/fog/openstack/compute/requests/add_security_group.rb index 13133d0bb..368e57416 100644 --- a/lib/fog/compute/openstack/requests/add_security_group.rb +++ b/lib/fog/openstack/compute/requests/add_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def add_security_group(server_id, group_name) body = {'addSecurityGroup' => {"name" => group_name}} diff --git a/lib/fog/compute/openstack/requests/allocate_address.rb b/lib/fog/openstack/compute/requests/allocate_address.rb similarity index 96% rename from lib/fog/compute/openstack/requests/allocate_address.rb rename to lib/fog/openstack/compute/requests/allocate_address.rb index fdae56401..20619b639 100644 --- a/lib/fog/compute/openstack/requests/allocate_address.rb +++ b/lib/fog/openstack/compute/requests/allocate_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def allocate_address(pool = nil) request( diff --git a/lib/fog/compute/openstack/requests/associate_address.rb b/lib/fog/openstack/compute/requests/associate_address.rb similarity index 95% rename from lib/fog/compute/openstack/requests/associate_address.rb rename to lib/fog/openstack/compute/requests/associate_address.rb index 259efd117..00c69a048 100644 --- a/lib/fog/compute/openstack/requests/associate_address.rb +++ b/lib/fog/openstack/compute/requests/associate_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def associate_address(server_id, ip_address) body = {"addFloatingIp" => {"address" => ip_address}} diff --git a/lib/fog/compute/openstack/requests/attach_volume.rb b/lib/fog/openstack/compute/requests/attach_volume.rb similarity index 96% rename from lib/fog/compute/openstack/requests/attach_volume.rb rename to lib/fog/openstack/compute/requests/attach_volume.rb index 1dcb04218..186e06a32 100644 --- a/lib/fog/compute/openstack/requests/attach_volume.rb +++ b/lib/fog/openstack/compute/requests/attach_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def attach_volume(volume_id, server_id, device) data = { diff --git a/lib/fog/compute/openstack/requests/boot_from_snapshot.rb b/lib/fog/openstack/compute/requests/boot_from_snapshot.rb similarity index 97% rename from lib/fog/compute/openstack/requests/boot_from_snapshot.rb rename to lib/fog/openstack/compute/requests/boot_from_snapshot.rb index a5e3b0231..64fbed70b 100644 --- a/lib/fog/compute/openstack/requests/boot_from_snapshot.rb +++ b/lib/fog/openstack/compute/requests/boot_from_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def boot_from_snapshot(name, image_ref, flavor_ref, options = {}) data = { diff --git a/lib/fog/compute/openstack/requests/change_server_password.rb b/lib/fog/openstack/compute/requests/change_server_password.rb similarity index 92% rename from lib/fog/compute/openstack/requests/change_server_password.rb rename to lib/fog/openstack/compute/requests/change_server_password.rb index 362d6ea3a..533e0a3d3 100644 --- a/lib/fog/compute/openstack/requests/change_server_password.rb +++ b/lib/fog/openstack/compute/requests/change_server_password.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def change_server_password(server_id, admin_password) body = {'changePassword' => {'adminPass' => admin_password}} diff --git a/lib/fog/compute/openstack/requests/confirm_resize_server.rb b/lib/fog/openstack/compute/requests/confirm_resize_server.rb similarity index 91% rename from lib/fog/compute/openstack/requests/confirm_resize_server.rb rename to lib/fog/openstack/compute/requests/confirm_resize_server.rb index 56188b99e..0a202efbd 100644 --- a/lib/fog/compute/openstack/requests/confirm_resize_server.rb +++ b/lib/fog/openstack/compute/requests/confirm_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def confirm_resize_server(server_id) body = {'confirmResize' => nil} diff --git a/lib/fog/compute/openstack/requests/create_aggregate.rb b/lib/fog/openstack/compute/requests/create_aggregate.rb similarity index 96% rename from lib/fog/compute/openstack/requests/create_aggregate.rb rename to lib/fog/openstack/compute/requests/create_aggregate.rb index a1efdc594..1a023c603 100644 --- a/lib/fog/compute/openstack/requests/create_aggregate.rb +++ b/lib/fog/openstack/compute/requests/create_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_aggregate(name, options = {}) data = { diff --git a/lib/fog/compute/openstack/requests/create_flavor.rb b/lib/fog/openstack/compute/requests/create_flavor.rb similarity index 98% rename from lib/fog/compute/openstack/requests/create_flavor.rb rename to lib/fog/openstack/compute/requests/create_flavor.rb index 7d7b9bbe0..76ac3ce01 100644 --- a/lib/fog/compute/openstack/requests/create_flavor.rb +++ b/lib/fog/openstack/compute/requests/create_flavor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # PARAMETERS # # name = Name of flavor diff --git a/lib/fog/compute/openstack/requests/create_flavor_metadata.rb b/lib/fog/openstack/compute/requests/create_flavor_metadata.rb similarity index 96% rename from lib/fog/compute/openstack/requests/create_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/create_flavor_metadata.rb index acdbe91e4..5b434cfc5 100644 --- a/lib/fog/compute/openstack/requests/create_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/create_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_flavor_metadata(flavor_ref, metadata) data = { diff --git a/lib/fog/compute/openstack/requests/create_image.rb b/lib/fog/openstack/compute/requests/create_image.rb similarity index 97% rename from lib/fog/compute/openstack/requests/create_image.rb rename to lib/fog/openstack/compute/requests/create_image.rb index bf4132a61..6a8fb545a 100644 --- a/lib/fog/compute/openstack/requests/create_image.rb +++ b/lib/fog/openstack/compute/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_image(server_id, name, metadata = {}) body = {'createImage' => { diff --git a/lib/fog/compute/openstack/requests/create_key_pair.rb b/lib/fog/openstack/compute/requests/create_key_pair.rb similarity index 98% rename from lib/fog/compute/openstack/requests/create_key_pair.rb rename to lib/fog/openstack/compute/requests/create_key_pair.rb index b94d6a338..e90e0d854 100644 --- a/lib/fog/compute/openstack/requests/create_key_pair.rb +++ b/lib/fog/openstack/compute/requests/create_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_key_pair(key_name, public_key = nil, user_id = nil) data = { diff --git a/lib/fog/compute/openstack/requests/create_os_interface.rb b/lib/fog/openstack/compute/requests/create_os_interface.rb similarity index 96% rename from lib/fog/compute/openstack/requests/create_os_interface.rb rename to lib/fog/openstack/compute/requests/create_os_interface.rb index 128a18b21..b192d600a 100644 --- a/lib/fog/compute/openstack/requests/create_os_interface.rb +++ b/lib/fog/openstack/compute/requests/create_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # === Parameters # * server_id <~String> diff --git a/lib/fog/compute/openstack/requests/create_security_group.rb b/lib/fog/openstack/compute/requests/create_security_group.rb similarity index 90% rename from lib/fog/compute/openstack/requests/create_security_group.rb rename to lib/fog/openstack/compute/requests/create_security_group.rb index 01d7a348a..3c5ebef75 100644 --- a/lib/fog/compute/openstack/requests/create_security_group.rb +++ b/lib/fog/openstack/compute/requests/create_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_security_group(name, description) data = { @@ -21,8 +21,8 @@ def create_security_group(name, description) class Mock def create_security_group(name, description) - Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') - tenant_id = Fog::Identity::OpenStack::V2::Mock.data[current_tenant][:tenants].keys.first + Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + tenant_id = Fog::OpenStack::Identity::V2::Mock.data[current_tenant][:tenants].keys.first security_group_id = Fog::Mock.random_numbers(2).to_i + 1 data[:security_groups][security_group_id.to_s] = { 'tenant_id' => tenant_id, diff --git a/lib/fog/compute/openstack/requests/create_security_group_rule.rb b/lib/fog/openstack/compute/requests/create_security_group_rule.rb similarity index 98% rename from lib/fog/compute/openstack/requests/create_security_group_rule.rb rename to lib/fog/openstack/compute/requests/create_security_group_rule.rb index 7a9908dbb..7d591d44a 100644 --- a/lib/fog/compute/openstack/requests/create_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/create_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, cidr, group_id = nil) data = { diff --git a/lib/fog/compute/openstack/requests/create_server.rb b/lib/fog/openstack/compute/requests/create_server.rb similarity index 97% rename from lib/fog/compute/openstack/requests/create_server.rb rename to lib/fog/openstack/compute/requests/create_server.rb index c36d3a254..7d64f97e7 100644 --- a/lib/fog/compute/openstack/requests/create_server.rb +++ b/lib/fog/openstack/compute/requests/create_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_server(name, image_ref, flavor_ref, options = {}) data = { @@ -23,7 +23,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) # security names requires a hash with a name prefix data['server']['security_groups'] = Array(options['security_groups']).map do |sg| - name = if sg.kind_of?(Fog::Compute::OpenStack::SecurityGroup) + name = if sg.kind_of?(Fog::OpenStack::Compute::SecurityGroup) sg.name else sg @@ -94,7 +94,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) response.status = 202 server_id = Fog::Mock.random_numbers(6).to_s - identity = Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') user = identity.users.find do |u| u.name == @openstack_username end @@ -158,7 +158,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) security_groups = options['security_groups'] if security_groups groups = Array(security_groups).map do |sg| - if sg.kind_of?(Fog::Compute::OpenStack::SecurityGroup) + if sg.kind_of?(Fog::OpenStack::Compute::SecurityGroup) sg.name else sg diff --git a/lib/fog/compute/openstack/requests/create_server_group.rb b/lib/fog/openstack/compute/requests/create_server_group.rb similarity index 80% rename from lib/fog/compute/openstack/requests/create_server_group.rb rename to lib/fog/openstack/compute/requests/create_server_group.rb index 10a42b9b5..63a73591e 100644 --- a/lib/fog/compute/openstack/requests/create_server_group.rb +++ b/lib/fog/openstack/compute/requests/create_server_group.rb @@ -1,9 +1,9 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_server_group(name, policy) - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy body = {'server_group' => { 'name' => name, @@ -20,7 +20,7 @@ def create_server_group(name, policy) class Mock def create_server_group(name, policy) - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy policy + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy id = SecureRandom.uuid data[:server_groups][id] = {:name => name, :policies => [policy], :members => []} get_server_group id diff --git a/lib/fog/compute/openstack/requests/create_snapshot.rb b/lib/fog/openstack/compute/requests/create_snapshot.rb similarity index 94% rename from lib/fog/compute/openstack/requests/create_snapshot.rb rename to lib/fog/openstack/compute/requests/create_snapshot.rb index c6d400b97..8df9ad038 100644 --- a/lib/fog/compute/openstack/requests/create_snapshot.rb +++ b/lib/fog/openstack/compute/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def create_snapshot(volume_id, name, description, force = false) data = { @@ -26,7 +26,7 @@ def create_snapshot(volume_id, name, description, _force = false) volume_response = get_volume_details(volume_id) volume = volume_response.data[:body]['volume'] if volume.nil? - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound else response = Excon::Response.new data = { diff --git a/lib/fog/compute/openstack/requests/create_volume.rb b/lib/fog/openstack/compute/requests/create_volume.rb similarity index 97% rename from lib/fog/compute/openstack/requests/create_volume.rb rename to lib/fog/openstack/compute/requests/create_volume.rb index 4d39fde7c..d90d439eb 100644 --- a/lib/fog/compute/openstack/requests/create_volume.rb +++ b/lib/fog/openstack/compute/requests/create_volume.rb @@ -1,7 +1,7 @@ # module Fog - module Compute - class OpenStack + module OpenStack + class Compute # class Real def create_volume(name, description, size, options = {}) diff --git a/lib/fog/compute/openstack/requests/delete_aggregate.rb b/lib/fog/openstack/compute/requests/delete_aggregate.rb similarity index 94% rename from lib/fog/compute/openstack/requests/delete_aggregate.rb rename to lib/fog/openstack/compute/requests/delete_aggregate.rb index e878ec6ee..fbd6ee4f1 100644 --- a/lib/fog/compute/openstack/requests/delete_aggregate.rb +++ b/lib/fog/openstack/compute/requests/delete_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_aggregate(uuid) request( diff --git a/lib/fog/compute/openstack/requests/delete_flavor.rb b/lib/fog/openstack/compute/requests/delete_flavor.rb similarity index 94% rename from lib/fog/compute/openstack/requests/delete_flavor.rb rename to lib/fog/openstack/compute/requests/delete_flavor.rb index 260c800c4..8cb4b2aa1 100644 --- a/lib/fog/compute/openstack/requests/delete_flavor.rb +++ b/lib/fog/openstack/compute/requests/delete_flavor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_flavor(flavor_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_flavor_metadata.rb b/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/delete_flavor_metadata.rb index fbb88dbb8..609147148 100644 --- a/lib/fog/compute/openstack/requests/delete_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_flavor_metadata(flavor_ref, key) request( diff --git a/lib/fog/compute/openstack/requests/delete_image.rb b/lib/fog/openstack/compute/requests/delete_image.rb similarity index 96% rename from lib/fog/compute/openstack/requests/delete_image.rb rename to lib/fog/openstack/compute/requests/delete_image.rb index 5b21ac423..c5841497c 100644 --- a/lib/fog/compute/openstack/requests/delete_image.rb +++ b/lib/fog/openstack/compute/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_image(image_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_key_pair.rb b/lib/fog/openstack/compute/requests/delete_key_pair.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_key_pair.rb rename to lib/fog/openstack/compute/requests/delete_key_pair.rb index 7b5e8568c..c39152ed3 100644 --- a/lib/fog/compute/openstack/requests/delete_key_pair.rb +++ b/lib/fog/openstack/compute/requests/delete_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_key_pair(key_name, user_id = nil) options = {} diff --git a/lib/fog/compute/openstack/requests/delete_meta.rb b/lib/fog/openstack/compute/requests/delete_meta.rb similarity index 85% rename from lib/fog/compute/openstack/requests/delete_meta.rb rename to lib/fog/openstack/compute/requests/delete_meta.rb index a0ce4f837..cc7fdf007 100644 --- a/lib/fog/compute/openstack/requests/delete_meta.rb +++ b/lib/fog/openstack/compute/requests/delete_meta.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_meta(collection_name, parent_id, key) request( @@ -15,13 +15,13 @@ class Mock def delete_meta(collection_name, parent_id, _key) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/delete_metadata.rb b/lib/fog/openstack/compute/requests/delete_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/delete_metadata.rb rename to lib/fog/openstack/compute/requests/delete_metadata.rb index cc3d9960b..0dd71329e 100644 --- a/lib/fog/compute/openstack/requests/delete_metadata.rb +++ b/lib/fog/openstack/compute/requests/delete_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_metadata(collection_name, parent_id, key) request( diff --git a/lib/fog/compute/openstack/requests/delete_os_interface.rb b/lib/fog/openstack/compute/requests/delete_os_interface.rb similarity index 92% rename from lib/fog/compute/openstack/requests/delete_os_interface.rb rename to lib/fog/openstack/compute/requests/delete_os_interface.rb index f5a053ae7..c70ded8ca 100644 --- a/lib/fog/compute/openstack/requests/delete_os_interface.rb +++ b/lib/fog/openstack/compute/requests/delete_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # === Parameters # * server_id <~String> diff --git a/lib/fog/compute/openstack/requests/delete_security_group.rb b/lib/fog/openstack/compute/requests/delete_security_group.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_security_group.rb rename to lib/fog/openstack/compute/requests/delete_security_group.rb index f25801011..aed82769c 100644 --- a/lib/fog/compute/openstack/requests/delete_security_group.rb +++ b/lib/fog/openstack/compute/requests/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_security_group(security_group_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_security_group_rule.rb b/lib/fog/openstack/compute/requests/delete_security_group_rule.rb similarity index 96% rename from lib/fog/compute/openstack/requests/delete_security_group_rule.rb rename to lib/fog/openstack/compute/requests/delete_security_group_rule.rb index c6bf309ad..751fa8f67 100644 --- a/lib/fog/compute/openstack/requests/delete_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/delete_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_security_group_rule(security_group_rule_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_server.rb b/lib/fog/openstack/compute/requests/delete_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/delete_server.rb rename to lib/fog/openstack/compute/requests/delete_server.rb index dd2087ab6..9a7a381d2 100644 --- a/lib/fog/compute/openstack/requests/delete_server.rb +++ b/lib/fog/openstack/compute/requests/delete_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_server(server_id) request( @@ -31,7 +31,7 @@ def delete_server(server_id) end response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/delete_server_group.rb b/lib/fog/openstack/compute/requests/delete_server_group.rb similarity index 94% rename from lib/fog/compute/openstack/requests/delete_server_group.rb rename to lib/fog/openstack/compute/requests/delete_server_group.rb index 26a4ade92..0e4212a0c 100644 --- a/lib/fog/compute/openstack/requests/delete_server_group.rb +++ b/lib/fog/openstack/compute/requests/delete_server_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_server_group(group_id) request( diff --git a/lib/fog/compute/openstack/requests/delete_service.rb b/lib/fog/openstack/compute/requests/delete_service.rb similarity index 95% rename from lib/fog/compute/openstack/requests/delete_service.rb rename to lib/fog/openstack/compute/requests/delete_service.rb index 24cfa4887..6193a3da9 100644 --- a/lib/fog/compute/openstack/requests/delete_service.rb +++ b/lib/fog/openstack/compute/requests/delete_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_service(uuid, optional_params = nil) # Encode all params diff --git a/lib/fog/compute/openstack/requests/delete_snapshot.rb b/lib/fog/openstack/compute/requests/delete_snapshot.rb similarity index 87% rename from lib/fog/compute/openstack/requests/delete_snapshot.rb rename to lib/fog/openstack/compute/requests/delete_snapshot.rb index 495264e2c..76877e107 100644 --- a/lib/fog/compute/openstack/requests/delete_snapshot.rb +++ b/lib/fog/openstack/compute/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_snapshot(snapshot_id) request( @@ -18,7 +18,7 @@ def delete_snapshot(snapshot_id) if list_snapshots_detail.body['snapshots'].find { |snap| snap['id'] == snapshot_id } data[:snapshots].delete(snapshot_id) else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end response end diff --git a/lib/fog/compute/openstack/requests/delete_volume.rb b/lib/fog/openstack/compute/requests/delete_volume.rb similarity index 86% rename from lib/fog/compute/openstack/requests/delete_volume.rb rename to lib/fog/openstack/compute/requests/delete_volume.rb index 24bd64ffc..405aa85d4 100644 --- a/lib/fog/compute/openstack/requests/delete_volume.rb +++ b/lib/fog/openstack/compute/requests/delete_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def delete_volume(volume_id) request( @@ -19,7 +19,7 @@ def delete_volume(volume_id) response.status = 204 response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/detach_volume.rb b/lib/fog/openstack/compute/requests/detach_volume.rb similarity index 89% rename from lib/fog/compute/openstack/requests/detach_volume.rb rename to lib/fog/openstack/compute/requests/detach_volume.rb index 908023ef0..696ad3c85 100644 --- a/lib/fog/compute/openstack/requests/detach_volume.rb +++ b/lib/fog/openstack/compute/requests/detach_volume.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def detach_volume(server_id, attachment_id) request( @@ -20,7 +20,7 @@ def detach_volume(server_id, attachment_id) response.status = 202 response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/disable_service.rb b/lib/fog/openstack/compute/requests/disable_service.rb similarity index 96% rename from lib/fog/compute/openstack/requests/disable_service.rb rename to lib/fog/openstack/compute/requests/disable_service.rb index 6dea8df79..cc20f0e4f 100644 --- a/lib/fog/compute/openstack/requests/disable_service.rb +++ b/lib/fog/openstack/compute/requests/disable_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def disable_service(host, binary, optional_params = nil) data = {"host" => host, "binary" => binary} diff --git a/lib/fog/compute/openstack/requests/disable_service_log_reason.rb b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb similarity index 96% rename from lib/fog/compute/openstack/requests/disable_service_log_reason.rb rename to lib/fog/openstack/compute/requests/disable_service_log_reason.rb index e462c5e6a..c18c834f6 100644 --- a/lib/fog/compute/openstack/requests/disable_service_log_reason.rb +++ b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def disable_service_log_reason(host, binary, disabled_reason, optional_params = nil) data = {"host" => host, "binary" => binary, "disabled_reason" => disabled_reason} diff --git a/lib/fog/compute/openstack/requests/disassociate_address.rb b/lib/fog/openstack/compute/requests/disassociate_address.rb similarity index 94% rename from lib/fog/compute/openstack/requests/disassociate_address.rb rename to lib/fog/openstack/compute/requests/disassociate_address.rb index a11bac537..7ec15b304 100644 --- a/lib/fog/compute/openstack/requests/disassociate_address.rb +++ b/lib/fog/openstack/compute/requests/disassociate_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def disassociate_address(server_id, ip_address) body = {"removeFloatingIp" => {"address" => ip_address}} diff --git a/lib/fog/compute/openstack/requests/enable_service.rb b/lib/fog/openstack/compute/requests/enable_service.rb similarity index 96% rename from lib/fog/compute/openstack/requests/enable_service.rb rename to lib/fog/openstack/compute/requests/enable_service.rb index bbdec5dba..cc146268c 100644 --- a/lib/fog/compute/openstack/requests/enable_service.rb +++ b/lib/fog/openstack/compute/requests/enable_service.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def enable_service(host, binary, optional_params = nil) data = {"host" => host, "binary" => binary} diff --git a/lib/fog/compute/openstack/requests/evacuate_server.rb b/lib/fog/openstack/compute/requests/evacuate_server.rb similarity index 95% rename from lib/fog/compute/openstack/requests/evacuate_server.rb rename to lib/fog/openstack/compute/requests/evacuate_server.rb index 9efcc43c2..87017d0e1 100644 --- a/lib/fog/compute/openstack/requests/evacuate_server.rb +++ b/lib/fog/openstack/compute/requests/evacuate_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_password = nil) evacuate = {} diff --git a/lib/fog/compute/openstack/requests/get_address.rb b/lib/fog/openstack/compute/requests/get_address.rb similarity index 96% rename from lib/fog/compute/openstack/requests/get_address.rb rename to lib/fog/openstack/compute/requests/get_address.rb index 19debb1fa..14e1d4bdf 100644 --- a/lib/fog/compute/openstack/requests/get_address.rb +++ b/lib/fog/openstack/compute/requests/get_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_address(address_id) request( diff --git a/lib/fog/compute/openstack/requests/get_aggregate.rb b/lib/fog/openstack/compute/requests/get_aggregate.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_aggregate.rb rename to lib/fog/openstack/compute/requests/get_aggregate.rb index 5dba4fde4..be3589855 100644 --- a/lib/fog/compute/openstack/requests/get_aggregate.rb +++ b/lib/fog/openstack/compute/requests/get_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_aggregate(uuid) request( diff --git a/lib/fog/compute/openstack/requests/get_console_output.rb b/lib/fog/openstack/compute/requests/get_console_output.rb similarity index 92% rename from lib/fog/compute/openstack/requests/get_console_output.rb rename to lib/fog/openstack/compute/requests/get_console_output.rb index f0b666a32..a29da59b2 100644 --- a/lib/fog/compute/openstack/requests/get_console_output.rb +++ b/lib/fog/openstack/compute/requests/get_console_output.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_console_output(server_id, log_length) body = { diff --git a/lib/fog/compute/openstack/requests/get_flavor_details.rb b/lib/fog/openstack/compute/requests/get_flavor_details.rb similarity index 95% rename from lib/fog/compute/openstack/requests/get_flavor_details.rb rename to lib/fog/openstack/compute/requests/get_flavor_details.rb index fd94fd0ed..0d7b45309 100644 --- a/lib/fog/compute/openstack/requests/get_flavor_details.rb +++ b/lib/fog/openstack/compute/requests/get_flavor_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_flavor_details(flavor_ref) request( @@ -30,7 +30,7 @@ def get_flavor_details(flavor_ref) } response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_flavor_metadata.rb b/lib/fog/openstack/compute/requests/get_flavor_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/get_flavor_metadata.rb index e54f4337d..6aab20b3b 100644 --- a/lib/fog/compute/openstack/requests/get_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/get_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_flavor_metadata(flavor_ref) request( diff --git a/lib/fog/compute/openstack/requests/get_host_details.rb b/lib/fog/openstack/compute/requests/get_host_details.rb similarity index 97% rename from lib/fog/compute/openstack/requests/get_host_details.rb rename to lib/fog/openstack/compute/requests/get_host_details.rb index ca43d14b1..7441bf711 100644 --- a/lib/fog/compute/openstack/requests/get_host_details.rb +++ b/lib/fog/openstack/compute/requests/get_host_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_host_details(host) request( diff --git a/lib/fog/compute/openstack/requests/get_hypervisor.rb b/lib/fog/openstack/compute/requests/get_hypervisor.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_hypervisor.rb rename to lib/fog/openstack/compute/requests/get_hypervisor.rb index 7834d5a0e..0358dd704 100644 --- a/lib/fog/compute/openstack/requests/get_hypervisor.rb +++ b/lib/fog/openstack/compute/requests/get_hypervisor.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_hypervisor(hypervisor_id) request( diff --git a/lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb b/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb similarity index 96% rename from lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb rename to lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb index 130f0c4fa..511880b83 100644 --- a/lib/fog/compute/openstack/requests/get_hypervisor_statistics.rb +++ b/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_hypervisor_statistics(_tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/get_image_details.rb b/lib/fog/openstack/compute/requests/get_image_details.rb similarity index 87% rename from lib/fog/compute/openstack/requests/get_image_details.rb rename to lib/fog/openstack/compute/requests/get_image_details.rb index cbb49670b..aa27f8ef8 100644 --- a/lib/fog/compute/openstack/requests/get_image_details.rb +++ b/lib/fog/openstack/compute/requests/get_image_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_image_details(image_id) request( @@ -20,7 +20,7 @@ def get_image_details(image_id) response.body = {'image' => image} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_key_pair.rb b/lib/fog/openstack/compute/requests/get_key_pair.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_key_pair.rb rename to lib/fog/openstack/compute/requests/get_key_pair.rb index 22710a658..46361d6c5 100644 --- a/lib/fog/compute/openstack/requests/get_key_pair.rb +++ b/lib/fog/openstack/compute/requests/get_key_pair.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_key_pair(key_name) request( diff --git a/lib/fog/compute/openstack/requests/get_limits.rb b/lib/fog/openstack/compute/requests/get_limits.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_limits.rb rename to lib/fog/openstack/compute/requests/get_limits.rb index 5dd7e8fd1..cb8c0bc74 100644 --- a/lib/fog/compute/openstack/requests/get_limits.rb +++ b/lib/fog/openstack/compute/requests/get_limits.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute # http://developer.openstack.org/api-ref-compute-v2.1.html#showlimits class Real diff --git a/lib/fog/compute/openstack/requests/get_metadata.rb b/lib/fog/openstack/compute/requests/get_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_metadata.rb rename to lib/fog/openstack/compute/requests/get_metadata.rb index 52db21f05..9f7c37094 100644 --- a/lib/fog/compute/openstack/requests/get_metadata.rb +++ b/lib/fog/openstack/compute/requests/get_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_metadata(collection_name, parent_id, key) request( diff --git a/lib/fog/compute/openstack/requests/get_os_interface.rb b/lib/fog/openstack/compute/requests/get_os_interface.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_os_interface.rb rename to lib/fog/openstack/compute/requests/get_os_interface.rb index d6697fa09..424fca7a9 100644 --- a/lib/fog/compute/openstack/requests/get_os_interface.rb +++ b/lib/fog/openstack/compute/requests/get_os_interface.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_os_interface(server_id,port_id) request( diff --git a/lib/fog/compute/openstack/requests/get_quota.rb b/lib/fog/openstack/compute/requests/get_quota.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_quota.rb rename to lib/fog/openstack/compute/requests/get_quota.rb index a1a716924..94c5caa01 100644 --- a/lib/fog/compute/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/compute/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_quota(tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/get_quota_defaults.rb b/lib/fog/openstack/compute/requests/get_quota_defaults.rb similarity index 93% rename from lib/fog/compute/openstack/requests/get_quota_defaults.rb rename to lib/fog/openstack/compute/requests/get_quota_defaults.rb index 1cf1ace87..9469b2c0f 100644 --- a/lib/fog/compute/openstack/requests/get_quota_defaults.rb +++ b/lib/fog/openstack/compute/requests/get_quota_defaults.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_quota_defaults(tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/get_security_group.rb b/lib/fog/openstack/compute/requests/get_security_group.rb similarity index 90% rename from lib/fog/compute/openstack/requests/get_security_group.rb rename to lib/fog/openstack/compute/requests/get_security_group.rb index e82139a8f..7641bd5db 100644 --- a/lib/fog/compute/openstack/requests/get_security_group.rb +++ b/lib/fog/openstack/compute/requests/get_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_security_group(security_group_id) request( @@ -27,7 +27,7 @@ def get_security_group(security_group_id) "security_group" => security_group } else - raise Fog::Compute::OpenStack::NotFound, "Security group #{security_group_id} does not exist" + raise Fog::OpenStack::Compute::NotFound, "Security group #{security_group_id} does not exist" end response end diff --git a/lib/fog/compute/openstack/requests/get_security_group_rule.rb b/lib/fog/openstack/compute/requests/get_security_group_rule.rb similarity index 92% rename from lib/fog/compute/openstack/requests/get_security_group_rule.rb rename to lib/fog/openstack/compute/requests/get_security_group_rule.rb index 738eec005..ee52de5fd 100644 --- a/lib/fog/compute/openstack/requests/get_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/get_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_security_group_rule(security_group_rule_id) request( @@ -28,7 +28,7 @@ def get_security_group_rule(security_group_rule_id) "security_group_rule" => security_group_rule } else - raise Fog::Compute::OpenStack::NotFound, "Security group rule #{security_group_rule_id} does not exist" + raise Fog::OpenStack::Compute::NotFound, "Security group rule #{security_group_rule_id} does not exist" end response end diff --git a/lib/fog/compute/openstack/requests/get_server_details.rb b/lib/fog/openstack/compute/requests/get_server_details.rb similarity index 87% rename from lib/fog/compute/openstack/requests/get_server_details.rb rename to lib/fog/openstack/compute/requests/get_server_details.rb index 6a732aad4..28b1405e2 100644 --- a/lib/fog/compute/openstack/requests/get_server_details.rb +++ b/lib/fog/openstack/compute/requests/get_server_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_details(server_id) request( @@ -20,7 +20,7 @@ def get_server_details(server_id) response.body = {'server' => server} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_server_group.rb b/lib/fog/openstack/compute/requests/get_server_group.rb similarity index 96% rename from lib/fog/compute/openstack/requests/get_server_group.rb rename to lib/fog/openstack/compute/requests/get_server_group.rb index df89e5a57..8ebb01cfa 100644 --- a/lib/fog/compute/openstack/requests/get_server_group.rb +++ b/lib/fog/openstack/compute/requests/get_server_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_group(group_id) request( diff --git a/lib/fog/compute/openstack/requests/get_server_password.rb b/lib/fog/openstack/compute/requests/get_server_password.rb similarity index 88% rename from lib/fog/compute/openstack/requests/get_server_password.rb rename to lib/fog/openstack/compute/requests/get_server_password.rb index aebf0ec87..2496f0f10 100644 --- a/lib/fog/compute/openstack/requests/get_server_password.rb +++ b/lib/fog/openstack/compute/requests/get_server_password.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_password(server_id) request( @@ -20,7 +20,7 @@ def get_server_password(server_id) response.body = {'server' => server} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_server_volumes.rb b/lib/fog/openstack/compute/requests/get_server_volumes.rb similarity index 95% rename from lib/fog/compute/openstack/requests/get_server_volumes.rb rename to lib/fog/openstack/compute/requests/get_server_volumes.rb index 0f2117dfb..8322b6709 100644 --- a/lib/fog/compute/openstack/requests/get_server_volumes.rb +++ b/lib/fog/openstack/compute/requests/get_server_volumes.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_server_volumes(server_id) request( diff --git a/lib/fog/compute/openstack/requests/get_snapshot_details.rb b/lib/fog/openstack/compute/requests/get_snapshot_details.rb similarity index 88% rename from lib/fog/compute/openstack/requests/get_snapshot_details.rb rename to lib/fog/openstack/compute/requests/get_snapshot_details.rb index 0ab0c58df..3ec669e6f 100644 --- a/lib/fog/compute/openstack/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/compute/requests/get_snapshot_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_snapshot_details(snapshot_id) request( @@ -21,7 +21,7 @@ def get_snapshot_details(snapshot_id) response.body = {'snapshot' => snapshot} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/get_usage.rb b/lib/fog/openstack/compute/requests/get_usage.rb similarity index 98% rename from lib/fog/compute/openstack/requests/get_usage.rb rename to lib/fog/openstack/compute/requests/get_usage.rb index 5f7908b3f..71428bc6c 100644 --- a/lib/fog/compute/openstack/requests/get_usage.rb +++ b/lib/fog/openstack/compute/requests/get_usage.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_usage(tenant_id, date_start, date_end) params = {} diff --git a/lib/fog/compute/openstack/requests/get_vnc_console.rb b/lib/fog/openstack/compute/requests/get_vnc_console.rb similarity index 97% rename from lib/fog/compute/openstack/requests/get_vnc_console.rb rename to lib/fog/openstack/compute/requests/get_vnc_console.rb index 01e4c3f71..22b387e28 100644 --- a/lib/fog/compute/openstack/requests/get_vnc_console.rb +++ b/lib/fog/openstack/compute/requests/get_vnc_console.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Get a vnc console for an instance. # For microversion < 2.6 as it has been replaced with remote-consoles diff --git a/lib/fog/compute/openstack/requests/get_volume_details.rb b/lib/fog/openstack/compute/requests/get_volume_details.rb similarity index 89% rename from lib/fog/compute/openstack/requests/get_volume_details.rb rename to lib/fog/openstack/compute/requests/get_volume_details.rb index 560290e0f..f7ee4eb4f 100644 --- a/lib/fog/compute/openstack/requests/get_volume_details.rb +++ b/lib/fog/openstack/compute/requests/get_volume_details.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def get_volume_details(volume_id) request( @@ -23,7 +23,7 @@ def get_volume_details(volume_id) response.body = {'volume' => data} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_address_pools.rb b/lib/fog/openstack/compute/requests/list_address_pools.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_address_pools.rb rename to lib/fog/openstack/compute/requests/list_address_pools.rb index 961142b4f..f8998cef3 100644 --- a/lib/fog/compute/openstack/requests/list_address_pools.rb +++ b/lib/fog/openstack/compute/requests/list_address_pools.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_address_pools request( diff --git a/lib/fog/compute/openstack/requests/list_addresses.rb b/lib/fog/openstack/compute/requests/list_addresses.rb similarity index 87% rename from lib/fog/compute/openstack/requests/list_addresses.rb rename to lib/fog/openstack/compute/requests/list_addresses.rb index 994787fb6..1428dc754 100644 --- a/lib/fog/compute/openstack/requests/list_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_addresses(server_id) response.body = {'addresses' => server['addresses']} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_aggregates.rb b/lib/fog/openstack/compute/requests/list_aggregates.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_aggregates.rb rename to lib/fog/openstack/compute/requests/list_aggregates.rb index 2e4dcee21..97c78a034 100644 --- a/lib/fog/compute/openstack/requests/list_aggregates.rb +++ b/lib/fog/openstack/compute/requests/list_aggregates.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_aggregates(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_all_addresses.rb b/lib/fog/openstack/compute/requests/list_all_addresses.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_all_addresses.rb rename to lib/fog/openstack/compute/requests/list_all_addresses.rb index 9c77b74ff..bce5aaf68 100644 --- a/lib/fog/compute/openstack/requests/list_all_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_all_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_all_addresses(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_availability_zones.rb b/lib/fog/openstack/compute/requests/list_availability_zones.rb similarity index 91% rename from lib/fog/compute/openstack/requests/list_availability_zones.rb rename to lib/fog/openstack/compute/requests/list_availability_zones.rb index 274026ae5..c069a6a8c 100644 --- a/lib/fog/compute/openstack/requests/list_availability_zones.rb +++ b/lib/fog/openstack/compute/requests/list_availability_zones.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_availability_zones(options = {}) params = options diff --git a/lib/fog/compute/openstack/requests/list_flavors.rb b/lib/fog/openstack/compute/requests/list_flavors.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_flavors.rb rename to lib/fog/openstack/compute/requests/list_flavors.rb index d8b5d3949..906733b9b 100644 --- a/lib/fog/compute/openstack/requests/list_flavors.rb +++ b/lib/fog/openstack/compute/requests/list_flavors.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_flavors(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_flavors_detail.rb b/lib/fog/openstack/compute/requests/list_flavors_detail.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_flavors_detail.rb rename to lib/fog/openstack/compute/requests/list_flavors_detail.rb index 67ea9e78b..33d1b648c 100644 --- a/lib/fog/compute/openstack/requests/list_flavors_detail.rb +++ b/lib/fog/openstack/compute/requests/list_flavors_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_flavors_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hosts.rb b/lib/fog/openstack/compute/requests/list_hosts.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_hosts.rb rename to lib/fog/openstack/compute/requests/list_hosts.rb index 0f7c4d50b..263368a36 100644 --- a/lib/fog/compute/openstack/requests/list_hosts.rb +++ b/lib/fog/openstack/compute/requests/list_hosts.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hosts(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hypervisor_servers.rb b/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_hypervisor_servers.rb rename to lib/fog/openstack/compute/requests/list_hypervisor_servers.rb index 926def05f..2e704033c 100644 --- a/lib/fog/compute/openstack/requests/list_hypervisor_servers.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hypervisor_servers(hypervisor_id, options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hypervisors.rb b/lib/fog/openstack/compute/requests/list_hypervisors.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_hypervisors.rb rename to lib/fog/openstack/compute/requests/list_hypervisors.rb index ed07af72a..cab7a5813 100644 --- a/lib/fog/compute/openstack/requests/list_hypervisors.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisors.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hypervisors(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_hypervisors_detail.rb b/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_hypervisors_detail.rb rename to lib/fog/openstack/compute/requests/list_hypervisors_detail.rb index 3d1a1ac0a..5840e4ab6 100644 --- a/lib/fog/compute/openstack/requests/list_hypervisors_detail.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_hypervisors_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_images.rb b/lib/fog/openstack/compute/requests/list_images.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_images.rb rename to lib/fog/openstack/compute/requests/list_images.rb index cd467014d..f3faa629e 100644 --- a/lib/fog/compute/openstack/requests/list_images.rb +++ b/lib/fog/openstack/compute/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_images request( diff --git a/lib/fog/compute/openstack/requests/list_images_detail.rb b/lib/fog/openstack/compute/requests/list_images_detail.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_images_detail.rb rename to lib/fog/openstack/compute/requests/list_images_detail.rb index 9e43ebb65..2884a3956 100644 --- a/lib/fog/compute/openstack/requests/list_images_detail.rb +++ b/lib/fog/openstack/compute/requests/list_images_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_images_detail(filters = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_key_pairs.rb b/lib/fog/openstack/compute/requests/list_key_pairs.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_key_pairs.rb rename to lib/fog/openstack/compute/requests/list_key_pairs.rb index 99861421c..40a6cce4e 100644 --- a/lib/fog/compute/openstack/requests/list_key_pairs.rb +++ b/lib/fog/openstack/compute/requests/list_key_pairs.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_key_pairs(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_metadata.rb b/lib/fog/openstack/compute/requests/list_metadata.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_metadata.rb rename to lib/fog/openstack/compute/requests/list_metadata.rb index b1c1a82ae..ea81fe543 100644 --- a/lib/fog/compute/openstack/requests/list_metadata.rb +++ b/lib/fog/openstack/compute/requests/list_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_metadata(collection_name, parent_id) request( diff --git a/lib/fog/compute/openstack/requests/list_os_interfaces.rb b/lib/fog/openstack/compute/requests/list_os_interfaces.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_os_interfaces.rb rename to lib/fog/openstack/compute/requests/list_os_interfaces.rb index 06fa5948b..5e861e098 100644 --- a/lib/fog/compute/openstack/requests/list_os_interfaces.rb +++ b/lib/fog/openstack/compute/requests/list_os_interfaces.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_os_interfaces(server_id) request( diff --git a/lib/fog/compute/openstack/requests/list_private_addresses.rb b/lib/fog/openstack/compute/requests/list_private_addresses.rb similarity index 88% rename from lib/fog/compute/openstack/requests/list_private_addresses.rb rename to lib/fog/openstack/compute/requests/list_private_addresses.rb index ef0c7033e..bc6787503 100644 --- a/lib/fog/compute/openstack/requests/list_private_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_private_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_private_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_private_addresses(server_id) response.body = {'private' => server['addresses']['private']} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_public_addresses.rb b/lib/fog/openstack/compute/requests/list_public_addresses.rb similarity index 88% rename from lib/fog/compute/openstack/requests/list_public_addresses.rb rename to lib/fog/openstack/compute/requests/list_public_addresses.rb index c662f6991..ccc2f0260 100644 --- a/lib/fog/compute/openstack/requests/list_public_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_public_addresses.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_public_addresses(server_id) request( @@ -20,7 +20,7 @@ def list_public_addresses(server_id) response.body = {'public' => server['addresses']['public']} response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/compute/openstack/requests/list_security_groups.rb b/lib/fog/openstack/compute/requests/list_security_groups.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_security_groups.rb rename to lib/fog/openstack/compute/requests/list_security_groups.rb index 1c0dc2a34..f5db8f0d8 100644 --- a/lib/fog/compute/openstack/requests/list_security_groups.rb +++ b/lib/fog/openstack/compute/requests/list_security_groups.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_security_groups(options = {}) path = "os-security-groups" diff --git a/lib/fog/compute/openstack/requests/list_server_groups.rb b/lib/fog/openstack/compute/requests/list_server_groups.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_server_groups.rb rename to lib/fog/openstack/compute/requests/list_server_groups.rb index a69cbd163..642552012 100644 --- a/lib/fog/compute/openstack/requests/list_server_groups.rb +++ b/lib/fog/openstack/compute/requests/list_server_groups.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_server_groups(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_servers.rb b/lib/fog/openstack/compute/requests/list_servers.rb similarity index 95% rename from lib/fog/compute/openstack/requests/list_servers.rb rename to lib/fog/openstack/compute/requests/list_servers.rb index 23df0ea3b..7f8ddddd4 100644 --- a/lib/fog/compute/openstack/requests/list_servers.rb +++ b/lib/fog/openstack/compute/requests/list_servers.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_servers(options = {}) params = options.dup diff --git a/lib/fog/compute/openstack/requests/list_servers_detail.rb b/lib/fog/openstack/compute/requests/list_servers_detail.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_servers_detail.rb rename to lib/fog/openstack/compute/requests/list_servers_detail.rb index e4e4be2ab..0210db8b1 100644 --- a/lib/fog/compute/openstack/requests/list_servers_detail.rb +++ b/lib/fog/openstack/compute/requests/list_servers_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Available filters: name, status, image, flavor, changes_since, reservation_id def list_servers_detail(options = {}) diff --git a/lib/fog/compute/openstack/requests/list_services.rb b/lib/fog/openstack/compute/requests/list_services.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_services.rb rename to lib/fog/openstack/compute/requests/list_services.rb index 74156035e..289d305b6 100644 --- a/lib/fog/compute/openstack/requests/list_services.rb +++ b/lib/fog/openstack/compute/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_services(parameters = nil) request( diff --git a/lib/fog/compute/openstack/requests/list_snapshots.rb b/lib/fog/openstack/compute/requests/list_snapshots.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_snapshots.rb rename to lib/fog/openstack/compute/requests/list_snapshots.rb index f96824f89..9933f80d6 100644 --- a/lib/fog/compute/openstack/requests/list_snapshots.rb +++ b/lib/fog/openstack/compute/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_snapshots(options = true) if options.kind_of?(Hash) diff --git a/lib/fog/compute/openstack/requests/list_snapshots_detail.rb b/lib/fog/openstack/compute/requests/list_snapshots_detail.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_snapshots_detail.rb rename to lib/fog/openstack/compute/requests/list_snapshots_detail.rb index 2bf652454..5acd89803 100644 --- a/lib/fog/compute/openstack/requests/list_snapshots_detail.rb +++ b/lib/fog/openstack/compute/requests/list_snapshots_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_snapshots_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb b/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb rename to lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb index deb7e3cd9..63dc99015 100644 --- a/lib/fog/compute/openstack/requests/list_tenants_with_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_tenants_with_flavor_access(flavor_ref) request( diff --git a/lib/fog/compute/openstack/requests/list_usages.rb b/lib/fog/openstack/compute/requests/list_usages.rb similarity index 97% rename from lib/fog/compute/openstack/requests/list_usages.rb rename to lib/fog/openstack/compute/requests/list_usages.rb index f4d2d7150..aeac14242 100644 --- a/lib/fog/compute/openstack/requests/list_usages.rb +++ b/lib/fog/openstack/compute/requests/list_usages.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_usages(date_start = nil, date_end = nil, detailed = false) params = {} diff --git a/lib/fog/compute/openstack/requests/list_volume_attachments.rb b/lib/fog/openstack/compute/requests/list_volume_attachments.rb similarity index 95% rename from lib/fog/compute/openstack/requests/list_volume_attachments.rb rename to lib/fog/openstack/compute/requests/list_volume_attachments.rb index 3e7f4122c..21bc0298a 100644 --- a/lib/fog/compute/openstack/requests/list_volume_attachments.rb +++ b/lib/fog/openstack/compute/requests/list_volume_attachments.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_volume_attachments(server_id) request( diff --git a/lib/fog/compute/openstack/requests/list_volumes.rb b/lib/fog/openstack/compute/requests/list_volumes.rb similarity index 96% rename from lib/fog/compute/openstack/requests/list_volumes.rb rename to lib/fog/openstack/compute/requests/list_volumes.rb index 91cdd6e88..dacd8aa66 100644 --- a/lib/fog/compute/openstack/requests/list_volumes.rb +++ b/lib/fog/openstack/compute/requests/list_volumes.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_volumes(options = true) if options.kind_of?(Hash) diff --git a/lib/fog/compute/openstack/requests/list_volumes_detail.rb b/lib/fog/openstack/compute/requests/list_volumes_detail.rb similarity index 93% rename from lib/fog/compute/openstack/requests/list_volumes_detail.rb rename to lib/fog/openstack/compute/requests/list_volumes_detail.rb index 8fbb044dc..29316eaf6 100644 --- a/lib/fog/compute/openstack/requests/list_volumes_detail.rb +++ b/lib/fog/openstack/compute/requests/list_volumes_detail.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_volumes_detail(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_zones.rb b/lib/fog/openstack/compute/requests/list_zones.rb similarity index 94% rename from lib/fog/compute/openstack/requests/list_zones.rb rename to lib/fog/openstack/compute/requests/list_zones.rb index f1971c735..50a084be9 100644 --- a/lib/fog/compute/openstack/requests/list_zones.rb +++ b/lib/fog/openstack/compute/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_zones(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/list_zones_detailed.rb b/lib/fog/openstack/compute/requests/list_zones_detailed.rb similarity index 98% rename from lib/fog/compute/openstack/requests/list_zones_detailed.rb rename to lib/fog/openstack/compute/requests/list_zones_detailed.rb index 754f82861..375f70d03 100644 --- a/lib/fog/compute/openstack/requests/list_zones_detailed.rb +++ b/lib/fog/openstack/compute/requests/list_zones_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def list_zones_detailed(options = {}) request( diff --git a/lib/fog/compute/openstack/requests/live_migrate_server.rb b/lib/fog/openstack/compute/requests/live_migrate_server.rb similarity index 94% rename from lib/fog/compute/openstack/requests/live_migrate_server.rb rename to lib/fog/openstack/compute/requests/live_migrate_server.rb index 26bbfe14e..e749a7632 100644 --- a/lib/fog/compute/openstack/requests/live_migrate_server.rb +++ b/lib/fog/openstack/compute/requests/live_migrate_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def live_migrate_server(server_id, host, block_migration, disk_over_commit) body = { diff --git a/lib/fog/compute/openstack/requests/migrate_server.rb b/lib/fog/openstack/compute/requests/migrate_server.rb similarity index 90% rename from lib/fog/compute/openstack/requests/migrate_server.rb rename to lib/fog/openstack/compute/requests/migrate_server.rb index 909d95a10..a4c61fb9a 100644 --- a/lib/fog/compute/openstack/requests/migrate_server.rb +++ b/lib/fog/openstack/compute/requests/migrate_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def migrate_server(server_id) body = {'migrate' => nil} diff --git a/lib/fog/compute/openstack/requests/pause_server.rb b/lib/fog/openstack/compute/requests/pause_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/pause_server.rb rename to lib/fog/openstack/compute/requests/pause_server.rb index a5b8bab7f..77a02c04e 100644 --- a/lib/fog/compute/openstack/requests/pause_server.rb +++ b/lib/fog/openstack/compute/requests/pause_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Pause the server. # diff --git a/lib/fog/compute/openstack/requests/reboot_server.rb b/lib/fog/openstack/compute/requests/reboot_server.rb similarity index 91% rename from lib/fog/compute/openstack/requests/reboot_server.rb rename to lib/fog/openstack/compute/requests/reboot_server.rb index 30cf812d7..8ed24c712 100644 --- a/lib/fog/compute/openstack/requests/reboot_server.rb +++ b/lib/fog/openstack/compute/requests/reboot_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def reboot_server(server_id, type = 'SOFT') body = {'reboot' => {'type' => type}} diff --git a/lib/fog/compute/openstack/requests/rebuild_server.rb b/lib/fog/openstack/compute/requests/rebuild_server.rb similarity index 96% rename from lib/fog/compute/openstack/requests/rebuild_server.rb rename to lib/fog/openstack/compute/requests/rebuild_server.rb index b519620c3..43adb63ec 100644 --- a/lib/fog/compute/openstack/requests/rebuild_server.rb +++ b/lib/fog/openstack/compute/requests/rebuild_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def rebuild_server(server_id, image_ref, name, admin_pass = nil, metadata = nil, personality = nil) body = {'rebuild' => { diff --git a/lib/fog/compute/openstack/requests/release_address.rb b/lib/fog/openstack/compute/requests/release_address.rb similarity index 94% rename from lib/fog/compute/openstack/requests/release_address.rb rename to lib/fog/openstack/compute/requests/release_address.rb index 9b7b68fdb..ee563c5e7 100644 --- a/lib/fog/compute/openstack/requests/release_address.rb +++ b/lib/fog/openstack/compute/requests/release_address.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def release_address(address_id) request( diff --git a/lib/fog/compute/openstack/requests/remote_consoles.rb b/lib/fog/openstack/compute/requests/remote_consoles.rb similarity index 97% rename from lib/fog/compute/openstack/requests/remote_consoles.rb rename to lib/fog/openstack/compute/requests/remote_consoles.rb index 3c869acd0..d4efe40e7 100644 --- a/lib/fog/compute/openstack/requests/remote_consoles.rb +++ b/lib/fog/openstack/compute/requests/remote_consoles.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Get a vnc console for an instance. # For microversion >= 2.6 diff --git a/lib/fog/compute/openstack/requests/remove_aggregate_host.rb b/lib/fog/openstack/compute/requests/remove_aggregate_host.rb similarity index 95% rename from lib/fog/compute/openstack/requests/remove_aggregate_host.rb rename to lib/fog/openstack/compute/requests/remove_aggregate_host.rb index 8a0879f91..9cef36b6b 100644 --- a/lib/fog/compute/openstack/requests/remove_aggregate_host.rb +++ b/lib/fog/openstack/compute/requests/remove_aggregate_host.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def remove_aggregate_host(uuid, host_uuid) data = {'remove_host' => {'host' => host_uuid}} diff --git a/lib/fog/compute/openstack/requests/remove_fixed_ip.rb b/lib/fog/openstack/compute/requests/remove_fixed_ip.rb similarity index 94% rename from lib/fog/compute/openstack/requests/remove_fixed_ip.rb rename to lib/fog/openstack/compute/requests/remove_fixed_ip.rb index ea1024145..d35add92b 100644 --- a/lib/fog/compute/openstack/requests/remove_fixed_ip.rb +++ b/lib/fog/openstack/compute/requests/remove_fixed_ip.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Remove an IP address. # diff --git a/lib/fog/compute/openstack/requests/remove_flavor_access.rb b/lib/fog/openstack/compute/requests/remove_flavor_access.rb similarity index 95% rename from lib/fog/compute/openstack/requests/remove_flavor_access.rb rename to lib/fog/openstack/compute/requests/remove_flavor_access.rb index b26cb94ec..d15628914 100644 --- a/lib/fog/compute/openstack/requests/remove_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/remove_flavor_access.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def remove_flavor_access(flavor_ref, tenant_id) request( diff --git a/lib/fog/compute/openstack/requests/remove_security_group.rb b/lib/fog/openstack/compute/requests/remove_security_group.rb similarity index 91% rename from lib/fog/compute/openstack/requests/remove_security_group.rb rename to lib/fog/openstack/compute/requests/remove_security_group.rb index 9dd118fde..3fabe564a 100644 --- a/lib/fog/compute/openstack/requests/remove_security_group.rb +++ b/lib/fog/openstack/compute/requests/remove_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def remove_security_group(server_id, group_name) body = {'removeSecurityGroup' => {"name" => group_name}} diff --git a/lib/fog/compute/openstack/requests/rescue_server.rb b/lib/fog/openstack/compute/requests/rescue_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/rescue_server.rb rename to lib/fog/openstack/compute/requests/rescue_server.rb index 936926e1e..c23ca54ca 100644 --- a/lib/fog/compute/openstack/requests/rescue_server.rb +++ b/lib/fog/openstack/compute/requests/rescue_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Rescue the server. # diff --git a/lib/fog/compute/openstack/requests/reset_server_state.rb b/lib/fog/openstack/compute/requests/reset_server_state.rb similarity index 92% rename from lib/fog/compute/openstack/requests/reset_server_state.rb rename to lib/fog/openstack/compute/requests/reset_server_state.rb index d70ae954e..5287047f1 100644 --- a/lib/fog/compute/openstack/requests/reset_server_state.rb +++ b/lib/fog/openstack/compute/requests/reset_server_state.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def reset_server_state(server_id, status) body = {'os-resetState' => {'state' => status}} diff --git a/lib/fog/compute/openstack/requests/resize_server.rb b/lib/fog/openstack/compute/requests/resize_server.rb similarity index 91% rename from lib/fog/compute/openstack/requests/resize_server.rb rename to lib/fog/openstack/compute/requests/resize_server.rb index a90f2dde1..e7eea5837 100644 --- a/lib/fog/compute/openstack/requests/resize_server.rb +++ b/lib/fog/openstack/compute/requests/resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def resize_server(server_id, flavor_ref) body = {'resize' => {'flavorRef' => flavor_ref}} diff --git a/lib/fog/compute/openstack/requests/resume_server.rb b/lib/fog/openstack/compute/requests/resume_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/resume_server.rb rename to lib/fog/openstack/compute/requests/resume_server.rb index 44274d381..d33638930 100644 --- a/lib/fog/compute/openstack/requests/resume_server.rb +++ b/lib/fog/openstack/compute/requests/resume_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Resume the server. # diff --git a/lib/fog/compute/openstack/requests/revert_resize_server.rb b/lib/fog/openstack/compute/requests/revert_resize_server.rb similarity index 94% rename from lib/fog/compute/openstack/requests/revert_resize_server.rb rename to lib/fog/openstack/compute/requests/revert_resize_server.rb index 047921122..83fb61b89 100644 --- a/lib/fog/compute/openstack/requests/revert_resize_server.rb +++ b/lib/fog/openstack/compute/requests/revert_resize_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def revert_resize_server(server_id) body = {'revertResize' => nil} diff --git a/lib/fog/compute/openstack/requests/server_action.rb b/lib/fog/openstack/compute/requests/server_action.rb similarity index 89% rename from lib/fog/compute/openstack/requests/server_action.rb rename to lib/fog/openstack/compute/requests/server_action.rb index 99f32c394..e735efd78 100644 --- a/lib/fog/compute/openstack/requests/server_action.rb +++ b/lib/fog/openstack/compute/requests/server_action.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def server_action(server_id, body, expects = [200, 202]) request( diff --git a/lib/fog/compute/openstack/requests/server_actions.rb b/lib/fog/openstack/compute/requests/server_actions.rb similarity index 96% rename from lib/fog/compute/openstack/requests/server_actions.rb rename to lib/fog/openstack/compute/requests/server_actions.rb index 6eb119c50..006fa5301 100644 --- a/lib/fog/compute/openstack/requests/server_actions.rb +++ b/lib/fog/openstack/compute/requests/server_actions.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Retrieve server actions. # diff --git a/lib/fog/compute/openstack/requests/server_diagnostics.rb b/lib/fog/openstack/compute/requests/server_diagnostics.rb similarity index 93% rename from lib/fog/compute/openstack/requests/server_diagnostics.rb rename to lib/fog/openstack/compute/requests/server_diagnostics.rb index d6e6c52a7..45b995693 100644 --- a/lib/fog/compute/openstack/requests/server_diagnostics.rb +++ b/lib/fog/openstack/compute/requests/server_diagnostics.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Retrieve server diagnostics. # diff --git a/lib/fog/compute/openstack/requests/set_metadata.rb b/lib/fog/openstack/compute/requests/set_metadata.rb similarity index 86% rename from lib/fog/compute/openstack/requests/set_metadata.rb rename to lib/fog/openstack/compute/requests/set_metadata.rb index 976c4bd9b..dba2f091d 100644 --- a/lib/fog/compute/openstack/requests/set_metadata.rb +++ b/lib/fog/openstack/compute/requests/set_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def set_metadata(collection_name, parent_id, metadata = {}) request( @@ -16,13 +16,13 @@ class Mock def set_metadata(collection_name, parent_id, metadata = {}) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/set_tenant.rb b/lib/fog/openstack/compute/requests/set_tenant.rb similarity index 88% rename from lib/fog/compute/openstack/requests/set_tenant.rb rename to lib/fog/openstack/compute/requests/set_tenant.rb index 620d74c7e..e3ae500dc 100644 --- a/lib/fog/compute/openstack/requests/set_tenant.rb +++ b/lib/fog/openstack/compute/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/compute/openstack/requests/shelve_offload_server.rb b/lib/fog/openstack/compute/requests/shelve_offload_server.rb similarity index 93% rename from lib/fog/compute/openstack/requests/shelve_offload_server.rb rename to lib/fog/openstack/compute/requests/shelve_offload_server.rb index 045ebfe4d..3964a411c 100644 --- a/lib/fog/compute/openstack/requests/shelve_offload_server.rb +++ b/lib/fog/openstack/compute/requests/shelve_offload_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Shelve Off load the server. Data and resource associations are deleted. # diff --git a/lib/fog/compute/openstack/requests/shelve_server.rb b/lib/fog/openstack/compute/requests/shelve_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/shelve_server.rb rename to lib/fog/openstack/compute/requests/shelve_server.rb index 7ba422f98..c12867981 100644 --- a/lib/fog/compute/openstack/requests/shelve_server.rb +++ b/lib/fog/openstack/compute/requests/shelve_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Shelve the server. # diff --git a/lib/fog/compute/openstack/requests/start_server.rb b/lib/fog/openstack/compute/requests/start_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/start_server.rb rename to lib/fog/openstack/compute/requests/start_server.rb index 1d1286e58..9bcb326e4 100644 --- a/lib/fog/compute/openstack/requests/start_server.rb +++ b/lib/fog/openstack/compute/requests/start_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Start the server. # diff --git a/lib/fog/compute/openstack/requests/stop_server.rb b/lib/fog/openstack/compute/requests/stop_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/stop_server.rb rename to lib/fog/openstack/compute/requests/stop_server.rb index 7addb0bf0..8948bc18f 100644 --- a/lib/fog/compute/openstack/requests/stop_server.rb +++ b/lib/fog/openstack/compute/requests/stop_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Stop the server. # diff --git a/lib/fog/compute/openstack/requests/suspend_server.rb b/lib/fog/openstack/compute/requests/suspend_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/suspend_server.rb rename to lib/fog/openstack/compute/requests/suspend_server.rb index 780b1a5a1..05f8ecb41 100644 --- a/lib/fog/compute/openstack/requests/suspend_server.rb +++ b/lib/fog/openstack/compute/requests/suspend_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Suspend the server. # diff --git a/lib/fog/compute/openstack/requests/unpause_server.rb b/lib/fog/openstack/compute/requests/unpause_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/unpause_server.rb rename to lib/fog/openstack/compute/requests/unpause_server.rb index d60c11d20..69aec04dc 100644 --- a/lib/fog/compute/openstack/requests/unpause_server.rb +++ b/lib/fog/openstack/compute/requests/unpause_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Unpause the server. # diff --git a/lib/fog/compute/openstack/requests/unshelve_server.rb b/lib/fog/openstack/compute/requests/unshelve_server.rb similarity index 92% rename from lib/fog/compute/openstack/requests/unshelve_server.rb rename to lib/fog/openstack/compute/requests/unshelve_server.rb index c5b80b0bb..b8589b04f 100644 --- a/lib/fog/compute/openstack/requests/unshelve_server.rb +++ b/lib/fog/openstack/compute/requests/unshelve_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real # Unshelve the server. # diff --git a/lib/fog/compute/openstack/requests/update_aggregate.rb b/lib/fog/openstack/compute/requests/update_aggregate.rb similarity index 96% rename from lib/fog/compute/openstack/requests/update_aggregate.rb rename to lib/fog/openstack/compute/requests/update_aggregate.rb index ab63235c1..3d0a777b9 100644 --- a/lib/fog/compute/openstack/requests/update_aggregate.rb +++ b/lib/fog/openstack/compute/requests/update_aggregate.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_aggregate(uuid, options = {}) vanilla_options = [:name, :availability_zone] diff --git a/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb b/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb similarity index 95% rename from lib/fog/compute/openstack/requests/update_aggregate_metadata.rb rename to lib/fog/openstack/compute/requests/update_aggregate_metadata.rb index 08b65638e..a1718a93a 100644 --- a/lib/fog/compute/openstack/requests/update_aggregate_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_aggregate_metadata(uuid, metadata = {}) data = {'set_metadata' => {'metadata' => metadata}} diff --git a/lib/fog/compute/openstack/requests/update_flavor_metadata.rb b/lib/fog/openstack/compute/requests/update_flavor_metadata.rb similarity index 95% rename from lib/fog/compute/openstack/requests/update_flavor_metadata.rb rename to lib/fog/openstack/compute/requests/update_flavor_metadata.rb index 1c4b2d835..a63c59c39 100644 --- a/lib/fog/compute/openstack/requests/update_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_flavor_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_flavor_metadata(flavor_ref, key, value) data = {key => value} diff --git a/lib/fog/compute/openstack/requests/update_meta.rb b/lib/fog/openstack/compute/requests/update_meta.rb similarity index 87% rename from lib/fog/compute/openstack/requests/update_meta.rb rename to lib/fog/openstack/compute/requests/update_meta.rb index ba3c71475..0eba6aadf 100644 --- a/lib/fog/compute/openstack/requests/update_meta.rb +++ b/lib/fog/openstack/compute/requests/update_meta.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_meta(collection_name, parent_id, key, value) request( @@ -16,13 +16,13 @@ class Mock def update_meta(collection_name, parent_id, key, value) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/update_metadata.rb b/lib/fog/openstack/compute/requests/update_metadata.rb similarity index 87% rename from lib/fog/compute/openstack/requests/update_metadata.rb rename to lib/fog/openstack/compute/requests/update_metadata.rb index ca7ae6251..18c5af67c 100644 --- a/lib/fog/compute/openstack/requests/update_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_metadata(collection_name, parent_id, metadata = {}) request( @@ -16,13 +16,13 @@ class Mock def update_metadata(collection_name, parent_id, metadata = {}) if collection_name == "images" unless list_images_detail.body['images'].find { |image| image['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end if collection_name == "servers" unless list_servers_detail.body['servers'].find { |server| server['id'] == parent_id } - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end diff --git a/lib/fog/compute/openstack/requests/update_quota.rb b/lib/fog/openstack/compute/requests/update_quota.rb similarity index 94% rename from lib/fog/compute/openstack/requests/update_quota.rb rename to lib/fog/openstack/compute/requests/update_quota.rb index ad518e5bc..7acc88d80 100644 --- a/lib/fog/compute/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/compute/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/compute/openstack/requests/update_server.rb b/lib/fog/openstack/compute/requests/update_server.rb similarity index 89% rename from lib/fog/compute/openstack/requests/update_server.rb rename to lib/fog/openstack/compute/requests/update_server.rb index 482431fc8..5485ad820 100644 --- a/lib/fog/compute/openstack/requests/update_server.rb +++ b/lib/fog/openstack/compute/requests/update_server.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute class Real def update_server(server_id, options = {}) request( @@ -23,7 +23,7 @@ def update_server(server_id, options = {}) response.status = 200 response else - raise Fog::Compute::OpenStack::NotFound + raise Fog::OpenStack::Compute::NotFound end end end diff --git a/lib/fog/container_infra/openstack.rb b/lib/fog/openstack/container_infra/container_infra.rb similarity index 94% rename from lib/fog/container_infra/openstack.rb rename to lib/fog/openstack/container_infra/container_infra.rb index cc5daa073..30a9f1e14 100644 --- a/lib/fog/container_infra/openstack.rb +++ b/lib/fog/openstack/container_infra/container_infra.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack < Fog::Service + module OpenStack + class ContainerInfra < Fog::Service SUPPORTED_VERSIONS = /v1/ SUPPORTED_MICROVERSION = '1.3' @@ -16,7 +16,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/container_infra/openstack/models' + model_path 'fog/openstack/container_infra/models' model :bay collection :bays @@ -29,7 +29,7 @@ class OpenStack < Fog::Service model :cluster_template collection :cluster_templates - request_path 'fog/container_infra/openstack/requests' + request_path 'fog/openstack/container_infra/requests' # Bay CRUD request :create_bay @@ -123,7 +123,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::ContainerInfra::OpenStack::NotFound + Fog::OpenStack::ContainerInfra::NotFound end def default_path_prefix diff --git a/lib/fog/container_infra/openstack/models/base.rb b/lib/fog/openstack/container_infra/models/base.rb similarity index 76% rename from lib/fog/container_infra/openstack/models/base.rb rename to lib/fog/openstack/container_infra/models/base.rb index 265e5ec35..55094626d 100644 --- a/lib/fog/container_infra/openstack/models/base.rb +++ b/lib/fog/openstack/container_infra/models/base.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' module Fog - module ContainerInfra - class OpenStack - class Base < Fog::OpenStack::Model + module OpenStack + class ContainerInfra + class Base < Fog::OpenStack::Model def convert_update_params(params) params = params.map do |key, value| { @@ -11,9 +11,9 @@ def convert_update_params(params) "op" => value ? "replace" : "remove" }.merge(value ? {"value" => value} : {}) end - params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} + params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} end end end end -end \ No newline at end of file +end diff --git a/lib/fog/container_infra/openstack/models/bay.rb b/lib/fog/openstack/container_infra/models/bay.rb similarity index 92% rename from lib/fog/container_infra/openstack/models/bay.rb rename to lib/fog/openstack/container_infra/models/bay.rb index 9465aed9d..5cdc9aa71 100644 --- a/lib/fog/container_infra/openstack/models/bay.rb +++ b/lib/fog/openstack/container_infra/models/bay.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class Bay < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class Bay < Fog::OpenStack::ContainerInfra::Base identity :uuid attribute :api_address diff --git a/lib/fog/container_infra/openstack/models/bay_model.rb b/lib/fog/openstack/container_infra/models/bay_model.rb similarity index 93% rename from lib/fog/container_infra/openstack/models/bay_model.rb rename to lib/fog/openstack/container_infra/models/bay_model.rb index 50bb59a2f..738066630 100644 --- a/lib/fog/container_infra/openstack/models/bay_model.rb +++ b/lib/fog/openstack/container_infra/models/bay_model.rb @@ -1,11 +1,11 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class BayModel < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class BayModel < Fog::OpenStack::ContainerInfra::Base identity :uuid - + attribute :apiserver_port attribute :cluster_distro attribute :coe diff --git a/lib/fog/container_infra/openstack/models/bay_models.rb b/lib/fog/openstack/container_infra/models/bay_models.rb similarity index 64% rename from lib/fog/container_infra/openstack/models/bay_models.rb rename to lib/fog/openstack/container_infra/models/bay_models.rb index 82d9e8395..29e8c9d45 100644 --- a/lib/fog/container_infra/openstack/models/bay_models.rb +++ b/lib/fog/openstack/container_infra/models/bay_models.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/bay_model' +require 'fog/openstack/container_infra/models/bay_model' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class BayModels < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::BayModel + model Fog::OpenStack::ContainerInfra::BayModel def all load_response(service.list_bay_models, 'baymodels') @@ -14,7 +14,7 @@ def all def get(bay_model_uuid_or_name) resource = service.get_bay_model(bay_model_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/bays.rb b/lib/fog/openstack/container_infra/models/bays.rb similarity index 63% rename from lib/fog/container_infra/openstack/models/bays.rb rename to lib/fog/openstack/container_infra/models/bays.rb index 043c39663..03e23e19e 100644 --- a/lib/fog/container_infra/openstack/models/bays.rb +++ b/lib/fog/openstack/container_infra/models/bays.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/bay' +require 'fog/openstack/container_infra/models/bay' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Bays < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::Bay + model Fog::OpenStack::ContainerInfra::Bay def all load_response(service.list_bays, "bays") @@ -14,7 +14,7 @@ def all def get(bay_uuid_or_name) resource = service.get_bay(bay_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/certificate.rb b/lib/fog/openstack/container_infra/models/certificate.rb similarity index 73% rename from lib/fog/container_infra/openstack/models/certificate.rb rename to lib/fog/openstack/container_infra/models/certificate.rb index 7c452bb27..f6f80050f 100644 --- a/lib/fog/container_infra/openstack/models/certificate.rb +++ b/lib/fog/openstack/container_infra/models/certificate.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class Certificate < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class Certificate < Fog::OpenStack::ContainerInfra::Base identity :bay_uuid attribute :pem diff --git a/lib/fog/container_infra/openstack/models/certificates.rb b/lib/fog/openstack/container_infra/models/certificates.rb similarity index 64% rename from lib/fog/container_infra/openstack/models/certificates.rb rename to lib/fog/openstack/container_infra/models/certificates.rb index 74ba7595a..ccd0d7621 100644 --- a/lib/fog/container_infra/openstack/models/certificates.rb +++ b/lib/fog/openstack/container_infra/models/certificates.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/certificate' +require 'fog/openstack/container_infra/models/certificate' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Certificates < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::Certificate + model Fog::OpenStack::ContainerInfra::Certificate def create(bay_uuid) resource = service.create_certificate(bay_uuid).body @@ -16,7 +16,7 @@ def create(bay_uuid) def get(bay_uuid) resource = service.get_certificate(bay_uuid).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/cluster.rb b/lib/fog/openstack/container_infra/models/cluster.rb similarity index 92% rename from lib/fog/container_infra/openstack/models/cluster.rb rename to lib/fog/openstack/container_infra/models/cluster.rb index 63500607f..d9bb73205 100644 --- a/lib/fog/container_infra/openstack/models/cluster.rb +++ b/lib/fog/openstack/container_infra/models/cluster.rb @@ -1,9 +1,9 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class Cluster < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class Cluster < Fog::OpenStack::ContainerInfra::Base identity :uuid attribute :api_address diff --git a/lib/fog/container_infra/openstack/models/cluster_template.rb b/lib/fog/openstack/container_infra/models/cluster_template.rb similarity index 93% rename from lib/fog/container_infra/openstack/models/cluster_template.rb rename to lib/fog/openstack/container_infra/models/cluster_template.rb index 42e60d16c..1b8762970 100644 --- a/lib/fog/container_infra/openstack/models/cluster_template.rb +++ b/lib/fog/openstack/container_infra/models/cluster_template.rb @@ -1,11 +1,11 @@ require_relative 'base' module Fog - module ContainerInfra - class OpenStack - class ClusterTemplate < Fog::ContainerInfra::OpenStack::Base + module OpenStack + class ContainerInfra + class ClusterTemplate < Fog::OpenStack::ContainerInfra::Base identity :uuid - + attribute :apiserver_port attribute :cluster_distro attribute :coe diff --git a/lib/fog/container_infra/openstack/models/cluster_templates.rb b/lib/fog/openstack/container_infra/models/cluster_templates.rb similarity index 65% rename from lib/fog/container_infra/openstack/models/cluster_templates.rb rename to lib/fog/openstack/container_infra/models/cluster_templates.rb index fd549429f..01a2d9e33 100644 --- a/lib/fog/container_infra/openstack/models/cluster_templates.rb +++ b/lib/fog/openstack/container_infra/models/cluster_templates.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/cluster_template' +require 'fog/openstack/container_infra/models/cluster_template' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class ClusterTemplates < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::ClusterTemplate + model Fog::OpenStack::ContainerInfra::ClusterTemplate def all load_response(service.list_cluster_templates, 'clustertemplates') @@ -15,7 +15,7 @@ def all def get(cluster_template_uuid_or_name) resource = service.get_cluster_template(cluster_template_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/models/clusters.rb b/lib/fog/openstack/container_infra/models/clusters.rb similarity index 64% rename from lib/fog/container_infra/openstack/models/clusters.rb rename to lib/fog/openstack/container_infra/models/clusters.rb index 8a8294f22..e0038aa55 100644 --- a/lib/fog/container_infra/openstack/models/clusters.rb +++ b/lib/fog/openstack/container_infra/models/clusters.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/container_infra/openstack/models/cluster' +require 'fog/openstack/container_infra/models/cluster' module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Clusters < Fog::OpenStack::Collection - model Fog::ContainerInfra::OpenStack::Cluster + model Fog::OpenStack::ContainerInfra::Cluster def all load_response(service.list_clusters, "clusters") @@ -15,7 +15,7 @@ def all def get(cluster_uuid_or_name) resource = service.get_cluster(cluster_uuid_or_name).body new(resource) - rescue Fog::ContainerInfra::OpenStack::NotFound + rescue Fog::OpenStack::ContainerInfra::NotFound nil end end diff --git a/lib/fog/container_infra/openstack/requests/create_bay.rb b/lib/fog/openstack/container_infra/requests/create_bay.rb similarity index 92% rename from lib/fog/container_infra/openstack/requests/create_bay.rb rename to lib/fog/openstack/container_infra/requests/create_bay.rb index 82e84e335..1f6e31100 100644 --- a/lib/fog/container_infra/openstack/requests/create_bay.rb +++ b/lib/fog/openstack/container_infra/requests/create_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_bay(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_bay_model.rb b/lib/fog/openstack/container_infra/requests/create_bay_model.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/create_bay_model.rb rename to lib/fog/openstack/container_infra/requests/create_bay_model.rb index e6cac430d..e080810c6 100644 --- a/lib/fog/container_infra/openstack/requests/create_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/create_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_bay_model(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_certificate.rb b/lib/fog/openstack/container_infra/requests/create_certificate.rb similarity index 95% rename from lib/fog/container_infra/openstack/requests/create_certificate.rb rename to lib/fog/openstack/container_infra/requests/create_certificate.rb index 3f9e099da..ce81a2512 100644 --- a/lib/fog/container_infra/openstack/requests/create_certificate.rb +++ b/lib/fog/openstack/container_infra/requests/create_certificate.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_certificate(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_cluster.rb b/lib/fog/openstack/container_infra/requests/create_cluster.rb similarity index 92% rename from lib/fog/container_infra/openstack/requests/create_cluster.rb rename to lib/fog/openstack/container_infra/requests/create_cluster.rb index 046d9f10a..8acd5897a 100644 --- a/lib/fog/container_infra/openstack/requests/create_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/create_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_cluster(params) request( diff --git a/lib/fog/container_infra/openstack/requests/create_cluster_template.rb b/lib/fog/openstack/container_infra/requests/create_cluster_template.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/create_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/create_cluster_template.rb index 92d8ec476..a138fdcee 100644 --- a/lib/fog/container_infra/openstack/requests/create_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/create_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def create_cluster_template(params) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_bay.rb b/lib/fog/openstack/container_infra/requests/delete_bay.rb similarity index 90% rename from lib/fog/container_infra/openstack/requests/delete_bay.rb rename to lib/fog/openstack/container_infra/requests/delete_bay.rb index bda6c49fb..27826933d 100644 --- a/lib/fog/container_infra/openstack/requests/delete_bay.rb +++ b/lib/fog/openstack/container_infra/requests/delete_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_bay(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_bay_model.rb b/lib/fog/openstack/container_infra/requests/delete_bay_model.rb similarity index 91% rename from lib/fog/container_infra/openstack/requests/delete_bay_model.rb rename to lib/fog/openstack/container_infra/requests/delete_bay_model.rb index 37cdff96e..7231738a4 100644 --- a/lib/fog/container_infra/openstack/requests/delete_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/delete_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_bay_model(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_cluster.rb b/lib/fog/openstack/container_infra/requests/delete_cluster.rb similarity index 91% rename from lib/fog/container_infra/openstack/requests/delete_cluster.rb rename to lib/fog/openstack/container_infra/requests/delete_cluster.rb index a72e5f9dd..459649aa4 100644 --- a/lib/fog/container_infra/openstack/requests/delete_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/delete_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_cluster(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/delete_cluster_template.rb b/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb similarity index 91% rename from lib/fog/container_infra/openstack/requests/delete_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/delete_cluster_template.rb index 099a8f3b8..c2b0d16bc 100644 --- a/lib/fog/container_infra/openstack/requests/delete_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def delete_cluster_template(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_bay.rb b/lib/fog/openstack/container_infra/requests/get_bay.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/get_bay.rb rename to lib/fog/openstack/container_infra/requests/get_bay.rb index a0ee1ac4b..77df5b3d0 100644 --- a/lib/fog/container_infra/openstack/requests/get_bay.rb +++ b/lib/fog/openstack/container_infra/requests/get_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_bay(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_bay_model.rb b/lib/fog/openstack/container_infra/requests/get_bay_model.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/get_bay_model.rb rename to lib/fog/openstack/container_infra/requests/get_bay_model.rb index b141c902c..31017b396 100644 --- a/lib/fog/container_infra/openstack/requests/get_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/get_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_bay_model(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_certificate.rb b/lib/fog/openstack/container_infra/requests/get_certificate.rb similarity index 93% rename from lib/fog/container_infra/openstack/requests/get_certificate.rb rename to lib/fog/openstack/container_infra/requests/get_certificate.rb index d5bef95ca..9fff2dcb9 100644 --- a/lib/fog/container_infra/openstack/requests/get_certificate.rb +++ b/lib/fog/openstack/container_infra/requests/get_certificate.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_certificate(bay_uuid) request( diff --git a/lib/fog/container_infra/openstack/requests/get_cluster.rb b/lib/fog/openstack/container_infra/requests/get_cluster.rb similarity index 96% rename from lib/fog/container_infra/openstack/requests/get_cluster.rb rename to lib/fog/openstack/container_infra/requests/get_cluster.rb index da4ea3912..96b9e43c5 100644 --- a/lib/fog/container_infra/openstack/requests/get_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/get_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_cluster(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/get_cluster_template.rb b/lib/fog/openstack/container_infra/requests/get_cluster_template.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/get_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/get_cluster_template.rb index 7670cb159..afe36620c 100644 --- a/lib/fog/container_infra/openstack/requests/get_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/get_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def get_cluster_template(uuid_or_name) request( diff --git a/lib/fog/container_infra/openstack/requests/list_bay_models.rb b/lib/fog/openstack/container_infra/requests/list_bay_models.rb similarity index 98% rename from lib/fog/container_infra/openstack/requests/list_bay_models.rb rename to lib/fog/openstack/container_infra/requests/list_bay_models.rb index 0257dc095..d7faae6c5 100644 --- a/lib/fog/container_infra/openstack/requests/list_bay_models.rb +++ b/lib/fog/openstack/container_infra/requests/list_bay_models.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_bay_models request( diff --git a/lib/fog/container_infra/openstack/requests/list_bays.rb b/lib/fog/openstack/container_infra/requests/list_bays.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/list_bays.rb rename to lib/fog/openstack/container_infra/requests/list_bays.rb index 68d8e37df..784913155 100644 --- a/lib/fog/container_infra/openstack/requests/list_bays.rb +++ b/lib/fog/openstack/container_infra/requests/list_bays.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_bays request( diff --git a/lib/fog/container_infra/openstack/requests/list_cluster_templates.rb b/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb similarity index 98% rename from lib/fog/container_infra/openstack/requests/list_cluster_templates.rb rename to lib/fog/openstack/container_infra/requests/list_cluster_templates.rb index 52436b623..7eb4a3c6d 100644 --- a/lib/fog/container_infra/openstack/requests/list_cluster_templates.rb +++ b/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_cluster_templates request( diff --git a/lib/fog/container_infra/openstack/requests/list_clusters.rb b/lib/fog/openstack/container_infra/requests/list_clusters.rb similarity index 95% rename from lib/fog/container_infra/openstack/requests/list_clusters.rb rename to lib/fog/openstack/container_infra/requests/list_clusters.rb index b81461ecc..8f302f1a0 100644 --- a/lib/fog/container_infra/openstack/requests/list_clusters.rb +++ b/lib/fog/openstack/container_infra/requests/list_clusters.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def list_clusters request( diff --git a/lib/fog/container_infra/openstack/requests/update_bay.rb b/lib/fog/openstack/container_infra/requests/update_bay.rb similarity index 92% rename from lib/fog/container_infra/openstack/requests/update_bay.rb rename to lib/fog/openstack/container_infra/requests/update_bay.rb index 4ed52fc75..306225c7e 100644 --- a/lib/fog/container_infra/openstack/requests/update_bay.rb +++ b/lib/fog/openstack/container_infra/requests/update_bay.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_bay(uuid_or_name, params) request( diff --git a/lib/fog/container_infra/openstack/requests/update_bay_model.rb b/lib/fog/openstack/container_infra/requests/update_bay_model.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/update_bay_model.rb rename to lib/fog/openstack/container_infra/requests/update_bay_model.rb index d08dbaf79..8db575ba8 100644 --- a/lib/fog/container_infra/openstack/requests/update_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/update_bay_model.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_bay_model(uuid_or_name, params) request( diff --git a/lib/fog/container_infra/openstack/requests/update_cluster.rb b/lib/fog/openstack/container_infra/requests/update_cluster.rb similarity index 93% rename from lib/fog/container_infra/openstack/requests/update_cluster.rb rename to lib/fog/openstack/container_infra/requests/update_cluster.rb index d78926f8e..0cc20bb90 100644 --- a/lib/fog/container_infra/openstack/requests/update_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/update_cluster.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_cluster(uuid_or_name, params) request( diff --git a/lib/fog/container_infra/openstack/requests/update_cluster_template.rb b/lib/fog/openstack/container_infra/requests/update_cluster_template.rb similarity index 97% rename from lib/fog/container_infra/openstack/requests/update_cluster_template.rb rename to lib/fog/openstack/container_infra/requests/update_cluster_template.rb index c0b85f0e6..78e8cbf66 100644 --- a/lib/fog/container_infra/openstack/requests/update_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/update_cluster_template.rb @@ -1,6 +1,6 @@ module Fog - module ContainerInfra - class OpenStack + module OpenStack + class ContainerInfra class Real def update_cluster_template(uuid_or_name, params) request( diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index a0ad1f9c0..d013838a3 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -19,7 +19,7 @@ module Core # fallback def self.not_found_class - Fog::Compute::OpenStack::NotFound + Fog::OpenStack::Compute::NotFound end def credentials diff --git a/lib/fog/openstack/dns/dns.rb b/lib/fog/openstack/dns/dns.rb new file mode 100644 index 000000000..34a072a1a --- /dev/null +++ b/lib/fog/openstack/dns/dns.rb @@ -0,0 +1,21 @@ +module Fog + module OpenStack + class DNS < Fog::Service + autoload :V1, 'fog/openstack/dns/v1' + autoload :V2, 'fog/openstack/dns/v2' + + # Fog::OpenStack::DNS.new() will return a Fog::OpenStack::DNS::V2 or a Fog::OpenStack::DNS::V1, + # choosing the latest available + def self.new(args = {}) + @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] + if inspect == 'Fog::OpenStack::DNS' + service = Fog::OpenStack::DNS::V2.new(args) unless args.empty? + service ||= Fog::OpenStack::DNS::V1.new(args) + else + service = Fog::Service.new(args) + end + service + end + end + end +end diff --git a/lib/fog/dns/openstack/v1.rb b/lib/fog/openstack/dns/v1.rb similarity index 96% rename from lib/fog/dns/openstack/v1.rb rename to lib/fog/openstack/dns/v1.rb index f42dda83b..e645d5258 100644 --- a/lib/fog/dns/openstack/v1.rb +++ b/lib/fog/openstack/dns/v1.rb @@ -1,8 +1,8 @@ -require 'fog/dns/openstack' +require 'fog/openstack/dns/dns' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -16,7 +16,7 @@ class V1 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - request_path 'fog/dns/openstack/v1/requests' + request_path 'fog/openstack/dns/v1/requests' request :list_domains @@ -99,7 +99,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::DNS::OpenStack::NotFound + Fog::OpenStack::DNS::NotFound end def default_path_prefix diff --git a/lib/fog/dns/openstack/v1/requests/get_quota.rb b/lib/fog/openstack/dns/v1/requests/get_quota.rb similarity index 94% rename from lib/fog/dns/openstack/v1/requests/get_quota.rb rename to lib/fog/openstack/dns/v1/requests/get_quota.rb index ac9fe7c24..38df7615a 100644 --- a/lib/fog/dns/openstack/v1/requests/get_quota.rb +++ b/lib/fog/openstack/dns/v1/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 class Real def get_quota(project_id) diff --git a/lib/fog/dns/openstack/v1/requests/list_domains.rb b/lib/fog/openstack/dns/v1/requests/list_domains.rb similarity index 94% rename from lib/fog/dns/openstack/v1/requests/list_domains.rb rename to lib/fog/openstack/dns/v1/requests/list_domains.rb index 41cefa46c..57e2db2c2 100644 --- a/lib/fog/dns/openstack/v1/requests/list_domains.rb +++ b/lib/fog/openstack/dns/v1/requests/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 class Real def list_domains(options = {}) diff --git a/lib/fog/dns/openstack/v1/requests/update_quota.rb b/lib/fog/openstack/dns/v1/requests/update_quota.rb similarity index 95% rename from lib/fog/dns/openstack/v1/requests/update_quota.rb rename to lib/fog/openstack/dns/v1/requests/update_quota.rb index f19519163..0009f6e74 100644 --- a/lib/fog/dns/openstack/v1/requests/update_quota.rb +++ b/lib/fog/openstack/dns/v1/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V1 class Real def update_quota(project_id, options = {}) diff --git a/lib/fog/dns/openstack/v2.rb b/lib/fog/openstack/dns/v2.rb similarity index 98% rename from lib/fog/dns/openstack/v2.rb rename to lib/fog/openstack/dns/v2.rb index 35cf9cfa3..8be50f1d6 100644 --- a/lib/fog/dns/openstack/v2.rb +++ b/lib/fog/openstack/dns/v2.rb @@ -1,8 +1,8 @@ -require 'fog/dns/openstack' +require 'fog/openstack/dns/dns' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -18,7 +18,7 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - model_path 'fog/dns/openstack/v2/models' + model_path 'fog/openstack/dns/v2/models' model :zone collection :zones model :recordset @@ -30,7 +30,7 @@ class V2 < Fog::Service model :zone_transfer_accept collection :zone_transfer_accepts - request_path 'fog/dns/openstack/v2/requests' + request_path 'fog/openstack/dns/v2/requests' request :list_zones request :get_zone @@ -308,7 +308,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::DNS::OpenStack::NotFound + Fog::OpenStack::DNS::NotFound end def default_path_prefix diff --git a/lib/fog/dns/openstack/v2/models/pool.rb b/lib/fog/openstack/dns/v2/models/pool.rb similarity index 92% rename from lib/fog/dns/openstack/v2/models/pool.rb rename to lib/fog/openstack/dns/v2/models/pool.rb index c9cd85ae7..d390a4576 100644 --- a/lib/fog/dns/openstack/v2/models/pool.rb +++ b/lib/fog/openstack/dns/v2/models/pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Pool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/pools.rb b/lib/fog/openstack/dns/v2/models/pools.rb similarity index 79% rename from lib/fog/dns/openstack/v2/models/pools.rb rename to lib/fog/openstack/dns/v2/models/pools.rb index bdf41c66b..4c81a4118 100644 --- a/lib/fog/dns/openstack/v2/models/pools.rb +++ b/lib/fog/openstack/dns/v2/models/pools.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/pool' +require 'fog/openstack/dns/v2/models/pool' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Pools < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::Pool + model Fog::OpenStack::DNS::V2::Pool def all(options = {}) load_response(service.list_pools(options), 'pools') diff --git a/lib/fog/dns/openstack/v2/models/recordset.rb b/lib/fog/openstack/dns/v2/models/recordset.rb similarity index 97% rename from lib/fog/dns/openstack/v2/models/recordset.rb rename to lib/fog/openstack/dns/v2/models/recordset.rb index ad3f685ab..fca03eaf0 100644 --- a/lib/fog/dns/openstack/v2/models/recordset.rb +++ b/lib/fog/openstack/dns/v2/models/recordset.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Recordset < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/recordsets.rb b/lib/fog/openstack/dns/v2/models/recordsets.rb similarity index 83% rename from lib/fog/dns/openstack/v2/models/recordsets.rb rename to lib/fog/openstack/dns/v2/models/recordsets.rb index ab6584b54..293b56d29 100644 --- a/lib/fog/dns/openstack/v2/models/recordsets.rb +++ b/lib/fog/openstack/dns/v2/models/recordsets.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/recordset' +require 'fog/openstack/dns/v2/models/recordset' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Recordsets < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::Recordset + model Fog::OpenStack::DNS::V2::Recordset def all(options = {}) load_response(service.list_recordsets(options), 'recordsets') diff --git a/lib/fog/dns/openstack/v2/models/zone.rb b/lib/fog/openstack/dns/v2/models/zone.rb similarity index 97% rename from lib/fog/dns/openstack/v2/models/zone.rb rename to lib/fog/openstack/dns/v2/models/zone.rb index 9e5fae992..3fc16d48f 100644 --- a/lib/fog/dns/openstack/v2/models/zone.rb +++ b/lib/fog/openstack/dns/v2/models/zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Zone < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb similarity index 95% rename from lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb index 3d27da7a7..42931fc7f 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_accept.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferAccept < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb similarity index 77% rename from lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb index 2dceaa807..5a68159c7 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_accepts.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/zone_transfer_accept' +require 'fog/openstack/dns/v2/models/zone_transfer_accept' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferAccepts < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::ZoneTransferAccept + model Fog::OpenStack::DNS::V2::ZoneTransferAccept def all(options = {}) load_response(service.list_zone_transfer_accepts(options), 'transfer_accepts') diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_request.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb similarity index 97% rename from lib/fog/dns/openstack/v2/models/zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_request.rb index 67c3b05ce..5610145d0 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferRequest < Fog::OpenStack::Model identity :id diff --git a/lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb similarity index 80% rename from lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb rename to lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb index 09da75767..66d4323b6 100644 --- a/lib/fog/dns/openstack/v2/models/zone_transfer_requests.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/zone_transfer_request' +require 'fog/openstack/dns/v2/models/zone_transfer_request' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class ZoneTransferRequests < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::ZoneTransferRequest + model Fog::OpenStack::DNS::V2::ZoneTransferRequest def all(options = {}) load_response(service.list_zone_transfer_requests(options), 'transfer_requests') diff --git a/lib/fog/dns/openstack/v2/models/zones.rb b/lib/fog/openstack/dns/v2/models/zones.rb similarity index 82% rename from lib/fog/dns/openstack/v2/models/zones.rb rename to lib/fog/openstack/dns/v2/models/zones.rb index 150ee1135..132cff248 100644 --- a/lib/fog/dns/openstack/v2/models/zones.rb +++ b/lib/fog/openstack/dns/v2/models/zones.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/dns/openstack/v2/models/zone' +require 'fog/openstack/dns/v2/models/zone' module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Zones < Fog::OpenStack::Collection - model Fog::DNS::OpenStack::V2::Zone + model Fog::OpenStack::DNS::V2::Zone def all(options = {}) load_response(service.list_zones(options), 'zones') diff --git a/lib/fog/dns/openstack/v2/requests/create_recordset.rb b/lib/fog/openstack/dns/v2/requests/create_recordset.rb similarity index 97% rename from lib/fog/dns/openstack/v2/requests/create_recordset.rb rename to lib/fog/openstack/dns/v2/requests/create_recordset.rb index fe508fe31..d489b2698 100644 --- a/lib/fog/dns/openstack/v2/requests/create_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/create_recordset.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_recordset(zone_id, name, type, records, options = {}) diff --git a/lib/fog/dns/openstack/v2/requests/create_zone.rb b/lib/fog/openstack/dns/v2/requests/create_zone.rb similarity index 97% rename from lib/fog/dns/openstack/v2/requests/create_zone.rb rename to lib/fog/openstack/dns/v2/requests/create_zone.rb index 5346e8e89..311e72847 100644 --- a/lib/fog/dns/openstack/v2/requests/create_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_zone(name, email, options = {}) diff --git a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb similarity index 90% rename from lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb rename to lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb index 1f7db40f2..1b71288f3 100644 --- a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) @@ -9,7 +9,7 @@ def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) :zone_transfer_request_id => zone_transfer_request_id } - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :headers => headers, diff --git a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb similarity index 96% rename from lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb index ce51ea8c8..ba435a7ee 100644 --- a/lib/fog/dns/openstack/v2/requests/create_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def create_zone_transfer_request(zone_id, options = {}) diff --git a/lib/fog/dns/openstack/v2/requests/delete_recordset.rb b/lib/fog/openstack/dns/v2/requests/delete_recordset.rb similarity index 91% rename from lib/fog/dns/openstack/v2/requests/delete_recordset.rb rename to lib/fog/openstack/dns/v2/requests/delete_recordset.rb index 3a600ad48..4ea01a619 100644 --- a/lib/fog/dns/openstack/v2/requests/delete_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_recordset.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def delete_recordset(zone_id, id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 202, :method => 'DELETE', diff --git a/lib/fog/dns/openstack/v2/requests/delete_zone.rb b/lib/fog/openstack/dns/v2/requests/delete_zone.rb similarity index 89% rename from lib/fog/dns/openstack/v2/requests/delete_zone.rb rename to lib/fog/openstack/dns/v2/requests/delete_zone.rb index 5574255a9..566b8ed81 100644 --- a/lib/fog/dns/openstack/v2/requests/delete_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_zone.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def delete_zone(id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 202, :method => 'DELETE', diff --git a/lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb index c2b9799be..957dc5f8b 100644 --- a/lib/fog/dns/openstack/v2/requests/delete_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def delete_zone_transfer_request(zone_transfer_request_id) diff --git a/lib/fog/dns/openstack/v2/requests/get_pool.rb b/lib/fog/openstack/dns/v2/requests/get_pool.rb similarity index 86% rename from lib/fog/dns/openstack/v2/requests/get_pool.rb rename to lib/fog/openstack/dns/v2/requests/get_pool.rb index 4a825b3f7..780a6b19a 100644 --- a/lib/fog/dns/openstack/v2/requests/get_pool.rb +++ b/lib/fog/openstack/dns/v2/requests/get_pool.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_pool(id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/dns/openstack/v2/requests/get_quota.rb b/lib/fog/openstack/dns/v2/requests/get_quota.rb similarity index 86% rename from lib/fog/dns/openstack/v2/requests/get_quota.rb rename to lib/fog/openstack/dns/v2/requests/get_quota.rb index 3ad2f700f..584af54a8 100644 --- a/lib/fog/dns/openstack/v2/requests/get_quota.rb +++ b/lib/fog/openstack/dns/v2/requests/get_quota.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_quota(project_id = nil) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(:all_projects => !project_id.nil?) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(:all_projects => !project_id.nil?) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/get_recordset.rb b/lib/fog/openstack/dns/v2/requests/get_recordset.rb similarity index 91% rename from lib/fog/dns/openstack/v2/requests/get_recordset.rb rename to lib/fog/openstack/dns/v2/requests/get_recordset.rb index 2bc1dad50..2d8c64a60 100644 --- a/lib/fog/dns/openstack/v2/requests/get_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/get_recordset.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_recordset(zone_id, id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/dns/openstack/v2/requests/get_zone.rb b/lib/fog/openstack/dns/v2/requests/get_zone.rb similarity index 86% rename from lib/fog/dns/openstack/v2/requests/get_zone.rb rename to lib/fog/openstack/dns/v2/requests/get_zone.rb index 75ab7c2dc..ab0f42b8e 100644 --- a/lib/fog/dns/openstack/v2/requests/get_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_zone(id, options = {}) - headers, _options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, :method => 'GET', diff --git a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb similarity index 95% rename from lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb rename to lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb index 36c69e021..a4c57d490 100644 --- a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_zone_transfer_accept(zone_transfer_accept_id) diff --git a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb similarity index 95% rename from lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb index 33b138330..d98e1a36a 100644 --- a/lib/fog/dns/openstack/v2/requests/get_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb @@ -1,7 +1,7 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def get_zone_transfer_request(zone_transfer_request_id) diff --git a/lib/fog/dns/openstack/v2/requests/list_pools.rb b/lib/fog/openstack/dns/v2/requests/list_pools.rb similarity index 85% rename from lib/fog/dns/openstack/v2/requests/list_pools.rb rename to lib/fog/openstack/dns/v2/requests/list_pools.rb index 009e03372..5e30111e6 100644 --- a/lib/fog/dns/openstack/v2/requests/list_pools.rb +++ b/lib/fog/openstack/dns/v2/requests/list_pools.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_pools(options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/list_recordsets.rb b/lib/fog/openstack/dns/v2/requests/list_recordsets.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/list_recordsets.rb rename to lib/fog/openstack/dns/v2/requests/list_recordsets.rb index d67bf213c..8f46c4d17 100644 --- a/lib/fog/dns/openstack/v2/requests/list_recordsets.rb +++ b/lib/fog/openstack/dns/v2/requests/list_recordsets.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_recordsets(zone_id = nil, options = {}) @@ -19,7 +19,7 @@ def list_recordsets(zone_id = nil, options = {}) zone_id = options.delete(:zone_id) if zone_id.nil? path = zone_id.nil? ? 'recordsets' : "zones/#{zone_id}/recordsets" - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb rename to lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb index 09e96e807..d326b401f 100644 --- a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_accepts.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_zone_transfer_accepts(options={}) diff --git a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb similarity index 94% rename from lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb rename to lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb index 4c3d8a635..8357c0f86 100644 --- a/lib/fog/dns/openstack/v2/requests/list_zone_transfer_requests.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_zone_transfer_requests(options={}) diff --git a/lib/fog/dns/openstack/v2/requests/list_zones.rb b/lib/fog/openstack/dns/v2/requests/list_zones.rb similarity index 85% rename from lib/fog/dns/openstack/v2/requests/list_zones.rb rename to lib/fog/openstack/dns/v2/requests/list_zones.rb index 9f0a54173..498494700 100644 --- a/lib/fog/dns/openstack/v2/requests/list_zones.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zones.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def list_zones(options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :expects => 200, diff --git a/lib/fog/dns/openstack/v2/requests/update_quota.rb b/lib/fog/openstack/dns/v2/requests/update_quota.rb similarity index 89% rename from lib/fog/dns/openstack/v2/requests/update_quota.rb rename to lib/fog/openstack/dns/v2/requests/update_quota.rb index bacac48cd..3431c7988 100644 --- a/lib/fog/dns/openstack/v2/requests/update_quota.rb +++ b/lib/fog/openstack/dns/v2/requests/update_quota.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_quota(project_id, options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/dns/openstack/v2/requests/update_recordset.rb b/lib/fog/openstack/dns/v2/requests/update_recordset.rb similarity index 92% rename from lib/fog/dns/openstack/v2/requests/update_recordset.rb rename to lib/fog/openstack/dns/v2/requests/update_recordset.rb index 460753d92..654c4e2cd 100644 --- a/lib/fog/dns/openstack/v2/requests/update_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/update_recordset.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_recordset(zone_id, id, options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/dns/openstack/v2/requests/update_zone.rb b/lib/fog/openstack/dns/v2/requests/update_zone.rb similarity index 91% rename from lib/fog/dns/openstack/v2/requests/update_zone.rb rename to lib/fog/openstack/dns/v2/requests/update_zone.rb index d592a1911..345eaeab6 100644 --- a/lib/fog/dns/openstack/v2/requests/update_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/update_zone.rb @@ -1,10 +1,10 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_zone(id, options = {}) - headers, options = Fog::DNS::OpenStack::V2.setup_headers(options) + headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( :body => Fog::JSON.encode(options), diff --git a/lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb similarity index 97% rename from lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb rename to lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb index bf99ca8c7..61980f621 100644 --- a/lib/fog/dns/openstack/v2/requests/update_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb @@ -1,6 +1,6 @@ module Fog - module DNS - class OpenStack + module OpenStack + class DNS class V2 class Real def update_zone_transfer_request(zone_transfer_request_id,description,options={}) diff --git a/lib/fog/event/openstack.rb b/lib/fog/openstack/event/event.rb similarity index 93% rename from lib/fog/event/openstack.rb rename to lib/fog/openstack/event/event.rb index 5317ecacd..b03b41593 100644 --- a/lib/fog/event/openstack.rb +++ b/lib/fog/openstack/event/event.rb @@ -1,6 +1,6 @@ module Fog - module Event - class OpenStack < Fog::Service + module OpenStack + class Event < Fog::Service SUPPORTED_VERSIONS = /v2/ requires :openstack_auth_url @@ -15,12 +15,12 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/event/openstack/models' + model_path 'fog/openstack/event/models' model :event collection :events - request_path 'fog/event/openstack/requests' + request_path 'fog/openstack/event/requests' request :get_event request :list_events @@ -85,7 +85,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Event::OpenStack::NotFound + Fog::OpenStack::Event::NotFound end def default_path_prefix diff --git a/lib/fog/event/openstack/models/event.rb b/lib/fog/openstack/event/models/event.rb similarity index 88% rename from lib/fog/event/openstack/models/event.rb rename to lib/fog/openstack/event/models/event.rb index fffa54856..29c04a05a 100644 --- a/lib/fog/event/openstack/models/event.rb +++ b/lib/fog/openstack/event/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Event - class OpenStack + module OpenStack + class Event class Event < Fog::OpenStack::Model identity :message_id diff --git a/lib/fog/event/openstack/models/events.rb b/lib/fog/openstack/event/models/events.rb similarity index 67% rename from lib/fog/event/openstack/models/events.rb rename to lib/fog/openstack/event/models/events.rb index 4dace3546..d8680c0b1 100644 --- a/lib/fog/event/openstack/models/events.rb +++ b/lib/fog/openstack/event/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/event/openstack/models/event' +require 'fog/openstack/event/models/event' module Fog - module Event - class OpenStack + module OpenStack + class Event class Events < Fog::OpenStack::Collection - model Fog::Event::OpenStack::Event + model Fog::OpenStack::Event::Event def all(q = []) load_response(service.list_events(q)) @@ -14,7 +14,7 @@ def all(q = []) def find_by_id(message_id) event = service.get_event(message_id).body new(event) - rescue Fog::Event::OpenStack::NotFound + rescue Fog::OpenStack::Event::NotFound nil end end diff --git a/lib/fog/event/openstack/requests/get_event.rb b/lib/fog/openstack/event/requests/get_event.rb similarity index 94% rename from lib/fog/event/openstack/requests/get_event.rb rename to lib/fog/openstack/event/requests/get_event.rb index 04bb58c66..86c28f7e6 100644 --- a/lib/fog/event/openstack/requests/get_event.rb +++ b/lib/fog/openstack/event/requests/get_event.rb @@ -1,6 +1,6 @@ module Fog - module Event - class OpenStack + module OpenStack + class Event class Real def get_event(message_id) request( diff --git a/lib/fog/event/openstack/requests/list_events.rb b/lib/fog/openstack/event/requests/list_events.rb similarity index 96% rename from lib/fog/event/openstack/requests/list_events.rb rename to lib/fog/openstack/event/requests/list_events.rb index 679a3586f..8172f75f8 100644 --- a/lib/fog/event/openstack/requests/list_events.rb +++ b/lib/fog/openstack/event/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module Event - class OpenStack + module OpenStack + class Event class Real def list_events(options = []) data = { diff --git a/lib/fog/identity/openstack.rb b/lib/fog/openstack/identity/identity.rb similarity index 85% rename from lib/fog/identity/openstack.rb rename to lib/fog/openstack/identity/identity.rb index f657f6be4..cdbd4fca6 100644 --- a/lib/fog/identity/openstack.rb +++ b/lib/fog/openstack/identity/identity.rb @@ -1,8 +1,8 @@ module Fog - module Identity - class OpenStack < Fog::Service - autoload :V2, 'fog/identity/openstack/v2' - autoload :V3, 'fog/identity/openstack/v3' + module OpenStack + class Identity < Fog::Service + autoload :V2, 'fog/openstack/identity/v2' + autoload :V3, 'fog/openstack/identity/v3' def self.new(args = {}) version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i @@ -25,9 +25,9 @@ def self.new(args = {}) case version when '2.0' - Fog::Identity::OpenStack::V2.new(args) + Fog::OpenStack::Identity::V2.new(args) else - Fog::Identity::OpenStack::V3.new(args) + Fog::OpenStack::Identity::V3.new(args) end end @@ -44,7 +44,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Identity::OpenStack::NotFound + Fog::OpenStack::Identity::NotFound end def config_service? diff --git a/lib/fog/identity/openstack/v2.rb b/lib/fog/openstack/identity/v2.rb similarity index 96% rename from lib/fog/identity/openstack/v2.rb rename to lib/fog/openstack/identity/v2.rb index 0eedb7b53..0ec570f2d 100644 --- a/lib/fog/identity/openstack/v2.rb +++ b/lib/fog/openstack/identity/v2.rb @@ -1,8 +1,8 @@ -require 'fog/identity/openstack' +require 'fog/openstack/identity/identity' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -16,7 +16,7 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :no_path_prefix - model_path 'fog/identity/openstack/v2/models' + model_path 'fog/openstack/identity/v2/models' model :tenant collection :tenants model :user @@ -26,7 +26,7 @@ class V2 < Fog::Service model :ec2_credential collection :ec2_credentials - request_path 'fog/identity/openstack/v2/requests' + request_path 'fog/openstack/identity/v2/requests' request :check_token request :validate_token @@ -168,7 +168,7 @@ def credentials end end - class Real < Fog::Identity::OpenStack::Real + class Real < Fog::OpenStack::Identity::Real def initialize(args) @path_prefix = if args[:no_path_prefix] '' diff --git a/lib/fog/identity/openstack/v2/models/ec2_credential.rb b/lib/fog/openstack/identity/v2/models/ec2_credential.rb similarity index 95% rename from lib/fog/identity/openstack/v2/models/ec2_credential.rb rename to lib/fog/openstack/identity/v2/models/ec2_credential.rb index 5b3098786..705022df7 100644 --- a/lib/fog/identity/openstack/v2/models/ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/models/ec2_credential.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Ec2Credential < Fog::OpenStack::Model identity :access, :aliases => 'access_key' diff --git a/lib/fog/identity/openstack/v2/models/ec2_credentials.rb b/lib/fog/openstack/identity/v2/models/ec2_credentials.rb similarity index 85% rename from lib/fog/identity/openstack/v2/models/ec2_credentials.rb rename to lib/fog/openstack/identity/v2/models/ec2_credentials.rb index f9d92bc33..8036608ab 100644 --- a/lib/fog/identity/openstack/v2/models/ec2_credentials.rb +++ b/lib/fog/openstack/identity/v2/models/ec2_credentials.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/ec2_credential' +require 'fog/openstack/identity/v2/models/ec2_credential' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Ec2Credentials < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::Ec2Credential + model Fog::OpenStack::Identity::V2::Ec2Credential attribute :user @@ -44,7 +44,7 @@ def find_by_access_key(access_key) body = response.body['credential'] body = body.merge 'service' => service - ec2_credential = Fog::Identity::OpenStack::V2::EC2Credential.new(body) + ec2_credential = Fog::OpenStack::Identity::V2::EC2Credential.new(body) end ec2_credential diff --git a/lib/fog/identity/openstack/v2/models/role.rb b/lib/fog/openstack/identity/v2/models/role.rb similarity index 97% rename from lib/fog/identity/openstack/v2/models/role.rb rename to lib/fog/openstack/identity/v2/models/role.rb index 683d701f3..3d428b556 100644 --- a/lib/fog/identity/openstack/v2/models/role.rb +++ b/lib/fog/openstack/identity/v2/models/role.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Role < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v2/models/roles.rb b/lib/fog/openstack/identity/v2/models/roles.rb similarity index 71% rename from lib/fog/identity/openstack/v2/models/roles.rb rename to lib/fog/openstack/identity/v2/models/roles.rb index 893cbe266..4da71e466 100644 --- a/lib/fog/identity/openstack/v2/models/roles.rb +++ b/lib/fog/openstack/identity/v2/models/roles.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/role' +require 'fog/openstack/identity/v2/models/role' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Roles < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::Role + model Fog::OpenStack::Identity::V2::Role def all(options = {}) load_response(service.list_roles(options), 'roles') diff --git a/lib/fog/identity/openstack/v2/models/tenant.rb b/lib/fog/openstack/identity/v2/models/tenant.rb similarity index 97% rename from lib/fog/identity/openstack/v2/models/tenant.rb rename to lib/fog/openstack/identity/v2/models/tenant.rb index c24c7e022..280bbfb36 100644 --- a/lib/fog/identity/openstack/v2/models/tenant.rb +++ b/lib/fog/openstack/identity/v2/models/tenant.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Tenant < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v2/models/tenants.rb b/lib/fog/openstack/identity/v2/models/tenants.rb similarity index 77% rename from lib/fog/identity/openstack/v2/models/tenants.rb rename to lib/fog/openstack/identity/v2/models/tenants.rb index e74a16bb5..d779676ef 100644 --- a/lib/fog/identity/openstack/v2/models/tenants.rb +++ b/lib/fog/openstack/identity/v2/models/tenants.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/tenant' +require 'fog/openstack/identity/v2/models/tenant' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Tenants < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::Tenant + model Fog::OpenStack::Identity::V2::Tenant def all(options = {}) load_response(service.list_tenants(options), 'tenants') @@ -16,7 +16,7 @@ def find_by_id(id) cached_tenant = find { |tenant| tenant.id == id } return cached_tenant if cached_tenant tenant_hash = service.get_tenant(id).body['tenant'] - Fog::Identity::OpenStack::V2::Tenant.new( + Fog::OpenStack::Identity::V2::Tenant.new( tenant_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v2/models/user.rb b/lib/fog/openstack/identity/v2/models/user.rb similarity index 97% rename from lib/fog/identity/openstack/v2/models/user.rb rename to lib/fog/openstack/identity/v2/models/user.rb index da35cb819..df4740127 100644 --- a/lib/fog/identity/openstack/v2/models/user.rb +++ b/lib/fog/openstack/identity/v2/models/user.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class User < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v2/models/users.rb b/lib/fog/openstack/identity/v2/models/users.rb similarity index 78% rename from lib/fog/identity/openstack/v2/models/users.rb rename to lib/fog/openstack/identity/v2/models/users.rb index 40c17d228..7aa1f67de 100644 --- a/lib/fog/identity/openstack/v2/models/users.rb +++ b/lib/fog/openstack/identity/v2/models/users.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v2/models/user' +require 'fog/openstack/identity/v2/models/user' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Users < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V2::User + model Fog::OpenStack::Identity::V2::User attribute :tenant_id @@ -18,7 +18,7 @@ def all(options = {}) def find_by_id(id) find { |user| user.id == id } || - Fog::Identity::OpenStack::V2::User.new( + Fog::OpenStack::Identity::V2::User.new( service.get_user_by_id(id).body['user'].merge( 'service' => service ) @@ -27,7 +27,7 @@ def find_by_id(id) def find_by_name(name) find { |user| user.name == name } || - Fog::Identity::OpenStack::V2::User.new( + Fog::OpenStack::Identity::V2::User.new( service.get_user_by_name(name).body['user'].merge( 'service' => service ) diff --git a/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb b/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb similarity index 96% rename from lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb rename to lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb index 3926b7e1e..4674a5ed6 100644 --- a/lib/fog/identity/openstack/v2/requests/add_user_to_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def add_user_to_tenant(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/check_token.rb b/lib/fog/openstack/identity/v2/requests/check_token.rb similarity index 92% rename from lib/fog/identity/openstack/v2/requests/check_token.rb rename to lib/fog/openstack/identity/v2/requests/check_token.rb index cf38bdb70..15b234fe8 100644 --- a/lib/fog/identity/openstack/v2/requests/check_token.rb +++ b/lib/fog/openstack/identity/v2/requests/check_token.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def check_token(token_id, tenant_id = nil) diff --git a/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb similarity index 97% rename from lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb rename to lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb index ee014ae26..ffe19f619 100644 --- a/lib/fog/identity/openstack/v2/requests/create_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## diff --git a/lib/fog/identity/openstack/v2/requests/create_role.rb b/lib/fog/openstack/identity/v2/requests/create_role.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/create_role.rb rename to lib/fog/openstack/identity/v2/requests/create_role.rb index dcf1bf80f..5a4ef4fce 100644 --- a/lib/fog/identity/openstack/v2/requests/create_role.rb +++ b/lib/fog/openstack/identity/v2/requests/create_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_role(name) diff --git a/lib/fog/identity/openstack/v2/requests/create_tenant.rb b/lib/fog/openstack/identity/v2/requests/create_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/create_tenant.rb rename to lib/fog/openstack/identity/v2/requests/create_tenant.rb index ee1a49860..cabb9f37f 100644 --- a/lib/fog/identity/openstack/v2/requests/create_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/create_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_tenant(attributes) diff --git a/lib/fog/identity/openstack/v2/requests/create_user.rb b/lib/fog/openstack/identity/v2/requests/create_user.rb similarity index 96% rename from lib/fog/identity/openstack/v2/requests/create_user.rb rename to lib/fog/openstack/identity/v2/requests/create_user.rb index 7f13f337c..bf1c5b256 100644 --- a/lib/fog/identity/openstack/v2/requests/create_user.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_user(name, password, email, tenantId = nil, enabled = true) diff --git a/lib/fog/identity/openstack/v2/requests/create_user_role.rb b/lib/fog/openstack/identity/v2/requests/create_user_role.rb similarity index 93% rename from lib/fog/identity/openstack/v2/requests/create_user_role.rb rename to lib/fog/openstack/identity/v2/requests/create_user_role.rb index b56f2fc22..9a5e3c07c 100644 --- a/lib/fog/identity/openstack/v2/requests/create_user_role.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def create_user_role(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb similarity index 91% rename from lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb rename to lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb index b487feee1..9fc30ca5e 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## @@ -27,7 +27,7 @@ def delete_ec2_credential(user_id, access) class Mock def delete_ec2_credential(user_id, access) - raise Fog::Identity::OpenStack::NotFound unless data[:ec2_credentials][user_id][access] + raise Fog::OpenStack::Identity::NotFound unless data[:ec2_credentials][user_id][access] data[:ec2_credentials][user_id].delete access diff --git a/lib/fog/identity/openstack/v2/requests/delete_role.rb b/lib/fog/openstack/identity/v2/requests/delete_role.rb similarity index 86% rename from lib/fog/identity/openstack/v2/requests/delete_role.rb rename to lib/fog/openstack/identity/v2/requests/delete_role.rb index 28d36ee24..aecf3f2d9 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_role.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_role(role_id) @@ -20,7 +20,7 @@ def delete_role(role_id) response.status = 204 response else - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_tenant.rb b/lib/fog/openstack/identity/v2/requests/delete_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/delete_tenant.rb rename to lib/fog/openstack/identity/v2/requests/delete_tenant.rb index c7410624b..e187d8438 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_tenant(id) diff --git a/lib/fog/identity/openstack/v2/requests/delete_user.rb b/lib/fog/openstack/identity/v2/requests/delete_user.rb similarity index 87% rename from lib/fog/identity/openstack/v2/requests/delete_user.rb rename to lib/fog/openstack/identity/v2/requests/delete_user.rb index 1413c7655..3ccfcb258 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_user.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_user(user_id) @@ -22,7 +22,7 @@ def delete_user(user_id) response.status = 204 response rescue - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/delete_user_role.rb b/lib/fog/openstack/identity/v2/requests/delete_user_role.rb similarity index 93% rename from lib/fog/identity/openstack/v2/requests/delete_user_role.rb rename to lib/fog/openstack/identity/v2/requests/delete_user_role.rb index a9f9a45d7..2f6a477d8 100644 --- a/lib/fog/identity/openstack/v2/requests/delete_user_role.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def delete_user_role(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb similarity index 94% rename from lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb rename to lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb index e7eed8295..800d04791 100644 --- a/lib/fog/identity/openstack/v2/requests/get_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## @@ -28,7 +28,7 @@ def get_ec2_credential(user_id, access) :path => "users/#{user_id}/credentials/OS-EC2/#{access}" ) rescue Excon::Errors::Unauthorized - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end diff --git a/lib/fog/identity/openstack/v2/requests/get_role.rb b/lib/fog/openstack/identity/v2/requests/get_role.rb similarity index 86% rename from lib/fog/identity/openstack/v2/requests/get_role.rb rename to lib/fog/openstack/identity/v2/requests/get_role.rb index 4ec42ef01..defaac045 100644 --- a/lib/fog/identity/openstack/v2/requests/get_role.rb +++ b/lib/fog/openstack/identity/v2/requests/get_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_role(id) @@ -20,7 +20,7 @@ def get_role(id) response.body = {'role' => data} response else - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/get_tenant.rb b/lib/fog/openstack/identity/v2/requests/get_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/get_tenant.rb rename to lib/fog/openstack/identity/v2/requests/get_tenant.rb index 0a57bd7f8..6b2676cdd 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_tenant(id) diff --git a/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb b/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb rename to lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb index 7018ceaba..df4a0fa03 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenants_by_id.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_tenants_by_id(tenant_id) diff --git a/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb b/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb rename to lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb index c03b29d7d..bdbefb7a8 100644 --- a/lib/fog/identity/openstack/v2/requests/get_tenants_by_name.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_tenants_by_name(name) diff --git a/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb b/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/get_user_by_id.rb rename to lib/fog/openstack/identity/v2/requests/get_user_by_id.rb index 72bf390e9..e8fbbb205 100644 --- a/lib/fog/identity/openstack/v2/requests/get_user_by_id.rb +++ b/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_user_by_id(user_id) diff --git a/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb b/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb similarity index 94% rename from lib/fog/identity/openstack/v2/requests/get_user_by_name.rb rename to lib/fog/openstack/identity/v2/requests/get_user_by_name.rb index d283d9167..79233d995 100644 --- a/lib/fog/identity/openstack/v2/requests/get_user_by_name.rb +++ b/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def get_user_by_name(name) diff --git a/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb b/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb similarity index 98% rename from lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb rename to lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb index e830a8222..9277676df 100644 --- a/lib/fog/identity/openstack/v2/requests/list_ec2_credentials.rb +++ b/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real ## diff --git a/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb b/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb similarity index 90% rename from lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb rename to lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb index 7d4c410c5..c4fc28bd4 100644 --- a/lib/fog/identity/openstack/v2/requests/list_endpoints_for_token.rb +++ b/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_endpoints_for_token(token_id) diff --git a/lib/fog/identity/openstack/v2/requests/list_roles.rb b/lib/fog/openstack/identity/v2/requests/list_roles.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/list_roles.rb rename to lib/fog/openstack/identity/v2/requests/list_roles.rb index 99332ebd3..ee55cc72d 100644 --- a/lib/fog/identity/openstack/v2/requests/list_roles.rb +++ b/lib/fog/openstack/identity/v2/requests/list_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_roles(options = {}) diff --git a/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb b/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb similarity index 95% rename from lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb rename to lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb index 504b63d5c..3acfade1f 100644 --- a/lib/fog/identity/openstack/v2/requests/list_roles_for_user_on_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_roles_for_user_on_tenant(tenant_id, user_id) diff --git a/lib/fog/identity/openstack/v2/requests/list_tenants.rb b/lib/fog/openstack/identity/v2/requests/list_tenants.rb similarity index 97% rename from lib/fog/identity/openstack/v2/requests/list_tenants.rb rename to lib/fog/openstack/identity/v2/requests/list_tenants.rb index 015549631..bec98c056 100644 --- a/lib/fog/identity/openstack/v2/requests/list_tenants.rb +++ b/lib/fog/openstack/identity/v2/requests/list_tenants.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_tenants(options = nil, marker = nil) diff --git a/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb b/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb rename to lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb index c8f618b1d..2b3d493ac 100644 --- a/lib/fog/identity/openstack/v2/requests/list_user_global_roles.rb +++ b/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_user_global_roles(user_id) diff --git a/lib/fog/identity/openstack/v2/requests/list_users.rb b/lib/fog/openstack/identity/v2/requests/list_users.rb similarity index 96% rename from lib/fog/identity/openstack/v2/requests/list_users.rb rename to lib/fog/openstack/identity/v2/requests/list_users.rb index e57efdc71..55305f221 100644 --- a/lib/fog/identity/openstack/v2/requests/list_users.rb +++ b/lib/fog/openstack/identity/v2/requests/list_users.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def list_users(options = {}) diff --git a/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb b/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb similarity index 92% rename from lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb rename to lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb index d68ad4f54..8814dc518 100644 --- a/lib/fog/identity/openstack/v2/requests/remove_user_from_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def remove_user_from_tenant(tenant_id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v2/requests/set_tenant.rb b/lib/fog/openstack/identity/v2/requests/set_tenant.rb similarity index 90% rename from lib/fog/identity/openstack/v2/requests/set_tenant.rb rename to lib/fog/openstack/identity/v2/requests/set_tenant.rb index 4beb72e84..7827c63dd 100644 --- a/lib/fog/identity/openstack/v2/requests/set_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def set_tenant(tenant) diff --git a/lib/fog/identity/openstack/v2/requests/update_tenant.rb b/lib/fog/openstack/identity/v2/requests/update_tenant.rb similarity index 94% rename from lib/fog/identity/openstack/v2/requests/update_tenant.rb rename to lib/fog/openstack/identity/v2/requests/update_tenant.rb index e24a8d90d..956b8fd01 100644 --- a/lib/fog/identity/openstack/v2/requests/update_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/update_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def update_tenant(id, attributes) diff --git a/lib/fog/identity/openstack/v2/requests/update_user.rb b/lib/fog/openstack/identity/v2/requests/update_user.rb similarity index 89% rename from lib/fog/identity/openstack/v2/requests/update_user.rb rename to lib/fog/openstack/identity/v2/requests/update_user.rb index 67709eb43..0d8622d1d 100644 --- a/lib/fog/identity/openstack/v2/requests/update_user.rb +++ b/lib/fog/openstack/identity/v2/requests/update_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def update_user(user_id, options = {}) @@ -24,7 +24,7 @@ def update_user(user_id, options) response.status = 200 response else - raise Fog::Identity::OpenStack::NotFound + raise Fog::OpenStack::Identity::NotFound end end end diff --git a/lib/fog/identity/openstack/v2/requests/validate_token.rb b/lib/fog/openstack/identity/v2/requests/validate_token.rb similarity index 92% rename from lib/fog/identity/openstack/v2/requests/validate_token.rb rename to lib/fog/openstack/identity/v2/requests/validate_token.rb index c278558a6..a7d4a1cb7 100644 --- a/lib/fog/identity/openstack/v2/requests/validate_token.rb +++ b/lib/fog/openstack/identity/v2/requests/validate_token.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V2 class Real def validate_token(token_id, tenant_id = nil) diff --git a/lib/fog/identity/openstack/v3.rb b/lib/fog/openstack/identity/v3.rb similarity index 95% rename from lib/fog/identity/openstack/v3.rb rename to lib/fog/openstack/identity/v3.rb index 86d5345fa..61da21d23 100644 --- a/lib/fog/identity/openstack/v3.rb +++ b/lib/fog/openstack/identity/v3.rb @@ -1,8 +1,8 @@ -require 'fog/identity/openstack' +require 'fog/openstack/identity/identity' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, @@ -15,7 +15,7 @@ class V3 < Fog::Service :current_user, :current_user_id, :current_tenant, :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix - model_path 'fog/identity/openstack/v3/models' + model_path 'fog/openstack/identity/v3/models' model :domain collection :domains model :endpoint @@ -39,7 +39,7 @@ class V3 < Fog::Service model :policy collection :policies - request_path 'fog/identity/openstack/v3/requests' + request_path 'fog/openstack/identity/v3/requests' request :list_users request :get_user @@ -141,7 +141,7 @@ def self.get_api_version(uri, connection_options = {}) version end - class Real < Fog::Identity::OpenStack::Real + class Real < Fog::OpenStack::Identity::Real def initialize(args) @path_prefix = if args[:no_path_prefix] '' diff --git a/lib/fog/identity/openstack/v3/models/domain.rb b/lib/fog/openstack/identity/v3/models/domain.rb similarity index 96% rename from lib/fog/identity/openstack/v3/models/domain.rb rename to lib/fog/openstack/identity/v3/models/domain.rb index 7c182b7b1..fda46d176 100644 --- a/lib/fog/identity/openstack/v3/models/domain.rb +++ b/lib/fog/openstack/identity/v3/models/domain.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Domain < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/domains.rb b/lib/fog/openstack/identity/v3/models/domains.rb similarity index 76% rename from lib/fog/identity/openstack/v3/models/domains.rb rename to lib/fog/openstack/identity/v3/models/domains.rb index 58c02e2be..43d33c12f 100644 --- a/lib/fog/identity/openstack/v3/models/domains.rb +++ b/lib/fog/openstack/identity/v3/models/domains.rb @@ -1,26 +1,26 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/domain' +require 'fog/openstack/identity/v3/models/domain' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Domains < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Domain + model Fog::OpenStack::Identity::V3::Domain def all(options = {}) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::Identity::OpenStack::V3::Domain.cache[{:token => service.auth_token, + cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, :options => options}] return cached_domain if cached_domain && expires > Time.now end domain_to_cache = load_response(service.list_domains(options), 'domains') if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Domain.cache + cache = Fog::OpenStack::Identity::V3::Domain.cache cache[{:token => service.auth_token, :options => options}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] - Fog::Identity::OpenStack::V3::Domain.cache = cache + Fog::OpenStack::Identity::V3::Domain.cache = cache end domain_to_cache end @@ -35,19 +35,19 @@ def auth_domains(options = {}) def find_by_id(id) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::Identity::OpenStack::V3::Domain.cache[{:token => service.auth_token, + cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, :id => id}] return cached_domain if cached_domain && expires > Time.now end domain_hash = service.get_domain(id).body['domain'] - domain_to_cache = Fog::Identity::OpenStack::V3::Domain.new( + domain_to_cache = Fog::OpenStack::Identity::V3::Domain.new( domain_hash.merge(:service => service) ) if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Domain.cache + cache = Fog::OpenStack::Identity::V3::Domain.cache cache[{:token => service.auth_token, :id => id}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] - Fog::Identity::OpenStack::V3::Domain.cache = cache + Fog::OpenStack::Identity::V3::Domain.cache = cache end domain_to_cache end diff --git a/lib/fog/identity/openstack/v3/models/endpoint.rb b/lib/fog/openstack/identity/v3/models/endpoint.rb similarity index 96% rename from lib/fog/identity/openstack/v3/models/endpoint.rb rename to lib/fog/openstack/identity/v3/models/endpoint.rb index 5b71e7103..1d735187b 100644 --- a/lib/fog/identity/openstack/v3/models/endpoint.rb +++ b/lib/fog/openstack/identity/v3/models/endpoint.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Endpoint < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/endpoints.rb b/lib/fog/openstack/identity/v3/models/endpoints.rb similarity index 74% rename from lib/fog/identity/openstack/v3/models/endpoints.rb rename to lib/fog/openstack/identity/v3/models/endpoints.rb index 3ba08aaf9..4351b5984 100644 --- a/lib/fog/identity/openstack/v3/models/endpoints.rb +++ b/lib/fog/openstack/identity/v3/models/endpoints.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/service' +require 'fog/openstack/identity/v3/models/service' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Endpoints < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Endpoint + model Fog::OpenStack::Identity::V3::Endpoint def all(options = {}) load_response(service.list_endpoints(options), 'endpoints') @@ -16,7 +16,7 @@ def find_by_id(id) cached_endpoint = find { |endpoint| endpoint.id == id } return cached_endpoint if cached_endpoint endpoint_hash = service.get_endpoint(id).body['endpoint'] - Fog::Identity::OpenStack::V3::Endpoint.new( + Fog::OpenStack::Identity::V3::Endpoint.new( endpoint_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/group.rb b/lib/fog/openstack/identity/v3/models/group.rb similarity index 93% rename from lib/fog/identity/openstack/v3/models/group.rb rename to lib/fog/openstack/identity/v3/models/group.rb index 7448ec376..46b7c7a00 100644 --- a/lib/fog/identity/openstack/v3/models/group.rb +++ b/lib/fog/openstack/identity/v3/models/group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Group < Fog::OpenStack::Model identity :id @@ -52,7 +52,7 @@ def contains_user?(user_id) requires :id begin service.group_user_check(id, user_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true @@ -72,7 +72,7 @@ def check_role(role_id) requires :id, :domain_id begin service.check_domain_group_role(domain_id, id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true diff --git a/lib/fog/identity/openstack/v3/models/groups.rb b/lib/fog/openstack/identity/v3/models/groups.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/groups.rb rename to lib/fog/openstack/identity/v3/models/groups.rb index 8185e1c9f..9af758aae 100644 --- a/lib/fog/identity/openstack/v3/models/groups.rb +++ b/lib/fog/openstack/identity/v3/models/groups.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/group' +require 'fog/openstack/identity/v3/models/group' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Groups < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Group + model Fog::OpenStack::Identity::V3::Group def all(options = {}) load_response(service.list_groups(options), 'groups') @@ -16,7 +16,7 @@ def find_by_id(id) cached_group = find { |group| group.id == id } return cached_group if cached_group group_hash = service.get_group(id).body['group'] - Fog::Identity::OpenStack::V3.group.new( + Fog::OpenStack::Identity::V3.group.new( group_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/os_credential.rb b/lib/fog/openstack/identity/v3/models/os_credential.rb similarity index 97% rename from lib/fog/identity/openstack/v3/models/os_credential.rb rename to lib/fog/openstack/identity/v3/models/os_credential.rb index 0b84470e8..70efbf741 100644 --- a/lib/fog/identity/openstack/v3/models/os_credential.rb +++ b/lib/fog/openstack/identity/v3/models/os_credential.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class OsCredential < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/os_credentials.rb b/lib/fog/openstack/identity/v3/models/os_credentials.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/os_credentials.rb rename to lib/fog/openstack/identity/v3/models/os_credentials.rb index b8de44bde..afa764fdd 100644 --- a/lib/fog/identity/openstack/v3/models/os_credentials.rb +++ b/lib/fog/openstack/identity/v3/models/os_credentials.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/os_credential' +require 'fog/openstack/identity/v3/models/os_credential' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class OsCredentials < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::OsCredential + model Fog::OpenStack::Identity::V3::OsCredential def all(options = {}) load_response(service.list_os_credentials(options), 'credentials') @@ -16,7 +16,7 @@ def find_by_id(id) cached_credential = find { |credential| credential.id == id } return cached_credential if cached_credential credential_hash = service.get_os_credential(id).body['credential'] - Fog::Identity::OpenStack::V3::Credential.new( + Fog::OpenStack::Identity::V3::Credential.new( credential_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/policies.rb b/lib/fog/openstack/identity/v3/models/policies.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/policies.rb rename to lib/fog/openstack/identity/v3/models/policies.rb index 08dce3d0e..9641bc30a 100644 --- a/lib/fog/identity/openstack/v3/models/policies.rb +++ b/lib/fog/openstack/identity/v3/models/policies.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/policy' +require 'fog/openstack/identity/v3/models/policy' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Policies < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Policy + model Fog::OpenStack::Identity::V3::Policy def all(options = {}) load_response(service.list_policies(options), 'policies') @@ -16,7 +16,7 @@ def find_by_id(id) cached_policy = find { |policy| policy.id == id } return cached_policy if cached_policy policy_hash = service.get_policy(id).body['policy'] - Fog::Identity::OpenStack::V3::Policy.new( + Fog::OpenStack::Identity::V3::Policy.new( policy_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/policy.rb b/lib/fog/openstack/identity/v3/models/policy.rb similarity index 95% rename from lib/fog/identity/openstack/v3/models/policy.rb rename to lib/fog/openstack/identity/v3/models/policy.rb index e136c6312..a642994a0 100644 --- a/lib/fog/identity/openstack/v3/models/policy.rb +++ b/lib/fog/openstack/identity/v3/models/policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Policy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/project.rb b/lib/fog/openstack/identity/v3/models/project.rb similarity index 94% rename from lib/fog/identity/openstack/v3/models/project.rb rename to lib/fog/openstack/identity/v3/models/project.rb index b3d53ddb3..5abcc3dca 100644 --- a/lib/fog/identity/openstack/v3/models/project.rb +++ b/lib/fog/openstack/identity/v3/models/project.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Project < Fog::OpenStack::Model identity :id @@ -65,7 +65,7 @@ def check_user_role(user_id, role_id) requires :id begin service.check_project_user_role(id, user_id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true @@ -92,7 +92,7 @@ def check_group_role(group_id, role_id) requires :id begin service.check_project_group_role(id, group_id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true diff --git a/lib/fog/identity/openstack/v3/models/projects.rb b/lib/fog/openstack/identity/v3/models/projects.rb similarity index 81% rename from lib/fog/identity/openstack/v3/models/projects.rb rename to lib/fog/openstack/identity/v3/models/projects.rb index b1d413221..fd13515c3 100644 --- a/lib/fog/identity/openstack/v3/models/projects.rb +++ b/lib/fog/openstack/identity/v3/models/projects.rb @@ -1,26 +1,26 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/project' +require 'fog/openstack/identity/v3/models/project' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Projects < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Project + model Fog::OpenStack::Identity::V3::Project def all(options = {}) if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::Identity::OpenStack::V3::Project.cache[{:token => service.auth_token, + cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, :options => options}] return cached_project if cached_project && expires > Time.now end project_to_cache = load_response(service.list_projects(options), 'projects') if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Project.cache + cache = Fog::OpenStack::Identity::V3::Project.cache cache[{:token => service.auth_token, :options => options}] = [project_to_cache, Time.now + service.openstack_cache_ttl] - Fog::Identity::OpenStack::V3::Project.cache = cache + Fog::OpenStack::Identity::V3::Project.cache = cache end project_to_cache end @@ -39,7 +39,7 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree end if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::Identity::OpenStack::V3::Project.cache[{:token => service.auth_token, + cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, :id => id, :options => options}] return cached_project if cached_project && expires > Time.now @@ -54,11 +54,11 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree end if service.openstack_cache_ttl > 0 - cache = Fog::Identity::OpenStack::V3::Project.cache + cache = Fog::OpenStack::Identity::V3::Project.cache cache[{:token => service.auth_token, :id => id, :options => options}] = [ top_project, Time.now + service.openstack_cache_ttl ] - Fog::Identity::OpenStack::V3::Project.cache = cache + Fog::OpenStack::Identity::V3::Project.cache = cache end top_project end @@ -66,7 +66,7 @@ def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree private def project_from_hash(project_hash, service) - Fog::Identity::OpenStack::V3::Project.new(project_hash.merge(:service => service)) + Fog::OpenStack::Identity::V3::Project.new(project_hash.merge(:service => service)) end end end diff --git a/lib/fog/identity/openstack/v3/models/role.rb b/lib/fog/openstack/identity/v3/models/role.rb similarity index 95% rename from lib/fog/identity/openstack/v3/models/role.rb rename to lib/fog/openstack/identity/v3/models/role.rb index 024b251b4..67a4414a2 100644 --- a/lib/fog/identity/openstack/v3/models/role.rb +++ b/lib/fog/openstack/identity/v3/models/role.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Role < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/role_assignment.rb b/lib/fog/openstack/identity/v3/models/role_assignment.rb similarity index 90% rename from lib/fog/identity/openstack/v3/models/role_assignment.rb rename to lib/fog/openstack/identity/v3/models/role_assignment.rb index 0fe981a00..2e8fc4df9 100644 --- a/lib/fog/identity/openstack/v3/models/role_assignment.rb +++ b/lib/fog/openstack/identity/v3/models/role_assignment.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class RoleAssignment < Fog::OpenStack::Model attribute :scope diff --git a/lib/fog/identity/openstack/v3/models/role_assignments.rb b/lib/fog/openstack/identity/v3/models/role_assignments.rb similarity index 82% rename from lib/fog/identity/openstack/v3/models/role_assignments.rb rename to lib/fog/openstack/identity/v3/models/role_assignments.rb index 5ebaa7f01..e1777c25f 100644 --- a/lib/fog/identity/openstack/v3/models/role_assignments.rb +++ b/lib/fog/openstack/identity/v3/models/role_assignments.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/role' +require 'fog/openstack/identity/v3/models/role' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class RoleAssignments < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::RoleAssignment + model Fog::OpenStack::Identity::V3::RoleAssignment def all(options = {}) load_response(service.list_role_assignments(options), 'role_assignments') diff --git a/lib/fog/identity/openstack/v3/models/roles.rb b/lib/fog/openstack/identity/v3/models/roles.rb similarity index 86% rename from lib/fog/identity/openstack/v3/models/roles.rb rename to lib/fog/openstack/identity/v3/models/roles.rb index 0b6a8cfbe..707fddc8d 100644 --- a/lib/fog/identity/openstack/v3/models/roles.rb +++ b/lib/fog/openstack/identity/v3/models/roles.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/role' +require 'fog/openstack/identity/v3/models/role' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Roles < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Role + model Fog::OpenStack::Identity::V3::Role def all(options = {}) load_response(service.list_roles(options), 'roles') @@ -24,7 +24,7 @@ def find_by_id(id) cached_role = find { |role| role.id == id } return cached_role if cached_role role_hash = service.get_role(id).body['role'] - Fog::Identity::OpenStack::V3.role.new( + Fog::OpenStack::Identity::V3.role.new( role_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/service.rb b/lib/fog/openstack/identity/v3/models/service.rb similarity index 96% rename from lib/fog/identity/openstack/v3/models/service.rb rename to lib/fog/openstack/identity/v3/models/service.rb index a06ef8a43..15d0249ca 100644 --- a/lib/fog/identity/openstack/v3/models/service.rb +++ b/lib/fog/openstack/identity/v3/models/service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Service < Fog::OpenStack::Model identity :id diff --git a/lib/fog/identity/openstack/v3/models/services.rb b/lib/fog/openstack/identity/v3/models/services.rb similarity index 77% rename from lib/fog/identity/openstack/v3/models/services.rb rename to lib/fog/openstack/identity/v3/models/services.rb index d9dc4a982..c60569839 100644 --- a/lib/fog/identity/openstack/v3/models/services.rb +++ b/lib/fog/openstack/identity/v3/models/services.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/service' +require 'fog/openstack/identity/v3/models/service' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Services < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Service + model Fog::OpenStack::Identity::V3::Service def all(options = {}) load_response(service.list_services(options), 'services') @@ -16,7 +16,7 @@ def find_by_id(id) cached_service = find { |service| service.id == id } return cached_service if cached_service service_hash = service.get_service(id).body['service'] - Fog::Identity::OpenStack::V3::Service.new( + Fog::OpenStack::Identity::V3::Service.new( service_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/models/token.rb b/lib/fog/openstack/identity/v3/models/token.rb similarity index 91% rename from lib/fog/identity/openstack/v3/models/token.rb rename to lib/fog/openstack/identity/v3/models/token.rb index 5c2392684..7e15c5fc1 100644 --- a/lib/fog/identity/openstack/v3/models/token.rb +++ b/lib/fog/openstack/identity/v3/models/token.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Token < Fog::OpenStack::Model attribute :value diff --git a/lib/fog/identity/openstack/v3/models/tokens.rb b/lib/fog/openstack/identity/v3/models/tokens.rb similarity index 78% rename from lib/fog/identity/openstack/v3/models/tokens.rb rename to lib/fog/openstack/identity/v3/models/tokens.rb index b07ea92ac..028eb9a8e 100644 --- a/lib/fog/identity/openstack/v3/models/tokens.rb +++ b/lib/fog/openstack/identity/v3/models/tokens.rb @@ -1,17 +1,17 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/service' +require 'fog/openstack/identity/v3/models/service' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Tokens < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::Token + model Fog::OpenStack::Identity::V3::Token def authenticate(auth) response = service.token_authenticate(auth) token_hash = response.body['token'] - Fog::Identity::OpenStack::V3::Token.new( + Fog::OpenStack::Identity::V3::Token.new( token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) ) end @@ -19,7 +19,7 @@ def authenticate(auth) def validate(subject_token) response = service.token_validate(subject_token) token_hash = response.body['token'] - Fog::Identity::OpenStack::V3::Token.new( + Fog::OpenStack::Identity::V3::Token.new( token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) ) end diff --git a/lib/fog/identity/openstack/v3/models/user.rb b/lib/fog/openstack/identity/v3/models/user.rb similarity index 95% rename from lib/fog/identity/openstack/v3/models/user.rb rename to lib/fog/openstack/identity/v3/models/user.rb index cf2ee4b59..70a677f90 100644 --- a/lib/fog/identity/openstack/v3/models/user.rb +++ b/lib/fog/openstack/identity/v3/models/user.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class User < Fog::OpenStack::Model identity :id @@ -44,7 +44,7 @@ def check_role(role_id) requires :id, :domain_id begin service.check_domain_user_role(domain_id, id, role_id) - rescue Fog::Identity::OpenStack::NotFound + rescue Fog::OpenStack::Identity::NotFound return false end true diff --git a/lib/fog/identity/openstack/v3/models/users.rb b/lib/fog/openstack/identity/v3/models/users.rb similarity index 80% rename from lib/fog/identity/openstack/v3/models/users.rb rename to lib/fog/openstack/identity/v3/models/users.rb index 9dc92a22c..109476747 100644 --- a/lib/fog/identity/openstack/v3/models/users.rb +++ b/lib/fog/openstack/identity/v3/models/users.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/identity/openstack/v3/models/domain' +require 'fog/openstack/identity/v3/models/domain' module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Users < Fog::OpenStack::Collection - model Fog::Identity::OpenStack::V3::User + model Fog::OpenStack::Identity::V3::User def all(options = {}) load_response(service.list_users(options), 'users') @@ -16,7 +16,7 @@ def find_by_id(id) cached_user = find { |user| user.id == id } return cached_user if cached_user user_hash = service.get_user(id).body['user'] - Fog::Identity::OpenStack::V3::User.new( + Fog::OpenStack::Identity::V3::User.new( user_hash.merge(:service => service) ) end diff --git a/lib/fog/identity/openstack/v3/requests/add_user_to_group.rb b/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/add_user_to_group.rb rename to lib/fog/openstack/identity/v3/requests/add_user_to_group.rb index 03a55d02f..852191bf0 100644 --- a/lib/fog/identity/openstack/v3/requests/add_user_to_group.rb +++ b/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def add_user_to_group(group_id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/auth_domains.rb b/lib/fog/openstack/identity/v3/requests/auth_domains.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/auth_domains.rb rename to lib/fog/openstack/identity/v3/requests/auth_domains.rb index 176214f5a..883a386ed 100644 --- a/lib/fog/identity/openstack/v3/requests/auth_domains.rb +++ b/lib/fog/openstack/identity/v3/requests/auth_domains.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def auth_domains(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/auth_projects.rb b/lib/fog/openstack/identity/v3/requests/auth_projects.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/auth_projects.rb rename to lib/fog/openstack/identity/v3/requests/auth_projects.rb index 2cd4c3455..f4861a39d 100644 --- a/lib/fog/identity/openstack/v3/requests/auth_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/auth_projects.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def auth_projects(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb rename to lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb index eb69a9dca..63f84fd99 100644 --- a/lib/fog/identity/openstack/v3/requests/check_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb rename to lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb index 8c842b1e8..ea40b6541 100644 --- a/lib/fog/identity/openstack/v3/requests/check_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/check_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_project_group_role.rb rename to lib/fog/openstack/identity/v3/requests/check_project_group_role.rb index 22895db06..d3a84af5b 100644 --- a/lib/fog/identity/openstack/v3/requests/check_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_project_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/check_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/check_project_user_role.rb rename to lib/fog/openstack/identity/v3/requests/check_project_user_role.rb index 1ee3415ee..36da39e1a 100644 --- a/lib/fog/identity/openstack/v3/requests/check_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def check_project_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/create_domain.rb b/lib/fog/openstack/identity/v3/requests/create_domain.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_domain.rb rename to lib/fog/openstack/identity/v3/requests/create_domain.rb index aabe7d2fa..cf2403dd9 100644 --- a/lib/fog/identity/openstack/v3/requests/create_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/create_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_domain(domain) diff --git a/lib/fog/identity/openstack/v3/requests/create_endpoint.rb b/lib/fog/openstack/identity/v3/requests/create_endpoint.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/create_endpoint.rb index ac57e58f4..d1f3e8017 100644 --- a/lib/fog/identity/openstack/v3/requests/create_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/create_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_endpoint(endpoint) diff --git a/lib/fog/identity/openstack/v3/requests/create_group.rb b/lib/fog/openstack/identity/v3/requests/create_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_group.rb rename to lib/fog/openstack/identity/v3/requests/create_group.rb index 74db0225b..5411edcc4 100644 --- a/lib/fog/identity/openstack/v3/requests/create_group.rb +++ b/lib/fog/openstack/identity/v3/requests/create_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_group(group) diff --git a/lib/fog/identity/openstack/v3/requests/create_os_credential.rb b/lib/fog/openstack/identity/v3/requests/create_os_credential.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/create_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/create_os_credential.rb index 9cfa4a030..61d555c16 100644 --- a/lib/fog/identity/openstack/v3/requests/create_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/create_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_os_credential(credential) diff --git a/lib/fog/identity/openstack/v3/requests/create_policy.rb b/lib/fog/openstack/identity/v3/requests/create_policy.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_policy.rb rename to lib/fog/openstack/identity/v3/requests/create_policy.rb index 46e719ac4..125d8354d 100644 --- a/lib/fog/identity/openstack/v3/requests/create_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/create_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_policy(policy) diff --git a/lib/fog/identity/openstack/v3/requests/create_project.rb b/lib/fog/openstack/identity/v3/requests/create_project.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_project.rb rename to lib/fog/openstack/identity/v3/requests/create_project.rb index 729dab287..1fcf1e21a 100644 --- a/lib/fog/identity/openstack/v3/requests/create_project.rb +++ b/lib/fog/openstack/identity/v3/requests/create_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_project(project) diff --git a/lib/fog/identity/openstack/v3/requests/create_role.rb b/lib/fog/openstack/identity/v3/requests/create_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_role.rb rename to lib/fog/openstack/identity/v3/requests/create_role.rb index 5ca245be4..e985bddae 100644 --- a/lib/fog/identity/openstack/v3/requests/create_role.rb +++ b/lib/fog/openstack/identity/v3/requests/create_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_role(role) diff --git a/lib/fog/identity/openstack/v3/requests/create_service.rb b/lib/fog/openstack/identity/v3/requests/create_service.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_service.rb rename to lib/fog/openstack/identity/v3/requests/create_service.rb index 6dc675a54..d765fdbb1 100644 --- a/lib/fog/identity/openstack/v3/requests/create_service.rb +++ b/lib/fog/openstack/identity/v3/requests/create_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_service(service) diff --git a/lib/fog/identity/openstack/v3/requests/create_user.rb b/lib/fog/openstack/identity/v3/requests/create_user.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/create_user.rb rename to lib/fog/openstack/identity/v3/requests/create_user.rb index cd80365ef..841d689d3 100644 --- a/lib/fog/identity/openstack/v3/requests/create_user.rb +++ b/lib/fog/openstack/identity/v3/requests/create_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def create_user(user) diff --git a/lib/fog/identity/openstack/v3/requests/delete_domain.rb b/lib/fog/openstack/identity/v3/requests/delete_domain.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_domain.rb rename to lib/fog/openstack/identity/v3/requests/delete_domain.rb index e99823e14..d2eb6d06c 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_domain(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_endpoint.rb b/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/delete_endpoint.rb index b86802d82..57023a664 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_endpoint(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_group.rb b/lib/fog/openstack/identity/v3/requests/delete_group.rb similarity index 88% rename from lib/fog/identity/openstack/v3/requests/delete_group.rb rename to lib/fog/openstack/identity/v3/requests/delete_group.rb index 1aad1f448..d494c5794 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_group.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_group(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_os_credential.rb b/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/delete_os_credential.rb index 7caf39d2a..45b9223f2 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_os_credential(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_policy.rb b/lib/fog/openstack/identity/v3/requests/delete_policy.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_policy.rb rename to lib/fog/openstack/identity/v3/requests/delete_policy.rb index e0a211aa1..3264965b4 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_policy(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_project.rb b/lib/fog/openstack/identity/v3/requests/delete_project.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_project.rb rename to lib/fog/openstack/identity/v3/requests/delete_project.rb index 0cc3c07d0..634186beb 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_project.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_project(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_role.rb b/lib/fog/openstack/identity/v3/requests/delete_role.rb similarity index 88% rename from lib/fog/identity/openstack/v3/requests/delete_role.rb rename to lib/fog/openstack/identity/v3/requests/delete_role.rb index 9b4e64244..0a5baf05d 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_role.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_role(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_service.rb b/lib/fog/openstack/identity/v3/requests/delete_service.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/delete_service.rb rename to lib/fog/openstack/identity/v3/requests/delete_service.rb index 6ede4eb30..16761e478 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_service.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_service(id) diff --git a/lib/fog/identity/openstack/v3/requests/delete_user.rb b/lib/fog/openstack/identity/v3/requests/delete_user.rb similarity index 88% rename from lib/fog/identity/openstack/v3/requests/delete_user.rb rename to lib/fog/openstack/identity/v3/requests/delete_user.rb index b08fd457a..eef6ee128 100644 --- a/lib/fog/identity/openstack/v3/requests/delete_user.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def delete_user(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_domain.rb b/lib/fog/openstack/identity/v3/requests/get_domain.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_domain.rb rename to lib/fog/openstack/identity/v3/requests/get_domain.rb index 3170fd640..0a2bd126f 100644 --- a/lib/fog/identity/openstack/v3/requests/get_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/get_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_domain(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_endpoint.rb b/lib/fog/openstack/identity/v3/requests/get_endpoint.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/get_endpoint.rb index b4860d18e..cd8fed07d 100644 --- a/lib/fog/identity/openstack/v3/requests/get_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/get_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_endpoint(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_group.rb b/lib/fog/openstack/identity/v3/requests/get_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_group.rb rename to lib/fog/openstack/identity/v3/requests/get_group.rb index 01b1fc210..706cc4880 100644 --- a/lib/fog/identity/openstack/v3/requests/get_group.rb +++ b/lib/fog/openstack/identity/v3/requests/get_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_group(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_os_credential.rb b/lib/fog/openstack/identity/v3/requests/get_os_credential.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/get_os_credential.rb index 2f049a51a..ed42db756 100644 --- a/lib/fog/identity/openstack/v3/requests/get_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/get_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_os_credential(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_policy.rb b/lib/fog/openstack/identity/v3/requests/get_policy.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_policy.rb rename to lib/fog/openstack/identity/v3/requests/get_policy.rb index ffddca73e..3bfb57755 100644 --- a/lib/fog/identity/openstack/v3/requests/get_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/get_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_policy(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_project.rb b/lib/fog/openstack/identity/v3/requests/get_project.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_project.rb rename to lib/fog/openstack/identity/v3/requests/get_project.rb index 1c93ab78d..1d6494491 100644 --- a/lib/fog/identity/openstack/v3/requests/get_project.rb +++ b/lib/fog/openstack/identity/v3/requests/get_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_project(id, options = []) diff --git a/lib/fog/identity/openstack/v3/requests/get_role.rb b/lib/fog/openstack/identity/v3/requests/get_role.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/get_role.rb rename to lib/fog/openstack/identity/v3/requests/get_role.rb index 78031e027..fecf25b45 100644 --- a/lib/fog/identity/openstack/v3/requests/get_role.rb +++ b/lib/fog/openstack/identity/v3/requests/get_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_role(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_service.rb b/lib/fog/openstack/identity/v3/requests/get_service.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/get_service.rb rename to lib/fog/openstack/identity/v3/requests/get_service.rb index 8c3408f54..0a83c3e88 100644 --- a/lib/fog/identity/openstack/v3/requests/get_service.rb +++ b/lib/fog/openstack/identity/v3/requests/get_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_service(id) diff --git a/lib/fog/identity/openstack/v3/requests/get_user.rb b/lib/fog/openstack/identity/v3/requests/get_user.rb similarity index 89% rename from lib/fog/identity/openstack/v3/requests/get_user.rb rename to lib/fog/openstack/identity/v3/requests/get_user.rb index a2200b3bb..93f119a01 100644 --- a/lib/fog/identity/openstack/v3/requests/get_user.rb +++ b/lib/fog/openstack/identity/v3/requests/get_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def get_user(id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb index c92301342..ed7d90405 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb index e23129e5f..b91bc7da4 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb index ffe442f01..99a5939b8 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_project_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb rename to lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb index 27ecd63fc..1dee70dba 100644 --- a/lib/fog/identity/openstack/v3/requests/grant_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def grant_project_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/group_user_check.rb b/lib/fog/openstack/identity/v3/requests/group_user_check.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/group_user_check.rb rename to lib/fog/openstack/identity/v3/requests/group_user_check.rb index 193292877..14a2b2001 100644 --- a/lib/fog/identity/openstack/v3/requests/group_user_check.rb +++ b/lib/fog/openstack/identity/v3/requests/group_user_check.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def group_user_check(group_id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb b/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb index 60126007b..3e0ff8620 100644 --- a/lib/fog/identity/openstack/v3/requests/list_domain_group_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_domain_group_roles(id, group_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb b/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb index 26d7ce24f..a11a8e053 100644 --- a/lib/fog/identity/openstack/v3/requests/list_domain_user_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_domain_user_roles(id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_domains.rb b/lib/fog/openstack/identity/v3/requests/list_domains.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_domains.rb rename to lib/fog/openstack/identity/v3/requests/list_domains.rb index f5a4d8480..884002d33 100644 --- a/lib/fog/identity/openstack/v3/requests/list_domains.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domains.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_domains(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_endpoints.rb b/lib/fog/openstack/identity/v3/requests/list_endpoints.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_endpoints.rb rename to lib/fog/openstack/identity/v3/requests/list_endpoints.rb index 7faf83f81..c72e27f10 100644 --- a/lib/fog/identity/openstack/v3/requests/list_endpoints.rb +++ b/lib/fog/openstack/identity/v3/requests/list_endpoints.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_endpoints(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_group_users.rb b/lib/fog/openstack/identity/v3/requests/list_group_users.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_group_users.rb rename to lib/fog/openstack/identity/v3/requests/list_group_users.rb index 25e4b43ea..a474bced0 100644 --- a/lib/fog/identity/openstack/v3/requests/list_group_users.rb +++ b/lib/fog/openstack/identity/v3/requests/list_group_users.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_group_users(id, options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_groups.rb b/lib/fog/openstack/identity/v3/requests/list_groups.rb similarity index 94% rename from lib/fog/identity/openstack/v3/requests/list_groups.rb rename to lib/fog/openstack/identity/v3/requests/list_groups.rb index d43290761..ab54244cd 100644 --- a/lib/fog/identity/openstack/v3/requests/list_groups.rb +++ b/lib/fog/openstack/identity/v3/requests/list_groups.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_groups(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_os_credentials.rb b/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_os_credentials.rb rename to lib/fog/openstack/identity/v3/requests/list_os_credentials.rb index 1aac07f95..bf74399fb 100644 --- a/lib/fog/identity/openstack/v3/requests/list_os_credentials.rb +++ b/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_os_credentials(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_policies.rb b/lib/fog/openstack/identity/v3/requests/list_policies.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_policies.rb rename to lib/fog/openstack/identity/v3/requests/list_policies.rb index 011234d83..acd7be6ed 100644 --- a/lib/fog/identity/openstack/v3/requests/list_policies.rb +++ b/lib/fog/openstack/identity/v3/requests/list_policies.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_policies(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb b/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb index 138e6fa57..87f37aa4b 100644 --- a/lib/fog/identity/openstack/v3/requests/list_project_group_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_project_group_roles(id, group_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb b/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb index a715334f8..cdcdae06a 100644 --- a/lib/fog/identity/openstack/v3/requests/list_project_user_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_project_user_roles(id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_projects.rb b/lib/fog/openstack/identity/v3/requests/list_projects.rb similarity index 94% rename from lib/fog/identity/openstack/v3/requests/list_projects.rb rename to lib/fog/openstack/identity/v3/requests/list_projects.rb index cd05fb71f..25edd6a79 100644 --- a/lib/fog/identity/openstack/v3/requests/list_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/list_projects.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_projects(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_role_assignments.rb b/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb similarity index 96% rename from lib/fog/identity/openstack/v3/requests/list_role_assignments.rb rename to lib/fog/openstack/identity/v3/requests/list_role_assignments.rb index 3b64bfe81..49611fadd 100644 --- a/lib/fog/identity/openstack/v3/requests/list_role_assignments.rb +++ b/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_role_assignments(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_roles.rb b/lib/fog/openstack/identity/v3/requests/list_roles.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_roles.rb rename to lib/fog/openstack/identity/v3/requests/list_roles.rb index da2ddd31c..e9a538311 100644 --- a/lib/fog/identity/openstack/v3/requests/list_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_roles.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_roles(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_services.rb b/lib/fog/openstack/identity/v3/requests/list_services.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_services.rb rename to lib/fog/openstack/identity/v3/requests/list_services.rb index a822a3779..b0e0c446f 100644 --- a/lib/fog/identity/openstack/v3/requests/list_services.rb +++ b/lib/fog/openstack/identity/v3/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_services(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_user_groups.rb b/lib/fog/openstack/identity/v3/requests/list_user_groups.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/list_user_groups.rb rename to lib/fog/openstack/identity/v3/requests/list_user_groups.rb index 7e6a90ed3..a6d6ac77e 100644 --- a/lib/fog/identity/openstack/v3/requests/list_user_groups.rb +++ b/lib/fog/openstack/identity/v3/requests/list_user_groups.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_user_groups(user_id) diff --git a/lib/fog/identity/openstack/v3/requests/list_user_projects.rb b/lib/fog/openstack/identity/v3/requests/list_user_projects.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_user_projects.rb rename to lib/fog/openstack/identity/v3/requests/list_user_projects.rb index e4079e011..cf96a30a0 100644 --- a/lib/fog/identity/openstack/v3/requests/list_user_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/list_user_projects.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_user_projects(user_id, options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/list_users.rb b/lib/fog/openstack/identity/v3/requests/list_users.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/list_users.rb rename to lib/fog/openstack/identity/v3/requests/list_users.rb index 017496dcb..0a5159a85 100644 --- a/lib/fog/identity/openstack/v3/requests/list_users.rb +++ b/lib/fog/openstack/identity/v3/requests/list_users.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def list_users(options = {}) diff --git a/lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb b/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb rename to lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb index 8f162eb98..f9b770883 100644 --- a/lib/fog/identity/openstack/v3/requests/remove_user_from_group.rb +++ b/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def remove_user_from_group(group_id, user_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb index 7f04ea149..0e69b4a2d 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_domain_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb index ded732f45..2aac1107f 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_domain_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb index 3bb8b6d86..f069db266 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_project_group_role(id, group_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb rename to lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb index e32e1b851..6262bfec9 100644 --- a/lib/fog/identity/openstack/v3/requests/revoke_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def revoke_project_user_role(id, user_id, role_id) diff --git a/lib/fog/identity/openstack/v3/requests/token_authenticate.rb b/lib/fog/openstack/identity/v3/requests/token_authenticate.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/token_authenticate.rb rename to lib/fog/openstack/identity/v3/requests/token_authenticate.rb index b8135513c..d6facf733 100644 --- a/lib/fog/identity/openstack/v3/requests/token_authenticate.rb +++ b/lib/fog/openstack/identity/v3/requests/token_authenticate.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_authenticate(auth) diff --git a/lib/fog/identity/openstack/v3/requests/token_check.rb b/lib/fog/openstack/identity/v3/requests/token_check.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/token_check.rb rename to lib/fog/openstack/identity/v3/requests/token_check.rb index d8d69ad8b..5f850af1d 100644 --- a/lib/fog/identity/openstack/v3/requests/token_check.rb +++ b/lib/fog/openstack/identity/v3/requests/token_check.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_check(subject_token) diff --git a/lib/fog/identity/openstack/v3/requests/token_revoke.rb b/lib/fog/openstack/identity/v3/requests/token_revoke.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/token_revoke.rb rename to lib/fog/openstack/identity/v3/requests/token_revoke.rb index c93c96040..e1c0b6f97 100644 --- a/lib/fog/identity/openstack/v3/requests/token_revoke.rb +++ b/lib/fog/openstack/identity/v3/requests/token_revoke.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_revoke(subject_token) diff --git a/lib/fog/identity/openstack/v3/requests/token_validate.rb b/lib/fog/openstack/identity/v3/requests/token_validate.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/token_validate.rb rename to lib/fog/openstack/identity/v3/requests/token_validate.rb index f19d04b5f..c2b842753 100644 --- a/lib/fog/identity/openstack/v3/requests/token_validate.rb +++ b/lib/fog/openstack/identity/v3/requests/token_validate.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def token_validate(subject_token) diff --git a/lib/fog/identity/openstack/v3/requests/update_domain.rb b/lib/fog/openstack/identity/v3/requests/update_domain.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_domain.rb rename to lib/fog/openstack/identity/v3/requests/update_domain.rb index 28e96ca71..7f430dec3 100644 --- a/lib/fog/identity/openstack/v3/requests/update_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/update_domain.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_domain(id, domain) diff --git a/lib/fog/identity/openstack/v3/requests/update_endpoint.rb b/lib/fog/openstack/identity/v3/requests/update_endpoint.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/update_endpoint.rb rename to lib/fog/openstack/identity/v3/requests/update_endpoint.rb index e66bfb646..e54a9725b 100644 --- a/lib/fog/identity/openstack/v3/requests/update_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/update_endpoint.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_endpoint(id, endpoint) diff --git a/lib/fog/identity/openstack/v3/requests/update_group.rb b/lib/fog/openstack/identity/v3/requests/update_group.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_group.rb rename to lib/fog/openstack/identity/v3/requests/update_group.rb index 8ea59f3bc..e93f851c2 100644 --- a/lib/fog/identity/openstack/v3/requests/update_group.rb +++ b/lib/fog/openstack/identity/v3/requests/update_group.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_group(id, group) diff --git a/lib/fog/identity/openstack/v3/requests/update_os_credential.rb b/lib/fog/openstack/identity/v3/requests/update_os_credential.rb similarity index 91% rename from lib/fog/identity/openstack/v3/requests/update_os_credential.rb rename to lib/fog/openstack/identity/v3/requests/update_os_credential.rb index a547c3aae..74281369d 100644 --- a/lib/fog/identity/openstack/v3/requests/update_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/update_os_credential.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_os_credential(id, credential) diff --git a/lib/fog/identity/openstack/v3/requests/update_policy.rb b/lib/fog/openstack/identity/v3/requests/update_policy.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_policy.rb rename to lib/fog/openstack/identity/v3/requests/update_policy.rb index 05653537b..ad2a19691 100644 --- a/lib/fog/identity/openstack/v3/requests/update_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/update_policy.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_policy(id, policy) diff --git a/lib/fog/identity/openstack/v3/requests/update_project.rb b/lib/fog/openstack/identity/v3/requests/update_project.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_project.rb rename to lib/fog/openstack/identity/v3/requests/update_project.rb index aac584281..91e7e2150 100644 --- a/lib/fog/identity/openstack/v3/requests/update_project.rb +++ b/lib/fog/openstack/identity/v3/requests/update_project.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_project(id, project) diff --git a/lib/fog/identity/openstack/v3/requests/update_role.rb b/lib/fog/openstack/identity/v3/requests/update_role.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_role.rb rename to lib/fog/openstack/identity/v3/requests/update_role.rb index be463ed0a..a93e33291 100644 --- a/lib/fog/identity/openstack/v3/requests/update_role.rb +++ b/lib/fog/openstack/identity/v3/requests/update_role.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_role(id, role) diff --git a/lib/fog/identity/openstack/v3/requests/update_service.rb b/lib/fog/openstack/identity/v3/requests/update_service.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_service.rb rename to lib/fog/openstack/identity/v3/requests/update_service.rb index 1cb56876d..bdfc39f8f 100644 --- a/lib/fog/identity/openstack/v3/requests/update_service.rb +++ b/lib/fog/openstack/identity/v3/requests/update_service.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_service(id, service) diff --git a/lib/fog/identity/openstack/v3/requests/update_user.rb b/lib/fog/openstack/identity/v3/requests/update_user.rb similarity index 90% rename from lib/fog/identity/openstack/v3/requests/update_user.rb rename to lib/fog/openstack/identity/v3/requests/update_user.rb index 1d9595029..9d928493d 100644 --- a/lib/fog/identity/openstack/v3/requests/update_user.rb +++ b/lib/fog/openstack/identity/v3/requests/update_user.rb @@ -1,6 +1,6 @@ module Fog - module Identity - class OpenStack + module OpenStack + class Identity class V3 class Real def update_user(id, user) diff --git a/lib/fog/openstack/image/image.rb b/lib/fog/openstack/image/image.rb new file mode 100644 index 000000000..7d9d9a20d --- /dev/null +++ b/lib/fog/openstack/image/image.rb @@ -0,0 +1,23 @@ + + +module Fog + module OpenStack + class Image < Fog::Service + autoload :V1, 'fog/openstack/image/v1' + autoload :V2, 'fog/openstack/image/v2' + + # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Image::V2 or a Fog::OpenStack::Image::V1, + # choosing the latest available + def self.new(args = {}) + @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] + if inspect == 'Fog::OpenStack::Image' + service = Fog::OpenStack::Image::V2.new(args) unless args.empty? + service ||= Fog::OpenStack::Image::V1.new(args) + else + service = Fog::Service.new(args) + end + service + end + end + end +end diff --git a/lib/fog/image/openstack/v1.rb b/lib/fog/openstack/image/v1.rb similarity index 94% rename from lib/fog/image/openstack/v1.rb rename to lib/fog/openstack/image/v1.rb index a08d1e51b..5c0183a4e 100644 --- a/lib/fog/image/openstack/v1.rb +++ b/lib/fog/openstack/image/v1.rb @@ -1,8 +1,8 @@ -require 'fog/image/openstack' +require 'fog/openstack/image/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 < Fog::Service SUPPORTED_VERSIONS = /v1(\.(0|1))*/ @@ -18,12 +18,12 @@ class V1 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/image/openstack/v1/models' + model_path 'fog/openstack/image/v1/models' model :image collection :images - request_path 'fog/image/openstack/v1/requests' + request_path 'fog/openstack/image/v1/requests' request :list_public_images request :list_public_images_detailed @@ -99,7 +99,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Image::OpenStack::NotFound + Fog::OpenStack::Image::NotFound end def default_endpoint_type diff --git a/lib/fog/image/openstack/v1/models/image.rb b/lib/fog/openstack/image/v1/models/image.rb similarity index 98% rename from lib/fog/image/openstack/v1/models/image.rb rename to lib/fog/openstack/image/v1/models/image.rb index 2d911e2a6..dfd3eae11 100644 --- a/lib/fog/image/openstack/v1/models/image.rb +++ b/lib/fog/openstack/image/v1/models/image.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Image < Fog::OpenStack::Model identity :id diff --git a/lib/fog/image/openstack/v1/models/images.rb b/lib/fog/openstack/image/v1/models/images.rb similarity index 94% rename from lib/fog/image/openstack/v1/models/images.rb rename to lib/fog/openstack/image/v1/models/images.rb index dee79dcb9..095a3a4a3 100644 --- a/lib/fog/image/openstack/v1/models/images.rb +++ b/lib/fog/openstack/image/v1/models/images.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/image/openstack/v1/models/image' +require 'fog/openstack/image/v1/models/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Images < Fog::OpenStack::Collection - model Fog::Image::OpenStack::V1::Image + model Fog::OpenStack::Image::V1::Image def all(options = {}) load_response(service.list_public_images_detailed(options), 'images') @@ -38,7 +38,7 @@ def find_by_id(id) params['properties'] = custom_properties new(params) - rescue Fog::Image::OpenStack::NotFound + rescue Fog::OpenStack::Image::NotFound nil end alias get find_by_id diff --git a/lib/fog/image/openstack/v1/requests/add_member_to_image.rb b/lib/fog/openstack/image/v1/requests/add_member_to_image.rb similarity index 93% rename from lib/fog/image/openstack/v1/requests/add_member_to_image.rb rename to lib/fog/openstack/image/v1/requests/add_member_to_image.rb index f6bbb33f0..9dec5a819 100644 --- a/lib/fog/image/openstack/v1/requests/add_member_to_image.rb +++ b/lib/fog/openstack/image/v1/requests/add_member_to_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def add_member_to_image(image_id, tenant_id) diff --git a/lib/fog/image/openstack/v1/requests/create_image.rb b/lib/fog/openstack/image/v1/requests/create_image.rb similarity index 98% rename from lib/fog/image/openstack/v1/requests/create_image.rb rename to lib/fog/openstack/image/v1/requests/create_image.rb index 23f515b45..16306b353 100644 --- a/lib/fog/image/openstack/v1/requests/create_image.rb +++ b/lib/fog/openstack/image/v1/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def create_image(attributes) diff --git a/lib/fog/image/openstack/v1/requests/delete_image.rb b/lib/fog/openstack/image/v1/requests/delete_image.rb similarity index 93% rename from lib/fog/image/openstack/v1/requests/delete_image.rb rename to lib/fog/openstack/image/v1/requests/delete_image.rb index 5e64ecd0d..36393e08b 100644 --- a/lib/fog/image/openstack/v1/requests/delete_image.rb +++ b/lib/fog/openstack/image/v1/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def delete_image(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_image.rb b/lib/fog/openstack/image/v1/requests/get_image.rb similarity index 98% rename from lib/fog/image/openstack/v1/requests/get_image.rb rename to lib/fog/openstack/image/v1/requests/get_image.rb index 69db152ac..87a68789f 100644 --- a/lib/fog/image/openstack/v1/requests/get_image.rb +++ b/lib/fog/openstack/image/v1/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_image(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_image_by_id.rb b/lib/fog/openstack/image/v1/requests/get_image_by_id.rb similarity index 97% rename from lib/fog/image/openstack/v1/requests/get_image_by_id.rb rename to lib/fog/openstack/image/v1/requests/get_image_by_id.rb index 9c2c32e92..ef9441edf 100644 --- a/lib/fog/image/openstack/v1/requests/get_image_by_id.rb +++ b/lib/fog/openstack/image/v1/requests/get_image_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_image_by_id(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_image_members.rb b/lib/fog/openstack/image/v1/requests/get_image_members.rb similarity index 95% rename from lib/fog/image/openstack/v1/requests/get_image_members.rb rename to lib/fog/openstack/image/v1/requests/get_image_members.rb index 55f4917c4..89b479b53 100644 --- a/lib/fog/image/openstack/v1/requests/get_image_members.rb +++ b/lib/fog/openstack/image/v1/requests/get_image_members.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_image_members(image_id) diff --git a/lib/fog/image/openstack/v1/requests/get_shared_images.rb b/lib/fog/openstack/image/v1/requests/get_shared_images.rb similarity index 95% rename from lib/fog/image/openstack/v1/requests/get_shared_images.rb rename to lib/fog/openstack/image/v1/requests/get_shared_images.rb index 82a4bec92..5c25aac42 100644 --- a/lib/fog/image/openstack/v1/requests/get_shared_images.rb +++ b/lib/fog/openstack/image/v1/requests/get_shared_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def get_shared_images(tenant_id) diff --git a/lib/fog/image/openstack/v1/requests/list_public_images.rb b/lib/fog/openstack/image/v1/requests/list_public_images.rb similarity index 96% rename from lib/fog/image/openstack/v1/requests/list_public_images.rb rename to lib/fog/openstack/image/v1/requests/list_public_images.rb index 3e48e1557..34fd231ec 100644 --- a/lib/fog/image/openstack/v1/requests/list_public_images.rb +++ b/lib/fog/openstack/image/v1/requests/list_public_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def list_public_images(options = {}) diff --git a/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb b/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb similarity index 96% rename from lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb rename to lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb index 3e3423553..d6c18c623 100644 --- a/lib/fog/image/openstack/v1/requests/list_public_images_detailed.rb +++ b/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def list_public_images_detailed(options = {}, query_deprecated = nil) diff --git a/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb b/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb similarity index 94% rename from lib/fog/image/openstack/v1/requests/remove_member_from_image.rb rename to lib/fog/openstack/image/v1/requests/remove_member_from_image.rb index c23bae900..a40e457bb 100644 --- a/lib/fog/image/openstack/v1/requests/remove_member_from_image.rb +++ b/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def remove_member_from_image(image_id, member_id) diff --git a/lib/fog/image/openstack/v1/requests/set_tenant.rb b/lib/fog/openstack/image/v1/requests/set_tenant.rb similarity index 90% rename from lib/fog/image/openstack/v1/requests/set_tenant.rb rename to lib/fog/openstack/image/v1/requests/set_tenant.rb index a65b20c12..e973c9bfa 100644 --- a/lib/fog/image/openstack/v1/requests/set_tenant.rb +++ b/lib/fog/openstack/image/v1/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def set_tenant(tenant) diff --git a/lib/fog/image/openstack/v1/requests/update_image.rb b/lib/fog/openstack/image/v1/requests/update_image.rb similarity index 98% rename from lib/fog/image/openstack/v1/requests/update_image.rb rename to lib/fog/openstack/image/v1/requests/update_image.rb index f0242576b..a7d0e238c 100644 --- a/lib/fog/image/openstack/v1/requests/update_image.rb +++ b/lib/fog/openstack/image/v1/requests/update_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def update_image(attributes) diff --git a/lib/fog/image/openstack/v1/requests/update_image_members.rb b/lib/fog/openstack/image/v1/requests/update_image_members.rb similarity index 96% rename from lib/fog/image/openstack/v1/requests/update_image_members.rb rename to lib/fog/openstack/image/v1/requests/update_image_members.rb index 3a2129ccd..65751cb34 100644 --- a/lib/fog/image/openstack/v1/requests/update_image_members.rb +++ b/lib/fog/openstack/image/v1/requests/update_image_members.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V1 class Real def update_image_members(image_id, members) diff --git a/lib/fog/image/openstack/v2.rb b/lib/fog/openstack/image/v2.rb similarity index 94% rename from lib/fog/image/openstack/v2.rb rename to lib/fog/openstack/image/v2.rb index b7cdc9f2e..f613988f9 100644 --- a/lib/fog/image/openstack/v2.rb +++ b/lib/fog/openstack/image/v2.rb @@ -1,8 +1,8 @@ -require 'fog/image/openstack' +require 'fog/openstack/image/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 < Fog::Service SUPPORTED_VERSIONS = /v2(\.(0|1|2|3))*/ @@ -18,12 +18,12 @@ class V2 < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/image/openstack/v2/models' + model_path 'fog/openstack/image/v2/models' model :image collection :images - request_path 'fog/image/openstack/v2/requests' + request_path 'fog/openstack/image/v2/requests' request :list_images request :get_image @@ -107,7 +107,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Image::OpenStack::NotFound + Fog::OpenStack::Image::NotFound end def default_endpoint_type diff --git a/lib/fog/image/openstack/v2/models/image.rb b/lib/fog/openstack/image/v2/models/image.rb similarity index 99% rename from lib/fog/image/openstack/v2/models/image.rb rename to lib/fog/openstack/image/v2/models/image.rb index 52a7b2768..69fcc0c99 100644 --- a/lib/fog/image/openstack/v2/models/image.rb +++ b/lib/fog/openstack/image/v2/models/image.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Image < Fog::OpenStack::Model identity :id diff --git a/lib/fog/image/openstack/v2/models/images.rb b/lib/fog/openstack/image/v2/models/images.rb similarity index 89% rename from lib/fog/image/openstack/v2/models/images.rb rename to lib/fog/openstack/image/v2/models/images.rb index f17bdfedf..4030816ac 100644 --- a/lib/fog/image/openstack/v2/models/images.rb +++ b/lib/fog/openstack/image/v2/models/images.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/image/openstack/v2/models/image' +require 'fog/openstack/image/v2/models/image' module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Images < Fog::OpenStack::Collection - model Fog::Image::OpenStack::V2::Image + model Fog::OpenStack::Image::V2::Image def all(options = {}) load_response(service.list_images(options), 'images') @@ -18,7 +18,7 @@ def summary(options = {}) def find_by_id(id) new(service.get_image_by_id(id).body) - rescue Fog::Image::OpenStack::NotFound + rescue Fog::OpenStack::Image::NotFound nil end diff --git a/lib/fog/image/openstack/v2/requests/add_member_to_image.rb b/lib/fog/openstack/image/v2/requests/add_member_to_image.rb similarity index 94% rename from lib/fog/image/openstack/v2/requests/add_member_to_image.rb rename to lib/fog/openstack/image/v2/requests/add_member_to_image.rb index 1d867a234..512392f23 100644 --- a/lib/fog/image/openstack/v2/requests/add_member_to_image.rb +++ b/lib/fog/openstack/image/v2/requests/add_member_to_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def add_member_to_image(image_id, tenant_id) diff --git a/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb b/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/add_tag_to_image.rb rename to lib/fog/openstack/image/v2/requests/add_tag_to_image.rb index f22e6bdfb..682bd64de 100644 --- a/lib/fog/image/openstack/v2/requests/add_tag_to_image.rb +++ b/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def add_tag_to_image(image_id, tag) diff --git a/lib/fog/image/openstack/v2/requests/create_image.rb b/lib/fog/openstack/image/v2/requests/create_image.rb similarity index 97% rename from lib/fog/image/openstack/v2/requests/create_image.rb rename to lib/fog/openstack/image/v2/requests/create_image.rb index a3864ee14..8c92fe7cb 100644 --- a/lib/fog/image/openstack/v2/requests/create_image.rb +++ b/lib/fog/openstack/image/v2/requests/create_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def create_image(image) diff --git a/lib/fog/image/openstack/v2/requests/deactivate_image.rb b/lib/fog/openstack/image/v2/requests/deactivate_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/deactivate_image.rb rename to lib/fog/openstack/image/v2/requests/deactivate_image.rb index f6a7e37a1..02f8c2c43 100644 --- a/lib/fog/image/openstack/v2/requests/deactivate_image.rb +++ b/lib/fog/openstack/image/v2/requests/deactivate_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def deactivate_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/delete_image.rb b/lib/fog/openstack/image/v2/requests/delete_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/delete_image.rb rename to lib/fog/openstack/image/v2/requests/delete_image.rb index 257794741..8275cd351 100644 --- a/lib/fog/image/openstack/v2/requests/delete_image.rb +++ b/lib/fog/openstack/image/v2/requests/delete_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def delete_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/download_image.rb b/lib/fog/openstack/image/v2/requests/download_image.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/download_image.rb rename to lib/fog/openstack/image/v2/requests/download_image.rb index eb0d306cc..76924090d 100644 --- a/lib/fog/image/openstack/v2/requests/download_image.rb +++ b/lib/fog/openstack/image/v2/requests/download_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def download_image(image_id, _content_range = nil, params) # TODO: implement content range handling diff --git a/lib/fog/image/openstack/v2/requests/get_image.rb b/lib/fog/openstack/image/v2/requests/get_image.rb similarity index 98% rename from lib/fog/image/openstack/v2/requests/get_image.rb rename to lib/fog/openstack/image/v2/requests/get_image.rb index 0c84793f3..d686ef716 100644 --- a/lib/fog/image/openstack/v2/requests/get_image.rb +++ b/lib/fog/openstack/image/v2/requests/get_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/get_image_by_id.rb b/lib/fog/openstack/image/v2/requests/get_image_by_id.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/get_image_by_id.rb rename to lib/fog/openstack/image/v2/requests/get_image_by_id.rb index ef7dbcbb7..4f9943347 100644 --- a/lib/fog/image/openstack/v2/requests/get_image_by_id.rb +++ b/lib/fog/openstack/image/v2/requests/get_image_by_id.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_image_by_id(image_id) diff --git a/lib/fog/image/openstack/v2/requests/get_image_members.rb b/lib/fog/openstack/image/v2/requests/get_image_members.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/get_image_members.rb rename to lib/fog/openstack/image/v2/requests/get_image_members.rb index 37fa276ba..9f788c7f4 100644 --- a/lib/fog/image/openstack/v2/requests/get_image_members.rb +++ b/lib/fog/openstack/image/v2/requests/get_image_members.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_image_members(image_id) diff --git a/lib/fog/image/openstack/v2/requests/get_member_details.rb b/lib/fog/openstack/image/v2/requests/get_member_details.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/get_member_details.rb rename to lib/fog/openstack/image/v2/requests/get_member_details.rb index 88bda499c..6d8942ead 100644 --- a/lib/fog/image/openstack/v2/requests/get_member_details.rb +++ b/lib/fog/openstack/image/v2/requests/get_member_details.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_member_details(image_id, member_id) diff --git a/lib/fog/image/openstack/v2/requests/get_shared_images.rb b/lib/fog/openstack/image/v2/requests/get_shared_images.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/get_shared_images.rb rename to lib/fog/openstack/image/v2/requests/get_shared_images.rb index 8812a5686..9f9479b41 100644 --- a/lib/fog/image/openstack/v2/requests/get_shared_images.rb +++ b/lib/fog/openstack/image/v2/requests/get_shared_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def get_shared_images(tenant_id) diff --git a/lib/fog/image/openstack/v2/requests/list_images.rb b/lib/fog/openstack/image/v2/requests/list_images.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/list_images.rb rename to lib/fog/openstack/image/v2/requests/list_images.rb index cd95d7a5f..e4ac2e794 100644 --- a/lib/fog/image/openstack/v2/requests/list_images.rb +++ b/lib/fog/openstack/image/v2/requests/list_images.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def list_images(options = {}) diff --git a/lib/fog/image/openstack/v2/requests/reactivate_image.rb b/lib/fog/openstack/image/v2/requests/reactivate_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/reactivate_image.rb rename to lib/fog/openstack/image/v2/requests/reactivate_image.rb index b4877c8cd..49fc76802 100644 --- a/lib/fog/image/openstack/v2/requests/reactivate_image.rb +++ b/lib/fog/openstack/image/v2/requests/reactivate_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def reactivate_image(image_id) diff --git a/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb b/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb similarity index 94% rename from lib/fog/image/openstack/v2/requests/remove_member_from_image.rb rename to lib/fog/openstack/image/v2/requests/remove_member_from_image.rb index a9b7fba3a..ef5ee7b76 100644 --- a/lib/fog/image/openstack/v2/requests/remove_member_from_image.rb +++ b/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def remove_member_from_image(image_id, member_id) diff --git a/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb b/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb similarity index 93% rename from lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb rename to lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb index 32a22f3b3..e550f63d3 100644 --- a/lib/fog/image/openstack/v2/requests/remove_tag_from_image.rb +++ b/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def remove_tag_from_image(image_id, tag) diff --git a/lib/fog/image/openstack/v2/requests/set_tenant.rb b/lib/fog/openstack/image/v2/requests/set_tenant.rb similarity index 90% rename from lib/fog/image/openstack/v2/requests/set_tenant.rb rename to lib/fog/openstack/image/v2/requests/set_tenant.rb index 56f1445b7..90e408571 100644 --- a/lib/fog/image/openstack/v2/requests/set_tenant.rb +++ b/lib/fog/openstack/image/v2/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def set_tenant(tenant) diff --git a/lib/fog/image/openstack/v2/requests/update_image.rb b/lib/fog/openstack/image/v2/requests/update_image.rb similarity index 98% rename from lib/fog/image/openstack/v2/requests/update_image.rb rename to lib/fog/openstack/image/v2/requests/update_image.rb index 4891b1d53..cead9ed33 100644 --- a/lib/fog/image/openstack/v2/requests/update_image.rb +++ b/lib/fog/openstack/image/v2/requests/update_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def update_image(id, json_patch) diff --git a/lib/fog/image/openstack/v2/requests/update_image_member.rb b/lib/fog/openstack/image/v2/requests/update_image_member.rb similarity index 96% rename from lib/fog/image/openstack/v2/requests/update_image_member.rb rename to lib/fog/openstack/image/v2/requests/update_image_member.rb index eefc31a20..40fa17a2e 100644 --- a/lib/fog/image/openstack/v2/requests/update_image_member.rb +++ b/lib/fog/openstack/image/v2/requests/update_image_member.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def update_image_member(image_id, member) diff --git a/lib/fog/image/openstack/v2/requests/upload_image.rb b/lib/fog/openstack/image/v2/requests/upload_image.rb similarity index 95% rename from lib/fog/image/openstack/v2/requests/upload_image.rb rename to lib/fog/openstack/image/v2/requests/upload_image.rb index 65d0b20db..e0ef0906b 100644 --- a/lib/fog/image/openstack/v2/requests/upload_image.rb +++ b/lib/fog/openstack/image/v2/requests/upload_image.rb @@ -1,6 +1,6 @@ module Fog - module Image - class OpenStack + module OpenStack + class Image class V2 class Real def upload_image(image_id, body, params = {}) diff --git a/lib/fog/introspection/openstack.rb b/lib/fog/openstack/introspection/introspection.rb similarity index 85% rename from lib/fog/introspection/openstack.rb rename to lib/fog/openstack/introspection/introspection.rb index 0bd02278a..67430dd00 100644 --- a/lib/fog/introspection/openstack.rb +++ b/lib/fog/openstack/introspection/introspection.rb @@ -1,8 +1,8 @@ require 'yaml' module Fog - module Introspection - class OpenStack < Fog::Service + module OpenStack + class Introspection < Fog::Service SUPPORTED_VERSIONS = /v1/ requires :openstack_auth_url @@ -19,7 +19,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/introspection/openstack/requests' + request_path 'fog/openstack/introspection/requests' # Introspection requests request :create_introspection @@ -36,7 +36,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/introspection/openstack/models' + model_path 'fog/openstack/introspection/models' model :rules collection :rules_collection @@ -44,8 +44,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| # Introspection data is *huge* we load it from a yaml file - file = "../../../../test/fixtures/introspection.yaml" - hash[key] = YAML.load(File.read(File.expand_path(file, __FILE__))) + file = "test/fixtures/introspection.yaml" + hash[key] = YAML.load(File.read(file)) end end @@ -73,7 +73,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Introspection::OpenStack::NotFound + Fog::OpenStack::Introspection::NotFound end def default_path_prefix diff --git a/lib/fog/introspection/openstack/models/rules.rb b/lib/fog/openstack/introspection/models/rules.rb similarity index 93% rename from lib/fog/introspection/openstack/models/rules.rb rename to lib/fog/openstack/introspection/models/rules.rb index 3db449d57..acdd3d037 100644 --- a/lib/fog/introspection/openstack/models/rules.rb +++ b/lib/fog/openstack/introspection/models/rules.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Rules < Fog::OpenStack::Model identity :uuid diff --git a/lib/fog/introspection/openstack/models/rules_collection.rb b/lib/fog/openstack/introspection/models/rules_collection.rb similarity index 71% rename from lib/fog/introspection/openstack/models/rules_collection.rb rename to lib/fog/openstack/introspection/models/rules_collection.rb index b6b437a0a..6b7e8e0db 100644 --- a/lib/fog/introspection/openstack/models/rules_collection.rb +++ b/lib/fog/openstack/introspection/models/rules_collection.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/introspection/openstack/models/rules' +require 'fog/openstack/introspection/models/rules' module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class RulesCollection < Fog::OpenStack::Collection - model Fog::Introspection::OpenStack::Rules + model Fog::OpenStack::Introspection::Rules def all(_options = {}) load_response(service.list_rules, 'rules') @@ -14,7 +14,7 @@ def all(_options = {}) def get(uuid) data = service.get_rules(uuid).body new(data) - rescue Fog::Introspection::OpenStack::NotFound + rescue Fog::OpenStack::Introspection::NotFound nil end diff --git a/lib/fog/introspection/openstack/requests/abort_introspection.rb b/lib/fog/openstack/introspection/requests/abort_introspection.rb similarity index 91% rename from lib/fog/introspection/openstack/requests/abort_introspection.rb rename to lib/fog/openstack/introspection/requests/abort_introspection.rb index 61dcebc94..51f127952 100644 --- a/lib/fog/introspection/openstack/requests/abort_introspection.rb +++ b/lib/fog/openstack/introspection/requests/abort_introspection.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def abort_introspection(node_id) request( diff --git a/lib/fog/introspection/openstack/requests/create_introspection.rb b/lib/fog/openstack/introspection/requests/create_introspection.rb similarity index 94% rename from lib/fog/introspection/openstack/requests/create_introspection.rb rename to lib/fog/openstack/introspection/requests/create_introspection.rb index 46ad193ce..cc05eeb7c 100644 --- a/lib/fog/introspection/openstack/requests/create_introspection.rb +++ b/lib/fog/openstack/introspection/requests/create_introspection.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def create_introspection(node_id, options = {}) if options diff --git a/lib/fog/introspection/openstack/requests/create_rules.rb b/lib/fog/openstack/introspection/requests/create_rules.rb similarity index 94% rename from lib/fog/introspection/openstack/requests/create_rules.rb rename to lib/fog/openstack/introspection/requests/create_rules.rb index da921cf4a..d3332186f 100644 --- a/lib/fog/introspection/openstack/requests/create_rules.rb +++ b/lib/fog/openstack/introspection/requests/create_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def create_rules(attributes) attributes_valid = [ diff --git a/lib/fog/introspection/openstack/requests/delete_rules.rb b/lib/fog/openstack/introspection/requests/delete_rules.rb similarity index 90% rename from lib/fog/introspection/openstack/requests/delete_rules.rb rename to lib/fog/openstack/introspection/requests/delete_rules.rb index fc254ed05..6a8eba027 100644 --- a/lib/fog/introspection/openstack/requests/delete_rules.rb +++ b/lib/fog/openstack/introspection/requests/delete_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def delete_rules(rule_id) request( diff --git a/lib/fog/introspection/openstack/requests/delete_rules_all.rb b/lib/fog/openstack/introspection/requests/delete_rules_all.rb similarity index 89% rename from lib/fog/introspection/openstack/requests/delete_rules_all.rb rename to lib/fog/openstack/introspection/requests/delete_rules_all.rb index 9449e7f0e..086296f73 100644 --- a/lib/fog/introspection/openstack/requests/delete_rules_all.rb +++ b/lib/fog/openstack/introspection/requests/delete_rules_all.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def delete_rules_all request( diff --git a/lib/fog/introspection/openstack/requests/get_introspection.rb b/lib/fog/openstack/introspection/requests/get_introspection.rb similarity index 91% rename from lib/fog/introspection/openstack/requests/get_introspection.rb rename to lib/fog/openstack/introspection/requests/get_introspection.rb index 3e8dff436..04cacb96e 100644 --- a/lib/fog/introspection/openstack/requests/get_introspection.rb +++ b/lib/fog/openstack/introspection/requests/get_introspection.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def get_introspection(node_id) request( diff --git a/lib/fog/introspection/openstack/requests/get_introspection_details.rb b/lib/fog/openstack/introspection/requests/get_introspection_details.rb similarity index 92% rename from lib/fog/introspection/openstack/requests/get_introspection_details.rb rename to lib/fog/openstack/introspection/requests/get_introspection_details.rb index 6a4d05d45..610c86955 100644 --- a/lib/fog/introspection/openstack/requests/get_introspection_details.rb +++ b/lib/fog/openstack/introspection/requests/get_introspection_details.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def get_introspection_details(node_id) request( diff --git a/lib/fog/introspection/openstack/requests/get_rules.rb b/lib/fog/openstack/introspection/requests/get_rules.rb similarity index 91% rename from lib/fog/introspection/openstack/requests/get_rules.rb rename to lib/fog/openstack/introspection/requests/get_rules.rb index 32e0ab150..c5df3e31f 100644 --- a/lib/fog/introspection/openstack/requests/get_rules.rb +++ b/lib/fog/openstack/introspection/requests/get_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def get_rules(rule_id) request( diff --git a/lib/fog/introspection/openstack/requests/list_rules.rb b/lib/fog/openstack/introspection/requests/list_rules.rb similarity index 90% rename from lib/fog/introspection/openstack/requests/list_rules.rb rename to lib/fog/openstack/introspection/requests/list_rules.rb index 5439da840..c05261574 100644 --- a/lib/fog/introspection/openstack/requests/list_rules.rb +++ b/lib/fog/openstack/introspection/requests/list_rules.rb @@ -1,6 +1,6 @@ module Fog - module Introspection - class OpenStack + module OpenStack + class Introspection class Real def list_rules request( diff --git a/lib/fog/key_manager/openstack.rb b/lib/fog/openstack/key_manager/key_manager.rb similarity index 94% rename from lib/fog/key_manager/openstack.rb rename to lib/fog/openstack/key_manager/key_manager.rb index dc56d3f90..5c411cc31 100644 --- a/lib/fog/key_manager/openstack.rb +++ b/lib/fog/openstack/key_manager/key_manager.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack < Fog::Service + module OpenStack + class KeyManager < Fog::Service SUPPORTED_VERSIONS = /v1(\.0)*/ requires :openstack_auth_url @@ -18,7 +18,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/key_manager/openstack/models' + model_path 'fog/openstack/key_manager/models' model :secret collection :secrets model :container @@ -28,7 +28,7 @@ class OpenStack < Fog::Service ## REQUESTS # secrets - request_path 'fog/key_manager/openstack/requests' + request_path 'fog/openstack/key_manager/requests' request :create_secret request :list_secrets request :get_secret @@ -93,7 +93,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::KeyManager::OpenStack::NotFound + Fog::OpenStack::KeyManager::NotFound end def default_path_prefix diff --git a/lib/fog/key_manager/openstack/models/acl.rb b/lib/fog/openstack/key_manager/models/acl.rb similarity index 90% rename from lib/fog/key_manager/openstack/models/acl.rb rename to lib/fog/openstack/key_manager/models/acl.rb index 9602e8451..1b52d7cfa 100644 --- a/lib/fog/key_manager/openstack/models/acl.rb +++ b/lib/fog/openstack/key_manager/models/acl.rb @@ -2,8 +2,8 @@ require 'fog/openstack/models/model' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class ACL < Fog::OpenStack::Model identity :acl_ref diff --git a/lib/fog/key_manager/openstack/models/container.rb b/lib/fog/openstack/key_manager/models/container.rb similarity index 94% rename from lib/fog/key_manager/openstack/models/container.rb rename to lib/fog/openstack/key_manager/models/container.rb index 3ebd6511e..4d5fb89ca 100644 --- a/lib/fog/key_manager/openstack/models/container.rb +++ b/lib/fog/openstack/key_manager/models/container.rb @@ -2,8 +2,8 @@ require 'uri' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Container < Fog::OpenStack::Model identity :container_ref @@ -41,4 +41,4 @@ def destroy end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/models/containers.rb b/lib/fog/openstack/key_manager/models/containers.rb similarity index 66% rename from lib/fog/key_manager/openstack/models/containers.rb rename to lib/fog/openstack/key_manager/models/containers.rb index ea73a8d73..0df3c9762 100644 --- a/lib/fog/key_manager/openstack/models/containers.rb +++ b/lib/fog/openstack/key_manager/models/containers.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/key_manager/openstack/models/container' +require 'fog/openstack/key_manager/models/container' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Containers < Fog::OpenStack::Collection - model Fog::KeyManager::OpenStack::Container + model Fog::OpenStack::KeyManager::Container def all(options = {}) load_response(service.list_containers(options), 'containers') @@ -15,11 +15,11 @@ def get(secret_ref) if secret = service.get_container(secret_ref).body new(secret) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/models/secret.rb b/lib/fog/openstack/key_manager/models/secret.rb similarity index 95% rename from lib/fog/key_manager/openstack/models/secret.rb rename to lib/fog/openstack/key_manager/models/secret.rb index 06c63652c..af55f07de 100644 --- a/lib/fog/key_manager/openstack/models/secret.rb +++ b/lib/fog/openstack/key_manager/models/secret.rb @@ -2,8 +2,8 @@ require 'uri' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Secret < Fog::OpenStack::Model identity :secret_ref @@ -50,4 +50,4 @@ def destroy end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/models/secrets.rb b/lib/fog/openstack/key_manager/models/secrets.rb similarity index 66% rename from lib/fog/key_manager/openstack/models/secrets.rb rename to lib/fog/openstack/key_manager/models/secrets.rb index 6858b5e12..5d133965d 100644 --- a/lib/fog/key_manager/openstack/models/secrets.rb +++ b/lib/fog/openstack/key_manager/models/secrets.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/key_manager/openstack/models/secret' +require 'fog/openstack/key_manager/models/secret' module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Secrets < Fog::OpenStack::Collection - model Fog::KeyManager::OpenStack::Secret + model Fog::OpenStack::KeyManager::Secret def all(options = {}) load_response(service.list_secrets(options), 'secrets') @@ -15,11 +15,11 @@ def get(secret_ref) if secret = service.get_secret(secret_ref).body new(secret) end - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/create_container.rb b/lib/fog/openstack/key_manager/requests/create_container.rb similarity index 87% rename from lib/fog/key_manager/openstack/requests/create_container.rb rename to lib/fog/openstack/key_manager/requests/create_container.rb index 283e9b9a5..3ce4b3a0e 100644 --- a/lib/fog/key_manager/openstack/requests/create_container.rb +++ b/lib/fog/openstack/key_manager/requests/create_container.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def create_container(options) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/create_secret.rb b/lib/fog/openstack/key_manager/requests/create_secret.rb similarity index 87% rename from lib/fog/key_manager/openstack/requests/create_secret.rb rename to lib/fog/openstack/key_manager/requests/create_secret.rb index 03914933f..fad47e055 100644 --- a/lib/fog/key_manager/openstack/requests/create_secret.rb +++ b/lib/fog/openstack/key_manager/requests/create_secret.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def create_secret(options) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/delete_container.rb b/lib/fog/openstack/key_manager/requests/delete_container.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/delete_container.rb rename to lib/fog/openstack/key_manager/requests/delete_container.rb index ef0fa356e..571ae2a98 100644 --- a/lib/fog/key_manager/openstack/requests/delete_container.rb +++ b/lib/fog/openstack/key_manager/requests/delete_container.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_container(id) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/delete_container_acl.rb b/lib/fog/openstack/key_manager/requests/delete_container_acl.rb similarity index 91% rename from lib/fog/key_manager/openstack/requests/delete_container_acl.rb rename to lib/fog/openstack/key_manager/requests/delete_container_acl.rb index bf19f5e2d..803712bc8 100644 --- a/lib/fog/key_manager/openstack/requests/delete_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/delete_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_container_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/delete_secret.rb b/lib/fog/openstack/key_manager/requests/delete_secret.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/delete_secret.rb rename to lib/fog/openstack/key_manager/requests/delete_secret.rb index 5d4201187..d5f439c3a 100644 --- a/lib/fog/key_manager/openstack/requests/delete_secret.rb +++ b/lib/fog/openstack/key_manager/requests/delete_secret.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_secret(id) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/delete_secret_acl.rb b/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb similarity index 91% rename from lib/fog/key_manager/openstack/requests/delete_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/delete_secret_acl.rb index 7ff365869..446d8ff4a 100644 --- a/lib/fog/key_manager/openstack/requests/delete_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def delete_secret_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/get_container.rb b/lib/fog/openstack/key_manager/requests/get_container.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/get_container.rb rename to lib/fog/openstack/key_manager/requests/get_container.rb index 4b5684a74..b8293f7ba 100644 --- a/lib/fog/key_manager/openstack/requests/get_container.rb +++ b/lib/fog/openstack/key_manager/requests/get_container.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_container(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/get_container_acl.rb b/lib/fog/openstack/key_manager/requests/get_container_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/get_container_acl.rb rename to lib/fog/openstack/key_manager/requests/get_container_acl.rb index 3523a6f69..07c33ca93 100644 --- a/lib/fog/key_manager/openstack/requests/get_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/get_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_container_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/get_secret.rb b/lib/fog/openstack/key_manager/requests/get_secret.rb similarity index 85% rename from lib/fog/key_manager/openstack/requests/get_secret.rb rename to lib/fog/openstack/key_manager/requests/get_secret.rb index 0085f75ec..52814f8f7 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/get_secret_acl.rb b/lib/fog/openstack/key_manager/requests/get_secret_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/get_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/get_secret_acl.rb index 6f5c2f1c6..5205edecf 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret_acl(uuid) request( diff --git a/lib/fog/key_manager/openstack/requests/get_secret_metadata.rb b/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb similarity index 86% rename from lib/fog/key_manager/openstack/requests/get_secret_metadata.rb rename to lib/fog/openstack/key_manager/requests/get_secret_metadata.rb index a91a00391..05ae2fc98 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret_metadata.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret_metadata(uuid) request( @@ -15,4 +15,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/get_secret_payload.rb b/lib/fog/openstack/key_manager/requests/get_secret_payload.rb similarity index 88% rename from lib/fog/key_manager/openstack/requests/get_secret_payload.rb rename to lib/fog/openstack/key_manager/requests/get_secret_payload.rb index 29a3ec0f2..042855c51 100644 --- a/lib/fog/key_manager/openstack/requests/get_secret_payload.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_payload.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def get_secret_payload(uuid) request( @@ -18,4 +18,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/list_containers.rb b/lib/fog/openstack/key_manager/requests/list_containers.rb similarity index 87% rename from lib/fog/key_manager/openstack/requests/list_containers.rb rename to lib/fog/openstack/key_manager/requests/list_containers.rb index cd0f2cdbe..f89b699c1 100644 --- a/lib/fog/key_manager/openstack/requests/list_containers.rb +++ b/lib/fog/openstack/key_manager/requests/list_containers.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def list_containers(options = {}) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/list_secrets.rb b/lib/fog/openstack/key_manager/requests/list_secrets.rb similarity index 86% rename from lib/fog/key_manager/openstack/requests/list_secrets.rb rename to lib/fog/openstack/key_manager/requests/list_secrets.rb index 7bbbbce41..612da0d7b 100644 --- a/lib/fog/key_manager/openstack/requests/list_secrets.rb +++ b/lib/fog/openstack/key_manager/requests/list_secrets.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def list_secrets(options = {}) request( @@ -16,4 +16,4 @@ class Mock end end end -end \ No newline at end of file +end diff --git a/lib/fog/key_manager/openstack/requests/replace_container_acl.rb b/lib/fog/openstack/key_manager/requests/replace_container_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/replace_container_acl.rb rename to lib/fog/openstack/key_manager/requests/replace_container_acl.rb index 50000cec8..24ec6fb12 100644 --- a/lib/fog/key_manager/openstack/requests/replace_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/replace_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def replace_container_acl(uuid, options) request( diff --git a/lib/fog/key_manager/openstack/requests/replace_secret_acl.rb b/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb similarity index 93% rename from lib/fog/key_manager/openstack/requests/replace_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/replace_secret_acl.rb index e4960c7b9..62559ebaa 100644 --- a/lib/fog/key_manager/openstack/requests/replace_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def replace_secret_acl(uuid, options) request( diff --git a/lib/fog/key_manager/openstack/requests/update_container_acl.rb b/lib/fog/openstack/key_manager/requests/update_container_acl.rb similarity index 94% rename from lib/fog/key_manager/openstack/requests/update_container_acl.rb rename to lib/fog/openstack/key_manager/requests/update_container_acl.rb index 01657b1c9..f65ccdff2 100644 --- a/lib/fog/key_manager/openstack/requests/update_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/update_container_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def update_container_acl(uuid, options) request( diff --git a/lib/fog/key_manager/openstack/requests/update_secret_acl.rb b/lib/fog/openstack/key_manager/requests/update_secret_acl.rb similarity index 93% rename from lib/fog/key_manager/openstack/requests/update_secret_acl.rb rename to lib/fog/openstack/key_manager/requests/update_secret_acl.rb index d92bc55e1..3bca98a31 100644 --- a/lib/fog/key_manager/openstack/requests/update_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/update_secret_acl.rb @@ -1,6 +1,6 @@ module Fog - module KeyManager - class OpenStack + module OpenStack + class KeyManager class Real def update_secret_acl(uuid, options) request( diff --git a/lib/fog/metering/openstack.rb b/lib/fog/openstack/metering/metering.rb similarity index 94% rename from lib/fog/metering/openstack.rb rename to lib/fog/openstack/metering/metering.rb index bd0f84d7f..ab6d9c294 100644 --- a/lib/fog/metering/openstack.rb +++ b/lib/fog/openstack/metering/metering.rb @@ -1,8 +1,8 @@ module Fog - module Metering - class OpenStack < Fog::Service + module OpenStack + class Metering < Fog::Service SUPPORTED_VERSIONS = /v2/ requires :openstack_auth_url @@ -17,7 +17,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/metering/openstack/models' + model_path 'fog/openstack/metering/models' model :resource collection :resources @@ -26,7 +26,7 @@ class OpenStack < Fog::Service model :event collection :events - request_path 'fog/metering/openstack/requests' + request_path 'fog/openstack/metering/requests' # Metering request :get_event @@ -97,7 +97,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Metering::OpenStack::NotFound + Fog::OpenStack::Metering::NotFound end def default_endpoint_type diff --git a/lib/fog/metering/openstack/models/event.rb b/lib/fog/openstack/metering/models/event.rb similarity index 87% rename from lib/fog/metering/openstack/models/event.rb rename to lib/fog/openstack/metering/models/event.rb index 606ebc0c1..7cf900642 100644 --- a/lib/fog/metering/openstack/models/event.rb +++ b/lib/fog/openstack/metering/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Event < Fog::OpenStack::Model identity :message_id diff --git a/lib/fog/metering/openstack/models/events.rb b/lib/fog/openstack/metering/models/events.rb similarity index 66% rename from lib/fog/metering/openstack/models/events.rb rename to lib/fog/openstack/metering/models/events.rb index 01af6f5a1..8b12e73e9 100644 --- a/lib/fog/metering/openstack/models/events.rb +++ b/lib/fog/openstack/metering/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/metering/openstack/models/event' +require 'fog/openstack/metering/models/event' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Events < Fog::OpenStack::Collection - model Fog::Metering::OpenStack::Event + model Fog::OpenStack::Metering::Event def all(q = []) load_response(service.list_events(q)) @@ -14,7 +14,7 @@ def all(q = []) def find_by_id(message_id) event = service.get_event(message_id).body new(event) - rescue Fog::Metering::OpenStack::NotFound + rescue Fog::OpenStack::Metering::NotFound nil end end diff --git a/lib/fog/metering/openstack/models/meter.rb b/lib/fog/openstack/metering/models/meter.rb similarity index 100% rename from lib/fog/metering/openstack/models/meter.rb rename to lib/fog/openstack/metering/models/meter.rb diff --git a/lib/fog/metering/openstack/models/meters.rb b/lib/fog/openstack/metering/models/meters.rb similarity index 100% rename from lib/fog/metering/openstack/models/meters.rb rename to lib/fog/openstack/metering/models/meters.rb diff --git a/lib/fog/metering/openstack/models/resource.rb b/lib/fog/openstack/metering/models/resource.rb similarity index 86% rename from lib/fog/metering/openstack/models/resource.rb rename to lib/fog/openstack/metering/models/resource.rb index 9d08cfe23..78fe5086a 100644 --- a/lib/fog/metering/openstack/models/resource.rb +++ b/lib/fog/openstack/metering/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Resource < Fog::OpenStack::Model identity :resource_id diff --git a/lib/fog/metering/openstack/models/resources.rb b/lib/fog/openstack/metering/models/resources.rb similarity index 66% rename from lib/fog/metering/openstack/models/resources.rb rename to lib/fog/openstack/metering/models/resources.rb index 048861625..93acfb551 100644 --- a/lib/fog/metering/openstack/models/resources.rb +++ b/lib/fog/openstack/metering/models/resources.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/metering/openstack/models/resource' +require 'fog/openstack/metering/models/resource' module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Resources < Fog::OpenStack::Collection - model Fog::Metering::OpenStack::Resource + model Fog::OpenStack::Metering::Resource def all(_detailed = true) load_response(service.list_resources) @@ -14,7 +14,7 @@ def all(_detailed = true) def find_by_id(resource_id) resource = service.get_resource(resource_id).body new(resource) - rescue Fog::Metering::OpenStack::NotFound + rescue Fog::OpenStack::Metering::NotFound nil end end diff --git a/lib/fog/metering/openstack/requests/get_event.rb b/lib/fog/openstack/metering/requests/get_event.rb similarity index 93% rename from lib/fog/metering/openstack/requests/get_event.rb rename to lib/fog/openstack/metering/requests/get_event.rb index 6738f426c..26d92b355 100644 --- a/lib/fog/metering/openstack/requests/get_event.rb +++ b/lib/fog/openstack/metering/requests/get_event.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_event(message_id) request( diff --git a/lib/fog/metering/openstack/requests/get_resource.rb b/lib/fog/openstack/metering/requests/get_resource.rb similarity index 94% rename from lib/fog/metering/openstack/requests/get_resource.rb rename to lib/fog/openstack/metering/requests/get_resource.rb index f878e4526..8a807c3a1 100644 --- a/lib/fog/metering/openstack/requests/get_resource.rb +++ b/lib/fog/openstack/metering/requests/get_resource.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_resource(resource_id) request( diff --git a/lib/fog/metering/openstack/requests/get_samples.rb b/lib/fog/openstack/metering/requests/get_samples.rb similarity index 97% rename from lib/fog/metering/openstack/requests/get_samples.rb rename to lib/fog/openstack/metering/requests/get_samples.rb index 58dd6707c..791b6b9e7 100644 --- a/lib/fog/metering/openstack/requests/get_samples.rb +++ b/lib/fog/openstack/metering/requests/get_samples.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_samples(meter_id, options = [], limit = 10000000) data = { diff --git a/lib/fog/metering/openstack/requests/get_statistics.rb b/lib/fog/openstack/metering/requests/get_statistics.rb similarity index 97% rename from lib/fog/metering/openstack/requests/get_statistics.rb rename to lib/fog/openstack/metering/requests/get_statistics.rb index b0905b7ee..841666b96 100644 --- a/lib/fog/metering/openstack/requests/get_statistics.rb +++ b/lib/fog/openstack/metering/requests/get_statistics.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def get_statistics(meter_id, options = {}) data = { diff --git a/lib/fog/metering/openstack/requests/list_events.rb b/lib/fog/openstack/metering/requests/list_events.rb similarity index 95% rename from lib/fog/metering/openstack/requests/list_events.rb rename to lib/fog/openstack/metering/requests/list_events.rb index 06f3f927c..e94ac857b 100644 --- a/lib/fog/metering/openstack/requests/list_events.rb +++ b/lib/fog/openstack/metering/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def list_events(options = []) data = { diff --git a/lib/fog/metering/openstack/requests/list_meters.rb b/lib/fog/openstack/metering/requests/list_meters.rb similarity index 96% rename from lib/fog/metering/openstack/requests/list_meters.rb rename to lib/fog/openstack/metering/requests/list_meters.rb index 99b857c45..728797d0d 100644 --- a/lib/fog/metering/openstack/requests/list_meters.rb +++ b/lib/fog/openstack/metering/requests/list_meters.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def list_meters(options = []) data = { diff --git a/lib/fog/metering/openstack/requests/list_resources.rb b/lib/fog/openstack/metering/requests/list_resources.rb similarity index 94% rename from lib/fog/metering/openstack/requests/list_resources.rb rename to lib/fog/openstack/metering/requests/list_resources.rb index 910ced8e1..4b574fe9b 100644 --- a/lib/fog/metering/openstack/requests/list_resources.rb +++ b/lib/fog/openstack/metering/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module Metering - class OpenStack + module OpenStack + class Metering class Real def list_resources(_options = {}) request( diff --git a/lib/fog/metric/openstack.rb b/lib/fog/openstack/metric/metric.rb similarity index 94% rename from lib/fog/metric/openstack.rb rename to lib/fog/openstack/metric/metric.rb index 08144e5eb..3feed8b09 100644 --- a/lib/fog/metric/openstack.rb +++ b/lib/fog/openstack/metric/metric.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack < Fog::Service + module OpenStack + class Metric < Fog::Service SUPPORTED_VERSIONS = /v1/ requires :openstack_auth_url @@ -15,14 +15,14 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/metric/openstack/models' + model_path 'fog/openstack/metric/models' model :metric collection :metrics model :resource collection :resources - request_path 'fog/metric/openstack/requests' + request_path 'fog/openstack/metric/requests' request :get_resource_metric_measures request :get_metric_measures @@ -95,7 +95,7 @@ def default_path_prefix end def self.not_found_class - Fog::Metric::OpenStack::NotFound + Fog::OpenStack::Metric::NotFound end def default_service_type diff --git a/lib/fog/metric/openstack/models/metric.rb b/lib/fog/openstack/metric/models/metric.rb similarity index 90% rename from lib/fog/metric/openstack/models/metric.rb rename to lib/fog/openstack/metric/models/metric.rb index aedf0ca50..fda7bce88 100644 --- a/lib/fog/metric/openstack/models/metric.rb +++ b/lib/fog/openstack/metric/models/metric.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Metric < Fog::OpenStack::Model identity :id diff --git a/lib/fog/metric/openstack/models/metrics.rb b/lib/fog/openstack/metric/models/metrics.rb similarity index 71% rename from lib/fog/metric/openstack/models/metrics.rb rename to lib/fog/openstack/metric/models/metrics.rb index c68f8a12e..594e5c3ac 100644 --- a/lib/fog/metric/openstack/models/metrics.rb +++ b/lib/fog/openstack/metric/models/metrics.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/metric/openstack/models/metric' +require 'fog/openstack/metric/models/metric' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Metrics < Fog::OpenStack::Collection - model Fog::Metric::OpenStack::Metric + model Fog::OpenStack::Metric::Metric def all(options = {}) load_response(service.list_metrics(options)) @@ -15,14 +15,14 @@ def all(options = {}) def find_by_id(metric_id) resource = service.get_metric(metric_id).body new(resource) - rescue Fog::Metric::OpenStack::NotFound + rescue Fog::OpenStack::Metric::NotFound nil end def find_measures_by_id(metric_id, options = {}) resource = service.get_metric_measures(metric_id, options).body new(resource) - rescue Fog::Metric::OpenStack::NotFound + rescue Fog::OpenStack::Metric::NotFound nil end end diff --git a/lib/fog/metric/openstack/models/resource.rb b/lib/fog/openstack/metric/models/resource.rb similarity index 88% rename from lib/fog/metric/openstack/models/resource.rb rename to lib/fog/openstack/metric/models/resource.rb index 772d72a96..5524c31a3 100644 --- a/lib/fog/metric/openstack/models/resource.rb +++ b/lib/fog/openstack/metric/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Resource < Fog::OpenStack::Model identity :id diff --git a/lib/fog/metric/openstack/models/resources.rb b/lib/fog/openstack/metric/models/resources.rb similarity index 68% rename from lib/fog/metric/openstack/models/resources.rb rename to lib/fog/openstack/metric/models/resources.rb index b0edaa6af..d58807c18 100644 --- a/lib/fog/metric/openstack/models/resources.rb +++ b/lib/fog/openstack/metric/models/resources.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/metric/openstack/models/resource' +require 'fog/openstack/metric/models/resource' module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Resources < Fog::OpenStack::Collection - model Fog::Metric::OpenStack::Resource + model Fog::OpenStack::Metric::Resource def all(options = {}) load_response(service.list_resources(options)) @@ -15,7 +15,7 @@ def all(options = {}) def find_by_id(resource_id) resource = service.get_resource(resource_id).body new(resource) - rescue Fog::Metric::OpenStack::NotFound + rescue Fog::OpenStack::Metric::NotFound nil end end diff --git a/lib/fog/metric/openstack/requests/get_metric.rb b/lib/fog/openstack/metric/requests/get_metric.rb similarity index 98% rename from lib/fog/metric/openstack/requests/get_metric.rb rename to lib/fog/openstack/metric/requests/get_metric.rb index f2f7f7556..3bbfd904b 100644 --- a/lib/fog/metric/openstack/requests/get_metric.rb +++ b/lib/fog/openstack/metric/requests/get_metric.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_metric(metric_id) request( diff --git a/lib/fog/metric/openstack/requests/get_metric_measures.rb b/lib/fog/openstack/metric/requests/get_metric_measures.rb similarity index 96% rename from lib/fog/metric/openstack/requests/get_metric_measures.rb rename to lib/fog/openstack/metric/requests/get_metric_measures.rb index 9f8ee1374..21b207a42 100644 --- a/lib/fog/metric/openstack/requests/get_metric_measures.rb +++ b/lib/fog/openstack/metric/requests/get_metric_measures.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_metric_measures(metric_id, options = {}) request( diff --git a/lib/fog/metric/openstack/requests/get_resource.rb b/lib/fog/openstack/metric/requests/get_resource.rb similarity index 97% rename from lib/fog/metric/openstack/requests/get_resource.rb rename to lib/fog/openstack/metric/requests/get_resource.rb index 486070bc0..33f9f994e 100644 --- a/lib/fog/metric/openstack/requests/get_resource.rb +++ b/lib/fog/openstack/metric/requests/get_resource.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_resource(resource_id) request( diff --git a/lib/fog/metric/openstack/requests/get_resource_metric_measures.rb b/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb similarity index 96% rename from lib/fog/metric/openstack/requests/get_resource_metric_measures.rb rename to lib/fog/openstack/metric/requests/get_resource_metric_measures.rb index c188a7a93..91dbc33bb 100644 --- a/lib/fog/metric/openstack/requests/get_resource_metric_measures.rb +++ b/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def get_resource_metric_measures(resource_id, metric_name, options = {}) request( diff --git a/lib/fog/metric/openstack/requests/list_metrics.rb b/lib/fog/openstack/metric/requests/list_metrics.rb similarity index 99% rename from lib/fog/metric/openstack/requests/list_metrics.rb rename to lib/fog/openstack/metric/requests/list_metrics.rb index 830d773b9..736fb9dd2 100644 --- a/lib/fog/metric/openstack/requests/list_metrics.rb +++ b/lib/fog/openstack/metric/requests/list_metrics.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def list_metrics(options = {}) request( diff --git a/lib/fog/metric/openstack/requests/list_resources.rb b/lib/fog/openstack/metric/requests/list_resources.rb similarity index 98% rename from lib/fog/metric/openstack/requests/list_resources.rb rename to lib/fog/openstack/metric/requests/list_resources.rb index 57d59d9db..2b32f609e 100644 --- a/lib/fog/metric/openstack/requests/list_resources.rb +++ b/lib/fog/openstack/metric/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module Metric - class OpenStack + module OpenStack + class Metric class Real def list_resources(type = "generic", options = {}) request( diff --git a/lib/fog/openstack/models/meta_parent.rb b/lib/fog/openstack/models/meta_parent.rb index b90b6e5b1..b9b624330 100644 --- a/lib/fog/openstack/models/meta_parent.rb +++ b/lib/fog/openstack/models/meta_parent.rb @@ -1,6 +1,6 @@ module Fog - module Compute - class OpenStack + module OpenStack + class Compute module MetaParent def parent @parent @@ -11,9 +11,9 @@ def parent=(new_parent) end def collection_name - if @parent.class == Fog::Compute::OpenStack::Image + if @parent.class == Fog::OpenStack::Compute::Image return "images" - elsif @parent.class == Fog::Compute::OpenStack::Server + elsif @parent.class == Fog::OpenStack::Compute::Server return "servers" else raise "Metadata is not supported for this model type." diff --git a/lib/fog/monitoring/openstack/models/alarm.rb b/lib/fog/openstack/monitoring/models/alarm.rb similarity index 95% rename from lib/fog/monitoring/openstack/models/alarm.rb rename to lib/fog/openstack/monitoring/models/alarm.rb index c42f20ff4..eafba1074 100644 --- a/lib/fog/monitoring/openstack/models/alarm.rb +++ b/lib/fog/openstack/monitoring/models/alarm.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Alarm < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/alarm_count.rb b/lib/fog/openstack/monitoring/models/alarm_count.rb similarity index 86% rename from lib/fog/monitoring/openstack/models/alarm_count.rb rename to lib/fog/openstack/monitoring/models/alarm_count.rb index afd2d5aa3..af982eec0 100644 --- a/lib/fog/monitoring/openstack/models/alarm_count.rb +++ b/lib/fog/openstack/monitoring/models/alarm_count.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmCount < Fog::OpenStack::Model attribute :links attribute :columns diff --git a/lib/fog/monitoring/openstack/models/alarm_counts.rb b/lib/fog/openstack/monitoring/models/alarm_counts.rb similarity index 61% rename from lib/fog/monitoring/openstack/models/alarm_counts.rb rename to lib/fog/openstack/monitoring/models/alarm_counts.rb index 9b2070c87..7e340e988 100644 --- a/lib/fog/monitoring/openstack/models/alarm_counts.rb +++ b/lib/fog/openstack/monitoring/models/alarm_counts.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm_count' +require 'fog/openstack/monitoring/models/alarm_count' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmCounts < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::AlarmCount + model Fog::OpenStack::Monitoring::AlarmCount def get(options = {}) load_response(service.get_alarm_counts(options)) diff --git a/lib/fog/monitoring/openstack/models/alarm_definition.rb b/lib/fog/openstack/monitoring/models/alarm_definition.rb similarity index 96% rename from lib/fog/monitoring/openstack/models/alarm_definition.rb rename to lib/fog/openstack/monitoring/models/alarm_definition.rb index 3938f0b8b..af7ba6839 100644 --- a/lib/fog/monitoring/openstack/models/alarm_definition.rb +++ b/lib/fog/openstack/monitoring/models/alarm_definition.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmDefinition < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/alarm_definitions.rb b/lib/fog/openstack/monitoring/models/alarm_definitions.rb similarity index 81% rename from lib/fog/monitoring/openstack/models/alarm_definitions.rb rename to lib/fog/openstack/monitoring/models/alarm_definitions.rb index a1b5451c0..0366033fe 100644 --- a/lib/fog/monitoring/openstack/models/alarm_definitions.rb +++ b/lib/fog/openstack/monitoring/models/alarm_definitions.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm_definition' +require 'fog/openstack/monitoring/models/alarm_definition' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmDefinitions < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::AlarmDefinition + model Fog::OpenStack::Monitoring::AlarmDefinition def create(attributes) super(attributes) @@ -27,7 +27,7 @@ def find_by_id(id) cached_alarm_definition = detect { |alarm_definition| alarm_definition.id == id } return cached_alarm_definition if cached_alarm_definition alarm_definition_hash = service.get_alarm_definition(id).body - Fog::Monitoring::OpenStack::AlarmDefinition.new( + Fog::OpenStack::Monitoring::AlarmDefinition.new( alarm_definition_hash.merge(:service => service) ) end diff --git a/lib/fog/monitoring/openstack/models/alarm_state.rb b/lib/fog/openstack/monitoring/models/alarm_state.rb similarity index 93% rename from lib/fog/monitoring/openstack/models/alarm_state.rb rename to lib/fog/openstack/monitoring/models/alarm_state.rb index 8dc34052e..0b5be8907 100644 --- a/lib/fog/monitoring/openstack/models/alarm_state.rb +++ b/lib/fog/openstack/monitoring/models/alarm_state.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmState < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/alarm_states.rb b/lib/fog/openstack/monitoring/models/alarm_states.rb similarity index 75% rename from lib/fog/monitoring/openstack/models/alarm_states.rb rename to lib/fog/openstack/monitoring/models/alarm_states.rb index 87fa6e5f0..4bef0a5a6 100644 --- a/lib/fog/monitoring/openstack/models/alarm_states.rb +++ b/lib/fog/openstack/monitoring/models/alarm_states.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm_state' +require 'fog/openstack/monitoring/models/alarm_state' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class AlarmStates < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::AlarmState + model Fog::OpenStack::Monitoring::AlarmState def all(options = {}) load_response(service.list_alarm_state_history_for_all_alarms(options), 'elements') diff --git a/lib/fog/monitoring/openstack/models/alarms.rb b/lib/fog/openstack/monitoring/models/alarms.rb similarity index 76% rename from lib/fog/monitoring/openstack/models/alarms.rb rename to lib/fog/openstack/monitoring/models/alarms.rb index 0a89ff5ea..f3aa14f1a 100644 --- a/lib/fog/monitoring/openstack/models/alarms.rb +++ b/lib/fog/openstack/monitoring/models/alarms.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/alarm' +require 'fog/openstack/monitoring/models/alarm' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Alarms < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Alarm + model Fog::OpenStack::Monitoring::Alarm def all(options = {}) load_response(service.list_alarms(options), 'elements') @@ -15,7 +15,7 @@ def find_by_id(id) cached_alarm = detect { |alarm| alarm.id == id } return cached_alarm if cached_alarm alarm_hash = service.get_alarm(id).body - Fog::Monitoring::OpenStack::Alarm.new( + Fog::OpenStack::Monitoring::Alarm.new( alarm_hash.merge(:service => service) ) end diff --git a/lib/fog/monitoring/openstack/models/dimension_value.rb b/lib/fog/openstack/monitoring/models/dimension_value.rb similarity index 87% rename from lib/fog/monitoring/openstack/models/dimension_value.rb rename to lib/fog/openstack/monitoring/models/dimension_value.rb index 8595f884a..4946bf798 100644 --- a/lib/fog/monitoring/openstack/models/dimension_value.rb +++ b/lib/fog/openstack/monitoring/models/dimension_value.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class DimensionValue < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/dimension_values.rb b/lib/fog/openstack/monitoring/models/dimension_values.rb similarity index 65% rename from lib/fog/monitoring/openstack/models/dimension_values.rb rename to lib/fog/openstack/monitoring/models/dimension_values.rb index 05fd95d8a..d6457dab5 100644 --- a/lib/fog/monitoring/openstack/models/dimension_values.rb +++ b/lib/fog/openstack/monitoring/models/dimension_values.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/dimension_value' +require 'fog/openstack/monitoring/models/dimension_value' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class DimensionValues < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::DimensionValue + model Fog::OpenStack::Monitoring::DimensionValue def all(dimension_name, options = {}) load_response(service.list_dimension_values(dimension_name, options), 'elements') diff --git a/lib/fog/monitoring/openstack/models/measurement.rb b/lib/fog/openstack/monitoring/models/measurement.rb similarity index 88% rename from lib/fog/monitoring/openstack/models/measurement.rb rename to lib/fog/openstack/monitoring/models/measurement.rb index fdbc27c72..de2d72e5b 100644 --- a/lib/fog/monitoring/openstack/models/measurement.rb +++ b/lib/fog/openstack/monitoring/models/measurement.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Measurement < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/measurements.rb b/lib/fog/openstack/monitoring/models/measurements.rb similarity index 63% rename from lib/fog/monitoring/openstack/models/measurements.rb rename to lib/fog/openstack/monitoring/models/measurements.rb index cc36c8f7e..c47f8f178 100644 --- a/lib/fog/monitoring/openstack/models/measurements.rb +++ b/lib/fog/openstack/monitoring/models/measurements.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/measurement' +require 'fog/openstack/monitoring/models/measurement' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Measurements < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Measurement + model Fog::OpenStack::Monitoring::Measurement def find(options = {}) load_response(service.find_measurements(options), 'elements') diff --git a/lib/fog/monitoring/openstack/models/metric.rb b/lib/fog/openstack/monitoring/models/metric.rb similarity index 92% rename from lib/fog/monitoring/openstack/models/metric.rb rename to lib/fog/openstack/monitoring/models/metric.rb index 9b8482272..9ed795398 100644 --- a/lib/fog/monitoring/openstack/models/metric.rb +++ b/lib/fog/openstack/monitoring/models/metric.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Metric < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/metrics.rb b/lib/fog/openstack/monitoring/models/metrics.rb similarity index 74% rename from lib/fog/monitoring/openstack/models/metrics.rb rename to lib/fog/openstack/monitoring/models/metrics.rb index 1b10f384f..095a6a471 100644 --- a/lib/fog/monitoring/openstack/models/metrics.rb +++ b/lib/fog/openstack/monitoring/models/metrics.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/metric' -require 'fog/monitoring/openstack/models/dimension_values' +require 'fog/openstack/monitoring/models/metric' +require 'fog/openstack/monitoring/models/dimension_values' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Metrics < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Metric + model Fog::OpenStack::Monitoring::Metric def all(options = {}) load_response(service.list_metrics(options), 'elements') @@ -25,7 +25,7 @@ def create_metric_array(metrics_list = []) end def list_dimension_values(dimension_name, options = {}) - dimension_value = Fog::Monitoring::OpenStack::DimensionValues.new + dimension_value = Fog::OpenStack::Monitoring::DimensionValues.new dimension_value.load_response( service.list_dimension_values(dimension_name, options), 'elements' ) diff --git a/lib/fog/monitoring/openstack/models/notification_method.rb b/lib/fog/openstack/monitoring/models/notification_method.rb similarity index 96% rename from lib/fog/monitoring/openstack/models/notification_method.rb rename to lib/fog/openstack/monitoring/models/notification_method.rb index 075e32333..f2a1fbfdc 100644 --- a/lib/fog/monitoring/openstack/models/notification_method.rb +++ b/lib/fog/openstack/monitoring/models/notification_method.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class NotificationMethod < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/notification_methods.rb b/lib/fog/openstack/monitoring/models/notification_methods.rb similarity index 82% rename from lib/fog/monitoring/openstack/models/notification_methods.rb rename to lib/fog/openstack/monitoring/models/notification_methods.rb index c8b8c711d..4d1fbaa07 100644 --- a/lib/fog/monitoring/openstack/models/notification_methods.rb +++ b/lib/fog/openstack/monitoring/models/notification_methods.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/notification_method' +require 'fog/openstack/monitoring/models/notification_method' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class NotificationMethods < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::NotificationMethod + model Fog::OpenStack::Monitoring::NotificationMethod def all(options = {}) load_response(service.list_notification_methods(options), 'elements') @@ -23,7 +23,7 @@ def find_by_id(id) cached_notification_method = detect { |notification_method| notification_method.id == id } return cached_notification_method if cached_notification_method notification_method_hash = service.get_notification_method(id).body - Fog::Monitoring::OpenStack::NotificationMethod.new( + Fog::OpenStack::Monitoring::NotificationMethod.new( notification_method_hash.merge(:service => service) ) end diff --git a/lib/fog/monitoring/openstack/models/statistic.rb b/lib/fog/openstack/monitoring/models/statistic.rb similarity index 88% rename from lib/fog/monitoring/openstack/models/statistic.rb rename to lib/fog/openstack/monitoring/models/statistic.rb index e38ca7db2..5bfcde135 100644 --- a/lib/fog/monitoring/openstack/models/statistic.rb +++ b/lib/fog/openstack/monitoring/models/statistic.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Statistic < Fog::OpenStack::Model identity :id diff --git a/lib/fog/monitoring/openstack/models/statistics.rb b/lib/fog/openstack/monitoring/models/statistics.rb similarity index 63% rename from lib/fog/monitoring/openstack/models/statistics.rb rename to lib/fog/openstack/monitoring/models/statistics.rb index 2098a2e4e..9bce67cc4 100644 --- a/lib/fog/monitoring/openstack/models/statistics.rb +++ b/lib/fog/openstack/monitoring/models/statistics.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/monitoring/openstack/models/statistic' +require 'fog/openstack/monitoring/models/statistic' module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Statistics < Fog::OpenStack::Collection - model Fog::Monitoring::OpenStack::Statistic + model Fog::OpenStack::Monitoring::Statistic def all(options = {}) load_response(service.list_statistics(options), 'elements') diff --git a/lib/fog/monitoring/openstack.rb b/lib/fog/openstack/monitoring/monitoring.rb similarity index 92% rename from lib/fog/monitoring/openstack.rb rename to lib/fog/openstack/monitoring/monitoring.rb index bd8141c3c..85f60452b 100644 --- a/lib/fog/monitoring/openstack.rb +++ b/lib/fog/openstack/monitoring/monitoring.rb @@ -1,7 +1,7 @@ module Fog - module Monitoring - class OpenStack < Fog::Service + module OpenStack + class Monitoring < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -14,7 +14,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - model_path 'fog/monitoring/openstack/models' + model_path 'fog/openstack/monitoring/models' model :metric collection :metrics model :measurement @@ -33,7 +33,7 @@ class OpenStack < Fog::Service collection :alarm_counts model :dimension_value - request_path 'fog/monitoring/openstack/requests' + request_path 'fog/openstack/monitoring/requests' request :create_metric request :create_metric_array request :list_metrics @@ -75,7 +75,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Monitoring::OpenStack::NotFound + Fog::OpenStack::Monitoring::NotFound end def default_service_type diff --git a/lib/fog/monitoring/openstack/requests/create_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/create_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/create_alarm_definition.rb index 6bf1e1da2..1a145cb8e 100644 --- a/lib/fog/monitoring/openstack/requests/create_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_alarm_definition(options) request( diff --git a/lib/fog/monitoring/openstack/requests/create_metric.rb b/lib/fog/openstack/monitoring/requests/create_metric.rb similarity index 93% rename from lib/fog/monitoring/openstack/requests/create_metric.rb rename to lib/fog/openstack/monitoring/requests/create_metric.rb index c84d56502..569641d67 100644 --- a/lib/fog/monitoring/openstack/requests/create_metric.rb +++ b/lib/fog/openstack/monitoring/requests/create_metric.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_metric(options) data = options diff --git a/lib/fog/monitoring/openstack/requests/create_metric_array.rb b/lib/fog/openstack/monitoring/requests/create_metric_array.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/create_metric_array.rb rename to lib/fog/openstack/monitoring/requests/create_metric_array.rb index da23b278b..87307b981 100644 --- a/lib/fog/monitoring/openstack/requests/create_metric_array.rb +++ b/lib/fog/openstack/monitoring/requests/create_metric_array.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_metric_array(metrics_list) request( diff --git a/lib/fog/monitoring/openstack/requests/create_notification_method.rb b/lib/fog/openstack/monitoring/requests/create_notification_method.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/create_notification_method.rb rename to lib/fog/openstack/monitoring/requests/create_notification_method.rb index b2456b56a..33b21d8b0 100644 --- a/lib/fog/monitoring/openstack/requests/create_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/create_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def create_notification_method(options) request( diff --git a/lib/fog/monitoring/openstack/requests/delete_alarm.rb b/lib/fog/openstack/monitoring/requests/delete_alarm.rb similarity index 86% rename from lib/fog/monitoring/openstack/requests/delete_alarm.rb rename to lib/fog/openstack/monitoring/requests/delete_alarm.rb index 27a12ff9c..ec16a8c0b 100644 --- a/lib/fog/monitoring/openstack/requests/delete_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/delete_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def delete_alarm(id) request( diff --git a/lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb index 8a51ad390..396544111 100644 --- a/lib/fog/monitoring/openstack/requests/delete_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def delete_alarm_definition(id) request( diff --git a/lib/fog/monitoring/openstack/requests/delete_notification_method.rb b/lib/fog/openstack/monitoring/requests/delete_notification_method.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/delete_notification_method.rb rename to lib/fog/openstack/monitoring/requests/delete_notification_method.rb index 5df23eb78..9bee9bf3a 100644 --- a/lib/fog/monitoring/openstack/requests/delete_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/delete_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def delete_notification_method(id) request( diff --git a/lib/fog/monitoring/openstack/requests/find_measurements.rb b/lib/fog/openstack/monitoring/requests/find_measurements.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/find_measurements.rb rename to lib/fog/openstack/monitoring/requests/find_measurements.rb index fd96c8ed2..31e123df7 100644 --- a/lib/fog/monitoring/openstack/requests/find_measurements.rb +++ b/lib/fog/openstack/monitoring/requests/find_measurements.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def find_measurements(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/get_alarm.rb b/lib/fog/openstack/monitoring/requests/get_alarm.rb similarity index 88% rename from lib/fog/monitoring/openstack/requests/get_alarm.rb rename to lib/fog/openstack/monitoring/requests/get_alarm.rb index 1bff9afba..b20a0c049 100644 --- a/lib/fog/monitoring/openstack/requests/get_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_alarm(id) request( diff --git a/lib/fog/monitoring/openstack/requests/get_alarm_counts.rb b/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/get_alarm_counts.rb rename to lib/fog/openstack/monitoring/requests/get_alarm_counts.rb index 8fd9e07cb..42da01d93 100644 --- a/lib/fog/monitoring/openstack/requests/get_alarm_counts.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_alarm_counts(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/get_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/get_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/get_alarm_definition.rb index 206cab92b..656ed7350 100644 --- a/lib/fog/monitoring/openstack/requests/get_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_alarm_definition(id) request( diff --git a/lib/fog/monitoring/openstack/requests/get_notification_method.rb b/lib/fog/openstack/monitoring/requests/get_notification_method.rb similarity index 87% rename from lib/fog/monitoring/openstack/requests/get_notification_method.rb rename to lib/fog/openstack/monitoring/requests/get_notification_method.rb index 69207e2a1..ad42e476e 100644 --- a/lib/fog/monitoring/openstack/requests/get_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/get_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def get_notification_method(id) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb b/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb rename to lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb index ebecef2ab..b76ab5a31 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarm_definitions.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarm_definitions(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb similarity index 91% rename from lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb rename to lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb index 20f65e754..770a11f31 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_all_alarms.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarm_state_history_for_all_alarms(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb similarity index 91% rename from lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb rename to lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb index 9fa40ad0f..2fb5c4a54 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarm_state_history_for_specific_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarm_state_history_for_specific_alarm(id, options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_alarms.rb b/lib/fog/openstack/monitoring/requests/list_alarms.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/list_alarms.rb rename to lib/fog/openstack/monitoring/requests/list_alarms.rb index 34bae7338..3288b1f54 100644 --- a/lib/fog/monitoring/openstack/requests/list_alarms.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarms.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_alarms(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_dimension_values.rb b/lib/fog/openstack/monitoring/requests/list_dimension_values.rb similarity index 92% rename from lib/fog/monitoring/openstack/requests/list_dimension_values.rb rename to lib/fog/openstack/monitoring/requests/list_dimension_values.rb index 3655b294c..0e29b215e 100644 --- a/lib/fog/monitoring/openstack/requests/list_dimension_values.rb +++ b/lib/fog/openstack/monitoring/requests/list_dimension_values.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_dimension_values(dimension_name, options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_metric_names.rb b/lib/fog/openstack/monitoring/requests/list_metric_names.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_metric_names.rb rename to lib/fog/openstack/monitoring/requests/list_metric_names.rb index 7d7eab855..2aae310cc 100644 --- a/lib/fog/monitoring/openstack/requests/list_metric_names.rb +++ b/lib/fog/openstack/monitoring/requests/list_metric_names.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_metric_names(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_metrics.rb b/lib/fog/openstack/monitoring/requests/list_metrics.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_metrics.rb rename to lib/fog/openstack/monitoring/requests/list_metrics.rb index ec36e4cee..c2baeb595 100644 --- a/lib/fog/monitoring/openstack/requests/list_metrics.rb +++ b/lib/fog/openstack/monitoring/requests/list_metrics.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_metrics(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb b/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/list_notification_method_types.rb rename to lib/fog/openstack/monitoring/requests/list_notification_method_types.rb index 6d3da6e83..74b8c1bfa 100644 --- a/lib/fog/monitoring/openstack/requests/list_notification_method_types.rb +++ b/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_notification_method_types request( diff --git a/lib/fog/monitoring/openstack/requests/list_notification_methods.rb b/lib/fog/openstack/monitoring/requests/list_notification_methods.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_notification_methods.rb rename to lib/fog/openstack/monitoring/requests/list_notification_methods.rb index 904ac4655..21639c200 100644 --- a/lib/fog/monitoring/openstack/requests/list_notification_methods.rb +++ b/lib/fog/openstack/monitoring/requests/list_notification_methods.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_notification_methods(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/list_statistics.rb b/lib/fog/openstack/monitoring/requests/list_statistics.rb similarity index 90% rename from lib/fog/monitoring/openstack/requests/list_statistics.rb rename to lib/fog/openstack/monitoring/requests/list_statistics.rb index ab39fd904..03df6c7fe 100644 --- a/lib/fog/monitoring/openstack/requests/list_statistics.rb +++ b/lib/fog/openstack/monitoring/requests/list_statistics.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def list_statistics(options = {}) request( diff --git a/lib/fog/monitoring/openstack/requests/patch_alarm.rb b/lib/fog/openstack/monitoring/requests/patch_alarm.rb similarity index 88% rename from lib/fog/monitoring/openstack/requests/patch_alarm.rb rename to lib/fog/openstack/monitoring/requests/patch_alarm.rb index 2d3bdfd78..aa5df3082 100644 --- a/lib/fog/monitoring/openstack/requests/patch_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/patch_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def patch_alarm(id, options) request( diff --git a/lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb index 8e887722e..3e3354d08 100644 --- a/lib/fog/monitoring/openstack/requests/patch_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def patch_alarm_definition(id, alarm_definition) request( diff --git a/lib/fog/monitoring/openstack/requests/patch_notification_method.rb b/lib/fog/openstack/monitoring/requests/patch_notification_method.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/patch_notification_method.rb rename to lib/fog/openstack/monitoring/requests/patch_notification_method.rb index 4f995ed49..34a3b92f5 100644 --- a/lib/fog/monitoring/openstack/requests/patch_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/patch_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def update_notification_method(id, notification) request( diff --git a/lib/fog/monitoring/openstack/requests/put_notification_method.rb b/lib/fog/openstack/monitoring/requests/put_notification_method.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/put_notification_method.rb rename to lib/fog/openstack/monitoring/requests/put_notification_method.rb index 3f0397e38..219d97144 100644 --- a/lib/fog/monitoring/openstack/requests/put_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/put_notification_method.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def put_notification_method(id, notification) request( diff --git a/lib/fog/monitoring/openstack/requests/update_alarm.rb b/lib/fog/openstack/monitoring/requests/update_alarm.rb similarity index 88% rename from lib/fog/monitoring/openstack/requests/update_alarm.rb rename to lib/fog/openstack/monitoring/requests/update_alarm.rb index a8910dd1d..cbd4384b2 100644 --- a/lib/fog/monitoring/openstack/requests/update_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/update_alarm.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def update_alarm(id, options) request( diff --git a/lib/fog/monitoring/openstack/requests/update_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb similarity index 89% rename from lib/fog/monitoring/openstack/requests/update_alarm_definition.rb rename to lib/fog/openstack/monitoring/requests/update_alarm_definition.rb index 925404cae..3e5fb81fe 100644 --- a/lib/fog/monitoring/openstack/requests/update_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb @@ -1,6 +1,6 @@ module Fog - module Monitoring - class OpenStack + module OpenStack + class Monitoring class Real def update_alarm_definition(id, alarm_definition) request( diff --git a/lib/fog/network/openstack/models/extension.rb b/lib/fog/openstack/network/models/extension.rb similarity index 87% rename from lib/fog/network/openstack/models/extension.rb rename to lib/fog/openstack/network/models/extension.rb index 745aa2b8f..1b95bd752 100644 --- a/lib/fog/network/openstack/models/extension.rb +++ b/lib/fog/openstack/network/models/extension.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Extension < Fog::OpenStack::Model identity :id attribute :name diff --git a/lib/fog/network/openstack/models/extensions.rb b/lib/fog/openstack/network/models/extensions.rb similarity index 76% rename from lib/fog/network/openstack/models/extensions.rb rename to lib/fog/openstack/network/models/extensions.rb index 6c01bbe7f..f105ce488 100644 --- a/lib/fog/network/openstack/models/extensions.rb +++ b/lib/fog/openstack/network/models/extensions.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/extension' +require 'fog/openstack/network/models/extension' module Fog - module Network - class OpenStack + module OpenStack + class Network class Extensions < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Extension + model Fog::OpenStack::Network::Extension def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(extension_id) if extension = service.get_extension(extension_id).body['extension'] new(extension) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/floating_ip.rb b/lib/fog/openstack/network/models/floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/models/floating_ip.rb rename to lib/fog/openstack/network/models/floating_ip.rb index de836fc9d..434ebe7f3 100644 --- a/lib/fog/network/openstack/models/floating_ip.rb +++ b/lib/fog/openstack/network/models/floating_ip.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class FloatingIp < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/floating_ips.rb b/lib/fog/openstack/network/models/floating_ips.rb similarity index 76% rename from lib/fog/network/openstack/models/floating_ips.rb rename to lib/fog/openstack/network/models/floating_ips.rb index dfeb12b6e..764b8f183 100644 --- a/lib/fog/network/openstack/models/floating_ips.rb +++ b/lib/fog/openstack/network/models/floating_ips.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/floating_ip' +require 'fog/openstack/network/models/floating_ip' module Fog - module Network - class OpenStack + module OpenStack + class Network class FloatingIps < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::FloatingIp + model Fog::OpenStack::Network::FloatingIp def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(floating_network_id) if floating_ip = service.get_floating_ip(floating_network_id).body['floatingip'] new(floating_ip) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/ike_policies.rb b/lib/fog/openstack/network/models/ike_policies.rb similarity index 76% rename from lib/fog/network/openstack/models/ike_policies.rb rename to lib/fog/openstack/network/models/ike_policies.rb index 39caae444..d659af701 100644 --- a/lib/fog/network/openstack/models/ike_policies.rb +++ b/lib/fog/openstack/network/models/ike_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/ike_policy' +require 'fog/openstack/network/models/ike_policy' module Fog - module Network - class OpenStack + module OpenStack + class Network class IkePolicies < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::IkePolicy + model Fog::OpenStack::Network::IkePolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(ike_policy_id) if ike_policy = service.get_ike_policy(ike_policy_id).body['ikepolicy'] new(ike_policy) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/ike_policy.rb b/lib/fog/openstack/network/models/ike_policy.rb similarity index 96% rename from lib/fog/network/openstack/models/ike_policy.rb rename to lib/fog/openstack/network/models/ike_policy.rb index 1cff0e650..47b7ed3bd 100644 --- a/lib/fog/network/openstack/models/ike_policy.rb +++ b/lib/fog/openstack/network/models/ike_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class IkePolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ipsec_policies.rb b/lib/fog/openstack/network/models/ipsec_policies.rb similarity index 76% rename from lib/fog/network/openstack/models/ipsec_policies.rb rename to lib/fog/openstack/network/models/ipsec_policies.rb index 5c4afe956..99e52a8be 100644 --- a/lib/fog/network/openstack/models/ipsec_policies.rb +++ b/lib/fog/openstack/network/models/ipsec_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/ipsec_policy' +require 'fog/openstack/network/models/ipsec_policy' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecPolicies < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::IpsecPolicy + model Fog::OpenStack::Network::IpsecPolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(ipsec_policy_id) if ipsec_policy = service.get_ipsec_policy(ipsec_policy_id).body['ipsecpolicy'] new(ipsec_policy) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/ipsec_policy.rb b/lib/fog/openstack/network/models/ipsec_policy.rb similarity index 97% rename from lib/fog/network/openstack/models/ipsec_policy.rb rename to lib/fog/openstack/network/models/ipsec_policy.rb index 3368d37b8..d7c5b4360 100644 --- a/lib/fog/network/openstack/models/ipsec_policy.rb +++ b/lib/fog/openstack/network/models/ipsec_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecPolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ipsec_site_connection.rb b/lib/fog/openstack/network/models/ipsec_site_connection.rb similarity index 97% rename from lib/fog/network/openstack/models/ipsec_site_connection.rb rename to lib/fog/openstack/network/models/ipsec_site_connection.rb index ec17a60f2..b5cf87f71 100644 --- a/lib/fog/network/openstack/models/ipsec_site_connection.rb +++ b/lib/fog/openstack/network/models/ipsec_site_connection.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecSiteConnection < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ipsec_site_connections.rb b/lib/fog/openstack/network/models/ipsec_site_connections.rb similarity index 77% rename from lib/fog/network/openstack/models/ipsec_site_connections.rb rename to lib/fog/openstack/network/models/ipsec_site_connections.rb index 15df5e80f..e560bc424 100644 --- a/lib/fog/network/openstack/models/ipsec_site_connections.rb +++ b/lib/fog/openstack/network/models/ipsec_site_connections.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/ipsec_site_connection' +require 'fog/openstack/network/models/ipsec_site_connection' module Fog - module Network - class OpenStack + module OpenStack + class Network class IpsecSiteConnections < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::IpsecSiteConnection + model Fog::OpenStack::Network::IpsecSiteConnection def initialize(attributes) self.filters ||= {} @@ -24,7 +24,7 @@ def get(ipsec_site_connection_id) if connection new(connection) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_health_monitor.rb b/lib/fog/openstack/network/models/lb_health_monitor.rb similarity index 97% rename from lib/fog/network/openstack/models/lb_health_monitor.rb rename to lib/fog/openstack/network/models/lb_health_monitor.rb index 479533f18..ef64acfc4 100644 --- a/lib/fog/network/openstack/models/lb_health_monitor.rb +++ b/lib/fog/openstack/network/models/lb_health_monitor.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbHealthMonitor < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_health_monitors.rb b/lib/fog/openstack/network/models/lb_health_monitors.rb similarity index 76% rename from lib/fog/network/openstack/models/lb_health_monitors.rb rename to lib/fog/openstack/network/models/lb_health_monitors.rb index 5fcb7c271..30ab428cb 100644 --- a/lib/fog/network/openstack/models/lb_health_monitors.rb +++ b/lib/fog/openstack/network/models/lb_health_monitors.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_health_monitor' +require 'fog/openstack/network/models/lb_health_monitor' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbHealthMonitors < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbHealthMonitor + model Fog::OpenStack::Network::LbHealthMonitor def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(health_monitor_id) if health_monitor = service.get_lb_health_monitor(health_monitor_id).body['health_monitor'] new(health_monitor) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_member.rb b/lib/fog/openstack/network/models/lb_member.rb similarity index 96% rename from lib/fog/network/openstack/models/lb_member.rb rename to lib/fog/openstack/network/models/lb_member.rb index e19db01a7..da8a44dbd 100644 --- a/lib/fog/network/openstack/models/lb_member.rb +++ b/lib/fog/openstack/network/models/lb_member.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbMember < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_members.rb b/lib/fog/openstack/network/models/lb_members.rb similarity index 75% rename from lib/fog/network/openstack/models/lb_members.rb rename to lib/fog/openstack/network/models/lb_members.rb index a897f82ad..fd74508bb 100644 --- a/lib/fog/network/openstack/models/lb_members.rb +++ b/lib/fog/openstack/network/models/lb_members.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_member' +require 'fog/openstack/network/models/lb_member' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbMembers < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbMember + model Fog::OpenStack::Network::LbMember def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(member_id) if member = service.get_lb_member(member_id).body['member'] new(member) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_pool.rb b/lib/fog/openstack/network/models/lb_pool.rb similarity index 97% rename from lib/fog/network/openstack/models/lb_pool.rb rename to lib/fog/openstack/network/models/lb_pool.rb index 9edf37d65..fbac5b226 100644 --- a/lib/fog/network/openstack/models/lb_pool.rb +++ b/lib/fog/openstack/network/models/lb_pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbPool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_pools.rb b/lib/fog/openstack/network/models/lb_pools.rb similarity index 75% rename from lib/fog/network/openstack/models/lb_pools.rb rename to lib/fog/openstack/network/models/lb_pools.rb index 218d486d2..8a0f7adf5 100644 --- a/lib/fog/network/openstack/models/lb_pools.rb +++ b/lib/fog/openstack/network/models/lb_pools.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_pool' +require 'fog/openstack/network/models/lb_pool' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbPools < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbPool + model Fog::OpenStack::Network::LbPool def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(pool_id) if pool = service.get_lb_pool(pool_id).body['pool'] new(pool) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/lb_vip.rb b/lib/fog/openstack/network/models/lb_vip.rb similarity index 97% rename from lib/fog/network/openstack/models/lb_vip.rb rename to lib/fog/openstack/network/models/lb_vip.rb index 18039149e..928bb0674 100644 --- a/lib/fog/network/openstack/models/lb_vip.rb +++ b/lib/fog/openstack/network/models/lb_vip.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbVip < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/lb_vips.rb b/lib/fog/openstack/network/models/lb_vips.rb similarity index 75% rename from lib/fog/network/openstack/models/lb_vips.rb rename to lib/fog/openstack/network/models/lb_vips.rb index 24f00e48f..ee44aa639 100644 --- a/lib/fog/network/openstack/models/lb_vips.rb +++ b/lib/fog/openstack/network/models/lb_vips.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/lb_vip' +require 'fog/openstack/network/models/lb_vip' module Fog - module Network - class OpenStack + module OpenStack + class Network class LbVips < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::LbVip + model Fog::OpenStack::Network::LbVip def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(vip_id) if vip = service.get_lb_vip(vip_id).body['vip'] new(vip) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/network.rb b/lib/fog/openstack/network/models/network.rb similarity index 96% rename from lib/fog/network/openstack/models/network.rb rename to lib/fog/openstack/network/models/network.rb index 36afb31c9..7daec5c02 100644 --- a/lib/fog/network/openstack/models/network.rb +++ b/lib/fog/openstack/network/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Network < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/network_ip_availabilities.rb b/lib/fog/openstack/network/models/network_ip_availabilities.rb similarity index 70% rename from lib/fog/network/openstack/models/network_ip_availabilities.rb rename to lib/fog/openstack/network/models/network_ip_availabilities.rb index b9dc84abe..ac285856b 100644 --- a/lib/fog/network/openstack/models/network_ip_availabilities.rb +++ b/lib/fog/openstack/network/models/network_ip_availabilities.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/network_ip_availability' +require 'fog/openstack/network/models/network_ip_availability' module Fog - module Network - class OpenStack + module OpenStack + class Network class NetworkIpAvailabilities < Fog::OpenStack::Collection - model Fog::Network::OpenStack::NetworkIpAvailability + model Fog::OpenStack::Network::NetworkIpAvailability def all load_response(service.list_network_ip_availabilities, 'network_ip_availabilities') @@ -15,7 +15,7 @@ def get(network_id) if network_ip_availability = service.get_network_ip_availability(network_id).body['network_ip_availability'] new(network_ip_availability) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/network_ip_availability.rb b/lib/fog/openstack/network/models/network_ip_availability.rb similarity index 90% rename from lib/fog/network/openstack/models/network_ip_availability.rb rename to lib/fog/openstack/network/models/network_ip_availability.rb index 18c263f11..86b32de8c 100644 --- a/lib/fog/network/openstack/models/network_ip_availability.rb +++ b/lib/fog/openstack/network/models/network_ip_availability.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class NetworkIpAvailability < Fog::OpenStack::Model attribute :used_ips attribute :subnet_ip_availability diff --git a/lib/fog/network/openstack/models/networks.rb b/lib/fog/openstack/network/models/networks.rb similarity index 76% rename from lib/fog/network/openstack/models/networks.rb rename to lib/fog/openstack/network/models/networks.rb index 2a6e061e5..4ff5cf06c 100644 --- a/lib/fog/network/openstack/models/networks.rb +++ b/lib/fog/openstack/network/models/networks.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/network' +require 'fog/openstack/network/models/network' module Fog - module Network - class OpenStack + module OpenStack + class Network class Networks < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Network + model Fog::OpenStack::Network::Network def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(network_id) if network = service.get_network(network_id).body['network'] new(network) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/port.rb b/lib/fog/openstack/network/models/port.rb similarity index 96% rename from lib/fog/network/openstack/models/port.rb rename to lib/fog/openstack/network/models/port.rb index 1d3bbb88f..c5a02df4a 100644 --- a/lib/fog/network/openstack/models/port.rb +++ b/lib/fog/openstack/network/models/port.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Port < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/ports.rb b/lib/fog/openstack/network/models/ports.rb similarity index 75% rename from lib/fog/network/openstack/models/ports.rb rename to lib/fog/openstack/network/models/ports.rb index b92c00310..e81e61ba6 100644 --- a/lib/fog/network/openstack/models/ports.rb +++ b/lib/fog/openstack/network/models/ports.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/port' +require 'fog/openstack/network/models/port' module Fog - module Network - class OpenStack + module OpenStack + class Network class Ports < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Port + model Fog::OpenStack::Network::Port def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(port_id) if port = service.get_port(port_id).body['port'] new(port) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/rbac_policies.rb b/lib/fog/openstack/network/models/rbac_policies.rb similarity index 77% rename from lib/fog/network/openstack/models/rbac_policies.rb rename to lib/fog/openstack/network/models/rbac_policies.rb index c25ce357f..11e6bdcaa 100644 --- a/lib/fog/network/openstack/models/rbac_policies.rb +++ b/lib/fog/openstack/network/models/rbac_policies.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/rbac_policy' +require 'fog/openstack/network/models/rbac_policy' module Fog - module Network - class OpenStack + module OpenStack + class Network class RbacPolicies < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::RbacPolicy + model Fog::OpenStack::Network::RbacPolicy def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(rbac_policy_id) if rbac_policy = service.get_rbac_policy(rbac_policy_id).body['rbac_policy'] new(rbac_policy) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end alias find_by_id get diff --git a/lib/fog/network/openstack/models/rbac_policy.rb b/lib/fog/openstack/network/models/rbac_policy.rb similarity index 95% rename from lib/fog/network/openstack/models/rbac_policy.rb rename to lib/fog/openstack/network/models/rbac_policy.rb index f315384cf..5ed353695 100644 --- a/lib/fog/network/openstack/models/rbac_policy.rb +++ b/lib/fog/openstack/network/models/rbac_policy.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class RbacPolicy < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/router.rb b/lib/fog/openstack/network/models/router.rb similarity index 92% rename from lib/fog/network/openstack/models/router.rb rename to lib/fog/openstack/network/models/router.rb index f1d86a012..e7059ee8a 100644 --- a/lib/fog/network/openstack/models/router.rb +++ b/lib/fog/openstack/network/models/router.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network # The Layer-3 Networking Extensions (router) # # A logical entity for forwarding packets across internal @@ -47,7 +47,7 @@ def options options = attributes.dup if options[:external_gateway_info] - if options[:external_gateway_info].kind_of?(Fog::Network::OpenStack::Network) + if options[:external_gateway_info].kind_of?(Fog::OpenStack::Network::Network) options[:external_gateway_info] = {:network_id => options[:external_gateway_info].id} else options[:external_gateway_info] = {:network_id => options[:external_gateway_info]} diff --git a/lib/fog/network/openstack/models/routers.rb b/lib/fog/openstack/network/models/routers.rb similarity index 75% rename from lib/fog/network/openstack/models/routers.rb rename to lib/fog/openstack/network/models/routers.rb index 3f5f49a49..e9bcea262 100644 --- a/lib/fog/network/openstack/models/routers.rb +++ b/lib/fog/openstack/network/models/routers.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/router' +require 'fog/openstack/network/models/router' module Fog - module Network - class OpenStack + module OpenStack + class Network class Routers < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Router + model Fog::OpenStack::Network::Router def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(router_id) if router = service.get_router(router_id).body['router'] new(router) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/security_group.rb b/lib/fog/openstack/network/models/security_group.rb similarity index 88% rename from lib/fog/network/openstack/models/security_group.rb rename to lib/fog/openstack/network/models/security_group.rb index 55bc842fb..307b412b1 100644 --- a/lib/fog/network/openstack/models/security_group.rb +++ b/lib/fog/openstack/network/models/security_group.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroup < Fog::OpenStack::Model identity :id @@ -18,7 +18,7 @@ def destroy end def security_group_rules - Fog::Network::OpenStack::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::OpenStack::Network::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) end def save diff --git a/lib/fog/network/openstack/models/security_group_rule.rb b/lib/fog/openstack/network/models/security_group_rule.rb similarity index 95% rename from lib/fog/network/openstack/models/security_group_rule.rb rename to lib/fog/openstack/network/models/security_group_rule.rb index 15ecff135..73f67ae53 100644 --- a/lib/fog/network/openstack/models/security_group_rule.rb +++ b/lib/fog/openstack/network/models/security_group_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroupRule < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/security_group_rules.rb b/lib/fog/openstack/network/models/security_group_rules.rb similarity index 76% rename from lib/fog/network/openstack/models/security_group_rules.rb rename to lib/fog/openstack/network/models/security_group_rules.rb index de8486a4e..138985b89 100644 --- a/lib/fog/network/openstack/models/security_group_rules.rb +++ b/lib/fog/openstack/network/models/security_group_rules.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/security_group_rule' +require 'fog/openstack/network/models/security_group_rule' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroupRules < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::SecurityGroupRule + model Fog::OpenStack::Network::SecurityGroupRule def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(sec_group_rule_id) if sec_group_rule = service.get_security_group_rule(sec_group_rule_id).body['security_group_rule'] new(sec_group_rule) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/security_groups.rb b/lib/fog/openstack/network/models/security_groups.rb similarity index 76% rename from lib/fog/network/openstack/models/security_groups.rb rename to lib/fog/openstack/network/models/security_groups.rb index cd79a446a..35bfe2b97 100644 --- a/lib/fog/network/openstack/models/security_groups.rb +++ b/lib/fog/openstack/network/models/security_groups.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/security_group' +require 'fog/openstack/network/models/security_group' module Fog - module Network - class OpenStack + module OpenStack + class Network class SecurityGroups < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::SecurityGroup + model Fog::OpenStack::Network::SecurityGroup def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(security_group_id) if security_group = service.get_security_group(security_group_id).body['security_group'] new(security_group) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/subnet.rb b/lib/fog/openstack/network/models/subnet.rb similarity index 96% rename from lib/fog/network/openstack/models/subnet.rb rename to lib/fog/openstack/network/models/subnet.rb index 377a68c9e..cbec2ba14 100644 --- a/lib/fog/network/openstack/models/subnet.rb +++ b/lib/fog/openstack/network/models/subnet.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class Subnet < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/subnet_pool.rb b/lib/fog/openstack/network/models/subnet_pool.rb similarity index 96% rename from lib/fog/network/openstack/models/subnet_pool.rb rename to lib/fog/openstack/network/models/subnet_pool.rb index bade0636a..c14208b18 100644 --- a/lib/fog/network/openstack/models/subnet_pool.rb +++ b/lib/fog/openstack/network/models/subnet_pool.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class SubnetPool < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/subnet_pools.rb b/lib/fog/openstack/network/models/subnet_pools.rb similarity index 76% rename from lib/fog/network/openstack/models/subnet_pools.rb rename to lib/fog/openstack/network/models/subnet_pools.rb index fa8006430..414cad0f8 100644 --- a/lib/fog/network/openstack/models/subnet_pools.rb +++ b/lib/fog/openstack/network/models/subnet_pools.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/subnet_pool' +require 'fog/openstack/network/models/subnet_pool' module Fog - module Network - class OpenStack + module OpenStack + class Network class SubnetPools < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::SubnetPool + model Fog::OpenStack::Network::SubnetPool def initialize(attributes) self.filters ||= {} @@ -24,7 +24,7 @@ def get(subnet_pool_id) if subnet_pool new(subnet_pool) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/subnets.rb b/lib/fog/openstack/network/models/subnets.rb similarity index 75% rename from lib/fog/network/openstack/models/subnets.rb rename to lib/fog/openstack/network/models/subnets.rb index f7df5f7f1..7f7b8dff2 100644 --- a/lib/fog/network/openstack/models/subnets.rb +++ b/lib/fog/openstack/network/models/subnets.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/subnet' +require 'fog/openstack/network/models/subnet' module Fog - module Network - class OpenStack + module OpenStack + class Network class Subnets < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::Subnet + model Fog::OpenStack::Network::Subnet def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(subnet_id) if subnet = service.get_subnet(subnet_id).body['subnet'] new(subnet) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack/models/vpn_service.rb b/lib/fog/openstack/network/models/vpn_service.rb similarity index 96% rename from lib/fog/network/openstack/models/vpn_service.rb rename to lib/fog/openstack/network/models/vpn_service.rb index 41217aadf..8dbb990c5 100644 --- a/lib/fog/network/openstack/models/vpn_service.rb +++ b/lib/fog/openstack/network/models/vpn_service.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Network - class OpenStack + module OpenStack + class Network class VpnService < Fog::OpenStack::Model identity :id diff --git a/lib/fog/network/openstack/models/vpn_services.rb b/lib/fog/openstack/network/models/vpn_services.rb similarity index 76% rename from lib/fog/network/openstack/models/vpn_services.rb rename to lib/fog/openstack/network/models/vpn_services.rb index af8baea7d..c062a2fa0 100644 --- a/lib/fog/network/openstack/models/vpn_services.rb +++ b/lib/fog/openstack/network/models/vpn_services.rb @@ -1,13 +1,13 @@ require 'fog/openstack/models/collection' -require 'fog/network/openstack/models/vpn_service' +require 'fog/openstack/network/models/vpn_service' module Fog - module Network - class OpenStack + module OpenStack + class Network class VpnServices < Fog::OpenStack::Collection attribute :filters - model Fog::Network::OpenStack::VpnService + model Fog::OpenStack::Network::VpnService def initialize(attributes) self.filters ||= {} @@ -23,7 +23,7 @@ def get(vpn_service_id) if vpn_service = service.get_vpn_service(vpn_service_id).body['vpnservice'] new(vpn_service) end - rescue Fog::Network::OpenStack::NotFound + rescue Fog::OpenStack::Network::NotFound nil end end diff --git a/lib/fog/network/openstack.rb b/lib/fog/openstack/network/network.rb similarity index 98% rename from lib/fog/network/openstack.rb rename to lib/fog/openstack/network/network.rb index f0c1e0f3c..10070d4d3 100644 --- a/lib/fog/network/openstack.rb +++ b/lib/fog/openstack/network/network.rb @@ -1,8 +1,8 @@ module Fog - module Network - class OpenStack < Fog::Service + module OpenStack + class Network < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -17,7 +17,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/network/openstack/models' + model_path 'fog/openstack/network/models' model :extension collection :extensions model :network @@ -59,7 +59,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/network/openstack/requests' + request_path 'fog/openstack/network/requests' # Neutron Extensions request :list_extensions @@ -442,7 +442,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Network::OpenStack::NotFound + Fog::OpenStack::Network::NotFound end def default_path_prefix diff --git a/lib/fog/network/openstack/requests/add_router_interface.rb b/lib/fog/openstack/network/requests/add_router_interface.rb similarity index 97% rename from lib/fog/network/openstack/requests/add_router_interface.rb rename to lib/fog/openstack/network/requests/add_router_interface.rb index e3c566128..ad6f8748d 100644 --- a/lib/fog/network/openstack/requests/add_router_interface.rb +++ b/lib/fog/openstack/network/requests/add_router_interface.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def add_router_interface(router_id, subnet_id_or_options) if subnet_id_or_options.kind_of? String diff --git a/lib/fog/network/openstack/requests/associate_floating_ip.rb b/lib/fog/openstack/network/requests/associate_floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/requests/associate_floating_ip.rb rename to lib/fog/openstack/network/requests/associate_floating_ip.rb index bb1b306a4..6ffa8d498 100644 --- a/lib/fog/network/openstack/requests/associate_floating_ip.rb +++ b/lib/fog/openstack/network/requests/associate_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def associate_floating_ip(floating_ip_id, port_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/associate_lb_health_monitor.rb b/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb similarity index 91% rename from lib/fog/network/openstack/requests/associate_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/associate_lb_health_monitor.rb index ad575e507..523310005 100644 --- a/lib/fog/network/openstack/requests/associate_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def associate_lb_health_monitor(pool_id, health_monitor_id) data = { @@ -28,7 +28,7 @@ def associate_lb_health_monitor(pool_id, health_monitor_id) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/create_floating_ip.rb b/lib/fog/openstack/network/requests/create_floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_floating_ip.rb rename to lib/fog/openstack/network/requests/create_floating_ip.rb index 5074ae40b..ec71f30a4 100644 --- a/lib/fog/network/openstack/requests/create_floating_ip.rb +++ b/lib/fog/openstack/network/requests/create_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_floating_ip(floating_network_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_ike_policy.rb b/lib/fog/openstack/network/requests/create_ike_policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_ike_policy.rb rename to lib/fog/openstack/network/requests/create_ike_policy.rb index 7d2296cc5..28b33df7f 100644 --- a/lib/fog/network/openstack/requests/create_ike_policy.rb +++ b/lib/fog/openstack/network/requests/create_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_ike_policy(options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_ipsec_policy.rb b/lib/fog/openstack/network/requests/create_ipsec_policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_ipsec_policy.rb rename to lib/fog/openstack/network/requests/create_ipsec_policy.rb index 8072890cd..0a0fd904d 100644 --- a/lib/fog/network/openstack/requests/create_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/create_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_ipsec_policy(options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/create_ipsec_site_connection.rb index fde20bca8..a5b674a13 100644 --- a/lib/fog/network/openstack/requests/create_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_health_monitor.rb b/lib/fog/openstack/network/requests/create_lb_health_monitor.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/create_lb_health_monitor.rb index eb3498c81..944c40cd6 100644 --- a/lib/fog/network/openstack/requests/create_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/create_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_member.rb b/lib/fog/openstack/network/requests/create_lb_member.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lb_member.rb rename to lib/fog/openstack/network/requests/create_lb_member.rb index 64443d13d..262201a48 100644 --- a/lib/fog/network/openstack/requests/create_lb_member.rb +++ b/lib/fog/openstack/network/requests/create_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_member(pool_id, address, protocol_port, weight, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_pool.rb b/lib/fog/openstack/network/requests/create_lb_pool.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lb_pool.rb rename to lib/fog/openstack/network/requests/create_lb_pool.rb index 6a03b6d78..e4ebd5cd1 100644 --- a/lib/fog/network/openstack/requests/create_lb_pool.rb +++ b/lib/fog/openstack/network/requests/create_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_pool(subnet_id, protocol, lb_method, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lb_vip.rb b/lib/fog/openstack/network/requests/create_lb_vip.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lb_vip.rb rename to lib/fog/openstack/network/requests/create_lb_vip.rb index 3344c2716..70a3358e7 100644 --- a/lib/fog/network/openstack/requests/create_lb_vip.rb +++ b/lib/fog/openstack/network/requests/create_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb index 98be085b7..be0a68f66 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_healthmonitor(pool_id, type, delay, timeout, max_retries, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/create_lbaas_l7policy.rb index aac267e48..7ef1c2333 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_l7policy(listener_id, action, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/create_lbaas_l7rule.rb index 869670308..e2992aa8e 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_l7rule(l7policy_id, type, compare_type, value, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_listener.rb b/lib/fog/openstack/network/requests/create_lbaas_listener.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_lbaas_listener.rb rename to lib/fog/openstack/network/requests/create_lbaas_listener.rb index dcec8c92f..5abeccaac 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_listener(loadbalancer_id, protocol, protocol_port, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb index aa8fb2afc..dd7d61118 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_loadbalancer(vip_subnet_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_pool.rb b/lib/fog/openstack/network/requests/create_lbaas_pool.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_pool.rb rename to lib/fog/openstack/network/requests/create_lbaas_pool.rb index c539862ff..cddffc9bd 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_pool(listener_id, protocol, lb_algorithm, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/create_lbaas_pool_member.rb index 8e73b2d8d..547158991 100644 --- a/lib/fog/network/openstack/requests/create_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_lbaas_pool_member(pool_id, address, protocol_port, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_network.rb b/lib/fog/openstack/network/requests/create_network.rb similarity index 94% rename from lib/fog/network/openstack/requests/create_network.rb rename to lib/fog/openstack/network/requests/create_network.rb index 035e284b5..bee8dc484 100644 --- a/lib/fog/network/openstack/requests/create_network.rb +++ b/lib/fog/openstack/network/requests/create_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real CREATE_OPTIONS = [ :name, @@ -25,7 +25,7 @@ class Real :router_external, ].freeze - # Map Fog::Network::OpenStack::Network + # Map Fog::OpenStack::Network::Network # model attributes to OpenStack provider attributes ALIASES = { :provider_network_type => 'provider:network_type', @@ -77,7 +77,7 @@ def create_network(options = {}) 'qos_policy_id' => options[:qos_policy_id], 'port_security_enabled' => options[:port_security_enabled] || false } - data.merge!(Fog::Network::OpenStack::Real.create(options)) + data.merge!(Fog::OpenStack::Network::Real.create(options)) self.data[:networks][data['id']] = data response.body = {'network' => data} response diff --git a/lib/fog/network/openstack/requests/create_port.rb b/lib/fog/openstack/network/requests/create_port.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_port.rb rename to lib/fog/openstack/network/requests/create_port.rb index f915d977e..75d41a049 100644 --- a/lib/fog/network/openstack/requests/create_port.rb +++ b/lib/fog/openstack/network/requests/create_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_port(network_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_rbac_policy.rb b/lib/fog/openstack/network/requests/create_rbac_policy.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_rbac_policy.rb rename to lib/fog/openstack/network/requests/create_rbac_policy.rb index bf9b34392..661dd5ae8 100644 --- a/lib/fog/network/openstack/requests/create_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/create_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_rbac_policy(options = {}) data = {'rbac_policy' => {}} diff --git a/lib/fog/network/openstack/requests/create_router.rb b/lib/fog/openstack/network/requests/create_router.rb similarity index 93% rename from lib/fog/network/openstack/requests/create_router.rb rename to lib/fog/openstack/network/requests/create_router.rb index 489666099..d02b67be8 100644 --- a/lib/fog/network/openstack/requests/create_router.rb +++ b/lib/fog/openstack/network/requests/create_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_router(name, options = {}) data = { @@ -23,7 +23,7 @@ def create_router(name, options = {}) # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::Network::OpenStack::Network) + if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" data['router'][:external_gateway_info] = {:network_id => egi.id} @@ -50,7 +50,7 @@ def create_router(name, options = {}) # remove this in a future egi = options[:external_gateway_info] - if egi && egi.kind_of?(Fog::Network::OpenStack::Network) + if egi && egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" egi = {:network_id => egi.id} diff --git a/lib/fog/network/openstack/requests/create_security_group.rb b/lib/fog/openstack/network/requests/create_security_group.rb similarity index 99% rename from lib/fog/network/openstack/requests/create_security_group.rb rename to lib/fog/openstack/network/requests/create_security_group.rb index 024f557e1..84800e80b 100644 --- a/lib/fog/network/openstack/requests/create_security_group.rb +++ b/lib/fog/openstack/network/requests/create_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Create a new security group # diff --git a/lib/fog/network/openstack/requests/create_security_group_rule.rb b/lib/fog/openstack/network/requests/create_security_group_rule.rb similarity index 99% rename from lib/fog/network/openstack/requests/create_security_group_rule.rb rename to lib/fog/openstack/network/requests/create_security_group_rule.rb index d80a5911f..3de620781 100644 --- a/lib/fog/network/openstack/requests/create_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/create_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Create a new security group rule # diff --git a/lib/fog/network/openstack/requests/create_subnet.rb b/lib/fog/openstack/network/requests/create_subnet.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_subnet.rb rename to lib/fog/openstack/network/requests/create_subnet.rb index 610fcb09b..1d49b1a34 100644 --- a/lib/fog/network/openstack/requests/create_subnet.rb +++ b/lib/fog/openstack/network/requests/create_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_subnet(network_id, cidr, ip_version, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_subnet_pool.rb b/lib/fog/openstack/network/requests/create_subnet_pool.rb similarity index 98% rename from lib/fog/network/openstack/requests/create_subnet_pool.rb rename to lib/fog/openstack/network/requests/create_subnet_pool.rb index f2064879a..3b56580f7 100644 --- a/lib/fog/network/openstack/requests/create_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/create_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_subnet_pool(name, prefixes, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/create_vpn_service.rb b/lib/fog/openstack/network/requests/create_vpn_service.rb similarity index 97% rename from lib/fog/network/openstack/requests/create_vpn_service.rb rename to lib/fog/openstack/network/requests/create_vpn_service.rb index b607e239f..811658e66 100644 --- a/lib/fog/network/openstack/requests/create_vpn_service.rb +++ b/lib/fog/openstack/network/requests/create_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def create_vpn_service(subnet_id, router_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/delete_floating_ip.rb b/lib/fog/openstack/network/requests/delete_floating_ip.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_floating_ip.rb rename to lib/fog/openstack/network/requests/delete_floating_ip.rb index 3410ae317..a5ed2249b 100644 --- a/lib/fog/network/openstack/requests/delete_floating_ip.rb +++ b/lib/fog/openstack/network/requests/delete_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_floating_ip(floating_ip_id) request( @@ -19,7 +19,7 @@ def delete_floating_ip(floating_ip_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_ike_policy.rb b/lib/fog/openstack/network/requests/delete_ike_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_ike_policy.rb rename to lib/fog/openstack/network/requests/delete_ike_policy.rb index fc798c3ae..7ded4a686 100644 --- a/lib/fog/network/openstack/requests/delete_ike_policy.rb +++ b/lib/fog/openstack/network/requests/delete_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_ike_policy(ike_policy_id) request( @@ -19,7 +19,7 @@ def delete_ike_policy(ike_policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_ipsec_policy.rb b/lib/fog/openstack/network/requests/delete_ipsec_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_ipsec_policy.rb rename to lib/fog/openstack/network/requests/delete_ipsec_policy.rb index b9ca9bf95..ab38153de 100644 --- a/lib/fog/network/openstack/requests/delete_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/delete_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_ipsec_policy(ipsec_policy_id) request( @@ -19,7 +19,7 @@ def delete_ipsec_policy(ipsec_policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb similarity index 89% rename from lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb index fd24837c9..685b2201e 100644 --- a/lib/fog/network/openstack/requests/delete_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_ipsec_site_connection(ipsec_site_connection_id) request( @@ -20,7 +20,7 @@ def delete_ipsec_site_connection(ipsec_site_connection_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_health_monitor.rb b/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/delete_lb_health_monitor.rb index 53759f2c8..bcda68445 100644 --- a/lib/fog/network/openstack/requests/delete_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_health_monitor(health_monitor_id) request( @@ -19,7 +19,7 @@ def delete_lb_health_monitor(health_monitor_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_member.rb b/lib/fog/openstack/network/requests/delete_lb_member.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lb_member.rb rename to lib/fog/openstack/network/requests/delete_lb_member.rb index d7dc2f956..5f59c5b87 100644 --- a/lib/fog/network/openstack/requests/delete_lb_member.rb +++ b/lib/fog/openstack/network/requests/delete_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_member(member_id) request( @@ -19,7 +19,7 @@ def delete_lb_member(member_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_pool.rb b/lib/fog/openstack/network/requests/delete_lb_pool.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lb_pool.rb rename to lib/fog/openstack/network/requests/delete_lb_pool.rb index 2028cfe49..c74ddf3e9 100644 --- a/lib/fog/network/openstack/requests/delete_lb_pool.rb +++ b/lib/fog/openstack/network/requests/delete_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_pool(pool_id) request( @@ -19,7 +19,7 @@ def delete_lb_pool(pool_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lb_vip.rb b/lib/fog/openstack/network/requests/delete_lb_vip.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lb_vip.rb rename to lib/fog/openstack/network/requests/delete_lb_vip.rb index 5a413684c..feb25b5fc 100644 --- a/lib/fog/network/openstack/requests/delete_lb_vip.rb +++ b/lib/fog/openstack/network/requests/delete_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lb_vip(vip_id) request( @@ -19,7 +19,7 @@ def delete_lb_vip(vip_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb index 31e41356b..54987f35a 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_healthmonitor(healthmonitor_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_healthmonitor(healthmonitor_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb index bafde224d..932da19e1 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_l7policy(l7policy_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_l7policy(l7policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb index dec806767..e8c238b53 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_l7rule(l7policy_id, l7rule_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_l7rule(l7policy_id, l7rule_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_listener.rb b/lib/fog/openstack/network/requests/delete_lbaas_listener.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_lbaas_listener.rb rename to lib/fog/openstack/network/requests/delete_lbaas_listener.rb index 3f4e73465..757f4dbd6 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_listener(listener_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_listener(listener_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb index e73cd61d4..86bd24c1e 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_loadbalancer(loadbalancer_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_loadbalancer(loadbalancer_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_pool.rb b/lib/fog/openstack/network/requests/delete_lbaas_pool.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_lbaas_pool.rb rename to lib/fog/openstack/network/requests/delete_lbaas_pool.rb index 8c0e5cf93..3034c130a 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_pool(pool_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_pool(pool_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb similarity index 88% rename from lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb index 17e547efb..82ef9e421 100644 --- a/lib/fog/network/openstack/requests/delete_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_lbaas_pool_member(pool_id, member_id) request( @@ -19,7 +19,7 @@ def delete_lbaas_pool_member(pool_id, member_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_network.rb b/lib/fog/openstack/network/requests/delete_network.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_network.rb rename to lib/fog/openstack/network/requests/delete_network.rb index 0bee8e6c1..abd10a4c0 100644 --- a/lib/fog/network/openstack/requests/delete_network.rb +++ b/lib/fog/openstack/network/requests/delete_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_network(network_id) request( @@ -19,7 +19,7 @@ def delete_network(network_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_port.rb b/lib/fog/openstack/network/requests/delete_port.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_port.rb rename to lib/fog/openstack/network/requests/delete_port.rb index 16b91a740..270b5eb25 100644 --- a/lib/fog/network/openstack/requests/delete_port.rb +++ b/lib/fog/openstack/network/requests/delete_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_port(port_id) request( @@ -19,7 +19,7 @@ def delete_port(port_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_quota.rb b/lib/fog/openstack/network/requests/delete_quota.rb similarity index 91% rename from lib/fog/network/openstack/requests/delete_quota.rb rename to lib/fog/openstack/network/requests/delete_quota.rb index 1336ab448..8cb55f731 100644 --- a/lib/fog/network/openstack/requests/delete_quota.rb +++ b/lib/fog/openstack/network/requests/delete_quota.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_quota(tenant_id) request( diff --git a/lib/fog/network/openstack/requests/delete_rbac_policy.rb b/lib/fog/openstack/network/requests/delete_rbac_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_rbac_policy.rb rename to lib/fog/openstack/network/requests/delete_rbac_policy.rb index f051160e3..61ab9a190 100644 --- a/lib/fog/network/openstack/requests/delete_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/delete_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_rbac_policy(rbac_policy_id) request( @@ -19,7 +19,7 @@ def delete_rbac_policy(rbac_policy_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_router.rb b/lib/fog/openstack/network/requests/delete_router.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_router.rb rename to lib/fog/openstack/network/requests/delete_router.rb index 313ce92d5..40b558328 100644 --- a/lib/fog/network/openstack/requests/delete_router.rb +++ b/lib/fog/openstack/network/requests/delete_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_router(router_id) request( @@ -19,7 +19,7 @@ def delete_router(router_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_security_group.rb b/lib/fog/openstack/network/requests/delete_security_group.rb similarity index 89% rename from lib/fog/network/openstack/requests/delete_security_group.rb rename to lib/fog/openstack/network/requests/delete_security_group.rb index 9dadd9b2f..d467dc440 100644 --- a/lib/fog/network/openstack/requests/delete_security_group.rb +++ b/lib/fog/openstack/network/requests/delete_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Delete a security group # @@ -23,7 +23,7 @@ def delete_security_group(security_group_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_security_group_rule.rb b/lib/fog/openstack/network/requests/delete_security_group_rule.rb similarity index 90% rename from lib/fog/network/openstack/requests/delete_security_group_rule.rb rename to lib/fog/openstack/network/requests/delete_security_group_rule.rb index 2651982d9..0ad7a8ac5 100644 --- a/lib/fog/network/openstack/requests/delete_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/delete_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Delete a security group rule # @@ -23,7 +23,7 @@ def delete_security_group_rule(security_group_rule_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_subnet.rb b/lib/fog/openstack/network/requests/delete_subnet.rb similarity index 86% rename from lib/fog/network/openstack/requests/delete_subnet.rb rename to lib/fog/openstack/network/requests/delete_subnet.rb index 86d3e4a64..0d47b2563 100644 --- a/lib/fog/network/openstack/requests/delete_subnet.rb +++ b/lib/fog/openstack/network/requests/delete_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_subnet(subnet_id) request( @@ -19,7 +19,7 @@ def delete_subnet(subnet_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_subnet_pool.rb b/lib/fog/openstack/network/requests/delete_subnet_pool.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_subnet_pool.rb rename to lib/fog/openstack/network/requests/delete_subnet_pool.rb index 9c985d0ce..ed2f970c2 100644 --- a/lib/fog/network/openstack/requests/delete_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/delete_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_subnet_pool(subnet_pool_id) request( @@ -19,7 +19,7 @@ def delete_subnet_pool(subnet_pool_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/delete_vpn_service.rb b/lib/fog/openstack/network/requests/delete_vpn_service.rb similarity index 87% rename from lib/fog/network/openstack/requests/delete_vpn_service.rb rename to lib/fog/openstack/network/requests/delete_vpn_service.rb index 99fd4a866..37665346e 100644 --- a/lib/fog/network/openstack/requests/delete_vpn_service.rb +++ b/lib/fog/openstack/network/requests/delete_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def delete_vpn_service(vpn_service_id) request( @@ -19,7 +19,7 @@ def delete_vpn_service(vpn_service_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/disassociate_floating_ip.rb b/lib/fog/openstack/network/requests/disassociate_floating_ip.rb similarity index 97% rename from lib/fog/network/openstack/requests/disassociate_floating_ip.rb rename to lib/fog/openstack/network/requests/disassociate_floating_ip.rb index 048e11ea2..f82c61378 100644 --- a/lib/fog/network/openstack/requests/disassociate_floating_ip.rb +++ b/lib/fog/openstack/network/requests/disassociate_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def disassociate_floating_ip(floating_ip_id, options = {}) data = { diff --git a/lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb b/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb similarity index 89% rename from lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb index 3cafc56f4..473fa2ffe 100644 --- a/lib/fog/network/openstack/requests/disassociate_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def disassociate_lb_health_monitor(pool_id, health_monitor_id) request( @@ -20,7 +20,7 @@ def disassociate_lb_health_monitor(pool_id, health_monitor_id) response.status = 204 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_extension.rb b/lib/fog/openstack/network/requests/get_extension.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_extension.rb rename to lib/fog/openstack/network/requests/get_extension.rb index 9cef9ec26..4bf4bd7c1 100644 --- a/lib/fog/network/openstack/requests/get_extension.rb +++ b/lib/fog/openstack/network/requests/get_extension.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_extension(name) request( @@ -19,7 +19,7 @@ def get_extension(name) response.body = {'extension' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_floating_ip.rb b/lib/fog/openstack/network/requests/get_floating_ip.rb similarity index 92% rename from lib/fog/network/openstack/requests/get_floating_ip.rb rename to lib/fog/openstack/network/requests/get_floating_ip.rb index 2ec92555e..4bd6ac2a5 100644 --- a/lib/fog/network/openstack/requests/get_floating_ip.rb +++ b/lib/fog/openstack/network/requests/get_floating_ip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_floating_ip(floating_ip_id) request( @@ -30,7 +30,7 @@ def get_floating_ip(floating_ip_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_ike_policy.rb b/lib/fog/openstack/network/requests/get_ike_policy.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_ike_policy.rb rename to lib/fog/openstack/network/requests/get_ike_policy.rb index da81eb114..4eacb6261 100644 --- a/lib/fog/network/openstack/requests/get_ike_policy.rb +++ b/lib/fog/openstack/network/requests/get_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_ike_policy(ike_policy_id) request( @@ -19,7 +19,7 @@ def get_ike_policy(ike_policy_id) response.body = {'ikepolicy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_ipsec_policy.rb b/lib/fog/openstack/network/requests/get_ipsec_policy.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_ipsec_policy.rb rename to lib/fog/openstack/network/requests/get_ipsec_policy.rb index 4d6336f45..b8c7d7b2f 100644 --- a/lib/fog/network/openstack/requests/get_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/get_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_ipsec_policy(ipsec_policy_id) request( @@ -19,7 +19,7 @@ def get_ipsec_policy(ipsec_policy_id) response.body = {'ipsecpolicy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb similarity index 88% rename from lib/fog/network/openstack/requests/get_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/get_ipsec_site_connection.rb index 5b1774b64..e100d18b4 100644 --- a/lib/fog/network/openstack/requests/get_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_ipsec_site_connection(ipsec_site_connection_id) request( @@ -19,7 +19,7 @@ def get_ipsec_site_connection(ipsec_site_connection_id) response.body = {'ipsec_site_connection' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_health_monitor.rb b/lib/fog/openstack/network/requests/get_lb_health_monitor.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/get_lb_health_monitor.rb index 6af8dadcf..1ac983470 100644 --- a/lib/fog/network/openstack/requests/get_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/get_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_health_monitor(health_monitor_id) request( @@ -19,7 +19,7 @@ def get_lb_health_monitor(health_monitor_id) response.body = {'health_monitor' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_member.rb b/lib/fog/openstack/network/requests/get_lb_member.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_lb_member.rb rename to lib/fog/openstack/network/requests/get_lb_member.rb index f6e0d0e38..cd18a27d7 100644 --- a/lib/fog/network/openstack/requests/get_lb_member.rb +++ b/lib/fog/openstack/network/requests/get_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_member(member_id) request( @@ -19,7 +19,7 @@ def get_lb_member(member_id) response.body = {'member' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_pool.rb b/lib/fog/openstack/network/requests/get_lb_pool.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_lb_pool.rb rename to lib/fog/openstack/network/requests/get_lb_pool.rb index c32746c83..93668dd60 100644 --- a/lib/fog/network/openstack/requests/get_lb_pool.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_pool(pool_id) request( @@ -19,7 +19,7 @@ def get_lb_pool(pool_id) response.body = {'pool' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_pool_stats.rb b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb similarity index 89% rename from lib/fog/network/openstack/requests/get_lb_pool_stats.rb rename to lib/fog/openstack/network/requests/get_lb_pool_stats.rb index 2e50f9425..385cec020 100644 --- a/lib/fog/network/openstack/requests/get_lb_pool_stats.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_pool_stats(pool_id) request( @@ -24,7 +24,7 @@ def get_lb_pool_stats(pool_id) response.body = {'stats' => stats} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lb_vip.rb b/lib/fog/openstack/network/requests/get_lb_vip.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_lb_vip.rb rename to lib/fog/openstack/network/requests/get_lb_vip.rb index 97c8bb13e..54b85101a 100644 --- a/lib/fog/network/openstack/requests/get_lb_vip.rb +++ b/lib/fog/openstack/network/requests/get_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lb_vip(vip_id) request( @@ -19,7 +19,7 @@ def get_lb_vip(vip_id) response.body = {'vip' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb index 5c7fcbf87..6a02762b6 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_healthmonitor(healthmonitor_id) request( @@ -19,7 +19,7 @@ def get_lbaas_healthmonitor(healthmonitor_id) response.body = {'healthmonitor' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/get_lbaas_l7policy.rb index 44d87105c..e1a319869 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_l7policy(l7policy_id) request( @@ -19,7 +19,7 @@ def get_lbaas_l7policy(l7policy_id) response.body = {'l7policy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/get_lbaas_l7rule.rb index e63b527d6..5f628dd1d 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_l7rule(l7policy_id, l7rule_id) request( @@ -19,7 +19,7 @@ def get_lbaas_l7rule(l7policy_id, l7rule_id) response.body = {'rule' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_listener.rb b/lib/fog/openstack/network/requests/get_lbaas_listener.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_lbaas_listener.rb rename to lib/fog/openstack/network/requests/get_lbaas_listener.rb index 2bfc10b78..2e3e9c360 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_listener(listener_id) request( @@ -19,7 +19,7 @@ def get_lbaas_listener(listener_id) response.body = {'listener' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb index e9c5f790b..9adbc292f 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_loadbalancer(loadbalancer_id) request( @@ -19,7 +19,7 @@ def get_lbaas_loadbalancer(loadbalancer_id) response.body = {'loadbalancer' => data[:lbaas_loadbalancer]} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_pool.rb b/lib/fog/openstack/network/requests/get_lbaas_pool.rb similarity index 85% rename from lib/fog/network/openstack/requests/get_lbaas_pool.rb rename to lib/fog/openstack/network/requests/get_lbaas_pool.rb index 8342fe7c2..7ee764d14 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_pool(pool_id) request( @@ -19,7 +19,7 @@ def get_lbaas_pool(pool_id) response.body = {'pool' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/get_lbaas_pool_member.rb index 88b89ac97..d91f8358c 100644 --- a/lib/fog/network/openstack/requests/get_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_lbaas_pool_member(pool_id, member_id) request( @@ -19,7 +19,7 @@ def get_lbaas_pool_member(pool_id, member_id) response.body = {'member' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_network.rb b/lib/fog/openstack/network/requests/get_network.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_network.rb rename to lib/fog/openstack/network/requests/get_network.rb index 44acd5d1c..86968552d 100644 --- a/lib/fog/network/openstack/requests/get_network.rb +++ b/lib/fog/openstack/network/requests/get_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_network(network_id) request( @@ -19,7 +19,7 @@ def get_network(network_id) response.body = {'network' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_network_ip_availability.rb b/lib/fog/openstack/network/requests/get_network_ip_availability.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_network_ip_availability.rb rename to lib/fog/openstack/network/requests/get_network_ip_availability.rb index ad09682db..08c2319cb 100644 --- a/lib/fog/network/openstack/requests/get_network_ip_availability.rb +++ b/lib/fog/openstack/network/requests/get_network_ip_availability.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_network_ip_availability(network_id) request( @@ -19,7 +19,7 @@ def get_network_ip_availability(network_id) response.body = {'network_ip_availability' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_port.rb b/lib/fog/openstack/network/requests/get_port.rb similarity index 94% rename from lib/fog/network/openstack/requests/get_port.rb rename to lib/fog/openstack/network/requests/get_port.rb index f8210265e..da6159748 100644 --- a/lib/fog/network/openstack/requests/get_port.rb +++ b/lib/fog/openstack/network/requests/get_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_port(port_id) request( @@ -42,7 +42,7 @@ def get_port(port_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_quota.rb b/lib/fog/openstack/network/requests/get_quota.rb similarity index 93% rename from lib/fog/network/openstack/requests/get_quota.rb rename to lib/fog/openstack/network/requests/get_quota.rb index 629c8db6b..7caa56c36 100644 --- a/lib/fog/network/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/network/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_quota(tenant_id) request( diff --git a/lib/fog/network/openstack/requests/get_quotas.rb b/lib/fog/openstack/network/requests/get_quotas.rb similarity index 92% rename from lib/fog/network/openstack/requests/get_quotas.rb rename to lib/fog/openstack/network/requests/get_quotas.rb index b13d9b530..295caca5a 100644 --- a/lib/fog/network/openstack/requests/get_quotas.rb +++ b/lib/fog/openstack/network/requests/get_quotas.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_quotas request( diff --git a/lib/fog/network/openstack/requests/get_rbac_policy.rb b/lib/fog/openstack/network/requests/get_rbac_policy.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_rbac_policy.rb rename to lib/fog/openstack/network/requests/get_rbac_policy.rb index 6b0ba0f7b..c42f505d9 100644 --- a/lib/fog/network/openstack/requests/get_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/get_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_rbac_policy(rbac_policy_id) request( @@ -19,7 +19,7 @@ def get_rbac_policy(rbac_policy_id) response.body = {'rbac_policy' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_router.rb b/lib/fog/openstack/network/requests/get_router.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_router.rb rename to lib/fog/openstack/network/requests/get_router.rb index 7791dc996..dc69e2be8 100644 --- a/lib/fog/network/openstack/requests/get_router.rb +++ b/lib/fog/openstack/network/requests/get_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_router(router_id) request( @@ -21,7 +21,7 @@ def get_router(router_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_security_group.rb b/lib/fog/openstack/network/requests/get_security_group.rb similarity index 96% rename from lib/fog/network/openstack/requests/get_security_group.rb rename to lib/fog/openstack/network/requests/get_security_group.rb index 86e10a088..7ef1c916d 100644 --- a/lib/fog/network/openstack/requests/get_security_group.rb +++ b/lib/fog/openstack/network/requests/get_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Get details about a security group # @@ -43,7 +43,7 @@ def get_security_group(security_group_id) response.body = {"security_group" => sec_group} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_security_group_rule.rb b/lib/fog/openstack/network/requests/get_security_group_rule.rb similarity index 95% rename from lib/fog/network/openstack/requests/get_security_group_rule.rb rename to lib/fog/openstack/network/requests/get_security_group_rule.rb index 67204e8ec..ac746088e 100644 --- a/lib/fog/network/openstack/requests/get_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/get_security_group_rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Get details about a security group rule # @@ -38,7 +38,7 @@ def get_security_group_rule(security_group_rule_id) response.body = {"security_group_rule" => sec_group_rule} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_subnet.rb b/lib/fog/openstack/network/requests/get_subnet.rb similarity index 93% rename from lib/fog/network/openstack/requests/get_subnet.rb rename to lib/fog/openstack/network/requests/get_subnet.rb index cac3ed4b4..8271a4dbf 100644 --- a/lib/fog/network/openstack/requests/get_subnet.rb +++ b/lib/fog/openstack/network/requests/get_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_subnet(subnet_id) request( @@ -38,7 +38,7 @@ def get_subnet(subnet_id) } response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_subnet_pool.rb b/lib/fog/openstack/network/requests/get_subnet_pool.rb similarity index 87% rename from lib/fog/network/openstack/requests/get_subnet_pool.rb rename to lib/fog/openstack/network/requests/get_subnet_pool.rb index dcbd84491..c1159b4ed 100644 --- a/lib/fog/network/openstack/requests/get_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/get_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_subnet_pool(subnet_pool_id) request( @@ -20,7 +20,7 @@ def get_subnet_pool(subnet_pool_id) response.body = {'subnetpool' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/get_vpn_service.rb b/lib/fog/openstack/network/requests/get_vpn_service.rb similarity index 86% rename from lib/fog/network/openstack/requests/get_vpn_service.rb rename to lib/fog/openstack/network/requests/get_vpn_service.rb index 3e8858e00..ac0825e43 100644 --- a/lib/fog/network/openstack/requests/get_vpn_service.rb +++ b/lib/fog/openstack/network/requests/get_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def get_vpn_service(vpn_service_id) request( @@ -19,7 +19,7 @@ def get_vpn_service(vpn_service_id) response.body = {'vpnservice' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/list_extensions.rb b/lib/fog/openstack/network/requests/list_extensions.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_extensions.rb rename to lib/fog/openstack/network/requests/list_extensions.rb index 2b8f7c7d7..2eee193a2 100644 --- a/lib/fog/network/openstack/requests/list_extensions.rb +++ b/lib/fog/openstack/network/requests/list_extensions.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_extensions(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_floating_ips.rb b/lib/fog/openstack/network/requests/list_floating_ips.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_floating_ips.rb rename to lib/fog/openstack/network/requests/list_floating_ips.rb index 58664a180..5932a7e87 100644 --- a/lib/fog/network/openstack/requests/list_floating_ips.rb +++ b/lib/fog/openstack/network/requests/list_floating_ips.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_floating_ips(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ike_policies.rb b/lib/fog/openstack/network/requests/list_ike_policies.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_ike_policies.rb rename to lib/fog/openstack/network/requests/list_ike_policies.rb index b3a5f265d..ede627f96 100644 --- a/lib/fog/network/openstack/requests/list_ike_policies.rb +++ b/lib/fog/openstack/network/requests/list_ike_policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ike_policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ipsec_policies.rb b/lib/fog/openstack/network/requests/list_ipsec_policies.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_ipsec_policies.rb rename to lib/fog/openstack/network/requests/list_ipsec_policies.rb index 07bb6a6d7..9cca1ca17 100644 --- a/lib/fog/network/openstack/requests/list_ipsec_policies.rb +++ b/lib/fog/openstack/network/requests/list_ipsec_policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ipsec_policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ipsec_site_connections.rb b/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_ipsec_site_connections.rb rename to lib/fog/openstack/network/requests/list_ipsec_site_connections.rb index de7a105a4..cd50b9e5a 100644 --- a/lib/fog/network/openstack/requests/list_ipsec_site_connections.rb +++ b/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ipsec_site_connections(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_health_monitors.rb b/lib/fog/openstack/network/requests/list_lb_health_monitors.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lb_health_monitors.rb rename to lib/fog/openstack/network/requests/list_lb_health_monitors.rb index e9d532375..60a1a9532 100644 --- a/lib/fog/network/openstack/requests/list_lb_health_monitors.rb +++ b/lib/fog/openstack/network/requests/list_lb_health_monitors.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_health_monitors(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_members.rb b/lib/fog/openstack/network/requests/list_lb_members.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lb_members.rb rename to lib/fog/openstack/network/requests/list_lb_members.rb index b8e893c1e..0c4c1f53e 100644 --- a/lib/fog/network/openstack/requests/list_lb_members.rb +++ b/lib/fog/openstack/network/requests/list_lb_members.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_members(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_pools.rb b/lib/fog/openstack/network/requests/list_lb_pools.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lb_pools.rb rename to lib/fog/openstack/network/requests/list_lb_pools.rb index 3987cc27b..aaa853b3f 100644 --- a/lib/fog/network/openstack/requests/list_lb_pools.rb +++ b/lib/fog/openstack/network/requests/list_lb_pools.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_pools(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lb_vips.rb b/lib/fog/openstack/network/requests/list_lb_vips.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lb_vips.rb rename to lib/fog/openstack/network/requests/list_lb_vips.rb index d6e7fa018..0e1749afc 100644 --- a/lib/fog/network/openstack/requests/list_lb_vips.rb +++ b/lib/fog/openstack/network/requests/list_lb_vips.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lb_vips(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb b/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb rename to lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb index 63e8e77df..17e68f45b 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_healthmonitors.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_healthmonitors(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_l7policies.rb b/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_l7policies.rb rename to lib/fog/openstack/network/requests/list_lbaas_l7policies.rb index b2a9415a1..c3e12db3f 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_l7policies.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_l7policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_l7rules.rb b/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_l7rules.rb rename to lib/fog/openstack/network/requests/list_lbaas_l7rules.rb index d716a7245..49321df5d 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_l7rules.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_l7rules(l7policy_id, filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_listeners.rb b/lib/fog/openstack/network/requests/list_lbaas_listeners.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_listeners.rb rename to lib/fog/openstack/network/requests/list_lbaas_listeners.rb index ff5dd4c9d..f6c4cf266 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_listeners.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_listeners.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_listeners(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb b/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb rename to lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb index 78dcc433b..c548296ec 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_loadbalancers.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_loadbalancers(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_pool_members.rb b/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_lbaas_pool_members.rb rename to lib/fog/openstack/network/requests/list_lbaas_pool_members.rb index 84ea68244..8bf197228 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_pool_members.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_pool_members(pool_id, filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_lbaas_pools.rb b/lib/fog/openstack/network/requests/list_lbaas_pools.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_lbaas_pools.rb rename to lib/fog/openstack/network/requests/list_lbaas_pools.rb index d4a59342b..d792cb075 100644 --- a/lib/fog/network/openstack/requests/list_lbaas_pools.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_pools.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_lbaas_pools(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_network_ip_availabilities.rb b/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb similarity index 86% rename from lib/fog/network/openstack/requests/list_network_ip_availabilities.rb rename to lib/fog/openstack/network/requests/list_network_ip_availabilities.rb index 119fa612f..df4269d78 100644 --- a/lib/fog/network/openstack/requests/list_network_ip_availabilities.rb +++ b/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_network_ip_availabilities request( @@ -19,7 +19,7 @@ def list_network_ip_availabilities response.body = {'network_ip_availabilities' => data} response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/list_networks.rb b/lib/fog/openstack/network/requests/list_networks.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_networks.rb rename to lib/fog/openstack/network/requests/list_networks.rb index 2f2d163fb..e21c89971 100644 --- a/lib/fog/network/openstack/requests/list_networks.rb +++ b/lib/fog/openstack/network/requests/list_networks.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_networks(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_ports.rb b/lib/fog/openstack/network/requests/list_ports.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_ports.rb rename to lib/fog/openstack/network/requests/list_ports.rb index 4a70473e7..46fe03b6c 100644 --- a/lib/fog/network/openstack/requests/list_ports.rb +++ b/lib/fog/openstack/network/requests/list_ports.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_ports(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_rbac_policies.rb b/lib/fog/openstack/network/requests/list_rbac_policies.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_rbac_policies.rb rename to lib/fog/openstack/network/requests/list_rbac_policies.rb index 7140a3ce6..0e2b95e70 100644 --- a/lib/fog/network/openstack/requests/list_rbac_policies.rb +++ b/lib/fog/openstack/network/requests/list_rbac_policies.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_rbac_policies(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_routers.rb b/lib/fog/openstack/network/requests/list_routers.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_routers.rb rename to lib/fog/openstack/network/requests/list_routers.rb index 510ba2875..3c9010c6f 100644 --- a/lib/fog/network/openstack/requests/list_routers.rb +++ b/lib/fog/openstack/network/requests/list_routers.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_routers(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_security_group_rules.rb b/lib/fog/openstack/network/requests/list_security_group_rules.rb similarity index 97% rename from lib/fog/network/openstack/requests/list_security_group_rules.rb rename to lib/fog/openstack/network/requests/list_security_group_rules.rb index ac126c807..d985d6fdd 100644 --- a/lib/fog/network/openstack/requests/list_security_group_rules.rb +++ b/lib/fog/openstack/network/requests/list_security_group_rules.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # List all security group rules # diff --git a/lib/fog/network/openstack/requests/list_security_groups.rb b/lib/fog/openstack/network/requests/list_security_groups.rb similarity index 98% rename from lib/fog/network/openstack/requests/list_security_groups.rb rename to lib/fog/openstack/network/requests/list_security_groups.rb index 9a4ee79b4..ceb16c9da 100644 --- a/lib/fog/network/openstack/requests/list_security_groups.rb +++ b/lib/fog/openstack/network/requests/list_security_groups.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # List all security groups # diff --git a/lib/fog/network/openstack/requests/list_subnet_pools.rb b/lib/fog/openstack/network/requests/list_subnet_pools.rb similarity index 93% rename from lib/fog/network/openstack/requests/list_subnet_pools.rb rename to lib/fog/openstack/network/requests/list_subnet_pools.rb index 0e8fe3f29..eee578c22 100644 --- a/lib/fog/network/openstack/requests/list_subnet_pools.rb +++ b/lib/fog/openstack/network/requests/list_subnet_pools.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_subnet_pools(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_subnets.rb b/lib/fog/openstack/network/requests/list_subnets.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_subnets.rb rename to lib/fog/openstack/network/requests/list_subnets.rb index 7de67fd1e..aae439beb 100644 --- a/lib/fog/network/openstack/requests/list_subnets.rb +++ b/lib/fog/openstack/network/requests/list_subnets.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_subnets(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/list_vpn_services.rb b/lib/fog/openstack/network/requests/list_vpn_services.rb similarity index 92% rename from lib/fog/network/openstack/requests/list_vpn_services.rb rename to lib/fog/openstack/network/requests/list_vpn_services.rb index f37c445c5..277c447f9 100644 --- a/lib/fog/network/openstack/requests/list_vpn_services.rb +++ b/lib/fog/openstack/network/requests/list_vpn_services.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def list_vpn_services(filters = {}) request( diff --git a/lib/fog/network/openstack/requests/remove_router_interface.rb b/lib/fog/openstack/network/requests/remove_router_interface.rb similarity index 95% rename from lib/fog/network/openstack/requests/remove_router_interface.rb rename to lib/fog/openstack/network/requests/remove_router_interface.rb index 86343ba30..81de8ea05 100644 --- a/lib/fog/network/openstack/requests/remove_router_interface.rb +++ b/lib/fog/openstack/network/requests/remove_router_interface.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def remove_router_interface(router_id, subnet_id, _options = {}) data = { diff --git a/lib/fog/network/openstack/requests/set_tenant.rb b/lib/fog/openstack/network/requests/set_tenant.rb similarity index 88% rename from lib/fog/network/openstack/requests/set_tenant.rb rename to lib/fog/openstack/network/requests/set_tenant.rb index 81dba7308..805f37521 100644 --- a/lib/fog/network/openstack/requests/set_tenant.rb +++ b/lib/fog/openstack/network/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/network/openstack/requests/update_ike_policy.rb b/lib/fog/openstack/network/requests/update_ike_policy.rb similarity index 95% rename from lib/fog/network/openstack/requests/update_ike_policy.rb rename to lib/fog/openstack/network/requests/update_ike_policy.rb index 53fa86f02..feb337958 100644 --- a/lib/fog/network/openstack/requests/update_ike_policy.rb +++ b/lib/fog/openstack/network/requests/update_ike_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_ike_policy(ike_policy_id, options = {}) data = {'ikepolicy' => {}} @@ -39,7 +39,7 @@ def update_ike_policy(ike_policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_ipsec_policy.rb b/lib/fog/openstack/network/requests/update_ipsec_policy.rb similarity index 95% rename from lib/fog/network/openstack/requests/update_ipsec_policy.rb rename to lib/fog/openstack/network/requests/update_ipsec_policy.rb index e41c9f5aa..db3ea1344 100644 --- a/lib/fog/network/openstack/requests/update_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/update_ipsec_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_ipsec_policy(ipsec_policy_id, options = {}) data = {'ipsecpolicy' => {}} @@ -42,7 +42,7 @@ def update_ipsec_policy(ipsec_policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb similarity index 97% rename from lib/fog/network/openstack/requests/update_ipsec_site_connection.rb rename to lib/fog/openstack/network/requests/update_ipsec_site_connection.rb index ae43af2d3..894e65041 100644 --- a/lib/fog/network/openstack/requests/update_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) data = {'ipsec_site_connection' => {}} @@ -54,7 +54,7 @@ def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_health_monitor.rb b/lib/fog/openstack/network/requests/update_lb_health_monitor.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_lb_health_monitor.rb rename to lib/fog/openstack/network/requests/update_lb_health_monitor.rb index f84f4080a..7c4bfcf7c 100644 --- a/lib/fog/network/openstack/requests/update_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/update_lb_health_monitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_health_monitor(health_monitor_id, options = {}) data = {'health_monitor' => {}} @@ -34,7 +34,7 @@ def update_lb_health_monitor(health_monitor_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_member.rb b/lib/fog/openstack/network/requests/update_lb_member.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lb_member.rb rename to lib/fog/openstack/network/requests/update_lb_member.rb index 212096751..c12aa1e98 100644 --- a/lib/fog/network/openstack/requests/update_lb_member.rb +++ b/lib/fog/openstack/network/requests/update_lb_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_member(member_id, options = {}) data = {'member' => {}} @@ -30,7 +30,7 @@ def update_lb_member(member_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_pool.rb b/lib/fog/openstack/network/requests/update_lb_pool.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lb_pool.rb rename to lib/fog/openstack/network/requests/update_lb_pool.rb index 2e20cd78f..5bb101a04 100644 --- a/lib/fog/network/openstack/requests/update_lb_pool.rb +++ b/lib/fog/openstack/network/requests/update_lb_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_pool(pool_id, options = {}) data = {'pool' => {}} @@ -31,7 +31,7 @@ def update_lb_pool(pool_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lb_vip.rb b/lib/fog/openstack/network/requests/update_lb_vip.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lb_vip.rb rename to lib/fog/openstack/network/requests/update_lb_vip.rb index e3aa77586..103f2bb5d 100644 --- a/lib/fog/network/openstack/requests/update_lb_vip.rb +++ b/lib/fog/openstack/network/requests/update_lb_vip.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lb_vip(vip_id, options = {}) data = {'vip' => {}} @@ -33,7 +33,7 @@ def update_lb_vip(vip_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb rename to lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb index 474188e63..6289ad379 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_healthmonitor(healthmonitor_id, options = {}) data = {'healthmonitor' => {}} @@ -34,7 +34,7 @@ def update_lbaas_healthmonitor(healthmonitor_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lbaas_l7policy.rb rename to lib/fog/openstack/network/requests/update_lbaas_l7policy.rb index bc21a9e95..2f17e8bf6 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_l7policy(l7policy_id, options = {}) @@ -34,7 +34,7 @@ def update_lbaas_l7rule(l7policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lbaas_l7rule.rb rename to lib/fog/openstack/network/requests/update_lbaas_l7rule.rb index e7a0be425..c464c2e11 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) @@ -33,7 +33,7 @@ def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_listener.rb b/lib/fog/openstack/network/requests/update_lbaas_listener.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_lbaas_listener.rb rename to lib/fog/openstack/network/requests/update_lbaas_listener.rb index 6417c3429..02b46fb77 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_listener.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_listener(listener_id, options = {}) @@ -35,7 +35,7 @@ def update_lbaas_listener(listener_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb rename to lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb index 8933875e8..8a6aeb255 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_loadbalancer(loadbalancer_id, options = {}) data = { @@ -32,7 +32,7 @@ def update_lbaas_loadbalancer(loadbalancer_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_pool.rb b/lib/fog/openstack/network/requests/update_lbaas_pool.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lbaas_pool.rb rename to lib/fog/openstack/network/requests/update_lbaas_pool.rb index cc7c79b4a..9e4e30dd5 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_pool(pool_id, options = {}) data = {'pool' => {}} @@ -31,7 +31,7 @@ def update_lbaas_pool(pool_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_lbaas_pool_member.rb rename to lib/fog/openstack/network/requests/update_lbaas_pool_member.rb index 507cd2348..78c0a5a13 100644 --- a/lib/fog/network/openstack/requests/update_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_lbaas_pool_member(pool_id, member_id, options = {}) data = {'member' => {}} @@ -30,7 +30,7 @@ def update_lbaas_pool_member(pool_id, member_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_network.rb b/lib/fog/openstack/network/requests/update_network.rb similarity index 90% rename from lib/fog/network/openstack/requests/update_network.rb rename to lib/fog/openstack/network/requests/update_network.rb index 23536ca0c..fa88d8d04 100644 --- a/lib/fog/network/openstack/requests/update_network.rb +++ b/lib/fog/openstack/network/requests/update_network.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Not all options can be updated UPDATE_OPTIONS = [ @@ -44,12 +44,12 @@ class Mock def update_network(network_id, options = {}) response = Excon::Response.new if network = list_networks.body['networks'].find { |_| _['id'] == network_id } - network.merge!(Fog::Network::OpenStack::Real.update(options)) + network.merge!(Fog::OpenStack::Network::Real.update(options)) response.body = {'network' => network} response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_port.rb b/lib/fog/openstack/network/requests/update_port.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_port.rb rename to lib/fog/openstack/network/requests/update_port.rb index 8b5014f66..b3ffcaed5 100644 --- a/lib/fog/network/openstack/requests/update_port.rb +++ b/lib/fog/openstack/network/requests/update_port.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_port(port_id, options = {}) data = {'port' => {}} @@ -35,7 +35,7 @@ def update_port(port_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_quota.rb b/lib/fog/openstack/network/requests/update_quota.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_quota.rb rename to lib/fog/openstack/network/requests/update_quota.rb index 7f52ed709..9d774b016 100644 --- a/lib/fog/network/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/network/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/network/openstack/requests/update_rbac_policy.rb b/lib/fog/openstack/network/requests/update_rbac_policy.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_rbac_policy.rb rename to lib/fog/openstack/network/requests/update_rbac_policy.rb index dfb0721ec..98fd3483f 100644 --- a/lib/fog/network/openstack/requests/update_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/update_rbac_policy.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_rbac_policy(rbac_policy_id, options = {}) data = {'rbac_policy' => {}} @@ -32,7 +32,7 @@ def update_rbac_policy(rbac_policy_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_router.rb b/lib/fog/openstack/network/requests/update_router.rb similarity index 91% rename from lib/fog/network/openstack/requests/update_router.rb rename to lib/fog/openstack/network/requests/update_router.rb index 48724d81d..cf76566cf 100644 --- a/lib/fog/network/openstack/requests/update_router.rb +++ b/lib/fog/openstack/network/requests/update_router.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real # Update Router # @@ -18,7 +18,7 @@ def update_router(router_id, options = {}) # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::Network::OpenStack::Network) + if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" data['router'][:external_gateway_info] = {:network_id => egi.id} @@ -43,14 +43,14 @@ def update_router(router_id, options = {}) response = Excon::Response.new router = list_routers.body['routers'].find { |r| r[:id] == router_id } - raise Fog::Network::OpenStack::NotFound unless router + raise Fog::OpenStack::Network::NotFound unless router options.keys.each { |k| router[k] = options[k] } # remove this in a future egi = options[:external_gateway_info] if egi - if egi.kind_of?(Fog::Network::OpenStack::Network) + if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" router[:external_gateway_info] = { :network_id => egi.id } diff --git a/lib/fog/network/openstack/requests/update_security_group.rb b/lib/fog/openstack/network/requests/update_security_group.rb similarity index 92% rename from lib/fog/network/openstack/requests/update_security_group.rb rename to lib/fog/openstack/network/requests/update_security_group.rb index 27aaae122..69824e119 100644 --- a/lib/fog/network/openstack/requests/update_security_group.rb +++ b/lib/fog/openstack/network/requests/update_security_group.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_security_group(security_group_id, options = {}) data = {'security_group' => {}} @@ -32,7 +32,7 @@ def update_security_group(security_group_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_subnet.rb b/lib/fog/openstack/network/requests/update_subnet.rb similarity index 93% rename from lib/fog/network/openstack/requests/update_subnet.rb rename to lib/fog/openstack/network/requests/update_subnet.rb index 10f5743c1..11e886890 100644 --- a/lib/fog/network/openstack/requests/update_subnet.rb +++ b/lib/fog/openstack/network/requests/update_subnet.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_subnet(subnet_id, options = {}) data = {'subnet' => {}} @@ -34,7 +34,7 @@ def update_subnet(subnet_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_subnet_pool.rb b/lib/fog/openstack/network/requests/update_subnet_pool.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_subnet_pool.rb rename to lib/fog/openstack/network/requests/update_subnet_pool.rb index b0a0ee546..8833a2568 100644 --- a/lib/fog/network/openstack/requests/update_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/update_subnet_pool.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_subnet_pool(subnet_pool_id, options = {}) data = {'subnetpool' => {}} @@ -37,7 +37,7 @@ def update_subnet_pool(subnet_pool_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/network/openstack/requests/update_vpn_service.rb b/lib/fog/openstack/network/requests/update_vpn_service.rb similarity index 94% rename from lib/fog/network/openstack/requests/update_vpn_service.rb rename to lib/fog/openstack/network/requests/update_vpn_service.rb index 87e3ef458..8a65c83b9 100644 --- a/lib/fog/network/openstack/requests/update_vpn_service.rb +++ b/lib/fog/openstack/network/requests/update_vpn_service.rb @@ -1,6 +1,6 @@ module Fog - module Network - class OpenStack + module OpenStack + class Network class Real def update_vpn_service(vpn_service_id, options = {}) data = {'vpnservice' => {}} @@ -37,7 +37,7 @@ def update_vpn_service(vpn_service_id, options = {}) response.status = 200 response else - raise Fog::Network::OpenStack::NotFound + raise Fog::OpenStack::Network::NotFound end end end diff --git a/lib/fog/nfv/openstack/models/vnf.rb b/lib/fog/openstack/nfv/models/vnf.rb similarity index 97% rename from lib/fog/nfv/openstack/models/vnf.rb rename to lib/fog/openstack/nfv/models/vnf.rb index 6373e172f..8229f4992 100644 --- a/lib/fog/nfv/openstack/models/vnf.rb +++ b/lib/fog/openstack/nfv/models/vnf.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnf < Fog::OpenStack::Model identity :id diff --git a/lib/fog/nfv/openstack/models/vnfd.rb b/lib/fog/openstack/nfv/models/vnfd.rb similarity index 97% rename from lib/fog/nfv/openstack/models/vnfd.rb rename to lib/fog/openstack/nfv/models/vnfd.rb index 1c39c0b2a..ebcda3ec1 100644 --- a/lib/fog/nfv/openstack/models/vnfd.rb +++ b/lib/fog/openstack/nfv/models/vnfd.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnfd < Fog::OpenStack::Model identity :id diff --git a/lib/fog/nfv/openstack/models/vnfds.rb b/lib/fog/openstack/nfv/models/vnfds.rb similarity index 73% rename from lib/fog/nfv/openstack/models/vnfds.rb rename to lib/fog/openstack/nfv/models/vnfds.rb index 924df6e43..9d213f235 100644 --- a/lib/fog/nfv/openstack/models/vnfds.rb +++ b/lib/fog/openstack/nfv/models/vnfds.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/nfv/openstack/models/vnfd' +require 'fog/openstack/nfv/models/vnfd' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnfds < Fog::OpenStack::Collection - model Fog::NFV::OpenStack::Vnfd + model Fog::OpenStack::NFV::Vnfd def all(options = {}) load_response(service.list_vnfds(options), 'vnfds') @@ -14,7 +14,7 @@ def all(options = {}) def get(uuid) data = service.get_vnfd(uuid).body['vnfd'] new(data) - rescue Fog::NFV::OpenStack::NotFound + rescue Fog::OpenStack::NFV::NotFound nil end diff --git a/lib/fog/nfv/openstack/models/vnfs.rb b/lib/fog/openstack/nfv/models/vnfs.rb similarity index 73% rename from lib/fog/nfv/openstack/models/vnfs.rb rename to lib/fog/openstack/nfv/models/vnfs.rb index 6db6c11dc..73813b470 100644 --- a/lib/fog/nfv/openstack/models/vnfs.rb +++ b/lib/fog/openstack/nfv/models/vnfs.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/nfv/openstack/models/vnf' +require 'fog/openstack/nfv/models/vnf' module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Vnfs < Fog::OpenStack::Collection - model Fog::NFV::OpenStack::Vnf + model Fog::OpenStack::NFV::Vnf def all(options = {}) load_response(service.list_vnfs(options), 'vnfs') @@ -14,7 +14,7 @@ def all(options = {}) def get(uuid) data = service.get_vnf(uuid).body['vnf'] new(data) - rescue Fog::NFV::OpenStack::NotFound + rescue Fog::OpenStack::NFV::NotFound nil end diff --git a/lib/fog/nfv/openstack.rb b/lib/fog/openstack/nfv/nfv.rb similarity index 94% rename from lib/fog/nfv/openstack.rb rename to lib/fog/openstack/nfv/nfv.rb index 857cacc19..b0cd206fc 100644 --- a/lib/fog/nfv/openstack.rb +++ b/lib/fog/openstack/nfv/nfv.rb @@ -1,8 +1,8 @@ require 'yaml' module Fog - module NFV - class OpenStack < Fog::Service + module OpenStack + class NFV < Fog::Service SUPPORTED_VERSIONS = /v1.0/ requires :openstack_auth_url @@ -19,7 +19,7 @@ class OpenStack < Fog::Service ## REQUESTS # - request_path 'fog/nfv/openstack/requests' + request_path 'fog/openstack/nfv/requests' # vnfds requests request :list_vnfds @@ -36,7 +36,7 @@ class OpenStack < Fog::Service ## MODELS # - model_path 'fog/nfv/openstack/models' + model_path 'fog/openstack/nfv/models' model :vnfd collection :vnfds model :vnf @@ -98,7 +98,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::NFV::OpenStack::NotFound + Fog::OpenStack::NFV::NotFound end def default_path_prefix diff --git a/lib/fog/nfv/openstack/requests/create_vnf.rb b/lib/fog/openstack/nfv/requests/create_vnf.rb similarity index 96% rename from lib/fog/nfv/openstack/requests/create_vnf.rb rename to lib/fog/openstack/nfv/requests/create_vnf.rb index 69f0d7b4a..ca6220d8e 100644 --- a/lib/fog/nfv/openstack/requests/create_vnf.rb +++ b/lib/fog/openstack/nfv/requests/create_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def create_vnf(options) options_valid = [ diff --git a/lib/fog/nfv/openstack/requests/create_vnfd.rb b/lib/fog/openstack/nfv/requests/create_vnfd.rb similarity index 95% rename from lib/fog/nfv/openstack/requests/create_vnfd.rb rename to lib/fog/openstack/nfv/requests/create_vnfd.rb index 44dbaf6ab..3cc9f441d 100644 --- a/lib/fog/nfv/openstack/requests/create_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/create_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def create_vnfd(options) options_valid = [ diff --git a/lib/fog/nfv/openstack/requests/delete_vnf.rb b/lib/fog/openstack/nfv/requests/delete_vnf.rb similarity index 92% rename from lib/fog/nfv/openstack/requests/delete_vnf.rb rename to lib/fog/openstack/nfv/requests/delete_vnf.rb index 71f89a4bf..979c6cfa3 100644 --- a/lib/fog/nfv/openstack/requests/delete_vnf.rb +++ b/lib/fog/openstack/nfv/requests/delete_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def delete_vnf(vnf_id) request( diff --git a/lib/fog/nfv/openstack/requests/delete_vnfd.rb b/lib/fog/openstack/nfv/requests/delete_vnfd.rb similarity index 92% rename from lib/fog/nfv/openstack/requests/delete_vnfd.rb rename to lib/fog/openstack/nfv/requests/delete_vnfd.rb index 3efdd7672..f8d1ec581 100644 --- a/lib/fog/nfv/openstack/requests/delete_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/delete_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def delete_vnfd(vnfd_id) request( diff --git a/lib/fog/nfv/openstack/requests/get_vnf.rb b/lib/fog/openstack/nfv/requests/get_vnf.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/get_vnf.rb rename to lib/fog/openstack/nfv/requests/get_vnf.rb index f204ee7b2..62a7df092 100644 --- a/lib/fog/nfv/openstack/requests/get_vnf.rb +++ b/lib/fog/openstack/nfv/requests/get_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def get_vnf(vnf_id) request( diff --git a/lib/fog/nfv/openstack/requests/get_vnfd.rb b/lib/fog/openstack/nfv/requests/get_vnfd.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/get_vnfd.rb rename to lib/fog/openstack/nfv/requests/get_vnfd.rb index f5f0e5781..5e47de284 100644 --- a/lib/fog/nfv/openstack/requests/get_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/get_vnfd.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def get_vnfd(vnfd_id) request( diff --git a/lib/fog/nfv/openstack/requests/list_vnfds.rb b/lib/fog/openstack/nfv/requests/list_vnfds.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/list_vnfds.rb rename to lib/fog/openstack/nfv/requests/list_vnfds.rb index a74aa33e9..f1a7793ed 100644 --- a/lib/fog/nfv/openstack/requests/list_vnfds.rb +++ b/lib/fog/openstack/nfv/requests/list_vnfds.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def list_vnfds(options = {}) request( diff --git a/lib/fog/nfv/openstack/requests/list_vnfs.rb b/lib/fog/openstack/nfv/requests/list_vnfs.rb similarity index 93% rename from lib/fog/nfv/openstack/requests/list_vnfs.rb rename to lib/fog/openstack/nfv/requests/list_vnfs.rb index 1f08060fd..a89b6723e 100644 --- a/lib/fog/nfv/openstack/requests/list_vnfs.rb +++ b/lib/fog/openstack/nfv/requests/list_vnfs.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def list_vnfs(options = {}) request( diff --git a/lib/fog/nfv/openstack/requests/update_vnf.rb b/lib/fog/openstack/nfv/requests/update_vnf.rb similarity index 95% rename from lib/fog/nfv/openstack/requests/update_vnf.rb rename to lib/fog/openstack/nfv/requests/update_vnf.rb index 37766efa7..47d1fcde8 100644 --- a/lib/fog/nfv/openstack/requests/update_vnf.rb +++ b/lib/fog/openstack/nfv/requests/update_vnf.rb @@ -1,6 +1,6 @@ module Fog - module NFV - class OpenStack + module OpenStack + class NFV class Real def update_vnf(id, options) options_valid = [ diff --git a/lib/fog/orchestration/openstack/models/event.rb b/lib/fog/openstack/orchestration/models/event.rb similarity index 89% rename from lib/fog/orchestration/openstack/models/event.rb rename to lib/fog/openstack/orchestration/models/event.rb index 8debd856a..283f9c476 100644 --- a/lib/fog/orchestration/openstack/models/event.rb +++ b/lib/fog/openstack/orchestration/models/event.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Event < Fog::OpenStack::Model include Reflectable diff --git a/lib/fog/orchestration/openstack/models/events.rb b/lib/fog/openstack/orchestration/models/events.rb similarity index 79% rename from lib/fog/orchestration/openstack/models/events.rb rename to lib/fog/openstack/orchestration/models/events.rb index 2d5ddd7f0..b2a823fe1 100644 --- a/lib/fog/orchestration/openstack/models/events.rb +++ b/lib/fog/openstack/orchestration/models/events.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/event' +require 'fog/openstack/orchestration/models/event' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Events < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Event + model Fog::OpenStack::Orchestration::Event def all(options = {}, options_deprecated = {}) data = if options.kind_of?(Stack) @@ -22,7 +22,7 @@ def all(options = {}, options_deprecated = {}) def get(stack, resource, event_id) data = service.show_event_details(stack, resource, event_id).body['event'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/orchestration/openstack/models/resource.rb b/lib/fog/openstack/orchestration/models/resource.rb similarity index 94% rename from lib/fog/orchestration/openstack/models/resource.rb rename to lib/fog/openstack/orchestration/models/resource.rb index 6d8574cf6..705e93e07 100644 --- a/lib/fog/orchestration/openstack/models/resource.rb +++ b/lib/fog/openstack/orchestration/models/resource.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Resource < Fog::OpenStack::Model include Reflectable diff --git a/lib/fog/orchestration/openstack/models/resource_schemas.rb b/lib/fog/openstack/orchestration/models/resource_schemas.rb similarity index 73% rename from lib/fog/orchestration/openstack/models/resource_schemas.rb rename to lib/fog/openstack/orchestration/models/resource_schemas.rb index f0131c84b..bd177115c 100644 --- a/lib/fog/orchestration/openstack/models/resource_schemas.rb +++ b/lib/fog/openstack/orchestration/models/resource_schemas.rb @@ -1,12 +1,12 @@ require 'fog/openstack/models/collection' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class ResourceSchemas < Fog::OpenStack::Collection def get(resource_type) service.show_resource_schema(resource_type).body - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/orchestration/openstack/models/resources.rb b/lib/fog/openstack/orchestration/models/resources.rb similarity index 76% rename from lib/fog/orchestration/openstack/models/resources.rb rename to lib/fog/openstack/orchestration/models/resources.rb index 6a9f7867c..fbc3f1988 100644 --- a/lib/fog/orchestration/openstack/models/resources.rb +++ b/lib/fog/openstack/orchestration/models/resources.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/resource' +require 'fog/openstack/orchestration/models/resource' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Resources < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Resource + model Fog::OpenStack::Orchestration::Resource def types service.list_resource_types.body['resource_types'].sort @@ -20,13 +20,13 @@ def get(resource_name, stack = nil) stack = first.stack if stack.nil? data = service.show_resource_data(stack.stack_name, stack.id, resource_name).body['resource'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end def metadata(stack_name, stack_id, resource_name) service.show_resource_metadata(stack_name, stack_id, resource_name).body['resource'] - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end end diff --git a/lib/fog/orchestration/openstack/models/stack.rb b/lib/fog/openstack/orchestration/models/stack.rb similarity index 96% rename from lib/fog/orchestration/openstack/models/stack.rb rename to lib/fog/openstack/orchestration/models/stack.rb index a21f070ee..7c54a6e33 100644 --- a/lib/fog/orchestration/openstack/models/stack.rb +++ b/lib/fog/openstack/orchestration/models/stack.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Stack < Fog::OpenStack::Model identity :id @@ -105,7 +105,7 @@ def timeout_in_minutes=(minutes) # build options to create or update stack def default_options template_content = - if template && template.kind_of?(Fog::Orchestration::OpenStack::Template) + if template && template.kind_of?(Fog::OpenStack::Orchestration::Template) template.content else template diff --git a/lib/fog/orchestration/openstack/models/stacks.rb b/lib/fog/openstack/orchestration/models/stacks.rb similarity index 89% rename from lib/fog/orchestration/openstack/models/stacks.rb rename to lib/fog/openstack/orchestration/models/stacks.rb index 1a4e8b0b8..176b6c824 100644 --- a/lib/fog/orchestration/openstack/models/stacks.rb +++ b/lib/fog/openstack/orchestration/models/stacks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/stack' +require 'fog/openstack/orchestration/models/stack' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Stacks < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Stack + model Fog::OpenStack::Orchestration::Stack def all(options = {}) # TODO(lsmola) we can uncomment this when https://bugs.launchpad.net/heat/+bug/1468318 is fixed, till then @@ -38,7 +38,7 @@ def get(arg1, arg2 = nil) id = arg2 data = service.show_stack_details(name, id).body['stack'] new(data) - rescue Fog::Compute::OpenStack::NotFound + rescue Fog::OpenStack::Compute::NotFound nil end diff --git a/lib/fog/orchestration/openstack/models/template.rb b/lib/fog/openstack/orchestration/models/template.rb similarity index 85% rename from lib/fog/orchestration/openstack/models/template.rb rename to lib/fog/openstack/orchestration/models/template.rb index b99687efb..5f16d20ba 100644 --- a/lib/fog/orchestration/openstack/models/template.rb +++ b/lib/fog/openstack/orchestration/models/template.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Template < Fog::OpenStack::Model %w(format description template_version parameters resources content).each do |a| attribute a.to_sym diff --git a/lib/fog/orchestration/openstack/models/templates.rb b/lib/fog/openstack/orchestration/models/templates.rb similarity index 85% rename from lib/fog/orchestration/openstack/models/templates.rb rename to lib/fog/openstack/orchestration/models/templates.rb index 9d1182666..b1d0dbd52 100644 --- a/lib/fog/orchestration/openstack/models/templates.rb +++ b/lib/fog/openstack/orchestration/models/templates.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/orchestration/openstack/models/template' +require 'fog/openstack/orchestration/models/template' module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Templates < Fog::OpenStack::Collection - model Fog::Orchestration::OpenStack::Template + model Fog::OpenStack::Orchestration::Template def get(obj) data = if obj.kind_of?(Stack) @@ -28,7 +28,7 @@ def get(obj) end new(data) - rescue Fog::Orchestration::OpenStack::NotFound + rescue Fog::OpenStack::Orchestration::NotFound nil end diff --git a/lib/fog/orchestration/openstack.rb b/lib/fog/openstack/orchestration/orchestration.rb similarity index 94% rename from lib/fog/orchestration/openstack.rb rename to lib/fog/openstack/orchestration/orchestration.rb index 18be8177f..8542a7760 100644 --- a/lib/fog/orchestration/openstack.rb +++ b/lib/fog/openstack/orchestration/orchestration.rb @@ -1,8 +1,6 @@ - - module Fog - module Orchestration - class OpenStack < Fog::Service + module OpenStack + class Orchestration < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -15,7 +13,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version - model_path 'fog/orchestration/openstack/models' + model_path 'fog/openstack/orchestration/models' model :stack collection :stacks @@ -30,7 +28,7 @@ class OpenStack < Fog::Service model :template collection :templates - request_path 'fog/orchestration/openstack/requests' + request_path 'fog/openstack/orchestration/requests' request :abandon_stack request :build_info request :create_stack @@ -127,7 +125,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Orchestration::OpenStack::NotFound + Fog::OpenStack::Orchestration::NotFound end def default_service_type diff --git a/lib/fog/orchestration/openstack/requests/abandon_stack.rb b/lib/fog/openstack/orchestration/requests/abandon_stack.rb similarity index 86% rename from lib/fog/orchestration/openstack/requests/abandon_stack.rb rename to lib/fog/openstack/orchestration/requests/abandon_stack.rb index 370be9f31..c0a8a0f44 100644 --- a/lib/fog/orchestration/openstack/requests/abandon_stack.rb +++ b/lib/fog/openstack/orchestration/requests/abandon_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def abandon_stack(stack) request( diff --git a/lib/fog/orchestration/openstack/requests/build_info.rb b/lib/fog/openstack/orchestration/requests/build_info.rb similarity index 83% rename from lib/fog/orchestration/openstack/requests/build_info.rb rename to lib/fog/openstack/orchestration/requests/build_info.rb index 0f65d96ab..cb0ae3482 100644 --- a/lib/fog/orchestration/openstack/requests/build_info.rb +++ b/lib/fog/openstack/orchestration/requests/build_info.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def build_info request( diff --git a/lib/fog/orchestration/openstack/requests/cancel_update.rb b/lib/fog/openstack/orchestration/requests/cancel_update.rb similarity index 92% rename from lib/fog/orchestration/openstack/requests/cancel_update.rb rename to lib/fog/openstack/orchestration/requests/cancel_update.rb index ca1627ee1..878326cd2 100644 --- a/lib/fog/orchestration/openstack/requests/cancel_update.rb +++ b/lib/fog/openstack/orchestration/requests/cancel_update.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def cancel_update(stack) request( diff --git a/lib/fog/orchestration/openstack/requests/create_stack.rb b/lib/fog/openstack/orchestration/requests/create_stack.rb similarity index 95% rename from lib/fog/orchestration/openstack/requests/create_stack.rb rename to lib/fog/openstack/orchestration/requests/create_stack.rb index ed82afec7..9377719fc 100644 --- a/lib/fog/orchestration/openstack/requests/create_stack.rb +++ b/lib/fog/openstack/orchestration/requests/create_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # Create a stack. # @@ -87,7 +87,7 @@ def create_stack(arg1, arg2 = nil) end if options.key?(:template) || options.key?(:template_url) - file_resolver = Util::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) + file_resolver = OrchestrationUtil::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) response.body['files'] = file_resolver.files unless file_resolver.files.empty? end diff --git a/lib/fog/orchestration/openstack/requests/delete_stack.rb b/lib/fog/openstack/orchestration/requests/delete_stack.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/delete_stack.rb rename to lib/fog/openstack/orchestration/requests/delete_stack.rb index b236e9b35..ba2e917aa 100644 --- a/lib/fog/orchestration/openstack/requests/delete_stack.rb +++ b/lib/fog/openstack/orchestration/requests/delete_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # Delete a stack. # diff --git a/lib/fog/orchestration/openstack/requests/get_stack_template.rb b/lib/fog/openstack/orchestration/requests/get_stack_template.rb similarity index 89% rename from lib/fog/orchestration/openstack/requests/get_stack_template.rb rename to lib/fog/openstack/orchestration/requests/get_stack_template.rb index 8551f778c..b053a5150 100644 --- a/lib/fog/orchestration/openstack/requests/get_stack_template.rb +++ b/lib/fog/openstack/orchestration/requests/get_stack_template.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def get_stack_template(stack) request( diff --git a/lib/fog/orchestration/openstack/requests/list_events.rb b/lib/fog/openstack/orchestration/requests/list_events.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/list_events.rb rename to lib/fog/openstack/orchestration/requests/list_events.rb index 7e456b8b0..1dedd2f1c 100644 --- a/lib/fog/orchestration/openstack/requests/list_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_events.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_events(options = {}) if !options.key?(:stack) && !(options.key?(:stack_name) && options.key?(:stack_id)) diff --git a/lib/fog/orchestration/openstack/requests/list_resource_events.rb b/lib/fog/openstack/orchestration/requests/list_resource_events.rb similarity index 95% rename from lib/fog/orchestration/openstack/requests/list_resource_events.rb rename to lib/fog/openstack/orchestration/requests/list_resource_events.rb index c2736f13d..d82e77a7b 100644 --- a/lib/fog/orchestration/openstack/requests/list_resource_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_resource_events.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_resource_events(stack, resource, options = {}) Fog::Logger.deprecation('Calling OpenStack[:orchestration].list_resource_events(stack, resource, options)'\ diff --git a/lib/fog/orchestration/openstack/requests/list_resource_types.rb b/lib/fog/openstack/orchestration/requests/list_resource_types.rb similarity index 92% rename from lib/fog/orchestration/openstack/requests/list_resource_types.rb rename to lib/fog/openstack/orchestration/requests/list_resource_types.rb index 358239b2f..7de2aef4b 100644 --- a/lib/fog/orchestration/openstack/requests/list_resource_types.rb +++ b/lib/fog/openstack/orchestration/requests/list_resource_types.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_resource_types(_options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/list_resources.rb b/lib/fog/openstack/orchestration/requests/list_resources.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/list_resources.rb rename to lib/fog/openstack/orchestration/requests/list_resources.rb index 2565d91e6..e8826638c 100644 --- a/lib/fog/orchestration/openstack/requests/list_resources.rb +++ b/lib/fog/openstack/orchestration/requests/list_resources.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_resources(options = {}, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/orchestration/openstack/requests/list_stack_data.rb b/lib/fog/openstack/orchestration/requests/list_stack_data.rb similarity index 92% rename from lib/fog/orchestration/openstack/requests/list_stack_data.rb rename to lib/fog/openstack/orchestration/requests/list_stack_data.rb index 7dfd23276..b5d12a8ef 100644 --- a/lib/fog/orchestration/openstack/requests/list_stack_data.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_data.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_stack_data(options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb b/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb similarity index 98% rename from lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb rename to lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb index 401712562..1bf382733 100644 --- a/lib/fog/orchestration/openstack/requests/list_stack_data_detailed.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_stack_data_detailed(options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/list_stack_events.rb b/lib/fog/openstack/orchestration/requests/list_stack_events.rb similarity index 95% rename from lib/fog/orchestration/openstack/requests/list_stack_events.rb rename to lib/fog/openstack/orchestration/requests/list_stack_events.rb index b9c848789..61d9979cb 100644 --- a/lib/fog/orchestration/openstack/requests/list_stack_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_events.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def list_stack_events(stack, options = {}) Fog::Logger.deprecation('Calling OpenStack[:orchestration].list_stack_events(stack, options)'\ diff --git a/lib/fog/orchestration/openstack/requests/patch_stack.rb b/lib/fog/openstack/orchestration/requests/patch_stack.rb similarity index 90% rename from lib/fog/orchestration/openstack/requests/patch_stack.rb rename to lib/fog/openstack/orchestration/requests/patch_stack.rb index bcaaa59be..2a25511a5 100644 --- a/lib/fog/orchestration/openstack/requests/patch_stack.rb +++ b/lib/fog/openstack/orchestration/requests/patch_stack.rb @@ -1,10 +1,10 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # patch a stack. # - # @param [Fog::Orchestration::OpenStack::Stack] the stack to patch. + # @param [Fog::OpenStack::Orchestration::Stack] the stack to patch. # @param [Hash] options # * :template [String] Structure containing the template body. # or (one of the two Template parameters is required) diff --git a/lib/fog/orchestration/openstack/requests/preview_stack.rb b/lib/fog/openstack/orchestration/requests/preview_stack.rb similarity index 87% rename from lib/fog/orchestration/openstack/requests/preview_stack.rb rename to lib/fog/openstack/orchestration/requests/preview_stack.rb index c4fe397f9..440ed4da4 100644 --- a/lib/fog/orchestration/openstack/requests/preview_stack.rb +++ b/lib/fog/openstack/orchestration/requests/preview_stack.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def preview_stack(options = {}) request( diff --git a/lib/fog/orchestration/openstack/requests/show_event_details.rb b/lib/fog/openstack/orchestration/requests/show_event_details.rb similarity index 93% rename from lib/fog/orchestration/openstack/requests/show_event_details.rb rename to lib/fog/openstack/orchestration/requests/show_event_details.rb index a86649b2b..739666e43 100644 --- a/lib/fog/orchestration/openstack/requests/show_event_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_event_details.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_event_details(stack, resource, event_id) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_data.rb b/lib/fog/openstack/orchestration/requests/show_resource_data.rb similarity index 93% rename from lib/fog/orchestration/openstack/requests/show_resource_data.rb rename to lib/fog/openstack/orchestration/requests/show_resource_data.rb index a6b902b22..9225efd5d 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_data.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_data.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_data(stack_name, stack_id, resource_name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_metadata.rb b/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb similarity index 93% rename from lib/fog/orchestration/openstack/requests/show_resource_metadata.rb rename to lib/fog/openstack/orchestration/requests/show_resource_metadata.rb index 0142882e6..486259bfc 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_metadata.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_metadata(stack, resource_name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_schema.rb b/lib/fog/openstack/orchestration/requests/show_resource_schema.rb similarity index 85% rename from lib/fog/orchestration/openstack/requests/show_resource_schema.rb rename to lib/fog/openstack/orchestration/requests/show_resource_schema.rb index 822fcc11a..7df1b5fe3 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_schema.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_schema.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_schema(name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_resource_template.rb b/lib/fog/openstack/orchestration/requests/show_resource_template.rb similarity index 88% rename from lib/fog/orchestration/openstack/requests/show_resource_template.rb rename to lib/fog/openstack/orchestration/requests/show_resource_template.rb index 60f23c81c..496cbe568 100644 --- a/lib/fog/orchestration/openstack/requests/show_resource_template.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_template.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_resource_template(name) request( diff --git a/lib/fog/orchestration/openstack/requests/show_stack_details.rb b/lib/fog/openstack/orchestration/requests/show_stack_details.rb similarity index 91% rename from lib/fog/orchestration/openstack/requests/show_stack_details.rb rename to lib/fog/openstack/orchestration/requests/show_stack_details.rb index c4868cafe..3568a669e 100644 --- a/lib/fog/orchestration/openstack/requests/show_stack_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_stack_details.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def show_stack_details(name, id) request( diff --git a/lib/fog/orchestration/openstack/requests/update_stack.rb b/lib/fog/openstack/orchestration/requests/update_stack.rb similarity index 97% rename from lib/fog/orchestration/openstack/requests/update_stack.rb rename to lib/fog/openstack/orchestration/requests/update_stack.rb index 913c2e26b..585a7f63f 100644 --- a/lib/fog/orchestration/openstack/requests/update_stack.rb +++ b/lib/fog/openstack/orchestration/requests/update_stack.rb @@ -1,10 +1,10 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real # Update a stack. # - # @param [Fog::Orchestration::OpenStack::Stack] the stack to update. + # @param [Fog::OpenStack::Orchestration::Stack] the stack to update. # @param [Hash] options # * :template [String] Structure containing the template body. # or (one of the two Template parameters is required) diff --git a/lib/fog/orchestration/openstack/requests/validate_template.rb b/lib/fog/openstack/orchestration/requests/validate_template.rb similarity index 87% rename from lib/fog/orchestration/openstack/requests/validate_template.rb rename to lib/fog/openstack/orchestration/requests/validate_template.rb index f203cad88..c0c962376 100644 --- a/lib/fog/orchestration/openstack/requests/validate_template.rb +++ b/lib/fog/openstack/orchestration/requests/validate_template.rb @@ -1,6 +1,6 @@ module Fog - module Orchestration - class OpenStack + module OpenStack + class Orchestration class Real def validate_template(options = {}) request( diff --git a/lib/fog/orchestration/util/recursive_hot_file_loader.rb b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb similarity index 99% rename from lib/fog/orchestration/util/recursive_hot_file_loader.rb rename to lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb index 74af237e7..826f51b4a 100644 --- a/lib/fog/orchestration/util/recursive_hot_file_loader.rb +++ b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb @@ -5,8 +5,8 @@ require 'fog/core' module Fog - module Orchestration - module Util + module OpenStack + module OrchestrationUtil # # Resolve get_file resources found in a HOT template populating # a files Hash conforming to Heat Specs diff --git a/lib/fog/planning/openstack/models/plan.rb b/lib/fog/openstack/planning/models/plan.rb similarity index 100% rename from lib/fog/planning/openstack/models/plan.rb rename to lib/fog/openstack/planning/models/plan.rb diff --git a/lib/fog/planning/openstack/models/plans.rb b/lib/fog/openstack/planning/models/plans.rb similarity index 93% rename from lib/fog/planning/openstack/models/plans.rb rename to lib/fog/openstack/planning/models/plans.rb index dec602896..cc0c915a5 100644 --- a/lib/fog/planning/openstack/models/plans.rb +++ b/lib/fog/openstack/planning/models/plans.rb @@ -1,5 +1,5 @@ require 'fog/openstack/models/collection' -require 'fog/planning/openstack/models/plan' +require 'fog/openstack/planning/models/plan' module Fog module OpenStack diff --git a/lib/fog/planning/openstack/models/role.rb b/lib/fog/openstack/planning/models/role.rb similarity index 100% rename from lib/fog/planning/openstack/models/role.rb rename to lib/fog/openstack/planning/models/role.rb diff --git a/lib/fog/planning/openstack/models/roles.rb b/lib/fog/openstack/planning/models/roles.rb similarity index 87% rename from lib/fog/planning/openstack/models/roles.rb rename to lib/fog/openstack/planning/models/roles.rb index 19dffd8bf..61cb22c69 100644 --- a/lib/fog/planning/openstack/models/roles.rb +++ b/lib/fog/openstack/planning/models/roles.rb @@ -1,5 +1,5 @@ require 'fog/openstack/models/collection' -require 'fog/planning/openstack/models/role' +require 'fog/openstack/planning/models/role' module Fog module OpenStack diff --git a/lib/fog/planning/openstack.rb b/lib/fog/openstack/planning/planning.rb similarity index 96% rename from lib/fog/planning/openstack.rb rename to lib/fog/openstack/planning/planning.rb index eb5f75cd8..e7253a2ad 100644 --- a/lib/fog/planning/openstack.rb +++ b/lib/fog/openstack/planning/planning.rb @@ -1,5 +1,3 @@ - - module Fog module OpenStack class Planning < Fog::Service @@ -19,7 +17,7 @@ class Planning < Fog::Service ## MODELS # - model_path 'fog/planning/openstack/models' + model_path 'fog/openstack/planning/models' model :role collection :roles model :plan @@ -27,7 +25,7 @@ class Planning < Fog::Service ## REQUESTS # - request_path 'fog/planning/openstack/requests' + request_path 'fog/openstack/planning/requests' # Role requests request :list_roles @@ -122,10 +120,12 @@ def self.[](service) end def self.new(attributes) + require 'pry-byebug' + binding.pry + attributes = attributes.dup # Prevent delete from having side effects service = attributes.delete(:service).to_s.downcase.to_sym if services.include?(service) - require "fog/#{service}/openstack" return Fog::OpenStack.const_get(service.to_s.capitalize).new(attributes) end raise ArgumentError, "Openstack has no #{service} service" diff --git a/lib/fog/planning/openstack/requests/add_role_to_plan.rb b/lib/fog/openstack/planning/requests/add_role_to_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/add_role_to_plan.rb rename to lib/fog/openstack/planning/requests/add_role_to_plan.rb diff --git a/lib/fog/planning/openstack/requests/create_plan.rb b/lib/fog/openstack/planning/requests/create_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/create_plan.rb rename to lib/fog/openstack/planning/requests/create_plan.rb diff --git a/lib/fog/planning/openstack/requests/delete_plan.rb b/lib/fog/openstack/planning/requests/delete_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/delete_plan.rb rename to lib/fog/openstack/planning/requests/delete_plan.rb diff --git a/lib/fog/planning/openstack/requests/get_plan.rb b/lib/fog/openstack/planning/requests/get_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/get_plan.rb rename to lib/fog/openstack/planning/requests/get_plan.rb diff --git a/lib/fog/planning/openstack/requests/get_plan_templates.rb b/lib/fog/openstack/planning/requests/get_plan_templates.rb similarity index 100% rename from lib/fog/planning/openstack/requests/get_plan_templates.rb rename to lib/fog/openstack/planning/requests/get_plan_templates.rb diff --git a/lib/fog/planning/openstack/requests/list_plans.rb b/lib/fog/openstack/planning/requests/list_plans.rb similarity index 100% rename from lib/fog/planning/openstack/requests/list_plans.rb rename to lib/fog/openstack/planning/requests/list_plans.rb diff --git a/lib/fog/planning/openstack/requests/list_roles.rb b/lib/fog/openstack/planning/requests/list_roles.rb similarity index 100% rename from lib/fog/planning/openstack/requests/list_roles.rb rename to lib/fog/openstack/planning/requests/list_roles.rb diff --git a/lib/fog/planning/openstack/requests/patch_plan.rb b/lib/fog/openstack/planning/requests/patch_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/patch_plan.rb rename to lib/fog/openstack/planning/requests/patch_plan.rb diff --git a/lib/fog/planning/openstack/requests/remove_role_from_plan.rb b/lib/fog/openstack/planning/requests/remove_role_from_plan.rb similarity index 100% rename from lib/fog/planning/openstack/requests/remove_role_from_plan.rb rename to lib/fog/openstack/planning/requests/remove_role_from_plan.rb diff --git a/lib/fog/shared_file_system/openstack/models/availability_zone.rb b/lib/fog/openstack/shared_file_system/models/availability_zone.rb similarity index 83% rename from lib/fog/shared_file_system/openstack/models/availability_zone.rb rename to lib/fog/openstack/shared_file_system/models/availability_zone.rb index 73a5f5526..10c2c463f 100644 --- a/lib/fog/shared_file_system/openstack/models/availability_zone.rb +++ b/lib/fog/openstack/shared_file_system/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class AvailabilityZone < Fog::OpenStack::Model identity :id diff --git a/lib/fog/shared_file_system/openstack/models/availability_zones.rb b/lib/fog/openstack/shared_file_system/models/availability_zones.rb similarity index 59% rename from lib/fog/shared_file_system/openstack/models/availability_zones.rb rename to lib/fog/openstack/shared_file_system/models/availability_zones.rb index d63442b8b..47ee8eb43 100644 --- a/lib/fog/shared_file_system/openstack/models/availability_zones.rb +++ b/lib/fog/openstack/shared_file_system/models/availability_zones.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/availability_zone' +require 'fog/openstack/shared_file_system/models/availability_zone' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class AvailabilityZones < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::AvailabilityZone + model Fog::OpenStack::SharedFileSystem::AvailabilityZone def all load_response(service.list_availability_zones(), 'availability_zones') diff --git a/lib/fog/shared_file_system/openstack/models/network.rb b/lib/fog/openstack/shared_file_system/models/network.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/models/network.rb rename to lib/fog/openstack/shared_file_system/models/network.rb index 62d2a574a..7787cdf2a 100644 --- a/lib/fog/shared_file_system/openstack/models/network.rb +++ b/lib/fog/openstack/shared_file_system/models/network.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Network < Fog::OpenStack::Model identity :id diff --git a/lib/fog/shared_file_system/openstack/models/networks.rb b/lib/fog/openstack/shared_file_system/models/networks.rb similarity index 77% rename from lib/fog/shared_file_system/openstack/models/networks.rb rename to lib/fog/openstack/shared_file_system/models/networks.rb index 84fe46937..4bdd9026c 100644 --- a/lib/fog/shared_file_system/openstack/models/networks.rb +++ b/lib/fog/openstack/shared_file_system/models/networks.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/network' +require 'fog/openstack/shared_file_system/models/network' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Networks < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::Network + model Fog::OpenStack::SharedFileSystem::Network def all(options = {}) load_response(service.list_share_networks_detail(options), 'share_networks') diff --git a/lib/fog/shared_file_system/openstack/models/share.rb b/lib/fog/openstack/shared_file_system/models/share.rb similarity index 97% rename from lib/fog/shared_file_system/openstack/models/share.rb rename to lib/fog/openstack/shared_file_system/models/share.rb index 26bf7b7c3..bfedd2b9a 100644 --- a/lib/fog/shared_file_system/openstack/models/share.rb +++ b/lib/fog/openstack/shared_file_system/models/share.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Share < Fog::OpenStack::Model identity :id @@ -85,7 +85,7 @@ def revoke_access(access_id) def access_rules service.share_access_rules(:share => self) end - + def export_locations service.share_export_locations(:share => self) end diff --git a/lib/fog/shared_file_system/openstack/models/share_access_rule.rb b/lib/fog/openstack/shared_file_system/models/share_access_rule.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/models/share_access_rule.rb rename to lib/fog/openstack/shared_file_system/models/share_access_rule.rb index 932e01ec6..923efa78f 100644 --- a/lib/fog/shared_file_system/openstack/models/share_access_rule.rb +++ b/lib/fog/openstack/shared_file_system/models/share_access_rule.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareAccessRule < Fog::OpenStack::Model attr_accessor :share diff --git a/lib/fog/shared_file_system/openstack/models/share_access_rules.rb b/lib/fog/openstack/shared_file_system/models/share_access_rules.rb similarity index 76% rename from lib/fog/shared_file_system/openstack/models/share_access_rules.rb rename to lib/fog/openstack/shared_file_system/models/share_access_rules.rb index d35020e06..88ce81d50 100644 --- a/lib/fog/shared_file_system/openstack/models/share_access_rules.rb +++ b/lib/fog/openstack/shared_file_system/models/share_access_rules.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/share_access_rule' +require 'fog/openstack/shared_file_system/models/share_access_rule' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareAccessRules < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::ShareAccessRule + model Fog::OpenStack::SharedFileSystem::ShareAccessRule attr_accessor :share diff --git a/lib/fog/shared_file_system/openstack/models/share_export_location.rb b/lib/fog/openstack/shared_file_system/models/share_export_location.rb similarity index 83% rename from lib/fog/shared_file_system/openstack/models/share_export_location.rb rename to lib/fog/openstack/shared_file_system/models/share_export_location.rb index 6c0975381..e25dd6d5d 100644 --- a/lib/fog/shared_file_system/openstack/models/share_export_location.rb +++ b/lib/fog/openstack/shared_file_system/models/share_export_location.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareExportLocation < Fog::OpenStack::Model identity :id - + attribute :share_instance_id attribute :path attribute :is_admin_only diff --git a/lib/fog/shared_file_system/openstack/models/share_export_locations.rb b/lib/fog/openstack/shared_file_system/models/share_export_locations.rb similarity index 77% rename from lib/fog/shared_file_system/openstack/models/share_export_locations.rb rename to lib/fog/openstack/shared_file_system/models/share_export_locations.rb index 39cdadbaf..49bf13206 100644 --- a/lib/fog/shared_file_system/openstack/models/share_export_locations.rb +++ b/lib/fog/openstack/shared_file_system/models/share_export_locations.rb @@ -1,14 +1,14 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/share_access_rule' +require 'fog/openstack/shared_file_system/models/share_access_rule' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class ShareExportLocations < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::ShareExportLocation + model Fog::OpenStack::SharedFileSystem::ShareExportLocation attr_accessor :share - + def all requires :share load_response(service.list_share_export_locations(@share.id), 'export_locations') @@ -20,7 +20,7 @@ def find_by_id(id) end alias get find_by_id - + def new(attributes = {}) requires :share super({:share => @share}.merge!(attributes)) diff --git a/lib/fog/shared_file_system/openstack/models/shares.rb b/lib/fog/openstack/shared_file_system/models/shares.rb similarity index 76% rename from lib/fog/shared_file_system/openstack/models/shares.rb rename to lib/fog/openstack/shared_file_system/models/shares.rb index 6f512b000..06e4ae729 100644 --- a/lib/fog/shared_file_system/openstack/models/shares.rb +++ b/lib/fog/openstack/shared_file_system/models/shares.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/share' +require 'fog/openstack/shared_file_system/models/share' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Shares < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::Share + model Fog::OpenStack::SharedFileSystem::Share def all(options = {}) load_response(service.list_shares_detail(options), 'shares') diff --git a/lib/fog/shared_file_system/openstack/models/snapshot.rb b/lib/fog/openstack/shared_file_system/models/snapshot.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/models/snapshot.rb rename to lib/fog/openstack/shared_file_system/models/snapshot.rb index 8f831a75a..6fefca9be 100644 --- a/lib/fog/shared_file_system/openstack/models/snapshot.rb +++ b/lib/fog/openstack/shared_file_system/models/snapshot.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Snapshot < Fog::OpenStack::Model identity :id diff --git a/lib/fog/shared_file_system/openstack/models/snapshots.rb b/lib/fog/openstack/shared_file_system/models/snapshots.rb similarity index 77% rename from lib/fog/shared_file_system/openstack/models/snapshots.rb rename to lib/fog/openstack/shared_file_system/models/snapshots.rb index e8a0ad749..3a6756f7c 100644 --- a/lib/fog/shared_file_system/openstack/models/snapshots.rb +++ b/lib/fog/openstack/shared_file_system/models/snapshots.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/shared_file_system/openstack/models/snapshot' +require 'fog/openstack/shared_file_system/models/snapshot' module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Snapshots < Fog::OpenStack::Collection - model Fog::SharedFileSystem::OpenStack::Snapshot + model Fog::OpenStack::SharedFileSystem::Snapshot def all(options = {}) load_response(service.list_snapshots_detail(options), 'snapshots') diff --git a/lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb b/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb index c80ede107..8ad8537e1 100644 --- a/lib/fog/shared_file_system/openstack/requests/add_security_service_to_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def add_security_service_to_share_network(security_service_id, share_network_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/create_security_service.rb b/lib/fog/openstack/shared_file_system/requests/create_security_service.rb similarity index 96% rename from lib/fog/shared_file_system/openstack/requests/create_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/create_security_service.rb index bfc3bb543..a32ce1b09 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_security_service(type, name, options = {}) data = { diff --git a/lib/fog/shared_file_system/openstack/requests/create_share.rb b/lib/fog/openstack/shared_file_system/requests/create_share.rb similarity index 96% rename from lib/fog/shared_file_system/openstack/requests/create_share.rb rename to lib/fog/openstack/shared_file_system/requests/create_share.rb index cd8535110..8222a6465 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_share(protocol, size, options = {}) data = { diff --git a/lib/fog/shared_file_system/openstack/requests/create_share_network.rb b/lib/fog/openstack/shared_file_system/requests/create_share_network.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/create_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/create_share_network.rb index 21c11285c..6a38d5b9c 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_share_network(options = {}) data = {} diff --git a/lib/fog/shared_file_system/openstack/requests/create_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/create_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/create_snapshot.rb index 4c9fff6e8..9e4befabd 100644 --- a/lib/fog/shared_file_system/openstack/requests/create_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def create_snapshot(share_id, options = {}) data = { diff --git a/lib/fog/shared_file_system/openstack/requests/delete_security_service.rb b/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb similarity index 90% rename from lib/fog/shared_file_system/openstack/requests/delete_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/delete_security_service.rb index 036057124..b304d2d22 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_security_service(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/delete_share.rb b/lib/fog/openstack/shared_file_system/requests/delete_share.rb similarity index 93% rename from lib/fog/shared_file_system/openstack/requests/delete_share.rb rename to lib/fog/openstack/shared_file_system/requests/delete_share.rb index f18126418..41c1113d2 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_share(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/delete_share_network.rb b/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/delete_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/delete_share_network.rb index 73bb098dc..3211b2cf2 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_share_network(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb index 48ca62beb..e48dfd759 100644 --- a/lib/fog/shared_file_system/openstack/requests/delete_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def delete_snapshot(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/extend_share.rb b/lib/fog/openstack/shared_file_system/requests/extend_share.rb similarity index 90% rename from lib/fog/shared_file_system/openstack/requests/extend_share.rb rename to lib/fog/openstack/shared_file_system/requests/extend_share.rb index 6fd4fcd99..723db63ce 100644 --- a/lib/fog/shared_file_system/openstack/requests/extend_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/extend_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def extend_share(share_id, new_size) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/get_limits.rb b/lib/fog/openstack/shared_file_system/requests/get_limits.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/get_limits.rb rename to lib/fog/openstack/shared_file_system/requests/get_limits.rb index c4421586c..eea8774ca 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_limits.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_limits.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_limits request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_quota.rb b/lib/fog/openstack/shared_file_system/requests/get_quota.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/get_quota.rb rename to lib/fog/openstack/shared_file_system/requests/get_quota.rb index c381abd93..28dff4787 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_quota(project_id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_security_service.rb b/lib/fog/openstack/shared_file_system/requests/get_security_service.rb similarity index 93% rename from lib/fog/shared_file_system/openstack/requests/get_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/get_security_service.rb index 86c134319..42682244e 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_security_service(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_share.rb b/lib/fog/openstack/shared_file_system/requests/get_share.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/get_share.rb rename to lib/fog/openstack/shared_file_system/requests/get_share.rb index f37a5ac26..60103a993 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_share(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb b/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb similarity index 89% rename from lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb rename to lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb index 1c5319ec7..8c3400ef3 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_share_export_location.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb @@ -1,8 +1,8 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real - # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). + # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns the export location detail. def get_share_export_location(share_id,export_location_id) diff --git a/lib/fog/shared_file_system/openstack/requests/get_share_network.rb b/lib/fog/openstack/shared_file_system/requests/get_share_network.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/get_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/get_share_network.rb index b8fb78218..befa8fb1a 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_share_network(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/get_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/get_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/get_snapshot.rb index b39ca1604..b9acf812a 100644 --- a/lib/fog/shared_file_system/openstack/requests/get_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def get_snapshot(id) request( diff --git a/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb b/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/grant_share_access.rb rename to lib/fog/openstack/shared_file_system/requests/grant_share_access.rb index c428e5821..92b3136a9 100644 --- a/lib/fog/shared_file_system/openstack/requests/grant_share_access.rb +++ b/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def grant_share_access(share_id, access_to = '0.0.0.0/0', access_type = 'ip', access_level = 'rw') action = { diff --git a/lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb b/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb rename to lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb index 1752876db..a2b8639b2 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_availability_zones.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_availability_zones() request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_security_services.rb b/lib/fog/openstack/shared_file_system/requests/list_security_services.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_security_services.rb rename to lib/fog/openstack/shared_file_system/requests/list_security_services.rb index 7495481e0..e6588d094 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_security_services.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_security_services.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_security_services(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb index 9e47a0e04..5d9750b6d 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_security_services_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_security_services_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb b/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb index c22da2865..b232a1de6 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_access_rules.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_share_access_rules(share_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb b/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb similarity index 87% rename from lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb index 54cebbffb..b2c283432 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_export_locations.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb @@ -1,8 +1,8 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real - # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). + # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns a list of the export locations. def list_share_export_locations(share_id) diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_networks.rb b/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_share_networks.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_networks.rb index 263ba803c..eec063415 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_networks.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_share_networks(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb index a73ff21f4..1555248f4 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_share_networks_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_share_networks_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_shares.rb b/lib/fog/openstack/shared_file_system/requests/list_shares.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_shares.rb rename to lib/fog/openstack/shared_file_system/requests/list_shares.rb index 090c91b52..13fd4e2a0 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_shares.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_shares.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_shares(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb index a3f722fd8..30abb0331 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_shares_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_shares_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_snapshots.rb b/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/list_snapshots.rb rename to lib/fog/openstack/shared_file_system/requests/list_snapshots.rb index 59a8b50b3..b62e978ab 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_snapshots.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_snapshots(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb similarity index 92% rename from lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb rename to lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb index 786449924..15e69cad1 100644 --- a/lib/fog/shared_file_system/openstack/requests/list_snapshots_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def list_snapshots_detail(options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb b/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb index 000154d94..a2072ddd4 100644 --- a/lib/fog/shared_file_system/openstack/requests/remove_security_service_from_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def remove_security_service_from_share_network(security_service_id, share_network_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb b/lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb similarity index 91% rename from lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb rename to lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb index 3f7016dd3..47610ee97 100644 --- a/lib/fog/shared_file_system/openstack/requests/revoke_share_access.rb +++ b/lib/fog/openstack/shared_file_system/requests/revoke_share_access.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def revoke_share_access(share_id, access_id) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/share_action.rb b/lib/fog/openstack/shared_file_system/requests/share_action.rb similarity index 87% rename from lib/fog/shared_file_system/openstack/requests/share_action.rb rename to lib/fog/openstack/shared_file_system/requests/share_action.rb index 5cb3f0ba2..c5c3cd97a 100644 --- a/lib/fog/shared_file_system/openstack/requests/share_action.rb +++ b/lib/fog/openstack/shared_file_system/requests/share_action.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def share_action(id, options = {}, expects_status = 202) request( diff --git a/lib/fog/shared_file_system/openstack/requests/share_network_action.rb b/lib/fog/openstack/shared_file_system/requests/share_network_action.rb similarity index 88% rename from lib/fog/shared_file_system/openstack/requests/share_network_action.rb rename to lib/fog/openstack/shared_file_system/requests/share_network_action.rb index d788f5ec5..9d78c1fe0 100644 --- a/lib/fog/shared_file_system/openstack/requests/share_network_action.rb +++ b/lib/fog/openstack/shared_file_system/requests/share_network_action.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def share_network_action(id, options = {}, expects_status = 200) request( diff --git a/lib/fog/shared_file_system/openstack/requests/shrink_share.rb b/lib/fog/openstack/shared_file_system/requests/shrink_share.rb similarity index 90% rename from lib/fog/shared_file_system/openstack/requests/shrink_share.rb rename to lib/fog/openstack/shared_file_system/requests/shrink_share.rb index 377b8ddb1..e0ebe59fc 100644 --- a/lib/fog/shared_file_system/openstack/requests/shrink_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/shrink_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def shrink_share(share_id, new_size) action = { diff --git a/lib/fog/shared_file_system/openstack/requests/update_quota.rb b/lib/fog/openstack/shared_file_system/requests/update_quota.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_quota.rb rename to lib/fog/openstack/shared_file_system/requests/update_quota.rb index cfd9eef46..55392410d 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_quota(project_id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_security_service.rb b/lib/fog/openstack/shared_file_system/requests/update_security_service.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_security_service.rb rename to lib/fog/openstack/shared_file_system/requests/update_security_service.rb index 132e9d12c..a1be0a855 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_security_service.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_security_service(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_share.rb b/lib/fog/openstack/shared_file_system/requests/update_share.rb similarity index 95% rename from lib/fog/shared_file_system/openstack/requests/update_share.rb rename to lib/fog/openstack/shared_file_system/requests/update_share.rb index 08f2fceeb..d283878b6 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_share.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_share(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_share_network.rb b/lib/fog/openstack/shared_file_system/requests/update_share_network.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_share_network.rb rename to lib/fog/openstack/shared_file_system/requests/update_share_network.rb index d90187a77..b5c55dac1 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_share_network.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_share_network(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack/requests/update_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb similarity index 94% rename from lib/fog/shared_file_system/openstack/requests/update_snapshot.rb rename to lib/fog/openstack/shared_file_system/requests/update_snapshot.rb index 46a77677f..3898a9715 100644 --- a/lib/fog/shared_file_system/openstack/requests/update_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack + module OpenStack + class SharedFileSystem class Real def update_snapshot(id, options = {}) request( diff --git a/lib/fog/shared_file_system/openstack.rb b/lib/fog/openstack/shared_file_system/shared_file_system.rb similarity index 98% rename from lib/fog/shared_file_system/openstack.rb rename to lib/fog/openstack/shared_file_system/shared_file_system.rb index 556df1739..1f70859de 100644 --- a/lib/fog/shared_file_system/openstack.rb +++ b/lib/fog/openstack/shared_file_system/shared_file_system.rb @@ -1,6 +1,6 @@ module Fog - module SharedFileSystem - class OpenStack < Fog::Service + module OpenStack + class SharedFileSystem < Fog::Service SUPPORTED_VERSIONS = /v2(\.0)*/ SUPPORTED_MICROVERSION = '2.15'.freeze @@ -16,7 +16,7 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_shared_file_system_microversion - model_path 'fog/shared_file_system/openstack/models' + model_path 'fog/openstack/shared_file_system/models' model :network collection :networks model :share @@ -30,7 +30,7 @@ class OpenStack < Fog::Service model :availability_zone collection :availability_zones - request_path 'fog/shared_file_system/openstack/requests' + request_path 'fog/openstack/shared_file_system/requests' # share networks request :list_share_networks request :list_share_networks_detail @@ -348,7 +348,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::SharedFileSystem::OpenStack::NotFound + Fog::OpenStack::SharedFileSystem::NotFound end def action_prefix diff --git a/lib/fog/storage/openstack/models/directories.rb b/lib/fog/openstack/storage/models/directories.rb similarity index 82% rename from lib/fog/storage/openstack/models/directories.rb rename to lib/fog/openstack/storage/models/directories.rb index d912cda10..f4dd7e6be 100644 --- a/lib/fog/storage/openstack/models/directories.rb +++ b/lib/fog/openstack/storage/models/directories.rb @@ -1,11 +1,11 @@ require 'fog/openstack/models/collection' -require 'fog/storage/openstack/models/directory' +require 'fog/openstack/storage/models/directory' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Directories < Fog::OpenStack::Collection - model Fog::Storage::OpenStack::Directory + model Fog::OpenStack::Storage::Directory def all(options = {}) data = service.get_containers(options) @@ -27,7 +27,7 @@ def get(key, options = {}) directory.files << directory.files.new(file) end directory - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound nil end end diff --git a/lib/fog/storage/openstack/models/directory.rb b/lib/fog/openstack/storage/models/directory.rb similarity index 83% rename from lib/fog/storage/openstack/models/directory.rb rename to lib/fog/openstack/storage/models/directory.rb index b6a6ba8b1..9d2f4ccbb 100644 --- a/lib/fog/storage/openstack/models/directory.rb +++ b/lib/fog/openstack/storage/models/directory.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/model' -require 'fog/storage/openstack/models/files' +require 'fog/openstack/storage/models/files' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Directory < Fog::OpenStack::Model identity :key, :aliases => 'name' @@ -22,7 +22,7 @@ def destroy def files @files ||= begin - Fog::Storage::OpenStack::Files.new( + Fog::OpenStack::Storage::Files.new( :directory => self, :service => service ) @@ -34,7 +34,7 @@ def public_url @public_url ||= begin service.public_url(key) - rescue Fog::Storage::OpenStack::NotFound => err + rescue Fog::OpenStack::Storage::NotFound => err nil end end diff --git a/lib/fog/storage/openstack/models/file.rb b/lib/fog/openstack/storage/models/file.rb similarity index 99% rename from lib/fog/storage/openstack/models/file.rb rename to lib/fog/openstack/storage/models/file.rb index 1650a27f8..8096f3e94 100644 --- a/lib/fog/storage/openstack/models/file.rb +++ b/lib/fog/openstack/storage/models/file.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class File < Fog::OpenStack::Model identity :key, :aliases => 'name' diff --git a/lib/fog/storage/openstack/models/files.rb b/lib/fog/openstack/storage/models/files.rb similarity index 91% rename from lib/fog/storage/openstack/models/files.rb rename to lib/fog/openstack/storage/models/files.rb index 141242948..9b4437830 100644 --- a/lib/fog/storage/openstack/models/files.rb +++ b/lib/fog/openstack/storage/models/files.rb @@ -1,9 +1,9 @@ require 'fog/openstack/models/collection' -require 'fog/storage/openstack/models/file' +require 'fog/openstack/storage/models/file' module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Files < Fog::OpenStack::Collection attribute :directory attribute :limit @@ -11,7 +11,7 @@ class Files < Fog::OpenStack::Collection attribute :path attribute :prefix - model Fog::Storage::OpenStack::File + model Fog::OpenStack::Storage::File def all(options = {}) requires :directory @@ -55,7 +55,7 @@ def get(key, &block) file_data = data.headers.merge(:body => data.body, :key => key) new(file_data) - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound nil end @@ -81,7 +81,7 @@ def head(key, _options = {}) data = service.head_object(directory.key, key) file_data = data.headers.merge(:key => key) new(file_data) - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound nil end diff --git a/lib/fog/storage/openstack/requests/copy_object.rb b/lib/fog/openstack/storage/requests/copy_object.rb similarity index 96% rename from lib/fog/storage/openstack/requests/copy_object.rb rename to lib/fog/openstack/storage/requests/copy_object.rb index 2e98e523f..db518bead 100644 --- a/lib/fog/storage/openstack/requests/copy_object.rb +++ b/lib/fog/openstack/storage/requests/copy_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Copy object # diff --git a/lib/fog/storage/openstack/requests/delete_container.rb b/lib/fog/openstack/storage/requests/delete_container.rb similarity index 91% rename from lib/fog/storage/openstack/requests/delete_container.rb rename to lib/fog/openstack/storage/requests/delete_container.rb index 5023110f5..2fa501eb3 100644 --- a/lib/fog/storage/openstack/requests/delete_container.rb +++ b/lib/fog/openstack/storage/requests/delete_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Delete an existing container # diff --git a/lib/fog/storage/openstack/requests/delete_multiple_objects.rb b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb similarity index 98% rename from lib/fog/storage/openstack/requests/delete_multiple_objects.rb rename to lib/fog/openstack/storage/requests/delete_multiple_objects.rb index a91d5a245..ca69fecfa 100644 --- a/lib/fog/storage/openstack/requests/delete_multiple_objects.rb +++ b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Deletes multiple objects or containers with a single request. # diff --git a/lib/fog/storage/openstack/requests/delete_object.rb b/lib/fog/openstack/storage/requests/delete_object.rb similarity index 93% rename from lib/fog/storage/openstack/requests/delete_object.rb rename to lib/fog/openstack/storage/requests/delete_object.rb index bbc344cda..7b6954cea 100644 --- a/lib/fog/storage/openstack/requests/delete_object.rb +++ b/lib/fog/openstack/storage/requests/delete_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Delete an existing object # diff --git a/lib/fog/storage/openstack/requests/delete_static_large_object.rb b/lib/fog/openstack/storage/requests/delete_static_large_object.rb similarity index 98% rename from lib/fog/storage/openstack/requests/delete_static_large_object.rb rename to lib/fog/openstack/storage/requests/delete_static_large_object.rb index 4acddd449..50e6dd0f1 100644 --- a/lib/fog/storage/openstack/requests/delete_static_large_object.rb +++ b/lib/fog/openstack/storage/requests/delete_static_large_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Delete a static large object. # diff --git a/lib/fog/storage/openstack/requests/get_container.rb b/lib/fog/openstack/storage/requests/get_container.rb similarity index 97% rename from lib/fog/storage/openstack/requests/get_container.rb rename to lib/fog/openstack/storage/requests/get_container.rb index 27b93da95..8f8f2b1c2 100644 --- a/lib/fog/storage/openstack/requests/get_container.rb +++ b/lib/fog/openstack/storage/requests/get_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get details for container and total bytes stored # diff --git a/lib/fog/storage/openstack/requests/get_containers.rb b/lib/fog/openstack/storage/requests/get_containers.rb similarity index 96% rename from lib/fog/storage/openstack/requests/get_containers.rb rename to lib/fog/openstack/storage/requests/get_containers.rb index 254cd0d9a..b3d0835f4 100644 --- a/lib/fog/storage/openstack/requests/get_containers.rb +++ b/lib/fog/openstack/storage/requests/get_containers.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # List existing storage containers # diff --git a/lib/fog/storage/openstack/requests/get_object.rb b/lib/fog/openstack/storage/requests/get_object.rb similarity index 94% rename from lib/fog/storage/openstack/requests/get_object.rb rename to lib/fog/openstack/storage/requests/get_object.rb index bdfa1b02a..479038723 100644 --- a/lib/fog/storage/openstack/requests/get_object.rb +++ b/lib/fog/openstack/storage/requests/get_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get details for object # diff --git a/lib/fog/storage/openstack/requests/get_object_http_url.rb b/lib/fog/openstack/storage/requests/get_object_http_url.rb similarity index 94% rename from lib/fog/storage/openstack/requests/get_object_http_url.rb rename to lib/fog/openstack/storage/requests/get_object_http_url.rb index 0e8582417..ef79757d4 100644 --- a/lib/fog/storage/openstack/requests/get_object_http_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_http_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get an expiring object http url # diff --git a/lib/fog/storage/openstack/requests/get_object_https_url.rb b/lib/fog/openstack/storage/requests/get_object_https_url.rb similarity index 98% rename from lib/fog/storage/openstack/requests/get_object_https_url.rb rename to lib/fog/openstack/storage/requests/get_object_https_url.rb index 4f9a418d2..5b8cd50e7 100644 --- a/lib/fog/storage/openstack/requests/get_object_https_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_https_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get an expiring object https url from Cloud Files # diff --git a/lib/fog/storage/openstack/requests/head_container.rb b/lib/fog/openstack/storage/requests/head_container.rb similarity index 95% rename from lib/fog/storage/openstack/requests/head_container.rb rename to lib/fog/openstack/storage/requests/head_container.rb index c42b83ca9..141e4cb04 100644 --- a/lib/fog/storage/openstack/requests/head_container.rb +++ b/lib/fog/openstack/storage/requests/head_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # List number of objects and total bytes stored # diff --git a/lib/fog/storage/openstack/requests/head_containers.rb b/lib/fog/openstack/storage/requests/head_containers.rb similarity index 93% rename from lib/fog/storage/openstack/requests/head_containers.rb rename to lib/fog/openstack/storage/requests/head_containers.rb index d4dea719a..1cbdffe18 100644 --- a/lib/fog/storage/openstack/requests/head_containers.rb +++ b/lib/fog/openstack/storage/requests/head_containers.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # List number of containers and total bytes stored # diff --git a/lib/fog/storage/openstack/requests/head_object.rb b/lib/fog/openstack/storage/requests/head_object.rb similarity index 93% rename from lib/fog/storage/openstack/requests/head_object.rb rename to lib/fog/openstack/storage/requests/head_object.rb index c38095991..647e289e6 100644 --- a/lib/fog/storage/openstack/requests/head_object.rb +++ b/lib/fog/openstack/storage/requests/head_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Get headers for object # diff --git a/lib/fog/storage/openstack/requests/post_object.rb b/lib/fog/openstack/storage/requests/post_object.rb similarity index 94% rename from lib/fog/storage/openstack/requests/post_object.rb rename to lib/fog/openstack/storage/requests/post_object.rb index 418d93820..2b66db150 100644 --- a/lib/fog/storage/openstack/requests/post_object.rb +++ b/lib/fog/openstack/storage/requests/post_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Update object metadata # diff --git a/lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb b/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb similarity index 96% rename from lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb rename to lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb index 45cc2dc8b..c5ca3a455 100644 --- a/lib/fog/storage/openstack/requests/post_set_meta_temp_url_key.rb +++ b/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Set the account wide Temp URL Key. This is a secret key that's # used to generate signed expiring URLs. diff --git a/lib/fog/storage/openstack/requests/public_url.rb b/lib/fog/openstack/storage/requests/public_url.rb similarity index 95% rename from lib/fog/storage/openstack/requests/public_url.rb rename to lib/fog/openstack/storage/requests/public_url.rb index c95c8d7e3..ca2261863 100644 --- a/lib/fog/storage/openstack/requests/public_url.rb +++ b/lib/fog/openstack/storage/requests/public_url.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage module PublicUrl # Get public_url for an object # diff --git a/lib/fog/storage/openstack/requests/put_container.rb b/lib/fog/openstack/storage/requests/put_container.rb similarity index 94% rename from lib/fog/storage/openstack/requests/put_container.rb rename to lib/fog/openstack/storage/requests/put_container.rb index 4b3c976d2..ba09d8f5d 100644 --- a/lib/fog/storage/openstack/requests/put_container.rb +++ b/lib/fog/openstack/storage/requests/put_container.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new container # diff --git a/lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb b/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb similarity index 95% rename from lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb rename to lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb index b35f20e5a..4c0124ab5 100644 --- a/lib/fog/storage/openstack/requests/put_dynamic_obj_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new dynamic large object manifest # @@ -19,7 +19,7 @@ class Real # @param options [Hash] Config headers for +object+. # @option options [String] 'X-Object-Manifest' ("container/object") "/" for segment objects. # - # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404 + # @raise [Fog::OpenStack::Storage::NotFound] HTTP 404 # @raise [Excon::Errors::BadRequest] HTTP 400 # @raise [Excon::Errors::Unauthorized] HTTP 401 # @raise [Excon::Errors::HTTPStatusError] diff --git a/lib/fog/storage/openstack/requests/put_object.rb b/lib/fog/openstack/storage/requests/put_object.rb similarity index 98% rename from lib/fog/storage/openstack/requests/put_object.rb rename to lib/fog/openstack/storage/requests/put_object.rb index 3057510d1..57007cc02 100644 --- a/lib/fog/storage/openstack/requests/put_object.rb +++ b/lib/fog/openstack/storage/requests/put_object.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new object # diff --git a/lib/fog/storage/openstack/requests/put_object_manifest.rb b/lib/fog/openstack/storage/requests/put_object_manifest.rb similarity index 90% rename from lib/fog/storage/openstack/requests/put_object_manifest.rb rename to lib/fog/openstack/storage/requests/put_object_manifest.rb index 1fe01c6d8..e52456217 100644 --- a/lib/fog/storage/openstack/requests/put_object_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_object_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new dynamic large object manifest # diff --git a/lib/fog/storage/openstack/requests/put_static_obj_manifest.rb b/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb similarity index 96% rename from lib/fog/storage/openstack/requests/put_static_obj_manifest.rb rename to lib/fog/openstack/storage/requests/put_static_obj_manifest.rb index 23b18a260..f031c1093 100644 --- a/lib/fog/storage/openstack/requests/put_static_obj_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb @@ -1,6 +1,6 @@ module Fog - module Storage - class OpenStack + module OpenStack + class Storage class Real # Create a new static large object manifest. # @@ -33,7 +33,7 @@ class Real # @param segments [Array] Segment data for the object. # @param options [Hash] Config headers for +object+. # - # @raise [Fog::Storage::OpenStack::NotFound] HTTP 404 + # @raise [Fog::OpenStack::Storage::NotFound] HTTP 404 # @raise [Excon::Errors::BadRequest] HTTP 400 # @raise [Excon::Errors::Unauthorized] HTTP 401 # @raise [Excon::Errors::HTTPStatusError] diff --git a/lib/fog/storage/openstack.rb b/lib/fog/openstack/storage/storage.rb similarity index 95% rename from lib/fog/storage/openstack.rb rename to lib/fog/openstack/storage/storage.rb index cca6d65a4..c369f0753 100644 --- a/lib/fog/storage/openstack.rb +++ b/lib/fog/openstack/storage/storage.rb @@ -1,8 +1,8 @@ module Fog - module Storage - class OpenStack < Fog::Service + module OpenStack + class Storage < Fog::Service requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -15,13 +15,13 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key - model_path 'fog/storage/openstack/models' + model_path 'fog/openstack/storage/models' model :directory collection :directories model :file collection :files - request_path 'fog/storage/openstack/requests' + request_path 'fog/openstack/storage/requests' request :copy_object request :delete_container request :delete_object @@ -105,7 +105,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Storage::OpenStack::NotFound + Fog::OpenStack::Storage::NotFound end def default_service_type @@ -125,7 +125,7 @@ def initialize(options = {}) # For example: # # # List current user account details - # service = Fog::Storage[:openstack] + # service = Fog::OpenStack::Storage.new # service.request :method => 'HEAD' # # Would return something like: diff --git a/lib/fog/volume/openstack/models/availability_zone.rb b/lib/fog/openstack/volume/models/availability_zone.rb similarity index 78% rename from lib/fog/volume/openstack/models/availability_zone.rb rename to lib/fog/openstack/volume/models/availability_zone.rb index e1b34cf14..bdbe24823 100644 --- a/lib/fog/volume/openstack/models/availability_zone.rb +++ b/lib/fog/openstack/volume/models/availability_zone.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class AvailabilityZone < Fog::OpenStack::Model end end diff --git a/lib/fog/volume/openstack/models/availability_zones.rb b/lib/fog/openstack/volume/models/availability_zones.rb similarity index 87% rename from lib/fog/volume/openstack/models/availability_zones.rb rename to lib/fog/openstack/volume/models/availability_zones.rb index 42563cee7..413e5b2c8 100644 --- a/lib/fog/volume/openstack/models/availability_zones.rb +++ b/lib/fog/openstack/volume/models/availability_zones.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module AvailabilityZones def all(options = {}) data = service.list_zones(options) diff --git a/lib/fog/volume/openstack/models/backup.rb b/lib/fog/openstack/volume/models/backup.rb similarity index 96% rename from lib/fog/volume/openstack/models/backup.rb rename to lib/fog/openstack/volume/models/backup.rb index 676a16c78..bb76a2bc7 100644 --- a/lib/fog/volume/openstack/models/backup.rb +++ b/lib/fog/openstack/volume/models/backup.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Backup < Fog::OpenStack::Model attribute :availability_zone attribute :container diff --git a/lib/fog/volume/openstack/models/backups.rb b/lib/fog/openstack/volume/models/backups.rb similarity index 86% rename from lib/fog/volume/openstack/models/backups.rb rename to lib/fog/openstack/volume/models/backups.rb index a7e29aeb2..3315bcd18 100644 --- a/lib/fog/volume/openstack/models/backups.rb +++ b/lib/fog/openstack/volume/models/backups.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Backups def all(options = {}) load_response(service.list_backups_detailed(options), 'backups') @@ -17,7 +17,7 @@ def get(backup_id) if backup new(backup) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/models/snapshot.rb b/lib/fog/openstack/volume/models/snapshot.rb similarity index 96% rename from lib/fog/volume/openstack/models/snapshot.rb rename to lib/fog/openstack/volume/models/snapshot.rb index e4ee978f1..83b4363e8 100644 --- a/lib/fog/volume/openstack/models/snapshot.rb +++ b/lib/fog/openstack/volume/models/snapshot.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Snapshot < Fog::OpenStack::Model def update(data) requires :id diff --git a/lib/fog/volume/openstack/models/snapshots.rb b/lib/fog/openstack/volume/models/snapshots.rb similarity index 86% rename from lib/fog/volume/openstack/models/snapshots.rb rename to lib/fog/openstack/volume/models/snapshots.rb index 77d92a9e7..2537440e7 100644 --- a/lib/fog/volume/openstack/models/snapshots.rb +++ b/lib/fog/openstack/volume/models/snapshots.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Snapshots def all(options = {}) load_response(service.list_snapshots_detailed(options), 'snapshots') @@ -17,7 +17,7 @@ def get(snapshots_id) if snapshot new(snapshot) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/models/transfer.rb b/lib/fog/openstack/volume/models/transfer.rb similarity index 94% rename from lib/fog/volume/openstack/models/transfer.rb rename to lib/fog/openstack/volume/models/transfer.rb index 773cdd15d..fc711e972 100644 --- a/lib/fog/volume/openstack/models/transfer.rb +++ b/lib/fog/openstack/volume/models/transfer.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Transfer < Fog::OpenStack::Model def save requires :name, :volume_id diff --git a/lib/fog/volume/openstack/models/transfers.rb b/lib/fog/openstack/volume/models/transfers.rb similarity index 91% rename from lib/fog/volume/openstack/models/transfers.rb rename to lib/fog/openstack/volume/models/transfers.rb index 824c21cd7..5118419eb 100644 --- a/lib/fog/volume/openstack/models/transfers.rb +++ b/lib/fog/openstack/volume/models/transfers.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Transfers def all(options = {}) load_response(service.list_transfers_detailed(options), 'transfers') @@ -16,7 +16,7 @@ def get(transfer_id) if transfer = service.get_transfer_details(transfer_id).body['transfer'] new(transfer) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end diff --git a/lib/fog/volume/openstack/models/volume.rb b/lib/fog/openstack/volume/models/volume.rb similarity index 98% rename from lib/fog/volume/openstack/models/volume.rb rename to lib/fog/openstack/volume/models/volume.rb index 531862350..565e71c09 100644 --- a/lib/fog/volume/openstack/models/volume.rb +++ b/lib/fog/openstack/volume/models/volume.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class Volume < Fog::OpenStack::Model attribute :metadata attribute :status diff --git a/lib/fog/volume/openstack/models/volume_type.rb b/lib/fog/openstack/volume/models/volume_type.rb similarity index 94% rename from lib/fog/volume/openstack/models/volume_type.rb rename to lib/fog/openstack/volume/models/volume_type.rb index 843188950..6f23d4082 100644 --- a/lib/fog/volume/openstack/models/volume_type.rb +++ b/lib/fog/openstack/volume/models/volume_type.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/model' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class VolumeType < Fog::OpenStack::Model attribute :extra_specs diff --git a/lib/fog/volume/openstack/models/volume_types.rb b/lib/fog/openstack/volume/models/volume_types.rb similarity index 84% rename from lib/fog/volume/openstack/models/volume_types.rb rename to lib/fog/openstack/volume/models/volume_types.rb index 3e58e0a77..3e1cd9851 100644 --- a/lib/fog/volume/openstack/models/volume_types.rb +++ b/lib/fog/openstack/volume/models/volume_types.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module VolumeTypes def all(options = {}) response = service.list_volume_types(options) @@ -13,7 +13,7 @@ def get(volume_type_id) if volume_type = service.get_volume_type_details(volume_type_id).body['volume_type'] new(volume_type) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/models/volumes.rb b/lib/fog/openstack/volume/models/volumes.rb similarity index 93% rename from lib/fog/volume/openstack/models/volumes.rb rename to lib/fog/openstack/volume/models/volumes.rb index 03fbc8be1..7efa2ad6f 100644 --- a/lib/fog/volume/openstack/models/volumes.rb +++ b/lib/fog/openstack/volume/models/volumes.rb @@ -1,8 +1,8 @@ require 'fog/openstack/models/collection' module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Volumes def all(options = {}) # the parameter has been "detailed = true" before. Make sure we are @@ -26,7 +26,7 @@ def get(volume_id) if volume = service.get_volume_details(volume_id).body['volume'] new(volume) end - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound nil end end diff --git a/lib/fog/volume/openstack/requests/accept_transfer.rb b/lib/fog/openstack/volume/requests/accept_transfer.rb similarity index 92% rename from lib/fog/volume/openstack/requests/accept_transfer.rb rename to lib/fog/openstack/volume/requests/accept_transfer.rb index 965ba4843..aaceb873b 100644 --- a/lib/fog/volume/openstack/requests/accept_transfer.rb +++ b/lib/fog/openstack/volume/requests/accept_transfer.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def accept_transfer(transfer_id, auth_key) data = { diff --git a/lib/fog/volume/openstack/requests/action.rb b/lib/fog/openstack/volume/requests/action.rb similarity index 89% rename from lib/fog/volume/openstack/requests/action.rb rename to lib/fog/openstack/volume/requests/action.rb index d9a6116f2..1b9addcc7 100644 --- a/lib/fog/volume/openstack/requests/action.rb +++ b/lib/fog/openstack/volume/requests/action.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def action(id, data) request( diff --git a/lib/fog/volume/openstack/requests/create_backup.rb b/lib/fog/openstack/volume/requests/create_backup.rb similarity index 96% rename from lib/fog/volume/openstack/requests/create_backup.rb rename to lib/fog/openstack/volume/requests/create_backup.rb index eb68bc50a..8e5278191 100644 --- a/lib/fog/volume/openstack/requests/create_backup.rb +++ b/lib/fog/openstack/volume/requests/create_backup.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def create_backup(attributes) desired_options = [ diff --git a/lib/fog/volume/openstack/requests/create_snapshot.rb b/lib/fog/openstack/volume/requests/create_snapshot.rb similarity index 89% rename from lib/fog/volume/openstack/requests/create_snapshot.rb rename to lib/fog/openstack/volume/requests/create_snapshot.rb index 0af0b86f5..1d6c394a3 100644 --- a/lib/fog/volume/openstack/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/requests/create_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real private diff --git a/lib/fog/volume/openstack/requests/create_transfer.rb b/lib/fog/openstack/volume/requests/create_transfer.rb similarity index 93% rename from lib/fog/volume/openstack/requests/create_transfer.rb rename to lib/fog/openstack/volume/requests/create_transfer.rb index a4453af12..94e2e2857 100644 --- a/lib/fog/volume/openstack/requests/create_transfer.rb +++ b/lib/fog/openstack/volume/requests/create_transfer.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def create_transfer(volume_id, options = {}) data = { diff --git a/lib/fog/volume/openstack/requests/create_volume.rb b/lib/fog/openstack/volume/requests/create_volume.rb similarity index 94% rename from lib/fog/volume/openstack/requests/create_volume.rb rename to lib/fog/openstack/volume/requests/create_volume.rb index 2b8cf3281..c639dde0e 100644 --- a/lib/fog/volume/openstack/requests/create_volume.rb +++ b/lib/fog/openstack/volume/requests/create_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real private diff --git a/lib/fog/volume/openstack/requests/create_volume_type.rb b/lib/fog/openstack/volume/requests/create_volume_type.rb similarity index 96% rename from lib/fog/volume/openstack/requests/create_volume_type.rb rename to lib/fog/openstack/volume/requests/create_volume_type.rb index 24ce2f868..b0eca9574 100644 --- a/lib/fog/volume/openstack/requests/create_volume_type.rb +++ b/lib/fog/openstack/volume/requests/create_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def create_volume_type(options = {}) data = { diff --git a/lib/fog/volume/openstack/requests/delete_backup.rb b/lib/fog/openstack/volume/requests/delete_backup.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_backup.rb rename to lib/fog/openstack/volume/requests/delete_backup.rb index 52d07a675..bf76b0ffa 100644 --- a/lib/fog/volume/openstack/requests/delete_backup.rb +++ b/lib/fog/openstack/volume/requests/delete_backup.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_backup(backup_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_metadata.rb b/lib/fog/openstack/volume/requests/delete_metadata.rb similarity index 88% rename from lib/fog/volume/openstack/requests/delete_metadata.rb rename to lib/fog/openstack/volume/requests/delete_metadata.rb index 972f116ec..e93ba9e92 100644 --- a/lib/fog/volume/openstack/requests/delete_metadata.rb +++ b/lib/fog/openstack/volume/requests/delete_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_metadata(volume_id, key_name) request( diff --git a/lib/fog/volume/openstack/requests/delete_snapshot.rb b/lib/fog/openstack/volume/requests/delete_snapshot.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_snapshot.rb rename to lib/fog/openstack/volume/requests/delete_snapshot.rb index f252f9327..e03d3fefb 100644 --- a/lib/fog/volume/openstack/requests/delete_snapshot.rb +++ b/lib/fog/openstack/volume/requests/delete_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_snapshot(snapshot_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb similarity index 89% rename from lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb rename to lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb index a4143134f..69bb6fda1 100644 --- a/lib/fog/volume/openstack/requests/delete_snapshot_metadata.rb +++ b/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_snapshot_metadata(snapshot_id, key_name) request( diff --git a/lib/fog/volume/openstack/requests/delete_transfer.rb b/lib/fog/openstack/volume/requests/delete_transfer.rb similarity index 88% rename from lib/fog/volume/openstack/requests/delete_transfer.rb rename to lib/fog/openstack/volume/requests/delete_transfer.rb index 6f49251a8..84ceedbbd 100644 --- a/lib/fog/volume/openstack/requests/delete_transfer.rb +++ b/lib/fog/openstack/volume/requests/delete_transfer.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_transfer(transfer_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_volume.rb b/lib/fog/openstack/volume/requests/delete_volume.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_volume.rb rename to lib/fog/openstack/volume/requests/delete_volume.rb index 7ebe8c137..fbc0748c3 100644 --- a/lib/fog/volume/openstack/requests/delete_volume.rb +++ b/lib/fog/openstack/volume/requests/delete_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_volume(volume_id) request( diff --git a/lib/fog/volume/openstack/requests/delete_volume_type.rb b/lib/fog/openstack/volume/requests/delete_volume_type.rb similarity index 92% rename from lib/fog/volume/openstack/requests/delete_volume_type.rb rename to lib/fog/openstack/volume/requests/delete_volume_type.rb index 57abf0fc7..2313d5559 100644 --- a/lib/fog/volume/openstack/requests/delete_volume_type.rb +++ b/lib/fog/openstack/volume/requests/delete_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def delete_volume_type(volume_type_id) request( diff --git a/lib/fog/volume/openstack/requests/extend_volume.rb b/lib/fog/openstack/volume/requests/extend_volume.rb similarity index 93% rename from lib/fog/volume/openstack/requests/extend_volume.rb rename to lib/fog/openstack/volume/requests/extend_volume.rb index 24c089aa7..421cc40dd 100644 --- a/lib/fog/volume/openstack/requests/extend_volume.rb +++ b/lib/fog/openstack/volume/requests/extend_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def extend_volume(volume_id, size) body = {'os-extend' => {'new_size' => size}} diff --git a/lib/fog/volume/openstack/requests/get_backup_details.rb b/lib/fog/openstack/volume/requests/get_backup_details.rb similarity index 95% rename from lib/fog/volume/openstack/requests/get_backup_details.rb rename to lib/fog/openstack/volume/requests/get_backup_details.rb index a001a09d7..1f5a346be 100644 --- a/lib/fog/volume/openstack/requests/get_backup_details.rb +++ b/lib/fog/openstack/volume/requests/get_backup_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_backup_details(backup_id) request( diff --git a/lib/fog/volume/openstack/requests/get_quota.rb b/lib/fog/openstack/volume/requests/get_quota.rb similarity index 93% rename from lib/fog/volume/openstack/requests/get_quota.rb rename to lib/fog/openstack/volume/requests/get_quota.rb index 6e2569b06..1e25662c8 100644 --- a/lib/fog/volume/openstack/requests/get_quota.rb +++ b/lib/fog/openstack/volume/requests/get_quota.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_quota(tenant_id) request( diff --git a/lib/fog/volume/openstack/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/requests/get_quota_defaults.rb similarity index 93% rename from lib/fog/volume/openstack/requests/get_quota_defaults.rb rename to lib/fog/openstack/volume/requests/get_quota_defaults.rb index ae2830e6c..101cfa266 100644 --- a/lib/fog/volume/openstack/requests/get_quota_defaults.rb +++ b/lib/fog/openstack/volume/requests/get_quota_defaults.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_quota_defaults(tenant_id) request( diff --git a/lib/fog/volume/openstack/requests/get_quota_usage.rb b/lib/fog/openstack/volume/requests/get_quota_usage.rb similarity index 96% rename from lib/fog/volume/openstack/requests/get_quota_usage.rb rename to lib/fog/openstack/volume/requests/get_quota_usage.rb index 42d8511a9..18431fe33 100644 --- a/lib/fog/volume/openstack/requests/get_quota_usage.rb +++ b/lib/fog/openstack/volume/requests/get_quota_usage.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_quota_usage(tenant_id) request( diff --git a/lib/fog/volume/openstack/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/requests/get_snapshot_details.rb similarity index 87% rename from lib/fog/volume/openstack/requests/get_snapshot_details.rb rename to lib/fog/openstack/volume/requests/get_snapshot_details.rb index 47f3fbb31..46a198a90 100644 --- a/lib/fog/volume/openstack/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/requests/get_snapshot_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_snapshot_details(snapshot_id) request( diff --git a/lib/fog/volume/openstack/requests/get_transfer_details.rb b/lib/fog/openstack/volume/requests/get_transfer_details.rb similarity index 89% rename from lib/fog/volume/openstack/requests/get_transfer_details.rb rename to lib/fog/openstack/volume/requests/get_transfer_details.rb index 35db96484..58ac36d37 100644 --- a/lib/fog/volume/openstack/requests/get_transfer_details.rb +++ b/lib/fog/openstack/volume/requests/get_transfer_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/volume/openstack/requests/get_volume_details.rb b/lib/fog/openstack/volume/requests/get_volume_details.rb similarity index 87% rename from lib/fog/volume/openstack/requests/get_volume_details.rb rename to lib/fog/openstack/volume/requests/get_volume_details.rb index facb196cc..7e9e85fdc 100644 --- a/lib/fog/volume/openstack/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/requests/get_volume_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_volume_details(volume_id) request( diff --git a/lib/fog/volume/openstack/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/requests/get_volume_type_details.rb similarity index 95% rename from lib/fog/volume/openstack/requests/get_volume_type_details.rb rename to lib/fog/openstack/volume/requests/get_volume_type_details.rb index 701796cf4..57cd39aa0 100644 --- a/lib/fog/volume/openstack/requests/get_volume_type_details.rb +++ b/lib/fog/openstack/volume/requests/get_volume_type_details.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def get_volume_type_details(volume_type_id) request( diff --git a/lib/fog/volume/openstack/requests/list_backups.rb b/lib/fog/openstack/volume/requests/list_backups.rb similarity index 88% rename from lib/fog/volume/openstack/requests/list_backups.rb rename to lib/fog/openstack/volume/requests/list_backups.rb index 229ce1125..74fcec90c 100644 --- a/lib/fog/volume/openstack/requests/list_backups.rb +++ b/lib/fog/openstack/volume/requests/list_backups.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_backups(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/requests/list_backups_detailed.rb similarity index 96% rename from lib/fog/volume/openstack/requests/list_backups_detailed.rb rename to lib/fog/openstack/volume/requests/list_backups_detailed.rb index 9c9f66e0f..b9f425523 100644 --- a/lib/fog/volume/openstack/requests/list_backups_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_backups_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_backups_detailed(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_snapshots.rb b/lib/fog/openstack/volume/requests/list_snapshots.rb similarity index 97% rename from lib/fog/volume/openstack/requests/list_snapshots.rb rename to lib/fog/openstack/volume/requests/list_snapshots.rb index d20eba97a..acc7242d5 100644 --- a/lib/fog/volume/openstack/requests/list_snapshots.rb +++ b/lib/fog/openstack/volume/requests/list_snapshots.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_snapshots(options = true, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/volume/openstack/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb similarity index 94% rename from lib/fog/volume/openstack/requests/list_snapshots_detailed.rb rename to lib/fog/openstack/volume/requests/list_snapshots_detailed.rb index ff04452ef..3879ecf97 100644 --- a/lib/fog/volume/openstack/requests/list_snapshots_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_snapshots_detailed(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_transfers.rb b/lib/fog/openstack/volume/requests/list_transfers.rb similarity index 90% rename from lib/fog/volume/openstack/requests/list_transfers.rb rename to lib/fog/openstack/volume/requests/list_transfers.rb index 45f37b83e..52868e450 100644 --- a/lib/fog/volume/openstack/requests/list_transfers.rb +++ b/lib/fog/openstack/volume/requests/list_transfers.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/volume/openstack/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/requests/list_transfers_detailed.rb similarity index 90% rename from lib/fog/volume/openstack/requests/list_transfers_detailed.rb rename to lib/fog/openstack/volume/requests/list_transfers_detailed.rb index afb1d9972..824e2c477 100644 --- a/lib/fog/volume/openstack/requests/list_transfers_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_transfers_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume # no Mock needed, test coverage in RSpec module Real diff --git a/lib/fog/volume/openstack/requests/list_volume_types.rb b/lib/fog/openstack/volume/requests/list_volume_types.rb similarity index 96% rename from lib/fog/volume/openstack/requests/list_volume_types.rb rename to lib/fog/openstack/volume/requests/list_volume_types.rb index e9ab78da8..ef76d8e1e 100644 --- a/lib/fog/volume/openstack/requests/list_volume_types.rb +++ b/lib/fog/openstack/volume/requests/list_volume_types.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_volume_types(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_volumes.rb b/lib/fog/openstack/volume/requests/list_volumes.rb similarity index 96% rename from lib/fog/volume/openstack/requests/list_volumes.rb rename to lib/fog/openstack/volume/requests/list_volumes.rb index 707465a3e..5f5e776d0 100644 --- a/lib/fog/volume/openstack/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/requests/list_volumes.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_volumes(options = true, options_deprecated = {}) if options.kind_of?(Hash) diff --git a/lib/fog/volume/openstack/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/requests/list_volumes_detailed.rb similarity index 88% rename from lib/fog/volume/openstack/requests/list_volumes_detailed.rb rename to lib/fog/openstack/volume/requests/list_volumes_detailed.rb index d70110349..a2dc53479 100644 --- a/lib/fog/volume/openstack/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_volumes_detailed.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_volumes_detailed(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/list_zones.rb b/lib/fog/openstack/volume/requests/list_zones.rb similarity index 94% rename from lib/fog/volume/openstack/requests/list_zones.rb rename to lib/fog/openstack/volume/requests/list_zones.rb index 67303472d..f2f606050 100644 --- a/lib/fog/volume/openstack/requests/list_zones.rb +++ b/lib/fog/openstack/volume/requests/list_zones.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def list_zones(options = {}) request( diff --git a/lib/fog/volume/openstack/requests/replace_metadata.rb b/lib/fog/openstack/volume/requests/replace_metadata.rb similarity index 91% rename from lib/fog/volume/openstack/requests/replace_metadata.rb rename to lib/fog/openstack/volume/requests/replace_metadata.rb index a46b43eea..c03c45cc5 100644 --- a/lib/fog/volume/openstack/requests/replace_metadata.rb +++ b/lib/fog/openstack/volume/requests/replace_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def replace_metadata(volume_id, metadata = {}) data = { diff --git a/lib/fog/volume/openstack/requests/restore_backup.rb b/lib/fog/openstack/volume/requests/restore_backup.rb similarity index 91% rename from lib/fog/volume/openstack/requests/restore_backup.rb rename to lib/fog/openstack/volume/requests/restore_backup.rb index d71bd6287..2b5298cc0 100644 --- a/lib/fog/volume/openstack/requests/restore_backup.rb +++ b/lib/fog/openstack/volume/requests/restore_backup.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def restore_backup(backup_id, volume_id = nil, name = nil) data = {'restore' => {'volume_id' => volume_id, 'name' => name}} diff --git a/lib/fog/volume/openstack/requests/set_tenant.rb b/lib/fog/openstack/volume/requests/set_tenant.rb similarity index 89% rename from lib/fog/volume/openstack/requests/set_tenant.rb rename to lib/fog/openstack/volume/requests/set_tenant.rb index 6a04e8c45..9853a01a2 100644 --- a/lib/fog/volume/openstack/requests/set_tenant.rb +++ b/lib/fog/openstack/volume/requests/set_tenant.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def set_tenant(tenant) @openstack_must_reauthenticate = true diff --git a/lib/fog/volume/openstack/requests/snapshot_action.rb b/lib/fog/openstack/volume/requests/snapshot_action.rb similarity index 89% rename from lib/fog/volume/openstack/requests/snapshot_action.rb rename to lib/fog/openstack/volume/requests/snapshot_action.rb index b977cea89..6065298ba 100644 --- a/lib/fog/volume/openstack/requests/snapshot_action.rb +++ b/lib/fog/openstack/volume/requests/snapshot_action.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def snapshot_action(id, data) request( diff --git a/lib/fog/volume/openstack/requests/update_metadata.rb b/lib/fog/openstack/volume/requests/update_metadata.rb similarity index 91% rename from lib/fog/volume/openstack/requests/update_metadata.rb rename to lib/fog/openstack/volume/requests/update_metadata.rb index 4b6d7c3a8..18b480049 100644 --- a/lib/fog/volume/openstack/requests/update_metadata.rb +++ b/lib/fog/openstack/volume/requests/update_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_metadata(volume_id, metadata = {}) data = { diff --git a/lib/fog/volume/openstack/requests/update_quota.rb b/lib/fog/openstack/volume/requests/update_quota.rb similarity index 94% rename from lib/fog/volume/openstack/requests/update_quota.rb rename to lib/fog/openstack/volume/requests/update_quota.rb index 01aa91918..3fc2b86e3 100644 --- a/lib/fog/volume/openstack/requests/update_quota.rb +++ b/lib/fog/openstack/volume/requests/update_quota.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_quota(tenant_id, options = {}) request( diff --git a/lib/fog/volume/openstack/requests/update_snapshot.rb b/lib/fog/openstack/volume/requests/update_snapshot.rb similarity index 97% rename from lib/fog/volume/openstack/requests/update_snapshot.rb rename to lib/fog/openstack/volume/requests/update_snapshot.rb index 5ed42ef3f..3c7703550 100644 --- a/lib/fog/volume/openstack/requests/update_snapshot.rb +++ b/lib/fog/openstack/volume/requests/update_snapshot.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_snapshot(snapshot_id, data = {}) request( diff --git a/lib/fog/volume/openstack/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb similarity index 91% rename from lib/fog/volume/openstack/requests/update_snapshot_metadata.rb rename to lib/fog/openstack/volume/requests/update_snapshot_metadata.rb index 46497b145..0ba7015f6 100644 --- a/lib/fog/volume/openstack/requests/update_snapshot_metadata.rb +++ b/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_snapshot_metadata(snapshot_id, metadata = {}) data = { diff --git a/lib/fog/volume/openstack/requests/update_volume.rb b/lib/fog/openstack/volume/requests/update_volume.rb similarity index 94% rename from lib/fog/volume/openstack/requests/update_volume.rb rename to lib/fog/openstack/volume/requests/update_volume.rb index 8ef96681c..224aaa30c 100644 --- a/lib/fog/volume/openstack/requests/update_volume.rb +++ b/lib/fog/openstack/volume/requests/update_volume.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_volume(volume_id, data = {}) request( diff --git a/lib/fog/volume/openstack/requests/update_volume_type.rb b/lib/fog/openstack/volume/requests/update_volume_type.rb similarity index 96% rename from lib/fog/volume/openstack/requests/update_volume_type.rb rename to lib/fog/openstack/volume/requests/update_volume_type.rb index 0420f1bde..5ba12c889 100644 --- a/lib/fog/volume/openstack/requests/update_volume_type.rb +++ b/lib/fog/openstack/volume/requests/update_volume_type.rb @@ -1,6 +1,6 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume module Real def update_volume_type(volume_type_id, options = {}) data = { diff --git a/lib/fog/volume/openstack/v1.rb b/lib/fog/openstack/volume/v1.rb similarity index 94% rename from lib/fog/volume/openstack/v1.rb rename to lib/fog/openstack/volume/v1.rb index 03ed14513..d3ed15e7a 100644 --- a/lib/fog/volume/openstack/v1.rb +++ b/lib/fog/openstack/volume/v1.rb @@ -1,17 +1,17 @@ require 'fog/openstack/core' -require 'fog/volume/openstack' +require 'fog/openstack/volume/volume' module Fog - module Volume - class OpenStack - class V1 < Fog::Volume::OpenStack + module OpenStack + class Volume + class V1 < Fog::OpenStack::Volume SUPPORTED_VERSIONS = /v1(\.(0-9))*/ requires :openstack_auth_url recognizes *@@recognizes - model_path 'fog/volume/openstack/v1/models' + model_path 'fog/openstack/volume/v1/models' model :volume collection :volumes @@ -31,7 +31,7 @@ class V1 < Fog::Volume::OpenStack model :backup collection :backups - request_path 'fog/volume/openstack/v1/requests' + request_path 'fog/openstack/volume/v1/requests' # Volume request :list_volumes @@ -149,7 +149,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Volume::OpenStack::NotFound + Fog::OpenStack::Volume::NotFound end def default_endtpoint_type diff --git a/lib/fog/openstack/volume/v1/models/availability_zone.rb b/lib/fog/openstack/volume/v1/models/availability_zone.rb new file mode 100644 index 000000000..e46cbd50f --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/availability_zone.rb @@ -0,0 +1,15 @@ +require 'fog/openstack/volume/models/availability_zone' + +module Fog + module OpenStack + class Volume + class V1 + class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone + identity :zoneName + + attribute :zoneState + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/availability_zones.rb b/lib/fog/openstack/volume/v1/models/availability_zones.rb new file mode 100644 index 000000000..c8411fcb2 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/availability_zones.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/availability_zone' +require 'fog/openstack/volume/models/availability_zones' + +module Fog + module OpenStack + class Volume + class V1 + class AvailabilityZones < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::AvailabilityZone + include Fog::OpenStack::Volume::AvailabilityZones + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/backup.rb b/lib/fog/openstack/volume/v1/models/backup.rb similarity index 53% rename from lib/fog/volume/openstack/v1/models/backup.rb rename to lib/fog/openstack/volume/v1/models/backup.rb index ff5a88382..48e79cfe4 100644 --- a/lib/fog/volume/openstack/v1/models/backup.rb +++ b/lib/fog/openstack/volume/v1/models/backup.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/backup' +require 'fog/openstack/volume/models/backup' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Backup < Fog::Volume::OpenStack::Backup + class Backup < Fog::OpenStack::Volume::Backup identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/openstack/volume/v1/models/backups.rb b/lib/fog/openstack/volume/v1/models/backups.rb new file mode 100644 index 000000000..f986fe81c --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/backups.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/backup' +require 'fog/openstack/volume/models/backups' + +module Fog + module OpenStack + class Volume + class V1 + class Backups < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Backup + include Fog::OpenStack::Volume::Backups + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/snapshot.rb b/lib/fog/openstack/volume/v1/models/snapshot.rb similarity index 89% rename from lib/fog/volume/openstack/v1/models/snapshot.rb rename to lib/fog/openstack/volume/v1/models/snapshot.rb index 02f64f1de..9dc1451fe 100644 --- a/lib/fog/volume/openstack/v1/models/snapshot.rb +++ b/lib/fog/openstack/volume/v1/models/snapshot.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/snapshot' +require 'fog/openstack/volume/models/snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Snapshot < Fog::Volume::OpenStack::Snapshot + class Snapshot < Fog::OpenStack::Volume::Snapshot identity :id attribute :display_name diff --git a/lib/fog/openstack/volume/v1/models/snapshots.rb b/lib/fog/openstack/volume/v1/models/snapshots.rb new file mode 100644 index 000000000..43a7694d4 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/snapshots.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/snapshot' +require 'fog/openstack/volume/models/snapshots' + +module Fog + module OpenStack + class Volume + class V1 + class Snapshots < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Snapshot + include Fog::OpenStack::Volume::Snapshots + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/transfer.rb b/lib/fog/openstack/volume/v1/models/transfer.rb similarity index 66% rename from lib/fog/volume/openstack/v1/models/transfer.rb rename to lib/fog/openstack/volume/v1/models/transfer.rb index e9b68a6eb..9ef55cd98 100644 --- a/lib/fog/volume/openstack/v1/models/transfer.rb +++ b/lib/fog/openstack/volume/v1/models/transfer.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/transfer' +require 'fog/openstack/volume/models/transfer' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Transfer < Fog::Volume::OpenStack::Transfer + class Transfer < Fog::OpenStack::Volume::Transfer identity :id attribute :auth_key, :aliases => 'authKey' diff --git a/lib/fog/openstack/volume/v1/models/transfers.rb b/lib/fog/openstack/volume/v1/models/transfers.rb new file mode 100644 index 000000000..8dfede857 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/transfers.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/transfer' +require 'fog/openstack/volume/models/transfers' + +module Fog + module OpenStack + class Volume + class V1 + class Transfers < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Transfer + include Fog::OpenStack::Volume::Transfers + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v1/models/volume.rb b/lib/fog/openstack/volume/v1/models/volume.rb similarity index 87% rename from lib/fog/volume/openstack/v1/models/volume.rb rename to lib/fog/openstack/volume/v1/models/volume.rb index 753f49d9d..89aaa76e7 100644 --- a/lib/fog/volume/openstack/v1/models/volume.rb +++ b/lib/fog/openstack/volume/v1/models/volume.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume' +require 'fog/openstack/volume/models/volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class Volume < Fog::Volume::OpenStack::Volume + class Volume < Fog::OpenStack::Volume::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/volume/openstack/v1/models/volume_type.rb b/lib/fog/openstack/volume/v1/models/volume_type.rb similarity index 51% rename from lib/fog/volume/openstack/v1/models/volume_type.rb rename to lib/fog/openstack/volume/v1/models/volume_type.rb index eb8c57c1a..f30127c52 100644 --- a/lib/fog/volume/openstack/v1/models/volume_type.rb +++ b/lib/fog/openstack/volume/v1/models/volume_type.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume_type' +require 'fog/openstack/volume/models/volume_type' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 - class VolumeType < Fog::Volume::OpenStack::VolumeType + class VolumeType < Fog::OpenStack::Volume::VolumeType identity :id attribute :name diff --git a/lib/fog/openstack/volume/v1/models/volume_types.rb b/lib/fog/openstack/volume/v1/models/volume_types.rb new file mode 100644 index 000000000..2e336a1e6 --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/volume_types.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/volume_type' +require 'fog/openstack/volume/models/volume_types' + +module Fog + module OpenStack + class Volume + class V1 + class VolumeTypes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::VolumeType + include Fog::OpenStack::Volume::VolumeTypes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/models/volumes.rb b/lib/fog/openstack/volume/v1/models/volumes.rb new file mode 100644 index 000000000..3c66ccdad --- /dev/null +++ b/lib/fog/openstack/volume/v1/models/volumes.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v1/models/volume' +require 'fog/openstack/volume/models/volumes' + +module Fog + module OpenStack + class Volume + class V1 + class Volumes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V1::Volume + include Fog::OpenStack::Volume::Volumes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/requests/accept_transfer.rb b/lib/fog/openstack/volume/v1/requests/accept_transfer.rb new file mode 100644 index 000000000..0bdc678ff --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/accept_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/accept_transfer' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/action.rb b/lib/fog/openstack/volume/v1/requests/action.rb new file mode 100644 index 000000000..e49b96818 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/action.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/action' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/create_backup.rb b/lib/fog/openstack/volume/v1/requests/create_backup.rb new file mode 100644 index 000000000..1135e30ea --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/create_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_backup' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_snapshot.rb b/lib/fog/openstack/volume/v1/requests/create_snapshot.rb similarity index 89% rename from lib/fog/volume/openstack/v1/requests/create_snapshot.rb rename to lib/fog/openstack/volume/v1/requests/create_snapshot.rb index 35cdc9e4e..7cfcfad93 100644 --- a/lib/fog/volume/openstack/v1/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/v1/requests/create_snapshot.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/create_snapshot' +require 'fog/openstack/volume/requests/create_snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real def create_snapshot(volume_id, name, description, force = false) data = { diff --git a/lib/fog/openstack/volume/v1/requests/create_transfer.rb b/lib/fog/openstack/volume/v1/requests/create_transfer.rb new file mode 100644 index 000000000..90f2ebe26 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/create_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_transfer' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_volume.rb b/lib/fog/openstack/volume/v1/requests/create_volume.rb similarity index 91% rename from lib/fog/volume/openstack/v1/requests/create_volume.rb rename to lib/fog/openstack/volume/v1/requests/create_volume.rb index 5c3587379..86c0d2ce1 100644 --- a/lib/fog/volume/openstack/v1/requests/create_volume.rb +++ b/lib/fog/openstack/volume/v1/requests/create_volume.rb @@ -1,8 +1,8 @@ -require 'fog/volume/openstack/requests/create_volume' +require 'fog/openstack/volume/requests/create_volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real def create_volume(name, description, size, options = {}) @@ -17,7 +17,7 @@ def create_volume(name, description, size, options = {}) _create_volume(data, options) end - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/create_volume_type.rb b/lib/fog/openstack/volume/v1/requests/create_volume_type.rb new file mode 100644 index 000000000..b0be257c7 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/create_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_volume_type' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_backup.rb b/lib/fog/openstack/volume/v1/requests/delete_backup.rb new file mode 100644 index 000000000..a801dceaa --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_backup' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_metadata.rb b/lib/fog/openstack/volume/v1/requests/delete_metadata.rb new file mode 100644 index 000000000..924d1c2ed --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb b/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb new file mode 100644 index 000000000..4ed627842 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb new file mode 100644 index 000000000..c2f24ba75 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_transfer.rb b/lib/fog/openstack/volume/v1/requests/delete_transfer.rb new file mode 100644 index 000000000..2394932c4 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_transfer' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/delete_volume.rb b/lib/fog/openstack/volume/v1/requests/delete_volume.rb new file mode 100644 index 000000000..f5dbbe801 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb b/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb new file mode 100644 index 000000000..e14b2e3d7 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/delete_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume_type' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/extend_volume.rb b/lib/fog/openstack/volume/v1/requests/extend_volume.rb new file mode 100644 index 000000000..1b2bc73ae --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/extend_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/extend_volume' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_backup_details.rb b/lib/fog/openstack/volume/v1/requests/get_backup_details.rb new file mode 100644 index 000000000..d92ca3a94 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_backup_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_backup_details' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota.rb b/lib/fog/openstack/volume/v1/requests/get_quota.rb new file mode 100644 index 000000000..b909d6de5 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb new file mode 100644 index 000000000..406b1542b --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_quota_defaults.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_defaults' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb b/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb new file mode 100644 index 000000000..cde513e68 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_quota_usage.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_usage' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb similarity index 83% rename from lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb rename to lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb index 6980212e7..6429db1cc 100644 --- a/lib/fog/volume/openstack/v1/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_snapshot_details' +require 'fog/openstack/volume/requests/get_snapshot_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb b/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb new file mode 100644 index 000000000..75b32b293 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_transfer_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_transfer_details' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_volume_details.rb b/lib/fog/openstack/volume/v1/requests/get_volume_details.rb similarity index 86% rename from lib/fog/volume/openstack/v1/requests/get_volume_details.rb rename to lib/fog/openstack/volume/v1/requests/get_volume_details.rb index 78729f963..cf43edf2c 100644 --- a/lib/fog/volume/openstack/v1/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/v1/requests/get_volume_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_volume_details' +require 'fog/openstack/volume/requests/get_volume_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb new file mode 100644 index 000000000..e3c124195 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/get_volume_type_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_volume_type_details' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_backups.rb b/lib/fog/openstack/volume/v1/requests/list_backups.rb new file mode 100644 index 000000000..8db51bc44 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_backups.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb new file mode 100644 index 000000000..c8418b0ee --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_backups_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups_detailed' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_snapshots.rb b/lib/fog/openstack/volume/v1/requests/list_snapshots.rb new file mode 100644 index 000000000..8fcfee35c --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_snapshots.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb new file mode 100644 index 000000000..df242787d --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_snapshots_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots_detailed' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/list_transfers.rb b/lib/fog/openstack/volume/v1/requests/list_transfers.rb new file mode 100644 index 000000000..2535a2589 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_transfers.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb new file mode 100644 index 000000000..fd94ac7a3 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_transfers_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers_detailed' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/list_volume_types.rb b/lib/fog/openstack/volume/v1/requests/list_volume_types.rb new file mode 100644 index 000000000..ea52d0e1a --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_volume_types.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_volume_types' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_volumes.rb b/lib/fog/openstack/volume/v1/requests/list_volumes.rb similarity index 91% rename from lib/fog/volume/openstack/v1/requests/list_volumes.rb rename to lib/fog/openstack/volume/v1/requests/list_volumes.rb index 26103e539..805cdd57d 100644 --- a/lib/fog/volume/openstack/v1/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/v1/requests/list_volumes.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes' +require 'fog/openstack/volume/requests/list_volumes' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb similarity index 90% rename from lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb rename to lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb index d762e7c06..12c461552 100644 --- a/lib/fog/volume/openstack/v1/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes_detailed' +require 'fog/openstack/volume/requests/list_volumes_detailed' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v1/requests/list_zones.rb b/lib/fog/openstack/volume/v1/requests/list_zones.rb new file mode 100644 index 000000000..ec96a724e --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/list_zones.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_zones' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/real.rb b/lib/fog/openstack/volume/v1/requests/real.rb similarity index 50% rename from lib/fog/volume/openstack/v1/requests/real.rb rename to lib/fog/openstack/volume/v1/requests/real.rb index 2a37b535a..c021f0318 100644 --- a/lib/fog/volume/openstack/v1/requests/real.rb +++ b/lib/fog/openstack/volume/v1/requests/real.rb @@ -1,9 +1,9 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V1 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end end end diff --git a/lib/fog/openstack/volume/v1/requests/real_mock.rb b/lib/fog/openstack/volume/v1/requests/real_mock.rb new file mode 100644 index 000000000..8856c5ab5 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/real_mock.rb @@ -0,0 +1,14 @@ +module Fog + module OpenStack + class Volume + class V1 + class Real + include Fog::OpenStack::Volume::Real + end + class Mock + include Fog::OpenStack::Volume::Mock + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/requests/replace_metadata.rb b/lib/fog/openstack/volume/v1/requests/replace_metadata.rb new file mode 100644 index 000000000..f27a16398 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/replace_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/replace_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/restore_backup.rb b/lib/fog/openstack/volume/v1/requests/restore_backup.rb new file mode 100644 index 000000000..f186448f9 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/restore_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/restore_backup' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/set_tenant.rb b/lib/fog/openstack/volume/v1/requests/set_tenant.rb new file mode 100644 index 000000000..19dac303b --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/set_tenant.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/set_tenant' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/update_metadata.rb b/lib/fog/openstack/volume/v1/requests/update_metadata.rb new file mode 100644 index 000000000..c5454974d --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_quota.rb b/lib/fog/openstack/volume/v1/requests/update_quota.rb new file mode 100644 index 000000000..671b65e6a --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_quota' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v1/requests/update_snapshot.rb b/lib/fog/openstack/volume/v1/requests/update_snapshot.rb new file mode 100644 index 000000000..8a9a231e7 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb new file mode 100644 index 000000000..f98829982 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot_metadata' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/openstack/volume/v1/requests/update_volume.rb b/lib/fog/openstack/volume/v1/requests/update_volume.rb new file mode 100644 index 000000000..e57109738 --- /dev/null +++ b/lib/fog/openstack/volume/v1/requests/update_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_volume' +require 'fog/openstack/volume/v1/requests/real' diff --git a/lib/fog/volume/openstack/v2.rb b/lib/fog/openstack/volume/v2.rb similarity index 94% rename from lib/fog/volume/openstack/v2.rb rename to lib/fog/openstack/volume/v2.rb index 64a1de788..8aeed1483 100644 --- a/lib/fog/volume/openstack/v2.rb +++ b/lib/fog/openstack/volume/v2.rb @@ -1,17 +1,17 @@ require 'fog/openstack/core' -require 'fog/volume/openstack' +require 'fog/openstack/volume/volume' module Fog - module Volume - class OpenStack - class V2 < Fog::Volume::OpenStack + module OpenStack + class Volume + class V2 < Fog::OpenStack::Volume SUPPORTED_VERSIONS = /v2(\.(0-9))*/ requires :openstack_auth_url recognizes *@@recognizes - model_path 'fog/volume/openstack/v2/models' + model_path 'fog/openstack/volume/v2/models' model :volume collection :volumes @@ -31,7 +31,7 @@ class V2 < Fog::Volume::OpenStack model :backup collection :backups - request_path 'fog/volume/openstack/v2/requests' + request_path 'fog/openstack/volume/v2/requests' # Volume request :list_volumes @@ -151,7 +151,7 @@ class Real include Fog::OpenStack::Core def self.not_found_class - Fog::Volume::OpenStack::NotFound + Fog::OpenStack::Volume::NotFound end def default_endtpoint_type diff --git a/lib/fog/openstack/volume/v2/models/availability_zone.rb b/lib/fog/openstack/volume/v2/models/availability_zone.rb new file mode 100644 index 000000000..c0e4c528d --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/availability_zone.rb @@ -0,0 +1,15 @@ +require 'fog/openstack/volume/models/availability_zone' + +module Fog + module OpenStack + class Volume + class V2 + class AvailabilityZone < Fog::OpenStack::Volume::AvailabilityZone + identity :zoneName + + attribute :zoneState + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/availability_zones.rb b/lib/fog/openstack/volume/v2/models/availability_zones.rb new file mode 100644 index 000000000..1c028c819 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/availability_zones.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/availability_zone' +require 'fog/openstack/volume/models/availability_zones' + +module Fog + module OpenStack + class Volume + class V2 + class AvailabilityZones < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::AvailabilityZone + include Fog::OpenStack::Volume::AvailabilityZones + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/backup.rb b/lib/fog/openstack/volume/v2/models/backup.rb similarity index 53% rename from lib/fog/volume/openstack/v2/models/backup.rb rename to lib/fog/openstack/volume/v2/models/backup.rb index a3f1fe943..5d9941cb3 100644 --- a/lib/fog/volume/openstack/v2/models/backup.rb +++ b/lib/fog/openstack/volume/v2/models/backup.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/backup' +require 'fog/openstack/volume/models/backup' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Backup < Fog::Volume::OpenStack::Backup + class Backup < Fog::OpenStack::Volume::Backup identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/openstack/volume/v2/models/backups.rb b/lib/fog/openstack/volume/v2/models/backups.rb new file mode 100644 index 000000000..75f53a770 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/backups.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/backup' +require 'fog/openstack/volume/models/backups' + +module Fog + module OpenStack + class Volume + class V2 + class Backups < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Backup + include Fog::OpenStack::Volume::Backups + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/snapshot.rb b/lib/fog/openstack/volume/v2/models/snapshot.rb similarity index 88% rename from lib/fog/volume/openstack/v2/models/snapshot.rb rename to lib/fog/openstack/volume/v2/models/snapshot.rb index 9ed9ff277..4a2a5bcd1 100644 --- a/lib/fog/volume/openstack/v2/models/snapshot.rb +++ b/lib/fog/openstack/volume/v2/models/snapshot.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/snapshot' +require 'fog/openstack/volume/models/snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Snapshot < Fog::Volume::OpenStack::Snapshot + class Snapshot < Fog::OpenStack::Volume::Snapshot identity :id attribute :name diff --git a/lib/fog/openstack/volume/v2/models/snapshots.rb b/lib/fog/openstack/volume/v2/models/snapshots.rb new file mode 100644 index 000000000..653c0bc98 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/snapshots.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/snapshot' +require 'fog/openstack/volume/models/snapshots' + +module Fog + module OpenStack + class Volume + class V2 + class Snapshots < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Snapshot + include Fog::OpenStack::Volume::Snapshots + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/transfer.rb b/lib/fog/openstack/volume/v2/models/transfer.rb similarity index 66% rename from lib/fog/volume/openstack/v2/models/transfer.rb rename to lib/fog/openstack/volume/v2/models/transfer.rb index ba2e5e51f..2739831f5 100644 --- a/lib/fog/volume/openstack/v2/models/transfer.rb +++ b/lib/fog/openstack/volume/v2/models/transfer.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/transfer' +require 'fog/openstack/volume/models/transfer' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Transfer < Fog::Volume::OpenStack::Transfer + class Transfer < Fog::OpenStack::Volume::Transfer identity :id attribute :auth_key, :aliases => 'authKey' diff --git a/lib/fog/openstack/volume/v2/models/transfers.rb b/lib/fog/openstack/volume/v2/models/transfers.rb new file mode 100644 index 000000000..cbee48f5e --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/transfers.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/transfer' +require 'fog/openstack/volume/models/transfers' + +module Fog + module OpenStack + class Volume + class V2 + class Transfers < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Transfer + include Fog::OpenStack::Volume::Transfers + end + end + end + end +end diff --git a/lib/fog/volume/openstack/v2/models/volume.rb b/lib/fog/openstack/volume/v2/models/volume.rb similarity index 86% rename from lib/fog/volume/openstack/v2/models/volume.rb rename to lib/fog/openstack/volume/v2/models/volume.rb index edc1464b9..d20c022dc 100644 --- a/lib/fog/volume/openstack/v2/models/volume.rb +++ b/lib/fog/openstack/volume/v2/models/volume.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume' +require 'fog/openstack/volume/models/volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class Volume < Fog::Volume::OpenStack::Volume + class Volume < Fog::OpenStack::Volume::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } diff --git a/lib/fog/volume/openstack/v2/models/volume_type.rb b/lib/fog/openstack/volume/v2/models/volume_type.rb similarity index 51% rename from lib/fog/volume/openstack/v2/models/volume_type.rb rename to lib/fog/openstack/volume/v2/models/volume_type.rb index 9df096a7c..13924bd76 100644 --- a/lib/fog/volume/openstack/v2/models/volume_type.rb +++ b/lib/fog/openstack/volume/v2/models/volume_type.rb @@ -1,10 +1,10 @@ -require 'fog/volume/openstack/models/volume_type' +require 'fog/openstack/volume/models/volume_type' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 - class VolumeType < Fog::Volume::OpenStack::VolumeType + class VolumeType < Fog::OpenStack::Volume::VolumeType identity :id attribute :name diff --git a/lib/fog/openstack/volume/v2/models/volume_types.rb b/lib/fog/openstack/volume/v2/models/volume_types.rb new file mode 100644 index 000000000..33e118c1b --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/volume_types.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/volume_type' +require 'fog/openstack/volume/models/volume_types' + +module Fog + module OpenStack + class Volume + class V2 + class VolumeTypes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::VolumeType + include Fog::OpenStack::Volume::VolumeTypes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/models/volumes.rb b/lib/fog/openstack/volume/v2/models/volumes.rb new file mode 100644 index 000000000..d0a2dfe95 --- /dev/null +++ b/lib/fog/openstack/volume/v2/models/volumes.rb @@ -0,0 +1,16 @@ +require 'fog/openstack/models/collection' +require 'fog/openstack/volume/v2/models/volume' +require 'fog/openstack/volume/models/volumes' + +module Fog + module OpenStack + class Volume + class V2 + class Volumes < Fog::OpenStack::Collection + model Fog::OpenStack::Volume::V2::Volume + include Fog::OpenStack::Volume::Volumes + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/requests/accept_transfer.rb b/lib/fog/openstack/volume/v2/requests/accept_transfer.rb new file mode 100644 index 000000000..b0c99657c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/accept_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/accept_transfer' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/action.rb b/lib/fog/openstack/volume/v2/requests/action.rb new file mode 100644 index 000000000..ccc36a89e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/action.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/action' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/create_backup.rb b/lib/fog/openstack/volume/v2/requests/create_backup.rb new file mode 100644 index 000000000..e2099585b --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/create_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_backup' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_snapshot.rb b/lib/fog/openstack/volume/v2/requests/create_snapshot.rb similarity index 88% rename from lib/fog/volume/openstack/v2/requests/create_snapshot.rb rename to lib/fog/openstack/volume/v2/requests/create_snapshot.rb index 520990376..95fbd0efc 100644 --- a/lib/fog/volume/openstack/v2/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/v2/requests/create_snapshot.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/create_snapshot' +require 'fog/openstack/volume/requests/create_snapshot' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real def create_snapshot(volume_id, name, description, force = false) data = { diff --git a/lib/fog/openstack/volume/v2/requests/create_transfer.rb b/lib/fog/openstack/volume/v2/requests/create_transfer.rb new file mode 100644 index 000000000..250ab3f55 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/create_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_transfer' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_volume.rb b/lib/fog/openstack/volume/v2/requests/create_volume.rb similarity index 90% rename from lib/fog/volume/openstack/v2/requests/create_volume.rb rename to lib/fog/openstack/volume/v2/requests/create_volume.rb index 0c0659558..ca5361214 100644 --- a/lib/fog/volume/openstack/v2/requests/create_volume.rb +++ b/lib/fog/openstack/volume/v2/requests/create_volume.rb @@ -1,8 +1,8 @@ -require 'fog/volume/openstack/requests/create_volume' +require 'fog/openstack/volume/requests/create_volume' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real def create_volume(name, description, size, options = {}) @@ -17,7 +17,7 @@ def create_volume(name, description, size, options = {}) _create_volume(data, options) end - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/create_volume_type.rb b/lib/fog/openstack/volume/v2/requests/create_volume_type.rb new file mode 100644 index 000000000..e5c10b5c8 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/create_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/create_volume_type' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_backup.rb b/lib/fog/openstack/volume/v2/requests/delete_backup.rb new file mode 100644 index 000000000..bb6ea632c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_backup' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_metadata.rb b/lib/fog/openstack/volume/v2/requests/delete_metadata.rb new file mode 100644 index 000000000..6174c85dc --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb b/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb new file mode 100644 index 000000000..7e55826a9 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb new file mode 100644 index 000000000..a674e33a7 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_snapshot_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_transfer.rb b/lib/fog/openstack/volume/v2/requests/delete_transfer.rb new file mode 100644 index 000000000..a743af6bb --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_transfer.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_transfer' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/delete_volume.rb b/lib/fog/openstack/volume/v2/requests/delete_volume.rb new file mode 100644 index 000000000..ace5f64f7 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb b/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb new file mode 100644 index 000000000..4a923106d --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/delete_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/delete_volume_type' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/extend_volume.rb b/lib/fog/openstack/volume/v2/requests/extend_volume.rb new file mode 100644 index 000000000..e5b0cec1e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/extend_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/extend_volume' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_backup_details.rb b/lib/fog/openstack/volume/v2/requests/get_backup_details.rb new file mode 100644 index 000000000..b7b580b0b --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_backup_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_backup_details' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota.rb b/lib/fog/openstack/volume/v2/requests/get_quota.rb new file mode 100644 index 000000000..c5bd543de --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb new file mode 100644 index 000000000..fdda9129f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_quota_defaults.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_defaults' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb b/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb new file mode 100644 index 000000000..9487a898e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_quota_usage.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_quota_usage' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb similarity index 82% rename from lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb rename to lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb index c7c25303a..8594d9ddb 100644 --- a/lib/fog/volume/openstack/v2/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_snapshot_details' +require 'fog/openstack/volume/requests/get_snapshot_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb b/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb new file mode 100644 index 000000000..b4db93b7f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_transfer_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_transfer_details' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_volume_details.rb b/lib/fog/openstack/volume/v2/requests/get_volume_details.rb similarity index 86% rename from lib/fog/volume/openstack/v2/requests/get_volume_details.rb rename to lib/fog/openstack/volume/v2/requests/get_volume_details.rb index f8ca41d7b..b87a61760 100644 --- a/lib/fog/volume/openstack/v2/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/v2/requests/get_volume_details.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/get_volume_details' +require 'fog/openstack/volume/requests/get_volume_details' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb new file mode 100644 index 000000000..500ff567e --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/get_volume_type_details.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/get_volume_type_details' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_backups.rb b/lib/fog/openstack/volume/v2/requests/list_backups.rb new file mode 100644 index 000000000..9db231553 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_backups.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb new file mode 100644 index 000000000..0350a0033 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_backups_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_backups_detailed' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_snapshots.rb b/lib/fog/openstack/volume/v2/requests/list_snapshots.rb new file mode 100644 index 000000000..9fe012b85 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_snapshots.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb new file mode 100644 index 000000000..5fcbf469a --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_snapshots_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_snapshots_detailed' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/list_transfers.rb b/lib/fog/openstack/volume/v2/requests/list_transfers.rb new file mode 100644 index 000000000..26681aa7a --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_transfers.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb new file mode 100644 index 000000000..31157701c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_transfers_detailed.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_transfers_detailed' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/list_volume_types.rb b/lib/fog/openstack/volume/v2/requests/list_volume_types.rb new file mode 100644 index 000000000..f67411696 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_volume_types.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_volume_types' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_volumes.rb b/lib/fog/openstack/volume/v2/requests/list_volumes.rb similarity index 91% rename from lib/fog/volume/openstack/v2/requests/list_volumes.rb rename to lib/fog/openstack/volume/v2/requests/list_volumes.rb index 4cbb9b28b..c3e1b9363 100644 --- a/lib/fog/volume/openstack/v2/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/v2/requests/list_volumes.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes' +require 'fog/openstack/volume/requests/list_volumes' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb similarity index 90% rename from lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb rename to lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb index a4c1b76b6..55565c2b7 100644 --- a/lib/fog/volume/openstack/v2/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb @@ -1,11 +1,11 @@ -require 'fog/volume/openstack/requests/list_volumes_detailed' +require 'fog/openstack/volume/requests/list_volumes_detailed' module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end class Mock diff --git a/lib/fog/openstack/volume/v2/requests/list_zones.rb b/lib/fog/openstack/volume/v2/requests/list_zones.rb new file mode 100644 index 000000000..e07fafc5f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/list_zones.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/list_zones' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/real.rb b/lib/fog/openstack/volume/v2/requests/real.rb similarity index 50% rename from lib/fog/volume/openstack/v2/requests/real.rb rename to lib/fog/openstack/volume/v2/requests/real.rb index 174b38887..016ac048b 100644 --- a/lib/fog/volume/openstack/v2/requests/real.rb +++ b/lib/fog/openstack/volume/v2/requests/real.rb @@ -1,9 +1,9 @@ module Fog - module Volume - class OpenStack + module OpenStack + class Volume class V2 class Real - include Fog::Volume::OpenStack::Real + include Fog::OpenStack::Volume::Real end end end diff --git a/lib/fog/openstack/volume/v2/requests/real_mock.rb b/lib/fog/openstack/volume/v2/requests/real_mock.rb new file mode 100644 index 000000000..cc2fca322 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/real_mock.rb @@ -0,0 +1,14 @@ +module Fog + module OpenStack + class Volume + class V2 + class Real + include Fog::OpenStack::Volume::Real + end + class Mock + include Fog::OpenStack::Volume::Mock + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/requests/replace_metadata.rb b/lib/fog/openstack/volume/v2/requests/replace_metadata.rb new file mode 100644 index 000000000..ea96993a5 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/replace_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/replace_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/restore_backup.rb b/lib/fog/openstack/volume/v2/requests/restore_backup.rb new file mode 100644 index 000000000..6e5d56df8 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/restore_backup.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/restore_backup' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/set_tenant.rb b/lib/fog/openstack/volume/v2/requests/set_tenant.rb new file mode 100644 index 000000000..9c7ce462c --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/set_tenant.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/set_tenant' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/snapshot_action.rb b/lib/fog/openstack/volume/v2/requests/snapshot_action.rb new file mode 100644 index 000000000..34e77445f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/snapshot_action.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/snapshot_action' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_metadata.rb b/lib/fog/openstack/volume/v2/requests/update_metadata.rb new file mode 100644 index 000000000..325ebabd3 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_quota.rb b/lib/fog/openstack/volume/v2/requests/update_quota.rb new file mode 100644 index 000000000..671b65e6a --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_quota.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_quota' +require 'fog/openstack/volume/v1/requests/real_mock' diff --git a/lib/fog/openstack/volume/v2/requests/update_snapshot.rb b/lib/fog/openstack/volume/v2/requests/update_snapshot.rb new file mode 100644 index 000000000..ca8f66113 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_snapshot.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb new file mode 100644 index 000000000..becbf026f --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_snapshot_metadata.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_snapshot_metadata' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_volume.rb b/lib/fog/openstack/volume/v2/requests/update_volume.rb new file mode 100644 index 000000000..58a077081 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_volume.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_volume' +require 'fog/openstack/volume/v2/requests/real' diff --git a/lib/fog/openstack/volume/v2/requests/update_volume_type.rb b/lib/fog/openstack/volume/v2/requests/update_volume_type.rb new file mode 100644 index 000000000..7e696c055 --- /dev/null +++ b/lib/fog/openstack/volume/v2/requests/update_volume_type.rb @@ -0,0 +1,2 @@ +require 'fog/openstack/volume/requests/update_volume_type' +require 'fog/openstack/volume/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack.rb b/lib/fog/openstack/volume/volume.rb similarity index 73% rename from lib/fog/volume/openstack.rb rename to lib/fog/openstack/volume/volume.rb index fbc961d42..6fc49815c 100644 --- a/lib/fog/volume/openstack.rb +++ b/lib/fog/openstack/volume/volume.rb @@ -1,10 +1,10 @@ module Fog - module Volume - class OpenStack < Fog::Service - autoload :V1, 'fog/volume/openstack/v1' - autoload :V2, 'fog/volume/openstack/v2' + module OpenStack + class Volume < Fog::Service + autoload :V1, 'fog/openstack/volume/v1' + autoload :V2, 'fog/openstack/volume/v2' @@recognizes = [:openstack_auth_token, :openstack_management_url, :persistent, :openstack_service_type, :openstack_service_name, @@ -17,12 +17,12 @@ class OpenStack < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version] - # Fog::Image::OpenStack.new() will return a Fog::Volume::OpenStack::V2 or a Fog::Volume::OpenStack::V1, + # Fog::OpenStack::Image.new() will return a Fog::OpenStack::Volume::V2 or a Fog::OpenStack::Volume::V1, # choosing the V2 by default, as V1 is deprecated since OpenStack Juno def self.new(args = {}) @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - service = if inspect == 'Fog::Volume::OpenStack' - Fog::Volume::OpenStack::V2.new(args) || Fog::Volume::OpenStack::V1.new(args) + service = if inspect == 'Fog::OpenStack::Volume' + Fog::OpenStack::Volume::V2.new(args) || Fog::OpenStack::Volume::V1.new(args) else super end diff --git a/lib/fog/workflow/openstack/v2.rb b/lib/fog/openstack/workflow/v2.rb similarity index 94% rename from lib/fog/workflow/openstack/v2.rb rename to lib/fog/openstack/workflow/v2.rb index fbd829b87..b2896cd4b 100644 --- a/lib/fog/workflow/openstack/v2.rb +++ b/lib/fog/openstack/workflow/v2.rb @@ -1,8 +1,8 @@ -require 'fog/workflow/openstack' +require 'fog/openstack/workflow/workflow' module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 < Fog::Service SUPPORTED_VERSIONS = /v2/ @@ -12,7 +12,7 @@ class V2 < Fog::Service ## REQUESTS # - request_path 'fog/workflow/openstack/v2/requests' + request_path 'fog/openstack/workflow/v2/requests' # Workflow requests request :create_execution @@ -126,7 +126,7 @@ def request(params) rescue Excon::Errors::HTTPStatusError => error raise case error when Excon::Errors::NotFound - Fog::Workflow::OpenStack::NotFound.slurp(error) + Fog::OpenStack::Workflow::NotFound.slurp(error) else error end diff --git a/lib/fog/workflow/openstack/v2/requests/create_action.rb b/lib/fog/openstack/workflow/v2/requests/create_action.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/create_action.rb rename to lib/fog/openstack/workflow/v2/requests/create_action.rb index c122c544e..4ee532b19 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_action(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/create_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/create_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/create_action_execution.rb index b8f650740..baf281247 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_action_execution(action, input = {}, params = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb similarity index 97% rename from lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb rename to lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb index 28f147197..ad2032176 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_cron_trigger(name, diff --git a/lib/fog/workflow/openstack/v2/requests/create_environment.rb b/lib/fog/openstack/workflow/v2/requests/create_environment.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/create_environment.rb rename to lib/fog/openstack/workflow/v2/requests/create_environment.rb index 6a62874b8..ec6b372d3 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_environment(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/create_execution.rb b/lib/fog/openstack/workflow/v2/requests/create_execution.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/create_execution.rb rename to lib/fog/openstack/workflow/v2/requests/create_execution.rb index 3fa4fb7c3..56ac002c8 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_execution(workflow, input = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/create_workbook.rb b/lib/fog/openstack/workflow/v2/requests/create_workbook.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/create_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/create_workbook.rb index ec6fc7169..52a44346f 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_workbook(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/create_workflow.rb b/lib/fog/openstack/workflow/v2/requests/create_workflow.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/create_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/create_workflow.rb index 2717e7990..483ae8de1 100644 --- a/lib/fog/workflow/openstack/v2/requests/create_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def create_workflow(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_action.rb b/lib/fog/openstack/workflow/v2/requests/delete_action.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_action.rb rename to lib/fog/openstack/workflow/v2/requests/delete_action.rb index 9ca4b7938..4c4918980 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_action(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb index 7ed4176b6..c4e6e41c4 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_action_execution(id) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb rename to lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb index 4f7a95051..9cf48bc51 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_cron_trigger(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_environment.rb b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_environment.rb rename to lib/fog/openstack/workflow/v2/requests/delete_environment.rb index f7f493fba..21308810f 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_environment(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_execution.rb b/lib/fog/openstack/workflow/v2/requests/delete_execution.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_execution.rb rename to lib/fog/openstack/workflow/v2/requests/delete_execution.rb index 3ef3db279..b43dc71b1 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_execution(id) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_workbook.rb b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/delete_workbook.rb index 29d66e80e..649caea29 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_workbook(name) diff --git a/lib/fog/workflow/openstack/v2/requests/delete_workflow.rb b/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb similarity index 92% rename from lib/fog/workflow/openstack/v2/requests/delete_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/delete_workflow.rb index 8553b953b..a2d7a3da8 100644 --- a/lib/fog/workflow/openstack/v2/requests/delete_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def delete_workflow(identifier) diff --git a/lib/fog/workflow/openstack/v2/requests/get_action.rb b/lib/fog/openstack/workflow/v2/requests/get_action.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_action.rb rename to lib/fog/openstack/workflow/v2/requests/get_action.rb index 468cb6fb7..c937c48f7 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_action(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/get_action_execution.rb index e19b118f3..6478d96b4 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_action_execution(execution_id) diff --git a/lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb rename to lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb index ccb3f236f..924362d6d 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_cron_trigger(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_environment.rb b/lib/fog/openstack/workflow/v2/requests/get_environment.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_environment.rb rename to lib/fog/openstack/workflow/v2/requests/get_environment.rb index 977bc684d..5bdad97db 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_environment(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_execution.rb b/lib/fog/openstack/workflow/v2/requests/get_execution.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_execution.rb rename to lib/fog/openstack/workflow/v2/requests/get_execution.rb index 88edc2c98..9c499161f 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_execution(execution_id) diff --git a/lib/fog/workflow/openstack/v2/requests/get_task.rb b/lib/fog/openstack/workflow/v2/requests/get_task.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/get_task.rb rename to lib/fog/openstack/workflow/v2/requests/get_task.rb index 203530e8b..09c1e4250 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_task.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_task.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_task(id) diff --git a/lib/fog/workflow/openstack/v2/requests/get_workbook.rb b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/get_workbook.rb index 2c9cb6bdc..33597a310 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_workbook(name) diff --git a/lib/fog/workflow/openstack/v2/requests/get_workflow.rb b/lib/fog/openstack/workflow/v2/requests/get_workflow.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/get_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/get_workflow.rb index efe0b24a7..27ca108a6 100644 --- a/lib/fog/workflow/openstack/v2/requests/get_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def get_workflow(identifier) diff --git a/lib/fog/workflow/openstack/v2/requests/list_action_executions.rb b/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_action_executions.rb rename to lib/fog/openstack/workflow/v2/requests/list_action_executions.rb index c3a6b6a22..16b08c121 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_action_executions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_action_executions diff --git a/lib/fog/workflow/openstack/v2/requests/list_actions.rb b/lib/fog/openstack/workflow/v2/requests/list_actions.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/list_actions.rb rename to lib/fog/openstack/workflow/v2/requests/list_actions.rb index cf734cf4f..58dd4b73c 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_actions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_actions.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_actions(params = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb b/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb rename to lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb index 5422ec500..6fce0012b 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_cron_triggers.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_cron_triggers diff --git a/lib/fog/workflow/openstack/v2/requests/list_environments.rb b/lib/fog/openstack/workflow/v2/requests/list_environments.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_environments.rb rename to lib/fog/openstack/workflow/v2/requests/list_environments.rb index 5375dda8e..cefb642dd 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_environments.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_environments.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_environments diff --git a/lib/fog/workflow/openstack/v2/requests/list_executions.rb b/lib/fog/openstack/workflow/v2/requests/list_executions.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_executions.rb rename to lib/fog/openstack/workflow/v2/requests/list_executions.rb index e95cc9210..8fe847e06 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_executions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_executions.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_executions diff --git a/lib/fog/workflow/openstack/v2/requests/list_services.rb b/lib/fog/openstack/workflow/v2/requests/list_services.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_services.rb rename to lib/fog/openstack/workflow/v2/requests/list_services.rb index 9b014921a..bbed40bff 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_services.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_services.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_services diff --git a/lib/fog/workflow/openstack/v2/requests/list_tasks.rb b/lib/fog/openstack/workflow/v2/requests/list_tasks.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_tasks.rb rename to lib/fog/openstack/workflow/v2/requests/list_tasks.rb index c0fdae7f4..1bba660a6 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_tasks.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_tasks.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_tasks(workflow_execution_id) diff --git a/lib/fog/workflow/openstack/v2/requests/list_workbooks.rb b/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/list_workbooks.rb rename to lib/fog/openstack/workflow/v2/requests/list_workbooks.rb index d429852a0..0173cb87b 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_workbooks.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_workbooks diff --git a/lib/fog/workflow/openstack/v2/requests/list_workflows.rb b/lib/fog/openstack/workflow/v2/requests/list_workflows.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/list_workflows.rb rename to lib/fog/openstack/workflow/v2/requests/list_workflows.rb index 397518c58..7fed8b8bb 100644 --- a/lib/fog/workflow/openstack/v2/requests/list_workflows.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_workflows.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def list_workflows(params = {}) diff --git a/lib/fog/workflow/openstack/v2/requests/rerun_task.rb b/lib/fog/openstack/workflow/v2/requests/rerun_task.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/rerun_task.rb rename to lib/fog/openstack/workflow/v2/requests/rerun_task.rb index a45be6ece..b999a925d 100644 --- a/lib/fog/workflow/openstack/v2/requests/rerun_task.rb +++ b/lib/fog/openstack/workflow/v2/requests/rerun_task.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def rerun_task(task_ex_id) diff --git a/lib/fog/workflow/openstack/v2/requests/update_action.rb b/lib/fog/openstack/workflow/v2/requests/update_action.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/update_action.rb rename to lib/fog/openstack/workflow/v2/requests/update_action.rb index 6b338dfc6..4dfb8c003 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_action(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/update_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/update_action_execution.rb rename to lib/fog/openstack/workflow/v2/requests/update_action_execution.rb index fc12c0c71..f8620b015 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_action_execution(id, name, value) diff --git a/lib/fog/workflow/openstack/v2/requests/update_environment.rb b/lib/fog/openstack/workflow/v2/requests/update_environment.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/update_environment.rb rename to lib/fog/openstack/workflow/v2/requests/update_environment.rb index a127ef6e7..e428b1332 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_environment.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_environment(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/update_execution.rb b/lib/fog/openstack/workflow/v2/requests/update_execution.rb similarity index 95% rename from lib/fog/workflow/openstack/v2/requests/update_execution.rb rename to lib/fog/openstack/workflow/v2/requests/update_execution.rb index ee6635a33..121b9cc10 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_execution.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_execution(id, name, value) diff --git a/lib/fog/workflow/openstack/v2/requests/update_workbook.rb b/lib/fog/openstack/workflow/v2/requests/update_workbook.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/update_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/update_workbook.rb index 2df428739..46f2abec2 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_workbook(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/update_workflow.rb b/lib/fog/openstack/workflow/v2/requests/update_workflow.rb similarity index 93% rename from lib/fog/workflow/openstack/v2/requests/update_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/update_workflow.rb index f9f916d8b..311fe9f22 100644 --- a/lib/fog/workflow/openstack/v2/requests/update_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def update_workflow(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/validate_action.rb b/lib/fog/openstack/workflow/v2/requests/validate_action.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/validate_action.rb rename to lib/fog/openstack/workflow/v2/requests/validate_action.rb index bbf77bb04..81c62717c 100644 --- a/lib/fog/workflow/openstack/v2/requests/validate_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_action.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def validate_action(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/validate_workbook.rb b/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/validate_workbook.rb rename to lib/fog/openstack/workflow/v2/requests/validate_workbook.rb index 0f919612c..195997b5b 100644 --- a/lib/fog/workflow/openstack/v2/requests/validate_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def validate_workbook(definition) diff --git a/lib/fog/workflow/openstack/v2/requests/validate_workflow.rb b/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb similarity index 94% rename from lib/fog/workflow/openstack/v2/requests/validate_workflow.rb rename to lib/fog/openstack/workflow/v2/requests/validate_workflow.rb index c190439ba..a4bbd3f43 100644 --- a/lib/fog/workflow/openstack/v2/requests/validate_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb @@ -1,6 +1,6 @@ module Fog - module Workflow - class OpenStack + module OpenStack + class Workflow class V2 class Real def validate_workflow(definition) diff --git a/lib/fog/workflow/openstack.rb b/lib/fog/openstack/workflow/workflow.rb similarity index 50% rename from lib/fog/workflow/openstack.rb rename to lib/fog/openstack/workflow/workflow.rb index 63b241672..23ba033cd 100644 --- a/lib/fog/workflow/openstack.rb +++ b/lib/fog/openstack/workflow/workflow.rb @@ -1,11 +1,13 @@ module Fog - module Workflow - class OpenStack < Fog::Service - # Fog::Workflow::OpenStack.new() will return a Fog::Workflow::OpenStack::V2 + module OpenStack + class Workflow < Fog::Service + autoload :V2, 'fog/openstack/workflow/v2' + + # Fog::OpenStack::Workflow.new() will return a Fog::OpenStack::Workflow::V2 # Will choose the latest available once Mistral V3 is released. def self.new(args = {}) @openstack_auth_uri = URI.parse(args[:openstack_auth_url]) if args[:openstack_auth_url] - Fog::Workflow::OpenStack::V2.new(args) + Fog::OpenStack::Workflow::V2.new(args) end end end diff --git a/lib/fog/volume/openstack/v1/models/availability_zone.rb b/lib/fog/volume/openstack/v1/models/availability_zone.rb deleted file mode 100644 index 35d6fdb2d..000000000 --- a/lib/fog/volume/openstack/v1/models/availability_zone.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'fog/volume/openstack/models/availability_zone' - -module Fog - module Volume - class OpenStack - class V1 - class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone - identity :zoneName - - attribute :zoneState - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/availability_zones.rb b/lib/fog/volume/openstack/v1/models/availability_zones.rb deleted file mode 100644 index ab449952b..000000000 --- a/lib/fog/volume/openstack/v1/models/availability_zones.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/availability_zone' -require 'fog/volume/openstack/models/availability_zones' - -module Fog - module Volume - class OpenStack - class V1 - class AvailabilityZones < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::AvailabilityZone - include Fog::Volume::OpenStack::AvailabilityZones - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/backups.rb b/lib/fog/volume/openstack/v1/models/backups.rb deleted file mode 100644 index 383fad71d..000000000 --- a/lib/fog/volume/openstack/v1/models/backups.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/backup' -require 'fog/volume/openstack/models/backups' - -module Fog - module Volume - class OpenStack - class V1 - class Backups < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Backup - include Fog::Volume::OpenStack::Backups - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/snapshots.rb b/lib/fog/volume/openstack/v1/models/snapshots.rb deleted file mode 100644 index f12d1a85a..000000000 --- a/lib/fog/volume/openstack/v1/models/snapshots.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/snapshot' -require 'fog/volume/openstack/models/snapshots' - -module Fog - module Volume - class OpenStack - class V1 - class Snapshots < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Snapshot - include Fog::Volume::OpenStack::Snapshots - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/transfers.rb b/lib/fog/volume/openstack/v1/models/transfers.rb deleted file mode 100644 index c35a60914..000000000 --- a/lib/fog/volume/openstack/v1/models/transfers.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/transfer' -require 'fog/volume/openstack/models/transfers' - -module Fog - module Volume - class OpenStack - class V1 - class Transfers < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Transfer - include Fog::Volume::OpenStack::Transfers - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/volume_types.rb b/lib/fog/volume/openstack/v1/models/volume_types.rb deleted file mode 100644 index 803e0c14c..000000000 --- a/lib/fog/volume/openstack/v1/models/volume_types.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/volume_type' -require 'fog/volume/openstack/models/volume_types' - -module Fog - module Volume - class OpenStack - class V1 - class VolumeTypes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::VolumeType - include Fog::Volume::OpenStack::VolumeTypes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/models/volumes.rb b/lib/fog/volume/openstack/v1/models/volumes.rb deleted file mode 100644 index 11dbb4b16..000000000 --- a/lib/fog/volume/openstack/v1/models/volumes.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v1/models/volume' -require 'fog/volume/openstack/models/volumes' - -module Fog - module Volume - class OpenStack - class V1 - class Volumes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V1::Volume - include Fog::Volume::OpenStack::Volumes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/requests/accept_transfer.rb b/lib/fog/volume/openstack/v1/requests/accept_transfer.rb deleted file mode 100644 index 22fb2e28b..000000000 --- a/lib/fog/volume/openstack/v1/requests/accept_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/accept_transfer' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/action.rb b/lib/fog/volume/openstack/v1/requests/action.rb deleted file mode 100644 index 864515140..000000000 --- a/lib/fog/volume/openstack/v1/requests/action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/action' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_backup.rb b/lib/fog/volume/openstack/v1/requests/create_backup.rb deleted file mode 100644 index 87aee6107..000000000 --- a/lib/fog/volume/openstack/v1/requests/create_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_backup' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_transfer.rb b/lib/fog/volume/openstack/v1/requests/create_transfer.rb deleted file mode 100644 index 589a96835..000000000 --- a/lib/fog/volume/openstack/v1/requests/create_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_transfer' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/create_volume_type.rb b/lib/fog/volume/openstack/v1/requests/create_volume_type.rb deleted file mode 100644 index 39fb7df50..000000000 --- a/lib/fog/volume/openstack/v1/requests/create_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_volume_type' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_backup.rb b/lib/fog/volume/openstack/v1/requests/delete_backup.rb deleted file mode 100644 index 0c931e879..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_backup' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_metadata.rb b/lib/fog/volume/openstack/v1/requests/delete_metadata.rb deleted file mode 100644 index cd60fa7bb..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb b/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb deleted file mode 100644 index 735096720..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb deleted file mode 100644 index 3399004e2..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_transfer.rb b/lib/fog/volume/openstack/v1/requests/delete_transfer.rb deleted file mode 100644 index d10c4f8d2..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_transfer' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/delete_volume.rb b/lib/fog/volume/openstack/v1/requests/delete_volume.rb deleted file mode 100644 index 1b65c11b9..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb b/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb deleted file mode 100644 index 87b41422d..000000000 --- a/lib/fog/volume/openstack/v1/requests/delete_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume_type' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/extend_volume.rb b/lib/fog/volume/openstack/v1/requests/extend_volume.rb deleted file mode 100644 index 40b949a3d..000000000 --- a/lib/fog/volume/openstack/v1/requests/extend_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/extend_volume' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_backup_details.rb b/lib/fog/volume/openstack/v1/requests/get_backup_details.rb deleted file mode 100644 index 42018a151..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_backup_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_backup_details' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota.rb b/lib/fog/volume/openstack/v1/requests/get_quota.rb deleted file mode 100644 index fb32eb165..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb deleted file mode 100644 index a9b4f99b5..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_quota_defaults.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_defaults' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb b/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb deleted file mode 100644 index dc6022759..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_quota_usage.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_usage' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb b/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb deleted file mode 100644 index f5c6f0087..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_transfer_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_transfer_details' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb deleted file mode 100644 index 7551a0536..000000000 --- a/lib/fog/volume/openstack/v1/requests/get_volume_type_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_volume_type_details' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_backups.rb b/lib/fog/volume/openstack/v1/requests/list_backups.rb deleted file mode 100644 index 7b8730232..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_backups.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb deleted file mode 100644 index b2af7b137..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_backups_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups_detailed' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_snapshots.rb b/lib/fog/volume/openstack/v1/requests/list_snapshots.rb deleted file mode 100644 index 77a90414a..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_snapshots.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb deleted file mode 100644 index 8538c572d..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_snapshots_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots_detailed' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_transfers.rb b/lib/fog/volume/openstack/v1/requests/list_transfers.rb deleted file mode 100644 index ad3207161..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_transfers.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb deleted file mode 100644 index efa6efbe5..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_transfers_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers_detailed' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/list_volume_types.rb b/lib/fog/volume/openstack/v1/requests/list_volume_types.rb deleted file mode 100644 index 293a84e0a..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_volume_types.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_volume_types' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/list_zones.rb b/lib/fog/volume/openstack/v1/requests/list_zones.rb deleted file mode 100644 index c1140f633..000000000 --- a/lib/fog/volume/openstack/v1/requests/list_zones.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_zones' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/real_mock.rb b/lib/fog/volume/openstack/v1/requests/real_mock.rb deleted file mode 100644 index e98f366ee..000000000 --- a/lib/fog/volume/openstack/v1/requests/real_mock.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Fog - module Volume - class OpenStack - class V1 - class Real - include Fog::Volume::OpenStack::Real - end - class Mock - include Fog::Volume::OpenStack::Mock - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v1/requests/replace_metadata.rb b/lib/fog/volume/openstack/v1/requests/replace_metadata.rb deleted file mode 100644 index e9f99233d..000000000 --- a/lib/fog/volume/openstack/v1/requests/replace_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/replace_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/restore_backup.rb b/lib/fog/volume/openstack/v1/requests/restore_backup.rb deleted file mode 100644 index 9bf58ae73..000000000 --- a/lib/fog/volume/openstack/v1/requests/restore_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/restore_backup' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/set_tenant.rb b/lib/fog/volume/openstack/v1/requests/set_tenant.rb deleted file mode 100644 index 542a550bb..000000000 --- a/lib/fog/volume/openstack/v1/requests/set_tenant.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/set_tenant' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/update_metadata.rb b/lib/fog/volume/openstack/v1/requests/update_metadata.rb deleted file mode 100644 index d1be8f383..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_quota.rb b/lib/fog/volume/openstack/v1/requests/update_quota.rb deleted file mode 100644 index ea7bdc107..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_quota' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v1/requests/update_snapshot.rb b/lib/fog/volume/openstack/v1/requests/update_snapshot.rb deleted file mode 100644 index 8465042cf..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb deleted file mode 100644 index 8116b1dfa..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot_metadata' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v1/requests/update_volume.rb b/lib/fog/volume/openstack/v1/requests/update_volume.rb deleted file mode 100644 index 161bf1c9e..000000000 --- a/lib/fog/volume/openstack/v1/requests/update_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_volume' -require 'fog/volume/openstack/v1/requests/real' diff --git a/lib/fog/volume/openstack/v2/models/availability_zone.rb b/lib/fog/volume/openstack/v2/models/availability_zone.rb deleted file mode 100644 index f7944c65d..000000000 --- a/lib/fog/volume/openstack/v2/models/availability_zone.rb +++ /dev/null @@ -1,15 +0,0 @@ -require 'fog/volume/openstack/models/availability_zone' - -module Fog - module Volume - class OpenStack - class V2 - class AvailabilityZone < Fog::Volume::OpenStack::AvailabilityZone - identity :zoneName - - attribute :zoneState - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/availability_zones.rb b/lib/fog/volume/openstack/v2/models/availability_zones.rb deleted file mode 100644 index c91554740..000000000 --- a/lib/fog/volume/openstack/v2/models/availability_zones.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/availability_zone' -require 'fog/volume/openstack/models/availability_zones' - -module Fog - module Volume - class OpenStack - class V2 - class AvailabilityZones < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::AvailabilityZone - include Fog::Volume::OpenStack::AvailabilityZones - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/backups.rb b/lib/fog/volume/openstack/v2/models/backups.rb deleted file mode 100644 index 3c074ef16..000000000 --- a/lib/fog/volume/openstack/v2/models/backups.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/backup' -require 'fog/volume/openstack/models/backups' - -module Fog - module Volume - class OpenStack - class V2 - class Backups < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Backup - include Fog::Volume::OpenStack::Backups - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/snapshots.rb b/lib/fog/volume/openstack/v2/models/snapshots.rb deleted file mode 100644 index f5eda7fa0..000000000 --- a/lib/fog/volume/openstack/v2/models/snapshots.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/snapshot' -require 'fog/volume/openstack/models/snapshots' - -module Fog - module Volume - class OpenStack - class V2 - class Snapshots < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Snapshot - include Fog::Volume::OpenStack::Snapshots - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/transfers.rb b/lib/fog/volume/openstack/v2/models/transfers.rb deleted file mode 100644 index d12bb6ab7..000000000 --- a/lib/fog/volume/openstack/v2/models/transfers.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/transfer' -require 'fog/volume/openstack/models/transfers' - -module Fog - module Volume - class OpenStack - class V2 - class Transfers < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Transfer - include Fog::Volume::OpenStack::Transfers - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/volume_types.rb b/lib/fog/volume/openstack/v2/models/volume_types.rb deleted file mode 100644 index c9ff191d5..000000000 --- a/lib/fog/volume/openstack/v2/models/volume_types.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/volume_type' -require 'fog/volume/openstack/models/volume_types' - -module Fog - module Volume - class OpenStack - class V2 - class VolumeTypes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::VolumeType - include Fog::Volume::OpenStack::VolumeTypes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/models/volumes.rb b/lib/fog/volume/openstack/v2/models/volumes.rb deleted file mode 100644 index 6d732e1cd..000000000 --- a/lib/fog/volume/openstack/v2/models/volumes.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/openstack/models/collection' -require 'fog/volume/openstack/v2/models/volume' -require 'fog/volume/openstack/models/volumes' - -module Fog - module Volume - class OpenStack - class V2 - class Volumes < Fog::OpenStack::Collection - model Fog::Volume::OpenStack::V2::Volume - include Fog::Volume::OpenStack::Volumes - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/requests/accept_transfer.rb b/lib/fog/volume/openstack/v2/requests/accept_transfer.rb deleted file mode 100644 index 90eeb4064..000000000 --- a/lib/fog/volume/openstack/v2/requests/accept_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/accept_transfer' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/action.rb b/lib/fog/volume/openstack/v2/requests/action.rb deleted file mode 100644 index 22ea9c995..000000000 --- a/lib/fog/volume/openstack/v2/requests/action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/action' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_backup.rb b/lib/fog/volume/openstack/v2/requests/create_backup.rb deleted file mode 100644 index 85e520897..000000000 --- a/lib/fog/volume/openstack/v2/requests/create_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_backup' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_transfer.rb b/lib/fog/volume/openstack/v2/requests/create_transfer.rb deleted file mode 100644 index 421b04770..000000000 --- a/lib/fog/volume/openstack/v2/requests/create_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_transfer' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/create_volume_type.rb b/lib/fog/volume/openstack/v2/requests/create_volume_type.rb deleted file mode 100644 index b0fed84ec..000000000 --- a/lib/fog/volume/openstack/v2/requests/create_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/create_volume_type' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_backup.rb b/lib/fog/volume/openstack/v2/requests/delete_backup.rb deleted file mode 100644 index c00284714..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_backup' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_metadata.rb b/lib/fog/volume/openstack/v2/requests/delete_metadata.rb deleted file mode 100644 index a8695156f..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb b/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb deleted file mode 100644 index 2b1ec6b66..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb b/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb deleted file mode 100644 index 80580e28b..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_snapshot_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_transfer.rb b/lib/fog/volume/openstack/v2/requests/delete_transfer.rb deleted file mode 100644 index b3f443cef..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_transfer.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_transfer' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/delete_volume.rb b/lib/fog/volume/openstack/v2/requests/delete_volume.rb deleted file mode 100644 index 237600d3d..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb b/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb deleted file mode 100644 index 1cc6024ea..000000000 --- a/lib/fog/volume/openstack/v2/requests/delete_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/delete_volume_type' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/extend_volume.rb b/lib/fog/volume/openstack/v2/requests/extend_volume.rb deleted file mode 100644 index 78b79fdc2..000000000 --- a/lib/fog/volume/openstack/v2/requests/extend_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/extend_volume' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_backup_details.rb b/lib/fog/volume/openstack/v2/requests/get_backup_details.rb deleted file mode 100644 index 8cb7d5516..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_backup_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_backup_details' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota.rb b/lib/fog/volume/openstack/v2/requests/get_quota.rb deleted file mode 100644 index 0dcacd264..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb b/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb deleted file mode 100644 index 546ebad52..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_quota_defaults.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_defaults' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb b/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb deleted file mode 100644 index b8aaa7936..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_quota_usage.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_quota_usage' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb b/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb deleted file mode 100644 index be4f9f0e2..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_transfer_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_transfer_details' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb b/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb deleted file mode 100644 index 53f5ac17b..000000000 --- a/lib/fog/volume/openstack/v2/requests/get_volume_type_details.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/get_volume_type_details' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_backups.rb b/lib/fog/volume/openstack/v2/requests/list_backups.rb deleted file mode 100644 index a6fec7b77..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_backups.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb deleted file mode 100644 index 37bbea076..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_backups_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_backups_detailed' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_snapshots.rb b/lib/fog/volume/openstack/v2/requests/list_snapshots.rb deleted file mode 100644 index d089a8cb6..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_snapshots.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb deleted file mode 100644 index 22c43a746..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_snapshots_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_snapshots_detailed' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_transfers.rb b/lib/fog/volume/openstack/v2/requests/list_transfers.rb deleted file mode 100644 index 1b76af131..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_transfers.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb b/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb deleted file mode 100644 index 0ee3cbae8..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_transfers_detailed.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_transfers_detailed' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/list_volume_types.rb b/lib/fog/volume/openstack/v2/requests/list_volume_types.rb deleted file mode 100644 index ebb0daee8..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_volume_types.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_volume_types' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/list_zones.rb b/lib/fog/volume/openstack/v2/requests/list_zones.rb deleted file mode 100644 index c45a1040d..000000000 --- a/lib/fog/volume/openstack/v2/requests/list_zones.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/list_zones' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/real_mock.rb b/lib/fog/volume/openstack/v2/requests/real_mock.rb deleted file mode 100644 index 3a0a6e53b..000000000 --- a/lib/fog/volume/openstack/v2/requests/real_mock.rb +++ /dev/null @@ -1,14 +0,0 @@ -module Fog - module Volume - class OpenStack - class V2 - class Real - include Fog::Volume::OpenStack::Real - end - class Mock - include Fog::Volume::OpenStack::Mock - end - end - end - end -end diff --git a/lib/fog/volume/openstack/v2/requests/replace_metadata.rb b/lib/fog/volume/openstack/v2/requests/replace_metadata.rb deleted file mode 100644 index 7ea4e7678..000000000 --- a/lib/fog/volume/openstack/v2/requests/replace_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/replace_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/restore_backup.rb b/lib/fog/volume/openstack/v2/requests/restore_backup.rb deleted file mode 100644 index 6268f26c1..000000000 --- a/lib/fog/volume/openstack/v2/requests/restore_backup.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/restore_backup' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/set_tenant.rb b/lib/fog/volume/openstack/v2/requests/set_tenant.rb deleted file mode 100644 index c1d386370..000000000 --- a/lib/fog/volume/openstack/v2/requests/set_tenant.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/set_tenant' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/snapshot_action.rb b/lib/fog/volume/openstack/v2/requests/snapshot_action.rb deleted file mode 100644 index 12940e411..000000000 --- a/lib/fog/volume/openstack/v2/requests/snapshot_action.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/snapshot_action' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_metadata.rb b/lib/fog/volume/openstack/v2/requests/update_metadata.rb deleted file mode 100644 index ab49b90d5..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_quota.rb b/lib/fog/volume/openstack/v2/requests/update_quota.rb deleted file mode 100644 index ea7bdc107..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_quota.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_quota' -require 'fog/volume/openstack/v1/requests/real_mock' diff --git a/lib/fog/volume/openstack/v2/requests/update_snapshot.rb b/lib/fog/volume/openstack/v2/requests/update_snapshot.rb deleted file mode 100644 index fcece5db5..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_snapshot.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb b/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb deleted file mode 100644 index 87f5f9f7a..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_snapshot_metadata.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_snapshot_metadata' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_volume.rb b/lib/fog/volume/openstack/v2/requests/update_volume.rb deleted file mode 100644 index 52f5d0902..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_volume.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_volume' -require 'fog/volume/openstack/v2/requests/real' diff --git a/lib/fog/volume/openstack/v2/requests/update_volume_type.rb b/lib/fog/volume/openstack/v2/requests/update_volume_type.rb deleted file mode 100644 index 8006cf220..000000000 --- a/lib/fog/volume/openstack/v2/requests/update_volume_type.rb +++ /dev/null @@ -1,2 +0,0 @@ -require 'fog/volume/openstack/requests/update_volume_type' -require 'fog/volume/openstack/v2/requests/real_mock' diff --git a/spec/dns_v2_spec.rb b/spec/dns_v2_spec.rb index 2fc9a5645..a7cf05297 100644 --- a/spec/dns_v2_spec.rb +++ b/spec/dns_v2_spec.rb @@ -1,14 +1,14 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::DNS::OpenStack::V2 do +describe Fog::OpenStack::DNS::V2 do spec_data_folder = 'spec/fixtures/openstack/dns_v2' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::DNS::OpenStack # Fog to choose latest available version + :service_class => Fog::OpenStack::DNS # Fog to choose latest available version ) @service = openstack_vcr.service end diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index 6faf12dc5..899a587d4 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Identity::OpenStack::V3 do +describe Fog::OpenStack::Identity::V3 do before :all do @openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/identity_v3', - :service_class => Fog::Identity::OpenStack::V3 + :service_class => Fog::OpenStack::Identity::V3 ) @service = @openstack_vcr.service @os_auth_url = @openstack_vcr.os_auth_url @@ -13,7 +13,7 @@ it 'authenticates with password, userid and domain_id' do VCR.use_cassette('authv3_a') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_domain_id => @openstack_vcr.domain_id, :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, @@ -25,7 +25,7 @@ it 'authenticates with password, username and domain_id' do VCR.use_cassette('authv3_b') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_domain_id => @openstack_vcr.domain_id, :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, @@ -37,7 +37,7 @@ it 'authenticates with password, username and domain_name' do VCR.use_cassette('authv3_c') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_user_domain => @openstack_vcr.domain_name, :openstack_api_key => @openstack_vcr.password, :openstack_username => @openstack_vcr.username, @@ -55,7 +55,7 @@ unless endpoints_in_region.empty? VCR.use_cassette('idv3_other_region') do - @fog = Fog::Identity::OpenStack::V3.new( + @fog = Fog::OpenStack::Identity::V3.new( :openstack_region => @openstack_vcr.region_other, :openstack_auth_url => @os_auth_url, :openstack_userid => @openstack_vcr.user_id, @@ -68,7 +68,7 @@ it 'get an unscoped token, then reauthenticate with it' do VCR.use_cassette('authv3_unscoped_reauth') do - id_v3 = Fog::Identity::OpenStack::V3.new( + id_v3 = Fog::OpenStack::Identity::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, @@ -81,7 +81,7 @@ :openstack_auth_url => @os_auth_url, :openstack_region => @openstack_vcr.region } - @fog2 = Fog::Identity::OpenStack::V3.new(auth_params) + @fog2 = Fog::OpenStack::Identity::V3.new(auth_params) @fog2.wont_equal nil token = @fog2.credentials[:openstack_auth_token] @@ -91,7 +91,7 @@ it 'authenticates with project scope' do VCR.use_cassette('authv3_project') do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, :openstack_api_key => @openstack_vcr.password, @@ -104,7 +104,7 @@ it 'get an unscoped token, then use it to get a scoped token' do VCR.use_cassette('authv3_unscoped') do - id_v3 = Fog::Identity::OpenStack::V3.new( + id_v3 = Fog::OpenStack::Identity::V3.new( :openstack_api_key => @openstack_vcr.password, :openstack_userid => @openstack_vcr.user_id, :openstack_region => @openstack_vcr.region, @@ -112,7 +112,7 @@ ) # Exchange it for a project-scoped token - auth = Fog::Identity::OpenStack::V3.new( + auth = Fog::OpenStack::Identity::V3.new( :openstack_project_name => @openstack_vcr.project_name, :openstack_domain_name => @openstack_vcr.domain_name, :openstack_auth_token => id_v3.credentials[:openstack_auth_token], @@ -127,13 +127,13 @@ validated_token.wont_equal nil id_v3.tokens.check(token) - proc { id_v3.tokens.check('random-token') }.must_raise Fog::Identity::OpenStack::NotFound + proc { id_v3.tokens.check('random-token') }.must_raise Fog::OpenStack::Identity::NotFound end end it "find specific user, lists users" do VCR.use_cassette('idv3_users') do - proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.users.find_by_id 'u-random-blah' }.must_raise Fog::OpenStack::Identity::NotFound admin_user = @service.users.find_by_name @openstack_vcr.username admin_user.length.must_equal 1 @@ -195,7 +195,7 @@ # Delete the user baz_user.destroy # Check that the deletion worked - proc { @service.users.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.users.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound @service.users.all.select { |user| %w[foobar baz].include? user.name }.length.must_equal 0 @service.users.find_by_name('foobar').length.must_equal 0 @service.users.find_by_name('baz').length.must_equal 0 @@ -258,7 +258,7 @@ # Delete the group baz_group.destroy - proc { @service.groups.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.groups.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound @service.groups.all.select { |group| %w[foobar baz].include? group.name }.length.must_equal 0 end end @@ -296,7 +296,7 @@ @service.tokens.check(token.value) @service.tokens.revoke(token.value) - proc { @service.tokens.check(token.value) }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.tokens.check(token.value) }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -316,7 +316,7 @@ foobar_role = @service.roles.create(:name => 'foobar_role390') foobar_user.grant_role(foobar_role.id) - nonadmin_v3 = Fog::Identity::OpenStack::V3.new( + nonadmin_v3 = Fog::OpenStack::Identity::V3.new( :openstack_domain_id => foobar_user.domain_id, :openstack_api_key => 's3cret!', :openstack_username => 'foobar_385', @@ -324,8 +324,8 @@ :openstack_auth_url => auth_url ) - # Test - check the token validity by using it to create a new Fog::Identity::OpenStack::V3 instance - token_check = Fog::Identity::OpenStack::V3.new( + # Test - check the token validity by using it to create a new Fog::OpenStack::Identity::V3 instance + token_check = Fog::OpenStack::Identity::V3.new( :openstack_auth_token => nonadmin_v3.auth_token, :openstack_region => @openstack_vcr.region, :openstack_auth_url => auth_url @@ -334,7 +334,7 @@ token_check.wont_equal nil proc do - Fog::Identity::OpenStack::V3.new( + Fog::OpenStack::Identity::V3.new( :openstack_auth_token => 'blahblahblah', :openstack_region => @openstack_vcr.region, :openstack_auth_url => auth_url @@ -363,7 +363,7 @@ default_domain = @service.domains.find_by_id @openstack_vcr.domain_id default_domain.wont_equal nil - proc { @service.domains.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.domains.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -399,7 +399,7 @@ rescue end # Check that the deletion worked - proc { @service.domains.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.domains.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id %w[foobar baz].each do |domain_name| @service.domains.all(:name => domain_name).length.must_equal 0 end @@ -531,7 +531,7 @@ role_by_id = @service.roles.find_by_id roles_all.first.id role_by_id.wont_equal nil - proc { @service.roles.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.roles.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -555,7 +555,7 @@ baz_role.destroy baz_role = nil # Check that the deletion worked - proc { @service.roles.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.roles.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id %w[foobar23 baz23].each do |role_name| @service.roles.all(:name => role_name).length.must_equal 0 end @@ -582,7 +582,7 @@ project_byid = @service.projects.find_by_id projects_all.first.id project_byid.wont_equal nil - proc { @service.projects.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.projects.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -612,7 +612,7 @@ baz_project.destroy # Check that the deletion worked - proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.projects.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound ['p-foobar46', 'p-baz46'].each do |project_name| @service.projects.all(:name => project_name).length.must_equal 0 end @@ -699,7 +699,7 @@ prj_role ||= @service.roles.all(:name => 'r-project67').first prj_role.destroy if prj_role # Check that the deletion worked - proc { @service.projects.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.projects.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id ['p-booboo67', 'p-fooboo67', 'p-boo67', 'p-baz67', 'p-foobar67'].each do |project_name| prj = @service.projects.all(:name => project_name).first prj.destroy if prj @@ -812,7 +812,7 @@ some_service = @service.services.find_by_id services_all.first.id some_service.wont_equal nil - proc { @service.services.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.services.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -841,7 +841,7 @@ baz_service.destroy if baz_service # Check that the deletion worked - proc { @service.services.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound if foobar_id + proc { @service.services.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound if foobar_id @service.services.all.select { |service| %w[foobar baz].include? service.name }.length.must_equal 0 end end @@ -860,7 +860,7 @@ some_endpoint = @service.endpoints.find_by_id endpoints_all.first.id some_endpoint.wont_equal nil - proc { @service.endpoints.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.endpoints.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -900,7 +900,7 @@ baz_endpoint.destroy # Check that the deletion worked - proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.endpoints.find_by_id foobar_id }.must_raise Fog::OpenStack::Identity::NotFound @service.endpoints.all.select { |endpoint| %w[foobar baz].include? endpoint.name }.length.must_equal 0 end end @@ -914,7 +914,7 @@ credentials_all = @service.os_credentials.all credentials_all.wont_equal nil - proc { @service.os_credentials.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.os_credentials.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -976,7 +976,7 @@ # Check that the deletion worked if credential_id - proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.os_credentials.find_by_id credential_id }.must_raise Fog::OpenStack::Identity::NotFound end @service.os_credentials.all.select { |credential| credential.type == 'ec2' }.length.must_equal 0 end @@ -993,7 +993,7 @@ policies_all.wont_equal nil policies_all.length.must_equal 0 - proc { @service.policies.find_by_id 'atlantis' }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.policies.find_by_id 'atlantis' }.must_raise Fog::OpenStack::Identity::NotFound end end @@ -1026,7 +1026,7 @@ updated_policy.destroy # Check that the deletion worked - proc { @service.policies.find_by_id policy_id }.must_raise Fog::Identity::OpenStack::NotFound + proc { @service.policies.find_by_id policy_id }.must_raise Fog::OpenStack::Identity::NotFound @service.policies.all.select { |policy| policy.type == 'application/json' }.length.must_equal 0 end end diff --git a/spec/image_v1_spec.rb b/spec/image_v1_spec.rb index 8b25b1342..3e6fc6192 100644 --- a/spec/image_v1_spec.rb +++ b/spec/image_v1_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Image::OpenStack do +describe Fog::OpenStack::Image do before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/image_v1', - :service_class => Fog::Image::OpenStack::V1 + :service_class => Fog::OpenStack::Image::V1 ) @service = openstack_vcr.service end diff --git a/spec/image_v2_spec.rb b/spec/image_v2_spec.rb index b957f57a1..f132fbb5e 100644 --- a/spec/image_v2_spec.rb +++ b/spec/image_v2_spec.rb @@ -1,13 +1,13 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Image::OpenStack do +describe Fog::OpenStack::Image do spec_data_folder = 'spec/fixtures/openstack/image_v2' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, - :service_class => Fog::Image::OpenStack # Fog to choose latest available version + :service_class => Fog::OpenStack::Image # Fog to choose latest available version ) @service = openstack_vcr.service end @@ -95,7 +95,7 @@ def cleanup_image(image, image_name = nil, image_id = nil) identifier = "11111111-2222-3333-aaaa-bbbbbbcccce2" begin # Create an image with a specified ID - foobar_image = Fog::Image::OpenStack::V2::Image.new( + foobar_image = Fog::OpenStack::Image::V2::Image.new( :name => 'original_name', :id => identifier, :service => @service, diff --git a/spec/image_v2_upload_spec.rb b/spec/image_v2_upload_spec.rb index 18763a7dd..33d475d52 100644 --- a/spec/image_v2_upload_spec.rb +++ b/spec/image_v2_upload_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe Fog::Image::OpenStack do +describe Fog::OpenStack::Image do it "Upload/download image data using chunked IO" do # We only run this against a live system, # because VCR's use of Webmock stops Excon :response_block from working correctly @@ -12,7 +12,7 @@ Excon.defaults[:ssl_verify_peer] = false if ENV['SSL_VERIFY_PEER'] == 'false' # setup the service object - @service ||= Fog::Image::OpenStack.new( + @service ||= Fog::OpenStack::Image.new( :openstack_auth_url => "#{@os_auth_url}/auth/tokens", :openstack_project_name => ENV.fetch('OS_PROJECT_NAME'), :openstack_username => ENV.fetch('OS_USERNAME'), @@ -65,7 +65,7 @@ if foobar_id proc do @service.images.find_by_id foobar_id - end.must_raise Fog::Image::OpenStack::NotFound + end.must_raise Fog::OpenStack::Image::NotFound end @service.images.all(:name => 'foobar_up2').length.must_equal 0 end diff --git a/spec/monitoring_spec.rb b/spec/monitoring_spec.rb index bf7ee77f8..aa06eca84 100644 --- a/spec/monitoring_spec.rb +++ b/spec/monitoring_spec.rb @@ -1,15 +1,15 @@ require 'spec_helper' require_relative './shared_context' -require 'fog/monitoring/openstack/models/metric' +require 'fog/openstack/monitoring/models/metric' require 'time' -describe Fog::Monitoring::OpenStack do +describe Fog::OpenStack::Monitoring do spec_data_folder = 'spec/fixtures/openstack/monitoring' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, - :service_class => Fog::Monitoring::OpenStack + :service_class => Fog::OpenStack::Monitoring ) @service = openstack_vcr.service @timestamp = 146_375_736_714_3 @@ -28,13 +28,13 @@ # create multiple metrics - metric_1 = Fog::Monitoring::OpenStack::Metric.new(:name => 'sample_metric_1', + metric_1 = Fog::OpenStack::Monitoring::Metric.new(:name => 'sample_metric_1', :timestamp => @timestamp, :dimensions => {"key1" => "value1"}, :value => 42, :value_meta => {"meta_key1" => "meta_value1"}) - metric_2 = Fog::Monitoring::OpenStack::Metric.new(:name => 'sample_metric_2', + metric_2 = Fog::OpenStack::Monitoring::Metric.new(:name => 'sample_metric_2', :timestamp => @timestamp, :dimensions => {"key1" => "value1"}, :value => 42, @@ -151,7 +151,7 @@ proc do @service.notification_methods.find_by_id('bogus_id') - end.must_raise Fog::Monitoring::OpenStack::NotFound + end.must_raise Fog::OpenStack::Monitoring::NotFound ensure notification_method.destroy if notification_method end diff --git a/spec/network_spec.rb b/spec/network_spec.rb index 5a8f16888..659e129d1 100644 --- a/spec/network_spec.rb +++ b/spec/network_spec.rb @@ -1,11 +1,11 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::Network::OpenStack do +describe Fog::OpenStack::Network do before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Network::OpenStack, + :service_class => Fog::OpenStack::Network, :project_scoped => true ) @service = openstack_vcr.service @@ -13,7 +13,7 @@ openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Identity::OpenStack::V3 + :service_class => Fog::OpenStack::Identity::V3 ) @identity_service = openstack_vcr.service end @@ -81,7 +81,7 @@ @auth_token = @identity_service.credentials[:openstack_auth_token] openstack_vcr = OpenStackVCR.new( :vcr_directory => 'spec/fixtures/openstack/network', - :service_class => Fog::Network::OpenStack, + :service_class => Fog::OpenStack::Network, :project_scoped => true, :token_auth => true, :token => @auth_token diff --git a/spec/shared_context.rb b/spec/shared_context.rb index 06f4d4c12..7de391f74 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -33,7 +33,7 @@ class OpenStackVCR # This method should be called in a "before :all" call to set everything up. # A properly configured instance of the service class (e.g. - # Fog::Volume::OpenStack) is then made available in @service. + # Fog::OpenStack::Volume) is then made available in @service. def initialize(options) # read arguments # must_be_kind_of String @@ -109,7 +109,7 @@ def initialize(options) end # TODO: remove - # if @service_class == Fog::Identity::OpenStack::V3 || @os_auth_url.end_with?('/v3') + # if @service_class == Fog::OpenStack::Identity::V3 || @os_auth_url.end_with?('/v3') if @identity_version == 'v3' connection_options = { :openstack_auth_url => @os_auth_url, diff --git a/spec/shared_file_system_spec.rb b/spec/shared_file_system_spec.rb index 1e00fb1fa..7db91ce67 100644 --- a/spec/shared_file_system_spec.rb +++ b/spec/shared_file_system_spec.rb @@ -1,21 +1,21 @@ require 'spec_helper' require_relative './shared_context' -describe Fog::SharedFileSystem::OpenStack do +describe Fog::OpenStack::SharedFileSystem do spec_data_folder = 'spec/fixtures/openstack/shared_file_system' before :all do openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::SharedFileSystem::OpenStack + :service_class => Fog::OpenStack::SharedFileSystem ) @service = openstack_vcr.service net_openstack_vcr = OpenStackVCR.new( :vcr_directory => spec_data_folder, :project_scoped => true, - :service_class => Fog::Network::OpenStack + :service_class => Fog::OpenStack::Network ) @network_service = net_openstack_vcr.service end diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index c2934aab0..2c3896798 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -2,15 +2,15 @@ require_relative './shared_context' [ - Fog::Volume::OpenStack, - Fog::Volume::OpenStack::V1, - Fog::Volume::OpenStack::V2 + Fog::OpenStack::Volume, + Fog::OpenStack::Volume::V1, + Fog::OpenStack::Volume::V2 ].delete_if { |the_class| ENV['TEST_CLASS'] && ENV['TEST_CLASS'] != the_class.name }.each do |service_class| describe service_class do before :all do - vcr_directory = 'spec/fixtures/openstack/volume' if service_class == Fog::Volume::OpenStack - vcr_directory = 'spec/fixtures/openstack/volume_v1' if service_class == Fog::Volume::OpenStack::V1 - vcr_directory = 'spec/fixtures/openstack/volume_v2' if service_class == Fog::Volume::OpenStack::V2 + vcr_directory = 'spec/fixtures/openstack/volume' if service_class == Fog::OpenStack::Volume + vcr_directory = 'spec/fixtures/openstack/volume_v1' if service_class == Fog::OpenStack::Volume::V1 + vcr_directory = 'spec/fixtures/openstack/volume_v2' if service_class == Fog::OpenStack::Volume::V2 openstack_vcr = OpenStackVCR.new( :vcr_directory => vcr_directory, @@ -28,7 +28,7 @@ end def v2? - @service.kind_of? Fog::Volume::OpenStack::V2::Real + @service.kind_of? Fog::OpenStack::Volume::V2::Real end def setup_test_object(options) @@ -116,7 +116,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume by ID..." if ENV['DEBUG_VERBOSE'] volume = @service.volumes.get(volume_id) - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume volume.id.must_equal volume_id volume.display_name.must_equal volume_name unless v2? @@ -134,7 +134,7 @@ def cleanup_test_object(collection, id) volumes = @service.volumes.all(@name_param => volume_name) volumes.length.must_equal 1 volume = volumes[0] - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume volume.id.must_equal volume_id volume.display_name.must_equal volume_name unless v2? @@ -148,7 +148,7 @@ def cleanup_test_object(collection, id) volumes = @service.volumes.all(@name_param => volume_new_name) volume = volumes.first - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume volume.display_name.must_equal volume_new_name unless v2? volume.name.must_equal volume_new_name if v2? @@ -185,7 +185,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume type by ID..." if ENV['DEBUG_VERBOSE'] type = @service.volume_types.get(type_id) - type.must_be_kind_of Fog::Volume::OpenStack::VolumeType + type.must_be_kind_of Fog::OpenStack::Volume::VolumeType type.id.must_equal type_id type.name.must_equal type_name @@ -193,7 +193,7 @@ def cleanup_test_object(collection, id) puts "Retrieving volume type by name..." if ENV['DEBUG_VERBOSE'] type = @service.volume_types.all(type_name).first - type.must_be_kind_of Fog::Volume::OpenStack::VolumeType + type.must_be_kind_of Fog::OpenStack::Volume::VolumeType type.id.must_equal type_id type.name.must_equal type_name end @@ -230,7 +230,7 @@ def cleanup_test_object(collection, id) # check that extending a non-existing volume fails puts "Extending deleted volume should fail..." if ENV['DEBUG_VERBOSE'] - proc { @service.extend_volume(volume.id, volume_size_small) }.must_raise Fog::Volume::OpenStack::NotFound + proc { @service.extend_volume(volume.id, volume_size_small) }.must_raise Fog::OpenStack::Volume::NotFound end end end @@ -259,7 +259,7 @@ def cleanup_test_object(collection, id) puts 'Retrieving transfer by ID...' if ENV['DEBUG_VERBOSE'] transfer = @service.transfers.get(transfer_id) - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name @@ -271,7 +271,7 @@ def cleanup_test_object(collection, id) transfers = @service.transfers.all(:name => transfer_name) transfers.length.must_equal 1 transfer = transfers[0] - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name @@ -292,7 +292,7 @@ def cleanup_test_object(collection, id) other_service.transfers.all(:name => transfer_name).length.must_equal 0 # # check that recipient cannot see the volume before transfer - # proc { other_service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # proc { other_service.volumes.get(volume.id) }.must_raise Fog::OpenStack::Compute::NotFound # other_service.volumes.all(@name_param => volume_name).length.must_equal 0 # The recipient can inexplicably see the volume even before the @@ -302,23 +302,23 @@ def cleanup_test_object(collection, id) # check that accept_transfer fails without valid transfer ID and auth key bogus_uuid = 'ec8ff7e8-81e2-4e12-b9fb-3e8890612c2d' # from Fog::UUID.uuid, but fixed to play nice with VCR - proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound + proc { other_service.transfers.accept(bogus_uuid, auth_key) }.must_raise Fog::OpenStack::Volume::NotFound proc { other_service.transfers.accept(transfer_id, 'invalidauthkey') }.must_raise Excon::Errors::BadRequest # accept transfer puts 'Accepting transfer...' if ENV['DEBUG_VERBOSE'] transfer = other_service.transfers.accept(transfer.id, auth_key) - transfer.must_be_kind_of Fog::Volume::OpenStack::Transfer + transfer.must_be_kind_of Fog::OpenStack::Volume::Transfer transfer.id.must_equal transfer_id transfer.name.must_equal transfer_name # check that recipient can see the volume volume = other_service.volumes.get(volume.id) - volume.must_be_kind_of Fog::Volume::OpenStack::Volume + volume.must_be_kind_of Fog::OpenStack::Volume::Volume # # check that sender cannot see the volume anymore - # proc { @service.volumes.get(volume.id) }.must_raise Fog::Compute::OpenStack::NotFound + # proc { @service.volumes.get(volume.id) }.must_raise Fog::OpenStack::Compute::NotFound # @service.volumes.all(@name_param => volume_name).length.must_equal 0 # As noted above, both users seem to be able to see the volume at all times. @@ -373,7 +373,7 @@ def cleanup_test_object(collection, id) # check that transfer cannot be accepted when it has been deleted puts 'Checking that accepting a deleted transfer fails...' if ENV['DEBUG_VERBOSE'] - proc { other_service.transfers.accept(transfer_id, auth_key) }.must_raise Fog::Volume::OpenStack::NotFound + proc { other_service.transfers.accept(transfer_id, auth_key) }.must_raise Fog::OpenStack::Volume::NotFound ensure # cleanup volume cleanup_test_object(@service.volumes, volume.id) if volume @@ -429,7 +429,7 @@ def cleanup_test_object(collection, id) # cleanup volume begin snapshot.destroy if snapshot - rescue Fog::Volume::OpenStack::NotFound + rescue Fog::OpenStack::Volume::NotFound # Don't care if it doesn't exist end diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index 0bc9d27ca..ebc9dab21 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -105,7 +105,7 @@ :openstack_auth_url => 'http://openstack:35357', :openstack_identity_api_version => 'v2.0' } - identity = Fog::Identity::OpenStack.new(creds) + identity = Fog::OpenStack::Identity.new(creds) identity.validate_token(@token, @tenant_token) identity.validate_token(@token) end @@ -115,7 +115,7 @@ :openstack_auth_url => 'http://openstack:35357', :openstack_identity_api_version => 'v2.0' } - identity = Fog::Identity::OpenStack.new(creds) + identity = Fog::OpenStack::Identity.new(creds) identity.check_token(@token, @tenant_token) identity.check_token(@token) end diff --git a/test/helpers/collection_helper.rb b/test/helpers/collection_helper.rb index 79275134c..85260ad65 100644 --- a/test/helpers/collection_helper.rb +++ b/test/helpers/collection_helper.rb @@ -16,7 +16,7 @@ def collection_tests(collection, params = {}) it "#create(#{params.inspect})" do unless Fog.mocking? - @instance.must_be_kind_of Fog::Network::OpenStack::SecurityGroup + @instance.must_be_kind_of Fog::OpenStack::Network::SecurityGroup end end @@ -27,13 +27,13 @@ def collection_tests(collection, params = {}) it "#all" do unless Fog.mocking? - collection.all.must_be_kind_of Fog::Network::OpenStack::SecurityGroups + collection.all.must_be_kind_of Fog::OpenStack::Network::SecurityGroups end end it "#get(#{@identity})" do unless Fog.mocking? - collection.get(@identity).must_be_kind_of Fog::Network::OpenStack::SecurityGroup + collection.get(@identity).must_be_kind_of Fog::OpenStack::Network::SecurityGroup end end diff --git a/test/helpers/container_infra_helper.rb b/test/helpers/container_infra_helper.rb index d0e19b9bb..69f34717a 100644 --- a/test/helpers/container_infra_helper.rb +++ b/test/helpers/container_infra_helper.rb @@ -4,7 +4,7 @@ def self.container_infra class_variable_get(:@@container_infra) end - class_variable_set(:@@container_infra, Fog::ContainerInfra::OpenStack.new) + class_variable_set(:@@container_infra, Fog::OpenStack::ContainerInfra.new) end end diff --git a/test/helpers/dns_v2_helper.rb b/test/helpers/dns_v2_helper.rb index 2d3c7d664..3ccb8e72b 100644 --- a/test/helpers/dns_v2_helper.rb +++ b/test/helpers/dns_v2_helper.rb @@ -1,5 +1,5 @@ def set_dns_data - @dns = Fog::DNS::OpenStack::V2.new + @dns = Fog::OpenStack::DNS::V2.new @zone = @dns.create_zone('example.org', 'hostmaster@example.org') @zone_id = @zone.body['id'] diff --git a/test/helpers/network_helper.rb b/test/helpers/network_helper.rb index 7d8f40e53..a15cf4eab 100644 --- a/test/helpers/network_helper.rb +++ b/test/helpers/network_helper.rb @@ -4,7 +4,7 @@ def self.network class_variable_get(:@@network) end - class_variable_set(:@@network, Fog::Network[:openstack]) + class_variable_set(:@@network, Fog::OpenStack::Network.new) end end diff --git a/test/helpers/nfv_helper.rb b/test/helpers/nfv_helper.rb index 3c89e3c4d..0f7c66c3a 100644 --- a/test/helpers/nfv_helper.rb +++ b/test/helpers/nfv_helper.rb @@ -1,5 +1,5 @@ def set_nfv_data - @nfv = Fog::NFV::OpenStack.new + @nfv = Fog::OpenStack::NFV.new @vnfd_data = { :attributes => { diff --git a/test/identity_version_tests.rb b/test/identity_version_tests.rb index 417b8a918..413fb144b 100644 --- a/test/identity_version_tests.rb +++ b/test/identity_version_tests.rb @@ -9,7 +9,7 @@ it "v2" do Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::Identity::OpenStack::V2::Real) do + assert(Fog::OpenStack::Identity::V2::Real) do Fog::Identity[:openstack].class end end @@ -17,7 +17,7 @@ it "v3" do Fog.credentials = {:openstack_auth_url => 'http://openstack:35357'} - assert(Fog::Identity::OpenStack::V3::Real) do + assert(Fog::OpenStack::Identity::V3::Real) do Fog::Identity[:openstack].class end end diff --git a/test/models/compute/images_tests.rb b/test/models/compute/images_tests.rb index 58131faa0..81e599882 100644 --- a/test/models/compute/images_tests.rb +++ b/test/models/compute/images_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Compute[:openstack] | images collection" do +describe "Fog::OpenStack::Compute | images collection" do describe "success" do describe "#all" do - let (:fog) { Fog::Compute[:openstack] } + let (:fog) { Fog::OpenStack::Compute.new } it "must be an Array" do fog.images.all.must_be_kind_of Array diff --git a/test/models/compute/security_group_tests.rb b/test/models/compute/security_group_tests.rb index 40d737fef..ca287e30e 100644 --- a/test/models/compute/security_group_tests.rb +++ b/test/models/compute/security_group_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Compute[:openstack] | security_group" do +describe "Fog::OpenStack::Compute | security_group" do describe "success" do - let(:fog) { Fog::Compute[:openstack] } + let(:fog) { Fog::OpenStack::Compute.new } let(:security_group) do fog.security_groups.create( :name => 'my_group', diff --git a/test/models/compute/server_group_tests.rb b/test/models/compute/server_group_tests.rb index d5a13333b..91fbdeb2d 100644 --- a/test/models/compute/server_group_tests.rb +++ b/test/models/compute/server_group_tests.rb @@ -1,16 +1,16 @@ require "test_helper" -describe "Fog::Compute::OpenStack::ServerGroup" do +describe "Fog::OpenStack::Compute::ServerGroup" do describe "validate_server_group_policy" do it "contains only allowed policies" do ['affinity', 'anti-affinity', 'soft-affinity', 'soft-anti-affinity'].each do |policy| - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy(policy).must_equal true + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy(policy).must_equal true end end it "raises an error" do assert_raises ArgumentError do - Fog::Compute::OpenStack::ServerGroup.validate_server_group_policy('invalid-policy') + Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy('invalid-policy') end end end diff --git a/test/models/compute/server_tests.rb b/test/models/compute/server_tests.rb index 90968657e..841a63685 100644 --- a/test/models/compute/server_tests.rb +++ b/test/models/compute/server_tests.rb @@ -1,7 +1,7 @@ require "test_helper" -describe "Fog::Compute[:openstack] | server" do - let (:compute) { Fog::Compute[:openstack] } +describe "Fog::OpenStack::Compute | server" do + let (:compute) { Fog::OpenStack::Compute.new } describe "success" do it "#floating_ips" do @@ -14,7 +14,7 @@ ) server.save - ip1 = Fog::Network[:openstack].floating_ips.create( + ip1 = Fog::OpenStack::Network.new.floating_ips.create( :floating_network_id => 'f0000000-0000-0000-0000-000000000000', :fixed_ip_address => '192.168.11.3' ) diff --git a/test/models/compute/service_tests.rb b/test/models/compute/service_tests.rb index ec75e1254..d692bdadc 100644 --- a/test/models/compute/service_tests.rb +++ b/test/models/compute/service_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Compute[:openstack] | services" do +describe "Fog::OpenStack::Compute | services" do describe "success" do before do - services = Fog::Compute[:openstack].services.all + services = Fog::OpenStack::Compute.new.services.all @service = services.first end @@ -12,7 +12,7 @@ end it "#get" do - service = Fog::Compute[:openstack].services.get(@service.id) + service = Fog::OpenStack::Compute.new.services.get(@service.id) %w(id binary host).all? do |attr| attr1 = service.send(attr.to_sym) attr2 = @service.send(attr.to_sym) diff --git a/test/models/container_infra/bay_model_tests.rb b/test/models/container_infra/bay_model_tests.rb index b20292b58..a71cf4742 100644 --- a/test/models/container_infra/bay_model_tests.rb +++ b/test/models/container_infra/bay_model_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay model" do +describe "Fog::OpenStack::ContainerInfra | bay model" do describe "success" do before do @instance = container_infra.bay_models.create( diff --git a/test/models/container_infra/bay_tests.rb b/test/models/container_infra/bay_tests.rb index a375b1817..409735be2 100644 --- a/test/models/container_infra/bay_tests.rb +++ b/test/models/container_infra/bay_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay" do +describe "Fog::OpenStack::ContainerInfra | bay" do describe "success" do before do @instance = container_infra.bays.create( diff --git a/test/models/container_infra/certificate_tests.rb b/test/models/container_infra/certificate_tests.rb index c5e4cd742..4457a103e 100644 --- a/test/models/container_infra/certificate_tests.rb +++ b/test/models/container_infra/certificate_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | certificate" do +describe "Fog::OpenStack::ContainerInfra | certificate" do describe "success" do before do @instance = container_infra.certificates.create( diff --git a/test/models/container_infra/cluster_template_tests.rb b/test/models/container_infra/cluster_template_tests.rb index 02ccfdda1..828e3df5f 100644 --- a/test/models/container_infra/cluster_template_tests.rb +++ b/test/models/container_infra/cluster_template_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | cluster template" do +describe "Fog::OpenStack::ContainerInfra | cluster template" do describe "success" do before do @instance = container_infra.cluster_templates.create( diff --git a/test/models/container_infra/cluster_tests.rb b/test/models/container_infra/cluster_tests.rb index a5ed37081..349a92d20 100644 --- a/test/models/container_infra/cluster_tests.rb +++ b/test/models/container_infra/cluster_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | cluster" do +describe "Fog::OpenStack::ContainerInfra | cluster" do describe "success" do before do @instance = container_infra.clusters.create( diff --git a/test/models/identity/ec2_credential_tests.rb b/test/models/identity/ec2_credential_tests.rb index ed661a8a5..09b97863f 100644 --- a/test/models/identity/ec2_credential_tests.rb +++ b/test/models/identity/ec2_credential_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credential" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/ec2_credentials_tests.rb b/test/models/identity/ec2_credentials_tests.rb index 0b32d443e..8f673d020 100644 --- a/test/models/identity/ec2_credentials_tests.rb +++ b/test/models/identity/ec2_credentials_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credentials" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } @@ -47,7 +47,7 @@ unless Fog.mocking? proc do @user.ec2_credentials.find_by_access_key('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -55,7 +55,7 @@ unless Fog.mocking? proc do @user.ec2_credentials.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end end diff --git a/test/models/identity/role_tests.rb b/test/models/identity/role_tests.rb index c39c8671c..b46adf880 100644 --- a/test/models/identity/role_tests.rb +++ b/test/models/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.roles.new( :name => 'Role Name', :user_id => 1, diff --git a/test/models/identity/roles_tests.rb b/test/models/identity/roles_tests.rb index a3da03888..cef09c724 100644 --- a/test/models/identity/roles_tests.rb +++ b/test/models/identity/roles_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | roles" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant = @identity.tenants.create(:name => 'test_user') @user = @identity.users.create(:name => 'test_user', :tenant_id => @tenant.id, :password => 'spoof') @role = @identity.roles(:user => @user, :tenant => @tenant).create(:name => 'test_role') @@ -17,7 +17,7 @@ describe "success" do it "#all" do - @roles.all.must_be_kind_of Fog::Identity::OpenStack::V2::Roles + @roles.all.must_be_kind_of Fog::OpenStack::Identity::V2::Roles end it "#get" do diff --git a/test/models/identity/tenant_tests.rb b/test/models/identity/tenant_tests.rb index 4d04467e6..a883ea219 100644 --- a/test/models/identity/tenant_tests.rb +++ b/test/models/identity/tenant_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | tenant" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') end describe "success" do diff --git a/test/models/identity/tenants_tests.rb b/test/models/identity/tenants_tests.rb index 572960e37..17f1a3948 100644 --- a/test/models/identity/tenants_tests.rb +++ b/test/models/identity/tenants_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Compute[:openstack] | tenants" do +describe "Fog::OpenStack::Compute | tenants" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @instance = @identity.tenants.create(:name => 'test') end @@ -22,7 +22,7 @@ unless Fog.mocking? proc do @identity.tenants.find_by_id('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -30,7 +30,7 @@ unless Fog.mocking? proc do @identity.tenants.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end end diff --git a/test/models/identity/user_tests.rb b/test/models/identity/user_tests.rb index 1d22aac7e..e4774fe7d 100644 --- a/test/models/identity/user_tests.rb +++ b/test/models/identity/user_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | user" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.new( :name => 'User Name', diff --git a/test/models/identity/users_tests.rb b/test/models/identity/users_tests.rb index 125027076..bc1c750c4 100644 --- a/test/models/identity/users_tests.rb +++ b/test/models/identity/users_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | users" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.create( :name => 'foobar', @@ -34,7 +34,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.find_by_id('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -42,7 +42,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.find_by_name('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end @@ -50,7 +50,7 @@ unless Fog.mocking? proc do Fog::Identity[:openstack].users.destroy('fake') - end.must_raise(Fog::Identity::OpenStack::NotFound) + end.must_raise(Fog::OpenStack::Identity::NotFound) end end end diff --git a/test/models/image/image_tests.rb b/test/models/image/image_tests.rb index ad7cdc6fa..79e61b544 100644 --- a/test/models/image/image_tests.rb +++ b/test/models/image/image_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Image[:openstack] | image" do +describe "Fog::OpenStack::Image | image" do describe "success" do before do - @instance = Fog::Image[:openstack].images.create(:name => 'test image') + @instance = Fog::OpenStack::Image.new.images.create(:name => 'test image') end it "#create" do diff --git a/test/models/image/images_tests.rb b/test/models/image/images_tests.rb index d61e90916..8b5f3eaf0 100644 --- a/test/models/image/images_tests.rb +++ b/test/models/image/images_tests.rb @@ -1,22 +1,22 @@ require "test_helper" -describe "Fog::Image[:openstack] | images" do +describe "Fog::OpenStack::Image | images" do before do - @instance = Fog::Image[:openstack].create_image(:name => "model test image").body + @instance = Fog::OpenStack::Image.new.create_image(:name => "model test image").body end describe "success" do it "#find_by_id" do - image = Fog::Image[:openstack].images.find_by_id(@instance['image']['id']) + image = Fog::OpenStack::Image.new.images.find_by_id(@instance['image']['id']) image.id.must_equal @instance['image']['id'] end it "#get" do - image = Fog::Image[:openstack].images.get(@instance['image']['id']) + image = Fog::OpenStack::Image.new.images.get(@instance['image']['id']) image.id.must_equal @instance['image']['id'] end it "#destroy" do - Fog::Image[:openstack].images.destroy(@instance['image']['id']).must_equal true + Fog::OpenStack::Image.new.images.destroy(@instance['image']['id']).must_equal true end end end diff --git a/test/models/network/floating_ip_tests.rb b/test/models/network/floating_ip_tests.rb index e12bd0a7a..bf0656819 100644 --- a/test/models/network/floating_ip_tests.rb +++ b/test/models/network/floating_ip_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | floating_ip" do +describe "Fog::OpenStack::Network | floating_ip" do describe "success" do let (:instance) do network.floating_ips.create( diff --git a/test/models/network/floating_ips_tests.rb b/test/models/network/floating_ips_tests.rb index c4d08fa8b..ed349ad5b 100644 --- a/test/models/network/floating_ips_tests.rb +++ b/test/models/network/floating_ips_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | floating_ips" do +describe "Fog::OpenStack::Network | floating_ips" do before do @floating_ip = network.floating_ips.create( :floating_network_id => 'f0000000-0000-0000-0000-000000000000' diff --git a/test/models/network/ike_policies_tests.rb b/test/models/network/ike_policies_tests.rb index bff516124..0149ffcc9 100644 --- a/test/models/network/ike_policies_tests.rb +++ b/test/models/network/ike_policies_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ike_policies" do +describe "Fog::OpenStack::Network | ike_policies" do before do @ike_policy = network.ike_policies.create( :name => 'test-ike-policy', diff --git a/test/models/network/ike_policy_tests.rb b/test/models/network/ike_policy_tests.rb index ceeace123..fb82f19f8 100644 --- a/test/models/network/ike_policy_tests.rb +++ b/test/models/network/ike_policy_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ike_policy" do +describe "Fog::OpenStack::Network | ike_policy" do describe "success" do before do @instance = network.ike_policies.create( diff --git a/test/models/network/ipsec_policies_tests.rb b/test/models/network/ipsec_policies_tests.rb index 4c00bcf7f..4a9911406 100644 --- a/test/models/network/ipsec_policies_tests.rb +++ b/test/models/network/ipsec_policies_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_policies" do +describe "Fog::OpenStack::Network | ipsec_policies" do before do params = { :name => 'test-ipsec-policy', diff --git a/test/models/network/ipsec_policy_tests.rb b/test/models/network/ipsec_policy_tests.rb index f9bd4a353..bef9e84f4 100644 --- a/test/models/network/ipsec_policy_tests.rb +++ b/test/models/network/ipsec_policy_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_policy" do +describe "Fog::OpenStack::Network | ipsec_policy" do describe "success" do before do @instance = network.ipsec_policies.create( diff --git a/test/models/network/ipsec_site_connection_tests.rb b/test/models/network/ipsec_site_connection_tests.rb index 79c87f675..025a45160 100644 --- a/test/models/network/ipsec_site_connection_tests.rb +++ b/test/models/network/ipsec_site_connection_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_site_connection" do +describe "Fog::OpenStack::Network | ipsec_site_connection" do describe "success" do before do params = { diff --git a/test/models/network/ipsec_site_connections_tests.rb b/test/models/network/ipsec_site_connections_tests.rb index 8dae7d416..02ff78e44 100644 --- a/test/models/network/ipsec_site_connections_tests.rb +++ b/test/models/network/ipsec_site_connections_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ipsec_site_connections" do +describe "Fog::OpenStack::Network | ipsec_site_connections" do before do params = { :name => 'test-ipsec-site-connection', diff --git a/test/models/network/lb_health_monitor_tests.rb b/test/models/network/lb_health_monitor_tests.rb index ae39cc7b4..8aa96723e 100644 --- a/test/models/network/lb_health_monitor_tests.rb +++ b/test/models/network/lb_health_monitor_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_health_monitor" do +describe "Fog::OpenStack::Network | lb_health_monitor" do describe "success" do before do @lb_pool = network.lb_pools.create( diff --git a/test/models/network/lb_health_monitors_tests.rb b/test/models/network/lb_health_monitors_tests.rb index d0a3af737..0546432cf 100644 --- a/test/models/network/lb_health_monitors_tests.rb +++ b/test/models/network/lb_health_monitors_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_health_monitors" do +describe "Fog::OpenStack::Network | lb_health_monitors" do before do @lb_health_monitor = network.lb_health_monitors.create( :type => 'PING', diff --git a/test/models/network/lb_member_tests.rb b/test/models/network/lb_member_tests.rb index d952f8730..69da26787 100644 --- a/test/models/network/lb_member_tests.rb +++ b/test/models/network/lb_member_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_member" do +describe "Fog::OpenStack::Network | lb_member" do describe "success" do before do @instance = network.lb_members.create( diff --git a/test/models/network/lb_members_tests.rb b/test/models/network/lb_members_tests.rb index e47cefa95..c43161936 100644 --- a/test/models/network/lb_members_tests.rb +++ b/test/models/network/lb_members_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_members" do +describe "Fog::OpenStack::Network | lb_members" do before do @lb_member = network.lb_members.create( :pool_id => 'pool_id', diff --git a/test/models/network/lb_pool_tests.rb b/test/models/network/lb_pool_tests.rb index 2c46a6f03..350ee2f4e 100644 --- a/test/models/network/lb_pool_tests.rb +++ b/test/models/network/lb_pool_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_pool" do +describe "Fog::OpenStack::Network | lb_pool" do describe "success" do before do @lb_health_monitor = network.lb_health_monitors.create( diff --git a/test/models/network/lb_pools_tests.rb b/test/models/network/lb_pools_tests.rb index 67ce0e352..9ade42c74 100644 --- a/test/models/network/lb_pools_tests.rb +++ b/test/models/network/lb_pools_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_pools" do +describe "Fog::OpenStack::Network | lb_pools" do before do @lb_pool = network.lb_pools.create( :subnet_id => 'subnet_id', diff --git a/test/models/network/lb_vip_tests.rb b/test/models/network/lb_vip_tests.rb index 9553a9142..37cadd52c 100644 --- a/test/models/network/lb_vip_tests.rb +++ b/test/models/network/lb_vip_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_vip" do +describe "Fog::OpenStack::Network | lb_vip" do describe "success" do before do attributes = { diff --git a/test/models/network/lb_vips_tests.rb b/test/models/network/lb_vips_tests.rb index b428477b0..9adf25765 100644 --- a/test/models/network/lb_vips_tests.rb +++ b/test/models/network/lb_vips_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | lb_vips" do +describe "Fog::OpenStack::Network | lb_vips" do before do @lb_vip = network.lb_vips.create( :subnet_id => 'subnet_id', diff --git a/test/models/network/network_tests.rb b/test/models/network/network_tests.rb index c94ee566f..946bb7635 100644 --- a/test/models/network/network_tests.rb +++ b/test/models/network/network_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | network" do +describe "Fog::OpenStack::Network | network" do describe "success" do before do @instance = network.networks.create( diff --git a/test/models/network/networks_tests.rb b/test/models/network/networks_tests.rb index 6f7970f43..abdb6214e 100644 --- a/test/models/network/networks_tests.rb +++ b/test/models/network/networks_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | networks" do +describe "Fog::OpenStack::Network | networks" do before do @network = network.networks.create( :name => 'net_name', diff --git a/test/models/network/port_tests.rb b/test/models/network/port_tests.rb index c6db13aef..e1f996ad6 100644 --- a/test/models/network/port_tests.rb +++ b/test/models/network/port_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | port" do +describe "Fog::OpenStack::Network | port" do describe "success" do before do @instance = network.ports.create( diff --git a/test/models/network/ports_tests.rb b/test/models/network/ports_tests.rb index 94a93479e..2a7f7eb55 100644 --- a/test/models/network/ports_tests.rb +++ b/test/models/network/ports_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | ports" do +describe "Fog::OpenStack::Network | ports" do before do @port = network.ports.create( :name => 'port_name', diff --git a/test/models/network/router_tests.rb b/test/models/network/router_tests.rb index 09f806fdb..a1bf17621 100644 --- a/test/models/network/router_tests.rb +++ b/test/models/network/router_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | router" do +describe "Fog::OpenStack::Network | router" do describe "success" do before do @instance = network.routers.create( diff --git a/test/models/network/routers_tests.rb b/test/models/network/routers_tests.rb index 2e81a8a2c..cbd0cae0b 100644 --- a/test/models/network/routers_tests.rb +++ b/test/models/network/routers_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | routers" do +describe "Fog::OpenStack::Network | routers" do before do @router = network.routers.create( :name => 'router_name', diff --git a/test/models/network/security_group_rule_tests.rb b/test/models/network/security_group_rule_tests.rb index c4894bd80..39dbfaba3 100644 --- a/test/models/network/security_group_rule_tests.rb +++ b/test/models/network/security_group_rule_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/model_helper" -describe "Fog::Network[:openstack] | security_group_rule model" do +describe "Fog::OpenStack::Network | security_group_rule model" do @secgroup = network.security_groups.create(:name => "fogsecgroup") attributes = {:security_group_id => @secgroup.id, :direction => "ingress"} model_tests(network.security_group_rules, attributes) diff --git a/test/models/network/security_group_rules_tests.rb b/test/models/network/security_group_rules_tests.rb index 4c34fb69d..8cb149e64 100644 --- a/test/models/network/security_group_rules_tests.rb +++ b/test/models/network/security_group_rules_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/collection_helper" -describe "Fog::Network[:openstack] | security_group_rules collection" do +describe "Fog::OpenStack::Network | security_group_rules collection" do @secgroup = network.security_groups.create(:name => "my_secgroup") attributes = {:security_group_id => @secgroup.id, :direction => "ingress"} collection_tests(network.security_group_rules, attributes) diff --git a/test/models/network/security_group_tests.rb b/test/models/network/security_group_tests.rb index 25d9b288c..d48319259 100644 --- a/test/models/network/security_group_tests.rb +++ b/test/models/network/security_group_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/model_helper" -describe "Fog::Network[:openstack] | security_group model" do +describe "Fog::OpenStack::Network | security_group model" do model_tests(network.security_groups, :name => "fogsecgroup") describe "success" do diff --git a/test/models/network/security_groups_tests.rb b/test/models/network/security_groups_tests.rb index 4f3cff179..06eda8e40 100644 --- a/test/models/network/security_groups_tests.rb +++ b/test/models/network/security_groups_tests.rb @@ -2,7 +2,7 @@ require "helpers/network_helper" require "helpers/collection_helper" -describe "Fog::Network[:openstack] | security_groups collection" do +describe "Fog::OpenStack::Network | security_groups collection" do @attributes = { :name => "my_secgroup", :description => "my sec group desc" diff --git a/test/models/network/subnet_pools_tests.rb b/test/models/network/subnet_pools_tests.rb index d76f6720c..1aabc0d6b 100644 --- a/test/models/network/subnet_pools_tests.rb +++ b/test/models/network/subnet_pools_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require "helpers/network_helper" -describe 'Fog::Network[:openstack] | subnet_pools' do +describe 'Fog::OpenStack::Network | subnet_pools' do describe 'success' do before do @subnet_pool = network.subnet_pools.create( diff --git a/test/models/network/subnet_tests.rb b/test/models/network/subnet_tests.rb index 64a5b26ea..b4b217332 100644 --- a/test/models/network/subnet_tests.rb +++ b/test/models/network/subnet_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | subnet" do +describe "Fog::OpenStack::Network | subnet" do describe "success" do before do @instance = network.subnets.create( diff --git a/test/models/network/subnets_tests.rb b/test/models/network/subnets_tests.rb index cb7ed4c91..0f92c49e7 100644 --- a/test/models/network/subnets_tests.rb +++ b/test/models/network/subnets_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | subnets" do +describe "Fog::OpenStack::Network | subnets" do describe "success" do before do @subnet = network.subnets.create( diff --git a/test/models/network/vpn_service_tests.rb b/test/models/network/vpn_service_tests.rb index 3c80baf72..af9b7dc3b 100644 --- a/test/models/network/vpn_service_tests.rb +++ b/test/models/network/vpn_service_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | vpn_service" do +describe "Fog::OpenStack::Network | vpn_service" do describe "success" do before do @instance = network.vpn_services.create( diff --git a/test/models/network/vpn_services_tests.rb b/test/models/network/vpn_services_tests.rb index ceeccf9ab..35af8740f 100644 --- a/test/models/network/vpn_services_tests.rb +++ b/test/models/network/vpn_services_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/network_helper" -describe "Fog::Network[:openstack] | vpn_services" do +describe "Fog::OpenStack::Network | vpn_services" do before do @vpn_service = network.vpn_services.create( :subnet_id => 'foo', diff --git a/test/models/planning/plan_tests.rb b/test/models/planning/plan_tests.rb index bada3ea61..1a2bcf8a6 100644 --- a/test/models/planning/plan_tests.rb +++ b/test/models/planning/plan_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | plan" do +describe "Fog::OpenStack::Planning | plan" do describe "success" do before do - @planning = Fog::OpenStack[:planning] + @planning = Fog::OpenStack::Planning.new @instance = @planning.plans.first @role = @planning.list_roles.body.first end diff --git a/test/models/planning/plans_tests.rb b/test/models/planning/plans_tests.rb index c87d8f7d9..dba84e72b 100644 --- a/test/models/planning/plans_tests.rb +++ b/test/models/planning/plans_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | plans" do +describe "Fog::OpenStack::Planning | plans" do describe "success" do before do - @planning = Fog::OpenStack[:planning] + @planning = Fog::OpenStack::Planning.new @instance = @planning.plans.all.first end diff --git a/test/models/planning/role_tests.rb b/test/models/planning/role_tests.rb index 8ed226937..1ee5d2600 100644 --- a/test/models/planning/role_tests.rb +++ b/test/models/planning/role_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | plan" do +describe "Fog::OpenStack::Planning | plan" do describe "success" do before do - @instance = Fog::OpenStack[:planning].roles.first - @plan = Fog::OpenStack[:planning].list_plans.body.first + @instance = Fog::OpenStack::Planning.new.roles.first + @plan = Fog::OpenStack::Planning.new.list_plans.body.first end it "#add_role" do diff --git a/test/models/storage/file_tests.rb b/test/models/storage/file_tests.rb index f5c1398c3..48ca223c5 100644 --- a/test/models/storage/file_tests.rb +++ b/test/models/storage/file_tests.rb @@ -29,7 +29,7 @@ def clear_metadata :key => "fogfilestests-#{rand(65536)}" } - @directory = Fog::Storage[:openstack].directories.create(directory_attributes) + @directory = Fog::OpenStack::Storage.new.directories.create(directory_attributes) describe "Fog::OpenStack::Storage | file" do after do diff --git a/test/requests/baremetal/chassis_tests.rb b/test/requests/baremetal/chassis_tests.rb index 43d659074..b858dc3c0 100644 --- a/test/requests/baremetal/chassis_tests.rb +++ b/test/requests/baremetal/chassis_tests.rb @@ -1,9 +1,9 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal chassis requests" do +describe "Fog::OpenStack::Baremetal | Baremetal chassis requests" do describe "success" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @chassis_format = { 'description' => String, diff --git a/test/requests/baremetal/driver_tests.rb b/test/requests/baremetal/driver_tests.rb index 34043581a..6c976b9a8 100644 --- a/test/requests/baremetal/driver_tests.rb +++ b/test/requests/baremetal/driver_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal driver requests" do +describe "Fog::OpenStack::Baremetal | Baremetal driver requests" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @driver_format = { 'hosts' => Array, diff --git a/test/requests/baremetal/node_tests.rb b/test/requests/baremetal/node_tests.rb index a8226efcc..99b61b308 100644 --- a/test/requests/baremetal/node_tests.rb +++ b/test/requests/baremetal/node_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal node requests" do +describe "Fog::OpenStack::Baremetal | Baremetal node requests" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @node_format = { 'instance_uuid' => Fog::Nullable::String, 'maintenance' => Fog::Boolean, diff --git a/test/requests/baremetal/port_tests.rb b/test/requests/baremetal/port_tests.rb index b408d69e2..689b7d046 100644 --- a/test/requests/baremetal/port_tests.rb +++ b/test/requests/baremetal/port_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Baremetal[:openstack] | Baremetal port requests" do +describe "Fog::OpenStack::Baremetal | Baremetal port requests" do before do - @baremetal = Fog::Baremetal[:openstack] + @baremetal = Fog::OpenStack::Baremetal.new @port_format = { 'address' => String, @@ -31,13 +31,13 @@ before do node_attributes = {:driver => 'pxe_ipmitool'} - @instance = Fog::Baremetal[:openstack].create_node(node_attributes).body + @instance = Fog::OpenStack::Baremetal.new.create_node(node_attributes).body port_attributes = { :address => '00:c2:08:85:de:ca', :node_uuid => @instance['uuid'] } - @port = Fog::Baremetal[:openstack].create_port(port_attributes).body + @port = Fog::OpenStack::Baremetal.new.create_port(port_attributes).body end it "#create_port" do diff --git a/test/requests/compute/address_tests.rb b/test/requests/compute/address_tests.rb index 39e4983c7..f43656aaf 100644 --- a/test/requests/compute/address_tests.rb +++ b/test/requests/compute/address_tests.rb @@ -7,7 +7,7 @@ # such as "warning: class variable access from toplevel" which pollute the tests # output. The latter has been avoided using class_variable_set/get and class # methods to wrap them. -describe "Fog::Compute[:openstack] | address requests" do +describe "Fog::OpenStack::Compute | address requests" do def self.compute class_variable_get(:@@compute) end @@ -20,7 +20,7 @@ def self.data class_variable_get(:@@data) end - class_variable_set(:@@compute, Fog::Compute[:openstack]) + class_variable_set(:@@compute, Fog::OpenStack::Compute.new) class_variable_set(:@@server_id, compute.create_server("test_server", get_image_ref, diff --git a/test/requests/compute/aggregate_tests.rb b/test/requests/compute/aggregate_tests.rb index a661da6a0..c21ce334a 100644 --- a/test/requests/compute/aggregate_tests.rb +++ b/test/requests/compute/aggregate_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | Compute aggregate requests" do +describe "Fog::OpenStack::Compute | Compute aggregate requests" do before do @aggregate_format = { "availability_zone" => Fog::Nullable::String, @@ -14,7 +14,7 @@ @detailed_aggregate_format = @aggregate_format.merge('hosts' => Array) @metadata_aggregate_format = @aggregate_format.merge("metadata" => Hash) - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @aggregate_body = @compute.create_aggregate('test_aggregate').body @aggregate = @aggregate_body['aggregate'] diff --git a/test/requests/compute/availability_zone_tests.rb b/test/requests/compute/availability_zone_tests.rb index 6a2137ed0..2da624419 100644 --- a/test/requests/compute/availability_zone_tests.rb +++ b/test/requests/compute/availability_zone_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | availability zone requests" do +describe "Fog::OpenStack::Compute | availability zone requests" do before do @flavor_format = { 'zoneName' => String, @@ -11,12 +11,12 @@ describe "success" do it "#list_zones" do - Fog::Compute[:openstack].list_zones.body. + Fog::OpenStack::Compute.new.list_zones.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end it "#list_zones_detailed" do - Fog::Compute[:openstack].list_zones_detailed.body. + Fog::OpenStack::Compute.new.list_zones_detailed.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end end diff --git a/test/requests/compute/flavor_tests.rb b/test/requests/compute/flavor_tests.rb index 171fe10cf..27052fd67 100644 --- a/test/requests/compute/flavor_tests.rb +++ b/test/requests/compute/flavor_tests.rb @@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::Compute[:openstack] | flavor requests" do +describe "Fog::OpenStack::Compute | flavor requests" do before do @flavor_format = { 'id' => String, @@ -18,7 +18,7 @@ 'vcpus' => Integer } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new end describe "success" do @@ -89,14 +89,14 @@ it "#get_flavor_details(0)" do proc do @compute.get_flavor_details("0") - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "add_flavor_access(1234, 1)" do unless Fog.mocking? proc do @compute.add_flavor_access(1234, 1).body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -104,7 +104,7 @@ unless Fog.mocking? proc do @compute.remove_flavor_access(1234, 1).body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -112,7 +112,7 @@ unless Fog.mocking? proc do @compute.list_tenants_with_flavor_access(1234) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -120,7 +120,7 @@ unless Fog.mocking? proc do @compute.get_flavor_metadata("1234").body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -129,7 +129,7 @@ proc do metadata = {:cpu_arch => 'x86_64'} @compute.create_flavor_metadata("1234", metadata).body - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end end diff --git a/test/requests/compute/helper.rb b/test/requests/compute/helper.rb index ee4e0d547..d549e69a2 100644 --- a/test/requests/compute/helper.rb +++ b/test/requests/compute/helper.rb @@ -11,15 +11,15 @@ module Formats end def get_flavor_ref - ENV['OPENSTACK_FLAVOR_REF'] || Fog::Compute[:openstack].list_flavors.body['flavors'].first['id'] + ENV['OPENSTACK_FLAVOR_REF'] || Fog::OpenStack::Compute.new.list_flavors.body['flavors'].first['id'] end def get_image_ref - ENV['OPENSTACK_IMAGE_REF'] || Fog::Compute[:openstack].list_images.body['images'].first['id'] + ENV['OPENSTACK_IMAGE_REF'] || Fog::OpenStack::Compute.new.list_images.body['images'].first['id'] end def get_volume_ref - ENV['OPENSTACK_VOLUME_REF'] || Fog::Compute[:openstack].list_volumes.body['volumes'].first['id'] + ENV['OPENSTACK_VOLUME_REF'] || Fog::OpenStack::Compute.new.list_volumes.body['volumes'].first['id'] end def get_flavor_ref_resize @@ -34,5 +34,5 @@ def set_password_enabled def get_security_group_ref ENV['OPENSTACK_SECURITY_GROUP_REF'] || - Fog::Compute[:openstack].list_security_groups.body['security_groups'].first['name'] + Fog::OpenStack::Compute.new.list_security_groups.body['security_groups'].first['name'] end diff --git a/test/requests/compute/image_tests.rb b/test/requests/compute/image_tests.rb index b2d21675f..6577314ca 100644 --- a/test/requests/compute/image_tests.rb +++ b/test/requests/compute/image_tests.rb @@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::Compute[:openstack] | image requests" do +describe "Fog::OpenStack::Compute | image requests" do before do @image_format = { 'created' => Fog::Nullable::String, @@ -18,12 +18,12 @@ 'links' => Array } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new end describe "success" do before do - @image_id = Fog::Compute[:openstack].images[0].id + @image_id = Fog::OpenStack::Compute.new.images[0].id unless Fog.mocking? @compute.images.get(@image_id).wait_for { ready? } end @@ -58,7 +58,7 @@ unless Fog.mocking? proc do @compute.delete_image(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -66,7 +66,7 @@ unless Fog.mocking? proc do @compute.get_image_details(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end end diff --git a/test/requests/compute/keypair_tests.rb b/test/requests/compute/keypair_tests.rb index 3947bc8fe..8f5876eb0 100644 --- a/test/requests/compute/keypair_tests.rb +++ b/test/requests/compute/keypair_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | keypair requests" do +describe "Fog::OpenStack::Compute | keypair requests" do before do @keypair_format = { "public_key" => String, @@ -19,17 +19,17 @@ describe "success" do it "#create_key_pair((key_name, public_key = nil))" do - Fog::Compute[:openstack].create_key_pair('from_shindo_test').body. + Fog::OpenStack::Compute.new.create_key_pair('from_shindo_test').body. must_match_schema("keypair" => @keypair_format) end it "#list_key_pairs" do - Fog::Compute[:openstack].list_key_pairs.body. + Fog::OpenStack::Compute.new.list_key_pairs.body. must_match_schema("keypairs" => [{"keypair" => @keypair_list_format}]) end it "#delete_key_pair(key_name)" do - Fog::Compute[:openstack].delete_key_pair('from_shindo_test').status.must_equal 202 + Fog::OpenStack::Compute.new.delete_key_pair('from_shindo_test').status.must_equal 202 end end end diff --git a/test/requests/compute/limit_tests.rb b/test/requests/compute/limit_tests.rb index 2d90621e3..c827dba8e 100644 --- a/test/requests/compute/limit_tests.rb +++ b/test/requests/compute/limit_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | limits requests" do +describe "Fog::OpenStack::Compute | limits requests" do before do @rate_limit_format = { 'regex' => String, @@ -44,22 +44,22 @@ describe "success" do describe "#get_limits" do it "format" do - Fog::Compute[:openstack].get_limits.body['limits']. + Fog::OpenStack::Compute.new.get_limits.body['limits']. must_match_schema(@limits_format) end it "rate limit format" do - Fog::Compute[:openstack].get_limits.body['limits']['rate']. + Fog::OpenStack::Compute.new.get_limits.body['limits']['rate']. first.must_match_schema(@rate_limit_format) end it "rate limit usage format" do - Fog::Compute[:openstack].get_limits.body['limits']['rate']. + Fog::OpenStack::Compute.new.get_limits.body['limits']['rate']. first['limit'].first.must_match_schema(@rate_limit_usage_format) end it "absolute limits format" do - Fog::Compute[:openstack].get_limits.body['limits']['absolute']. + Fog::OpenStack::Compute.new.get_limits.body['limits']['absolute']. must_match_schema(@absolute_limits_format) end end diff --git a/test/requests/compute/quota_tests.rb b/test/requests/compute/quota_tests.rb index ef0657267..584622010 100644 --- a/test/requests/compute/quota_tests.rb +++ b/test/requests/compute/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Compute[:openstack] | quota requests" do +describe "Fog::OpenStack::Compute | quota requests" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'key_pairs' => Integer, @@ -21,7 +21,7 @@ 'id' => String } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @quota = @compute.get_quota(@tenant_id).body['quota_set'] end diff --git a/test/requests/compute/security_group_tests.rb b/test/requests/compute/security_group_tests.rb index 1767a6dc5..f776fd523 100644 --- a/test/requests/compute/security_group_tests.rb +++ b/test/requests/compute/security_group_tests.rb @@ -22,7 +22,7 @@ "parent_group_id" => Integer } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @security_group = @compute.create_security_group('from_shindo_test', 'this is from the shindo test' ).body diff --git a/test/requests/compute/server_tests.rb b/test/requests/compute/server_tests.rb index 3f57e4515..3d7b30c3f 100644 --- a/test/requests/compute/server_tests.rb +++ b/test/requests/compute/server_tests.rb @@ -2,12 +2,12 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper')) -describe "Fog::Compute[:openstack] | server requests" do +describe "Fog::OpenStack::Compute | server requests" do def self.compute class_variable_get(:@@compute) end - class_variable_set(:@@compute, Fog::Compute[:openstack]) + class_variable_set(:@@compute, Fog::OpenStack::Compute.new) def compute self.class.compute @@ -153,7 +153,7 @@ def compute @data = compute.create_server("test", @image_id, @flavor_id).body['server'] @server_id = @data['id'] compute.servers.get(@server_id).wait_for { ready? } unless Fog.mocking? - # Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } + # Fog::OpenStack::Compute.new.servers.get(@server_id).wait_for { ready? } end it "#create_server('test', #{@image_id}, 19)" do @@ -331,7 +331,7 @@ def compute # DELETE IMAGE it "#delete_image(#{@snapshot_id})" do - Fog::Compute[:openstack].servers.get(@server_id).wait_for { ready? } + Fog::OpenStack::Compute.new.servers.get(@server_id).wait_for { ready? } assert(compute.delete_image(@snapshot_id)) end end @@ -341,26 +341,26 @@ def compute it "#delete_server(0)" do proc do self.class.compute.delete_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "#get_server_details(0)" do proc do self.class.compute.get_server_details(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "#update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver')" do proc do self.class.compute.update_server(0, :name => 'fogupdatedserver', :adminPass => 'fogupdatedserver') - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end it "#reboot_server(0)" do unless Fog.mocking? proc do self.class.compute.reboot_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -368,7 +368,7 @@ def compute unless Fog.mocking? proc do self.class.compute.start_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end @@ -376,7 +376,7 @@ def compute unless Fog.mocking? proc do self.class.compute.stop_server(0) - end.must_raise Fog::Compute::OpenStack::NotFound + end.must_raise Fog::OpenStack::Compute::NotFound end end end diff --git a/test/requests/compute/service_tests.rb b/test/requests/compute/service_tests.rb index 5107caa6c..74f1a6063 100644 --- a/test/requests/compute/service_tests.rb +++ b/test/requests/compute/service_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Shindo.tests('Fog::Compute[:openstack] | service requests" do +describe "Shindo.tests('Fog::OpenStack::Compute.new | service requests" do before do @service_format = { "id" => Integer, @@ -12,7 +12,7 @@ "zone" => String, 'disabled_reason' => Fog::Nullable::String } - @services = Fog::Compute[:openstack].list_services.body + @services = Fog::OpenStack::Compute.new.list_services.body @service = @services['services'].last end @@ -22,13 +22,13 @@ end it "#disable_service" do - Fog::Compute[:openstack].disable_service( + Fog::OpenStack::Compute.new.disable_service( @service['host'], @service['binary'] ).body["service"]["status"].must_equal "disabled" end it "#disable_service_log_reason" do - disabled_service = Fog::Compute[:openstack].disable_service_log_reason( + disabled_service = Fog::OpenStack::Compute.new.disable_service_log_reason( @service['host'], @service['binary'], 'reason' ).body disabled_service["service"]["status"].must_equal "disabled" @@ -36,7 +36,7 @@ end it "#enable_service" do - Fog::Compute[:openstack].enable_service( + Fog::OpenStack::Compute.new.enable_service( @service['host'], @service['binary'] ).body["service"]["status"].must_equal "enabled" end diff --git a/test/requests/compute/tenant_tests.rb b/test/requests/compute/tenant_tests.rb index b6804793d..ccc25cc02 100644 --- a/test/requests/compute/tenant_tests.rb +++ b/test/requests/compute/tenant_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | tenant requests" do +describe "Fog::OpenStack::Compute | tenant requests" do before do @tenant_format = { 'id' => String, @@ -12,13 +12,13 @@ describe "success" do it "#list_tenants" do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') identity.list_tenants.body. must_match_schema('tenants_links' => Array, 'tenants' => [@tenant_format]) end it "#set_tenant admin" do - Fog::Compute[:openstack].set_tenant("admin").must_equal true + Fog::OpenStack::Compute.new.set_tenant("admin").must_equal true end end end diff --git a/test/requests/compute/volume_tests.rb b/test/requests/compute/volume_tests.rb index 1237d4878..ec78c1409 100644 --- a/test/requests/compute/volume_tests.rb +++ b/test/requests/compute/volume_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Compute[:openstack] | volume requests" do +describe "Fog::OpenStack::Compute | volume requests" do before do @volume_format = { 'id' => String, @@ -16,7 +16,7 @@ 'metadata' => Hash } - @compute = Fog::Compute[:openstack] + @compute = Fog::OpenStack::Compute.new @volume = @compute.create_volume('loud', 'this is a loud volume', 3).body end diff --git a/test/requests/container_infra/bay_model_tests.rb b/test/requests/container_infra/bay_model_tests.rb index 903268315..677c26dff 100644 --- a/test/requests/container_infra/bay_model_tests.rb +++ b/test/requests/container_infra/bay_model_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay model requests" do +describe "Fog::OpenStack::ContainerInfra | bay model requests" do before do @bay_model_format = { "insecure_registry" => Fog::Nullable::String, diff --git a/test/requests/container_infra/bay_tests.rb b/test/requests/container_infra/bay_tests.rb index 83254a9b8..3f0fe6713 100644 --- a/test/requests/container_infra/bay_tests.rb +++ b/test/requests/container_infra/bay_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | bay requests" do +describe "Fog::OpenStack::ContainerInfra | bay requests" do before do @bay_format = { "status" => String, diff --git a/test/requests/container_infra/certificate_tests.rb b/test/requests/container_infra/certificate_tests.rb index 8dfff9dda..488bb3b5e 100644 --- a/test/requests/container_infra/certificate_tests.rb +++ b/test/requests/container_infra/certificate_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | certificate requests" do +describe "Fog::OpenStack::ContainerInfra | certificate requests" do before do @certificate_format = { "pem" => String, diff --git a/test/requests/container_infra/cluster_template_tests.rb b/test/requests/container_infra/cluster_template_tests.rb index a8f495355..418a580a4 100644 --- a/test/requests/container_infra/cluster_template_tests.rb +++ b/test/requests/container_infra/cluster_template_tests.rb @@ -3,7 +3,7 @@ @cluster_templates = [] -describe "Fog::ContainerInfra[:openstack] | cluster template requests" do +describe "Fog::OpenStack::ContainerInfra | cluster template requests" do before do @cluster_template_format = { "insecure_registry" => Fog::Nullable::String, diff --git a/test/requests/container_infra/cluster_tests.rb b/test/requests/container_infra/cluster_tests.rb index 63812e15d..100a3c08a 100644 --- a/test/requests/container_infra/cluster_tests.rb +++ b/test/requests/container_infra/cluster_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/container_infra_helper' -describe "Fog::ContainerInfra[:openstack] | cluster requests" do +describe "Fog::OpenStack::ContainerInfra | cluster requests" do before do @cluster_format = { "status" => String, diff --git a/test/requests/dns_v1/domain_tests.rb b/test/requests/dns_v1/domain_tests.rb index d714d7ae6..0774c6ccc 100644 --- a/test/requests/dns_v1/domain_tests.rb +++ b/test/requests/dns_v1/domain_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::DNS::OpenStack::V1 | domain requests" do +describe "Fog::OpenStack::DNS::V1 | domain requests" do before do - @dns = Fog::DNS::OpenStack::V1.new + @dns = Fog::OpenStack::DNS::V1.new @domain_format = { "id" => String, diff --git a/test/requests/dns_v1/quota_tests.rb b/test/requests/dns_v1/quota_tests.rb index 674b08323..0733b5383 100644 --- a/test/requests/dns_v1/quota_tests.rb +++ b/test/requests/dns_v1/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::DNS::OpenStack::V1 | quota requests" do +describe "Fog::OpenStack::DNS::V1 | quota requests" do before do - @dns = Fog::DNS::OpenStack::V1.new + @dns = Fog::OpenStack::DNS::V1.new @project_id = Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/dns_v2/pool_tests.rb b/test/requests/dns_v2/pool_tests.rb index 8714f1252..e8a68ed4c 100644 --- a/test/requests/dns_v2/pool_tests.rb +++ b/test/requests/dns_v2/pool_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::DNS::OpenStack::V2 | pool requests" do +describe "Fog::OpenStack::DNS::V2 | pool requests" do before do @dns, = set_dns_data diff --git a/test/requests/dns_v2/quota_tests.rb b/test/requests/dns_v2/quota_tests.rb index 959983d31..aec0065d3 100644 --- a/test/requests/dns_v2/quota_tests.rb +++ b/test/requests/dns_v2/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::DNS::OpenStack::V2 | quota requests" do +describe "Fog::OpenStack::DNS::V2 | quota requests" do before do - @dns = Fog::DNS::OpenStack::V2.new + @dns = Fog::OpenStack::DNS::V2.new @project_id = @dns.respond_to?(:current_tenant) ? @dns.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/dns_v2/recordset_tests.rb b/test/requests/dns_v2/recordset_tests.rb index 9289f69a1..6d1b6295b 100644 --- a/test/requests/dns_v2/recordset_tests.rb +++ b/test/requests/dns_v2/recordset_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::DNS::OpenStack::V2 | recordset requests" do +describe "Fog::OpenStack::DNS::V2 | recordset requests" do before do @dns, @zone, @zone_id = set_dns_data diff --git a/test/requests/dns_v2/zone_tests.rb b/test/requests/dns_v2/zone_tests.rb index 53acbff4e..940777afb 100644 --- a/test/requests/dns_v2/zone_tests.rb +++ b/test/requests/dns_v2/zone_tests.rb @@ -1,7 +1,7 @@ require "test_helper" require "helpers/dns_v2_helper" -describe "Fog::DNS::OpenStack::V2 | zone requests" do +describe "Fog::OpenStack::DNS::V2 | zone requests" do before do @dns, @zone, @zone_id = set_dns_data diff --git a/test/requests/event/event_tests.rb b/test/requests/event/event_tests.rb index 6e737213a..f171a334f 100644 --- a/test/requests/event/event_tests.rb +++ b/test/requests/event/event_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Event[:openstack] | event requests" do +describe "Fog::OpenStack::Event | event requests" do before do - @metering = Fog::Event::OpenStack.new + @metering = Fog::OpenStack::Event.new @event_format = { 'message_id' => String, 'event_type' => String diff --git a/test/requests/identity/ec2_credentials_tests.rb b/test/requests/identity/ec2_credentials_tests.rb index 6b627935b..bf1891b54 100644 --- a/test/requests/identity/ec2_credentials_tests.rb +++ b/test/requests/identity/ec2_credentials_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | EC2 credential requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @credential_format = { 'access' => String, diff --git a/test/requests/identity/role_tests.rb b/test/requests/identity/role_tests.rb index 39a433b8d..4ab969af3 100644 --- a/test/requests/identity/role_tests.rb +++ b/test/requests/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @role_format = { 'id' => String, diff --git a/test/requests/identity/tenant_tests.rb b/test/requests/identity/tenant_tests.rb index 8aa2c7cfe..e5158e26c 100644 --- a/test/requests/identity/tenant_tests.rb +++ b/test/requests/identity/tenant_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | tenant requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_format = { 'id' => String, diff --git a/test/requests/identity/user_tests.rb b/test/requests/identity/user_tests.rb index 83ce1054b..cedbce996 100644 --- a/test/requests/identity/user_tests.rb +++ b/test/requests/identity/user_tests.rb @@ -4,7 +4,7 @@ describe "Fog::Identity[:openstack] | user requests" do before do - @identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @user_format = { 'id' => String, diff --git a/test/requests/image/image_tests.rb b/test/requests/image/image_tests.rb index 2843448b8..7a0fa2815 100644 --- a/test/requests/image/image_tests.rb +++ b/test/requests/image/image_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Image[:openstack] | image requests" do +describe "Fog::OpenStack::Image | image requests" do before(:all) do - openstack = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + openstack = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @image_attributes = { :name => 'new image', @@ -90,7 +90,7 @@ image_attributes[:location] = @test_iso.path end - @instance = Fog::Image[:openstack].create_image(image_attributes).body + @instance = Fog::OpenStack::Image.new.create_image(image_attributes).body end after do @@ -99,11 +99,11 @@ describe "success" do it "#list_public_images" do - Fog::Image[:openstack].list_public_images.body.must_match_schema('images' => [@image_format]) + Fog::OpenStack::Image.new.list_public_images.body.must_match_schema('images' => [@image_format]) end it "#list_public_images_detailed" do - Fog::Image[:openstack].list_public_images_detailed.body. + Fog::OpenStack::Image.new.list_public_images_detailed.body. must_match_schema('images' => [@detailed_image_format]) end @@ -112,12 +112,12 @@ end it "#get_image" do - Fog::Image[:openstack].get_image(@instance['image']['id']).headers. + Fog::OpenStack::Image.new.get_image(@instance['image']['id']).headers. must_match_schema(@image_meta_format) end it "#update_image" do - Fog::Image[:openstack].update_image( + Fog::OpenStack::Image.new.update_image( :id => @instance['image']['id'], :name => 'edit image' ).body['image'].must_match_schema(@detailed_image_format) @@ -125,30 +125,30 @@ it "#add_member_to_image" do [200, 204].must_include( - Fog::Image[:openstack].add_member_to_image( + Fog::OpenStack::Image.new.add_member_to_image( @instance['image']['id'], @instance['image']['owner'] ).status ) end it "#get_image_members" do - [200, 204].must_include(Fog::Image[:openstack].get_image_members(@instance['image']['id']).status) + [200, 204].must_include(Fog::OpenStack::Image.new.get_image_members(@instance['image']['id']).status) end it "#get_shared_images" do - [200, 204].must_include(Fog::Image[:openstack].get_shared_images(@instance['image']['owner']).status) + [200, 204].must_include(Fog::OpenStack::Image.new.get_shared_images(@instance['image']['owner']).status) end it "#remove_member_from_image" do [200, 204].must_include( - Fog::Image[:openstack].remove_member_from_image( + Fog::OpenStack::Image.new.remove_member_from_image( @instance['image']['id'], @instance['image']['owner'] ).status ) end it "#delete_image" do - Fog::Image[:openstack].delete_image(@instance['image']['id']).status.must_equal 200 + Fog::OpenStack::Image.new.delete_image(@instance['image']['id']).status.must_equal 200 end end end diff --git a/test/requests/introspection/introspection_tests.rb b/test/requests/introspection/introspection_tests.rb index 14aaaa403..126b7e70d 100644 --- a/test/requests/introspection/introspection_tests.rb +++ b/test/requests/introspection/introspection_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Introspection::OpenStack | Introspection requests" do +describe "Fog::OpenStack::Introspection | Introspection requests" do before do - @inspector = Fog::Introspection::OpenStack.new + @inspector = Fog::OpenStack::Introspection.new @node_uuid = Fog::UUID.uuid diff --git a/test/requests/introspection/rules_tests.rb b/test/requests/introspection/rules_tests.rb index 0cc4def6b..0835154d8 100644 --- a/test/requests/introspection/rules_tests.rb +++ b/test/requests/introspection/rules_tests.rb @@ -2,7 +2,7 @@ describe "@inspector | Introspection rules requests" do before do - @inspector = Fog::Introspection::OpenStack.new + @inspector = Fog::OpenStack::Introspection.new @rules_id = Fog::UUID.uuid @rules = { 'description' => Fog::Nullable::String, diff --git a/test/requests/metering/event_tests.rb b/test/requests/metering/event_tests.rb index 237c766f9..c07553403 100644 --- a/test/requests/metering/event_tests.rb +++ b/test/requests/metering/event_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metering[:openstack] | event requests" do +describe "Fog::OpenStack::Metering | event requests" do before do - @metering = Fog::Metering[:openstack] + @metering = Fog::OpenStack::Metering.new @event_format = { 'message_id' => String, 'event_type' => String diff --git a/test/requests/metering/meter_tests.rb b/test/requests/metering/meter_tests.rb index 890121dd5..c41ec5763 100644 --- a/test/requests/metering/meter_tests.rb +++ b/test/requests/metering/meter_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metering[:openstack] | meter requests" do +describe "Fog::OpenStack::Metering | meter requests" do before do - @metering = Fog::Metering[:openstack] + @metering = Fog::OpenStack::Metering.new @sample_format = { 'counter_name' => String, diff --git a/test/requests/metering/resource_tests.rb b/test/requests/metering/resource_tests.rb index 0ac533eb8..16b706ba1 100644 --- a/test/requests/metering/resource_tests.rb +++ b/test/requests/metering/resource_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metering[:openstack] | resource requests" do +describe "Fog::OpenStack::Metering | resource requests" do before do - @metering = Fog::Metering[:openstack] + @metering = Fog::OpenStack::Metering.new @resource_format = { 'resource_id' => String, diff --git a/test/requests/metric/metric_test.rb b/test/requests/metric/metric_test.rb index a914a8f94..4918afdd6 100644 --- a/test/requests/metric/metric_test.rb +++ b/test/requests/metric/metric_test.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metric::OpenStack | metric requests" do +describe "Fog::OpenStack::Metric | metric requests" do before do - @metric = Fog::Metric::OpenStack.new + @metric = Fog::OpenStack::Metric.new end describe "success" do diff --git a/test/requests/metric/resource_test.rb b/test/requests/metric/resource_test.rb index 2a0cb9bf1..d6b34f723 100644 --- a/test/requests/metric/resource_test.rb +++ b/test/requests/metric/resource_test.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Metric::OpenStack | metric requests" do +describe "Fog::OpenStack::Metric | metric requests" do before do - @metric = Fog::Metric::OpenStack.new + @metric = Fog::OpenStack::Metric.new end describe "success" do diff --git a/test/requests/network/extension_tests.rb b/test/requests/network/extension_tests.rb index 62e3770bd..11fec830e 100644 --- a/test/requests/network/extension_tests.rb +++ b/test/requests/network/extension_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | extension requests" do +describe "Fog::OpenStack::Network | extension requests" do before do @extension_format = { 'id' => String, @@ -28,7 +28,7 @@ it "#get_extension" do proc do network.get_extension(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/ike_policy_tests.rb b/test/requests/network/ike_policy_tests.rb index f328a04c5..e76b67732 100644 --- a/test/requests/network/ike_policy_tests.rb +++ b/test/requests/network/ike_policy_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | ike_policy requests" do +describe "Fog::OpenStack::Network | ike_policy requests" do describe "success" do before do @ike_policy_format = { @@ -74,19 +74,19 @@ it "#get_ike_policy" do proc do network.get_ike_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_ike_policy" do proc do network.update_ike_policy(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_ike_policy" do proc do network.delete_ike_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/ipsec_policy_tests.rb b/test/requests/network/ipsec_policy_tests.rb index 8adb769e5..f3c1d3873 100644 --- a/test/requests/network/ipsec_policy_tests.rb +++ b/test/requests/network/ipsec_policy_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::Network[:openstack] | ipsec_policy requests" do +describe "Fog::OpenStack::Network | ipsec_policy requests" do before do @ipsec_policy_format = { 'id' => String, @@ -76,19 +76,19 @@ it "#get_ipsec_policy" do proc do network.get_ipsec_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_ipsec_policy" do proc do network.update_ipsec_policy(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_ipsec_policy" do proc do network.delete_ipsec_policy(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/ipsec_site_connection_tests.rb b/test/requests/network/ipsec_site_connection_tests.rb index d39abdd8a..0912b07cc 100644 --- a/test/requests/network/ipsec_site_connection_tests.rb +++ b/test/requests/network/ipsec_site_connection_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | ipsec_site_connection requests" do +describe "Fog::OpenStack::Network | ipsec_site_connection requests" do before do @ipsec_site_connection_format = { 'id' => String, @@ -100,19 +100,19 @@ it "#get_ipsec_site_connection" do proc do network.get_ipsec_site_connection(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_ipsec_site_connection" do proc do network.update_ipsec_site_connection(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_ipsec_site_connection" do proc do network.delete_ipsec_site_connection(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_health_monitor_tests.rb b/test/requests/network/lb_health_monitor_tests.rb index 9d18c48a7..a0dc44547 100644 --- a/test/requests/network/lb_health_monitor_tests.rb +++ b/test/requests/network/lb_health_monitor_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_health_monitor requests" do +describe "Fog::OpenStack::Network | lb_health_monitor requests" do before do @lb_health_monitor_format = { 'id' => String, @@ -98,31 +98,31 @@ it "#get_lb_health_monitor" do proc do network.get_lb_health_monitor(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_health_monitor" do proc do network.update_lb_health_monitor(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#associate_lb_health_monitor" do proc do network.associate_lb_health_monitor(0, 0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#disassociate_lb_health_monitor" do proc do network.disassociate_lb_health_monitor(0, 0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_health_monitor" do proc do network.delete_lb_health_monitor(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_member_tests.rb b/test/requests/network/lb_member_tests.rb index 4d8dfd8ae..eb734bfb9 100644 --- a/test/requests/network/lb_member_tests.rb +++ b/test/requests/network/lb_member_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_member requests" do +describe "Fog::OpenStack::Network | lb_member requests" do describe "success" do before do @lb_member_format = { @@ -63,19 +63,19 @@ it "#get_lb_member" do proc do network.get_lb_member(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_member" do proc do network.update_lb_member(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_member" do proc do network.delete_lb_member(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_pool_tests.rb b/test/requests/network/lb_pool_tests.rb index baa0065b6..4a56292a6 100644 --- a/test/requests/network/lb_pool_tests.rb +++ b/test/requests/network/lb_pool_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_pool requests" do +describe "Fog::OpenStack::Network | lb_pool requests" do before do @lb_pool_format = { 'id' => String, @@ -86,19 +86,19 @@ it "#get_lb_pool" do proc do network.get_lb_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_pool" do proc do network.update_lb_pool(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_pool" do proc do network.delete_lb_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/lb_vip_tests.rb b/test/requests/network/lb_vip_tests.rb index 3926c4fe5..e92bc2e15 100644 --- a/test/requests/network/lb_vip_tests.rb +++ b/test/requests/network/lb_vip_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | lb_vip requests" do +describe "Fog::OpenStack::Network | lb_vip requests" do describe "success" do before do @lb_vip_format = { @@ -74,19 +74,19 @@ it "#get_lb_vip" do proc do network.get_lb_vip(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_vip" do proc do network.update_lb_vip(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_lb_vip" do proc do network.delete_lb_vip(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/network_tests.rb b/test/requests/network/network_tests.rb index dc486084a..57bdeab8b 100644 --- a/test/requests/network/network_tests.rb +++ b/test/requests/network/network_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/network_helper.rb' -describe "Fog::Network[:openstack] | network requests" do +describe "Fog::OpenStack::Network | network requests" do describe "success" do let(:network_format) do { @@ -124,19 +124,19 @@ it "#get_network" do proc do network.get_network(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_network" do proc do network.update_network(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_network" do proc do network.delete_network(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end diff --git a/test/requests/network/port_tests.rb b/test/requests/network/port_tests.rb index 76a75f69c..8caf37014 100644 --- a/test/requests/network/port_tests.rb +++ b/test/requests/network/port_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | port requests" do +describe "Fog::OpenStack::Network | port requests" do before do @port_format = { 'id' => String, @@ -75,19 +75,19 @@ it "#get_port" do proc do network.get_port(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_port" do proc do network.update_port(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_port" do proc do network.delete_port(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/quota_tests.rb b/test/requests/network/quota_tests.rb index 9c74e578d..e5d06c2cc 100644 --- a/test/requests/network/quota_tests.rb +++ b/test/requests/network/quota_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::Network[:openstack] | quota requests" do +describe "Fog::OpenStack::Network | quota requests" do before do - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_format = { 'subnet' => Fog::Nullable::Integer, diff --git a/test/requests/network/router_tests.rb b/test/requests/network/router_tests.rb index d50538a4a..6b10de227 100644 --- a/test/requests/network/router_tests.rb +++ b/test/requests/network/router_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | router requests" do +describe "Fog::OpenStack::Network | router requests" do before do @router_format = { :id => String, @@ -69,19 +69,19 @@ it "#get_router" do proc do network.get_router(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_router" do proc do network.update_router(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_router" do proc do network.delete_router(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/security_group_rule_tests.rb b/test/requests/network/security_group_rule_tests.rb index 3bb12f1d4..f8083255b 100644 --- a/test/requests/network/security_group_rule_tests.rb +++ b/test/requests/network/security_group_rule_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | security_grouprule requests" do +describe "Fog::OpenStack::Network | security_grouprule requests" do before do @security_group_rule_format = { "id" => String, @@ -59,13 +59,13 @@ it "#get_security_group_rule(0)" do proc do network.get_security_group_rule(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_security_group_rule(0)" do proc do network.delete_security_group_rule(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/security_group_tests.rb b/test/requests/network/security_group_tests.rb index 73e51b5de..6622e4fed 100644 --- a/test/requests/network/security_group_tests.rb +++ b/test/requests/network/security_group_tests.rb @@ -1,7 +1,7 @@ require 'test_helper' require 'helpers/network_helper' -describe "Fog::Network[:openstack] | security_group requests" do +describe "Fog::OpenStack::Network | security_group requests" do before do @security_group_format = { "id" => String, @@ -54,13 +54,13 @@ it "#get_security_group(0)" do proc do network.get_security_group(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_security_group(0)" do proc do network.delete_security_group(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/subnet_pool_tests.rb b/test/requests/network/subnet_pool_tests.rb index 72d11f828..50005886f 100644 --- a/test/requests/network/subnet_pool_tests.rb +++ b/test/requests/network/subnet_pool_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | subnet_pool requests" do +describe "Fog::OpenStack::Network | subnet_pool requests" do before do @subnet_pool_format = { 'id' => String, @@ -59,19 +59,19 @@ it "#get_subnet_pool" do proc do network.get_subnet_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_subnet_pool" do proc do network.update_subnet_pool(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_subnet_pool" do proc do network.delete_subnet_pool(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/subnet_tests.rb b/test/requests/network/subnet_tests.rb index 6463a0435..e18338382 100644 --- a/test/requests/network/subnet_tests.rb +++ b/test/requests/network/subnet_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | subnet requests" do +describe "Fog::OpenStack::Network | subnet requests" do before do @subnet_format = { 'id' => String, @@ -70,19 +70,19 @@ it "#get_subnet" do proc do network.get_subnet(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_subnet" do proc do network.update_subnet(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_subnet" do proc do network.delete_subnet(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/network/vpn_service_tests.rb b/test/requests/network/vpn_service_tests.rb index 52113ef4c..1145a03f6 100644 --- a/test/requests/network/vpn_service_tests.rb +++ b/test/requests/network/vpn_service_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Network[:openstack] | vpn_service requests" do +describe "Fog::OpenStack::Network | vpn_service requests" do before do @vpn_service_format = { 'id' => String, @@ -68,19 +68,19 @@ it "#get_vpn_service" do proc do network.get_vpn_service(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#update_lb_pool" do proc do network.update_lb_pool(0, {}) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end it "#delete_vpn_service" do proc do network.delete_vpn_service(0) - end.must_raise Fog::Network::OpenStack::NotFound + end.must_raise Fog::OpenStack::Network::NotFound end end end diff --git a/test/requests/orchestration/stack_files_util_helper_tests.rb b/test/requests/orchestration/stack_files_util_helper_tests.rb index c520ec20e..1ade003a6 100644 --- a/test/requests/orchestration/stack_files_util_helper_tests.rb +++ b/test/requests/orchestration/stack_files_util_helper_tests.rb @@ -2,7 +2,7 @@ require "yaml" require "open-uri" -describe "Fog::Orchestration[:openstack] | stack requests" do +describe "Fog::OpenStack::Orchestration | stack requests" do @create_format_files = { 'id' => String, 'links' => Array, @@ -15,8 +15,8 @@ @data = YAML.load_file("stack_files_util_tests.yaml") @template_yaml = YAML.load_file("template.yaml") @local_yaml = YAML.load_file("local.yaml") - @orchestration = Fog::Orchestration[:openstack] - @file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + @orchestration = Fog::OpenStack::Orchestration.new + @file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) end after do Dir.chdir(@oldcwd) diff --git a/test/requests/orchestration/stack_files_util_tests.rb b/test/requests/orchestration/stack_files_util_tests.rb index ca727e704..fad89d19d 100644 --- a/test/requests/orchestration/stack_files_util_tests.rb +++ b/test/requests/orchestration/stack_files_util_tests.rb @@ -6,7 +6,7 @@ def travis? File.exist?('/home/travis/build/fog/fog-openstack') end -describe "Fog::Orchestration[:openstack] | stack requests" do +describe "Fog::OpenStack::Orchestration | stack requests" do @create_format_files = { 'id' => String, 'links' => Array, @@ -19,8 +19,8 @@ def travis? @data = YAML.load_file("stack_files_util_tests.yaml") @template_yaml = YAML.load_file("template.yaml") @local_yaml = YAML.load_file("local.yaml") - @orchestration = Fog::Orchestration[:openstack] - @file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + @orchestration = Fog::OpenStack::Orchestration.new + @file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) end after do Dir.chdir(@oldcwd) @@ -36,7 +36,7 @@ def travis? [{"get_file" => "foo.sh", "b" => "values"}, {'foo.sh'=>'# Just a mock'}], ] test_cases.each do |data, expected| - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) file_resolver.send(:get_file_contents, data, nil) assert_equal(file_resolver.files, expected) end @@ -53,7 +53,7 @@ def travis? test_cases.each do |data, expected| Fog::Logger.warning("Testing with #{data} #{expected}") expected = prefix_with_url(expected, @base_url) - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new({}) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new({}) file_resolver.send(:get_file_contents, data, @base_url) assert_equal(file_resolver.files.keys, expected) end @@ -65,7 +65,7 @@ def travis? end.compact test_cases.each do |data, _| assert_raises ArgumentError, URI::InvalidURIError do - Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) end end end @@ -76,7 +76,7 @@ def travis? [testcase['input'], testcase['expected']] end.compact test_cases.each do |data, expected| - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) assert_equal_set(file_resolver.files.keys, expected) end end @@ -90,13 +90,13 @@ def travis? test_cases.push([@local_yaml, ["local.yaml", "hot_1.yaml"]]) test_cases.each do |data, expected| expected = prefix_with_url(expected, @base_url) - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(data) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(data) assert_equal_set(file_resolver.files.keys, expected) end end it "#dont_modify_passed_template" do - file_resolver = Fog::Orchestration::Util::RecursiveHotFileLoader.new(@local_yaml) + file_resolver = Fog::OpenStack::OrchestrationUtil::RecursiveHotFileLoader.new(@local_yaml) template = file_resolver.template # The template argument should be modified. diff --git a/test/requests/orchestration/stack_tests.rb b/test/requests/orchestration/stack_tests.rb index ad6862667..4becd492d 100644 --- a/test/requests/orchestration/stack_tests.rb +++ b/test/requests/orchestration/stack_tests.rb @@ -1,15 +1,15 @@ require "test_helper" require 'fog/core' -describe "Fog::Orchestration[:openstack] | stack requests" do +describe "Fog::OpenStack::Orchestration | stack requests" do before do @oldcwd = Dir.pwd Dir.chdir("test/requests/orchestration") @base_url = "file://" + File.absolute_path(".") - @orchestration = Fog::Orchestration[:openstack] + @orchestration = Fog::OpenStack::Orchestration.new - @stack_mock = Fog::Orchestration::OpenStack::Stack.new( + @stack_mock = Fog::OpenStack::Orchestration::Stack.new( :template_name => "stack_mock", :id => "stack_id" ) diff --git a/test/requests/planning/plan_tests.rb b/test/requests/planning/plan_tests.rb index 83c987834..602ab706c 100644 --- a/test/requests/planning/plan_tests.rb +++ b/test/requests/planning/plan_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | Planning plan requests" do +describe "Fog::OpenStack::Planning | Planning plan requests" do before do @plan_format = { "created_at" => Fog::Nullable::String, @@ -14,9 +14,9 @@ } @plan_templates_format = Hash - @plans = Fog::OpenStack[:planning].list_plans.body + @plans = Fog::OpenStack::Planning.new.list_plans.body @instance = @plans.first - @role_instance = Fog::OpenStack[:planning].list_roles.body.first + @role_instance = Fog::OpenStack::Planning.new.list_roles.body.first end describe "success" do @@ -25,11 +25,11 @@ end it "#get_plan" do - Fog::OpenStack[:planning].get_plan(@instance['uuid']).body.must_match_schema(@plan_format) + Fog::OpenStack::Planning.new.get_plan(@instance['uuid']).body.must_match_schema(@plan_format) end it "#delete_plan" do - Fog::OpenStack[:planning].delete_plan(@instance['uuid']).status.must_equal 204 + Fog::OpenStack::Planning.new.delete_plan(@instance['uuid']).status.must_equal 204 end it "#create_plan" do @@ -37,19 +37,19 @@ :name => 'test-plan-name', :description => 'test-plan-desc', } - @instance = Fog::OpenStack[:planning].create_plan(plan_attributes).body + @instance = Fog::OpenStack::Planning.new.create_plan(plan_attributes).body @instance.must_match_schema(@plan_format) end it "#add_role_to_plan" do - Fog::OpenStack[:planning].add_role_to_plan( + Fog::OpenStack::Planning.new.add_role_to_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end it "#patch_plan" do - parameters = Fog::OpenStack[:planning].get_plan(@instance['uuid']). + parameters = Fog::OpenStack::Planning.new.get_plan(@instance['uuid']). body['parameters'][0..1] plan_parameters = parameters.collect do |parameter| { @@ -57,17 +57,17 @@ "value" => "test-#{parameter['name']}-value", } end - Fog::OpenStack[:planning].patch_plan(@instance['uuid'], plan_parameters).body. + Fog::OpenStack::Planning.new.patch_plan(@instance['uuid'], plan_parameters).body. must_match_schema(@plan_format) end it "#get_plan_templates" do - Fog::OpenStack[:planning].get_plan_templates(@instance['uuid']).body. + Fog::OpenStack::Planning.new.get_plan_templates(@instance['uuid']).body. must_match_schema(@plan_templates_format) end it "#remove_role_from_plan" do - Fog::OpenStack[:planning].remove_role_from_plan( + Fog::OpenStack::Planning.new.remove_role_from_plan( @instance['uuid'], @role_instance['uuid'] ).body.must_match_schema(@plan_format) end diff --git a/test/requests/planning/role_tests.rb b/test/requests/planning/role_tests.rb index 56d790e46..0545482ea 100644 --- a/test/requests/planning/role_tests.rb +++ b/test/requests/planning/role_tests.rb @@ -1,6 +1,6 @@ require "test_helper" -describe "Fog::OpenStack[:planning] | Planning role requests" do +describe "Fog::OpenStack::Planning | Planning role requests" do before do @role_format = { 'description' => Fog::Nullable::String, @@ -12,7 +12,7 @@ describe "success" do it "#list_roles" do - Fog::OpenStack[:planning].list_roles.body.must_match_schema([@role_format]) + Fog::OpenStack::Planning.new.list_roles.body.must_match_schema([@role_format]) end end end diff --git a/test/requests/shared_file_system/quota_tests.rb b/test/requests/shared_file_system/quota_tests.rb index 412af7dc0..d2fe3db20 100644 --- a/test/requests/shared_file_system/quota_tests.rb +++ b/test/requests/shared_file_system/quota_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::SharedFileSystem::OpenStack | quota requests" do +describe "Fog::OpenStack::SharedFileSystem | quota requests" do before do - @manila = Fog::SharedFileSystem::OpenStack.new + @manila = Fog::OpenStack::SharedFileSystem.new @project_id = @manila.respond_to?(:current_tenant) ? @manila.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s diff --git a/test/requests/storage/container_tests.rb b/test/requests/storage/container_tests.rb index 3a4603d55..148ded79f 100644 --- a/test/requests/storage/container_tests.rb +++ b/test/requests/storage/container_tests.rb @@ -1,16 +1,16 @@ require "test_helper" -describe "Fog::Storage[:openstack] | container requests" do +describe "Fog::OpenStack::Storage | container requests" do def cleanup_container return if Fog.mocking? if @storage.head_container(@container_name) @storage.delete_container(@container_name) end - rescue Fog::Storage::OpenStack::NotFound + rescue Fog::OpenStack::Storage::NotFound end before do - @storage = Fog::Storage[:openstack] + @storage = Fog::OpenStack::Storage.new @container_format = [String] @container_name = 'fogcontainertests' @@ -85,7 +85,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.get_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end @@ -93,7 +93,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.head_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end @@ -101,7 +101,7 @@ def cleanup_container unless Fog.mocking? proc do @storage.delete_container('fognoncontainer') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end end diff --git a/test/requests/storage/large_object_tests.rb b/test/requests/storage/large_object_tests.rb index b78eca059..cc8ca9803 100644 --- a/test/requests/storage/large_object_tests.rb +++ b/test/requests/storage/large_object_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Storage[:openstack] | large object requests" do +describe "Fog::OpenStack::Storage | large object requests" do before do - @storage = Fog::Storage[:openstack] + @storage = Fog::OpenStack::Storage.new unless Fog.mocking? @directory = @storage.directories.create(:key => 'foglargeobjecttests') @@ -280,7 +280,7 @@ unless Fog.mocking? proc do @storage.put_dynamic_obj_manifest('fognoncontainer', 'fog_large_object') - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end end @@ -290,7 +290,7 @@ unless Fog.mocking? proc do @storage.put_static_obj_manifest('fognoncontainer', 'fog_large_object', []) - end.must_raise Fog::Storage::OpenStack::NotFound + end.must_raise Fog::OpenStack::Storage::NotFound end end diff --git a/test/requests/storage/object_tests.rb b/test/requests/storage/object_tests.rb index b50e4c144..c7cdad329 100644 --- a/test/requests/storage/object_tests.rb +++ b/test/requests/storage/object_tests.rb @@ -9,10 +9,10 @@ def test_temp_url(url_s, time, desired_scheme) query_params.any? { |p| p == ['temp_url_expires', time.to_i.to_s] }.must_equal true end -describe "Fog::Storage[:openstack] | object requests" do +describe "Fog::OpenStack::Storage | object requests" do before do unless Fog.mocking? - @directory = Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests') + @directory = Fog::OpenStack::Storage.new.directories.create(:key => 'fogobjecttests') end module OpenStackStorageHelpers @@ -31,21 +31,21 @@ def override_path(path) describe "success" do it "#put_object('fogobjecttests', 'fog_object')" do - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file) + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', lorem_file) resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end describe "with_object" do before do file = lorem_file - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', file) file.close resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end it "#get_object('fogobjectests', 'fog_object')" do unless Fog.mocking? - resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_object') resp.body.must_equal lorem_file.read end end @@ -53,7 +53,7 @@ def override_path(path) it "#get_object('fogobjecttests', 'fog_object', &block)" do unless Fog.mocking? data = '' - Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| + Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_object') do |chunk, _remaining_bytes, _total_bytes| data << chunk end data.must_equal lorem_file.read @@ -62,33 +62,33 @@ def override_path(path) it "#public_url('fogobjectests', 'fog_object')" do unless Fog.mocking? - url = Fog::Storage[:openstack].directories.first.files.first.public_url + url = Fog::OpenStack::Storage.new.directories.first.files.first.public_url url.end_with?('/fogobjecttests/fog_object').must_equal true end end it "#public_url('fogobjectests')" do unless Fog.mocking? - url = Fog::Storage[:openstack].directories.first.public_url + url = Fog::OpenStack::Storage.new.directories.first.public_url url.end_with?('/fogobjecttests').must_equal true end end it "#head_object('fogobjectests', 'fog_object')" do unless Fog.mocking? - resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_object') resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' end end it "#post_object('fogobjecttests', 'fog_object')" do unless Fog.mocking? - Fog::Storage[:openstack].post_object( + Fog::OpenStack::Storage.new.post_object( 'fogobjecttests', 'fog_object', 'X-Object-Meta-test-header' => 'fog-test-value' ) - resp = Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_object') resp.headers.must_include 'X-Object-Meta-Test-Header' resp.headers['X-Object-Meta-Test-Header'].must_equal 'fog-test-value' end @@ -96,7 +96,7 @@ def override_path(path) it "#delete_object('fogobjecttests', 'fog_object')" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_object') + resp = Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_object') resp.status.must_equal 204 end end @@ -104,7 +104,7 @@ def override_path(path) it "#get_object_http_url('directory.identity', 'fog_object', expiration timestamp)" do unless Fog.mocking? ts = Time.at(1_395_343_213) - url_s = Fog::Storage[:openstack].get_object_http_url(@directory.identity, 'fog_object', ts) + url_s = Fog::OpenStack::Storage.new.get_object_http_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'http') end end @@ -112,7 +112,7 @@ def override_path(path) it "#get_object_https_url('directory.identity', 'fog_object', expiration timestamp)" do unless Fog.mocking? ts = Time.at(1_395_343_213) - url_s = Fog::Storage[:openstack].get_object_https_url(@directory.identity, 'fog_object', ts) + url_s = Fog::OpenStack::Storage.new.get_object_https_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'https') end end @@ -132,7 +132,7 @@ def override_path(path) begin file = lorem_file buffer_size = file.stat.size / 2 # chop it up into two buffers - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_block_object', nil) do file.read(buffer_size).to_s end ensure @@ -144,7 +144,7 @@ def override_path(path) describe "with_object" do before do file = lorem_file - Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_block_object', nil) do + Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_block_object', nil) do file.read(file.stat.size).to_s end file.close @@ -152,14 +152,14 @@ def override_path(path) it "#get_object" do unless Fog.mocking? - resp = Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_block_object') + resp = Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_block_object') resp.body.must_equal lorem_file.read end end it "#delete_object" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_block_object') + resp = Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_block_object') resp.status.must_equal 204 end end @@ -169,10 +169,10 @@ def override_path(path) describe "deletes multiple objects" do before do unless Fog.mocking? - Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', lorem_file) - Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object2', lorem_file) - Fog::Storage[:openstack].directories.create(:key => 'fogobjecttests2') - Fog::Storage[:openstack].put_object('fogobjecttests2', 'fog_object', lorem_file) + Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', lorem_file) + Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object2', lorem_file) + Fog::OpenStack::Storage.new.directories.create(:key => 'fogobjecttests2') + Fog::OpenStack::Storage.new.put_object('fogobjecttests2', 'fog_object', lorem_file) end @expected = { @@ -186,7 +186,7 @@ def override_path(path) after do unless Fog.mocking? - dir2 = Fog::Storage[:openstack].directories.get('fogobjecttests2') + dir2 = Fog::OpenStack::Storage.new.directories.get('fogobjecttests2') unless dir2.nil? dir2.files.each(&:destroy) dir2.destroy @@ -196,7 +196,7 @@ def override_path(path) it "#delete_multiple_objects" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( 'fogobjecttests', %w[fog_object fog_object2] ) resp.body.must_equal @expected @@ -205,7 +205,7 @@ def override_path(path) it "deletes object and container" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( nil, ['fogobjecttests2/fog_object', 'fogobjecttests2'] ) @@ -219,56 +219,56 @@ def override_path(path) it "#get_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].get_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.get_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#get_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].get_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.get_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#head_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].head_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.head_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#head_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].head_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.head_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#post_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].post_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.post_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#delete_object('fogobjecttests', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].delete_object('fogobjecttests', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.delete_object('fogobjecttests', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end it "#delete_object('fognoncontainer', 'fog_non_object')" do unless Fog.mocking? proc do - Fog::Storage[:openstack].delete_object('fognoncontainer', 'fog_non_object') - end.must_raise(Fog::Storage::OpenStack::NotFound) + Fog::OpenStack::Storage.new.delete_object('fognoncontainer', 'fog_non_object') + end.must_raise(Fog::OpenStack::Storage::NotFound) end end @@ -287,7 +287,7 @@ def override_path(path) it "reports missing objects" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( 'fogobjecttests', %w[fog_non_object fog_non_object2] ) resp.body.must_equal @expected @@ -296,7 +296,7 @@ def override_path(path) it "reports missing container" do unless Fog.mocking? - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( 'fognoncontainer', %w[fog_non_object fog_non_object2] ) resp.body.must_equal @expected @@ -306,7 +306,7 @@ def override_path(path) it "deleting non-empty container" do unless Fog.mocking? file = lorem_file - resp = Fog::Storage[:openstack].put_object('fogobjecttests', 'fog_object', file) + resp = Fog::OpenStack::Storage.new.put_object('fogobjecttests', 'fog_object', file) file.close resp.headers['ETag'].must_equal '80d7930fe13ff4e45156b6581656a247' @@ -318,7 +318,7 @@ def override_path(path) "Response Body" => "" } - resp = Fog::Storage[:openstack].delete_multiple_objects( + resp = Fog::OpenStack::Storage.new.delete_multiple_objects( nil, %w[fogobjecttests] ) diff --git a/test/requests/volume/availability_zone_tests.rb b/test/requests/volume/availability_zone_tests.rb index 9d268c91e..43e1fc4b3 100644 --- a/test/requests/volume/availability_zone_tests.rb +++ b/test/requests/volume/availability_zone_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | availability zone requests" do +describe "Fog::OpenStack::Volume | availability zone requests" do before do @flavor_format = { 'zoneName' => String, @@ -10,7 +10,7 @@ describe "success" do it "#list_zones" do - Fog::Volume[:openstack].list_zones.body. + Fog::OpenStack::Volume.new.list_zones.body. must_match_schema('availabilityZoneInfo' => [@flavor_format]) end end diff --git a/test/requests/volume/backup_tests.rb b/test/requests/volume/backup_tests.rb index 587f37e09..e8f335c23 100644 --- a/test/requests/volume/backup_tests.rb +++ b/test/requests/volume/backup_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | backup requests" do +describe "Fog::OpenStack::Volume | backup requests" do before do - @volume = Fog::Volume[:openstack] + @volume = Fog::OpenStack::Volume.new @backup_format = { 'id' => String, 'volume_id' => String, diff --git a/test/requests/volume/quota_tests.rb b/test/requests/volume/quota_tests.rb index d6e672dea..ca7648478 100644 --- a/test/requests/volume/quota_tests.rb +++ b/test/requests/volume/quota_tests.rb @@ -1,9 +1,9 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | quota requests" do +describe "Fog::OpenStack::Volume | quota requests" do before do - @volume = Fog::Volume[:openstack] - identity = Fog::Identity::OpenStack.new(:openstack_identity_api_version => 'v2.0') + @volume = Fog::OpenStack::Volume.new + identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { 'volumes' => Fog::Nullable::Integer, diff --git a/test/requests/volume/volume_type_tests.rb b/test/requests/volume/volume_type_tests.rb index 242f02117..935deae68 100644 --- a/test/requests/volume/volume_type_tests.rb +++ b/test/requests/volume/volume_type_tests.rb @@ -1,8 +1,8 @@ require 'test_helper' -describe "Fog::Volume[:openstack] | volume_type requests" do +describe "Fog::OpenStack::Volume | volume_type requests" do before do - @volume = Fog::Volume[:openstack] + @volume = Fog::OpenStack::Volume.new @volume_type_format = { 'name' => String, diff --git a/test/requests/workflow/workflow_tests.rb b/test/requests/workflow/workflow_tests.rb index 8c3d16726..9337931e8 100644 --- a/test/requests/workflow/workflow_tests.rb +++ b/test/requests/workflow/workflow_tests.rb @@ -1,10 +1,10 @@ require "test_helper" -require 'fog/workflow/openstack' -require 'fog/workflow/openstack/v2' +require 'fog/openstack/workflow/workflow' +require 'fog/openstack/workflow/v2' -describe "Fog::Workflow::OpenStack | Workflow requests" do +describe "Fog::OpenStack::Workflow | Workflow requests" do before do - @workflow = Fog::Workflow::OpenStack.new + @workflow = Fog::OpenStack::Workflow.new @execution_id = Fog::UUID.uuid @workflow_name = "tripleo.plan_management.v1.create_default_deployment_plan" diff --git a/test/storage_tests.rb b/test/storage_tests.rb index 9c1bbf75f..e6f1f50a1 100644 --- a/test/storage_tests.rb +++ b/test/storage_tests.rb @@ -1,8 +1,8 @@ require "test_helper" -describe "Fog::Storage[:openstack], ['openstack', 'storage']" do +describe "Fog::OpenStack::Storage, ['openstack', 'storage']" do before do - @storage = Fog::Storage[:openstack] + @storage = Fog::OpenStack::Storage.new @original_path = @storage.instance_variable_get :@path end diff --git a/test/volume_tests.rb b/test/volume_tests.rb index ceca9c4f7..3bf97d9ed 100644 --- a/test/volume_tests.rb +++ b/test/volume_tests.rb @@ -1,11 +1,11 @@ require 'test_helper' -require 'fog/volume/openstack' -require 'fog/volume/openstack/v1' -require 'fog/volume/openstack/v2' +require 'fog/openstack/volume/volume' +require 'fog/openstack/volume/v1' +require 'fog/openstack/volume/v2' -describe "Fog::Volume[:openstack], ['openstack', 'volume']" do - volume = Fog::Volume[:openstack] +describe "Fog::OpenStack::Volume, ['openstack', 'volume']" do + volume = Fog::OpenStack::Volume.new describe "Volumes collection" do %w{ volumes }.each do |collection| From 74734d1d8be1389097fdf9d4ea62c353296112cf Mon Sep 17 00:00:00 2001 From: Igor Pavliv Date: Thu, 20 Sep 2018 15:13:37 +0300 Subject: [PATCH 072/129] Fix hash bug in Image model (cherry picked from commit aa7c56d0734f79f99d1d5f35500255e7fa943e17) --- lib/fog/openstack/compute/models/image.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/compute/models/image.rb b/lib/fog/openstack/compute/models/image.rb index bc2b0c8cb..6498504b1 100644 --- a/lib/fog/openstack/compute/models/image.rb +++ b/lib/fog/openstack/compute/models/image.rb @@ -28,7 +28,7 @@ def metadata def metadata=(new_metadata = {}) metas = [] - new_metadata.each_pair { |k, v| metas << {"key" => k, "value" => v} } + new_metadata.to_hash.each_pair { |k, v| metas << {"key" => k, "value" => v} } metadata.load(metas) end From 8f91607fcf210ae00c454b8d41a1defc8d6ea903 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 21 Sep 2018 11:01:11 +1000 Subject: [PATCH 073/129] V1.0.0: Enforce namespace change needed to fully support fog-core 2 --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index a5197ddbd..5b9509d85 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '0.3.2'.freeze + VERSION = '1.0.0'.freeze end end From 701adbeb145e3fbdc1f7795068cdc20794340764 Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Mon, 17 Sep 2018 14:20:04 +0200 Subject: [PATCH 074/129] Filter unsupported params for volume update request --- lib/fog/openstack/volume/requests/update_volume.rb | 1 + lib/fog/openstack/volume/v2/models/volume.rb | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fog/openstack/volume/requests/update_volume.rb b/lib/fog/openstack/volume/requests/update_volume.rb index 224aaa30c..0a67186fc 100644 --- a/lib/fog/openstack/volume/requests/update_volume.rb +++ b/lib/fog/openstack/volume/requests/update_volume.rb @@ -3,6 +3,7 @@ module OpenStack class Volume module Real def update_volume(volume_id, data = {}) + data = data.select { |key| key == :name || key == :description || key == :metadata } request( :body => Fog::JSON.encode('volume' => data), :expects => 200, diff --git a/lib/fog/openstack/volume/v2/models/volume.rb b/lib/fog/openstack/volume/v2/models/volume.rb index d20c022dc..79c558c36 100644 --- a/lib/fog/openstack/volume/v2/models/volume.rb +++ b/lib/fog/openstack/volume/v2/models/volume.rb @@ -17,7 +17,7 @@ def save data = if id.nil? service.create_volume(name, description, size, attributes) else - service.update_volume(id, attributes.reject { |k, _v| k == :id }) + service.update_volume(id, attributes.select { |key| %i(name description metadata).include?(key) }) end merge_attributes(data.body['volume']) true From 1e2bebf0a5dbdd069891263c7b0a95391d7dc82a Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 26 Sep 2018 12:13:01 +1000 Subject: [PATCH 075/129] Auth: Propagate connections options --- lib/fog/openstack/auth/token.rb | 17 ++++++----- lib/fog/openstack/core.rb | 2 +- unit/auth/token_test.rb | 50 ++++++++++++++++----------------- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb index beb60a274..2e12d6be5 100644 --- a/lib/fog/openstack/auth/token.rb +++ b/lib/fog/openstack/auth/token.rb @@ -13,35 +13,34 @@ class ExpiryError < RuntimeError; end class StandardError < RuntimeError; end class URLError < RuntimeError; end - def self.build(auth) + def self.build(auth, options) if auth[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i || auth[:openstack_tenant_id] || auth[:openstack_tenant] - Fog::OpenStack::Auth::Token::V2.new(auth) + Fog::OpenStack::Auth::Token::V2.new(auth, options) else - Fog::OpenStack::Auth::Token::V3.new(auth) + Fog::OpenStack::Auth::Token::V3.new(auth, options) end end - def initialize(auth) + def initialize(auth, options) raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty? @creds = { :data => build_credentials(auth), :uri => URI.parse(auth[:openstack_auth_url]) } - response = authenticate(@creds) + response = authenticate(@creds, options) set(response) end def get - set(authenticate(@creds)) if expired? + set(authenticate(@creds, {})) if expired? @token end private - def authenticate(creds) - connection_options = {} - connection = Fog::Core::Connection.new(creds[:uri].to_s, false, connection_options) + def authenticate(creds, options) + connection = Fog::Core::Connection.new(creds[:uri].to_s, false, options) request = { :expects => [200, 201], diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index d013838a3..e7ea9322b 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -206,7 +206,7 @@ def authenticate if !@openstack_management_url || @openstack_must_reauthenticate @openstack_auth_token = nil if @openstack_must_reauthenticate - token = Fog::OpenStack::Auth::Token.build(openstack_options) + token = Fog::OpenStack::Auth::Token.build(openstack_options, @connection_options) @openstack_management_url = if token.catalog token.catalog.get_endpoint_url( diff --git a/unit/auth/token_test.rb b/unit/auth/token_test.rb index 7caf8a9c2..4106632ab 100644 --- a/unit/auth/token_test.rb +++ b/unit/auth/token_test.rb @@ -13,7 +13,7 @@ ) proc do - Fog::OpenStack::Auth::Token.build({}) + Fog::OpenStack::Auth::Token.build({}, {}) end.must_raise Fog::OpenStack::Auth::Token::URLError end @@ -36,7 +36,7 @@ :headers => {'x-subject-token'=>'token_data_v3'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data_v3' end @@ -59,7 +59,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end @@ -83,7 +83,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end end @@ -106,7 +106,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end @@ -127,7 +127,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end end @@ -149,7 +149,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end end @@ -171,7 +171,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end end @@ -193,7 +193,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end @@ -214,7 +214,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end end @@ -236,7 +236,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end @@ -256,7 +256,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal 'token_data' end end @@ -283,7 +283,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) token.stub :expired?, false do token.get.must_equal 'token_data' end @@ -297,7 +297,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) token.stub :expired?, true do token.get.must_equal 'token_data' end @@ -312,7 +312,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) token.catalog.payload.must_equal ['catalog_data'] end @@ -324,7 +324,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(authv3_creds) + token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost' end end @@ -337,7 +337,7 @@ to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) proc do - Fog::OpenStack::Auth::Token.build({}) + Fog::OpenStack::Auth::Token.build({}, {}) end.must_raise Fog::OpenStack::Auth::Token::URLError end @@ -355,7 +355,7 @@ \"tenantName\":\"tenant\"}}"). to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' end @@ -372,7 +372,7 @@ \"tenantId\":\"tenant_id\"}}"). to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' end end @@ -389,7 +389,7 @@ with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}"). to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) - token = Fog::OpenStack::Auth::Token.build(auth) + token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' end @@ -404,7 +404,7 @@ with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}"). to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) - Fog::OpenStack::Auth::Token.build(auth) + Fog::OpenStack::Auth::Token.build(auth, {}) end end end @@ -429,7 +429,7 @@ :headers => {} ) - token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) token.stub :expired?, false do token.get.must_equal 'token_not_expired' end @@ -443,7 +443,7 @@ :headers => {} ) - token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) token.stub :expired?, true do token.get.must_equal 'token_expired' end @@ -458,7 +458,7 @@ :headers => {} ) - token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) token.catalog.payload.must_equal ['catalog_data'] end @@ -470,7 +470,7 @@ :headers => {'x-subject-token'=>'token_data'} ) - token = Fog::OpenStack::Auth::Token.build(authv2_creds) + token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) token.catalog.get_endpoint_url(%w[identity], 'public', 'regionOne').must_equal 'http://localhost' end end From d76ca3954ad2f5d842d913e488a6c078cd8ce308 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 26 Sep 2018 15:34:57 +1000 Subject: [PATCH 076/129] Image::V1: Service type is now imagev1 --- lib/fog/openstack/image/v1.rb | 2 +- lib/fog/openstack/image/v2.rb | 2 +- spec/fixtures/openstack/image_v1/common_setup.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/fog/openstack/image/v1.rb b/lib/fog/openstack/image/v1.rb index 5c0183a4e..6a4f02a3e 100644 --- a/lib/fog/openstack/image/v1.rb +++ b/lib/fog/openstack/image/v1.rb @@ -111,7 +111,7 @@ def default_path_prefix end def default_service_type - %w[image] + %w[imagev1] end end end diff --git a/lib/fog/openstack/image/v2.rb b/lib/fog/openstack/image/v2.rb index f613988f9..54978df47 100644 --- a/lib/fog/openstack/image/v2.rb +++ b/lib/fog/openstack/image/v2.rb @@ -119,7 +119,7 @@ def default_path_prefix end def default_service_type - %w[image] + %w[image imagev2] end end end diff --git a/spec/fixtures/openstack/image_v1/common_setup.yml b/spec/fixtures/openstack/image_v1/common_setup.yml index d05c0b4d9..090ce6bd7 100644 --- a/spec/fixtures/openstack/image_v1/common_setup.yml +++ b/spec/fixtures/openstack/image_v1/common_setup.yml @@ -73,7 +73,7 @@ http_interactions: {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region": "RegionOne", "interface": "public", "id": "b3b24c2c4ef44ff48049caff79149091"}, {"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9292", "region": "RegionOne", "interface": - "internal", "id": "b9d30173e66148baa3ab2dc2df33cb5e"}], "type": "image", "id": + "internal", "id": "b9d30173e66148baa3ab2dc2df33cb5e"}], "type": "imagev1", "id": "b936e5bfd38e4a3b97fcb8d08840881f", "name": "glance"}, {"endpoints": [{"region_id": "RegionOne", "url": "http://devstack.openstack.stack:9696/", "region": "RegionOne", "interface": "admin", "id": "1a6718d75cd94e24993a27d275442a17"}, {"region_id": "RegionOne", From 04032998ab629aaea843b148f4d39d6dbb14deaa Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 27 Sep 2018 10:47:32 +1000 Subject: [PATCH 077/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 5b9509d85..9e2c21670 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.0'.freeze + VERSION = '1.0.1'.freeze end end From 118d11c7f79c6f65d3b988d7b9221cce438b5dd4 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 27 Sep 2018 22:38:08 +1000 Subject: [PATCH 078/129] Identity: Fix versionned endpoint --- lib/fog/openstack/identity/identity.rb | 21 +-------------------- lib/fog/openstack/identity/v2.rb | 12 ++++++------ lib/fog/openstack/identity/v3.rb | 14 +++++++------- 3 files changed, 14 insertions(+), 33 deletions(-) diff --git a/lib/fog/openstack/identity/identity.rb b/lib/fog/openstack/identity/identity.rb index cdbd4fca6..949b89252 100644 --- a/lib/fog/openstack/identity/identity.rb +++ b/lib/fog/openstack/identity/identity.rb @@ -5,26 +5,7 @@ class Identity < Fog::Service autoload :V3, 'fog/openstack/identity/v3' def self.new(args = {}) - version = if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i - '2.0' - elsif args[:openstack_auth_url] =~ /v3|v2(\.0)*/ - # Deprecated from fog-openstack 0.2.0 - # Will be removed in future after hard deprecation is enforced for a couple of releases - Fog::Logger.deprecation("An authentication URL including a version is deprecated") - case args[:openstack_auth_url] - when /\/v3(\/)*.*$/ - args[:openstack_auth_url].gsub!(/\/v3(\/)*.*$/, '') - args[:no_path_prefix] = true - '3' - when /\/v2(\.0)*(\/)*.*$/ - args[:openstack_auth_url].gsub!(/\/v2(\.0)*(\/)*.*$/, '') - args[:no_path_prefix] = true - '2.0' - end - end - - case version - when '2.0' + if args[:openstack_identity_api_version] =~ /(v)*2(\.0)*/i Fog::OpenStack::Identity::V2.new(args) else Fog::OpenStack::Identity::V3.new(args) diff --git a/lib/fog/openstack/identity/v2.rb b/lib/fog/openstack/identity/v2.rb index 0ec570f2d..52fd83777 100644 --- a/lib/fog/openstack/identity/v2.rb +++ b/lib/fog/openstack/identity/v2.rb @@ -169,12 +169,8 @@ def credentials end class Real < Fog::OpenStack::Identity::Real - def initialize(args) - @path_prefix = if args[:no_path_prefix] - '' - else - 'v2.0' - end + def api_path_prefix + @path_prefix = version_in_path?(@openstack_management_uri.path) ? '' : 'v2.0' super end @@ -185,6 +181,10 @@ def default_path_prefix def default_service_type %w[identity_v2 identityv2 identity] end + + def version_in_path?(url) + true if url =~ /\/v2(\.0)*(\/)*.*$/ + end end end end diff --git a/lib/fog/openstack/identity/v3.rb b/lib/fog/openstack/identity/v3.rb index 61da21d23..46c001fc7 100644 --- a/lib/fog/openstack/identity/v3.rb +++ b/lib/fog/openstack/identity/v3.rb @@ -13,7 +13,7 @@ class V3 < Fog::Service :openstack_user_domain_id, :openstack_project_domain_id, :openstack_api_key, :openstack_current_user_id, :openstack_userid, :openstack_username, :current_user, :current_user_id, :current_tenant, - :provider, :openstack_identity_api_version, :openstack_cache_ttl, :no_path_prefix + :provider, :openstack_identity_api_version, :openstack_cache_ttl model_path 'fog/openstack/identity/v3/models' model :domain @@ -142,12 +142,8 @@ def self.get_api_version(uri, connection_options = {}) end class Real < Fog::OpenStack::Identity::Real - def initialize(args) - @path_prefix = if args[:no_path_prefix] - '' - else - 'v3' - end + def api_path_prefix + @path_prefix = version_in_path?(@openstack_management_uri.path) ? '' : 'v3' super end @@ -158,6 +154,10 @@ def default_path_prefix def default_service_type %w[identity_v3 identityv3 identity] end + + def version_in_path?(url) + true if url =~ /\/v3(\/)*.*$/ + end end end end From 7e919ebb8b09a89062079532326c6b36d711fe17 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 27 Sep 2018 15:55:25 +1000 Subject: [PATCH 079/129] Auth: Allow a versionned auth_url path --- lib/fog/openstack/auth/token.rb | 2 +- lib/fog/openstack/auth/token/v2.rb | 10 +++++++++- lib/fog/openstack/auth/token/v3.rb | 10 +++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb index 2e12d6be5..a6b75ba2d 100644 --- a/lib/fog/openstack/auth/token.rb +++ b/lib/fog/openstack/auth/token.rb @@ -47,7 +47,7 @@ def authenticate(creds, options) :headers => {'Content-Type' => 'application/json'}, :body => Fog::JSON.encode(creds[:data]), :method => 'POST', - :path => creds[:uri].path + path + :path => creds[:uri].path + prefix_path(creds[:uri]) + path } connection.request(request) diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb index 04a59d48e..5f1d4dd85 100644 --- a/lib/fog/openstack/auth/token/v2.rb +++ b/lib/fog/openstack/auth/token/v2.rb @@ -29,8 +29,16 @@ def credentials {'auth' => identity} end + def prefix_path(uri) + if uri.path =~ /\/v2(\.0)*(\/)*.*$/ + '' + else + '/v2.0' + end + end + def path - '/v2.0/tokens' + '/tokens' end def user_credentials diff --git a/lib/fog/openstack/auth/token/v3.rb b/lib/fog/openstack/auth/token/v3.rb index 8dd99c8e7..a5037bfbe 100644 --- a/lib/fog/openstack/auth/token/v3.rb +++ b/lib/fog/openstack/auth/token/v3.rb @@ -37,8 +37,16 @@ def credentials end end + def prefix_path(uri) + if uri.path =~ /\/v3(\/)*.*$/ + '' + else + '/v3' + end + end + def path - '/v3/auth/tokens' + '/auth/tokens' end def scope From 2a6a0e3316f915463eca8c6f197b588f413c2ead Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 27 Sep 2018 23:13:04 +1000 Subject: [PATCH 080/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 9e2c21670..12cf02d62 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.1'.freeze + VERSION = '1.0.2'.freeze end end From 9ea6a8c088be5e08ecf818c337b8ab250600411c Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 2 Oct 2018 13:39:53 +1000 Subject: [PATCH 081/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 12cf02d62..37ba3efd3 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.2'.freeze + VERSION = '1.0.3'.freeze end end From 1012318bae4dccf01bc23ecb65a2bbf01897b89e Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Thu, 11 Oct 2018 16:20:50 +1100 Subject: [PATCH 082/129] Volume update: Filter fixtures and v1 --- .../volume/requests/update_volume.rb | 12 ------ lib/fog/openstack/volume/v1/models/volume.rb | 3 +- .../volume/v1/requests/update_volume.rb | 17 ++++++++ .../volume/v2/requests/update_volume.rb | 18 +++++++++ .../fixtures/openstack/volume/volume_crud.yml | 39 +++++++++---------- .../openstack/volume_v1/volume_crud.yml | 37 +++++++++--------- .../openstack/volume_v2/volume_crud.yml | 37 +++++++++--------- 7 files changed, 92 insertions(+), 71 deletions(-) diff --git a/lib/fog/openstack/volume/requests/update_volume.rb b/lib/fog/openstack/volume/requests/update_volume.rb index 0a67186fc..67ec2e861 100644 --- a/lib/fog/openstack/volume/requests/update_volume.rb +++ b/lib/fog/openstack/volume/requests/update_volume.rb @@ -1,18 +1,6 @@ module Fog module OpenStack class Volume - module Real - def update_volume(volume_id, data = {}) - data = data.select { |key| key == :name || key == :description || key == :metadata } - request( - :body => Fog::JSON.encode('volume' => data), - :expects => 200, - :method => 'PUT', - :path => "volumes/#{volume_id}" - ) - end - end - module Mock def update_volume(volume_id, data = {}) response = Excon::Response.new diff --git a/lib/fog/openstack/volume/v1/models/volume.rb b/lib/fog/openstack/volume/v1/models/volume.rb index 89aaa76e7..d76276add 100644 --- a/lib/fog/openstack/volume/v1/models/volume.rb +++ b/lib/fog/openstack/volume/v1/models/volume.rb @@ -17,7 +17,8 @@ def save data = if id.nil? service.create_volume(display_name, display_description, size, attributes) else - service.update_volume(id, attributes.reject { |k, _v| k == :id }) + attrib = attributes.select { |key| %i(display_name display_description metadata).include?(key) } + service.update_volume(id, attrib) end merge_attributes(data.body['volume']) true diff --git a/lib/fog/openstack/volume/v1/requests/update_volume.rb b/lib/fog/openstack/volume/v1/requests/update_volume.rb index e57109738..3dd666ea6 100644 --- a/lib/fog/openstack/volume/v1/requests/update_volume.rb +++ b/lib/fog/openstack/volume/v1/requests/update_volume.rb @@ -1,2 +1,19 @@ require 'fog/openstack/volume/requests/update_volume' require 'fog/openstack/volume/v1/requests/real' + +module Fog + module OpenStack + class Volume + module Real + def update_volume(volume_id, data = {}) + request( + :body => Fog::JSON.encode('volume' => data), + :expects => 200, + :method => 'PUT', + :path => "volumes/#{volume_id}" + ) + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/requests/update_volume.rb b/lib/fog/openstack/volume/v2/requests/update_volume.rb index 58a077081..056e2275e 100644 --- a/lib/fog/openstack/volume/v2/requests/update_volume.rb +++ b/lib/fog/openstack/volume/v2/requests/update_volume.rb @@ -1,2 +1,20 @@ require 'fog/openstack/volume/requests/update_volume' require 'fog/openstack/volume/v2/requests/real' + +module Fog + module OpenStack + class Volume + module Real + def update_volume(volume_id, data = {}) + data = data.select { |key| key == :name || key == :description || key == :metadata } + request( + :body => Fog::JSON.encode('volume' => data), + :expects => 200, + :method => 'PUT', + :path => "volumes/#{volume_id}" + ) + end + end + end + end +end diff --git a/spec/fixtures/openstack/volume/volume_crud.yml b/spec/fixtures/openstack/volume/volume_crud.yml index 2f6131e31..5c70feb98 100644 --- a/spec/fixtures/openstack/volume/volume_crud.yml +++ b/spec/fixtures/openstack/volume/volume_crud.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:27 GMT - request: method: post @@ -98,7 +98,7 @@ http_interactions: "replication_status": "disabled", "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "97b01b22-1239-4295-84bc-8ba77cb203d6", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:28 GMT - request: method: get @@ -155,7 +155,7 @@ http_interactions: null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:28 GMT - request: method: get @@ -212,7 +212,7 @@ http_interactions: null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:28 GMT - request: method: get @@ -269,7 +269,7 @@ http_interactions: null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:29 GMT - request: method: get @@ -326,7 +326,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:30 GMT - request: method: get @@ -383,7 +383,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:30 GMT - request: method: put @@ -437,7 +437,7 @@ http_interactions: "replication_status": "disabled", "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "97b01b22-1239-4295-84bc-8ba77cb203d6", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:31 GMT - request: method: get @@ -494,15 +494,14 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:31 GMT - request: method: put uri: http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/volumes/97b01b22-1239-4295-84bc-8ba77cb203d6 body: encoding: UTF-8 - string: '{"volume":{"migration_status":null,"attachments":[],"links":[{"href":"http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/volumes/97b01b22-1239-4295-84bc-8ba77cb203d6","rel":"self"},{"href":"http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/volumes/97b01b22-1239-4295-84bc-8ba77cb203d6","rel":"bookmark"}],"availability_zone":"nova","os-vol-host-attr:host":"mo-0e4c34476@lvmdriver-1#lvmdriver-1","encrypted":false,"os-volume-replication:extended_status":null,"replication_status":"disabled","snapshot_id":null,"size":1,"user_id":"205e0e39a2534743b517ed0aa2fbcda7","tenant_id":"2ab82e30d7984631874def67813dffd8","os-vol-mig-status-attr:migstat":null,"metadata":{},"status":"available","description":"This - is the updated volume description.","multiattach":false,"os-volume-replication:driver_data":null,"source_volid":null,"consistencygroup_id":null,"os-vol-mig-status-attr:name_id":null,"name":"fog-updated-testvolume-1","bootable":"false","created_at":"2016-05-03T14:15:27.000000","volume_type":"lvmdriver-1"}}' + string: '{"volume":{"metadata":{},"description":"This is the updated volume description.","name":"fog-updated-testvolume-1"}}' headers: User-Agent: - fog-core/1.38.0 @@ -549,7 +548,7 @@ http_interactions: "replication_status": "disabled", "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "97b01b22-1239-4295-84bc-8ba77cb203d6", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:31 GMT - request: method: get @@ -606,7 +605,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:32 GMT - request: method: get @@ -663,7 +662,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:32 GMT - request: method: get @@ -720,7 +719,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:33 GMT - request: method: delete @@ -763,7 +762,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:33 GMT - request: method: get @@ -820,7 +819,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:33 GMT - request: method: get @@ -877,7 +876,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:35 GMT - request: method: get @@ -934,7 +933,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:15:27.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:37 GMT - request: method: get @@ -980,6 +979,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Volume 97b01b22-1239-4295-84bc-8ba77cb203d6 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:15:41 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v1/volume_crud.yml b/spec/fixtures/openstack/volume_v1/volume_crud.yml index bcfea4f52..d0811a075 100644 --- a/spec/fixtures/openstack/volume_v1/volume_crud.yml +++ b/spec/fixtures/openstack/volume_v1/volume_crud.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:51 GMT - request: method: post @@ -94,7 +94,7 @@ http_interactions: "display_description": "This is the volume description.", "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:51 GMT - request: method: get @@ -147,7 +147,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:51 GMT - request: method: get @@ -200,7 +200,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:52 GMT - request: method: get @@ -253,7 +253,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:52 GMT - request: method: get @@ -306,7 +306,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:52 GMT - request: method: put @@ -356,7 +356,7 @@ http_interactions: "display_description": "This is the volume description.", "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:53 GMT - request: method: get @@ -409,15 +409,14 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:53 GMT - request: method: put uri: http://devstack.openstack.stack:8776/v1/2ab82e30d7984631874def67813dffd8/volumes/3b59e23e-d5b5-42be-b297-f4880c1bbb5f body: encoding: UTF-8 - string: '{"volume":{"status":"available","display_name":"fog-updated-testvolume-1","attachments":[],"availability_zone":"nova","bootable":"false","encrypted":false,"created_at":"2016-05-03T14:17:51.000000","multiattach":"false","tenant_id":"2ab82e30d7984631874def67813dffd8","os-volume-replication:driver_data":null,"display_description":"This - is the updated volume description.","os-volume-replication:extended_status":null,"os-vol-host-attr:host":"mo-0e4c34476@lvmdriver-1#lvmdriver-1","volume_type":"lvmdriver-1","snapshot_id":null,"source_volid":null,"os-vol-mig-status-attr:name_id":null,"metadata":{},"os-vol-mig-status-attr:migstat":null,"size":1}}' + string: '{"volume":{"display_name":"fog-updated-testvolume-1","display_description":"This is the updated volume description.","metadata":{}}}' headers: User-Agent: - fog-core/1.38.0 @@ -460,7 +459,7 @@ http_interactions: "display_description": "This is the updated volume description.", "volume_type": "lvmdriver-1", "snapshot_id": null, "source_volid": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:54 GMT - request: method: get @@ -513,7 +512,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:54 GMT - request: method: get @@ -566,7 +565,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:55 GMT - request: method: get @@ -619,7 +618,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:55 GMT - request: method: delete @@ -662,7 +661,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:55 GMT - request: method: get @@ -715,7 +714,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:56 GMT - request: method: get @@ -768,7 +767,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:57 GMT - request: method: get @@ -821,7 +820,7 @@ http_interactions: "lvmdriver-1", "snapshot_id": null, "source_volid": null, "os-vol-mig-status-attr:name_id": null, "metadata": {}, "id": "3b59e23e-d5b5-42be-b297-f4880c1bbb5f", "os-vol-mig-status-attr:migstat": null, "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:17:59 GMT - request: method: get @@ -867,6 +866,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "The resource could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:18:04 GMT recorded_with: VCR 3.0.1 diff --git a/spec/fixtures/openstack/volume_v2/volume_crud.yml b/spec/fixtures/openstack/volume_v2/volume_crud.yml index b678cf646..c046f46e4 100644 --- a/spec/fixtures/openstack/volume_v2/volume_crud.yml +++ b/spec/fixtures/openstack/volume_v2/volume_crud.yml @@ -43,7 +43,7 @@ http_interactions: body: encoding: UTF-8 string: '{"volumes": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:21 GMT - request: method: post @@ -98,7 +98,7 @@ http_interactions: "replication_status": "disabled", "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:22 GMT - request: method: get @@ -155,7 +155,7 @@ http_interactions: null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:22 GMT - request: method: get @@ -212,7 +212,7 @@ http_interactions: null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:23 GMT - request: method: get @@ -269,7 +269,7 @@ http_interactions: null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:23 GMT - request: method: get @@ -326,7 +326,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:24 GMT - request: method: get @@ -383,7 +383,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:24 GMT - request: method: put @@ -437,7 +437,7 @@ http_interactions: "replication_status": "disabled", "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:25 GMT - request: method: get @@ -494,15 +494,14 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:25 GMT - request: method: put uri: http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/volumes/b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11 body: encoding: UTF-8 - string: '{"volume":{"migration_status":null,"attachments":[],"links":[{"href":"http://devstack.openstack.stack:8776/v2/2ab82e30d7984631874def67813dffd8/volumes/b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11","rel":"self"},{"href":"http://devstack.openstack.stack:8776/2ab82e30d7984631874def67813dffd8/volumes/b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11","rel":"bookmark"}],"availability_zone":"nova","os-vol-host-attr:host":"mo-0e4c34476@lvmdriver-1#lvmdriver-1","encrypted":false,"os-volume-replication:extended_status":null,"replication_status":"disabled","snapshot_id":null,"size":1,"user_id":"205e0e39a2534743b517ed0aa2fbcda7","tenant_id":"2ab82e30d7984631874def67813dffd8","os-vol-mig-status-attr:migstat":null,"metadata":{},"status":"available","description":"This - is the updated volume description.","multiattach":false,"os-volume-replication:driver_data":null,"source_volid":null,"consistencygroup_id":null,"os-vol-mig-status-attr:name_id":null,"name":"fog-updated-testvolume-1","bootable":"false","created_at":"2016-05-03T14:21:22.000000","volume_type":"lvmdriver-1"}}' + string: '{"volume":{"metadata":{},"description":"This is the updated volume description.","name":"fog-updated-testvolume-1"}}' headers: User-Agent: - fog-core/1.38.0 @@ -549,7 +548,7 @@ http_interactions: "replication_status": "disabled", "consistencygroup_id": null, "source_volid": null, "snapshot_id": null, "multiattach": false, "metadata": {}, "id": "b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11", "size": 1}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:26 GMT - request: method: get @@ -606,7 +605,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:26 GMT - request: method: get @@ -663,7 +662,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:27 GMT - request: method: get @@ -720,7 +719,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:27 GMT - request: method: delete @@ -763,7 +762,7 @@ http_interactions: body: encoding: UTF-8 string: '' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:27 GMT - request: method: get @@ -820,7 +819,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:28 GMT - request: method: get @@ -877,7 +876,7 @@ http_interactions: null, "source_volid": null, "consistencygroup_id": null, "os-vol-mig-status-attr:name_id": null, "name": "fog-updated-testvolume-1", "bootable": "false", "created_at": "2016-05-03T14:21:22.000000", "volume_type": "lvmdriver-1"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:29 GMT - request: method: get @@ -923,6 +922,6 @@ http_interactions: encoding: UTF-8 string: '{"itemNotFound": {"message": "Volume b1c8ab26-71c4-4ccc-a06c-99e94d6c7b11 could not be found.", "code": 404}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 14:21:32 GMT recorded_with: VCR 3.0.1 From 04bc479765304a4f5c31cbf5569e949e954af630 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 19 Oct 2018 10:50:19 +1100 Subject: [PATCH 083/129] Token: Use auth_url when catalog is empty --- lib/fog/openstack/core.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index e7ea9322b..0f49124c7 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -208,7 +208,7 @@ def authenticate token = Fog::OpenStack::Auth::Token.build(openstack_options, @connection_options) - @openstack_management_url = if token.catalog + @openstack_management_url = if token.catalog && !token.catalog.payload.empty? token.catalog.get_endpoint_url( @openstack_service_type, @openstack_endpoint_type, From 210added8f8dce08f7c7e0935512c837e7f61b49 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 19 Oct 2018 15:14:53 +1100 Subject: [PATCH 084/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 37ba3efd3..783f41279 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.3'.freeze + VERSION = '1.0.4'.freeze end end From f23f865238768967ea429f6403bcb1d9bb91d726 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 23 Oct 2018 13:15:01 +1100 Subject: [PATCH 085/129] Swift: Allow 202 for large objects creation/update/copy --- lib/fog/openstack/storage/requests/copy_object.rb | 2 +- lib/fog/openstack/storage/requests/put_object.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/openstack/storage/requests/copy_object.rb b/lib/fog/openstack/storage/requests/copy_object.rb index db518bead..f94a723a9 100644 --- a/lib/fog/openstack/storage/requests/copy_object.rb +++ b/lib/fog/openstack/storage/requests/copy_object.rb @@ -12,7 +12,7 @@ class Real # * options<~Hash> - Additional headers def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options = {}) headers = {'X-Copy-From' => "/#{source_container_name}/#{source_object_name}"}.merge(options) - request(:expects => 201, + request(:expects => [201, 202], :headers => headers, :method => 'PUT', :path => "#{Fog::OpenStack.escape(target_container_name)}/#{Fog::OpenStack.escape(target_object_name)}") diff --git a/lib/fog/openstack/storage/requests/put_object.rb b/lib/fog/openstack/storage/requests/put_object.rb index 57007cc02..ce1a3d187 100644 --- a/lib/fog/openstack/storage/requests/put_object.rb +++ b/lib/fog/openstack/storage/requests/put_object.rb @@ -26,7 +26,7 @@ def put_object(container, object, data, options = {}, &block) end params.merge!( - :expects => 201, + :expects => [201, 202], :idempotent => !params[:request_block], :headers => headers, :method => 'PUT', From c349e3e649d575a14a7eb2e1e005f1f19cc6566b Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 30 Oct 2018 16:23:59 +1100 Subject: [PATCH 086/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 783f41279..366bb5f8b 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.4'.freeze + VERSION = '1.0.5'.freeze end end From aaeab017ae6a9f0cb36cac26bd95803140d6cf89 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Mon, 5 Nov 2018 14:43:53 +1100 Subject: [PATCH 087/129] Nova: filter onSharedStorage for evacuate_server --- lib/fog/openstack/compute/requests/evacuate_server.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/fog/openstack/compute/requests/evacuate_server.rb b/lib/fog/openstack/compute/requests/evacuate_server.rb index 87017d0e1..7e60f34d7 100644 --- a/lib/fog/openstack/compute/requests/evacuate_server.rb +++ b/lib/fog/openstack/compute/requests/evacuate_server.rb @@ -5,7 +5,11 @@ class Real def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_password = nil) evacuate = {} evacuate['host'] = host if host - evacuate['onSharedStorage'] = on_shared_storage if on_shared_storage + + if !microversion_newwer_than('2.13') && on_shared_storage + evacuate['onSharedStorage'] = on_shared_storage + end + evacuate['adminPass'] = admin_password if admin_password body = { 'evacuate' => evacuate From 798cb9f7551f1d12a058ed23dd88259c54c069dc Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 7 Nov 2018 09:00:15 +1100 Subject: [PATCH 088/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 366bb5f8b..1127d2ce4 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.5'.freeze + VERSION = '1.0.6'.freeze end end From c2a8d31975f9a6172ba6cf3f9e6817f0d2c17b61 Mon Sep 17 00:00:00 2001 From: Marek Aufart Date: Mon, 29 Jan 2018 13:56:23 +0100 Subject: [PATCH 089/129] Fix get_project request path Get project method failed on bad component(expected absolute path component), caused by question mark in the path. Updating request to same approach as other working requests. --- .../identity/v3/requests/get_project.rb | 5 ++-- .../identity_v3/idv3_project_crud.yml | 30 +++++++++---------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/lib/fog/openstack/identity/v3/requests/get_project.rb b/lib/fog/openstack/identity/v3/requests/get_project.rb index 1d6494491..23340099d 100644 --- a/lib/fog/openstack/identity/v3/requests/get_project.rb +++ b/lib/fog/openstack/identity/v3/requests/get_project.rb @@ -3,11 +3,12 @@ module OpenStack class Identity class V3 class Real - def get_project(id, options = []) + def get_project(id, options = {}) request( :expects => [200], :method => 'GET', - :path => "projects/#{id}?#{options.join '&'}" + :path => "projects/#{id}", + :query => options ) end end diff --git a/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml b/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml index 86282e64c..6a5edd8ea 100644 --- a/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml +++ b/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml @@ -97,11 +97,11 @@ http_interactions: "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "enabled": true, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-foobar46"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:05 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46 + uri: http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e body: encoding: US-ASCII string: '' @@ -143,12 +143,12 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-foobar46", "previous": null, "next": null}, "projects": [{"is_domain": false, "description": "", "links": {"self": "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "enabled": true, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-foobar46"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:05 GMT - request: method: patch @@ -198,11 +198,11 @@ http_interactions: "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "extra": {}, "enabled": false, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-baz46"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects?name=p-baz46 + uri: http://devstack.openstack.stack:35357/v3/projects/p-baz46 body: encoding: US-ASCII string: '' @@ -244,12 +244,12 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-baz46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-baz46", "previous": null, "next": null}, "projects": [{"is_domain": false, "description": "", "links": {"self": "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "enabled": false, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-baz46"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get @@ -392,11 +392,11 @@ http_interactions: encoding: UTF-8 string: '{"error": {"message": "Could not find project: 6c752a162b6e4168b3f451ccf65d495e", "code": 404, "title": "Not Found"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46 + uri: http://devstack.openstack.stack:35357/v3/projects/p-foobar46 body: encoding: US-ASCII string: '' @@ -438,13 +438,13 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-foobar46", "previous": null, "next": null}, "projects": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects?name=p-baz46 + uri: http://devstack.openstack.stack:35357/v3/projects/p-baz46 body: encoding: US-ASCII string: '' @@ -486,8 +486,8 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-baz46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-baz46", "previous": null, "next": null}, "projects": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT recorded_with: VCR 3.0.1 From 234a1ab35cddc8230b7e72d421c0aa0c12841b77 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Fri, 23 Nov 2018 16:16:34 +1100 Subject: [PATCH 090/129] Options is hash; No changes to vcr files --- .../openstack/identity/v3/models/projects.rb | 4 +-- .../identity_v3/idv3_project_crud.yml | 30 +++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/lib/fog/openstack/identity/v3/models/projects.rb b/lib/fog/openstack/identity/v3/models/projects.rb index fd13515c3..e17eafca9 100644 --- a/lib/fog/openstack/identity/v3/models/projects.rb +++ b/lib/fog/openstack/identity/v3/models/projects.rb @@ -33,9 +33,9 @@ def auth_projects(options = {}) load(service.auth_projects(options).body['projects']) end - def find_by_id(id, options = []) # options can include :subtree_as_ids, :subtree_as_list, :parents_as_ids, :parents_as_list + def find_by_id(id, options = {}) # options can include :subtree_as_ids, :subtree_as_list, :parents_as_ids, :parents_as_list if options.kind_of? Symbol # Deal with a single option being passed on its own - options = [options] + options = {options => nil} end if service.openstack_cache_ttl > 0 diff --git a/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml b/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml index 6a5edd8ea..86282e64c 100644 --- a/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml +++ b/spec/fixtures/openstack/identity_v3/idv3_project_crud.yml @@ -97,11 +97,11 @@ http_interactions: "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "enabled": true, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-foobar46"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:05 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e + uri: http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46 body: encoding: US-ASCII string: '' @@ -143,12 +143,12 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-foobar46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46", "previous": null, "next": null}, "projects": [{"is_domain": false, "description": "", "links": {"self": "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "enabled": true, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-foobar46"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:05 GMT - request: method: patch @@ -198,11 +198,11 @@ http_interactions: "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "extra": {}, "enabled": false, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-baz46"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects/p-baz46 + uri: http://devstack.openstack.stack:35357/v3/projects?name=p-baz46 body: encoding: US-ASCII string: '' @@ -244,12 +244,12 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-baz46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-baz46", "previous": null, "next": null}, "projects": [{"is_domain": false, "description": "", "links": {"self": "http://devstack.openstack.stack:35357/v3/projects/6c752a162b6e4168b3f451ccf65d495e"}, "enabled": false, "id": "6c752a162b6e4168b3f451ccf65d495e", "parent_id": null, "domain_id": "default", "name": "p-baz46"}]}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get @@ -392,11 +392,11 @@ http_interactions: encoding: UTF-8 string: '{"error": {"message": "Could not find project: 6c752a162b6e4168b3f451ccf65d495e", "code": 404, "title": "Not Found"}}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects/p-foobar46 + uri: http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46 body: encoding: US-ASCII string: '' @@ -438,13 +438,13 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-foobar46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-foobar46", "previous": null, "next": null}, "projects": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT - request: method: get - uri: http://devstack.openstack.stack:35357/v3/projects/p-baz46 + uri: http://devstack.openstack.stack:35357/v3/projects?name=p-baz46 body: encoding: US-ASCII string: '' @@ -486,8 +486,8 @@ http_interactions: - keep-alive body: encoding: UTF-8 - string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects/p-baz46", + string: '{"links": {"self": "http://devstack.openstack.stack:35357/v3/projects?name=p-baz46", "previous": null, "next": null}, "projects": []}' - http_version: + http_version: recorded_at: Tue, 03 May 2016 13:52:06 GMT recorded_with: VCR 3.0.1 From c4b969bc9b7e1531a2c028a8e5d15fff5f4995a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 11:36:52 +0100 Subject: [PATCH 091/129] Remove binding.pry statement and related. --- lib/fog/openstack/planning/planning.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/fog/openstack/planning/planning.rb b/lib/fog/openstack/planning/planning.rb index e7253a2ad..b9743c115 100644 --- a/lib/fog/openstack/planning/planning.rb +++ b/lib/fog/openstack/planning/planning.rb @@ -120,9 +120,6 @@ def self.[](service) end def self.new(attributes) - require 'pry-byebug' - binding.pry - attributes = attributes.dup # Prevent delete from having side effects service = attributes.delete(:service).to_s.downcase.to_sym if services.include?(service) From 84b30cc1672e17be2597fd17079259aaffe4ae49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 12:19:15 +0100 Subject: [PATCH 092/129] install bundler before updating it. --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 055b2b249..5c62d49a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,7 @@ language: ruby sudo: false before_install: + - gem install bundler - gem update bundler script: - bundle exec rake test TESTOPTS="--verbose" From ccd0665c05fdb1be363fb2e0f8768d2764e4c7d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 12:24:29 +0100 Subject: [PATCH 093/129] Fix bundler version for travis --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5c62d49a7..a2c7570f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby sudo: false before_install: - - gem install bundler + - gem install bundler --version '~> 1.6' - gem update bundler script: - bundle exec rake test TESTOPTS="--verbose" From 00ee7a0819bd9e89a7dd8943116d79e010149d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 12:27:21 +0100 Subject: [PATCH 094/129] Don't update if you need bundler v1.6 compatible version --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a2c7570f0..ced0901dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,6 @@ language: ruby sudo: false before_install: - gem install bundler --version '~> 1.6' - - gem update bundler script: - bundle exec rake test TESTOPTS="--verbose" - bundle exec rake spec From 3a8f7aaf2f49d2f5a4ad79c5c6388db6099324fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 12:57:29 +0100 Subject: [PATCH 095/129] upgrade bundler gem to 2.0 --- .travis.yml | 2 +- fog-openstack.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ced0901dc..e6b42e46a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby sudo: false before_install: - - gem install bundler --version '~> 1.6' + - gem install bundler script: - bundle exec rake test TESTOPTS="--verbose" - bundle exec rake spec diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 2d201a5c2..60f0f4fbc 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'fog-json', '>= 1.0' spec.add_dependency 'ipaddress', '>= 0.8' - spec.add_development_dependency 'bundler', '~> 1.6' + spec.add_development_dependency 'bundler', '~> 2.0' spec.add_development_dependency 'coveralls' spec.add_development_dependency "mime-types" spec.add_development_dependency "mime-types-data" From 97b4333fee703464b19361cd6c3b89e55e7e3cb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 12:59:29 +0100 Subject: [PATCH 096/129] remove outdate ruby version (2.2.10) and add new one (2.6.0), upgrade the others (2.3.8, 2.4.5, 2.5.3) --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6b42e46a..1fd211f1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,13 +10,13 @@ env: matrix: fast_finish: true include: - - rvm: 2.2.10 + - rvm: 2.3.8 gemfile: Gemfile - - rvm: 2.3.7 + - rvm: 2.4.5 gemfile: Gemfile - - rvm: 2.4.4 + - rvm: 2.5.3 gemfile: Gemfile - - rvm: 2.5.1 + - rvm: 2.6.0 gemfile: Gemfile - rvm: jruby-head gemfile: Gemfile From 1eebe47d56c693e43279023b313a53645c7013f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 15:12:07 +0100 Subject: [PATCH 097/129] update ruby versions checked. --- .travis.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 055b2b249..1fd211f1b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby sudo: false before_install: - - gem update bundler + - gem install bundler script: - bundle exec rake test TESTOPTS="--verbose" - bundle exec rake spec @@ -10,13 +10,13 @@ env: matrix: fast_finish: true include: - - rvm: 2.2.10 + - rvm: 2.3.8 gemfile: Gemfile - - rvm: 2.3.7 + - rvm: 2.4.5 gemfile: Gemfile - - rvm: 2.4.4 + - rvm: 2.5.3 gemfile: Gemfile - - rvm: 2.5.1 + - rvm: 2.6.0 gemfile: Gemfile - rvm: jruby-head gemfile: Gemfile From 74a575e94ce62202b993a7711dd9aff8839f645e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 4 Jan 2019 15:21:42 +0100 Subject: [PATCH 098/129] correct bundler version everywhere needed. --- .travis.yml | 2 +- fog-openstack.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1fd211f1b..19e3e60da 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ language: ruby sudo: false before_install: - - gem install bundler + - gem install bundler --version '~> 1' script: - bundle exec rake test TESTOPTS="--verbose" - bundle exec rake spec diff --git a/fog-openstack.gemspec b/fog-openstack.gemspec index 2d201a5c2..d392aea4e 100644 --- a/fog-openstack.gemspec +++ b/fog-openstack.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |spec| spec.add_dependency 'fog-json', '>= 1.0' spec.add_dependency 'ipaddress', '>= 0.8' - spec.add_development_dependency 'bundler', '~> 1.6' + spec.add_development_dependency 'bundler', '~> 1' spec.add_development_dependency 'coveralls' spec.add_development_dependency "mime-types" spec.add_development_dependency "mime-types-data" From 19904fab3e4a19f324e4a58d8e7b7e93e5477734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Mon, 7 Jan 2019 11:03:42 +0100 Subject: [PATCH 099/129] Try fix zuul --- .zuul.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index 201fb1969..d8cfc0af8 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -12,10 +12,10 @@ run: playbooks/fog-openstack-unittest-test/run.yaml vars: rvm: - 2.2.10 - 2.3.7 - 2.4.4 - 2.5.1 + 2.3.8 + 2.4.5 + 2.5.3 + 2.6.0 jruby-head nodeset: ubuntu-xenial @@ -27,9 +27,9 @@ run: playbooks/fog-openstack-unittest-spec/run.yaml vars: rvm: - 2.2.10 - 2.3.7 - 2.4.4 - 2.5.1 + 2.3.8 + 2.4.5 + 2.5.3 + 2.6.0 jruby-head nodeset: ubuntu-xenial From 7869f36d835fcf596c694d3067be1bf8cccf053f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Mon, 7 Jan 2019 11:52:51 +0100 Subject: [PATCH 100/129] Include travis fix to zuul --- playbooks/fog-openstack-unittest-spec/run.yaml | 3 +-- playbooks/fog-openstack-unittest-test/run.yaml | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/playbooks/fog-openstack-unittest-spec/run.yaml b/playbooks/fog-openstack-unittest-spec/run.yaml index 7f3d4261f..f0ce89dbe 100644 --- a/playbooks/fog-openstack-unittest-spec/run.yaml +++ b/playbooks/fog-openstack-unittest-spec/run.yaml @@ -24,8 +24,7 @@ rvm use ${version} > /dev/null 2>&1 echo "Running tests based on Ruby ${version}..." ruby --version - gem install bundler - gem update bundler + gem install bundler --version '~> 1' bundle install --jobs=3 --retry=3 bundle exec rake spec TESTOPTS="--verbose" done diff --git a/playbooks/fog-openstack-unittest-test/run.yaml b/playbooks/fog-openstack-unittest-test/run.yaml index d01685084..5c3b2594a 100644 --- a/playbooks/fog-openstack-unittest-test/run.yaml +++ b/playbooks/fog-openstack-unittest-test/run.yaml @@ -24,8 +24,7 @@ rvm use ${version} > /dev/null 2>&1 echo "Running tests based on Ruby ${version}..." ruby --version - gem install bundler - gem update bundler + gem install bundler --version '~> 1' bundle install --jobs=3 --retry=3 bundle exec rake test TESTOPTS="--verbose" done From 84e8888e387a2b761649f650494c79f5eb728c98 Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Tue, 8 Jan 2019 14:53:16 +0100 Subject: [PATCH 101/129] Fix typo --- lib/fog/openstack/compute/requests/evacuate_server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/compute/requests/evacuate_server.rb b/lib/fog/openstack/compute/requests/evacuate_server.rb index 7e60f34d7..f8012d1a4 100644 --- a/lib/fog/openstack/compute/requests/evacuate_server.rb +++ b/lib/fog/openstack/compute/requests/evacuate_server.rb @@ -6,7 +6,7 @@ def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_passwo evacuate = {} evacuate['host'] = host if host - if !microversion_newwer_than('2.13') && on_shared_storage + if !microversion_newer_than('2.13') && on_shared_storage evacuate['onSharedStorage'] = on_shared_storage end From 8d76ab576e281d66f940e69e7ce48976783c38c6 Mon Sep 17 00:00:00 2001 From: Ladislav Smola Date: Wed, 9 Jan 2019 09:16:08 +0100 Subject: [PATCH 102/129] Release 1.0.7 --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index 1127d2ce4..de396b9e3 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.6'.freeze + VERSION = '1.0.7'.freeze end end From 5b4890d325ee39cd19e74d8d8584e947b7bd88e7 Mon Sep 17 00:00:00 2001 From: Lobster Date: Wed, 26 Dec 2018 20:19:28 -0200 Subject: [PATCH 103/129] Fix service path fog-core requires pattern fog/#{provider}/#{service} file --- lib/fog/openstack.rb | 40 +++++++++---------- .../openstack/{baremetal => }/baremetal.rb | 0 lib/fog/openstack/{compute => }/compute.rb | 0 .../{container_infra => }/container_infra.rb | 0 lib/fog/openstack/{dns => }/dns.rb | 0 lib/fog/openstack/dns/v1.rb | 2 +- lib/fog/openstack/dns/v2.rb | 2 +- lib/fog/openstack/{event => }/event.rb | 0 lib/fog/openstack/{identity => }/identity.rb | 0 lib/fog/openstack/identity/v2.rb | 2 +- lib/fog/openstack/identity/v3.rb | 2 +- lib/fog/openstack/{image => }/image.rb | 0 lib/fog/openstack/image/v1.rb | 2 +- lib/fog/openstack/image/v2.rb | 2 +- .../{introspection => }/introspection.rb | 0 .../{key_manager => }/key_manager.rb | 0 lib/fog/openstack/{metering => }/metering.rb | 0 lib/fog/openstack/{metric => }/metric.rb | 0 .../openstack/{monitoring => }/monitoring.rb | 0 lib/fog/openstack/{network => }/network.rb | 0 lib/fog/openstack/{nfv => }/nfv.rb | 0 .../{orchestration => }/orchestration.rb | 0 lib/fog/openstack/{planning => }/planning.rb | 0 .../shared_file_system.rb | 0 lib/fog/openstack/{storage => }/storage.rb | 0 lib/fog/openstack/{volume => }/volume.rb | 0 lib/fog/openstack/volume/v1.rb | 2 +- lib/fog/openstack/volume/v2.rb | 2 +- lib/fog/openstack/{workflow => }/workflow.rb | 0 lib/fog/openstack/workflow/v2.rb | 2 +- 30 files changed, 29 insertions(+), 29 deletions(-) rename lib/fog/openstack/{baremetal => }/baremetal.rb (100%) rename lib/fog/openstack/{compute => }/compute.rb (100%) rename lib/fog/openstack/{container_infra => }/container_infra.rb (100%) rename lib/fog/openstack/{dns => }/dns.rb (100%) rename lib/fog/openstack/{event => }/event.rb (100%) rename lib/fog/openstack/{identity => }/identity.rb (100%) rename lib/fog/openstack/{image => }/image.rb (100%) rename lib/fog/openstack/{introspection => }/introspection.rb (100%) rename lib/fog/openstack/{key_manager => }/key_manager.rb (100%) rename lib/fog/openstack/{metering => }/metering.rb (100%) rename lib/fog/openstack/{metric => }/metric.rb (100%) rename lib/fog/openstack/{monitoring => }/monitoring.rb (100%) rename lib/fog/openstack/{network => }/network.rb (100%) rename lib/fog/openstack/{nfv => }/nfv.rb (100%) rename lib/fog/openstack/{orchestration => }/orchestration.rb (100%) rename lib/fog/openstack/{planning => }/planning.rb (100%) rename lib/fog/openstack/{shared_file_system => }/shared_file_system.rb (100%) rename lib/fog/openstack/{storage => }/storage.rb (100%) rename lib/fog/openstack/{volume => }/volume.rb (100%) rename lib/fog/openstack/{workflow => }/workflow.rb (100%) diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index f61a00ee4..b1d308dae 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -10,27 +10,27 @@ module OpenStack autoload :Core, 'fog/openstack/core' autoload :Errors, 'fog/openstack/errors' - autoload :Baremetal, 'fog/openstack/baremetal/baremetal' - autoload :Compute, 'fog/openstack/compute/compute' - autoload :ContainerInfra, 'fog/openstack/container_infra/container_infra' - autoload :DNS, 'fog/openstack/dns/dns' - autoload :Event, 'fog/openstack/event/event' - autoload :Identity, 'fog/openstack/identity/identity' - autoload :Image, 'fog/openstack/image/image' - autoload :Introspection, 'fog/openstack/introspection/introspection' - autoload :KeyManager, 'fog/openstack/key_manager/key_manager' - autoload :Metering, 'fog/openstack/metering/metering' - autoload :Metric, 'fog/openstack/metric/metric' - autoload :Monitoring, 'fog/openstack/monitoring/monitoring' - autoload :Network, 'fog/openstack/network/network' - autoload :NFV, 'fog/openstack/nfv/nfv' - autoload :Orchestration, 'fog/openstack/orchestration/orchestration' + autoload :Baremetal, 'fog/openstack/baremetal' + autoload :Compute, 'fog/openstack/compute' + autoload :ContainerInfra, 'fog/openstack/container_infra' + autoload :DNS, 'fog/openstack/dns' + autoload :Event, 'fog/openstack/event' + autoload :Identity, 'fog/openstack/identity' + autoload :Image, 'fog/openstack/image' + autoload :Introspection, 'fog/openstack/introspection' + autoload :KeyManager, 'fog/openstack/key_manager' + autoload :Metering, 'fog/openstack/metering' + autoload :Metric, 'fog/openstack/metric' + autoload :Monitoring, 'fog/openstack/monitoring' + autoload :Network, 'fog/openstack/network' + autoload :NFV, 'fog/openstack/nfv' + autoload :Orchestration, 'fog/openstack/orchestration' autoload :OrchestrationUtil, 'fog/openstack/orchestration/util/recursive_hot_file_loader' - autoload :Planning, 'fog/openstack/planning/planning' - autoload :SharedFileSystem, 'fog/openstack/shared_file_system/shared_file_system' - autoload :Storage, 'fog/openstack/storage/storage' - autoload :Workflow, 'fog/openstack/workflow/workflow' - autoload :Volume, 'fog/openstack/volume/volume' + autoload :Planning, 'fog/openstack/planning' + autoload :SharedFileSystem, 'fog/openstack/shared_file_system' + autoload :Storage, 'fog/openstack/storage' + autoload :Workflow, 'fog/openstack/workflow' + autoload :Volume, 'fog/openstack/volume' extend Fog::Provider diff --git a/lib/fog/openstack/baremetal/baremetal.rb b/lib/fog/openstack/baremetal.rb similarity index 100% rename from lib/fog/openstack/baremetal/baremetal.rb rename to lib/fog/openstack/baremetal.rb diff --git a/lib/fog/openstack/compute/compute.rb b/lib/fog/openstack/compute.rb similarity index 100% rename from lib/fog/openstack/compute/compute.rb rename to lib/fog/openstack/compute.rb diff --git a/lib/fog/openstack/container_infra/container_infra.rb b/lib/fog/openstack/container_infra.rb similarity index 100% rename from lib/fog/openstack/container_infra/container_infra.rb rename to lib/fog/openstack/container_infra.rb diff --git a/lib/fog/openstack/dns/dns.rb b/lib/fog/openstack/dns.rb similarity index 100% rename from lib/fog/openstack/dns/dns.rb rename to lib/fog/openstack/dns.rb diff --git a/lib/fog/openstack/dns/v1.rb b/lib/fog/openstack/dns/v1.rb index e645d5258..1788f37b4 100644 --- a/lib/fog/openstack/dns/v1.rb +++ b/lib/fog/openstack/dns/v1.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/dns/dns' +require 'fog/openstack/dns' module Fog module OpenStack diff --git a/lib/fog/openstack/dns/v2.rb b/lib/fog/openstack/dns/v2.rb index 8be50f1d6..782ae0de0 100644 --- a/lib/fog/openstack/dns/v2.rb +++ b/lib/fog/openstack/dns/v2.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/dns/dns' +require 'fog/openstack/dns' module Fog module OpenStack diff --git a/lib/fog/openstack/event/event.rb b/lib/fog/openstack/event.rb similarity index 100% rename from lib/fog/openstack/event/event.rb rename to lib/fog/openstack/event.rb diff --git a/lib/fog/openstack/identity/identity.rb b/lib/fog/openstack/identity.rb similarity index 100% rename from lib/fog/openstack/identity/identity.rb rename to lib/fog/openstack/identity.rb diff --git a/lib/fog/openstack/identity/v2.rb b/lib/fog/openstack/identity/v2.rb index 52fd83777..31efe3fad 100644 --- a/lib/fog/openstack/identity/v2.rb +++ b/lib/fog/openstack/identity/v2.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/identity/identity' +require 'fog/openstack/identity' module Fog module OpenStack diff --git a/lib/fog/openstack/identity/v3.rb b/lib/fog/openstack/identity/v3.rb index 46c001fc7..3798b7c29 100644 --- a/lib/fog/openstack/identity/v3.rb +++ b/lib/fog/openstack/identity/v3.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/identity/identity' +require 'fog/openstack/identity' module Fog module OpenStack diff --git a/lib/fog/openstack/image/image.rb b/lib/fog/openstack/image.rb similarity index 100% rename from lib/fog/openstack/image/image.rb rename to lib/fog/openstack/image.rb diff --git a/lib/fog/openstack/image/v1.rb b/lib/fog/openstack/image/v1.rb index 6a4f02a3e..004677cd6 100644 --- a/lib/fog/openstack/image/v1.rb +++ b/lib/fog/openstack/image/v1.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/image/image' +require 'fog/openstack/image' module Fog module OpenStack diff --git a/lib/fog/openstack/image/v2.rb b/lib/fog/openstack/image/v2.rb index 54978df47..a2e641e77 100644 --- a/lib/fog/openstack/image/v2.rb +++ b/lib/fog/openstack/image/v2.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/image/image' +require 'fog/openstack/image' module Fog module OpenStack diff --git a/lib/fog/openstack/introspection/introspection.rb b/lib/fog/openstack/introspection.rb similarity index 100% rename from lib/fog/openstack/introspection/introspection.rb rename to lib/fog/openstack/introspection.rb diff --git a/lib/fog/openstack/key_manager/key_manager.rb b/lib/fog/openstack/key_manager.rb similarity index 100% rename from lib/fog/openstack/key_manager/key_manager.rb rename to lib/fog/openstack/key_manager.rb diff --git a/lib/fog/openstack/metering/metering.rb b/lib/fog/openstack/metering.rb similarity index 100% rename from lib/fog/openstack/metering/metering.rb rename to lib/fog/openstack/metering.rb diff --git a/lib/fog/openstack/metric/metric.rb b/lib/fog/openstack/metric.rb similarity index 100% rename from lib/fog/openstack/metric/metric.rb rename to lib/fog/openstack/metric.rb diff --git a/lib/fog/openstack/monitoring/monitoring.rb b/lib/fog/openstack/monitoring.rb similarity index 100% rename from lib/fog/openstack/monitoring/monitoring.rb rename to lib/fog/openstack/monitoring.rb diff --git a/lib/fog/openstack/network/network.rb b/lib/fog/openstack/network.rb similarity index 100% rename from lib/fog/openstack/network/network.rb rename to lib/fog/openstack/network.rb diff --git a/lib/fog/openstack/nfv/nfv.rb b/lib/fog/openstack/nfv.rb similarity index 100% rename from lib/fog/openstack/nfv/nfv.rb rename to lib/fog/openstack/nfv.rb diff --git a/lib/fog/openstack/orchestration/orchestration.rb b/lib/fog/openstack/orchestration.rb similarity index 100% rename from lib/fog/openstack/orchestration/orchestration.rb rename to lib/fog/openstack/orchestration.rb diff --git a/lib/fog/openstack/planning/planning.rb b/lib/fog/openstack/planning.rb similarity index 100% rename from lib/fog/openstack/planning/planning.rb rename to lib/fog/openstack/planning.rb diff --git a/lib/fog/openstack/shared_file_system/shared_file_system.rb b/lib/fog/openstack/shared_file_system.rb similarity index 100% rename from lib/fog/openstack/shared_file_system/shared_file_system.rb rename to lib/fog/openstack/shared_file_system.rb diff --git a/lib/fog/openstack/storage/storage.rb b/lib/fog/openstack/storage.rb similarity index 100% rename from lib/fog/openstack/storage/storage.rb rename to lib/fog/openstack/storage.rb diff --git a/lib/fog/openstack/volume/volume.rb b/lib/fog/openstack/volume.rb similarity index 100% rename from lib/fog/openstack/volume/volume.rb rename to lib/fog/openstack/volume.rb diff --git a/lib/fog/openstack/volume/v1.rb b/lib/fog/openstack/volume/v1.rb index d3ed15e7a..5cb9dca25 100644 --- a/lib/fog/openstack/volume/v1.rb +++ b/lib/fog/openstack/volume/v1.rb @@ -1,5 +1,5 @@ require 'fog/openstack/core' -require 'fog/openstack/volume/volume' +require 'fog/openstack/volume' module Fog module OpenStack diff --git a/lib/fog/openstack/volume/v2.rb b/lib/fog/openstack/volume/v2.rb index 8aeed1483..aa9444ca7 100644 --- a/lib/fog/openstack/volume/v2.rb +++ b/lib/fog/openstack/volume/v2.rb @@ -1,5 +1,5 @@ require 'fog/openstack/core' -require 'fog/openstack/volume/volume' +require 'fog/openstack/volume' module Fog module OpenStack diff --git a/lib/fog/openstack/workflow/workflow.rb b/lib/fog/openstack/workflow.rb similarity index 100% rename from lib/fog/openstack/workflow/workflow.rb rename to lib/fog/openstack/workflow.rb diff --git a/lib/fog/openstack/workflow/v2.rb b/lib/fog/openstack/workflow/v2.rb index b2896cd4b..0aa747089 100644 --- a/lib/fog/openstack/workflow/v2.rb +++ b/lib/fog/openstack/workflow/v2.rb @@ -1,4 +1,4 @@ -require 'fog/openstack/workflow/workflow' +require 'fog/openstack/workflow' module Fog module OpenStack From a0f9bdc5639e1eb1d461d2a072eac1efeac4eda9 Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Tue, 15 Jan 2019 17:38:37 +0100 Subject: [PATCH 104/129] Fix typo --- lib/fog/openstack/compute/requests/evacuate_server.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/compute/requests/evacuate_server.rb b/lib/fog/openstack/compute/requests/evacuate_server.rb index f8012d1a4..2622e9be2 100644 --- a/lib/fog/openstack/compute/requests/evacuate_server.rb +++ b/lib/fog/openstack/compute/requests/evacuate_server.rb @@ -6,7 +6,7 @@ def evacuate_server(server_id, host = nil, on_shared_storage = nil, admin_passwo evacuate = {} evacuate['host'] = host if host - if !microversion_newer_than('2.13') && on_shared_storage + if !microversion_newer_than?('2.13') && on_shared_storage evacuate['onSharedStorage'] = on_shared_storage end From b0985e87b0717df8a977ee15a6c48199ec64a139 Mon Sep 17 00:00:00 2001 From: Sam Lucidi Date: Thu, 17 Jan 2019 14:51:20 -0500 Subject: [PATCH 105/129] Add multiattach parameter to volume creation --- lib/fog/openstack/volume/requests/create_volume.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/fog/openstack/volume/requests/create_volume.rb b/lib/fog/openstack/volume/requests/create_volume.rb index c639dde0e..498739e2d 100644 --- a/lib/fog/openstack/volume/requests/create_volume.rb +++ b/lib/fog/openstack/volume/requests/create_volume.rb @@ -6,7 +6,8 @@ module Real def _create_volume(data, options = {}) vanilla_options = [:snapshot_id, :imageRef, :volume_type, - :source_volid, :availability_zone, :metadata] + :source_volid, :availability_zone, :metadata, + :multiattach] vanilla_options.select { |o| options[o] }.each do |key| data['volume'][key] = options[key] end From eec6373b82531af815cb456915e27a4cd87b5815 Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Tue, 22 Jan 2019 16:36:30 +0100 Subject: [PATCH 106/129] Update version.rb --- lib/fog/openstack/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/version.rb b/lib/fog/openstack/version.rb index de396b9e3..a2d7ab0a8 100644 --- a/lib/fog/openstack/version.rb +++ b/lib/fog/openstack/version.rb @@ -1,5 +1,5 @@ module Fog module OpenStack - VERSION = '1.0.7'.freeze + VERSION = '1.0.8'.freeze end end From 153577dd223e7c53f22e9bcfc5e3004f5a5b11fe Mon Sep 17 00:00:00 2001 From: Alexander Demichev Date: Wed, 23 Jan 2019 14:24:47 +0100 Subject: [PATCH 107/129] Add debugger warning --- .rubocop.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.rubocop.yml b/.rubocop.yml index 265da2fa4..79a8c0d48 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -21,6 +21,8 @@ CollectionMethods: reduce: inject CyclomaticComplexity: Severity: refactor +Debugger: + Enabled: true FormatString: EnforcedStyle: percent HashSyntax: From 634aca42778df937f68a073089be46ec836b7bbc Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 30 Jan 2019 16:17:23 +0100 Subject: [PATCH 108/129] Fixed a couple of path to clear tests --- test/requests/workflow/workflow_tests.rb | 2 +- test/volume_tests.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/requests/workflow/workflow_tests.rb b/test/requests/workflow/workflow_tests.rb index 9337931e8..24dc08ac2 100644 --- a/test/requests/workflow/workflow_tests.rb +++ b/test/requests/workflow/workflow_tests.rb @@ -1,5 +1,5 @@ require "test_helper" -require 'fog/openstack/workflow/workflow' +require 'fog/openstack/workflow' require 'fog/openstack/workflow/v2' describe "Fog::OpenStack::Workflow | Workflow requests" do diff --git a/test/volume_tests.rb b/test/volume_tests.rb index 3bf97d9ed..4284142e5 100644 --- a/test/volume_tests.rb +++ b/test/volume_tests.rb @@ -1,6 +1,6 @@ require 'test_helper' -require 'fog/openstack/volume/volume' +require 'fog/openstack/volume' require 'fog/openstack/volume/v1' require 'fog/openstack/volume/v2' From bb5bb5c555dc42daf18c3bbc7513788b801be2fb Mon Sep 17 00:00:00 2001 From: Gilles Dubreuil Date: Wed, 30 Jan 2019 16:09:28 +0100 Subject: [PATCH 109/129] Created explicit mock and real files for volume v1 and v2 --- lib/fog/openstack/volume/v1.rb | 78 +---------------------------- lib/fog/openstack/volume/v1/mock.rb | 68 +++++++++++++++++++++++++ lib/fog/openstack/volume/v1/real.rb | 23 +++++++++ lib/fog/openstack/volume/v2.rb | 78 +---------------------------- lib/fog/openstack/volume/v2/mock.rb | 68 +++++++++++++++++++++++++ lib/fog/openstack/volume/v2/real.rb | 23 +++++++++ 6 files changed, 186 insertions(+), 152 deletions(-) create mode 100644 lib/fog/openstack/volume/v1/mock.rb create mode 100644 lib/fog/openstack/volume/v1/real.rb create mode 100644 lib/fog/openstack/volume/v2/mock.rb create mode 100644 lib/fog/openstack/volume/v2/real.rb diff --git a/lib/fog/openstack/volume/v1.rb b/lib/fog/openstack/volume/v1.rb index 5cb9dca25..b46df6fe5 100644 --- a/lib/fog/openstack/volume/v1.rb +++ b/lib/fog/openstack/volume/v1.rb @@ -84,82 +84,8 @@ class V1 < Fog::OpenStack::Volume request :set_tenant request :action - class Mock - def self.data - @data ||= Hash.new do |hash, key| - hash[key] = { - :users => {}, - :tenants => {}, - :quota => { - 'gigabytes' => 1000, - 'volumes' => 10, - 'snapshots' => 10 - } - } - end - end - - def self.reset - @data = nil - end - - def initialize(options = {}) - @openstack_username = options[:openstack_username] - @openstack_tenant = options[:openstack_tenant] - @openstack_auth_uri = URI.parse(options[:openstack_auth_url]) - - @auth_token = Fog::Mock.random_base64(64) - @auth_token_expiration = (Time.now.utc + 86400).iso8601 - - management_url = URI.parse(options[:openstack_auth_url]) - management_url.port = 8776 - management_url.path = '/v1' - @openstack_management_url = management_url.to_s - - @data ||= {:users => {}} - unless @data[:users].find { |u| u['name'] == options[:openstack_username] } - id = Fog::Mock.random_numbers(6).to_s - @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", - 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true - } - end - end - - def data - self.class.data[@openstack_username] - end - - def reset_data - self.class.data.delete(@openstack_username) - end - - def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} - end - end - - class Real - include Fog::OpenStack::Core - - def self.not_found_class - Fog::OpenStack::Volume::NotFound - end - - def default_endtpoint_type - 'admin' - end - - def default_service_type - %w[volume] - end - end + autoload :Mock, 'fog/openstack/volume/v1/mock' + autoload :Real, 'fog/openstack/volume/v1/real' end end end diff --git a/lib/fog/openstack/volume/v1/mock.rb b/lib/fog/openstack/volume/v1/mock.rb new file mode 100644 index 000000000..dbafe15ce --- /dev/null +++ b/lib/fog/openstack/volume/v1/mock.rb @@ -0,0 +1,68 @@ +module Fog + module OpenStack + class Volume + class V1 < Fog::OpenStack::Volume + class Mock + def self.data + @data ||= Hash.new do |hash, key| + hash[key] = { + :users => {}, + :tenants => {}, + :quota => { + 'gigabytes' => 1000, + 'volumes' => 10, + 'snapshots' => 10 + } + } + end + end + + def self.reset + @data = nil + end + + def initialize(options = {}) + @openstack_username = options[:openstack_username] + @openstack_tenant = options[:openstack_tenant] + @openstack_auth_uri = URI.parse(options[:openstack_auth_url]) + + @auth_token = Fog::Mock.random_base64(64) + @auth_token_expiration = (Time.now.utc + 86400).iso8601 + + management_url = URI.parse(options[:openstack_auth_url]) + management_url.port = 8776 + management_url.path = '/v1' + @openstack_management_url = management_url.to_s + + @data ||= {:users => {}} + unless @data[:users].find { |u| u['name'] == options[:openstack_username] } + id = Fog::Mock.random_numbers(6).to_s + @data[:users][id] = { + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", + 'tenantId' => Fog::Mock.random_numbers(6).to_s, + 'enabled' => true + } + end + end + + def data + self.class.data[@openstack_username] + end + + def reset_data + self.class.data.delete(@openstack_username) + end + + def credentials + {:provider => 'openstack', + :openstack_auth_url => @openstack_auth_uri.to_s, + :openstack_auth_token => @auth_token, + :openstack_management_url => @openstack_management_url} + end + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v1/real.rb b/lib/fog/openstack/volume/v1/real.rb new file mode 100644 index 000000000..ecd9d317c --- /dev/null +++ b/lib/fog/openstack/volume/v1/real.rb @@ -0,0 +1,23 @@ +module Fog + module OpenStack + class Volume + class V1 < Fog::OpenStack::Volume + class Real + include Fog::OpenStack::Core + + def self.not_found_class + Fog::OpenStack::Volume::NotFound + end + + def default_endtpoint_type + 'admin' + end + + def default_service_type + %w[volume] + end + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2.rb b/lib/fog/openstack/volume/v2.rb index aa9444ca7..d4efd4fae 100644 --- a/lib/fog/openstack/volume/v2.rb +++ b/lib/fog/openstack/volume/v2.rb @@ -86,82 +86,8 @@ class V2 < Fog::OpenStack::Volume request :action request :snapshot_action - class Mock - def self.data - @data ||= Hash.new do |hash, key| - hash[key] = { - :users => {}, - :tenants => {}, - :quota => { - 'gigabytes' => 1000, - 'volumes' => 10, - 'snapshots' => 10 - } - } - end - end - - def self.reset - @data = nil - end - - def initialize(options = {}) - @openstack_username = options[:openstack_username] - @openstack_tenant = options[:openstack_tenant] - @openstack_auth_uri = URI.parse(options[:openstack_auth_url]) - - @auth_token = Fog::Mock.random_base64(64) - @auth_token_expiration = (Time.now.utc + 86400).iso8601 - - management_url = URI.parse(options[:openstack_auth_url]) - management_url.port = 8776 - management_url.path = '/v1' - @openstack_management_url = management_url.to_s - - @data ||= {:users => {}} - unless @data[:users].find { |u| u['name'] == options[:openstack_username] } - id = Fog::Mock.random_numbers(6).to_s - @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", - 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true - } - end - end - - def data - self.class.data[@openstack_username] - end - - def reset_data - self.class.data.delete(@openstack_username) - end - - def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} - end - end - - class Real - include Fog::OpenStack::Core - - def self.not_found_class - Fog::OpenStack::Volume::NotFound - end - - def default_endtpoint_type - 'admin' - end - - def default_service_type - %w[volumev2] - end - end + autoload :Mock, 'fog/openstack/volume/v2/mock' + autoload :Real, 'fog/openstack/volume/v2/real' end end end diff --git a/lib/fog/openstack/volume/v2/mock.rb b/lib/fog/openstack/volume/v2/mock.rb new file mode 100644 index 000000000..262441dbd --- /dev/null +++ b/lib/fog/openstack/volume/v2/mock.rb @@ -0,0 +1,68 @@ +module Fog + module OpenStack + class Volume + class V2 < Fog::OpenStack::Volume + class Mock + def self.data + @data ||= Hash.new do |hash, key| + hash[key] = { + :users => {}, + :tenants => {}, + :quota => { + 'gigabytes' => 1000, + 'volumes' => 10, + 'snapshots' => 10 + } + } + end + end + + def self.reset + @data = nil + end + + def initialize(options = {}) + @openstack_username = options[:openstack_username] + @openstack_tenant = options[:openstack_tenant] + @openstack_auth_uri = URI.parse(options[:openstack_auth_url]) + + @auth_token = Fog::Mock.random_base64(64) + @auth_token_expiration = (Time.now.utc + 86400).iso8601 + + management_url = URI.parse(options[:openstack_auth_url]) + management_url.port = 8776 + management_url.path = '/v1' + @openstack_management_url = management_url.to_s + + @data ||= {:users => {}} + unless @data[:users].find { |u| u['name'] == options[:openstack_username] } + id = Fog::Mock.random_numbers(6).to_s + @data[:users][id] = { + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", + 'tenantId' => Fog::Mock.random_numbers(6).to_s, + 'enabled' => true + } + end + end + + def data + self.class.data[@openstack_username] + end + + def reset_data + self.class.data.delete(@openstack_username) + end + + def credentials + {:provider => 'openstack', + :openstack_auth_url => @openstack_auth_uri.to_s, + :openstack_auth_token => @auth_token, + :openstack_management_url => @openstack_management_url} + end + end + end + end + end +end diff --git a/lib/fog/openstack/volume/v2/real.rb b/lib/fog/openstack/volume/v2/real.rb new file mode 100644 index 000000000..32ffc028c --- /dev/null +++ b/lib/fog/openstack/volume/v2/real.rb @@ -0,0 +1,23 @@ +module Fog + module OpenStack + class Volume + class V2 < Fog::OpenStack::Volume + class Real + include Fog::OpenStack::Core + + def self.not_found_class + Fog::OpenStack::Volume::NotFound + end + + def default_endtpoint_type + 'admin' + end + + def default_service_type + %w[volumev2] + end + end + end + end + end +end From 8f5e4aa586669f20d3b60fe5d3d690a0f38d9a43 Mon Sep 17 00:00:00 2001 From: Michal Wazgird Date: Tue, 5 Feb 2019 18:50:08 +0100 Subject: [PATCH 110/129] Allow custom filename through Content-Disposition header --- .../storage/requests/get_object_https_url.rb | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/fog/openstack/storage/requests/get_object_https_url.rb b/lib/fog/openstack/storage/requests/get_object_https_url.rb index 5b8cd50e7..98da0ee23 100644 --- a/lib/fog/openstack/storage/requests/get_object_https_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_https_url.rb @@ -27,6 +27,7 @@ def get_object_https_url(container, object, expires, options = {}) # * 'scheme'<~String> - The scheme to use (http, https) # * 'host'<~String> - The host to use # * 'port'<~Integer> - The port to use + # * 'filename'<~String> - Filename returned Content-Disposition response header # # ==== Returns # * response<~Excon::Response>: @@ -34,6 +35,7 @@ def get_object_https_url(container, object, expires, options = {}) # # ==== See Also # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html + # https://developer.openstack.org/api-ref/object-store/?expanded=get-object-content-and-metadata-detail#get-object-content-and-metadata def create_temp_url(container, object, expires, method, options = {}) raise ArgumentError, "Insufficient parameters specified." unless container && object && expires && method raise ArgumentError, "Storage must be instantiated with the :openstack_temp_url_key option" if @openstack_temp_url_key.nil? @@ -54,14 +56,19 @@ def create_temp_url(container, object, expires, method, options = {}) string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}" hmac = Fog::HMAC.new('sha1', @openstack_temp_url_key.to_s) - sig = sig_to_hex(hmac.sign(string_to_sign)) + + query = { + temp_url_sig: sig_to_hex(hmac.sign(string_to_sign)), + temp_url_expires: expires + } + query[:filename] = options[:filename] unless options[:filename].nil? temp_url_options = { :scheme => scheme, :host => host, :port => port, :path => object_path_escaped, - :query => "temp_url_sig=#{sig}&temp_url_expires=#{expires}" + :query => query.map { |k, v| "#{k}=#{v}" }.join('&') } URI::Generic.build(temp_url_options).to_s end From 7935bc12e2c5f3f2af58b202b17a64a069f0ebba Mon Sep 17 00:00:00 2001 From: Michal Wazgird Date: Thu, 7 Feb 2019 20:56:51 +0100 Subject: [PATCH 111/129] small refactor --- lib/fog/openstack/storage/requests/get_object_https_url.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/storage/requests/get_object_https_url.rb b/lib/fog/openstack/storage/requests/get_object_https_url.rb index 98da0ee23..268df6726 100644 --- a/lib/fog/openstack/storage/requests/get_object_https_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_https_url.rb @@ -61,7 +61,7 @@ def create_temp_url(container, object, expires, method, options = {}) temp_url_sig: sig_to_hex(hmac.sign(string_to_sign)), temp_url_expires: expires } - query[:filename] = options[:filename] unless options[:filename].nil? + query[:filename] = options[:filename] if options[:filename] temp_url_options = { :scheme => scheme, From 7b3d6b2ec9957b0330e645d5714e10b4a5d12f10 Mon Sep 17 00:00:00 2001 From: Aleksey Sudakov Date: Wed, 20 Feb 2019 11:39:21 +0300 Subject: [PATCH 112/129] catch token expire --- lib/fog/openstack/core.rb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 0f49124c7..0660049bd 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -50,17 +50,18 @@ def initialize(options = {}) def request(params, parse_json = true) retried = false begin + authenticate! if @expires && (@expires - Time.now.utc).to_i < 60 + response = @connection.request( params.merge( :headers => headers(params.delete(:headers)), :path => "#{@path}/#{params[:path]}" ) ) - rescue Excon::Errors::Unauthorized => error + rescue Excon::Errors::Unauthorized, Excon::Error::Unauthorized => error # token expiration and token renewal possible if error.response.body != 'Bad username or password' && @openstack_can_reauthenticate && !retried - @openstack_must_reauthenticate = true - authenticate + authenticate! retried = true retry # bad credentials or token renewal not possible @@ -221,7 +222,7 @@ def authenticate @current_user = token.user['name'] @current_user_id = token.user['id'] @current_tenant = token.tenant - @expires = token.expires + @expires = Time.parse(token.expires) @auth_token = token.token @unscoped_token = token.token @openstack_must_reauthenticate = false @@ -237,6 +238,11 @@ def authenticate true end + + def authenticate! + @openstack_must_reauthenticate = true + authenticate + end end end end From ae29a115767e66654451c15a9d67700b8acce310 Mon Sep 17 00:00:00 2001 From: Aleksey Sudakov Date: Thu, 21 Feb 2019 17:46:01 +0300 Subject: [PATCH 113/129] fix date in VCR cassette --- spec/shared_context.rb | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/spec/shared_context.rb b/spec/shared_context.rb index 7de391f74..a83276983 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -74,6 +74,21 @@ def initialize(options) config.cassette_library_dir = "spec/debug" config.default_cassette_options = {:record => :all} end + + config.before_playback do |interaction| + # shift issued_at and expires_at to Time.now and Time.now + 1.day in json cassette body + next unless interaction.response.headers["Content-Type"] == ["application/json"] + + interaction.response.body.scan(/"(issued_at|expires_at)": "(.*?)"/m).each do |match| + time_to = + case match[0] + when 'issued_at' then Time.now + when 'expires_at' then Time.now + 86400 + end + + interaction.response.body.gsub!("\"#{match[0]}\": \"#{match[1]}\"", "\"#{match[0]}\": \"#{time_to}\"") + end + end end # allow us to ignore dev certificates on servers From ca7549fc3f228fbd588e961a29b1b5dfec8b6d31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 14:23:01 +0100 Subject: [PATCH 114/129] fix missed new openstack_auth_url usage --- spec/identity_v3_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index 9862a9313..ce31aef34 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -18,7 +18,7 @@ openstack_api_key: @openstack_vcr.password, openstack_userid: @openstack_vcr.user_id, openstack_region: @openstack_vcr.region, - openstack_auth_url: "#{@os_auth_url}/auth/tokens" + openstack_auth_url: @os_auth_url ) end end From caac49de269ea3d69096e18a068dbfe41b8b8f35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 14:27:15 +0100 Subject: [PATCH 115/129] Fix bad unless block removing (trailing `end` keywords) --- test/requests/storage/large_object_tests.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/test/requests/storage/large_object_tests.rb b/test/requests/storage/large_object_tests.rb index 7623af6cf..29a8b73f0 100644 --- a/test/requests/storage/large_object_tests.rb +++ b/test/requests/storage/large_object_tests.rb @@ -318,7 +318,7 @@ end it "#put_static_obj_manifest with invalid etag" do - unless Fog.mocking? + skip if Fog.mocking? segments = [{ path: "#{@segments[:a][:container]}/#{@segments[:a][:name]}", @@ -327,16 +327,16 @@ }] expected = { 'Errors' => [[segments[0][:path], 'Etag Mismatch']] } - err = proc do - @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) - end.must_raise Excon::Errors::BadRequest + err = proc do + @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) + end.must_raise Excon::Errors::BadRequest - Fog::JSON.decode(err.response.body).must_equal expected - end + Fog::JSON.decode(err.response.body).must_equal expected end it "#put_static_obj_manifest with invalid byte_size" do skip if Fog.mocking? + segments = [{ path: "#{@segments[:a][:container]}/#{@segments[:a][:name]}", etag: @segments[:a][:etag], @@ -348,8 +348,7 @@ @storage.put_static_obj_manifest(@directory.identity, 'fog_large_object', segments) end.must_raise Excon::Errors::BadRequest - Fog::JSON.decode(err.response.body).must_equal expected - end + Fog::JSON.decode(err.response.body).must_equal expected end describe "#delete_static_large_object with missing segment" do From cd8664b6dd6aa7696783cdfb0941ca7b516b72c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 14:30:40 +0100 Subject: [PATCH 116/129] Fix minitests complaning about must_equal nil tests. --- spec/volume_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index d26a777e0..1ca0f7ca0 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -288,7 +288,7 @@ def cleanup_test_object(collection, id) ) # check that recipient cannot see the transfer object - other_service.transfers.get(transfer.id).must_equal nil + other_service.transfers.get(transfer.id).must_be_nil other_service.transfers.all(name: transfer_name).length.must_equal 0 # # check that recipient cannot see the volume before transfer @@ -328,7 +328,7 @@ def cleanup_test_object(collection, id) # check that the transfer object is gone on both sides [@service, other_service].each do |service| - service.transfers.get(transfer.id).must_equal nil + service.transfers.get(transfer.id).must_be_nil service.transfers.all(name: transfer_name).length.must_equal 0 end ensure From df564ba0daea2f6e5f30401b0adea065d0f054e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 14:37:31 +0100 Subject: [PATCH 117/129] rubocop:auto_correct run. --- Rakefile | 14 +- examples/container_infra/basics.rb | 30 +- examples/image/upload-test-image.rb | 2 +- examples/introspection/basics.rb | 11 +- examples/workflow/workflow-examples.rb | 4 +- lib/fog/openstack.rb | 4 +- lib/fog/openstack/auth/catalog.rb | 4 + lib/fog/openstack/auth/name.rb | 10 +- lib/fog/openstack/auth/token.rb | 16 +- lib/fog/openstack/auth/token/v2.rb | 9 +- lib/fog/openstack/auth/token/v3.rb | 10 +- lib/fog/openstack/baremetal.rb | 120 +++--- .../baremetal/models/chassis_collection.rb | 2 +- lib/fog/openstack/baremetal/models/node.rb | 2 +- lib/fog/openstack/baremetal/models/nodes.rb | 2 +- lib/fog/openstack/baremetal/models/ports.rb | 2 +- .../baremetal/requests/create_chassis.rb | 14 +- .../baremetal/requests/create_node.rb | 14 +- .../baremetal/requests/create_port.rb | 14 +- .../baremetal/requests/delete_chassis.rb | 10 +- .../baremetal/requests/delete_node.rb | 10 +- .../baremetal/requests/delete_port.rb | 10 +- .../baremetal/requests/get_chassis.rb | 6 +- .../baremetal/requests/get_driver.rb | 6 +- .../requests/get_driver_properties.rb | 32 +- .../openstack/baremetal/requests/get_node.rb | 6 +- .../openstack/baremetal/requests/get_port.rb | 6 +- .../baremetal/requests/list_chassis.rb | 16 +- .../requests/list_chassis_detailed.rb | 10 +- .../baremetal/requests/list_drivers.rb | 10 +- .../baremetal/requests/list_nodes.rb | 18 +- .../baremetal/requests/list_nodes_detailed.rb | 10 +- .../baremetal/requests/list_ports.rb | 16 +- .../baremetal/requests/list_ports_detailed.rb | 10 +- .../baremetal/requests/patch_chassis.rb | 14 +- .../baremetal/requests/patch_node.rb | 14 +- .../baremetal/requests/patch_port.rb | 14 +- .../requests/set_node_maintenance.rb | 14 +- .../requests/set_node_power_state.rb | 14 +- .../requests/set_node_provision_state.rb | 18 +- .../requests/unset_node_maintenance.rb | 14 +- lib/fog/openstack/compute.rb | 116 ++--- lib/fog/openstack/compute/models/address.rb | 3 +- lib/fog/openstack/compute/models/flavor.rb | 6 +- lib/fog/openstack/compute/models/hosts.rb | 2 +- lib/fog/openstack/compute/models/image.rb | 14 +- lib/fog/openstack/compute/models/key_pair.rb | 4 +- lib/fog/openstack/compute/models/metadata.rb | 6 +- lib/fog/openstack/compute/models/networks.rb | 6 +- .../openstack/compute/models/os_interface.rb | 2 +- .../openstack/compute/models/os_interfaces.rb | 2 +- .../compute/models/security_group.rb | 4 +- lib/fog/openstack/compute/models/server.rb | 72 ++-- .../openstack/compute/models/server_group.rb | 3 +- lib/fog/openstack/compute/models/servers.rb | 2 +- lib/fog/openstack/compute/models/snapshot.rb | 8 +- lib/fog/openstack/compute/models/volume.rb | 14 +- .../compute/requests/add_aggregate_host.rb | 14 +- .../compute/requests/add_flavor_access.rb | 14 +- .../compute/requests/add_security_group.rb | 2 +- .../compute/requests/allocate_address.rb | 22 +- .../compute/requests/associate_address.rb | 8 +- .../compute/requests/attach_volume.rb | 16 +- .../compute/requests/boot_from_snapshot.rb | 14 +- .../requests/change_server_password.rb | 2 +- .../compute/requests/confirm_resize_server.rb | 2 +- .../compute/requests/create_aggregate.rb | 14 +- .../compute/requests/create_flavor.rb | 54 +-- .../requests/create_flavor_metadata.rb | 18 +- .../compute/requests/create_image.rb | 26 +- .../compute/requests/create_key_pair.rb | 20 +- .../compute/requests/create_os_interface.rb | 18 +- .../compute/requests/create_security_group.rb | 26 +- .../requests/create_security_group_rule.rb | 36 +- .../compute/requests/create_server.rb | 64 +-- .../compute/requests/create_server_group.rb | 16 +- .../compute/requests/create_snapshot.rb | 28 +- .../compute/requests/create_volume.rb | 37 +- .../compute/requests/delete_aggregate.rb | 10 +- .../compute/requests/delete_flavor.rb | 10 +- .../requests/delete_flavor_metadata.rb | 12 +- .../compute/requests/delete_image.rb | 10 +- .../compute/requests/delete_key_pair.rb | 10 +- .../openstack/compute/requests/delete_meta.rb | 6 +- .../compute/requests/delete_metadata.rb | 6 +- .../compute/requests/delete_os_interface.rb | 8 +- .../compute/requests/delete_security_group.rb | 10 +- .../requests/delete_security_group_rule.rb | 10 +- .../compute/requests/delete_server.rb | 8 +- .../compute/requests/delete_server_group.rb | 10 +- .../compute/requests/delete_service.rb | 12 +- .../compute/requests/delete_snapshot.rb | 6 +- .../compute/requests/delete_volume.rb | 6 +- .../compute/requests/detach_volume.rb | 6 +- .../compute/requests/disable_service.rb | 14 +- .../requests/disable_service_log_reason.rb | 18 +- .../compute/requests/disassociate_address.rb | 6 +- .../compute/requests/enable_service.rb | 14 +- .../openstack/compute/requests/get_address.rb | 20 +- .../compute/requests/get_aggregate.rb | 8 +- .../compute/requests/get_flavor_details.rb | 20 +- .../compute/requests/get_flavor_metadata.rb | 10 +- .../compute/requests/get_host_details.rb | 70 +-- .../compute/requests/get_hypervisor.rb | 56 +-- .../requests/get_hypervisor_statistics.rb | 28 +- .../compute/requests/get_image_details.rb | 8 +- .../compute/requests/get_key_pair.rb | 18 +- .../openstack/compute/requests/get_limits.rb | 118 ++--- .../compute/requests/get_metadata.rb | 8 +- .../compute/requests/get_os_interface.rb | 14 +- .../openstack/compute/requests/get_quota.rb | 6 +- .../compute/requests/get_quota_defaults.rb | 6 +- .../compute/requests/get_security_group.rb | 12 +- .../requests/get_security_group_rule.rb | 12 +- .../compute/requests/get_server_details.rb | 8 +- .../compute/requests/get_server_group.rb | 26 +- .../compute/requests/get_server_password.rb | 8 +- .../compute/requests/get_server_volumes.rb | 8 +- .../compute/requests/get_snapshot_details.rb | 8 +- .../openstack/compute/requests/get_usage.rb | 50 +-- .../compute/requests/get_vnc_console.rb | 2 +- .../compute/requests/get_volume_details.rb | 8 +- .../compute/requests/list_address_pools.rb | 8 +- .../compute/requests/list_addresses.rb | 8 +- .../compute/requests/list_aggregates.rb | 26 +- .../compute/requests/list_all_addresses.rb | 46 +- .../requests/list_availability_zones.rb | 11 +- .../compute/requests/list_flavors.rb | 22 +- .../compute/requests/list_flavors_detail.rb | 22 +- .../openstack/compute/requests/list_hosts.rb | 14 +- .../requests/list_hypervisor_servers.rb | 20 +- .../compute/requests/list_hypervisors.rb | 14 +- .../requests/list_hypervisors_detail.rb | 62 +-- .../openstack/compute/requests/list_images.rb | 10 +- .../compute/requests/list_images_detail.rb | 10 +- .../compute/requests/list_key_pairs.rb | 18 +- .../compute/requests/list_metadata.rb | 6 +- .../compute/requests/list_os_interfaces.rb | 12 +- .../requests/list_private_addresses.rb | 8 +- .../compute/requests/list_public_addresses.rb | 8 +- .../compute/requests/list_security_groups.rb | 18 +- .../compute/requests/list_server_groups.rb | 12 +- .../compute/requests/list_servers.rb | 12 +- .../compute/requests/list_servers_detail.rb | 10 +- .../compute/requests/list_services.rb | 64 +-- .../compute/requests/list_snapshots.rb | 10 +- .../compute/requests/list_snapshots_detail.rb | 10 +- .../list_tenants_with_flavor_access.rb | 8 +- .../openstack/compute/requests/list_usages.rb | 24 +- .../requests/list_volume_attachments.rb | 20 +- .../compute/requests/list_volumes.rb | 12 +- .../compute/requests/list_volumes_detail.rb | 12 +- .../openstack/compute/requests/list_zones.rb | 18 +- .../compute/requests/list_zones_detailed.rb | 40 +- .../compute/requests/live_migrate_server.rb | 6 +- .../compute/requests/migrate_server.rb | 2 +- .../compute/requests/pause_server.rb | 2 +- .../compute/requests/reboot_server.rb | 2 +- .../compute/requests/rebuild_server.rb | 8 +- .../compute/requests/release_address.rb | 10 +- .../compute/requests/remote_consoles.rb | 12 +- .../compute/requests/remove_aggregate_host.rb | 14 +- .../compute/requests/remove_flavor_access.rb | 12 +- .../compute/requests/remove_security_group.rb | 2 +- .../compute/requests/rescue_server.rb | 2 +- .../compute/requests/reset_server_state.rb | 2 +- .../compute/requests/resize_server.rb | 2 +- .../compute/requests/resume_server.rb | 2 +- .../compute/requests/revert_resize_server.rb | 2 +- .../compute/requests/server_action.rb | 8 +- .../compute/requests/server_actions.rb | 18 +- .../compute/requests/server_diagnostics.rb | 7 +- .../compute/requests/set_metadata.rb | 10 +- .../compute/requests/shelve_offload_server.rb | 2 +- .../compute/requests/shelve_server.rb | 2 +- .../compute/requests/start_server.rb | 2 +- .../openstack/compute/requests/stop_server.rb | 2 +- .../compute/requests/suspend_server.rb | 2 +- .../compute/requests/unpause_server.rb | 2 +- .../compute/requests/unshelve_server.rb | 2 +- .../compute/requests/update_aggregate.rb | 16 +- .../requests/update_aggregate_metadata.rb | 14 +- .../requests/update_flavor_metadata.rb | 18 +- .../openstack/compute/requests/update_meta.rb | 10 +- .../compute/requests/update_metadata.rb | 10 +- .../compute/requests/update_quota.rb | 10 +- .../compute/requests/update_server.rb | 8 +- lib/fog/openstack/container_infra.rb | 30 +- .../openstack/container_infra/models/base.rb | 12 +- .../openstack/container_infra/models/bay.rb | 5 +- .../container_infra/models/bay_model.rb | 6 +- .../container_infra/models/bay_models.rb | 2 +- .../openstack/container_infra/models/bays.rb | 2 +- .../container_infra/models/certificate.rb | 2 +- .../container_infra/models/certificates.rb | 3 +- .../container_infra/models/cluster.rb | 5 +- .../models/cluster_template.rb | 6 +- .../models/cluster_templates.rb | 3 +- .../container_infra/models/clusters.rb | 3 +- .../container_infra/requests/create_bay.rb | 10 +- .../requests/create_bay_model.rb | 68 +-- .../requests/create_certificate.rb | 16 +- .../requests/create_cluster.rb | 10 +- .../requests/create_cluster_template.rb | 68 +-- .../container_infra/requests/delete_bay.rb | 8 +- .../requests/delete_bay_model.rb | 8 +- .../requests/delete_cluster.rb | 8 +- .../requests/delete_cluster_template.rb | 8 +- .../container_infra/requests/get_bay.rb | 48 +-- .../container_infra/requests/get_bay_model.rb | 66 +-- .../requests/get_certificate.rb | 18 +- .../container_infra/requests/get_cluster.rb | 38 +- .../requests/get_cluster_template.rb | 66 +-- .../requests/list_bay_models.rb | 74 ++-- .../container_infra/requests/list_bays.rb | 48 +-- .../requests/list_cluster_templates.rb | 66 +-- .../container_infra/requests/list_clusters.rb | 22 +- .../container_infra/requests/update_bay.rb | 10 +- .../requests/update_bay_model.rb | 68 +-- .../requests/update_cluster.rb | 10 +- .../requests/update_cluster_template.rb | 68 +-- lib/fog/openstack/core.rb | 3 +- lib/fog/openstack/dns/v1.rb | 44 +- .../openstack/dns/v1/requests/get_quota.rb | 6 +- .../openstack/dns/v1/requests/list_domains.rb | 10 +- .../openstack/dns/v1/requests/update_quota.rb | 8 +- lib/fog/openstack/dns/v2.rb | 217 +++++----- lib/fog/openstack/dns/v2/models/pools.rb | 2 +- lib/fog/openstack/dns/v2/models/recordset.rb | 1 + lib/fog/openstack/dns/v2/models/recordsets.rb | 2 +- lib/fog/openstack/dns/v2/models/zone.rb | 1 + .../dns/v2/models/zone_transfer_accepts.rb | 2 +- .../dns/v2/models/zone_transfer_request.rb | 16 +- .../dns/v2/models/zone_transfer_requests.rb | 2 +- lib/fog/openstack/dns/v2/models/zones.rb | 2 +- .../dns/v2/requests/create_recordset.rb | 12 +- .../openstack/dns/v2/requests/create_zone.rb | 10 +- .../requests/create_zone_transfer_accept.rb | 16 +- .../requests/create_zone_transfer_request.rb | 14 +- .../dns/v2/requests/delete_recordset.rb | 8 +- .../openstack/dns/v2/requests/delete_zone.rb | 8 +- .../requests/delete_zone_transfer_request.rb | 9 +- lib/fog/openstack/dns/v2/requests/get_pool.rb | 8 +- .../openstack/dns/v2/requests/get_quota.rb | 10 +- .../dns/v2/requests/get_recordset.rb | 8 +- lib/fog/openstack/dns/v2/requests/get_zone.rb | 8 +- .../v2/requests/get_zone_transfer_accept.rb | 6 +- .../v2/requests/get_zone_transfer_request.rb | 7 +- .../openstack/dns/v2/requests/list_pools.rb | 10 +- .../dns/v2/requests/list_recordsets.rb | 10 +- .../v2/requests/list_zone_transfer_accepts.rb | 12 +- .../requests/list_zone_transfer_requests.rb | 12 +- .../openstack/dns/v2/requests/list_zones.rb | 12 +- .../openstack/dns/v2/requests/update_quota.rb | 10 +- .../dns/v2/requests/update_recordset.rb | 10 +- .../openstack/dns/v2/requests/update_zone.rb | 10 +- .../requests/update_zone_transfer_request.rb | 17 +- lib/fog/openstack/event.rb | 24 +- lib/fog/openstack/event/requests/get_event.rb | 8 +- .../openstack/event/requests/list_events.rb | 10 +- lib/fog/openstack/identity/v2.rb | 36 +- .../identity/v2/models/ec2_credential.rb | 4 +- .../openstack/identity/v2/models/tenant.rb | 6 +- .../openstack/identity/v2/models/tenants.rb | 3 +- lib/fog/openstack/identity/v2/models/user.rb | 5 +- .../v2/requests/add_user_to_tenant.rb | 8 +- .../identity/v2/requests/check_token.rb | 9 +- .../v2/requests/create_ec2_credential.rb | 18 +- .../identity/v2/requests/create_role.rb | 14 +- .../identity/v2/requests/create_tenant.rb | 14 +- .../identity/v2/requests/create_user.rb | 24 +- .../identity/v2/requests/create_user_role.rb | 10 +- .../v2/requests/delete_ec2_credential.rb | 8 +- .../identity/v2/requests/delete_role.rb | 6 +- .../identity/v2/requests/delete_tenant.rb | 12 +- .../identity/v2/requests/delete_user.rb | 8 +- .../identity/v2/requests/delete_user_role.rb | 6 +- .../v2/requests/get_ec2_credential.rb | 8 +- .../identity/v2/requests/get_role.rb | 8 +- .../identity/v2/requests/get_tenant.rb | 12 +- .../identity/v2/requests/get_tenants_by_id.rb | 6 +- .../v2/requests/get_tenants_by_name.rb | 6 +- .../identity/v2/requests/get_user_by_id.rb | 6 +- .../identity/v2/requests/get_user_by_name.rb | 6 +- .../v2/requests/list_ec2_credentials.rb | 10 +- .../v2/requests/list_endpoints_for_token.rb | 6 +- .../identity/v2/requests/list_roles.rb | 14 +- .../requests/list_roles_for_user_on_tenant.rb | 10 +- .../identity/v2/requests/list_tenants.rb | 38 +- .../v2/requests/list_user_global_roles.rb | 6 +- .../identity/v2/requests/list_users.rb | 12 +- .../v2/requests/remove_user_from_tenant.rb | 9 +- .../identity/v2/requests/update_tenant.rb | 10 +- .../identity/v2/requests/update_user.rb | 8 +- .../identity/v2/requests/validate_token.rb | 9 +- lib/fog/openstack/identity/v3.rb | 13 +- .../openstack/identity/v3/models/domains.rb | 16 +- .../openstack/identity/v3/models/endpoints.rb | 3 +- .../openstack/identity/v3/models/groups.rb | 3 +- .../identity/v3/models/os_credential.rb | 2 +- .../identity/v3/models/os_credentials.rb | 3 +- .../openstack/identity/v3/models/policies.rb | 3 +- .../openstack/identity/v3/models/projects.rb | 20 +- lib/fog/openstack/identity/v3/models/roles.rb | 3 +- .../openstack/identity/v3/models/services.rb | 3 +- .../openstack/identity/v3/models/tokens.rb | 4 +- lib/fog/openstack/identity/v3/models/users.rb | 5 +- .../identity/v3/requests/add_user_to_group.rb | 6 +- .../identity/v3/requests/auth_domains.rb | 11 +- .../identity/v3/requests/auth_projects.rb | 11 +- .../v3/requests/check_domain_group_role.rb | 6 +- .../v3/requests/check_domain_user_role.rb | 6 +- .../v3/requests/check_project_group_role.rb | 6 +- .../v3/requests/check_project_user_role.rb | 6 +- .../identity/v3/requests/create_domain.rb | 8 +- .../identity/v3/requests/create_endpoint.rb | 8 +- .../identity/v3/requests/create_group.rb | 8 +- .../v3/requests/create_os_credential.rb | 8 +- .../identity/v3/requests/create_policy.rb | 8 +- .../identity/v3/requests/create_project.rb | 8 +- .../identity/v3/requests/create_role.rb | 8 +- .../identity/v3/requests/create_service.rb | 8 +- .../identity/v3/requests/create_user.rb | 8 +- .../identity/v3/requests/delete_domain.rb | 6 +- .../identity/v3/requests/delete_endpoint.rb | 6 +- .../identity/v3/requests/delete_group.rb | 6 +- .../v3/requests/delete_os_credential.rb | 6 +- .../identity/v3/requests/delete_policy.rb | 6 +- .../identity/v3/requests/delete_project.rb | 6 +- .../identity/v3/requests/delete_role.rb | 6 +- .../identity/v3/requests/delete_service.rb | 6 +- .../identity/v3/requests/delete_user.rb | 6 +- .../identity/v3/requests/get_domain.rb | 9 +- .../identity/v3/requests/get_endpoint.rb | 9 +- .../identity/v3/requests/get_group.rb | 9 +- .../identity/v3/requests/get_os_credential.rb | 9 +- .../identity/v3/requests/get_policy.rb | 9 +- .../identity/v3/requests/get_project.rb | 11 +- .../identity/v3/requests/get_role.rb | 9 +- .../identity/v3/requests/get_service.rb | 9 +- .../identity/v3/requests/get_user.rb | 9 +- .../v3/requests/grant_domain_group_role.rb | 6 +- .../v3/requests/grant_domain_user_role.rb | 6 +- .../v3/requests/grant_project_group_role.rb | 6 +- .../v3/requests/grant_project_user_role.rb | 6 +- .../identity/v3/requests/group_user_check.rb | 6 +- .../v3/requests/list_domain_group_roles.rb | 9 +- .../v3/requests/list_domain_user_roles.rb | 9 +- .../identity/v3/requests/list_domains.rb | 11 +- .../identity/v3/requests/list_endpoints.rb | 11 +- .../identity/v3/requests/list_group_users.rb | 11 +- .../identity/v3/requests/list_groups.rb | 11 +- .../v3/requests/list_os_credentials.rb | 11 +- .../identity/v3/requests/list_policies.rb | 11 +- .../v3/requests/list_project_group_roles.rb | 9 +- .../v3/requests/list_project_user_roles.rb | 9 +- .../identity/v3/requests/list_projects.rb | 11 +- .../v3/requests/list_role_assignments.rb | 21 +- .../identity/v3/requests/list_roles.rb | 11 +- .../identity/v3/requests/list_services.rb | 11 +- .../identity/v3/requests/list_user_groups.rb | 9 +- .../v3/requests/list_user_projects.rb | 11 +- .../identity/v3/requests/list_users.rb | 11 +- .../v3/requests/remove_user_from_group.rb | 6 +- .../v3/requests/revoke_domain_group_role.rb | 6 +- .../v3/requests/revoke_domain_user_role.rb | 6 +- .../v3/requests/revoke_project_group_role.rb | 6 +- .../v3/requests/revoke_project_user_role.rb | 6 +- .../v3/requests/token_authenticate.rb | 8 +- .../identity/v3/requests/token_check.rb | 8 +- .../identity/v3/requests/token_revoke.rb | 8 +- .../identity/v3/requests/token_validate.rb | 8 +- .../identity/v3/requests/update_domain.rb | 8 +- .../identity/v3/requests/update_endpoint.rb | 8 +- .../identity/v3/requests/update_group.rb | 8 +- .../v3/requests/update_os_credential.rb | 8 +- .../identity/v3/requests/update_policy.rb | 8 +- .../identity/v3/requests/update_project.rb | 8 +- .../identity/v3/requests/update_role.rb | 8 +- .../identity/v3/requests/update_service.rb | 8 +- .../identity/v3/requests/update_user.rb | 8 +- lib/fog/openstack/image.rb | 2 - lib/fog/openstack/image/v1.rb | 24 +- lib/fog/openstack/image/v1/models/images.rb | 2 +- .../image/v1/requests/add_member_to_image.rb | 6 +- .../image/v1/requests/create_image.rb | 64 +-- .../image/v1/requests/delete_image.rb | 6 +- .../openstack/image/v1/requests/get_image.rb | 48 +-- .../image/v1/requests/get_image_by_id.rb | 36 +- .../image/v1/requests/get_image_members.rb | 10 +- .../image/v1/requests/get_shared_images.rb | 10 +- .../image/v1/requests/list_public_images.rb | 18 +- .../requests/list_public_images_detailed.rb | 12 +- .../v1/requests/remove_member_from_image.rb | 6 +- .../image/v1/requests/update_image.rb | 56 +-- .../image/v1/requests/update_image_members.rb | 14 +- lib/fog/openstack/image/v2.rb | 24 +- lib/fog/openstack/image/v2/models/image.rb | 4 +- lib/fog/openstack/image/v2/models/images.rb | 2 +- .../image/v2/requests/add_member_to_image.rb | 8 +- .../image/v2/requests/add_tag_to_image.rb | 6 +- .../image/v2/requests/create_image.rb | 38 +- .../image/v2/requests/deactivate_image.rb | 6 +- .../image/v2/requests/delete_image.rb | 6 +- .../image/v2/requests/download_image.rb | 8 +- .../openstack/image/v2/requests/get_image.rb | 48 +-- .../image/v2/requests/get_image_by_id.rb | 16 +- .../image/v2/requests/get_image_members.rb | 10 +- .../image/v2/requests/get_member_details.rb | 18 +- .../image/v2/requests/get_shared_images.rb | 10 +- .../image/v2/requests/list_images.rb | 18 +- .../image/v2/requests/reactivate_image.rb | 6 +- .../v2/requests/remove_member_from_image.rb | 6 +- .../v2/requests/remove_tag_from_image.rb | 6 +- .../image/v2/requests/update_image.rb | 42 +- .../image/v2/requests/update_image_member.rb | 20 +- .../image/v2/requests/upload_image.rb | 8 +- lib/fog/openstack/introspection.rb | 6 +- .../requests/abort_introspection.rb | 8 +- .../requests/create_introspection.rb | 8 +- .../introspection/requests/create_rules.rb | 10 +- .../introspection/requests/delete_rules.rb | 6 +- .../requests/delete_rules_all.rb | 6 +- .../requests/get_introspection.rb | 8 +- .../requests/get_introspection_details.rb | 8 +- .../introspection/requests/get_rules.rb | 8 +- .../introspection/requests/list_rules.rb | 8 +- lib/fog/openstack/key_manager.rb | 25 +- lib/fog/openstack/key_manager/models/acl.rb | 3 - .../openstack/key_manager/models/container.rb | 7 +- .../key_manager/models/containers.rb | 1 - .../openstack/key_manager/models/secret.rb | 7 +- .../openstack/key_manager/models/secrets.rb | 1 - .../key_manager/requests/create_container.rb | 8 +- .../key_manager/requests/create_secret.rb | 8 +- .../key_manager/requests/delete_container.rb | 6 +- .../requests/delete_container_acl.rb | 6 +- .../key_manager/requests/delete_secret.rb | 6 +- .../key_manager/requests/delete_secret_acl.rb | 6 +- .../key_manager/requests/get_container.rb | 6 +- .../key_manager/requests/get_container_acl.rb | 12 +- .../key_manager/requests/get_secret.rb | 6 +- .../key_manager/requests/get_secret_acl.rb | 12 +- .../requests/get_secret_metadata.rb | 6 +- .../requests/get_secret_payload.rb | 8 +- .../key_manager/requests/list_containers.rb | 8 +- .../key_manager/requests/list_secrets.rb | 8 +- .../requests/replace_container_acl.rb | 8 +- .../requests/replace_secret_acl.rb | 8 +- .../requests/update_container_acl.rb | 8 +- .../key_manager/requests/update_secret_acl.rb | 8 +- lib/fog/openstack/metering.rb | 26 +- .../openstack/metering/requests/get_event.rb | 8 +- .../metering/requests/get_resource.rb | 12 +- .../metering/requests/get_samples.rb | 28 +- .../metering/requests/get_statistics.rb | 46 +- .../metering/requests/list_events.rb | 10 +- .../metering/requests/list_meters.rb | 18 +- .../metering/requests/list_resources.rb | 12 +- lib/fog/openstack/metric.rb | 24 +- lib/fog/openstack/metric/models/metrics.rb | 1 - lib/fog/openstack/metric/models/resources.rb | 1 - .../openstack/metric/requests/get_metric.rb | 80 ++-- .../metric/requests/get_metric_measures.rb | 32 +- .../openstack/metric/requests/get_resource.rb | 30 +- .../requests/get_resource_metric_measures.rb | 48 +-- .../openstack/metric/requests/list_metrics.rb | 158 +++---- .../metric/requests/list_resources.rb | 94 ++-- lib/fog/openstack/monitoring.rb | 1 - .../monitoring/models/alarm_definitions.rb | 3 +- lib/fog/openstack/monitoring/models/alarms.rb | 3 +- .../monitoring/models/notification_methods.rb | 3 +- .../requests/create_alarm_definition.rb | 8 +- .../monitoring/requests/create_metric.rb | 8 +- .../requests/create_metric_array.rb | 8 +- .../requests/create_notification_method.rb | 8 +- .../monitoring/requests/delete_alarm.rb | 6 +- .../requests/delete_alarm_definition.rb | 6 +- .../requests/delete_notification_method.rb | 6 +- .../monitoring/requests/find_measurements.rb | 8 +- .../monitoring/requests/get_alarm.rb | 6 +- .../monitoring/requests/get_alarm_counts.rb | 8 +- .../requests/get_alarm_definition.rb | 6 +- .../requests/get_notification_method.rb | 6 +- .../requests/list_alarm_definitions.rb | 8 +- ...list_alarm_state_history_for_all_alarms.rb | 8 +- ..._alarm_state_history_for_specific_alarm.rb | 8 +- .../monitoring/requests/list_alarms.rb | 8 +- .../requests/list_dimension_values.rb | 8 +- .../monitoring/requests/list_metric_names.rb | 8 +- .../monitoring/requests/list_metrics.rb | 8 +- .../list_notification_method_types.rb | 6 +- .../requests/list_notification_methods.rb | 8 +- .../monitoring/requests/list_statistics.rb | 8 +- .../monitoring/requests/patch_alarm.rb | 8 +- .../requests/patch_alarm_definition.rb | 8 +- .../requests/patch_notification_method.rb | 8 +- .../requests/put_notification_method.rb | 8 +- .../monitoring/requests/update_alarm.rb | 8 +- .../requests/update_alarm_definition.rb | 8 +- lib/fog/openstack/network.rb | 216 +++++----- .../openstack/network/models/floating_ip.rb | 3 +- lib/fog/openstack/network/models/network.rb | 8 +- lib/fog/openstack/network/models/router.rb | 10 +- .../network/models/security_group.rb | 2 +- .../network/models/security_group_rule.rb | 1 + .../network/requests/add_router_interface.rb | 32 +- .../network/requests/associate_floating_ip.rb | 22 +- .../requests/associate_lb_health_monitor.rb | 12 +- .../network/requests/create_floating_ip.rb | 20 +- .../network/requests/create_ike_policy.rb | 28 +- .../network/requests/create_ipsec_policy.rb | 28 +- .../requests/create_ipsec_site_connection.rb | 52 +-- .../requests/create_lb_health_monitor.rb | 34 +- .../network/requests/create_lb_member.rb | 30 +- .../network/requests/create_lb_pool.rb | 42 +- .../network/requests/create_lb_vip.rb | 44 +- .../requests/create_lbaas_healthmonitor.rb | 40 +- .../network/requests/create_lbaas_l7policy.rb | 32 +- .../network/requests/create_lbaas_l7rule.rb | 32 +- .../network/requests/create_lbaas_listener.rb | 36 +- .../requests/create_lbaas_loadbalancer.rb | 44 +- .../network/requests/create_lbaas_pool.rb | 34 +- .../requests/create_lbaas_pool_member.rb | 36 +- .../network/requests/create_network.rb | 38 +- .../openstack/network/requests/create_port.rb | 36 +- .../network/requests/create_rbac_policy.rb | 22 +- .../network/requests/create_router.rb | 26 +- .../network/requests/create_security_group.rb | 60 +-- .../requests/create_security_group_rule.rb | 30 +- .../network/requests/create_subnet.rb | 32 +- .../network/requests/create_subnet_pool.rb | 40 +- .../network/requests/create_vpn_service.rb | 24 +- .../network/requests/delete_floating_ip.rb | 6 +- .../network/requests/delete_ike_policy.rb | 6 +- .../network/requests/delete_ipsec_policy.rb | 6 +- .../requests/delete_ipsec_site_connection.rb | 6 +- .../requests/delete_lb_health_monitor.rb | 6 +- .../network/requests/delete_lb_member.rb | 6 +- .../network/requests/delete_lb_pool.rb | 6 +- .../network/requests/delete_lb_vip.rb | 6 +- .../requests/delete_lbaas_healthmonitor.rb | 6 +- .../network/requests/delete_lbaas_l7policy.rb | 6 +- .../network/requests/delete_lbaas_l7rule.rb | 8 +- .../network/requests/delete_lbaas_listener.rb | 6 +- .../requests/delete_lbaas_loadbalancer.rb | 6 +- .../network/requests/delete_lbaas_pool.rb | 6 +- .../requests/delete_lbaas_pool_member.rb | 6 +- .../network/requests/delete_network.rb | 6 +- .../openstack/network/requests/delete_port.rb | 6 +- .../network/requests/delete_quota.rb | 6 +- .../network/requests/delete_rbac_policy.rb | 6 +- .../network/requests/delete_router.rb | 6 +- .../network/requests/delete_security_group.rb | 6 +- .../requests/delete_security_group_rule.rb | 6 +- .../network/requests/delete_subnet.rb | 6 +- .../network/requests/delete_subnet_pool.rb | 6 +- .../network/requests/delete_vpn_service.rb | 6 +- .../requests/disassociate_floating_ip.rb | 22 +- .../disassociate_lb_health_monitor.rb | 6 +- .../network/requests/get_extension.rb | 8 +- .../network/requests/get_floating_ip.rb | 18 +- .../network/requests/get_ike_policy.rb | 8 +- .../network/requests/get_ipsec_policy.rb | 8 +- .../requests/get_ipsec_site_connection.rb | 8 +- .../network/requests/get_lb_health_monitor.rb | 8 +- .../network/requests/get_lb_member.rb | 8 +- .../openstack/network/requests/get_lb_pool.rb | 8 +- .../network/requests/get_lb_pool_stats.rb | 8 +- .../openstack/network/requests/get_lb_vip.rb | 8 +- .../requests/get_lbaas_healthmonitor.rb | 8 +- .../network/requests/get_lbaas_l7policy.rb | 8 +- .../network/requests/get_lbaas_l7rule.rb | 10 +- .../network/requests/get_lbaas_listener.rb | 8 +- .../requests/get_lbaas_loadbalancer.rb | 8 +- .../network/requests/get_lbaas_pool.rb | 8 +- .../network/requests/get_lbaas_pool_member.rb | 10 +- .../openstack/network/requests/get_network.rb | 8 +- .../requests/get_network_ip_availability.rb | 10 +- .../openstack/network/requests/get_port.rb | 32 +- .../openstack/network/requests/get_quota.rb | 6 +- .../openstack/network/requests/get_quotas.rb | 6 +- .../network/requests/get_rbac_policy.rb | 8 +- .../openstack/network/requests/get_router.rb | 8 +- .../network/requests/get_security_group.rb | 8 +- .../requests/get_security_group_rule.rb | 8 +- .../openstack/network/requests/get_subnet.rb | 28 +- .../network/requests/get_subnet_pool.rb | 8 +- .../network/requests/get_vpn_service.rb | 8 +- .../network/requests/list_extensions.rb | 12 +- .../network/requests/list_floating_ips.rb | 12 +- .../network/requests/list_ike_policies.rb | 12 +- .../network/requests/list_ipsec_policies.rb | 12 +- .../requests/list_ipsec_site_connections.rb | 12 +- .../requests/list_lb_health_monitors.rb | 12 +- .../network/requests/list_lb_members.rb | 12 +- .../network/requests/list_lb_pools.rb | 12 +- .../network/requests/list_lb_vips.rb | 12 +- .../requests/list_lbaas_healthmonitors.rb | 12 +- .../network/requests/list_lbaas_l7policies.rb | 14 +- .../network/requests/list_lbaas_l7rules.rb | 14 +- .../network/requests/list_lbaas_listeners.rb | 12 +- .../requests/list_lbaas_loadbalancers.rb | 14 +- .../requests/list_lbaas_pool_members.rb | 16 +- .../network/requests/list_lbaas_pools.rb | 12 +- .../list_network_ip_availabilities.rb | 8 +- .../network/requests/list_networks.rb | 12 +- .../openstack/network/requests/list_ports.rb | 12 +- .../network/requests/list_rbac_policies.rb | 12 +- .../network/requests/list_routers.rb | 12 +- .../requests/list_security_group_rules.rb | 10 +- .../network/requests/list_security_groups.rb | 10 +- .../network/requests/list_subnet_pools.rb | 12 +- .../network/requests/list_subnets.rb | 12 +- .../network/requests/list_vpn_services.rb | 12 +- .../requests/remove_router_interface.rb | 12 +- .../network/requests/update_ike_policy.rb | 12 +- .../network/requests/update_ipsec_policy.rb | 12 +- .../requests/update_ipsec_site_connection.rb | 12 +- .../requests/update_lb_health_monitor.rb | 12 +- .../network/requests/update_lb_member.rb | 12 +- .../network/requests/update_lb_pool.rb | 12 +- .../network/requests/update_lb_vip.rb | 12 +- .../requests/update_lbaas_healthmonitor.rb | 12 +- .../network/requests/update_lbaas_l7policy.rb | 13 +- .../network/requests/update_lbaas_l7rule.rb | 13 +- .../network/requests/update_lbaas_listener.rb | 13 +- .../requests/update_lbaas_loadbalancer.rb | 12 +- .../network/requests/update_lbaas_pool.rb | 12 +- .../requests/update_lbaas_pool_member.rb | 14 +- .../network/requests/update_network.rb | 12 +- .../openstack/network/requests/update_port.rb | 12 +- .../network/requests/update_quota.rb | 10 +- .../network/requests/update_rbac_policy.rb | 12 +- .../network/requests/update_router.rb | 18 +- .../network/requests/update_security_group.rb | 12 +- .../network/requests/update_subnet.rb | 12 +- .../network/requests/update_subnet_pool.rb | 12 +- .../network/requests/update_vpn_service.rb | 12 +- lib/fog/openstack/nfv.rb | 36 +- lib/fog/openstack/nfv/models/vnf.rb | 4 +- lib/fog/openstack/nfv/models/vnfd.rb | 4 +- lib/fog/openstack/nfv/requests/create_vnf.rb | 12 +- lib/fog/openstack/nfv/requests/create_vnfd.rb | 12 +- lib/fog/openstack/nfv/requests/delete_vnf.rb | 6 +- lib/fog/openstack/nfv/requests/delete_vnfd.rb | 6 +- lib/fog/openstack/nfv/requests/get_vnf.rb | 8 +- lib/fog/openstack/nfv/requests/get_vnfd.rb | 8 +- lib/fog/openstack/nfv/requests/list_vnfds.rb | 10 +- lib/fog/openstack/nfv/requests/list_vnfs.rb | 10 +- lib/fog/openstack/nfv/requests/update_vnf.rb | 12 +- lib/fog/openstack/orchestration.rb | 12 +- .../openstack/orchestration/models/stack.rb | 10 +- .../orchestration/requests/abandon_stack.rb | 6 +- .../orchestration/requests/build_info.rb | 6 +- .../orchestration/requests/cancel_update.rb | 9 +- .../orchestration/requests/create_stack.rb | 32 +- .../orchestration/requests/delete_stack.rb | 6 +- .../requests/get_stack_template.rb | 9 +- .../orchestration/requests/list_events.rb | 12 +- .../requests/list_resource_events.rb | 6 +- .../requests/list_resource_types.rb | 12 +- .../orchestration/requests/list_resources.rb | 12 +- .../orchestration/requests/list_stack_data.rb | 12 +- .../requests/list_stack_data_detailed.rb | 56 +-- .../requests/list_stack_events.rb | 6 +- .../orchestration/requests/patch_stack.rb | 8 +- .../orchestration/requests/preview_stack.rb | 8 +- .../requests/show_event_details.rb | 10 +- .../requests/show_resource_data.rb | 10 +- .../requests/show_resource_metadata.rb | 10 +- .../requests/show_resource_schema.rb | 6 +- .../requests/show_resource_template.rb | 9 +- .../requests/show_stack_details.rb | 10 +- .../orchestration/requests/update_stack.rb | 14 +- .../requests/validate_template.rb | 8 +- .../util/recursive_hot_file_loader.rb | 1 + lib/fog/openstack/planning.rb | 25 +- lib/fog/openstack/planning/models/plan.rb | 4 +- lib/fog/openstack/planning/models/plans.rb | 2 +- .../planning/requests/add_role_to_plan.rb | 26 +- .../planning/requests/create_plan.rb | 20 +- .../planning/requests/delete_plan.rb | 6 +- .../openstack/planning/requests/get_plan.rb | 46 +- .../planning/requests/get_plan_templates.rb | 10 +- .../openstack/planning/requests/list_plans.rb | 48 +-- .../openstack/planning/requests/list_roles.rb | 14 +- .../openstack/planning/requests/patch_plan.rb | 36 +- .../requests/remove_role_from_plan.rb | 18 +- lib/fog/openstack/shared_file_system.rb | 260 +++++------ .../models/availability_zones.rb | 2 +- .../shared_file_system/models/network.rb | 1 + .../shared_file_system/models/networks.rb | 2 +- .../shared_file_system/models/share.rb | 5 +- .../models/share_access_rule.rb | 1 + .../models/share_access_rules.rb | 2 +- .../models/share_export_locations.rb | 6 +- .../shared_file_system/models/shares.rb | 2 +- .../shared_file_system/models/snapshot.rb | 1 + .../shared_file_system/models/snapshots.rb | 2 +- .../add_security_service_to_share_network.rb | 2 +- .../requests/create_security_service.rb | 10 +- .../requests/create_share.rb | 12 +- .../requests/create_share_network.rb | 10 +- .../requests/create_snapshot.rb | 10 +- .../requests/delete_security_service.rb | 6 +- .../requests/delete_share.rb | 8 +- .../requests/delete_share_network.rb | 8 +- .../requests/delete_snapshot.rb | 8 +- .../shared_file_system/requests/get_limits.rb | 30 +- .../shared_file_system/requests/get_quota.rb | 8 +- .../requests/get_security_service.rb | 8 +- .../shared_file_system/requests/get_share.rb | 6 +- .../requests/get_share_export_location.rb | 8 +- .../requests/get_share_network.rb | 8 +- .../requests/get_snapshot.rb | 6 +- .../requests/grant_share_access.rb | 6 +- .../requests/list_availability_zones.rb | 12 +- .../requests/list_security_services.rb | 10 +- .../requests/list_security_services_detail.rb | 10 +- .../requests/list_share_access_rules.rb | 2 +- .../requests/list_share_export_locations.rb | 10 +- .../requests/list_share_networks.rb | 10 +- .../requests/list_share_networks_detail.rb | 10 +- .../requests/list_shares.rb | 10 +- .../requests/list_shares_detail.rb | 10 +- .../requests/list_snapshots.rb | 10 +- .../requests/list_snapshots_detail.rb | 10 +- ...ove_security_service_from_share_network.rb | 2 +- .../requests/share_action.rb | 8 +- .../requests/share_network_action.rb | 8 +- .../requests/update_quota.rb | 10 +- .../requests/update_security_service.rb | 10 +- .../requests/update_share.rb | 10 +- .../requests/update_share_network.rb | 10 +- .../requests/update_snapshot.rb | 10 +- lib/fog/openstack/storage.rb | 16 +- .../openstack/storage/models/directories.rb | 4 +- lib/fog/openstack/storage/models/directory.rb | 16 +- lib/fog/openstack/storage/models/file.rb | 38 +- lib/fog/openstack/storage/models/files.rb | 14 +- .../openstack/storage/requests/copy_object.rb | 10 +- .../storage/requests/delete_container.rb | 6 +- .../requests/delete_multiple_objects.rb | 12 +- .../storage/requests/delete_object.rb | 6 +- .../requests/delete_static_large_object.rb | 12 +- .../storage/requests/get_container.rb | 8 +- .../storage/requests/get_containers.rb | 8 +- .../openstack/storage/requests/get_object.rb | 6 +- .../storage/requests/get_object_http_url.rb | 2 +- .../storage/requests/get_object_https_url.rb | 14 +- .../storage/requests/head_container.rb | 8 +- .../storage/requests/head_containers.rb | 8 +- .../openstack/storage/requests/head_object.rb | 6 +- .../openstack/storage/requests/post_object.rb | 9 +- .../requests/post_set_meta_temp_url_key.rb | 6 +- .../openstack/storage/requests/public_url.rb | 1 + .../storage/requests/put_container.rb | 8 +- .../requests/put_dynamic_obj_manifest.rb | 10 +- .../openstack/storage/requests/put_object.rb | 19 +- .../requests/put_static_obj_manifest.rb | 12 +- lib/fog/openstack/volume.rb | 2 - lib/fog/openstack/volume/models/transfer.rb | 2 +- lib/fog/openstack/volume/models/volume.rb | 12 +- .../volume/requests/accept_transfer.rb | 8 +- lib/fog/openstack/volume/requests/action.rb | 8 +- .../volume/requests/create_backup.rb | 14 +- .../volume/requests/create_snapshot.rb | 8 +- .../volume/requests/create_transfer.rb | 8 +- .../volume/requests/create_volume.rb | 8 +- .../volume/requests/create_volume_type.rb | 12 +- .../volume/requests/delete_backup.rb | 6 +- .../volume/requests/delete_metadata.rb | 6 +- .../volume/requests/delete_snapshot.rb | 6 +- .../requests/delete_snapshot_metadata.rb | 6 +- .../volume/requests/delete_transfer.rb | 6 +- .../volume/requests/delete_volume.rb | 6 +- .../volume/requests/delete_volume_type.rb | 6 +- .../volume/requests/extend_volume.rb | 10 +- .../volume/requests/get_backup_details.rb | 8 +- .../openstack/volume/requests/get_quota.rb | 6 +- .../volume/requests/get_quota_defaults.rb | 6 +- .../volume/requests/get_quota_usage.rb | 22 +- .../volume/requests/get_snapshot_details.rb | 6 +- .../volume/requests/get_transfer_details.rb | 6 +- .../volume/requests/get_volume_details.rb | 6 +- .../requests/get_volume_type_details.rb | 10 +- .../openstack/volume/requests/list_backups.rb | 8 +- .../volume/requests/list_backups_detailed.rb | 12 +- .../volume/requests/list_snapshots.rb | 8 +- .../requests/list_snapshots_detailed.rb | 8 +- .../volume/requests/list_transfers.rb | 8 +- .../requests/list_transfers_detailed.rb | 8 +- .../volume/requests/list_volume_types.rb | 18 +- .../openstack/volume/requests/list_volumes.rb | 8 +- .../volume/requests/list_volumes_detailed.rb | 8 +- .../openstack/volume/requests/list_zones.rb | 16 +- .../volume/requests/replace_metadata.rb | 8 +- .../volume/requests/restore_backup.rb | 10 +- .../volume/requests/snapshot_action.rb | 8 +- .../volume/requests/update_metadata.rb | 8 +- .../openstack/volume/requests/update_quota.rb | 10 +- .../volume/requests/update_snapshot.rb | 11 +- .../requests/update_snapshot_metadata.rb | 8 +- .../volume/requests/update_volume.rb | 2 +- .../volume/requests/update_volume_type.rb | 12 +- lib/fog/openstack/volume/v1.rb | 2 +- lib/fog/openstack/volume/v1/mock.rb | 26 +- .../openstack/volume/v1/models/transfer.rb | 6 +- lib/fog/openstack/volume/v1/models/volume.rb | 8 +- .../volume/v1/requests/create_snapshot.rb | 18 +- .../volume/v1/requests/create_volume.rb | 26 +- .../v1/requests/get_snapshot_details.rb | 12 +- .../volume/v1/requests/get_volume_details.rb | 20 +- .../volume/v1/requests/list_volumes.rb | 46 +- .../v1/requests/list_volumes_detailed.rb | 46 +- .../volume/v1/requests/update_volume.rb | 8 +- lib/fog/openstack/volume/v2.rb | 2 +- lib/fog/openstack/volume/v2/mock.rb | 26 +- .../openstack/volume/v2/models/transfer.rb | 6 +- lib/fog/openstack/volume/v2/models/volume.rb | 4 +- .../volume/v2/requests/create_snapshot.rb | 18 +- .../volume/v2/requests/create_volume.rb | 26 +- .../v2/requests/get_snapshot_details.rb | 12 +- .../volume/v2/requests/get_volume_details.rb | 18 +- .../volume/v2/requests/list_volumes.rb | 46 +- .../v2/requests/list_volumes_detailed.rb | 46 +- .../volume/v2/requests/update_volume.rb | 8 +- lib/fog/openstack/workflow/v2.rb | 10 +- .../workflow/v2/requests/create_action.rb | 8 +- .../v2/requests/create_action_execution.rb | 10 +- .../v2/requests/create_cron_trigger.rb | 16 +- .../v2/requests/create_environment.rb | 8 +- .../workflow/v2/requests/create_execution.rb | 10 +- .../workflow/v2/requests/create_workbook.rb | 8 +- .../workflow/v2/requests/create_workflow.rb | 8 +- .../workflow/v2/requests/delete_action.rb | 6 +- .../v2/requests/delete_action_execution.rb | 6 +- .../v2/requests/delete_cron_trigger.rb | 6 +- .../v2/requests/delete_environment.rb | 6 +- .../workflow/v2/requests/delete_execution.rb | 6 +- .../workflow/v2/requests/delete_workbook.rb | 6 +- .../workflow/v2/requests/delete_workflow.rb | 6 +- .../workflow/v2/requests/get_action.rb | 10 +- .../v2/requests/get_action_execution.rb | 8 +- .../workflow/v2/requests/get_cron_trigger.rb | 12 +- .../workflow/v2/requests/get_environment.rb | 12 +- .../workflow/v2/requests/get_execution.rb | 8 +- .../workflow/v2/requests/get_task.rb | 10 +- .../workflow/v2/requests/get_workbook.rb | 12 +- .../workflow/v2/requests/get_workflow.rb | 12 +- .../v2/requests/list_action_executions.rb | 12 +- .../workflow/v2/requests/list_actions.rb | 14 +- .../v2/requests/list_cron_triggers.rb | 12 +- .../workflow/v2/requests/list_environments.rb | 12 +- .../workflow/v2/requests/list_executions.rb | 12 +- .../workflow/v2/requests/list_services.rb | 12 +- .../workflow/v2/requests/list_tasks.rb | 12 +- .../workflow/v2/requests/list_workbooks.rb | 12 +- .../workflow/v2/requests/list_workflows.rb | 14 +- .../workflow/v2/requests/rerun_task.rb | 14 +- .../workflow/v2/requests/update_action.rb | 8 +- .../v2/requests/update_action_execution.rb | 10 +- .../v2/requests/update_environment.rb | 8 +- .../workflow/v2/requests/update_execution.rb | 10 +- .../workflow/v2/requests/update_workbook.rb | 8 +- .../workflow/v2/requests/update_workflow.rb | 8 +- .../workflow/v2/requests/validate_action.rb | 8 +- .../workflow/v2/requests/validate_workbook.rb | 8 +- .../workflow/v2/requests/validate_workflow.rb | 8 +- spec/identity_v3_spec.rb | 30 +- spec/image_v2_spec.rb | 4 +- spec/monitoring_spec.rb | 2 +- spec/shared_context.rb | 2 +- spec/volume_spec.rb | 56 +-- test/authenticate_tests.rb | 71 ++-- test/helpers/nfv_helper.rb | 2 +- test/models/identity/ec2_credential_tests.rb | 2 +- test/models/identity/ec2_credentials_tests.rb | 2 +- test/models/identity/role_tests.rb | 2 +- test/models/identity/roles_tests.rb | 2 +- test/models/identity/tenant_tests.rb | 2 +- test/models/identity/tenants_tests.rb | 2 +- test/models/identity/user_tests.rb | 2 +- test/models/identity/users_tests.rb | 2 +- .../network/ipsec_site_connection_tests.rb | 8 +- test/models/network/lb_vip_tests.rb | 2 +- .../network/security_group_rule_tests.rb | 2 +- test/models/planning/plan_tests.rb | 2 +- test/models/storage/file_tests.rb | 6 +- test/requests/baremetal/chassis_tests.rb | 16 +- test/requests/baremetal/driver_tests.rb | 24 +- test/requests/baremetal/node_tests.rb | 50 +-- test/requests/baremetal/port_tests.rb | 12 +- test/requests/compute/address_tests.rb | 8 +- test/requests/compute/aggregate_tests.rb | 12 +- .../compute/availability_zone_tests.rb | 4 +- test/requests/compute/flavor_tests.rb | 20 +- test/requests/compute/helper.rb | 4 +- test/requests/compute/image_tests.rb | 18 +- test/requests/compute/keypair_tests.rb | 10 +- test/requests/compute/limit_tests.rb | 42 +- test/requests/compute/quota_tests.rb | 30 +- test/requests/compute/security_group_tests.rb | 20 +- test/requests/compute/server_tests.rb | 52 +-- test/requests/compute/service_tests.rb | 14 +- test/requests/compute/tenant_tests.rb | 8 +- test/requests/compute/volume_tests.rb | 20 +- .../container_infra/bay_model_tests.rb | 66 +-- test/requests/container_infra/bay_tests.rb | 36 +- .../container_infra/certificate_tests.rb | 6 +- .../container_infra/cluster_template_tests.rb | 66 +-- .../requests/container_infra/cluster_tests.rb | 34 +- test/requests/dns_v1/domain_tests.rb | 14 +- test/requests/dns_v1/quota_tests.rb | 8 +- test/requests/dns_v2/pool_tests.rb | 16 +- test/requests/dns_v2/quota_tests.rb | 10 +- test/requests/dns_v2/recordset_tests.rb | 32 +- test/requests/dns_v2/zone_tests.rb | 32 +- .../identity/ec2_credentials_tests.rb | 8 +- test/requests/identity/role_tests.rb | 4 +- test/requests/identity/tenant_tests.rb | 10 +- test/requests/identity/user_tests.rb | 10 +- test/requests/image/image_tests.rb | 86 ++-- .../introspection/introspection_tests.rb | 352 +++++++-------- test/requests/introspection/rules_tests.rb | 14 +- test/requests/metering/meter_tests.rb | 50 +-- test/requests/metering/resource_tests.rb | 6 +- test/requests/network/extension_tests.rb | 8 +- test/requests/network/ike_policy_tests.rb | 18 +- test/requests/network/ipsec_policy_tests.rb | 18 +- .../network/ipsec_site_connection_tests.rb | 38 +- .../network/lb_health_monitor_tests.rb | 18 +- test/requests/network/lb_member_tests.rb | 14 +- test/requests/network/lb_pool_tests.rb | 36 +- test/requests/network/lb_vip_tests.rb | 26 +- test/requests/network/network_tests.rb | 22 +- test/requests/network/port_tests.rb | 22 +- test/requests/network/quota_tests.rb | 22 +- .../network/security_group_rule_tests.rb | 18 +- test/requests/network/security_group_tests.rb | 8 +- test/requests/network/subnet_pool_tests.rb | 28 +- test/requests/network/subnet_tests.rb | 20 +- test/requests/network/vpn_service_tests.rb | 14 +- test/requests/nfv/vnf_tests.rb | 26 +- test/requests/nfv/vnfd_tests.rb | 14 +- .../stack_files_util_helper_tests.rb | 2 +- .../orchestration/stack_files_util_tests.rb | 2 +- test/requests/orchestration/stack_tests.rb | 52 +-- test/requests/planning/plan_tests.rb | 16 +- test/requests/planning/role_tests.rb | 6 +- .../shared_file_system/quota_tests.rb | 12 +- test/requests/storage/container_tests.rb | 3 +- test/requests/storage/large_object_tests.rb | 40 +- test/requests/storage/object_tests.rb | 26 +- .../volume/availability_zone_tests.rb | 2 +- test/requests/volume/backup_tests.rb | 12 +- test/requests/volume/quota_tests.rb | 8 +- test/requests/volume/volume_type_tests.rb | 4 +- test/requests/workflow/workflow_tests.rb | 14 +- test/version_tests.rb | 18 +- unit/auth/catalog_test.rb | 138 +++--- unit/auth/name_test.rb | 18 +- unit/auth/token_test.rb | 402 +++++++++--------- unit/auth_helper.rb | 94 ++-- 965 files changed, 7355 insertions(+), 7391 deletions(-) diff --git a/Rakefile b/Rakefile index 760a62480..a0b9e15fd 100644 --- a/Rakefile +++ b/Rakefile @@ -4,22 +4,22 @@ require 'rake/testtask' RuboCop::RakeTask.new -task :default => ['tests:mock', 'tests:spec', 'tests:unit'] +task default: ['tests:mock', 'tests:spec', 'tests:unit'] -task :mock => 'tests:mock' +task mock: 'tests:mock' desc 'Run fog-openstack spec/ tests (VCR)' -task :spec => "tests:spec" +task spec: "tests:spec" -task :unit => 'tests:unit' +task unit: 'tests:unit' namespace :tests do desc 'Run fog-openstack tests with Mock class' Rake::TestTask.new do |t| - ENV['FOG_MOCK']= ENV['FOG_MOCK'].nil? ? 'true' : ENV['FOG_MOCK'] + ENV['FOG_MOCK'] = ENV['FOG_MOCK'].nil? ? 'true' : ENV['FOG_MOCK'] t.name = 'mock' - t.libs.push [ "lib", "test" ] + t.libs.push ["lib", "test"] t.test_files = FileList['test/**/*.rb'] t.verbose = true end @@ -35,7 +35,7 @@ namespace :tests do desc 'Run fog-openstack unit tests' Rake::TestTask.new do |t| t.name = 'unit' - t.libs.push [ "lib", "unit" ] + t.libs.push ["lib", "unit"] t.pattern = 'unit/**/*_test.rb' t.verbose = true end diff --git a/examples/container_infra/basics.rb b/examples/container_infra/basics.rb index d3cb9abca..57758229a 100644 --- a/examples/container_infra/basics.rb +++ b/examples/container_infra/basics.rb @@ -3,9 +3,9 @@ # Initialize a connection to the Magnum API params = { - openstack_auth_url: 'https://example.net/v3/auth/tokens', - openstack_username: 'username', - openstack_api_key: 'password', + openstack_auth_url: 'https://example.net/v3/auth/tokens', + openstack_username: 'username', + openstack_api_key: 'password', openstack_project_name: 'magnum' } @@ -27,16 +27,16 @@ # Create a cluster template for using Docker Swarm and Fedora Atomic params = { - name: 'swarm-cluster-template', - image_id: 'fedora-atomic-latest', - keypair_id: 'YOUR_KEYPAIR_NAME', + name: 'swarm-cluster-template', + image_id: 'fedora-atomic-latest', + keypair_id: 'YOUR_KEYPAIR_NAME', external_network_id: 'public', - master_flavor_id: 'm1.small', - flavor_id: 'm1.small', - coe: 'swarm', - docker_volume_size: 3, - dns_nameserver: '8.8.8.8', - tls_disabled: true + master_flavor_id: 'm1.small', + flavor_id: 'm1.small', + coe: 'swarm', + docker_volume_size: 3, + dns_nameserver: '8.8.8.8', + tls_disabled: true } cluster_template = container_infra.cluster_templates.create(params) @@ -44,10 +44,10 @@ # Create a swarm cluster and wait for it to build params = { - name: 'swarm-cluster', + name: 'swarm-cluster', cluster_template_id: 'swarm-cluster-template', - master_count: 1, - node_count: 1 + master_count: 1, + node_count: 1 } cluster = container_infra.clusters.create(params) diff --git a/examples/image/upload-test-image.rb b/examples/image/upload-test-image.rb index 342ea7ba3..d1f977b6b 100755 --- a/examples/image/upload-test-image.rb +++ b/examples/image/upload-test-image.rb @@ -69,6 +69,6 @@ container_format: 'ami', location: ami, properties: { - 'kernel_id' => aki.id, + 'kernel_id' => aki.id, 'ramdisk_id' => ari.id } diff --git a/examples/introspection/basics.rb b/examples/introspection/basics.rb index 8e3f1d618..9fec78177 100644 --- a/examples/introspection/basics.rb +++ b/examples/introspection/basics.rb @@ -1,4 +1,3 @@ - require 'rubygems' require 'fog/openstack' # version >= 1.37 @@ -39,22 +38,22 @@ # Create a set of rules rules = { "description" => "Successful Rule", - "actions" => [ + "actions" => [ { "action" => "set-attribute", - "path" => "/extra/rule_success", - "value" => "yes" + "path" => "/extra/rule_success", + "value" => "yes" } ], "conditions" => [ { "field" => "memory_mb", - "op" => "ge", + "op" => "ge", "value" => 256 }, { "field" => "local_gb", - "op" => "ge", + "op" => "ge", "value" => 1 } ] diff --git a/examples/workflow/workflow-examples.rb b/examples/workflow/workflow-examples.rb index aeab47954..533322dbe 100644 --- a/examples/workflow/workflow-examples.rb +++ b/examples/workflow/workflow-examples.rb @@ -225,7 +225,7 @@ version: "2.0", myaction: { :input => ['execution_id'], - :base => "std.email", + :base => "std.email", "base-input" => { to_addrs: ['admin@mywebsite.org'], subject: "subject1", @@ -266,7 +266,7 @@ version: "2.0", myaction: { :input => ['execution_id'], - :base => "std.email", + :base => "std.email", "base-input" => { to_addrs: ['admin@mywebsite.org'], subject: "subject updated", diff --git a/lib/fog/openstack.rb b/lib/fog/openstack.rb index 64c859846..ddfaeabf1 100644 --- a/lib/fog/openstack.rb +++ b/lib/fog/openstack.rb @@ -109,7 +109,7 @@ def self.get_version(supported_versions, uri, auth_token, connection_options = { response = connection.request( expects: [200, 204, 300], headers: { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', + 'Accept' => 'application/json', 'X-Auth-Token' => auth_token }, method: 'GET' ) @@ -126,7 +126,7 @@ def self.extract_version_from_body(body, supported_versions) versions = body['versions'].kind_of?(Array) ? body['versions'] : body['versions']['values'] end # Some version API would return single endpoint rather than endpoints list, try to get it via 'version'. - unless body['version'].nil? or versions.length != 0 + unless body['version'].nil? || !versions.empty? versions = [body['version']] end version = nil diff --git a/lib/fog/openstack/auth/catalog.rb b/lib/fog/openstack/auth/catalog.rb index 41100e008..cbc42e07b 100644 --- a/lib/fog/openstack/auth/catalog.rb +++ b/lib/fog/openstack/auth/catalog.rb @@ -35,6 +35,7 @@ def get_endpoint_url(names, interfaces, region = nil) end raise EndpointError, 'No endpoint found' if list.empty? + list[0] end @@ -42,6 +43,7 @@ def get_endpoint_url(names, interfaces, region = nil) def get_by_type(names) raise CatalogError, 'Empty content' unless @payload + @payload.select do |e| names.include?(e['type']) end @@ -51,11 +53,13 @@ def get_endpoint(entries, interface, region) list = [] entries.each do |type| next unless type.key?('endpoints') + type['endpoints'].each do |endpoint| list << endpoint_url(endpoint, interface) if endpoint_match?(endpoint, interface, region) end end raise EndpointError, 'Multiple endpoints found' if list.size > 1 + list[0] end end diff --git a/lib/fog/openstack/auth/name.rb b/lib/fog/openstack/auth/name.rb index 638f44545..1567c4b4f 100644 --- a/lib/fog/openstack/auth/name.rb +++ b/lib/fog/openstack/auth/name.rb @@ -26,17 +26,18 @@ class Name def identity return to_h(:id) unless id.nil? return to_h(:name) unless name.nil? + raise Fog::OpenStack::Auth::CredentialsError, "#{self.class}: No available id or name" end def to_h(var) - {var => send(var)} + { var => send(var) } end end class DomainScope < Name def identity - {:domain => super} + { domain: super } end end @@ -44,7 +45,7 @@ class ProjectScope < Name include Fog::OpenStack::Auth::Domain def identity - {:project => super} + { project: super } end end @@ -56,8 +57,9 @@ class User < Name def identity data = super raise CredentialsError, "#{self.class}: No password available" if password.nil? + data.merge!(to_h(:password)) - {:user => data} + { user: data } end end end diff --git a/lib/fog/openstack/auth/token.rb b/lib/fog/openstack/auth/token.rb index a6b75ba2d..d5d14bb4a 100644 --- a/lib/fog/openstack/auth/token.rb +++ b/lib/fog/openstack/auth/token.rb @@ -24,9 +24,10 @@ def self.build(auth, options) def initialize(auth, options) raise URLError, 'No URL provided' if auth[:openstack_auth_url].nil? || auth[:openstack_auth_url].empty? + @creds = { - :data => build_credentials(auth), - :uri => URI.parse(auth[:openstack_auth_url]) + data: build_credentials(auth), + uri: URI.parse(auth[:openstack_auth_url]) } response = authenticate(@creds, options) set(response) @@ -43,11 +44,11 @@ def authenticate(creds, options) connection = Fog::Core::Connection.new(creds[:uri].to_s, false, options) request = { - :expects => [200, 201], - :headers => {'Content-Type' => 'application/json'}, - :body => Fog::JSON.encode(creds[:data]), - :method => 'POST', - :path => creds[:uri].path + prefix_path(creds[:uri]) + path + expects: [200, 201], + headers: { 'Content-Type' => 'application/json' }, + body: Fog::JSON.encode(creds[:data]), + method: 'POST', + path: creds[:uri].path + prefix_path(creds[:uri]) + path } connection.request(request) @@ -57,6 +58,7 @@ def expired? if @expires.nil? || @expires.empty? raise ExpiryError, 'Missing token expiration data' end + Time.parse(@expires) < Time.now.utc end diff --git a/lib/fog/openstack/auth/token/v2.rb b/lib/fog/openstack/auth/token/v2.rb index 5f1d4dd85..e74578770 100644 --- a/lib/fog/openstack/auth/token/v2.rb +++ b/lib/fog/openstack/auth/token/v2.rb @@ -13,11 +13,12 @@ class V2 def credentials if @token - identity = {'token' => {'id' => @token}} + identity = { 'token' => { 'id' => @token } } else raise CredentialsError, "#{self.class}: User name is required" if @user.name.nil? raise CredentialsError, "#{self.class}: User password is required" if @user.password.nil? - identity = {'passwordCredentials' => user_credentials} + + identity = { 'passwordCredentials' => user_credentials } end if @tenant.id @@ -26,11 +27,11 @@ def credentials identity['tenantName'] = @tenant.name.to_s end - {'auth' => identity} + { 'auth' => identity } end def prefix_path(uri) - if uri.path =~ /\/v2(\.0)*(\/)*.*$/ + if uri.path =~ %r{/v2(\.0)*(/)*.*$} '' else '/v2.0' diff --git a/lib/fog/openstack/auth/token/v3.rb b/lib/fog/openstack/auth/token/v3.rb index a5037bfbe..2f85bbe5b 100644 --- a/lib/fog/openstack/auth/token/v3.rb +++ b/lib/fog/openstack/auth/token/v3.rb @@ -16,11 +16,11 @@ def credentials identity = if @token { 'methods' => ['token'], - 'token' => {'id' => @token} + 'token' => { 'id' => @token } } else { - 'methods' => ['password'], + 'methods' => ['password'], 'password' => @user.identity } end @@ -29,16 +29,16 @@ def credentials { 'auth' => { 'identity' => identity, - 'scope' => scope + 'scope' => scope } } else - {'auth' => {'identity' => identity}} + { 'auth' => { 'identity' => identity } } end end def prefix_path(uri) - if uri.path =~ /\/v3(\/)*.*$/ + if uri.path =~ %r{/v3(/)*.*$} '' else '/v3' diff --git a/lib/fog/openstack/baremetal.rb b/lib/fog/openstack/baremetal.rb index c1ba2e52e..117a7f7e2 100644 --- a/lib/fog/openstack/baremetal.rb +++ b/lib/fog/openstack/baremetal.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class Baremetal < Fog::Service - SUPPORTED_VERSIONS = /(.)*/ + SUPPORTED_VERSIONS = /(.)*/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -90,108 +90,108 @@ def self.data node_uuid = Fog::UUID.uuid hash[key] = { - :chassis_collection => [ + chassis_collection: [ { - "created_at" => "2000-01-01T12:00:00", + "created_at" => "2000-01-01T12:00:00", "description" => "Sample chassis", - "extra" => {}, - "links" => [ + "extra" => {}, + "links" => [ { "href" => "http://localhost:6385/v1/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89", - "rel" => "self" + "rel" => "self" }, { "href" => "http://localhost:6385/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "nodes" => [ + "nodes" => [ { "href" => "http://localhost:6385/v1/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89/nodes", - "rel" => "self" + "rel" => "self" }, { "href" => "http://localhost:6385/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89/nodes", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "updated_at" => "2000-01-01T12:00:00", - "uuid" => chassis_uuid + "updated_at" => "2000-01-01T12:00:00", + "uuid" => chassis_uuid } ], - :drivers => [ + drivers: [ { "hosts" => [ "fake-host" ], - "name" => "sample-driver" + "name" => "sample-driver" } ], - :nodes => [{ - "chassis_uuid" => chassis_uuid, - "console_enabled" => false, - "created_at" => "2000-01-01T12:00:00", - "driver" => "sample-driver", - "driver_info" => {}, - "extra" => {}, - "instance_info" => {}, - "instance_uuid" => instance_uuid, - "last_error" => nil, - "links" => [ + nodes: [{ + "chassis_uuid" => chassis_uuid, + "console_enabled" => false, + "created_at" => "2000-01-01T12:00:00", + "driver" => "sample-driver", + "driver_info" => {}, + "extra" => {}, + "instance_info" => {}, + "instance_uuid" => instance_uuid, + "last_error" => nil, + "links" => [ { "href" => "http://localhost:6385/v1/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123", - "rel" => "self" + "rel" => "self" }, { "href" => "http://localhost:6385/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "maintenance" => false, - "maintenance_reason" => nil, - "ports" => [ + "maintenance" => false, + "maintenance_reason" => nil, + "ports" => [ { "href" => "http://localhost:6385/v1/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ports", - "rel" => "self" + "rel" => "self" }, { "href" => "http://localhost:6385/nodes/1be26c0b-03f2-4d2e-ae87-c02d7f33c123/ports", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "power_state" => "power on", - "properties" => { - "cpus" => "1", - "local_gb" => "10", + "power_state" => "power on", + "properties" => { + "cpus" => "1", + "local_gb" => "10", "memory_mb" => "1024" }, - "provision_state" => "active", - "provision_updated_at" => "2000-01-01T12:00:00", - "reservation" => nil, - "target_power_state" => nil, + "provision_state" => "active", + "provision_updated_at" => "2000-01-01T12:00:00", + "reservation" => nil, + "target_power_state" => nil, "target_provision_state" => nil, - "updated_at" => "2000-01-01T12:00:00", - "uuid" => node_uuid + "updated_at" => "2000-01-01T12:00:00", + "uuid" => node_uuid }], - :ports => [{ - "address" => "fe:54:00:77:07:d9", + ports: [{ + "address" => "fe:54:00:77:07:d9", "created_at" => "2014-12-23T19:35:30.734116", - "extra" => { + "extra" => { "foo" => "bar" }, - "links" => [ + "links" => [ { "href" => "http://localhost:6385/v1/ports/27e3153e-d5bf-4b7e-b517-fb518e17f34c", - "rel" => "self" + "rel" => "self" }, { "href" => "http://localhost:6385/ports/27e3153e-d5bf-4b7e-b517-fb518e17f34c", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "node_uuid" => "7ae81bb3-dec3-4289-8d6c-da80bd8001ae", + "node_uuid" => "7ae81bb3-dec3-4289-8d6c-da80bd8001ae", "updated_at" => "2014-12-23T19:35:30.734119", - "uuid" => "27e3153e-d5bf-4b7e-b517-fb518e17f34c" + "uuid" => "27e3153e-d5bf-4b7e-b517-fb518e17f34c" }] } end @@ -214,15 +214,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -236,11 +236,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/baremetal/models/chassis_collection.rb b/lib/fog/openstack/baremetal/models/chassis_collection.rb index cee1170f7..d5ba56de4 100644 --- a/lib/fog/openstack/baremetal/models/chassis_collection.rb +++ b/lib/fog/openstack/baremetal/models/chassis_collection.rb @@ -33,7 +33,7 @@ def destroy(uuid) def method_missing(method_sym, *arguments, &block) if method_sym.to_s =~ /^find_by_(.*)$/ - load(service.list_chassis_detailed($1 => arguments.first).body['chassis']) + load(service.list_chassis_detailed(Regexp.last_match(1) => arguments.first).body['chassis']) else super end diff --git a/lib/fog/openstack/baremetal/models/node.rb b/lib/fog/openstack/baremetal/models/node.rb index 403485b52..01a2ba237 100644 --- a/lib/fog/openstack/baremetal/models/node.rb +++ b/lib/fog/openstack/baremetal/models/node.rb @@ -61,7 +61,7 @@ def chassis def ports requires :uuid - service.list_ports_detailed(:node_uuid => uuid).body['ports'] + service.list_ports_detailed(node_uuid: uuid).body['ports'] end def set_node_maintenance(parameters = nil) diff --git a/lib/fog/openstack/baremetal/models/nodes.rb b/lib/fog/openstack/baremetal/models/nodes.rb index a9e8c58a0..199c2091d 100644 --- a/lib/fog/openstack/baremetal/models/nodes.rb +++ b/lib/fog/openstack/baremetal/models/nodes.rb @@ -33,7 +33,7 @@ def destroy(uuid) def method_missing(method_sym, *arguments, &block) if method_sym.to_s =~ /^find_by_(.*)$/ - load(service.list_nodes_detailed($1 => arguments.first).body['nodes']) + load(service.list_nodes_detailed(Regexp.last_match(1) => arguments.first).body['nodes']) else super end diff --git a/lib/fog/openstack/baremetal/models/ports.rb b/lib/fog/openstack/baremetal/models/ports.rb index d5322650c..eb71010f3 100644 --- a/lib/fog/openstack/baremetal/models/ports.rb +++ b/lib/fog/openstack/baremetal/models/ports.rb @@ -33,7 +33,7 @@ def destroy(uuid) def method_missing(method_sym, *arguments, &block) if method_sym.to_s =~ /^find_by_(.*)$/ - load(service.list_ports_detailed($1 => arguments.first).body['ports']) + load(service.list_ports_detailed(Regexp.last_match(1) => arguments.first).body['ports']) else super end diff --git a/lib/fog/openstack/baremetal/requests/create_chassis.rb b/lib/fog/openstack/baremetal/requests/create_chassis.rb index dc1da3d84..a4984fea6 100644 --- a/lib/fog/openstack/baremetal/requests/create_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/create_chassis.rb @@ -17,10 +17,10 @@ def create_chassis(attributes) data = attributes.select { |key, _value| desired_options.include?(key.to_sym) } request( - :body => Fog::JSON.encode(data), - :expects => [200, 201], - :method => 'POST', - :path => 'chassis' + body: Fog::JSON.encode(data), + expects: [200, 201], + method: 'POST', + path: 'chassis' ) end end @@ -31,9 +31,9 @@ def create_chassis(_attributes) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:chassis_collection].first response diff --git a/lib/fog/openstack/baremetal/requests/create_node.rb b/lib/fog/openstack/baremetal/requests/create_node.rb index 629e0614f..973120b67 100644 --- a/lib/fog/openstack/baremetal/requests/create_node.rb +++ b/lib/fog/openstack/baremetal/requests/create_node.rb @@ -27,10 +27,10 @@ def create_node(attributes) data = attributes.select { |key, _value| desired_options.include?(key.to_sym) } request( - :body => Fog::JSON.encode(data), - :expects => [200, 201], - :method => 'POST', - :path => 'nodes' + body: Fog::JSON.encode(data), + expects: [200, 201], + method: 'POST', + path: 'nodes' ) end end @@ -41,9 +41,9 @@ def create_node(_attributes) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:nodes].first response diff --git a/lib/fog/openstack/baremetal/requests/create_port.rb b/lib/fog/openstack/baremetal/requests/create_port.rb index a980ed0ab..9df26b816 100644 --- a/lib/fog/openstack/baremetal/requests/create_port.rb +++ b/lib/fog/openstack/baremetal/requests/create_port.rb @@ -19,10 +19,10 @@ def create_port(attributes) data = attributes.select { |key, _value| desired_options.include?(key.to_sym) } request( - :body => Fog::JSON.encode(data), - :expects => [200, 201], - :method => 'POST', - :path => 'ports' + body: Fog::JSON.encode(data), + expects: [200, 201], + method: 'POST', + path: 'ports' ) end end @@ -33,9 +33,9 @@ def create_port(_attributes) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:ports].first response diff --git a/lib/fog/openstack/baremetal/requests/delete_chassis.rb b/lib/fog/openstack/baremetal/requests/delete_chassis.rb index a13ce5b7b..452e088cb 100644 --- a/lib/fog/openstack/baremetal/requests/delete_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/delete_chassis.rb @@ -3,12 +3,12 @@ module OpenStack class Baremetal class Real def delete_chassis(chassis_uuid) - data = {:chassis_uuid => chassis_uuid} + data = { chassis_uuid: chassis_uuid } request( - :body => Fog::JSON.encode(data), - :expects => [200, 204], - :method => 'DELETE', - :path => 'chassis' + body: Fog::JSON.encode(data), + expects: [200, 204], + method: 'DELETE', + path: 'chassis' ) end end diff --git a/lib/fog/openstack/baremetal/requests/delete_node.rb b/lib/fog/openstack/baremetal/requests/delete_node.rb index 522373555..7a30c486f 100644 --- a/lib/fog/openstack/baremetal/requests/delete_node.rb +++ b/lib/fog/openstack/baremetal/requests/delete_node.rb @@ -3,12 +3,12 @@ module OpenStack class Baremetal class Real def delete_node(node_uuid) - data = {:node_ident => node_uuid} + data = { node_ident: node_uuid } request( - :body => Fog::JSON.encode(data), - :expects => [200, 204], - :method => 'DELETE', - :path => 'nodes' + body: Fog::JSON.encode(data), + expects: [200, 204], + method: 'DELETE', + path: 'nodes' ) end end diff --git a/lib/fog/openstack/baremetal/requests/delete_port.rb b/lib/fog/openstack/baremetal/requests/delete_port.rb index 1faadb1d1..087ece563 100644 --- a/lib/fog/openstack/baremetal/requests/delete_port.rb +++ b/lib/fog/openstack/baremetal/requests/delete_port.rb @@ -3,12 +3,12 @@ module OpenStack class Baremetal class Real def delete_port(port_uuid) - data = {:port_uuid => port_uuid} + data = { port_uuid: port_uuid } request( - :body => Fog::JSON.encode(data), - :expects => [200, 204], - :method => 'DELETE', - :path => 'ports' + body: Fog::JSON.encode(data), + expects: [200, 204], + method: 'DELETE', + path: 'ports' ) end end diff --git a/lib/fog/openstack/baremetal/requests/get_chassis.rb b/lib/fog/openstack/baremetal/requests/get_chassis.rb index def0f616b..761d84f8c 100644 --- a/lib/fog/openstack/baremetal/requests/get_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/get_chassis.rb @@ -4,9 +4,9 @@ class Baremetal class Real def get_chassis(chassis_uuid) request( - :expects => [200, 204], - :method => 'GET', - :path => "chassis/#{chassis_uuid}" + expects: [200, 204], + method: 'GET', + path: "chassis/#{chassis_uuid}" ) end end diff --git a/lib/fog/openstack/baremetal/requests/get_driver.rb b/lib/fog/openstack/baremetal/requests/get_driver.rb index 915f03638..30c4664f6 100644 --- a/lib/fog/openstack/baremetal/requests/get_driver.rb +++ b/lib/fog/openstack/baremetal/requests/get_driver.rb @@ -4,9 +4,9 @@ class Baremetal class Real def get_driver(driver_name) request( - :expects => [200, 204], - :method => 'GET', - :path => "drivers/#{driver_name}" + expects: [200, 204], + method: 'GET', + path: "drivers/#{driver_name}" ) end end diff --git a/lib/fog/openstack/baremetal/requests/get_driver_properties.rb b/lib/fog/openstack/baremetal/requests/get_driver_properties.rb index 3dc9e11ea..988ac0685 100644 --- a/lib/fog/openstack/baremetal/requests/get_driver_properties.rb +++ b/lib/fog/openstack/baremetal/requests/get_driver_properties.rb @@ -3,12 +3,12 @@ module OpenStack class Baremetal class Real def get_driver_properties(driver_name) - data = {:driver_name => driver_name} + data = { driver_name: driver_name } request( - :body => Fog::JSON.encode(data), - :expects => [200, 204], - :method => 'GET', - :path => "drivers/properties" + body: Fog::JSON.encode(data), + expects: [200, 204], + method: 'GET', + path: "drivers/properties" ) end end @@ -18,19 +18,19 @@ def get_driver_properties(_driver_name) response = Excon::Response.new response.status = [200, 204][rand(2)] response.body = { - "pxe_deploy_ramdisk" => "UUID (from Glance) of the ramdisk.", + "pxe_deploy_ramdisk" => "UUID (from Glance) of the ramdisk.", "ipmi_transit_address" => "transit address for bridged request.", - "ipmi_terminal_port" => "node's UDP port to connect to.", - "ipmi_target_channel" => "destination channel for bridged request.", + "ipmi_terminal_port" => "node's UDP port to connect to.", + "ipmi_target_channel" => "destination channel for bridged request.", "ipmi_transit_channel" => "transit channel for bridged request.", - "ipmi_local_address" => "local IPMB address for bridged requests. ", - "ipmi_username" => "username; default is NULL user. Optional.", - "ipmi_address" => "IP address or hostname of the node. Required.", - "ipmi_target_address" => "destination address for bridged request.", - "ipmi_password" => "password. Optional.", - "pxe_deploy_kernel" => "UUID (from Glance) of the deployment kernel.", - "ipmi_priv_level" => "privilege level; default is ADMINISTRATOR. ", - "ipmi_bridging" => "bridging_type." + "ipmi_local_address" => "local IPMB address for bridged requests. ", + "ipmi_username" => "username; default is NULL user. Optional.", + "ipmi_address" => "IP address or hostname of the node. Required.", + "ipmi_target_address" => "destination address for bridged request.", + "ipmi_password" => "password. Optional.", + "pxe_deploy_kernel" => "UUID (from Glance) of the deployment kernel.", + "ipmi_priv_level" => "privilege level; default is ADMINISTRATOR. ", + "ipmi_bridging" => "bridging_type." } response end diff --git a/lib/fog/openstack/baremetal/requests/get_node.rb b/lib/fog/openstack/baremetal/requests/get_node.rb index 60d4be300..a32d1aefc 100644 --- a/lib/fog/openstack/baremetal/requests/get_node.rb +++ b/lib/fog/openstack/baremetal/requests/get_node.rb @@ -4,9 +4,9 @@ class Baremetal class Real def get_node(node_id) request( - :expects => [200, 204], - :method => 'GET', - :path => "nodes/#{node_id}" + expects: [200, 204], + method: 'GET', + path: "nodes/#{node_id}" ) end end diff --git a/lib/fog/openstack/baremetal/requests/get_port.rb b/lib/fog/openstack/baremetal/requests/get_port.rb index bf34be34f..c397af2fb 100644 --- a/lib/fog/openstack/baremetal/requests/get_port.rb +++ b/lib/fog/openstack/baremetal/requests/get_port.rb @@ -4,9 +4,9 @@ class Baremetal class Real def get_port(port_id) request( - :expects => [200, 204], - :method => 'GET', - :path => "ports/#{port_id}" + expects: [200, 204], + method: 'GET', + path: "ports/#{port_id}" ) end end diff --git a/lib/fog/openstack/baremetal/requests/list_chassis.rb b/lib/fog/openstack/baremetal/requests/list_chassis.rb index f7d5272cc..a231b3328 100644 --- a/lib/fog/openstack/baremetal/requests/list_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/list_chassis.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_chassis(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'chassis', - :query => options + expects: [200, 204], + method: 'GET', + path: 'chassis', + query: options ) end end @@ -20,17 +20,17 @@ def list_chassis(_parameters = nil) "chassis" => [ { "description" => "Sample chassis", - "links" => [ + "links" => [ { "href" => "http =>//localhost:6385/v1/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89", - "rel" => "self" + "rel" => "self" }, { "href" => "http =>//localhost:6385/chassis/eaaca217-e7d8-47b4-bb41-3f99f20eed89", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "uuid" => Fog::UUID.uuid + "uuid" => Fog::UUID.uuid } ] } diff --git a/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb b/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb index 63a25d58b..7426fab96 100644 --- a/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_chassis_detailed.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_chassis_detailed(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'chassis/detail', - :query => options + expects: [200, 204], + method: 'GET', + path: 'chassis/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_chassis_detailed(_options = {}) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.body = {"chassis" => data[:chassis_collection]} + response.body = { "chassis" => data[:chassis_collection] } response end end diff --git a/lib/fog/openstack/baremetal/requests/list_drivers.rb b/lib/fog/openstack/baremetal/requests/list_drivers.rb index bf0646520..28e4c3c78 100644 --- a/lib/fog/openstack/baremetal/requests/list_drivers.rb +++ b/lib/fog/openstack/baremetal/requests/list_drivers.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_drivers(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'drivers', - :query => options + expects: [200, 204], + method: 'GET', + path: 'drivers', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_drivers(_options = {}) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.body = {"drivers" => data[:drivers]} + response.body = { "drivers" => data[:drivers] } response end end diff --git a/lib/fog/openstack/baremetal/requests/list_nodes.rb b/lib/fog/openstack/baremetal/requests/list_nodes.rb index ff2c63964..4dadb970a 100644 --- a/lib/fog/openstack/baremetal/requests/list_nodes.rb +++ b/lib/fog/openstack/baremetal/requests/list_nodes.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_nodes(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'nodes', - :query => options + expects: [200, 204], + method: 'GET', + path: 'nodes', + query: options ) end end @@ -18,12 +18,12 @@ def list_nodes(_options = {}) response.status = [200, 204][rand(2)] response.body = { "nodes" => [{ - "instance_uuid" => Fog::UUID.uuid, - "maintenance" => false, - "power_state" => "power on", + "instance_uuid" => Fog::UUID.uuid, + "maintenance" => false, + "power_state" => "power on", "provision_state" => "active", - "uuid" => Fog::UUID.uuid, - "links" => [] + "uuid" => Fog::UUID.uuid, + "links" => [] }] } response diff --git a/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb b/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb index afbca74d5..45a2773e8 100644 --- a/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_nodes_detailed.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_nodes_detailed(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'nodes/detail', - :query => options + expects: [200, 204], + method: 'GET', + path: 'nodes/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_nodes_detailed(_options = {}) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.body = {"nodes" => data[:nodes]} + response.body = { "nodes" => data[:nodes] } response end end diff --git a/lib/fog/openstack/baremetal/requests/list_ports.rb b/lib/fog/openstack/baremetal/requests/list_ports.rb index 0a68f4042..69d7c5fbe 100644 --- a/lib/fog/openstack/baremetal/requests/list_ports.rb +++ b/lib/fog/openstack/baremetal/requests/list_ports.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_ports(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'ports', - :query => options + expects: [200, 204], + method: 'GET', + path: 'ports', + query: options ) end end @@ -20,17 +20,17 @@ def list_ports(_options = {}) "ports" => [ { "address" => "fe:54:00:77:07:d9", - "links" => [ + "links" => [ { "href" => "http://localhost:6385/v1/ports/27e3153e-d5bf-4b7e-b517-fb518e17f34c", - "rel" => "self" + "rel" => "self" }, { "href" => "http://localhost:6385/ports/27e3153e-d5bf-4b7e-b517-fb518e17f34c", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "uuid" => Fog::UUID.uuid + "uuid" => Fog::UUID.uuid } ] } diff --git a/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb b/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb index 768c40773..9de70b737 100644 --- a/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb +++ b/lib/fog/openstack/baremetal/requests/list_ports_detailed.rb @@ -4,10 +4,10 @@ class Baremetal class Real def list_ports_detailed(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'ports/detail', - :query => options + expects: [200, 204], + method: 'GET', + path: 'ports/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_ports_detailed(_options = {}) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.body = {"ports" => data[:ports]} + response.body = { "ports" => data[:ports] } response end end diff --git a/lib/fog/openstack/baremetal/requests/patch_chassis.rb b/lib/fog/openstack/baremetal/requests/patch_chassis.rb index ebfe87b66..0d9cc1c6a 100644 --- a/lib/fog/openstack/baremetal/requests/patch_chassis.rb +++ b/lib/fog/openstack/baremetal/requests/patch_chassis.rb @@ -14,10 +14,10 @@ class Real # value = Value to set def patch_chassis(chassis_uuid, patch) request( - :body => Fog::JSON.encode(patch), - :expects => 200, - :method => 'PATCH', - :path => "chassis/#{chassis_uuid}" + body: Fog::JSON.encode(patch), + expects: 200, + method: 'PATCH', + path: "chassis/#{chassis_uuid}" ) end end @@ -28,9 +28,9 @@ def patch_chassis(_chassis_uuid, _patch) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:chassis_collection].first response diff --git a/lib/fog/openstack/baremetal/requests/patch_node.rb b/lib/fog/openstack/baremetal/requests/patch_node.rb index 445b15cc7..e1d2ab778 100644 --- a/lib/fog/openstack/baremetal/requests/patch_node.rb +++ b/lib/fog/openstack/baremetal/requests/patch_node.rb @@ -14,10 +14,10 @@ class Real # value = Value to set def patch_node(node_uuid, patch) request( - :body => Fog::JSON.encode(patch), - :expects => 200, - :method => 'PATCH', - :path => "nodes/#{node_uuid}" + body: Fog::JSON.encode(patch), + expects: 200, + method: 'PATCH', + path: "nodes/#{node_uuid}" ) end end @@ -28,9 +28,9 @@ def patch_node(_node_uuid, _patch) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:nodes].first response diff --git a/lib/fog/openstack/baremetal/requests/patch_port.rb b/lib/fog/openstack/baremetal/requests/patch_port.rb index ffe9da2ba..a26314c59 100644 --- a/lib/fog/openstack/baremetal/requests/patch_port.rb +++ b/lib/fog/openstack/baremetal/requests/patch_port.rb @@ -14,10 +14,10 @@ class Real # value = Value to set def patch_port(port_uuid, patch) request( - :body => Fog::JSON.encode(patch), - :expects => 200, - :method => 'PATCH', - :path => "ports/#{port_uuid}" + body: Fog::JSON.encode(patch), + expects: 200, + method: 'PATCH', + path: "ports/#{port_uuid}" ) end end @@ -28,9 +28,9 @@ def patch_port(_port_uuid, _patch) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:ports].first response diff --git a/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb b/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb index 8939b200b..27117b3f0 100644 --- a/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_maintenance.rb @@ -4,10 +4,10 @@ class Baremetal class Real def set_node_maintenance(node_uuid, parameters = nil) request( - :expects => [200, 202, 204], - :method => 'PUT', - :path => "nodes/#{node_uuid}/maintenance", - :query => parameters + expects: [200, 202, 204], + method: 'PUT', + path: "nodes/#{node_uuid}/maintenance", + query: parameters ) end end @@ -18,9 +18,9 @@ def set_node_maintenance(_node_uuid, _parameters = nil) response.status = 202 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response end diff --git a/lib/fog/openstack/baremetal/requests/set_node_power_state.rb b/lib/fog/openstack/baremetal/requests/set_node_power_state.rb index f036c074f..eaef4707b 100644 --- a/lib/fog/openstack/baremetal/requests/set_node_power_state.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_power_state.rb @@ -8,10 +8,10 @@ def set_node_power_state(node_id, power_state) } request( - :body => Fog::JSON.encode(data), - :expects => 202, - :method => 'PUT', - :path => "nodes/#{node_id}/states/power" + body: Fog::JSON.encode(data), + expects: 202, + method: 'PUT', + path: "nodes/#{node_id}/states/power" ) end end @@ -22,9 +22,9 @@ def set_node_power_state(_node_id, _power_state) response.status = 202 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:nodes].first response diff --git a/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb b/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb index f2ddc57dc..7a950d58c 100644 --- a/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb +++ b/lib/fog/openstack/baremetal/requests/set_node_provision_state.rb @@ -8,12 +8,12 @@ def set_node_provision_state(node_id, provision_state) } request( - :body => Fog::JSON.encode(data), - :expects => 202, - :method => 'PUT', - :path => "nodes/#{node_id}/states/provision", - :headers => { - :'X-OpenStack-Ironic-API-Version' => 'latest' + body: Fog::JSON.encode(data), + expects: 202, + method: 'PUT', + path: "nodes/#{node_id}/states/provision", + headers: { + 'X-OpenStack-Ironic-API-Version': 'latest' } ) end @@ -25,9 +25,9 @@ def set_node_provision_state(_node_id, _provision_state) response.status = 202 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = data[:nodes].first response diff --git a/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb b/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb index 7cdd20f76..0cc09aab6 100644 --- a/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb +++ b/lib/fog/openstack/baremetal/requests/unset_node_maintenance.rb @@ -4,10 +4,10 @@ class Baremetal class Real def unset_node_maintenance(node_uuid, parameters = nil) request( - :expects => [200, 202, 204], - :method => 'DELETE', - :path => "nodes/#{node_uuid}/maintenance", - :query => parameters + expects: [200, 202, 204], + method: 'DELETE', + path: "nodes/#{node_uuid}/maintenance", + query: parameters ) end end @@ -18,9 +18,9 @@ def unset_node_maintenance(_node_uuid, _parameters = nil) response.status = 202 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute.rb b/lib/fog/openstack/compute.rb index 38bc5a2ed..b51c483b6 100644 --- a/lib/fog/openstack/compute.rb +++ b/lib/fog/openstack/compute.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class Compute < Fog::Service - SUPPORTED_VERSIONS = /v2\.0|v2\.1/ + SUPPORTED_VERSIONS = /v2\.0|v2\.1/.freeze SUPPORTED_MICROVERSION = '2.15'.freeze requires :openstack_auth_url @@ -257,76 +257,76 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :last_modified => { - :images => {}, - :servers => {}, - :key_pairs => {}, - :security_groups => {}, - :addresses => {} + last_modified: { + images: {}, + servers: {}, + key_pairs: {}, + security_groups: {}, + addresses: {} }, - :aggregates => [{ + aggregates: [{ "availability_zone" => "nova", - "created_at" => "2012-11-16T06:22:23.032493", - "deleted" => false, - "deleted_at" => nil, - "id" => 1, - "name" => "name", - "updated_at" => nil + "created_at" => "2012-11-16T06:22:23.032493", + "deleted" => false, + "deleted_at" => nil, + "id" => 1, + "name" => "name", + "updated_at" => nil }], - :images => { + images: { "0e09fbd6-43c5-448a-83e9-0d3d05f9747e" => { - "id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e", - "name" => "cirros-0.3.0-x86_64-blank", + "id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e", + "name" => "cirros-0.3.0-x86_64-blank", 'progress' => 100, - 'status' => "ACTIVE", - 'updated' => "", - 'minRam' => 0, - 'minDisk' => 0, + 'status' => "ACTIVE", + 'updated' => "", + 'minRam' => 0, + 'minDisk' => 0, 'metadata' => {}, - 'links' => [{"href" => "http://nova1:8774/v1.1/admin/images/1", "rel" => "self"}, - {"href" => "http://nova1:8774/admin/images/2", "rel" => "bookmark"}] + 'links' => [{ "href" => "http://nova1:8774/v1.1/admin/images/1", "rel" => "self" }, + { "href" => "http://nova1:8774/admin/images/2", "rel" => "bookmark" }] } }, - :servers => {}, - :key_pairs => {}, - :security_groups => { + servers: {}, + key_pairs: {}, + security_groups: { '0' => { - "id" => 0, - "tenant_id" => Fog::Mock.random_hex(8), - "name" => "default", + "id" => 0, + "tenant_id" => Fog::Mock.random_hex(8), + "name" => "default", "description" => "default", - "rules" => [ - {"id" => 0, - "parent_group_id" => 0, - "from_port" => 68, - "to_port" => 68, - "ip_protocol" => "udp", - "ip_range" => {"cidr" => "0.0.0.0/0"}, - "group" => {}}, - ], - }, + "rules" => [ + { "id" => 0, + "parent_group_id" => 0, + "from_port" => 68, + "to_port" => 68, + "ip_protocol" => "udp", + "ip_range" => { "cidr" => "0.0.0.0/0" }, + "group" => {} } + ] + } }, - :server_groups => {}, - :server_security_group_map => {}, - :addresses => {}, - :quota => { - 'security_group_rules' => 20, - 'security_groups' => 10, + server_groups: {}, + server_security_group_map: {}, + addresses: {}, + quota: { + 'security_group_rules' => 20, + 'security_groups' => 10, 'injected_file_content_bytes' => 10240, - 'injected_file_path_bytes' => 256, - 'injected_files' => 5, - 'metadata_items' => 128, - 'floating_ips' => 10, - 'instances' => 10, - 'key_pairs' => 10, - 'gigabytes' => 5000, - 'volumes' => 10, - 'cores' => 20, - 'ram' => 51200 + 'injected_file_path_bytes' => 256, + 'injected_files' => 5, + 'metadata_items' => 128, + 'floating_ips' => 10, + 'instances' => 10, + 'key_pairs' => 10, + 'gigabytes' => 5000, + 'volumes' => 10, + 'cores' => 20, + 'ram' => 51200 }, - :volumes => {}, - :snapshots => {}, - :os_interfaces => [ + volumes: {}, + snapshots: {}, + os_interfaces: [ { "fixed_ips" => [ { diff --git a/lib/fog/openstack/compute/models/address.rb b/lib/fog/openstack/compute/models/address.rb index ac62ade97..33c247303 100644 --- a/lib/fog/openstack/compute/models/address.rb +++ b/lib/fog/openstack/compute/models/address.rb @@ -33,8 +33,9 @@ def server=(new_server) def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + data = service.allocate_address(pool).body['floating_ip'] - new_attributes = data.reject { |key, _value| !['id', 'instance_id', 'ip', 'fixed_ip'].include?(key) } + new_attributes = data.select { |key, _value| ['id', 'instance_id', 'ip', 'fixed_ip'].include?(key) } merge_attributes(new_attributes) if @server self.server = @server diff --git a/lib/fog/openstack/compute/models/flavor.rb b/lib/fog/openstack/compute/models/flavor.rb index aa56fc297..4f827bcac 100644 --- a/lib/fog/openstack/compute/models/flavor.rb +++ b/lib/fog/openstack/compute/models/flavor.rb @@ -14,9 +14,9 @@ class Flavor < Fog::OpenStack::Model attribute :swap attribute :rxtx_factor 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' + attribute :ephemeral, aliases: 'OS-FLV-EXT-DATA:ephemeral' + attribute :is_public, aliases: 'os-flavor-access:is_public' + attribute :disabled, aliases: 'OS-FLV-DISABLED:disabled' def save requires :name, :ram, :vcpus, :disk diff --git a/lib/fog/openstack/compute/models/hosts.rb b/lib/fog/openstack/compute/models/hosts.rb index 9baf1edc3..39f178d14 100644 --- a/lib/fog/openstack/compute/models/hosts.rb +++ b/lib/fog/openstack/compute/models/hosts.rb @@ -15,7 +15,7 @@ def all(options = {}) def get(host_name) if host = service.get_host_details(host_name).body['host'] new('host_name' => host_name, - 'details' => host) + 'details' => host) end rescue Fog::OpenStack::Compute::NotFound nil diff --git a/lib/fog/openstack/compute/models/image.rb b/lib/fog/openstack/compute/models/image.rb index 6498504b1..8f288bd48 100644 --- a/lib/fog/openstack/compute/models/image.rb +++ b/lib/fog/openstack/compute/models/image.rb @@ -8,27 +8,27 @@ class Image < Fog::OpenStack::Model identity :id attribute :name - attribute :created_at, :aliases => 'created' - attribute :updated_at, :aliases => 'updated' + attribute :created_at, aliases: 'created' + attribute :updated_at, aliases: 'updated' attribute :progress attribute :status attribute :minDisk attribute :minRam - attribute :server, :aliases => 'server' - attribute :size, :aliases => 'OS-EXT-IMG-SIZE:size' + attribute :server, aliases: 'server' + attribute :size, aliases: 'OS-EXT-IMG-SIZE:size' attribute :metadata attribute :links def metadata @metadata ||= begin - Fog::OpenStack::Compute::Metadata.new(:service => service, - :parent => self) + Fog::OpenStack::Compute::Metadata.new(service: service, + parent: self) end end def metadata=(new_metadata = {}) metas = [] - new_metadata.to_hash.each_pair { |k, v| metas << {"key" => k, "value" => v} } + new_metadata.to_hash.each_pair { |k, v| metas << { "key" => k, "value" => v } } metadata.load(metas) end diff --git a/lib/fog/openstack/compute/models/key_pair.rb b/lib/fog/openstack/compute/models/key_pair.rb index 7a16a7a75..bdeea2b24 100644 --- a/lib/fog/openstack/compute/models/key_pair.rb +++ b/lib/fog/openstack/compute/models/key_pair.rb @@ -29,7 +29,7 @@ def save else service.create_key_pair(name, nil, user_id).body['keypair'] end - new_attributes = data.reject { |key, _value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key) } + new_attributes = data.select { |key, _value| ['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key) } merge_attributes(new_attributes) true end @@ -39,7 +39,7 @@ def write(path = "#{ENV['HOME']}/.ssh/fog_#{Fog.credential}_#{name}.pem") split_private_key = private_key.split(/\n/) File.open(path, "w") do |f| split_private_key.each { |line| f.puts line } - f.chmod 0600 + f.chmod 0o600 end "Key file built: #{path}" else diff --git a/lib/fog/openstack/compute/models/metadata.rb b/lib/fog/openstack/compute/models/metadata.rb index 50cfc70ec..29f410147 100644 --- a/lib/fog/openstack/compute/models/metadata.rb +++ b/lib/fog/openstack/compute/models/metadata.rb @@ -16,7 +16,7 @@ def all requires :parent metadata = service.list_metadata(collection_name, @parent.id).body['metadata'] metas = [] - metadata.each_pair { |k, v| metas << {"key" => k, "value" => v} } unless metadata.nil? + metadata.each_pair { |k, v| metas << { "key" => k, "value" => v } } unless metadata.nil? # TODO: convert to load_response? load(metas) end @@ -25,7 +25,7 @@ def get(key) requires :parent data = service.get_metadata(collection_name, @parent.id, key).body["meta"] metas = [] - data.each_pair { |k, v| metas << {"key" => k, "value" => v} } + data.each_pair { |k, v| metas << { "key" => k, "value" => v } } new(metas[0]) rescue Fog::OpenStack::Compute::NotFound nil @@ -43,7 +43,7 @@ def set(data = nil) def new(attributes = {}) requires :parent - super({:parent => @parent}.merge!(attributes)) + super({ parent: @parent }.merge!(attributes)) end def to_hash(data = nil) diff --git a/lib/fog/openstack/compute/models/networks.rb b/lib/fog/openstack/compute/models/networks.rb index 98d1224a0..77f6ad3e5 100644 --- a/lib/fog/openstack/compute/models/networks.rb +++ b/lib/fog/openstack/compute/models/networks.rb @@ -15,9 +15,9 @@ def all networks = [] server.addresses.each_with_index do |address, index| networks << { - :id => index + 1, - :name => address[0], - :addresses => address[1].map { |a| a['addr'] } + id: index + 1, + name: address[0], + addresses: address[1].map { |a| a['addr'] } } end diff --git a/lib/fog/openstack/compute/models/os_interface.rb b/lib/fog/openstack/compute/models/os_interface.rb index dc47e446a..465d5393a 100644 --- a/lib/fog/openstack/compute/models/os_interface.rb +++ b/lib/fog/openstack/compute/models/os_interface.rb @@ -5,7 +5,7 @@ module OpenStack class Compute class OsInterface < Fog::OpenStack::Model identity :port_id - attribute :fixed_ips, :type => :array + attribute :fixed_ips, type: :array attribute :mac_addr attribute :net_id attribute :port_state diff --git a/lib/fog/openstack/compute/models/os_interfaces.rb b/lib/fog/openstack/compute/models/os_interfaces.rb index 32c69dc3f..5a06483ac 100644 --- a/lib/fog/openstack/compute/models/os_interfaces.rb +++ b/lib/fog/openstack/compute/models/os_interfaces.rb @@ -19,7 +19,7 @@ def all def get(port_id) requires :server - data = service.get_os_interface(server.id,port_id) + data = service.get_os_interface(server.id, port_id) load_response(data, 'interfaceAttachment') end end diff --git a/lib/fog/openstack/compute/models/security_group.rb b/lib/fog/openstack/compute/models/security_group.rb index 8a7305815..8601f6cc5 100644 --- a/lib/fog/openstack/compute/models/security_group.rb +++ b/lib/fog/openstack/compute/models/security_group.rb @@ -8,11 +8,11 @@ class SecurityGroup < Fog::OpenStack::Model attribute :name attribute :description - attribute :security_group_rules, :aliases => "rules" + attribute :security_group_rules, aliases: "rules" attribute :tenant_id def security_group_rules - Fog::OpenStack::Compute::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::OpenStack::Compute::SecurityGroupRules.new(service: service).load(attributes[:security_group_rules]) end def rules diff --git a/lib/fog/openstack/compute/models/server.rb b/lib/fog/openstack/compute/models/server.rb index 66df13fa3..eb04ec164 100644 --- a/lib/fog/openstack/compute/models/server.rb +++ b/lib/fog/openstack/compute/models/server.rb @@ -6,11 +6,11 @@ module OpenStack class Compute class Server < Fog::Compute::Server identity :id - attribute :instance_name, :aliases => 'OS-EXT-SRV-ATTR:instance_name' + attribute :instance_name, aliases: 'OS-EXT-SRV-ATTR:instance_name' attribute :addresses attribute :flavor - attribute :host_id, :aliases => 'hostId' + attribute :host_id, aliases: 'hostId' attribute :image attribute :metadata attribute :links @@ -30,24 +30,24 @@ class Server < Fog::Compute::Server attribute :progress attribute :accessIPv4 attribute :accessIPv6 - attribute :availability_zone, :aliases => 'OS-EXT-AZ:availability_zone' + attribute :availability_zone, aliases: 'OS-EXT-AZ:availability_zone' attribute :user_data_encoded - attribute :state, :aliases => 'status' - attribute :created, :type => :time - attribute :updated, :type => :time + attribute :state, aliases: 'status' + attribute :created, type: :time + attribute :updated, type: :time attribute :tenant_id attribute :user_id attribute :key_name attribute :fault attribute :config_drive - attribute :os_dcf_disk_config, :aliases => 'OS-DCF:diskConfig' - attribute :os_ext_srv_attr_host, :aliases => 'OS-EXT-SRV-ATTR:host' - attribute :os_ext_srv_attr_hypervisor_hostname, :aliases => 'OS-EXT-SRV-ATTR:hypervisor_hostname' - attribute :os_ext_srv_attr_instance_name, :aliases => 'OS-EXT-SRV-ATTR:instance_name' - attribute :os_ext_sts_power_state, :aliases => 'OS-EXT-STS:power_state' - attribute :os_ext_sts_task_state, :aliases => 'OS-EXT-STS:task_state' - attribute :os_ext_sts_vm_state, :aliases => 'OS-EXT-STS:vm_state' + attribute :os_dcf_disk_config, aliases: 'OS-DCF:diskConfig' + attribute :os_ext_srv_attr_host, aliases: 'OS-EXT-SRV-ATTR:host' + attribute :os_ext_srv_attr_hypervisor_hostname, aliases: 'OS-EXT-SRV-ATTR:hypervisor_hostname' + attribute :os_ext_srv_attr_instance_name, aliases: 'OS-EXT-SRV-ATTR:instance_name' + attribute :os_ext_sts_power_state, aliases: 'OS-EXT-STS:power_state' + attribute :os_ext_sts_task_state, aliases: 'OS-EXT-STS:task_state' + attribute :os_ext_sts_vm_state, aliases: 'OS-EXT-STS:vm_state' attr_reader :password attr_writer :image_ref, :flavor_ref, :nics, :os_scheduler_hints @@ -74,15 +74,16 @@ def initialize(attributes = {}) def metadata @metadata ||= begin - Fog::OpenStack::Compute::Metadata.new(:service => service, - :parent => self) + Fog::OpenStack::Compute::Metadata.new(service: service, + parent: self) end end def metadata=(new_metadata = {}) return unless new_metadata + metas = [] - new_metadata.each { |k, v| metas << {"key" => k, "value" => v} } + new_metadata.each { |k, v| metas << { "key" => k, "value" => v } } @metadata = metadata.load(metas) end @@ -98,7 +99,7 @@ def destroy def images requires :id - service.images(:server => self) + service.images(server: self) end def all_addresses @@ -110,7 +111,7 @@ def all_addresses def os_interfaces requires :id - service.os_interfaces(:server => self) + service.os_interfaces(server: self) end def reload @@ -230,10 +231,10 @@ def security_groups if id requires :id - groups = service.list_security_groups(:server_id => id).body['security_groups'] + groups = service.list_security_groups(server_id: id).body['security_groups'] groups.map do |group| - Fog::OpenStack::Compute::SecurityGroup.new group.merge(:service => service) + Fog::OpenStack::Compute::SecurityGroup.new group.merge(service: service) end else service.security_groups.all @@ -336,7 +337,7 @@ def reset_vm_state(vm_state) attr_writer :max_count def networks - service.networks(:server => self) + service.networks(server: self) end def volumes @@ -365,23 +366,24 @@ def detach_volume(volume_id) def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + requires :flavor_ref, :name requires_one :image_ref, :block_device_mapping, :block_device_mapping_v2 options = { - 'personality' => personality, - 'accessIPv4' => accessIPv4, - 'accessIPv6' => accessIPv6, - 'availability_zone' => availability_zone, - 'user_data' => user_data_encoded, - 'key_name' => key_name, - 'config_drive' => config_drive, - 'security_groups' => @security_groups, - 'min_count' => @min_count, - 'max_count' => @max_count, - 'nics' => @nics, - 'os:scheduler_hints' => @os_scheduler_hints, - 'block_device_mapping' => @block_device_mapping, - 'block_device_mapping_v2' => @block_device_mapping_v2, + 'personality' => personality, + 'accessIPv4' => accessIPv4, + 'accessIPv6' => accessIPv6, + 'availability_zone' => availability_zone, + 'user_data' => user_data_encoded, + 'key_name' => key_name, + 'config_drive' => config_drive, + 'security_groups' => @security_groups, + 'min_count' => @min_count, + 'max_count' => @max_count, + 'nics' => @nics, + 'os:scheduler_hints' => @os_scheduler_hints, + 'block_device_mapping' => @block_device_mapping, + 'block_device_mapping_v2' => @block_device_mapping_v2 } options['metadata'] = metadata.to_hash unless @metadata.nil? options = options.reject { |_key, value| value.nil? } diff --git a/lib/fog/openstack/compute/models/server_group.rb b/lib/fog/openstack/compute/models/server_group.rb index 73bca63b0..ce998161b 100644 --- a/lib/fog/openstack/compute/models/server_group.rb +++ b/lib/fog/openstack/compute/models/server_group.rb @@ -6,7 +6,7 @@ class Compute class ServerGroup < Fog::OpenStack::Model identity :id attribute :name - attribute :policies, :type => :array + attribute :policies, type: :array attribute :members VALID_SERVER_GROUP_POLICIES = ['affinity', 'anti-affinity', 'soft-affinity', 'soft-anti-affinity'].freeze @@ -14,6 +14,7 @@ class ServerGroup < Fog::OpenStack::Model def self.validate_server_group_policy(policy) raise ArgumentError, "#{policy} is an invalid policy... must use one of #{VALID_SERVER_GROUP_POLICIES.join(', ')}" \ unless VALID_SERVER_GROUP_POLICIES.include? policy + true end end diff --git a/lib/fog/openstack/compute/models/servers.rb b/lib/fog/openstack/compute/models/servers.rb index 8f1fed4c3..b9864c7c0 100644 --- a/lib/fog/openstack/compute/models/servers.rb +++ b/lib/fog/openstack/compute/models/servers.rb @@ -42,7 +42,7 @@ def summary(filters_arg = filters) def bootstrap(new_attributes = {}) server = create(new_attributes) server.wait_for { ready? } - server.setup(:password => server.password) + server.setup(password: server.password) server end diff --git a/lib/fog/openstack/compute/models/snapshot.rb b/lib/fog/openstack/compute/models/snapshot.rb index a0bf1db9d..8eb46cad4 100644 --- a/lib/fog/openstack/compute/models/snapshot.rb +++ b/lib/fog/openstack/compute/models/snapshot.rb @@ -7,10 +7,10 @@ class Compute class Snapshot < Fog::OpenStack::Model identity :id - attribute :name, :aliases => 'displayName' - attribute :description, :aliases => 'displayDescription' - attribute :volume_id, :aliases => 'volumeId' - attribute :created_at, :aliases => 'createdAt' + attribute :name, aliases: 'displayName' + attribute :description, aliases: 'displayDescription' + attribute :volume_id, aliases: 'volumeId' + attribute :created_at, aliases: 'createdAt' attribute :status attribute :size diff --git a/lib/fog/openstack/compute/models/volume.rb b/lib/fog/openstack/compute/models/volume.rb index 0ac7293d9..7808e0bb8 100644 --- a/lib/fog/openstack/compute/models/volume.rb +++ b/lib/fog/openstack/compute/models/volume.rb @@ -7,14 +7,14 @@ class Compute class Volume < Fog::OpenStack::Model identity :id - attribute :name, :aliases => 'displayName' - attribute :description, :aliases => 'displayDescription' + attribute :name, aliases: 'displayName' + attribute :description, aliases: 'displayDescription' attribute :status attribute :size - attribute :type, :aliases => 'volumeType' - attribute :snapshot_id, :aliases => 'snapshotId' - attribute :availability_zone, :aliases => 'availabilityZone' - attribute :created_at, :aliases => 'createdAt' + attribute :type, aliases: 'volumeType' + attribute :snapshot_id, aliases: 'snapshotId' + attribute :availability_zone, aliases: 'availabilityZone' + attribute :created_at, aliases: 'createdAt' attribute :attachments def save @@ -33,7 +33,7 @@ def destroy def attach(server_id, name) requires :id data = service.attach_volume(id, server_id, name) - merge_attributes(:attachments => attachments << data.body['volumeAttachment']) + merge_attributes(attachments: attachments << data.body['volumeAttachment']) true end diff --git a/lib/fog/openstack/compute/requests/add_aggregate_host.rb b/lib/fog/openstack/compute/requests/add_aggregate_host.rb index 6775bd6a9..a9e0b632a 100644 --- a/lib/fog/openstack/compute/requests/add_aggregate_host.rb +++ b/lib/fog/openstack/compute/requests/add_aggregate_host.rb @@ -3,12 +3,12 @@ module OpenStack class Compute class Real def add_aggregate_host(uuid, host_uuid) - data = {'add_host' => {'host' => host_uuid}} + data = { 'add_host' => { 'host' => host_uuid } } request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'POST', - :path => "os-aggregates/#{uuid}/action" + body: Fog::JSON.encode(data), + expects: [200], + method: 'POST', + path: "os-aggregates/#{uuid}/action" ) end end @@ -18,9 +18,9 @@ def add_aggregate_host(_uuid, _host_uuid) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/add_flavor_access.rb b/lib/fog/openstack/compute/requests/add_flavor_access.rb index bd9c14e8c..5b03d638d 100644 --- a/lib/fog/openstack/compute/requests/add_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/add_flavor_access.rb @@ -4,12 +4,12 @@ class Compute class Real def add_flavor_access(flavor_ref, tenant_id) request( - :body => Fog::JSON.encode("addTenantAccess" => { - "tenant" => tenant_id - }), - :expects => [200, 203], - :method => 'POST', - :path => "flavors/#{flavor_ref}/action" + body: Fog::JSON.encode("addTenantAccess" => { + "tenant" => tenant_id + }), + expects: [200, 203], + method: 'POST', + path: "flavors/#{flavor_ref}/action" ) end end @@ -19,7 +19,7 @@ def add_flavor_access(flavor_ref, tenant_id) response = Excon::Response.new response.status = 200 response.body = { - "flavor_access" => [{"tenant_id" => tenant_id.to_s, "flavor_id" => flavor_ref.to_s}] + "flavor_access" => [{ "tenant_id" => tenant_id.to_s, "flavor_id" => flavor_ref.to_s }] } response end diff --git a/lib/fog/openstack/compute/requests/add_security_group.rb b/lib/fog/openstack/compute/requests/add_security_group.rb index 368e57416..6936311e4 100644 --- a/lib/fog/openstack/compute/requests/add_security_group.rb +++ b/lib/fog/openstack/compute/requests/add_security_group.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def add_security_group(server_id, group_name) - body = {'addSecurityGroup' => {"name" => group_name}} + body = { 'addSecurityGroup' => { "name" => group_name } } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/allocate_address.rb b/lib/fog/openstack/compute/requests/allocate_address.rb index 20619b639..048168053 100644 --- a/lib/fog/openstack/compute/requests/allocate_address.rb +++ b/lib/fog/openstack/compute/requests/allocate_address.rb @@ -4,10 +4,10 @@ class Compute class Real def allocate_address(pool = nil) request( - :body => Fog::JSON.encode('pool' => pool), - :expects => [200, 202], - :method => 'POST', - :path => 'os-floating-ips' + body: Fog::JSON.encode('pool' => pool), + expects: [200, 202], + method: 'POST', + path: 'os-floating-ips' ) end end @@ -18,17 +18,17 @@ def allocate_address(_pool = nil) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-d4a21158-a86c-44a6-983a-e25645907f26", - "Content-Type" => "application/json", - "Content-Length" => "105", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "105", + "Date" => Date.new } response.body = { "floating_ip" => { "instance_id" => nil, - "ip" => "192.168.27.132", - "fixed_ip" => nil, - "id" => 4, - "pool" => "nova" + "ip" => "192.168.27.132", + "fixed_ip" => nil, + "id" => 4, + "pool" => "nova" } } response diff --git a/lib/fog/openstack/compute/requests/associate_address.rb b/lib/fog/openstack/compute/requests/associate_address.rb index 00c69a048..ddebbc2bf 100644 --- a/lib/fog/openstack/compute/requests/associate_address.rb +++ b/lib/fog/openstack/compute/requests/associate_address.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def associate_address(server_id, ip_address) - body = {"addFloatingIp" => {"address" => ip_address}} + body = { "addFloatingIp" => { "address" => ip_address } } server_action(server_id, body) end end @@ -12,15 +12,15 @@ class Mock def associate_address(server_id, ip_address) server = data[:servers][server_id] server["addresses"]['mocknet'] ||= [] - ip_hash = {"OS-EXT-IPS-MAC:mac_addr" => "fa:16:3e:85:47:40", "version" => 4, "addr" => ip_address, "OS-EXT-IPS:type" => "floating"} + ip_hash = { "OS-EXT-IPS-MAC:mac_addr" => "fa:16:3e:85:47:40", "version" => 4, "addr" => ip_address, "OS-EXT-IPS:type" => "floating" } server["addresses"]['mocknet'] << ip_hash response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html, charset=UTF-8", + "Content-Type" => "text/html, charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/attach_volume.rb b/lib/fog/openstack/compute/requests/attach_volume.rb index 186e06a32..49598c2f1 100644 --- a/lib/fog/openstack/compute/requests/attach_volume.rb +++ b/lib/fog/openstack/compute/requests/attach_volume.rb @@ -6,14 +6,14 @@ def attach_volume(volume_id, server_id, device) data = { 'volumeAttachment' => { 'volumeId' => volume_id.to_s, - 'device' => device + 'device' => device } } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "servers/%s/os-volume_attachments" % [server_id] + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: format("servers/%s/os-volume_attachments", server_id) ) end end @@ -23,14 +23,14 @@ def attach_volume(volume_id, server_id, device) response = Excon::Response.new response.status = 200 data = { - 'id' => volume_id, + 'id' => volume_id, 'volumeId' => volume_id, 'serverId' => server_id, - 'device' => device + 'device' => device } self.data[:volumes][volume_id]['attachments'] << data self.data[:volumes][volume_id]['status'] = 'in-use' - response.body = {'volumeAttachment' => data} + response.body = { 'volumeAttachment' => data } response end end diff --git a/lib/fog/openstack/compute/requests/boot_from_snapshot.rb b/lib/fog/openstack/compute/requests/boot_from_snapshot.rb index 64fbed70b..f8ebfcef6 100644 --- a/lib/fog/openstack/compute/requests/boot_from_snapshot.rb +++ b/lib/fog/openstack/compute/requests/boot_from_snapshot.rb @@ -6,8 +6,8 @@ def boot_from_snapshot(name, image_ref, flavor_ref, options = {}) data = { 'server' => { 'flavorRef' => flavor_ref, - 'imageRef' => image_ref, - 'name' => name + 'imageRef' => image_ref, + 'name' => name } } @@ -23,16 +23,16 @@ def boot_from_snapshot(name, image_ref, flavor_ref, options = {}) options['personality'].each do |file| data['server']['personality'] << { 'contents' => Base64.encode64(file['contents']), - 'path' => file['path'] + 'path' => file['path'] } end end request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => '/os-volumes_boot' + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: '/os-volumes_boot' ) end end diff --git a/lib/fog/openstack/compute/requests/change_server_password.rb b/lib/fog/openstack/compute/requests/change_server_password.rb index 533e0a3d3..c4cd79825 100644 --- a/lib/fog/openstack/compute/requests/change_server_password.rb +++ b/lib/fog/openstack/compute/requests/change_server_password.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def change_server_password(server_id, admin_password) - body = {'changePassword' => {'adminPass' => admin_password}} + body = { 'changePassword' => { 'adminPass' => admin_password } } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/confirm_resize_server.rb b/lib/fog/openstack/compute/requests/confirm_resize_server.rb index 0a202efbd..cdd412cdf 100644 --- a/lib/fog/openstack/compute/requests/confirm_resize_server.rb +++ b/lib/fog/openstack/compute/requests/confirm_resize_server.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def confirm_resize_server(server_id) - body = {'confirmResize' => nil} + body = { 'confirmResize' => nil } server_action(server_id, body, 204) end end diff --git a/lib/fog/openstack/compute/requests/create_aggregate.rb b/lib/fog/openstack/compute/requests/create_aggregate.rb index 1a023c603..4765e5c70 100644 --- a/lib/fog/openstack/compute/requests/create_aggregate.rb +++ b/lib/fog/openstack/compute/requests/create_aggregate.rb @@ -16,10 +16,10 @@ def create_aggregate(name, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'POST', - :path => "os-aggregates" + body: Fog::JSON.encode(data), + expects: [200], + method: 'POST', + path: "os-aggregates" ) end end @@ -29,11 +29,11 @@ def create_aggregate(_name, _options = {}) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } - response.body = {'aggregate' => data[:aggregates].first} + response.body = { 'aggregate' => data[:aggregates].first } response end end diff --git a/lib/fog/openstack/compute/requests/create_flavor.rb b/lib/fog/openstack/compute/requests/create_flavor.rb index 76ac3ce01..fd6a7e57f 100644 --- a/lib/fog/openstack/compute/requests/create_flavor.rb +++ b/lib/fog/openstack/compute/requests/create_flavor.rb @@ -12,23 +12,23 @@ class Real def create_flavor(attributes) data = { 'flavor' => { - 'name' => attributes[:name], - 'ram' => attributes[:ram], - 'vcpus' => attributes[:vcpus], - 'disk' => attributes[:disk], - 'id' => attributes[:flavor_id], - 'swap' => attributes[:swap], - 'OS-FLV-EXT-DATA:ephemeral' => attributes[:ephemeral], + 'name' => attributes[:name], + 'ram' => attributes[:ram], + 'vcpus' => attributes[:vcpus], + 'disk' => attributes[:disk], + 'id' => attributes[:flavor_id], + 'swap' => attributes[:swap], + 'OS-FLV-EXT-DATA:ephemeral' => attributes[:ephemeral], 'os-flavor-access:is_public' => attributes[:is_public], - 'rxtx_factor' => attributes[:rxtx_factor] + 'rxtx_factor' => attributes[:rxtx_factor] } } request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'POST', - :path => 'flavors' + body: Fog::JSON.encode(data), + expects: 200, + method: 'POST', + path: 'flavors' ) end end @@ -39,32 +39,32 @@ def create_flavor(attributes) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = { "flavor" => { - "vcpus" => attributes[:vcpus], - "disk" => attributes[:disk], - "name" => attributes[:name], - "links" => [ + "vcpus" => attributes[:vcpus], + "disk" => attributes[:disk], + "name" => attributes[:name], + "links" => [ { "href" => "http://192.168.27.100:8774/v1.1/6733e93c5f5c4eb1bcabc6902ba208d6/flavors/11", - "rel" => "self" + "rel" => "self" }, { "href" => "http://192.168.27.100:8774/6733e93c5f5c4eb1bcabc6902ba208d6/flavors/11", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "rxtx_factor" => attributes[:rxtx_factor] || 1.0, - "OS-FLV-EXT-DATA:ephemeral" => attributes[:ephemeral] || 0, + "rxtx_factor" => attributes[:rxtx_factor] || 1.0, + "OS-FLV-EXT-DATA:ephemeral" => attributes[:ephemeral] || 0, "os-flavor-access:is_public" => attributes[:is_public] || false, - "OS-FLV-DISABLED:disabled" => attributes[:disabled] || false, - "ram" => attributes[:ram], - "id" => "11", - "swap" => attributes[:swap] || "" + "OS-FLV-DISABLED:disabled" => attributes[:disabled] || false, + "ram" => attributes[:ram], + "id" => "11", + "swap" => attributes[:swap] || "" } } response diff --git a/lib/fog/openstack/compute/requests/create_flavor_metadata.rb b/lib/fog/openstack/compute/requests/create_flavor_metadata.rb index 5b434cfc5..2947ca2a5 100644 --- a/lib/fog/openstack/compute/requests/create_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/create_flavor_metadata.rb @@ -8,10 +8,10 @@ def create_flavor_metadata(flavor_ref, metadata) } request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'POST', - :path => "flavors/#{flavor_ref}/os-extra_specs" + body: Fog::JSON.encode(data), + expects: 200, + method: 'POST', + path: "flavors/#{flavor_ref}/os-extra_specs" ) end end @@ -22,13 +22,13 @@ def create_flavor_metadata(_flavor_ref, _metadata) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } - response.body = {"extra_specs" => { + response.body = { "extra_specs" => { "cpu_arch" => "x86_64" - }} + } } response end end diff --git a/lib/fog/openstack/compute/requests/create_image.rb b/lib/fog/openstack/compute/requests/create_image.rb index 6a8fb545a..340b1bd8e 100644 --- a/lib/fog/openstack/compute/requests/create_image.rb +++ b/lib/fog/openstack/compute/requests/create_image.rb @@ -3,10 +3,10 @@ module OpenStack class Compute class Real def create_image(server_id, name, metadata = {}) - body = {'createImage' => { - 'name' => name, + body = { 'createImage' => { + 'name' => name, 'metadata' => metadata - }} + } } data = server_action(server_id, body) image_id = data.headers["Location"].scan(%r{.*/(.*)}).flatten[0] get_image_details(image_id) @@ -21,21 +21,21 @@ def create_image(server_id, name, metadata = {}) img_id = Fog::Mock.random_numbers(6).to_s data = { - 'id' => img_id, - 'server' => {"id" => "3", "links" => [{"href" => "http://nova1:8774/admin/servers/#{server_id}", "rel" => "bookmark"}]}, - 'links' => [{"href" => "http://nova1:8774/v1.1/admin/images/#{img_id}", "rel" => "self"}, {"href" => "http://nova1:8774/admin/images/#{img_id}", "rel" => "bookmark"}], + 'id' => img_id, + 'server' => { "id" => "3", "links" => [{ "href" => "http://nova1:8774/admin/servers/#{server_id}", "rel" => "bookmark" }] }, + 'links' => [{ "href" => "http://nova1:8774/v1.1/admin/images/#{img_id}", "rel" => "self" }, { "href" => "http://nova1:8774/admin/images/#{img_id}", "rel" => "bookmark" }], 'metadata' => metadata || {}, - 'name' => name || "server_#{rand(999)}", + 'name' => name || "server_#{rand(999)}", 'progress' => 0, - 'status' => 'SAVING', - 'minDisk' => 0, - 'minRam' => 0, - 'updated' => "", - 'created' => "" + 'status' => 'SAVING', + 'minDisk' => 0, + 'minRam' => 0, + 'updated' => "", + 'created' => "" } self.data[:last_modified][:images][data['id']] = Time.now self.data[:images][data['id']] = data - response.body = {'image' => data} + response.body = { 'image' => data } response end end diff --git a/lib/fog/openstack/compute/requests/create_key_pair.rb b/lib/fog/openstack/compute/requests/create_key_pair.rb index e90e0d854..2a2967118 100644 --- a/lib/fog/openstack/compute/requests/create_key_pair.rb +++ b/lib/fog/openstack/compute/requests/create_key_pair.rb @@ -13,10 +13,10 @@ def create_key_pair(key_name, public_key = nil, user_id = nil) data['keypair']['user_id'] = user_id unless user_id.nil? request( - :body => Fog::JSON.encode(data), - :expects => [200, 201], - :method => 'POST', - :path => 'os-keypairs' + body: Fog::JSON.encode(data), + expects: [200, 201], + method: 'POST', + path: 'os-keypairs' ) end end @@ -27,16 +27,16 @@ def create_key_pair(key_name, _public_key = nil) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-c373a42c-2825-4e60-8d34-99416ea850be", - "Content-Type" => "application/json", - "Content-Length" => "1289", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "1289", + "Date" => Date.new } response.body = { "keypair" => { - "public_key" => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCdAZLjljntJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz02GWBS45rcuboeGg/gozKRwsLu4N6NLPlYtbK/NapJIvgO/djBp+FQG1QZNtLPsx7j4hVJac3yISGms+Xtu4cEv6j5sFDzAgTQbWez0Z1+9qOq9ngdaoW+YClfQ== vagrant@nova\n", + "public_key" => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCdAZLjljntJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz02GWBS45rcuboeGg/gozKRwsLu4N6NLPlYtbK/NapJIvgO/djBp+FQG1QZNtLPsx7j4hVJac3yISGms+Xtu4cEv6j5sFDzAgTQbWez0Z1+9qOq9ngdaoW+YClfQ== vagrant@nova\n", "private_key" => "-----BEGIN RSA PRIVATE KEY-----\nMIICXgIBAAKBgQDCdAZLjljn1tJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz02\nGWBS45rcuHboeGg/gozKRwsLu4N6NLPlYtbK/NapJIvgO/djBp+FQG1QZNtLPsx7\nj4hVJac3yISGms+Xtu4cEv6j5sFDzAgTQbWez0Z1+9qOq9ngdaoW+YClfQIDAQAB\nAoGBALBoT9m1vuQ82EONQf2RONqHAsfUzi/SMhEZRgOlv9AemXZkcWyl4uPvxmtd\nEcreiTystAtCHjw7lhCExXthipevUjtIAAt+b3pMn6Oyjad3IRvde6atMdjrje43\n/nftYtuXYyJTsvwEvLYqSioLQ0Nn/XDKhOpcM5tejDHOH35lAkEA+H4r7y9X521u\nIABVAezBWaT/wvdMjx5cwfyYEQjnI1bxfRIqkgoY5gDDBdVbT75UTsHHbHLORQcw\nRjRvS2zgewJBAMhT6eyMonJvHHvC5RcchcY+dWkscIKoOzeyUKMb+7tERQa9/UN2\njYb+jdM0VyL0ruLFwYtl2m34gfmhcXgIvGcCQGzKMEnjHEUBr7jq7EyPbobkqeSd\niDMQQ+PZxmmO0EK0ib0L+v881HG926PuKK/cz+Q7Cif8iznFT+ksg50t6YkCQQC9\nwfcAskqieSuS9A9LcCIrojhXctf0e+T0Ij2N89DlF4sHEuqXf/IZ4IB5gsfTfdE3\nUDnAkK9yogaEbu/r0uKbAkEAy5kl71bIqvKTKsY2mES9ziVxfftl/9UIi5LI+QHb\nmC/c6cTrGVCM71fi2GMxGgBeEea4+7xwoWTL4CxA00kmTg==\n-----END RSA PRIVATE KEY-----\n", - "user_id" => "admin", - "name" => key_name, + "user_id" => "admin", + "name" => key_name, "fingerprint" => "97:86:f4:15:68:0c:7b:a7:e5:8f:f0:bd:1f:27:65:ad" } } diff --git a/lib/fog/openstack/compute/requests/create_os_interface.rb b/lib/fog/openstack/compute/requests/create_os_interface.rb index b192d600a..5be2c5230 100644 --- a/lib/fog/openstack/compute/requests/create_os_interface.rb +++ b/lib/fog/openstack/compute/requests/create_os_interface.rb @@ -5,7 +5,7 @@ class Real # === Parameters # * server_id <~String> # * options <~Hash> - def create_os_interface(server_id, options={}) + def create_os_interface(server_id, options = {}) body = { 'interfaceAttachment' => {} } @@ -17,23 +17,23 @@ def create_os_interface(server_id, options={}) end if options[:ip_address] - body['interfaceAttachment']['fixed_ips'] = {ip_address: options[:ip_address]} + body['interfaceAttachment']['fixed_ips'] = { ip_address: options[:ip_address] } end request( - :body => Fog::JSON.encode(body), - :expects => [200, 201, 202, 204], - :method => 'POST', - :path => "servers/#{server_id}/os-interface" + body: Fog::JSON.encode(body), + expects: [200, 201, 202, 204], + method: 'POST', + path: "servers/#{server_id}/os-interface" ) end end class Mock - def create_os_interface(server_id, options={}) + def create_os_interface(_server_id, _options = {}) Excon::Response.new( - :body => {'interfaceAttachment' => data[:os_interfaces].first}, - :status => 200 + body: { 'interfaceAttachment' => data[:os_interfaces].first }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/create_security_group.rb b/lib/fog/openstack/compute/requests/create_security_group.rb index 3c5ebef75..5c0d6a1d2 100644 --- a/lib/fog/openstack/compute/requests/create_security_group.rb +++ b/lib/fog/openstack/compute/requests/create_security_group.rb @@ -5,30 +5,30 @@ class Real def create_security_group(name, description) data = { 'security_group' => { - 'name' => name, + 'name' => name, 'description' => description } } request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'POST', - :path => 'os-security-groups' + body: Fog::JSON.encode(data), + expects: 200, + method: 'POST', + path: 'os-security-groups' ) end end class Mock def create_security_group(name, description) - Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + Fog::OpenStack::Identity.new(openstack_auth_url: credentials[:openstack_auth_url], openstack_identity_api_version: 'v2.0') tenant_id = Fog::OpenStack::Identity::V2::Mock.data[current_tenant][:tenants].keys.first security_group_id = Fog::Mock.random_numbers(2).to_i + 1 data[:security_groups][security_group_id.to_s] = { - 'tenant_id' => tenant_id, - 'rules' => [], - 'id' => security_group_id, - 'name' => name, + 'tenant_id' => tenant_id, + 'rules' => [], + 'id' => security_group_id, + 'name' => name, 'description' => description } @@ -36,9 +36,9 @@ def create_security_group(name, description) response.status = 200 response.headers = { 'X-Compute-Request-Id' => "req-#{Fog::Mock.random_hex(32)}", - 'Content-Type' => 'application/json', - 'Content-Length' => Fog::Mock.random_numbers(3).to_s, - 'Date' => Date.new + 'Content-Type' => 'application/json', + 'Content-Length' => Fog::Mock.random_numbers(3).to_s, + 'Date' => Date.new } response.body = { 'security_group' => data[:security_groups][security_group_id.to_s] diff --git a/lib/fog/openstack/compute/requests/create_security_group_rule.rb b/lib/fog/openstack/compute/requests/create_security_group_rule.rb index 7d591d44a..fa8b471f8 100644 --- a/lib/fog/openstack/compute/requests/create_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/create_security_group_rule.rb @@ -6,19 +6,19 @@ def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, data = { 'security_group_rule' => { 'parent_group_id' => parent_group_id, - 'ip_protocol' => ip_protocol, - 'from_port' => from_port, - 'to_port' => to_port, - 'cidr' => cidr, - 'group_id' => group_id + 'ip_protocol' => ip_protocol, + 'from_port' => from_port, + 'to_port' => to_port, + 'cidr' => cidr, + 'group_id' => group_id } } request( - :expects => 200, - :method => 'POST', - :body => Fog::JSON.encode(data), - :path => 'os-security-group-rules' + expects: 200, + method: 'POST', + body: Fog::JSON.encode(data), + path: 'os-security-group-rules' ) end end @@ -30,18 +30,18 @@ def create_security_group_rule(parent_group_id, ip_protocol, from_port, to_port, response.status = 200 response.headers = { 'X-Compute-Request-Id' => "req-#{Fog::Mock.random_hex(32)}", - 'Content-Type' => 'application/json', - 'Content-Length' => Fog::Mock.random_numbers(3).to_s, - 'Date' => Date.new + 'Content-Type' => 'application/json', + 'Content-Length' => Fog::Mock.random_numbers(3).to_s, + 'Date' => Date.new } rule = { - 'id' => Fog::Mock.random_numbers(2).to_i, - 'from_port' => from_port, - 'group' => group_id || {}, - 'ip_protocol' => ip_protocol, - 'to_port' => to_port, + 'id' => Fog::Mock.random_numbers(2).to_i, + 'from_port' => from_port, + 'group' => group_id || {}, + 'ip_protocol' => ip_protocol, + 'to_port' => to_port, 'parent_group_id' => parent_group_id, - 'ip_range' => { + 'ip_range' => { 'cidr' => cidr } } diff --git a/lib/fog/openstack/compute/requests/create_server.rb b/lib/fog/openstack/compute/requests/create_server.rb index 7d64f97e7..830cddbde 100644 --- a/lib/fog/openstack/compute/requests/create_server.rb +++ b/lib/fog/openstack/compute/requests/create_server.rb @@ -6,7 +6,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) data = { 'server' => { 'flavorRef' => flavor_ref, - 'name' => name + 'name' => name } } data['server']['imageRef'] = image_ref if image_ref @@ -28,7 +28,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) else sg end - {:name => name} + { name: name } end end @@ -37,7 +37,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) options['personality'].each do |file| data['server']['personality'] << { 'contents' => Base64.encode64(file['contents'] || file[:contents]), - 'path' => file['path'] || file[:path] + 'path' => file['path'] || file[:path] } end end @@ -70,9 +70,9 @@ def create_server(name, image_ref, flavor_ref, options = {}) data['server']['block_device_mapping'] = [block_device_mapping].flatten.collect do |mapping| { 'delete_on_termination' => mapping[:delete_on_termination], - 'device_name' => mapping[:device_name], - 'volume_id' => mapping[:volume_id], - 'volume_size' => mapping[:volume_size], + 'device_name' => mapping[:device_name], + 'volume_id' => mapping[:volume_id], + 'volume_size' => mapping[:volume_size] } end end @@ -80,10 +80,10 @@ def create_server(name, image_ref, flavor_ref, options = {}) path = options['block_device_mapping'] ? 'os-volumes_boot' : 'servers' request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => path + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: path ) end end @@ -94,7 +94,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) response.status = 202 server_id = Fog::Mock.random_numbers(6).to_s - identity = Fog::OpenStack::Identity.new(:openstack_auth_url => credentials[:openstack_auth_url], :openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_auth_url: credentials[:openstack_auth_url], openstack_identity_api_version: 'v2.0') user = identity.users.find do |u| u.name == @openstack_username end @@ -109,22 +109,22 @@ def create_server(name, image_ref, flavor_ref, options = {}) end mock_data = { - 'addresses' => {"Private" => [{"addr" => Fog::Mock.random_ip}]}, - 'flavor' => {"id" => flavor_ref, "links" => [{"href" => "http://nova1:8774/admin/flavors/1", "rel" => "bookmark"}]}, - 'id' => server_id, - 'image' => {"id" => image_ref, "links" => [{"href" => "http://nova1:8774/admin/images/#{image_ref}", "rel" => "bookmark"}]}, - 'links' => [{"href" => "http://nova1:8774/v1.1/admin/servers/5", "rel" => "self"}, {"href" => "http://nova1:8774/admin/servers/5", "rel" => "bookmark"}], - 'hostId' => "123456789ABCDEF01234567890ABCDEF", - 'metadata' => options['metadata'] || {}, - 'name' => name || "server_#{rand(999)}", - 'accessIPv4' => options['accessIPv4'] || "", - 'accessIPv6' => options['accessIPv6'] || "", - 'progress' => 0, - 'status' => 'BUILD', - 'created' => '2012-09-27T00:04:18Z', - 'updated' => '2012-09-27T00:04:27Z', - 'user_id' => user_id, - 'config_drive' => options['config_drive'] || '', + 'addresses' => { "Private" => [{ "addr" => Fog::Mock.random_ip }] }, + 'flavor' => { "id" => flavor_ref, "links" => [{ "href" => "http://nova1:8774/admin/flavors/1", "rel" => "bookmark" }] }, + 'id' => server_id, + 'image' => { "id" => image_ref, "links" => [{ "href" => "http://nova1:8774/admin/images/#{image_ref}", "rel" => "bookmark" }] }, + 'links' => [{ "href" => "http://nova1:8774/v1.1/admin/servers/5", "rel" => "self" }, { "href" => "http://nova1:8774/admin/servers/5", "rel" => "bookmark" }], + 'hostId' => "123456789ABCDEF01234567890ABCDEF", + 'metadata' => options['metadata'] || {}, + 'name' => name || "server_#{rand(999)}", + 'accessIPv4' => options['accessIPv4'] || "", + 'accessIPv6' => options['accessIPv6'] || "", + 'progress' => 0, + 'status' => 'BUILD', + 'created' => '2012-09-27T00:04:18Z', + 'updated' => '2012-09-27T00:04:27Z', + 'user_id' => user_id, + 'config_drive' => options['config_drive'] || '' } nics = options['nics'] @@ -132,18 +132,18 @@ def create_server(name, image_ref, flavor_ref, options = {}) if nics nics.each do |_nic| mock_data["addresses"].merge!( - "Public" => [{'addr' => Fog::Mock.random_ip}] + "Public" => [{ 'addr' => Fog::Mock.random_ip }] ) end end response_data = if options['return_reservation_id'] == 'True' - {'reservation_id' => "r-#{Fog::Mock.random_numbers(6)}"} + { 'reservation_id' => "r-#{Fog::Mock.random_numbers(6)}" } else { 'adminPass' => 'password', - 'id' => server_id, - 'links' => mock_data['links'], + 'id' => server_id, + 'links' => mock_data['links'] } end @@ -177,7 +177,7 @@ def create_server(name, image_ref, flavor_ref, options = {}) response.body = if options['return_reservation_id'] == 'True' response_data else - {'server' => response_data} + { 'server' => response_data } end response end diff --git a/lib/fog/openstack/compute/requests/create_server_group.rb b/lib/fog/openstack/compute/requests/create_server_group.rb index 63a73591e..1b7eae88e 100644 --- a/lib/fog/openstack/compute/requests/create_server_group.rb +++ b/lib/fog/openstack/compute/requests/create_server_group.rb @@ -5,15 +5,15 @@ class Real def create_server_group(name, policy) Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy - body = {'server_group' => { - 'name' => name, + body = { 'server_group' => { + 'name' => name, 'policies' => [policy] - }} + } } request( - :body => Fog::JSON.encode(body), - :expects => 200, - :method => 'POST', - :path => 'os-server-groups' + body: Fog::JSON.encode(body), + expects: 200, + method: 'POST', + path: 'os-server-groups' ) end end @@ -22,7 +22,7 @@ class Mock def create_server_group(name, policy) Fog::OpenStack::Compute::ServerGroup.validate_server_group_policy policy id = SecureRandom.uuid - data[:server_groups][id] = {:name => name, :policies => [policy], :members => []} + data[:server_groups][id] = { name: name, policies: [policy], members: [] } get_server_group id end end diff --git a/lib/fog/openstack/compute/requests/create_snapshot.rb b/lib/fog/openstack/compute/requests/create_snapshot.rb index 8df9ad038..fa9ac97b7 100644 --- a/lib/fog/openstack/compute/requests/create_snapshot.rb +++ b/lib/fog/openstack/compute/requests/create_snapshot.rb @@ -5,18 +5,18 @@ class Real def create_snapshot(volume_id, name, description, force = false) data = { 'snapshot' => { - 'volume_id' => volume_id, - 'display_name' => name, + 'volume_id' => volume_id, + 'display_name' => name, 'display_description' => description, - 'force' => force + 'force' => force } } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "os-snapshots" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "os-snapshots" ) end end @@ -30,17 +30,17 @@ def create_snapshot(volume_id, name, description, _force = false) else response = Excon::Response.new data = { - "status" => "availble", - "name" => name, - "created_at" => Time.now, + "status" => "availble", + "name" => name, + "created_at" => Time.now, "description" => description, - "volume_id" => volume_id, - "id" => Fog::Mock.random_numbers(2), - "size" => volume['size'] + "volume_id" => volume_id, + "id" => Fog::Mock.random_numbers(2), + "size" => volume['size'] } self.data[:snapshots][data['id']] = data - response.body = {"snapshot" => data} + response.body = { "snapshot" => data } response.status = 202 response end diff --git a/lib/fog/openstack/compute/requests/create_volume.rb b/lib/fog/openstack/compute/requests/create_volume.rb index d90d439eb..d3af35abd 100644 --- a/lib/fog/openstack/compute/requests/create_volume.rb +++ b/lib/fog/openstack/compute/requests/create_volume.rb @@ -1,15 +1,13 @@ -# module Fog module OpenStack class Compute - # class Real def create_volume(name, description, size, options = {}) data = { 'volume' => { - 'display_name' => name, + 'display_name' => name, 'display_description' => description, - 'size' => size + 'size' => size } } @@ -25,31 +23,30 @@ def create_volume(name, description, size, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => 'os-volumes' + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: 'os-volumes' ) end end - # class Mock def create_volume(name, description, size, options = {}) response = Excon::Response.new response.status = 202 - data = {'id' => Fog::Mock.random_numbers(2), - 'displayName' => name, - 'displayDescription' => description, - 'size' => size, - 'status' => 'creating', - 'snapshotId' => options[:snapshot_id], - 'volumeType' => options[:volume_type] || 'None', - 'availabilityZone' => options[:availability_zone] || 'nova', - 'createdAt' => Time.now.strftime('%FT%T.%6N'), - 'attachments' => [], 'metadata' => options[:metadata] || {}} + data = { 'id' => Fog::Mock.random_numbers(2), + 'displayName' => name, + 'displayDescription' => description, + 'size' => size, + 'status' => 'creating', + 'snapshotId' => options[:snapshot_id], + 'volumeType' => options[:volume_type] || 'None', + 'availabilityZone' => options[:availability_zone] || 'nova', + 'createdAt' => Time.now.strftime('%FT%T.%6N'), + 'attachments' => [], 'metadata' => options[:metadata] || {} } self.data[:volumes][data['id']] = data - response.body = {'volume' => data} + response.body = { 'volume' => data } response end end diff --git a/lib/fog/openstack/compute/requests/delete_aggregate.rb b/lib/fog/openstack/compute/requests/delete_aggregate.rb index fbd6ee4f1..53d76455a 100644 --- a/lib/fog/openstack/compute/requests/delete_aggregate.rb +++ b/lib/fog/openstack/compute/requests/delete_aggregate.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_aggregate(uuid) request( - :expects => [200, 202, 204], - :method => 'DELETE', - :path => "os-aggregates/#{uuid}" + expects: [200, 202, 204], + method: 'DELETE', + path: "os-aggregates/#{uuid}" ) end end @@ -16,9 +16,9 @@ def delete_aggregate(_uuid) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/delete_flavor.rb b/lib/fog/openstack/compute/requests/delete_flavor.rb index 8cb4b2aa1..1680c0d8c 100644 --- a/lib/fog/openstack/compute/requests/delete_flavor.rb +++ b/lib/fog/openstack/compute/requests/delete_flavor.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_flavor(flavor_id) request( - :expects => 202, - :method => 'DELETE', - :path => "flavors/#{flavor_id}" + expects: 202, + method: 'DELETE', + path: "flavors/#{flavor_id}" ) end end @@ -16,9 +16,9 @@ def delete_flavor(_flavor_id) response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb b/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb index 609147148..1cd0436e1 100644 --- a/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/delete_flavor_metadata.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_flavor_metadata(flavor_ref, key) request( - :expects => 200, - :method => 'DELETE', - :path => "flavors/#{flavor_ref}/os-extra_specs/#{key}" + expects: 200, + method: 'DELETE', + path: "flavors/#{flavor_ref}/os-extra_specs/#{key}" ) end end @@ -17,9 +17,9 @@ def delete_flavor_metadata(_flavor_ref, _key) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } response.body = nil response diff --git a/lib/fog/openstack/compute/requests/delete_image.rb b/lib/fog/openstack/compute/requests/delete_image.rb index c5841497c..69fddfe63 100644 --- a/lib/fog/openstack/compute/requests/delete_image.rb +++ b/lib/fog/openstack/compute/requests/delete_image.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_image(image_id) request( - :expects => 204, - :method => 'DELETE', - :path => "images/#{image_id}" + expects: 204, + method: 'DELETE', + path: "images/#{image_id}" ) end end @@ -18,7 +18,7 @@ def delete_image(image_id) if image if image['status'] == 'SAVING' response.status = 409 - raise(Excon::Errors.status_error({:expects => 202}, response)) + raise(Excon::Errors.status_error({ expects: 202 }, response)) else data[:last_modified][:images].delete(image_id) data[:images].delete(image_id) @@ -27,7 +27,7 @@ def delete_image(image_id) response else response.status = 400 - raise(Excon::Errors.status_error({:expects => 202}, response)) + raise(Excon::Errors.status_error({ expects: 202 }, response)) end end end diff --git a/lib/fog/openstack/compute/requests/delete_key_pair.rb b/lib/fog/openstack/compute/requests/delete_key_pair.rb index c39152ed3..e159fadfb 100644 --- a/lib/fog/openstack/compute/requests/delete_key_pair.rb +++ b/lib/fog/openstack/compute/requests/delete_key_pair.rb @@ -6,9 +6,9 @@ def delete_key_pair(key_name, user_id = nil) options = {} options[:user_id] = user_id unless user_id.nil? request( - :expects => [202, 204], - :method => 'DELETE', - :path => "os-keypairs/#{Fog::OpenStack.escape(key_name)}" + expects: [202, 204], + method: 'DELETE', + path: "os-keypairs/#{Fog::OpenStack.escape(key_name)}" ) end end @@ -18,9 +18,9 @@ def delete_key_pair(_key_name) response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response.body = {} response diff --git a/lib/fog/openstack/compute/requests/delete_meta.rb b/lib/fog/openstack/compute/requests/delete_meta.rb index cc7fdf007..66c66a5cd 100644 --- a/lib/fog/openstack/compute/requests/delete_meta.rb +++ b/lib/fog/openstack/compute/requests/delete_meta.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_meta(collection_name, parent_id, key) request( - :expects => 204, - :method => 'DELETE', - :path => "#{collection_name}/#{parent_id}/metadata/#{key}" + expects: 204, + method: 'DELETE', + path: "#{collection_name}/#{parent_id}/metadata/#{key}" ) end end diff --git a/lib/fog/openstack/compute/requests/delete_metadata.rb b/lib/fog/openstack/compute/requests/delete_metadata.rb index 0dd71329e..9a46f442c 100644 --- a/lib/fog/openstack/compute/requests/delete_metadata.rb +++ b/lib/fog/openstack/compute/requests/delete_metadata.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_metadata(collection_name, parent_id, key) request( - :expects => 204, - :method => 'DELETE', - :path => "#{collection_name}/#{parent_id}/metadata/#{key}" + expects: 204, + method: 'DELETE', + path: "#{collection_name}/#{parent_id}/metadata/#{key}" ) end end diff --git a/lib/fog/openstack/compute/requests/delete_os_interface.rb b/lib/fog/openstack/compute/requests/delete_os_interface.rb index c70ded8ca..5a8eadc4e 100644 --- a/lib/fog/openstack/compute/requests/delete_os_interface.rb +++ b/lib/fog/openstack/compute/requests/delete_os_interface.rb @@ -7,15 +7,15 @@ class Real # * port_id <~String> def delete_os_interface(server_id, port_id) request( - :expects => [200, 202,204], - :method => 'DELETE', - :path => "servers/#{server_id}/os-interface/#{port_id}" + expects: [200, 202, 204], + method: 'DELETE', + path: "servers/#{server_id}/os-interface/#{port_id}" ) end end class Mock - def delete_os_interface(server_id, port_id) + def delete_os_interface(_server_id, _port_id) true end end diff --git a/lib/fog/openstack/compute/requests/delete_security_group.rb b/lib/fog/openstack/compute/requests/delete_security_group.rb index aed82769c..fa06bc3c5 100644 --- a/lib/fog/openstack/compute/requests/delete_security_group.rb +++ b/lib/fog/openstack/compute/requests/delete_security_group.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_security_group(security_group_id) request( - :expects => 202, - :method => 'DELETE', - :path => "os-security-groups/#{security_group_id}" + expects: 202, + method: 'DELETE', + path: "os-security-groups/#{security_group_id}" ) end end @@ -18,9 +18,9 @@ def delete_security_group(security_group_id) response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response.body = {} response diff --git a/lib/fog/openstack/compute/requests/delete_security_group_rule.rb b/lib/fog/openstack/compute/requests/delete_security_group_rule.rb index 751fa8f67..e91be1fb4 100644 --- a/lib/fog/openstack/compute/requests/delete_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/delete_security_group_rule.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_security_group_rule(security_group_rule_id) request( - :expects => 202, - :method => 'DELETE', - :path => "os-security-group-rules/#{security_group_rule_id}" + expects: 202, + method: 'DELETE', + path: "os-security-group-rules/#{security_group_rule_id}" ) end end @@ -18,9 +18,9 @@ def delete_security_group_rule(security_group_rule_id) response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response.body = {} response diff --git a/lib/fog/openstack/compute/requests/delete_server.rb b/lib/fog/openstack/compute/requests/delete_server.rb index 9a7a381d2..22e20996b 100644 --- a/lib/fog/openstack/compute/requests/delete_server.rb +++ b/lib/fog/openstack/compute/requests/delete_server.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_server(server_id) request( - :expects => 204, - :method => 'DELETE', - :path => "servers/#{server_id}" + expects: 204, + method: 'DELETE', + path: "servers/#{server_id}" ) end end @@ -18,7 +18,7 @@ def delete_server(server_id) if server if server['status'] == 'BUILD' response.status = 409 - raise(Excon::Errors.status_error({:expects => 204}, response)) + raise(Excon::Errors.status_error({ expects: 204 }, response)) else data[:last_modified][:servers].delete(server_id) data[:servers].delete(server_id) diff --git a/lib/fog/openstack/compute/requests/delete_server_group.rb b/lib/fog/openstack/compute/requests/delete_server_group.rb index 0e4212a0c..5b59d5a85 100644 --- a/lib/fog/openstack/compute/requests/delete_server_group.rb +++ b/lib/fog/openstack/compute/requests/delete_server_group.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_server_group(group_id) request( - :expects => 204, - :method => 'DELETE', - :path => "os-server-groups/#{group_id}" + expects: 204, + method: 'DELETE', + path: "os-server-groups/#{group_id}" ) end end @@ -16,9 +16,9 @@ def delete_server_group(group_id) response = Excon::Response.new response.status = data[:server_groups].delete(group_id) ? 204 : 404 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/delete_service.rb b/lib/fog/openstack/compute/requests/delete_service.rb index 6193a3da9..93d79866a 100644 --- a/lib/fog/openstack/compute/requests/delete_service.rb +++ b/lib/fog/openstack/compute/requests/delete_service.rb @@ -7,10 +7,10 @@ def delete_service(uuid, optional_params = nil) optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params request( - :expects => [202, 204], - :method => 'DELETE', - :path => "os-services/#{uuid}", - :query => optional_params + expects: [202, 204], + method: 'DELETE', + path: "os-services/#{uuid}", + query: optional_params ) end end @@ -20,9 +20,9 @@ def delete_service(_host, _binary, _optional_params = nil) response = Excon::Response.new response.status = 204 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/delete_snapshot.rb b/lib/fog/openstack/compute/requests/delete_snapshot.rb index 76877e107..460fcf282 100644 --- a/lib/fog/openstack/compute/requests/delete_snapshot.rb +++ b/lib/fog/openstack/compute/requests/delete_snapshot.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_snapshot(snapshot_id) request( - :expects => 202, - :method => 'DELETE', - :path => "os-snapshots/#{snapshot_id}" + expects: 202, + method: 'DELETE', + path: "os-snapshots/#{snapshot_id}" ) end end diff --git a/lib/fog/openstack/compute/requests/delete_volume.rb b/lib/fog/openstack/compute/requests/delete_volume.rb index 405aa85d4..fc7691f2c 100644 --- a/lib/fog/openstack/compute/requests/delete_volume.rb +++ b/lib/fog/openstack/compute/requests/delete_volume.rb @@ -4,9 +4,9 @@ class Compute class Real def delete_volume(volume_id) request( - :expects => 202, - :method => 'DELETE', - :path => "os-volumes/#{volume_id}" + expects: 202, + method: 'DELETE', + path: "os-volumes/#{volume_id}" ) end end diff --git a/lib/fog/openstack/compute/requests/detach_volume.rb b/lib/fog/openstack/compute/requests/detach_volume.rb index 696ad3c85..03dff9682 100644 --- a/lib/fog/openstack/compute/requests/detach_volume.rb +++ b/lib/fog/openstack/compute/requests/detach_volume.rb @@ -4,9 +4,9 @@ class Compute class Real def detach_volume(server_id, attachment_id) request( - :expects => 202, - :method => 'DELETE', - :path => "servers/%s/os-volume_attachments/%s" % [server_id, attachment_id] + expects: 202, + method: 'DELETE', + path: format("servers/%s/os-volume_attachments/%s", server_id, attachment_id) ) end end diff --git a/lib/fog/openstack/compute/requests/disable_service.rb b/lib/fog/openstack/compute/requests/disable_service.rb index cc20f0e4f..53d7fc5ec 100644 --- a/lib/fog/openstack/compute/requests/disable_service.rb +++ b/lib/fog/openstack/compute/requests/disable_service.rb @@ -3,17 +3,17 @@ module OpenStack class Compute class Real def disable_service(host, binary, optional_params = nil) - data = {"host" => host, "binary" => binary} + data = { "host" => host, "binary" => binary } # Encode all params optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "os-services/disable", - :query => optional_params + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "os-services/disable", + query: optional_params ) end end @@ -24,7 +24,7 @@ def disable_service(_host, _binary, _optional_params = nil) response.status = 200 response.body = { "service" => { - "host" => "host1", + "host" => "host1", "binary" => "nova-compute", "status" => "disabled" } diff --git a/lib/fog/openstack/compute/requests/disable_service_log_reason.rb b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb index c18c834f6..bbbb42892 100644 --- a/lib/fog/openstack/compute/requests/disable_service_log_reason.rb +++ b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb @@ -3,17 +3,17 @@ module OpenStack class Compute class Real def disable_service_log_reason(host, binary, disabled_reason, optional_params = nil) - data = {"host" => host, "binary" => binary, "disabled_reason" => disabled_reason} + data = { "host" => host, "binary" => binary, "disabled_reason" => disabled_reason } # Encode all params optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "os-services/disable-log-reason", - :query => optional_params + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "os-services/disable-log-reason", + query: optional_params ) end end @@ -24,9 +24,9 @@ def disable_service_log_reason(_host, _binary, _disabled_reason, _optional_param response.status = 200 response.body = { "service" => { - "host" => "host1", - "binary" => "nova-compute", - "status" => "disabled", + "host" => "host1", + "binary" => "nova-compute", + "status" => "disabled", "disabled_reason" => "test2" } } diff --git a/lib/fog/openstack/compute/requests/disassociate_address.rb b/lib/fog/openstack/compute/requests/disassociate_address.rb index 7ec15b304..3f2999017 100644 --- a/lib/fog/openstack/compute/requests/disassociate_address.rb +++ b/lib/fog/openstack/compute/requests/disassociate_address.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def disassociate_address(server_id, ip_address) - body = {"removeFloatingIp" => {"address" => ip_address}} + body = { "removeFloatingIp" => { "address" => ip_address } } server_action(server_id, body) end end @@ -13,9 +13,9 @@ def disassociate_address(_server_id, _ip_address) response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html, charset=UTF-8", + "Content-Type" => "text/html, charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/enable_service.rb b/lib/fog/openstack/compute/requests/enable_service.rb index cc146268c..92e1ff27b 100644 --- a/lib/fog/openstack/compute/requests/enable_service.rb +++ b/lib/fog/openstack/compute/requests/enable_service.rb @@ -3,17 +3,17 @@ module OpenStack class Compute class Real def enable_service(host, binary, optional_params = nil) - data = {"host" => host, "binary" => binary} + data = { "host" => host, "binary" => binary } # Encode all params optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "os-services/enable", - :query => optional_params + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "os-services/enable", + query: optional_params ) end end @@ -24,7 +24,7 @@ def enable_service(_host, _binary, _optional_params = nil) response.status = 200 response.body = { "service" => { - "host" => "host1", + "host" => "host1", "binary" => "nova-compute", "status" => "enabled" } diff --git a/lib/fog/openstack/compute/requests/get_address.rb b/lib/fog/openstack/compute/requests/get_address.rb index 14e1d4bdf..fd9f330f2 100644 --- a/lib/fog/openstack/compute/requests/get_address.rb +++ b/lib/fog/openstack/compute/requests/get_address.rb @@ -4,9 +4,9 @@ class Compute class Real def get_address(address_id) request( - :expects => [200], - :method => 'GET', - :path => "os-floating-ips/#{address_id}" + expects: [200], + method: 'GET', + path: "os-floating-ips/#{address_id}" ) end end @@ -17,17 +17,17 @@ def get_address(_address_id) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-d4a21158-a86c-44a6-983a-e25645907f26", - "Content-Type" => "application/json", - "Content-Length" => "105", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "105", + "Date" => Date.new } response.body = { "floating_ip" => { "instance_id" => nil, - "ip" => "192.168.27.129", - "fixed_ip" => nil, - "id" => 1, - "pool" => "nova" + "ip" => "192.168.27.129", + "fixed_ip" => nil, + "id" => 1, + "pool" => "nova" } } response diff --git a/lib/fog/openstack/compute/requests/get_aggregate.rb b/lib/fog/openstack/compute/requests/get_aggregate.rb index be3589855..b000525a0 100644 --- a/lib/fog/openstack/compute/requests/get_aggregate.rb +++ b/lib/fog/openstack/compute/requests/get_aggregate.rb @@ -4,9 +4,9 @@ class Compute class Real def get_aggregate(uuid) request( - :expects => [200], - :method => 'GET', - :path => "os-aggregates/#{uuid}" + expects: [200], + method: 'GET', + path: "os-aggregates/#{uuid}" ) end end @@ -15,7 +15,7 @@ class Mock def get_aggregate(_uuid) response = Excon::Response.new response.status = 2040 - response.body = {'aggregate' => data[:aggregates].first.merge("hosts" => [])} + response.body = { 'aggregate' => data[:aggregates].first.merge("hosts" => []) } response end diff --git a/lib/fog/openstack/compute/requests/get_flavor_details.rb b/lib/fog/openstack/compute/requests/get_flavor_details.rb index 0d7b45309..016e93dba 100644 --- a/lib/fog/openstack/compute/requests/get_flavor_details.rb +++ b/lib/fog/openstack/compute/requests/get_flavor_details.rb @@ -4,9 +4,9 @@ class Compute class Real def get_flavor_details(flavor_ref) request( - :expects => [200, 203], - :method => 'GET', - :path => "flavors/#{flavor_ref}" + expects: [200, 203], + method: 'GET', + path: "flavors/#{flavor_ref}" ) end end @@ -15,13 +15,13 @@ class Mock def get_flavor_details(flavor_ref) response = Excon::Response.new flavor = { - '1' => {'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'swap' => '1', 'vcpus' => 1, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - '2' => {'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'swap' => '1', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - '3' => {'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'swap' => '2', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - '4' => {'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'swap' => '4', 'vcpus' => 4, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - '5' => {'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'swap' => '8', 'vcpus' => 8, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - '6' => {'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'swap' => '16', 'vcpus' => 16, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - '7' => {'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'swap' => '32', 'vcpus' => 32, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []} + '1' => { 'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'swap' => '1', 'vcpus' => 1, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + '2' => { 'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'swap' => '1', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + '3' => { 'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'swap' => '2', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + '4' => { 'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'swap' => '4', 'vcpus' => 4, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + '5' => { 'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'swap' => '8', 'vcpus' => 8, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + '6' => { 'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'swap' => '16', 'vcpus' => 16, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + '7' => { 'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'swap' => '32', 'vcpus' => 32, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] } }[flavor_ref] if flavor response.status = 200 diff --git a/lib/fog/openstack/compute/requests/get_flavor_metadata.rb b/lib/fog/openstack/compute/requests/get_flavor_metadata.rb index 6aab20b3b..5ddc3e6b1 100644 --- a/lib/fog/openstack/compute/requests/get_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/get_flavor_metadata.rb @@ -4,9 +4,9 @@ class Compute class Real def get_flavor_metadata(flavor_ref) request( - :expects => [200, 203], - :method => 'GET', - :path => "flavors/#{flavor_ref}/os-extra_specs" + expects: [200, 203], + method: 'GET', + path: "flavors/#{flavor_ref}/os-extra_specs" ) end end @@ -15,9 +15,9 @@ class Mock def get_flavor_metadata(_flavor_ref) response = Excon::Response.new response.status = 200 - response.body = {"extra_specs" => { + response.body = { "extra_specs" => { "cpu_arch" => "x86_64" - }} + } } response end end diff --git a/lib/fog/openstack/compute/requests/get_host_details.rb b/lib/fog/openstack/compute/requests/get_host_details.rb index 7441bf711..64ccd1c2b 100644 --- a/lib/fog/openstack/compute/requests/get_host_details.rb +++ b/lib/fog/openstack/compute/requests/get_host_details.rb @@ -4,9 +4,9 @@ class Compute class Real def get_host_details(host) request( - :expects => [200, 203], - :method => 'GET', - :path => "os-hosts/#{host}" + expects: [200, 203], + method: 'GET', + path: "os-hosts/#{host}" ) end end @@ -15,43 +15,43 @@ class Mock def get_host_details(_host) response = Excon::Response.new response.status = 200 - response.body = {"host" => [ - {"resource" => { - "project" => "(total)", + response.body = { "host" => [ + { "resource" => { + "project" => "(total)", "memory_mb" => 64427, - "host" => "cn28.la-1-3.morphcloud.net", - "cpu" => 12, - "disk_gb" => 1608 - }}, - {"resource" => { - "project" => "(used_now)", + "host" => "cn28.la-1-3.morphcloud.net", + "cpu" => 12, + "disk_gb" => 1608 + } }, + { "resource" => { + "project" => "(used_now)", "memory_mb" => 1753, - "host" => "cn28.la-1-3.morphcloud.net", - "cpu" => 3, - "disk_gb" => 33 - }}, - {"resource" => { - "project" => "(used_max)", + "host" => "cn28.la-1-3.morphcloud.net", + "cpu" => 3, + "disk_gb" => 33 + } }, + { "resource" => { + "project" => "(used_max)", "memory_mb" => 7168, - "host" => "cn28.la-1-3.morphcloud.net", - "cpu" => 3, - "disk_gb" => 45 - }}, - {"resource" => { - "project" => "bf8301f5164f4790889a1bc2bfb16d99", + "host" => "cn28.la-1-3.morphcloud.net", + "cpu" => 3, + "disk_gb" => 45 + } }, + { "resource" => { + "project" => "bf8301f5164f4790889a1bc2bfb16d99", "memory_mb" => 5120, - "host" => "cn28.la-1-3.morphcloud.net", - "cpu" => 2, - "disk_gb" => 35 - }}, - {"resource" => { - "project" => "3bb4d0301c5f47d5b4d96a361fcf96f4", + "host" => "cn28.la-1-3.morphcloud.net", + "cpu" => 2, + "disk_gb" => 35 + } }, + { "resource" => { + "project" => "3bb4d0301c5f47d5b4d96a361fcf96f4", "memory_mb" => 2048, - "host" => "cn28.la-1-3.morphcloud.net", - "cpu" => 1, - "disk_gb" => 10 - }} - ]} + "host" => "cn28.la-1-3.morphcloud.net", + "cpu" => 1, + "disk_gb" => 10 + } } + ] } response end end diff --git a/lib/fog/openstack/compute/requests/get_hypervisor.rb b/lib/fog/openstack/compute/requests/get_hypervisor.rb index 0358dd704..acf9be7ca 100644 --- a/lib/fog/openstack/compute/requests/get_hypervisor.rb +++ b/lib/fog/openstack/compute/requests/get_hypervisor.rb @@ -4,9 +4,9 @@ class Compute class Real def get_hypervisor(hypervisor_id) request( - :expects => 200, - :method => 'GET', - :path => "os-hypervisors/#{hypervisor_id}" + expects: 200, + method: 'GET', + path: "os-hypervisors/#{hypervisor_id}" ) end end @@ -17,43 +17,43 @@ def get_hypervisor(hypervisor_id) response.status = 200 response.body = { "hypervisor" => { - "cpu_info" => { - "arch" => "x86_64", - "model" => "Nehalem", - "vendor" => "Intel", + "cpu_info" => { + "arch" => "x86_64", + "model" => "Nehalem", + "vendor" => "Intel", "features" => [ "pge", "clflush" ], "topology" => { - "cores" => 1, + "cores" => 1, "threads" => 1, "sockets" => 4 } }, - "current_workload" => 0, - "status" => "enabled", - "state" => "up", + "current_workload" => 0, + "status" => "enabled", + "state" => "up", "disk_available_least" => 0, - "host_ip" => "1.1.1.1", - "free_disk_gb" => 1028, - "free_ram_mb" => 7680, - "hypervisor_hostname" => "fake-mini", - "hypervisor_type" => "fake", - "hypervisor_version" => 1000, - "id" => hypervisor_id, - "local_gb" => 1028, - "local_gb_used" => 0, - "memory_mb" => 8192, - "memory_mb_used" => 512, - "running_vms" => 0, - "service" => { - "host" => "host1", - "id" => 7, + "host_ip" => "1.1.1.1", + "free_disk_gb" => 1028, + "free_ram_mb" => 7680, + "hypervisor_hostname" => "fake-mini", + "hypervisor_type" => "fake", + "hypervisor_version" => 1000, + "id" => hypervisor_id, + "local_gb" => 1028, + "local_gb_used" => 0, + "memory_mb" => 8192, + "memory_mb_used" => 512, + "running_vms" => 0, + "service" => { + "host" => "host1", + "id" => 7, "disabled_reason" => null }, - "vcpus" => 1, - "vcpus_used" => 0 + "vcpus" => 1, + "vcpus_used" => 0 } } response diff --git a/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb b/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb index 511880b83..9fcbf365d 100644 --- a/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb +++ b/lib/fog/openstack/compute/requests/get_hypervisor_statistics.rb @@ -4,9 +4,9 @@ class Compute class Real def get_hypervisor_statistics(_tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "os-hypervisors/statistics" + expects: 200, + method: 'GET', + path: "os-hypervisors/statistics" ) end end @@ -17,18 +17,18 @@ def get_hypervisor_statistics(_tenant_id) response.status = 200 response.body = { "hypervisor_statistics" => { - "count" => 1, - "current_workload" => 0, + "count" => 1, + "current_workload" => 0, "disk_available_least" => 0, - "free_disk_gb" => 1028, - "free_ram_mb" => 7680, - "local_gb" => 1028, - "local_gb_used" => 0, - "memory_mb" => 8192, - "memory_mb_used" => 512, - "running_vms" => 0, - "vcpus" => 1, - "vcpus_used" => 0 + "free_disk_gb" => 1028, + "free_ram_mb" => 7680, + "local_gb" => 1028, + "local_gb_used" => 0, + "memory_mb" => 8192, + "memory_mb_used" => 512, + "running_vms" => 0, + "vcpus" => 1, + "vcpus_used" => 0 } } response diff --git a/lib/fog/openstack/compute/requests/get_image_details.rb b/lib/fog/openstack/compute/requests/get_image_details.rb index aa27f8ef8..854bf1420 100644 --- a/lib/fog/openstack/compute/requests/get_image_details.rb +++ b/lib/fog/openstack/compute/requests/get_image_details.rb @@ -4,9 +4,9 @@ class Compute class Real def get_image_details(image_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "images/#{image_id}" + expects: [200, 203], + method: 'GET', + path: "images/#{image_id}" ) end end @@ -17,7 +17,7 @@ def get_image_details(image_id) image = list_images_detail.body['images'].find { |im| im['id'] == image_id } if image response.status = [200, 203][rand(2)] - response.body = {'image' => image} + response.body = { 'image' => image } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/get_key_pair.rb b/lib/fog/openstack/compute/requests/get_key_pair.rb index 46361d6c5..184443d68 100644 --- a/lib/fog/openstack/compute/requests/get_key_pair.rb +++ b/lib/fog/openstack/compute/requests/get_key_pair.rb @@ -4,9 +4,9 @@ class Compute class Real def get_key_pair(key_name) request( - :expects => 200, - :method => 'GET', - :path => "os-keypairs/#{Fog::OpenStack.escape(key_name)}" + expects: 200, + method: 'GET', + path: "os-keypairs/#{Fog::OpenStack.escape(key_name)}" ) end end @@ -17,13 +17,13 @@ def delete_key_pair(key_name) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-c373a42c-2825-4e60-8d34-99416ea850be", - "Content-Type" => "application/json", - "Content-Length" => "1289", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "1289", + "Date" => Date.new } response.body = { "keypair" => { - "public_key" => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCdAZLjljntJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz"\ + "public_key" => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCdAZLjljntJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz"\ "02GWBS45rcuboeGg/gozKRwsLu4N6NLPlYtbK/NapJIvgO/djBp+FQG1QZNtLPsx7j4hVJac3yISGms+Xtu4c"\ "Ev6j5sFDzAgTQbWez0Z1+9qOq9ngdaoW+YClfQ== vagrant@nova\n", "private_key" => "-----BEGIN RSA PRIVATE KEY-----\nMIICXgIBAAKBgQDCdAZLjljn1tJbLVVkNHjWFSoKen2nZbk39Zfq"\ @@ -37,8 +37,8 @@ def delete_key_pair(key_name) "50t6YkCQQC9\nwfcAskqieSuS9A9LcCIrojhXctf0e+T0Ij2N89DlF4sHEuqXf/IZ4IB5gsfTfdE3\nUDnAkK"\ "9yogaEbu/r0uKbAkEAy5kl71bIqvKTKsY2mES9ziVxfftl/9UIi5LI+QHb\nmC/c6cTrGVCM71fi2GMxGgBeE"\ "ea4+7xwoWTL4CxA00kmTg==\n-----END RSA PRIVATE KEY-----\n", - "user_id" => "admin", - "name" => key_name, + "user_id" => "admin", + "name" => key_name, "fingerprint" => "97:86:f4:15:68:0c:7b:a7:e5:8f:f0:bd:1f:27:65:ad" } } diff --git a/lib/fog/openstack/compute/requests/get_limits.rb b/lib/fog/openstack/compute/requests/get_limits.rb index cb8c0bc74..e7cdb9ded 100644 --- a/lib/fog/openstack/compute/requests/get_limits.rb +++ b/lib/fog/openstack/compute/requests/get_limits.rb @@ -6,10 +6,10 @@ class Compute class Real def get_limits(options = {}) request( - :expects => 200, - :method => 'GET', - :path => '/limits', - :query => options + expects: 200, + method: 'GET', + path: '/limits', + query: options ) end end @@ -17,72 +17,72 @@ def get_limits(options = {}) class Mock def get_limits(_options = {}) rate_limits = [ - {'regex' => '.*', - 'limit' => [ - {'next-available' => '2012-11-22T16:13:44Z', - 'unit' => 'MINUTE', - 'verb' => 'POST', - 'remaining' => 9, - 'value' => 10}, - {'next-available' => '2012-11-23T00:46:14Z', - 'unit' => 'MINUTE', - 'verb' => 'PUT', - 'remaining' => 10, - 'value' => 10}, - {'next-available' => '2012-11-22T16:14:30Z', - 'unit' => 'MINUTE', - 'verb' => 'DELETE', - 'remaining' => 99, - 'value' => 100} - ], - 'uri' => '*'}, - {'regex' => '^/servers', - 'limit' => [ - {'next-available' => '2012-11-23T00:46:14Z', - 'unit' => 'DAY', - 'verb' => 'POST', - 'remaining' => 50, - 'value' => 50} - ], - 'uri' => '*/servers'}, - {'regex' => '.*changes-since.*', - 'limit' => [ - {'next-available' => '2012-11-23T00:46:14Z', - 'unit' => 'MINUTE', - 'verb' => 'GET', - 'remaining' => 3, - 'value' => 3} - ], - 'uri' => '*changes-since*'} + { 'regex' => '.*', + 'limit' => [ + { 'next-available' => '2012-11-22T16:13:44Z', + 'unit' => 'MINUTE', + 'verb' => 'POST', + 'remaining' => 9, + 'value' => 10 }, + { 'next-available' => '2012-11-23T00:46:14Z', + 'unit' => 'MINUTE', + 'verb' => 'PUT', + 'remaining' => 10, + 'value' => 10 }, + { 'next-available' => '2012-11-22T16:14:30Z', + 'unit' => 'MINUTE', + 'verb' => 'DELETE', + 'remaining' => 99, + 'value' => 100 } + ], + 'uri' => '*' }, + { 'regex' => '^/servers', + 'limit' => [ + { 'next-available' => '2012-11-23T00:46:14Z', + 'unit' => 'DAY', + 'verb' => 'POST', + 'remaining' => 50, + 'value' => 50 } + ], + 'uri' => '*/servers' }, + { 'regex' => '.*changes-since.*', + 'limit' => [ + { 'next-available' => '2012-11-23T00:46:14Z', + 'unit' => 'MINUTE', + 'verb' => 'GET', + 'remaining' => 3, + 'value' => 3 } + ], + 'uri' => '*changes-since*' } ] absolute_limits = { # Max - 'maxServerMeta' => 128, - 'maxTotalInstances' => 10, - 'maxPersonality' => 5, - 'maxImageMeta' => 128, - 'maxPersonalitySize' => 10240, - 'maxSecurityGroupRules' => 20, - 'maxTotalKeypairs' => 100, - 'maxSecurityGroups' => 10, - 'maxTotalCores' => 20, - 'maxTotalFloatingIps' => 10, - 'maxTotalRAMSize' => 51200, + 'maxServerMeta' => 128, + 'maxTotalInstances' => 10, + 'maxPersonality' => 5, + 'maxImageMeta' => 128, + 'maxPersonalitySize' => 10240, + 'maxSecurityGroupRules' => 20, + 'maxTotalKeypairs' => 100, + 'maxSecurityGroups' => 10, + 'maxTotalCores' => 20, + 'maxTotalFloatingIps' => 10, + 'maxTotalRAMSize' => 51200, # Used - 'totalCoresUsed' => -1, - 'totalRAMUsed' => -2048, - 'totalInstancesUsed' => -1, + 'totalCoresUsed' => -1, + 'totalRAMUsed' => -2048, + 'totalInstancesUsed' => -1, 'totalSecurityGroupsUsed' => 0, - 'totalFloatingIpsUsed' => 0 + 'totalFloatingIpsUsed' => 0 } Excon::Response.new( - :status => 200, - :body => { + status: 200, + body: { 'limits' => { - 'rate' => rate_limits, + 'rate' => rate_limits, 'absolute' => absolute_limits } } diff --git a/lib/fog/openstack/compute/requests/get_metadata.rb b/lib/fog/openstack/compute/requests/get_metadata.rb index 9f7c37094..c8dd2f37d 100644 --- a/lib/fog/openstack/compute/requests/get_metadata.rb +++ b/lib/fog/openstack/compute/requests/get_metadata.rb @@ -4,9 +4,9 @@ class Compute class Real def get_metadata(collection_name, parent_id, key) request( - :expects => [200, 203], - :method => 'GET', - :path => "#{collection_name}/#{parent_id}/metadata/#{key}" + expects: [200, 203], + method: 'GET', + path: "#{collection_name}/#{parent_id}/metadata/#{key}" ) end end @@ -15,7 +15,7 @@ class Mock def get_metadata(_collection_name, _parent_id, _key) response = Excon::Response.new response.status = 200 - response.body = {'meta' => {}} + response.body = { 'meta' => {} } response end end diff --git a/lib/fog/openstack/compute/requests/get_os_interface.rb b/lib/fog/openstack/compute/requests/get_os_interface.rb index 424fca7a9..38ac8bdb5 100644 --- a/lib/fog/openstack/compute/requests/get_os_interface.rb +++ b/lib/fog/openstack/compute/requests/get_os_interface.rb @@ -2,20 +2,20 @@ module Fog module OpenStack class Compute class Real - def get_os_interface(server_id,port_id) + def get_os_interface(server_id, port_id) request( - :expects => [200, 202, 203], - :method => 'GET', - :path => "servers/#{server_id}/os-interface/#{port_id}" + expects: [200, 202, 203], + method: 'GET', + path: "servers/#{server_id}/os-interface/#{port_id}" ) end end class Mock - def get_os_interface(server_id,port_id) + def get_os_interface(_server_id, _port_id) Excon::Response.new( - :body => {'interfaceAttachment' => data[:os_interfaces].first}, - :status => 200 + body: { 'interfaceAttachment' => data[:os_interfaces].first }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/get_quota.rb b/lib/fog/openstack/compute/requests/get_quota.rb index 94c5caa01..c7b13ad5c 100644 --- a/lib/fog/openstack/compute/requests/get_quota.rb +++ b/lib/fog/openstack/compute/requests/get_quota.rb @@ -4,9 +4,9 @@ class Compute class Real def get_quota(tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "/os-quota-sets/#{tenant_id}" + expects: 200, + method: 'GET', + path: "/os-quota-sets/#{tenant_id}" ) end end diff --git a/lib/fog/openstack/compute/requests/get_quota_defaults.rb b/lib/fog/openstack/compute/requests/get_quota_defaults.rb index 9469b2c0f..51aa13545 100644 --- a/lib/fog/openstack/compute/requests/get_quota_defaults.rb +++ b/lib/fog/openstack/compute/requests/get_quota_defaults.rb @@ -4,9 +4,9 @@ class Compute class Real def get_quota_defaults(tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "/os-quota-sets/#{tenant_id}/defaults" + expects: 200, + method: 'GET', + path: "/os-quota-sets/#{tenant_id}/defaults" ) end end diff --git a/lib/fog/openstack/compute/requests/get_security_group.rb b/lib/fog/openstack/compute/requests/get_security_group.rb index 7641bd5db..717bc1112 100644 --- a/lib/fog/openstack/compute/requests/get_security_group.rb +++ b/lib/fog/openstack/compute/requests/get_security_group.rb @@ -4,9 +4,9 @@ class Compute class Real def get_security_group(security_group_id) request( - :expects => [200], - :method => 'GET', - :path => "os-security-groups/#{security_group_id}" + expects: [200], + method: 'GET', + path: "os-security-groups/#{security_group_id}" ) end end @@ -19,9 +19,9 @@ def get_security_group(security_group_id) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-63a90344-7c4d-42e2-936c-fd748bced1b3", - "Content-Type" => "application/json", - "Content-Length" => "167", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "167", + "Date" => Date.new } response.body = { "security_group" => security_group diff --git a/lib/fog/openstack/compute/requests/get_security_group_rule.rb b/lib/fog/openstack/compute/requests/get_security_group_rule.rb index ee52de5fd..169ea0bd9 100644 --- a/lib/fog/openstack/compute/requests/get_security_group_rule.rb +++ b/lib/fog/openstack/compute/requests/get_security_group_rule.rb @@ -4,9 +4,9 @@ class Compute class Real def get_security_group_rule(security_group_rule_id) request( - :expects => [200], - :method => 'GET', - :path => "os-security-group-rules/#{security_group_rule_id}" + expects: [200], + method: 'GET', + path: "os-security-group-rules/#{security_group_rule_id}" ) end end @@ -20,9 +20,9 @@ def get_security_group_rule(security_group_rule_id) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-63a90344-7c4d-42e2-936c-fd748bced1b3", - "Content-Type" => "application/json", - "Content-Length" => "167", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "167", + "Date" => Date.new } response.body = { "security_group_rule" => security_group_rule diff --git a/lib/fog/openstack/compute/requests/get_server_details.rb b/lib/fog/openstack/compute/requests/get_server_details.rb index 28b1405e2..dfedb52cb 100644 --- a/lib/fog/openstack/compute/requests/get_server_details.rb +++ b/lib/fog/openstack/compute/requests/get_server_details.rb @@ -4,9 +4,9 @@ class Compute class Real def get_server_details(server_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "servers/#{server_id}" + expects: [200, 203], + method: 'GET', + path: "servers/#{server_id}" ) end end @@ -17,7 +17,7 @@ def get_server_details(server_id) server = list_servers_detail.body['servers'].find { |srv| srv['id'] == server_id } if server response.status = [200, 203][rand(2)] - response.body = {'server' => server} + response.body = { 'server' => server } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/get_server_group.rb b/lib/fog/openstack/compute/requests/get_server_group.rb index 8ebb01cfa..bfab35cca 100644 --- a/lib/fog/openstack/compute/requests/get_server_group.rb +++ b/lib/fog/openstack/compute/requests/get_server_group.rb @@ -4,9 +4,9 @@ class Compute class Real def get_server_group(group_id) request( - :expects => 200, - :method => 'GET', - :path => "/os-server-groups/#{group_id}" + expects: 200, + method: 'GET', + path: "/os-server-groups/#{group_id}" ) end end @@ -17,19 +17,19 @@ def get_server_group(group_id) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } - response.body = {'server_group' => { - 'id' => group_id, - 'name' => grp[:name], - 'policies' => grp[:policies], - 'members' => grp[:members], - 'metadata' => {}, + response.body = { 'server_group' => { + 'id' => group_id, + 'name' => grp[:name], + 'policies' => grp[:policies], + 'members' => grp[:members], + 'metadata' => {}, 'project_id' => 'test-project', - 'user_id' => 'test-user' - }} + 'user_id' => 'test-user' + } } response end end diff --git a/lib/fog/openstack/compute/requests/get_server_password.rb b/lib/fog/openstack/compute/requests/get_server_password.rb index 2496f0f10..9614eeaf4 100644 --- a/lib/fog/openstack/compute/requests/get_server_password.rb +++ b/lib/fog/openstack/compute/requests/get_server_password.rb @@ -4,9 +4,9 @@ class Compute class Real def get_server_password(server_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "servers/#{server_id}/os-server-password" + expects: [200, 203], + method: 'GET', + path: "servers/#{server_id}/os-server-password" ) end end @@ -17,7 +17,7 @@ def get_server_password(server_id) server = list_servers_detail.body['servers'].find { |srv| srv['id'] == server_id } if server response.status = [200, 203][rand(2)] - response.body = {'server' => server} + response.body = { 'server' => server } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/get_server_volumes.rb b/lib/fog/openstack/compute/requests/get_server_volumes.rb index 8322b6709..c9f2103f0 100644 --- a/lib/fog/openstack/compute/requests/get_server_volumes.rb +++ b/lib/fog/openstack/compute/requests/get_server_volumes.rb @@ -4,9 +4,9 @@ class Compute class Real def get_server_volumes(server_id) request( - :expects => 200, - :method => 'GET', - :path => "servers/#{server_id}/os-volume_attachments" + expects: 200, + method: 'GET', + path: "servers/#{server_id}/os-volume_attachments" ) end end @@ -18,7 +18,7 @@ def get_server_volumes(server_id) data = self.data[:volumes].values.select do |vol| vol['attachments'].find { |attachment| attachment["serverId"] == server_id } end - response.body = {'volumeAttachments' => data.map! { |vol| vol['attachments'] }.flatten(1)} + response.body = { 'volumeAttachments' => data.map! { |vol| vol['attachments'] }.flatten(1) } response end end diff --git a/lib/fog/openstack/compute/requests/get_snapshot_details.rb b/lib/fog/openstack/compute/requests/get_snapshot_details.rb index 3ec669e6f..c54134e90 100644 --- a/lib/fog/openstack/compute/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/compute/requests/get_snapshot_details.rb @@ -4,9 +4,9 @@ class Compute class Real def get_snapshot_details(snapshot_id) request( - :expects => 200, - :method => 'GET', - :path => "os-snapshots/#{snapshot_id}" + expects: 200, + method: 'GET', + path: "os-snapshots/#{snapshot_id}" ) end end @@ -18,7 +18,7 @@ def get_snapshot_details(snapshot_id) snap['id'] == snapshot_id end response.status = 200 - response.body = {'snapshot' => snapshot} + response.body = { 'snapshot' => snapshot } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/get_usage.rb b/lib/fog/openstack/compute/requests/get_usage.rb index 71428bc6c..a2fa5c6de 100644 --- a/lib/fog/openstack/compute/requests/get_usage.rb +++ b/lib/fog/openstack/compute/requests/get_usage.rb @@ -7,10 +7,10 @@ def get_usage(tenant_id, date_start, date_end) params[:start] = date_start.utc.iso8601.chop! params[:end] = date_end.utc.iso8601.chop! request( - :expects => [200, 203], - :method => 'GET', - :path => "os-simple-tenant-usage/#{tenant_id}", - :query => params + expects: [200, 203], + method: 'GET', + path: "os-simple-tenant-usage/#{tenant_id}", + query: params ) end end @@ -19,27 +19,27 @@ class Mock def get_usage(tenant_id, date_start, date_end) response = Excon::Response.new response.status = 200 - response.body = {"tenant_usage" => - {"total_memory_mb_usage" => 0.0, - "total_vcpus_usage" => 0.0, - "total_hours" => 0.0, - "tenant_id" => tenant_id, - "stop" => date_start, - "start" => date_end, - "total_local_gb_usage" => 0.0, - "server_usages" => [{ - "hours" => 0.0, - "uptime" => 69180, - "local_gb" => 0, - "ended_at" => nil, - "name" => "test server", - "tenant_id" => tenant_id, - "vcpus" => 1, - "memory_mb" => 512, - "state" => "active", - "flavor" => "m1.tiny", - "started_at" => "2012-03-05 09:11:44" - }]}} + response.body = { "tenant_usage" => + { "total_memory_mb_usage" => 0.0, + "total_vcpus_usage" => 0.0, + "total_hours" => 0.0, + "tenant_id" => tenant_id, + "stop" => date_start, + "start" => date_end, + "total_local_gb_usage" => 0.0, + "server_usages" => [{ + "hours" => 0.0, + "uptime" => 69180, + "local_gb" => 0, + "ended_at" => nil, + "name" => "test server", + "tenant_id" => tenant_id, + "vcpus" => 1, + "memory_mb" => 512, + "state" => "active", + "flavor" => "m1.tiny", + "started_at" => "2012-03-05 09:11:44" + }] } } response end end diff --git a/lib/fog/openstack/compute/requests/get_vnc_console.rb b/lib/fog/openstack/compute/requests/get_vnc_console.rb index 22b387e28..527cf156c 100644 --- a/lib/fog/openstack/compute/requests/get_vnc_console.rb +++ b/lib/fog/openstack/compute/requests/get_vnc_console.rb @@ -37,7 +37,7 @@ def get_vnc_console(_server_id, _console_type) response.status = 200 response.body = { "console" => { - "url" => "http://192.168.27.100:6080/vnc_auto.html?token=c3606020-d1b7-445d-a88f-f7af48dd6a20", + "url" => "http://192.168.27.100:6080/vnc_auto.html?token=c3606020-d1b7-445d-a88f-f7af48dd6a20", "type" => "novnc" } } diff --git a/lib/fog/openstack/compute/requests/get_volume_details.rb b/lib/fog/openstack/compute/requests/get_volume_details.rb index f7ee4eb4f..5a8290b3a 100644 --- a/lib/fog/openstack/compute/requests/get_volume_details.rb +++ b/lib/fog/openstack/compute/requests/get_volume_details.rb @@ -4,9 +4,9 @@ class Compute class Real def get_volume_details(volume_id) request( - :expects => 200, - :method => 'GET', - :path => "os-volumes/#{volume_id}" + expects: 200, + method: 'GET', + path: "os-volumes/#{volume_id}" ) end end @@ -20,7 +20,7 @@ def get_volume_details(volume_id) data['status'] = 'available' end response.status = 200 - response.body = {'volume' => data} + response.body = { 'volume' => data } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/list_address_pools.rb b/lib/fog/openstack/compute/requests/list_address_pools.rb index f8998cef3..29d81c91d 100644 --- a/lib/fog/openstack/compute/requests/list_address_pools.rb +++ b/lib/fog/openstack/compute/requests/list_address_pools.rb @@ -4,9 +4,9 @@ class Compute class Real def list_address_pools request( - :expects => [200, 203], - :method => 'GET', - :path => "os-floating-ip-pools" + expects: [200, 203], + method: 'GET', + path: "os-floating-ip-pools" ) end end @@ -17,7 +17,7 @@ def list_address_pools response.status = 200 response.body = { 'floating_ip_pools' => [ - {'name' => 'nova'} + { 'name' => 'nova' } ] } response diff --git a/lib/fog/openstack/compute/requests/list_addresses.rb b/lib/fog/openstack/compute/requests/list_addresses.rb index 1428dc754..b7d7599bc 100644 --- a/lib/fog/openstack/compute/requests/list_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_addresses.rb @@ -4,9 +4,9 @@ class Compute class Real def list_addresses(server_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "servers/#{server_id}/ips" + expects: [200, 203], + method: 'GET', + path: "servers/#{server_id}/ips" ) end end @@ -17,7 +17,7 @@ def list_addresses(server_id) server = list_servers_detail.body['servers'].find { |srv| srv['id'] == server_id } if server response.status = [200, 203][rand(2)] - response.body = {'addresses' => server['addresses']} + response.body = { 'addresses' => server['addresses'] } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/list_aggregates.rb b/lib/fog/openstack/compute/requests/list_aggregates.rb index 97c78a034..85532bfd8 100644 --- a/lib/fog/openstack/compute/requests/list_aggregates.rb +++ b/lib/fog/openstack/compute/requests/list_aggregates.rb @@ -4,10 +4,10 @@ class Compute class Real def list_aggregates(options = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => 'os-aggregates', - :query => options + expects: [200, 203], + method: 'GET', + path: 'os-aggregates', + query: options ) end end @@ -16,18 +16,18 @@ class Mock def list_aggregates(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'aggregates' => [{ + response.body = { 'aggregates' => [{ "availability_zone" => "nova", - "created_at" => "2012-11-16T06:22:23.032493", - "deleted" => false, - "deleted_at" => nil, - "metadata" => { + "created_at" => "2012-11-16T06:22:23.032493", + "deleted" => false, + "deleted_at" => nil, + "metadata" => { "availability_zone" => "nova" }, - "id" => 1, - "name" => "name", - "updated_at" => nil - }]} + "id" => 1, + "name" => "name", + "updated_at" => nil + }] } response end diff --git a/lib/fog/openstack/compute/requests/list_all_addresses.rb b/lib/fog/openstack/compute/requests/list_all_addresses.rb index bce5aaf68..c6ff8fd39 100644 --- a/lib/fog/openstack/compute/requests/list_all_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_all_addresses.rb @@ -4,10 +4,10 @@ class Compute class Real def list_all_addresses(options = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => "os-floating-ips", - :query => options + expects: [200, 203], + method: 'GET', + path: "os-floating-ips", + query: options ) end end @@ -18,39 +18,39 @@ def list_all_addresses(_options = {}) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-d4a21158-a86c-44a6-983a-e25645907f26", - "Content-Type" => "application/json", - "Content-Length" => "378", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "378", + "Date" => Date.new } response.body = { "floating_ips" => [ { "instance_id" => nil, - "ip" => "192.168.27.129", - "fixed_ip" => nil, - "id" => 1, - "pool" => "nova" + "ip" => "192.168.27.129", + "fixed_ip" => nil, + "id" => 1, + "pool" => "nova" }, { "instance_id" => nil, - "ip" => "192.168.27.130", - "fixed_ip" => nil, - "id" => 2, - "pool" => "nova" + "ip" => "192.168.27.130", + "fixed_ip" => nil, + "id" => 2, + "pool" => "nova" }, { "instance_id" => nil, - "ip" => "192.168.27.131", - "fixed_ip" => nil, - "id" => 3, - "pool" => "nova" + "ip" => "192.168.27.131", + "fixed_ip" => nil, + "id" => 3, + "pool" => "nova" }, { "instance_id" => nil, - "ip" => "192.168.27.132", - "fixed_ip" => nil, - "id" => 4, - "pool" => "nova" + "ip" => "192.168.27.132", + "fixed_ip" => nil, + "id" => 4, + "pool" => "nova" } ] } diff --git a/lib/fog/openstack/compute/requests/list_availability_zones.rb b/lib/fog/openstack/compute/requests/list_availability_zones.rb index c069a6a8c..7a2824b90 100644 --- a/lib/fog/openstack/compute/requests/list_availability_zones.rb +++ b/lib/fog/openstack/compute/requests/list_availability_zones.rb @@ -6,17 +6,16 @@ def list_availability_zones(options = {}) params = options request( - :expects => [200], - :method => 'GET', - :path => "os-availability-zone", - :query => params + expects: [200], + method: 'GET', + path: "os-availability-zone", + query: params ) end end class Mock - def list_endpoints - end + def list_endpoints; end end end end diff --git a/lib/fog/openstack/compute/requests/list_flavors.rb b/lib/fog/openstack/compute/requests/list_flavors.rb index 906733b9b..0daf60c12 100644 --- a/lib/fog/openstack/compute/requests/list_flavors.rb +++ b/lib/fog/openstack/compute/requests/list_flavors.rb @@ -4,10 +4,10 @@ class Compute class Real def list_flavors(options = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => 'flavors', - :query => options + expects: [200, 203], + method: 'GET', + path: 'flavors', + query: options ) end end @@ -18,13 +18,13 @@ def list_flavors(_options = {}) response.status = 200 response.body = { 'flavors' => [ - {'name' => '256 server', 'id' => '1', 'links' => ['https://itdoesntmatterwhatshere.heh']}, - {'name' => '512 server', 'id' => '2', 'links' => ['https://itdoesntmatterwhatshere.heh']}, - {'name' => '1GB server', 'id' => '3', 'links' => ['https://itdoesntmatterwhatshere.heh']}, - {'name' => '2GB server', 'id' => '4', 'links' => ['https://itdoesntmatterwhatshere.heh']}, - {'name' => '4GB server', 'id' => '5', 'links' => ['https://itdoesntmatterwhatshere.heh']}, - {'name' => '8GB server', 'id' => '6', 'links' => ['https://itdoesntmatterwhatshere.heh']}, - {'name' => '15.5GB server', 'id' => '7', 'links' => ['https://itdoesntmatterwhatshere.heh']} + { 'name' => '256 server', 'id' => '1', 'links' => ['https://itdoesntmatterwhatshere.heh'] }, + { 'name' => '512 server', 'id' => '2', 'links' => ['https://itdoesntmatterwhatshere.heh'] }, + { 'name' => '1GB server', 'id' => '3', 'links' => ['https://itdoesntmatterwhatshere.heh'] }, + { 'name' => '2GB server', 'id' => '4', 'links' => ['https://itdoesntmatterwhatshere.heh'] }, + { 'name' => '4GB server', 'id' => '5', 'links' => ['https://itdoesntmatterwhatshere.heh'] }, + { 'name' => '8GB server', 'id' => '6', 'links' => ['https://itdoesntmatterwhatshere.heh'] }, + { 'name' => '15.5GB server', 'id' => '7', 'links' => ['https://itdoesntmatterwhatshere.heh'] } ] } response diff --git a/lib/fog/openstack/compute/requests/list_flavors_detail.rb b/lib/fog/openstack/compute/requests/list_flavors_detail.rb index 33d1b648c..f16421438 100644 --- a/lib/fog/openstack/compute/requests/list_flavors_detail.rb +++ b/lib/fog/openstack/compute/requests/list_flavors_detail.rb @@ -4,10 +4,10 @@ class Compute class Real def list_flavors_detail(options = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => 'flavors/detail', - :query => options + expects: [200, 203], + method: 'GET', + path: 'flavors/detail', + query: options ) end end @@ -18,13 +18,13 @@ def list_flavors_detail(_options = {}) response.status = 200 response.body = { 'flavors' => [ - {'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'swap' => '1', 'vcpus' => 1, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - {'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'swap' => '1', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - {'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'swap' => '2', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - {'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'swap' => '4', 'vcpus' => 4, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - {'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'swap' => '8', 'vcpus' => 8, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - {'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'swap' => '16', 'vcpus' => 16, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []}, - {'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'swap' => '32', 'vcpus' => 32, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => []} + { 'id' => '1', 'name' => '256 server', 'ram' => 256, 'disk' => 10, 'swap' => '1', 'vcpus' => 1, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + { 'id' => '2', 'name' => '512 server', 'ram' => 512, 'disk' => 20, 'swap' => '1', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + { 'id' => '3', 'name' => '1GB server', 'ram' => 1024, 'disk' => 40, 'swap' => '2', 'vcpus' => 2, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + { 'id' => '4', 'name' => '2GB server', 'ram' => 2048, 'disk' => 80, 'swap' => '4', 'vcpus' => 4, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + { 'id' => '5', 'name' => '4GB server', 'ram' => 4096, 'disk' => 160, 'swap' => '8', 'vcpus' => 8, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + { 'id' => '6', 'name' => '8GB server', 'ram' => 8192, 'disk' => 320, 'swap' => '16', 'vcpus' => 16, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] }, + { 'id' => '7', 'name' => '15.5GB server', 'ram' => 15872, 'disk' => 620, 'swap' => '32', 'vcpus' => 32, 'OS-FLV-EXT-DATA:ephemeral' => 1, 'links' => [] } ] } response diff --git a/lib/fog/openstack/compute/requests/list_hosts.rb b/lib/fog/openstack/compute/requests/list_hosts.rb index 263368a36..155823621 100644 --- a/lib/fog/openstack/compute/requests/list_hosts.rb +++ b/lib/fog/openstack/compute/requests/list_hosts.rb @@ -4,10 +4,10 @@ class Compute class Real def list_hosts(options = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => 'os-hosts', - :query => options + expects: [200, 203], + method: 'GET', + path: 'os-hosts', + query: options ) end end @@ -16,9 +16,9 @@ class Mock def list_hosts(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {"hosts" => [ - {"host_name" => "host.test.net", "service" => "compute", "zone" => "az1"} - ]} + response.body = { "hosts" => [ + { "host_name" => "host.test.net", "service" => "compute", "zone" => "az1" } + ] } response end end diff --git a/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb b/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb index 2e704033c..c81458149 100644 --- a/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisor_servers.rb @@ -4,10 +4,10 @@ class Compute class Real def list_hypervisor_servers(hypervisor_id, options = {}) request( - :expects => 200, - :method => 'GET', - :path => "os-hypervisors/#{hypervisor_id}/servers", - :query => options + expects: 200, + method: 'GET', + path: "os-hypervisors/#{hypervisor_id}/servers", + query: options ) end end @@ -16,13 +16,13 @@ class Mock def list_hypervisor_servers(hypervisor_id, _options = {}) response = Excon::Response.new response.status = 200 - response.body = {'hypervisors' => [ + response.body = { 'hypervisors' => [ { "hypervisor_hostname" => "fake-mini", - "id" => hypervisor_id, - "state" => "up", - "status" => "enabled", - "servers" => [ + "id" => hypervisor_id, + "state" => "up", + "status" => "enabled", + "servers" => [ { "name" => "test_server1", "uuid" => "aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa" @@ -33,7 +33,7 @@ def list_hypervisor_servers(hypervisor_id, _options = {}) } ] } - ]} + ] } response end end diff --git a/lib/fog/openstack/compute/requests/list_hypervisors.rb b/lib/fog/openstack/compute/requests/list_hypervisors.rb index cab7a5813..dc57f08fd 100644 --- a/lib/fog/openstack/compute/requests/list_hypervisors.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisors.rb @@ -4,10 +4,10 @@ class Compute class Real def list_hypervisors(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-hypervisors', - :query => options + expects: 200, + method: 'GET', + path: 'os-hypervisors', + query: options ) end end @@ -16,9 +16,9 @@ class Mock def list_hypervisors(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'hypervisors' => [ - {"hypervisor_hostname" => "fake-mini", "id" => 2, "state" => "up", "status" => "enabled"} - ]} + response.body = { 'hypervisors' => [ + { "hypervisor_hostname" => "fake-mini", "id" => 2, "state" => "up", "status" => "enabled" } + ] } response end end diff --git a/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb b/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb index 5840e4ab6..8d56cfcde 100644 --- a/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb +++ b/lib/fog/openstack/compute/requests/list_hypervisors_detail.rb @@ -4,10 +4,10 @@ class Compute class Real def list_hypervisors_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-hypervisors/detail', - :query => options + expects: 200, + method: 'GET', + path: 'os-hypervisors/detail', + query: options ) end end @@ -17,49 +17,49 @@ def list_hypervisors_detail(_options = {}) response = Excon::Response.new response.status = 200 response.body = { - "hypervisors" => [{ - "cpu_info" => { - "arch" => "x86_64", - "model" => "Nehalem", - "vendor" => "Intel", + "hypervisors" => [{ + "cpu_info" => { + "arch" => "x86_64", + "model" => "Nehalem", + "vendor" => "Intel", "features" => [ "pge", "clflush" ], "topology" => { - "cores" => 1, + "cores" => 1, "threads" => 1, "sockets" => 4 } }, - "current_workload" => 0, - "status" => "enabled", - "state" => "up", + "current_workload" => 0, + "status" => "enabled", + "state" => "up", "disk_available_least" => 0, - "host_ip" => "1.1.1.1", - "free_disk_gb" => 1028, - "free_ram_mb" => 7680, - "hypervisor_hostname" => "fake-mini", - "hypervisor_type" => "fake", - "hypervisor_version" => 1000, - "id" => 2, - "local_gb" => 1028, - "local_gb_used" => 0, - "memory_mb" => 8192, - "memory_mb_used" => 512, - "running_vms" => 0, - "service" => { - "host" => "host1", - "id" => 7, + "host_ip" => "1.1.1.1", + "free_disk_gb" => 1028, + "free_ram_mb" => 7680, + "hypervisor_hostname" => "fake-mini", + "hypervisor_type" => "fake", + "hypervisor_version" => 1000, + "id" => 2, + "local_gb" => 1028, + "local_gb_used" => 0, + "memory_mb" => 8192, + "memory_mb_used" => 512, + "running_vms" => 0, + "service" => { + "host" => "host1", + "id" => 7, "disabled_reason" => null }, - "vcpus" => 1, - "vcpus_used" => 0 + "vcpus" => 1, + "vcpus_used" => 0 }], "hypervisors_links" => [ { "href" => "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/hypervisors/detail?limit=1&marker=2", - "rel" => "next" + "rel" => "next" } ] } diff --git a/lib/fog/openstack/compute/requests/list_images.rb b/lib/fog/openstack/compute/requests/list_images.rb index f3faa629e..4a94a7767 100644 --- a/lib/fog/openstack/compute/requests/list_images.rb +++ b/lib/fog/openstack/compute/requests/list_images.rb @@ -4,9 +4,9 @@ class Compute class Real def list_images request( - :expects => [200, 203], - :method => 'GET', - :path => 'images' + expects: [200, 203], + method: 'GET', + path: 'images' ) end end @@ -17,10 +17,10 @@ def list_images data = list_images_detail.body['images'] images = [] data.each do |image| - images << image.reject { |key, _value| !['id', 'name', 'links'].include?(key) } + images << image.select { |key, _value| ['id', 'name', 'links'].include?(key) } end response.status = [200, 203][rand(2)] - response.body = {'images' => images} + response.body = { 'images' => images } response end end diff --git a/lib/fog/openstack/compute/requests/list_images_detail.rb b/lib/fog/openstack/compute/requests/list_images_detail.rb index 2884a3956..108c6e27c 100644 --- a/lib/fog/openstack/compute/requests/list_images_detail.rb +++ b/lib/fog/openstack/compute/requests/list_images_detail.rb @@ -4,10 +4,10 @@ class Compute class Real def list_images_detail(filters = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => 'images/detail', - :query => filters + expects: [200, 203], + method: 'GET', + path: 'images/detail', + query: filters ) end end @@ -27,7 +27,7 @@ def list_images_detail(_filters = {}) end response.status = [200, 203][rand(2)] - response.body = {'images' => images.map { |image| image.reject { |key, _value| !['id', 'name', 'links', 'minRam', 'minDisk', 'metadata', 'status', 'updated'].include?(key) } }} + response.body = { 'images' => images.map { |image| image.select { |key, _value| ['id', 'name', 'links', 'minRam', 'minDisk', 'metadata', 'status', 'updated'].include?(key) } } } response end end diff --git a/lib/fog/openstack/compute/requests/list_key_pairs.rb b/lib/fog/openstack/compute/requests/list_key_pairs.rb index 40a6cce4e..4f3e8f397 100644 --- a/lib/fog/openstack/compute/requests/list_key_pairs.rb +++ b/lib/fog/openstack/compute/requests/list_key_pairs.rb @@ -4,10 +4,10 @@ class Compute class Real def list_key_pairs(options = {}) request( - :expects => [200, 203], - :method => 'GET', - :path => 'os-keypairs', - :query => options + expects: [200, 203], + method: 'GET', + path: 'os-keypairs', + query: options ) end end @@ -18,15 +18,15 @@ def list_key_pairs(_options = {}) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-c373a42c-2825-4e60-8d34-99416ea850be", - "Content-Type" => "application/json", - "Content-Length" => "360", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "360", + "Date" => Date.new } response.body = { "keypairs" => [{ "keypair" => { - "public_key" => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCdAZLjln1tJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz02GWBS4rcuHboeGg/gozKRwsLu4N6NLPlYtbK/NapJIvgO/djBp+FG1QZNtLPsx7j4hVJac3yISGms+Xtu4cEv6j5sFDzAgTQbWz0Z1+9qOq9ngdaoW+YClfQ== vagrant@nova\n", - "name" => "test_key", + "public_key" => "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAAAgQDCdAZLjln1tJbLVVkNHjWFSoKen2nZbk39ZfqhZJOMdeFdz02GWBS4rcuHboeGg/gozKRwsLu4N6NLPlYtbK/NapJIvgO/djBp+FG1QZNtLPsx7j4hVJac3yISGms+Xtu4cEv6j5sFDzAgTQbWz0Z1+9qOq9ngdaoW+YClfQ== vagrant@nova\n", + "name" => "test_key", "fingerprint" => "97:86:f4:15:68:0c:7b:a7:e5:8f:f0:bd:1f:27:65:ad" } }] diff --git a/lib/fog/openstack/compute/requests/list_metadata.rb b/lib/fog/openstack/compute/requests/list_metadata.rb index ea81fe543..92f99db53 100644 --- a/lib/fog/openstack/compute/requests/list_metadata.rb +++ b/lib/fog/openstack/compute/requests/list_metadata.rb @@ -4,9 +4,9 @@ class Compute class Real def list_metadata(collection_name, parent_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "/#{collection_name}/#{parent_id}/metadata" + expects: [200, 203], + method: 'GET', + path: "/#{collection_name}/#{parent_id}/metadata" ) end end diff --git a/lib/fog/openstack/compute/requests/list_os_interfaces.rb b/lib/fog/openstack/compute/requests/list_os_interfaces.rb index 5e861e098..576b10002 100644 --- a/lib/fog/openstack/compute/requests/list_os_interfaces.rb +++ b/lib/fog/openstack/compute/requests/list_os_interfaces.rb @@ -4,18 +4,18 @@ class Compute class Real def list_os_interfaces(server_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "servers/#{server_id}/os-interface" + expects: [200, 203], + method: 'GET', + path: "servers/#{server_id}/os-interface" ) end end class Mock - def list_os_interfaces(server_id) + def list_os_interfaces(_server_id) Excon::Response.new( - :body => {'interfaceAttachments' => data[:os_interfaces]}, - :status => 200 + body: { 'interfaceAttachments' => data[:os_interfaces] }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_private_addresses.rb b/lib/fog/openstack/compute/requests/list_private_addresses.rb index bc6787503..06616e451 100644 --- a/lib/fog/openstack/compute/requests/list_private_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_private_addresses.rb @@ -4,9 +4,9 @@ class Compute class Real def list_private_addresses(server_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "servers/#{server_id}/ips/private" + expects: [200, 203], + method: 'GET', + path: "servers/#{server_id}/ips/private" ) end end @@ -17,7 +17,7 @@ def list_private_addresses(server_id) server = list_servers_detail.body['servers'].find { |srv| srv['id'] == server_id } if server response.status = [200, 203][rand(2)] - response.body = {'private' => server['addresses']['private']} + response.body = { 'private' => server['addresses']['private'] } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/list_public_addresses.rb b/lib/fog/openstack/compute/requests/list_public_addresses.rb index ccc2f0260..d631f0f21 100644 --- a/lib/fog/openstack/compute/requests/list_public_addresses.rb +++ b/lib/fog/openstack/compute/requests/list_public_addresses.rb @@ -4,9 +4,9 @@ class Compute class Real def list_public_addresses(server_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "servers/#{server_id}/ips/public" + expects: [200, 203], + method: 'GET', + path: "servers/#{server_id}/ips/public" ) end end @@ -17,7 +17,7 @@ def list_public_addresses(server_id) server = list_servers_detail.body['servers'].find { |srv| srv['id'] == server_id } if server response.status = [200, 203][rand(2)] - response.body = {'public' => server['addresses']['public']} + response.body = { 'public' => server['addresses']['public'] } response else raise Fog::OpenStack::Compute::NotFound diff --git a/lib/fog/openstack/compute/requests/list_security_groups.rb b/lib/fog/openstack/compute/requests/list_security_groups.rb index f5db8f0d8..7bfffcdd9 100644 --- a/lib/fog/openstack/compute/requests/list_security_groups.rb +++ b/lib/fog/openstack/compute/requests/list_security_groups.rb @@ -20,10 +20,10 @@ def list_security_groups(options = {}) end request( - :expects => [200], - :method => 'GET', - :path => path, - :query => query + expects: [200], + method: 'GET', + path: path, + query: query ) end end @@ -52,13 +52,13 @@ def list_security_groups(options = {}) end Excon::Response.new( - :body => {'security_groups' => groups}, - :headers => { + body: { 'security_groups' => groups }, + headers: { "X-Compute-Request-Id" => "req-#{Fog::Mock.random_base64(36)}", - "Content-Type" => "application/json", - "Date" => Date.new + "Content-Type" => "application/json", + "Date" => Date.new }, - :status => 200 + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_server_groups.rb b/lib/fog/openstack/compute/requests/list_server_groups.rb index 642552012..cd6fd3e89 100644 --- a/lib/fog/openstack/compute/requests/list_server_groups.rb +++ b/lib/fog/openstack/compute/requests/list_server_groups.rb @@ -4,10 +4,10 @@ class Compute class Real def list_server_groups(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-server-groups', - :query => options + expects: 200, + method: 'GET', + path: 'os-server-groups', + query: options ) end end @@ -18,8 +18,8 @@ def list_server_groups(_options = {}) group.merge('id' => id, 'project_id' => 'test-project', 'user_id' => 'test-user') end Excon::Response.new( - :body => {'server_groups' => groups}, - :status => 200 + body: { 'server_groups' => groups }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_servers.rb b/lib/fog/openstack/compute/requests/list_servers.rb index 7f8ddddd4..f42af6a5f 100644 --- a/lib/fog/openstack/compute/requests/list_servers.rb +++ b/lib/fog/openstack/compute/requests/list_servers.rb @@ -10,10 +10,10 @@ def list_servers(options = {}) end request( - :expects => [200, 203], - :method => 'GET', - :path => 'servers', - :query => params + expects: [200, 203], + method: 'GET', + path: 'servers', + query: params ) end end @@ -24,10 +24,10 @@ def list_servers(_options = {}) data = list_servers_detail.body['servers'] servers = [] data.each do |server| - servers << server.reject { |key, _value| !['id', 'name', 'links'].include?(key) } + servers << server.select { |key, _value| ['id', 'name', 'links'].include?(key) } end response.status = [200, 203][rand(2)] - response.body = {'servers' => servers} + response.body = { 'servers' => servers } response end end diff --git a/lib/fog/openstack/compute/requests/list_servers_detail.rb b/lib/fog/openstack/compute/requests/list_servers_detail.rb index 0210db8b1..67b38c0e2 100644 --- a/lib/fog/openstack/compute/requests/list_servers_detail.rb +++ b/lib/fog/openstack/compute/requests/list_servers_detail.rb @@ -11,10 +11,10 @@ def list_servers_detail(options = {}) end request( - :expects => [200, 203], - :method => 'GET', - :path => 'servers/detail', - :query => params + expects: [200, 203], + method: 'GET', + path: 'servers/detail', + query: params ) end end @@ -34,7 +34,7 @@ def list_servers_detail(_filters = {}) end response.status = [200, 203][rand(2)] - response.body = {'servers' => servers} + response.body = { 'servers' => servers } response end end diff --git a/lib/fog/openstack/compute/requests/list_services.rb b/lib/fog/openstack/compute/requests/list_services.rb index 289d305b6..b0be1fc6c 100644 --- a/lib/fog/openstack/compute/requests/list_services.rb +++ b/lib/fog/openstack/compute/requests/list_services.rb @@ -4,10 +4,10 @@ class Compute class Real def list_services(parameters = nil) request( - :expects => [200, 203], - :method => 'GET', - :path => 'os-services', - :query => parameters + expects: [200, 203], + method: 'GET', + path: 'os-services', + query: parameters ) end end @@ -18,43 +18,43 @@ def list_services(_parameters = nil) response.status = 200 response.body = { "services" => [{ - "id" => 1, - "binary" => "nova-scheduler", - "host" => "host1", - "state" => "up", - "status" => "disabled", - "updated_at" => "2012-10-29T13:42:02.000000", - "zone" => "internal", + "id" => 1, + "binary" => "nova-scheduler", + "host" => "host1", + "state" => "up", + "status" => "disabled", + "updated_at" => "2012-10-29T13:42:02.000000", + "zone" => "internal", "disabled_reason" => "test2" }, { - "id" => 2, - "binary" => "nova-compute", - "host" => "host1", - "state" => "up", - "status" => "disabled", - "updated_at" => "2012-10-29T13:42:05.000000", - "zone" => "nova", + "id" => 2, + "binary" => "nova-compute", + "host" => "host1", + "state" => "up", + "status" => "disabled", + "updated_at" => "2012-10-29T13:42:05.000000", + "zone" => "nova", "disabled_reason" => "test2" }, { - "id" => 3, - "binary" => "nova-scheduler", - "host" => "host2", - "state" => "down", - "status" => "enabled", - "updated_at" => "2012-09-19T06:55:34.000000", - "zone" => "internal", + "id" => 3, + "binary" => "nova-scheduler", + "host" => "host2", + "state" => "down", + "status" => "enabled", + "updated_at" => "2012-09-19T06:55:34.000000", + "zone" => "internal", "disabled_reason" => "nil" }, { - "id" => 4, - "binary" => "nova-compute", - "host" => "host2", - "state" => "down", - "status" => "disabled", - "updated_at" => "2012-09-18T08:03:38.000000", - "zone" => "nova", + "id" => 4, + "binary" => "nova-compute", + "host" => "host2", + "state" => "down", + "status" => "disabled", + "updated_at" => "2012-09-18T08:03:38.000000", + "zone" => "nova", "disabled_reason" => "test2" }] } diff --git a/lib/fog/openstack/compute/requests/list_snapshots.rb b/lib/fog/openstack/compute/requests/list_snapshots.rb index 9933f80d6..4de508d0e 100644 --- a/lib/fog/openstack/compute/requests/list_snapshots.rb +++ b/lib/fog/openstack/compute/requests/list_snapshots.rb @@ -18,10 +18,10 @@ def list_snapshots(options = true) end request( - :expects => 200, - :method => 'GET', - :path => path, - :query => query + expects: 200, + method: 'GET', + path: path, + query: query ) end end @@ -31,7 +31,7 @@ def list_snapshots(_options = true) response = Excon::Response.new response.status = 200 snapshots = data[:snapshots].values - response.body = {'snapshots' => snapshots} + response.body = { 'snapshots' => snapshots } response end end diff --git a/lib/fog/openstack/compute/requests/list_snapshots_detail.rb b/lib/fog/openstack/compute/requests/list_snapshots_detail.rb index 5acd89803..e1bf80a2b 100644 --- a/lib/fog/openstack/compute/requests/list_snapshots_detail.rb +++ b/lib/fog/openstack/compute/requests/list_snapshots_detail.rb @@ -4,10 +4,10 @@ class Compute class Real def list_snapshots_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-snapshots/detail', - :query => options + expects: 200, + method: 'GET', + path: 'os-snapshots/detail', + query: options ) end end @@ -17,7 +17,7 @@ def list_snapshots_detail(_options = {}) response = Excon::Response.new response.status = 200 snapshots = data[:snapshots].values - response.body = {'snapshots' => snapshots} + response.body = { 'snapshots' => snapshots } response end end diff --git a/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb b/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb index 63dc99015..7bac4eb24 100644 --- a/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/list_tenants_with_flavor_access.rb @@ -4,9 +4,9 @@ class Compute class Real def list_tenants_with_flavor_access(flavor_ref) request( - :expects => [200, 203], - :method => 'GET', - :path => "flavors/#{flavor_ref}/os-flavor-access" + expects: [200, 203], + method: 'GET', + path: "flavors/#{flavor_ref}/os-flavor-access" ) end end @@ -16,7 +16,7 @@ def list_tenants_with_flavor_access(flavor_ref) response = Excon::Response.new response.status = 200 response.body = { - "flavor_access" => [{"tenant_id" => Fog::Mock.random_hex(33), "flavor_id" => flavor_ref.to_s}] + "flavor_access" => [{ "tenant_id" => Fog::Mock.random_hex(33), "flavor_id" => flavor_ref.to_s }] } response end diff --git a/lib/fog/openstack/compute/requests/list_usages.rb b/lib/fog/openstack/compute/requests/list_usages.rb index aeac14242..873d000fc 100644 --- a/lib/fog/openstack/compute/requests/list_usages.rb +++ b/lib/fog/openstack/compute/requests/list_usages.rb @@ -9,10 +9,10 @@ def list_usages(date_start = nil, date_end = nil, detailed = false) params[:detailed] = (detailed ? '1' : '0') if detailed request( - :expects => [200, 203], - :method => 'GET', - :path => 'os-simple-tenant-usage', - :query => params + expects: [200, 203], + method: 'GET', + path: 'os-simple-tenant-usage', + query: params ) end end @@ -21,15 +21,15 @@ class Mock def list_usages(_date_start = nil, _date_end = nil, _detailed = false) response = Excon::Response.new response.status = 200 - response.body = {"tenant_usages" => [{ + response.body = { "tenant_usages" => [{ "total_memory_mb_usage" => 0.00036124444444444445, - "total_vcpus_usage" => 7.055555555555556e-07, - "start" => "2012-03-06 05:05:56.349001", - "tenant_id" => "b97c8abba0c44a0987c63b858a4823e5", - "stop" => "2012-03-06 05:05:56.349255", - "total_hours" => 7.055555555555556e-07, - "total_local_gb_usage" => 0.0 - }]} + "total_vcpus_usage" => 7.055555555555556e-07, + "start" => "2012-03-06 05:05:56.349001", + "tenant_id" => "b97c8abba0c44a0987c63b858a4823e5", + "stop" => "2012-03-06 05:05:56.349255", + "total_hours" => 7.055555555555556e-07, + "total_local_gb_usage" => 0.0 + }] } response end end diff --git a/lib/fog/openstack/compute/requests/list_volume_attachments.rb b/lib/fog/openstack/compute/requests/list_volume_attachments.rb index 21bc0298a..d66b20b63 100644 --- a/lib/fog/openstack/compute/requests/list_volume_attachments.rb +++ b/lib/fog/openstack/compute/requests/list_volume_attachments.rb @@ -4,9 +4,9 @@ class Compute class Real def list_volume_attachments(server_id) request( - :expects => 200, - :method => 'GET', - :path => format('servers/%s/os-volume_attachments', server_id) + expects: 200, + method: 'GET', + path: format('servers/%s/os-volume_attachments', server_id) ) end end @@ -14,15 +14,15 @@ def list_volume_attachments(server_id) class Mock def list_volume_attachments(server_id) Excon::Response.new( - :body => { - :volumeAttachments => [{ - :device => '/dev/vdd', - :serverId => server_id, - :id => '24011ca7-9937-41e4-b19b-141307d1b656', - :volumeId => '24011ca7-9937-41e4-b19b-141307d1b656' + body: { + volumeAttachments: [{ + device: '/dev/vdd', + serverId: server_id, + id: '24011ca7-9937-41e4-b19b-141307d1b656', + volumeId: '24011ca7-9937-41e4-b19b-141307d1b656' }] }, - :status => 200 + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_volumes.rb b/lib/fog/openstack/compute/requests/list_volumes.rb index dacd8aa66..29f69497f 100644 --- a/lib/fog/openstack/compute/requests/list_volumes.rb +++ b/lib/fog/openstack/compute/requests/list_volumes.rb @@ -18,10 +18,10 @@ def list_volumes(options = true) end request( - :expects => 200, - :method => 'GET', - :path => path, - :query => query + expects: 200, + method: 'GET', + path: path, + query: query ) end end @@ -29,8 +29,8 @@ def list_volumes(options = true) class Mock def list_volumes(_options = true) Excon::Response.new( - :body => {'volumes' => data[:volumes].values}, - :status => 200 + body: { 'volumes' => data[:volumes].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_volumes_detail.rb b/lib/fog/openstack/compute/requests/list_volumes_detail.rb index 29316eaf6..282a4dfeb 100644 --- a/lib/fog/openstack/compute/requests/list_volumes_detail.rb +++ b/lib/fog/openstack/compute/requests/list_volumes_detail.rb @@ -4,10 +4,10 @@ class Compute class Real def list_volumes_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-volumes/detail', - :query => options + expects: 200, + method: 'GET', + path: 'os-volumes/detail', + query: options ) end end @@ -15,8 +15,8 @@ def list_volumes_detail(options = {}) class Mock def list_volumes_detail(_options = {}) Excon::Response.new( - :body => {'volumes' => data[:volumes].values}, - :status => 200 + body: { 'volumes' => data[:volumes].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_zones.rb b/lib/fog/openstack/compute/requests/list_zones.rb index 50a084be9..f9e61903a 100644 --- a/lib/fog/openstack/compute/requests/list_zones.rb +++ b/lib/fog/openstack/compute/requests/list_zones.rb @@ -4,10 +4,10 @@ class Compute class Real def list_zones(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-availability-zone', - :query => options + expects: 200, + method: 'GET', + path: 'os-availability-zone', + query: options ) end end @@ -15,16 +15,16 @@ def list_zones(options = {}) class Mock def list_zones(_options = {}) Excon::Response.new( - :body => {"availabilityZoneInfo" => [ + body: { "availabilityZoneInfo" => [ { "zoneState" => { "available" => true }, - "hosts" => nil, - "zoneName" => "nova" + "hosts" => nil, + "zoneName" => "nova" } - ]}, - :status => 200 + ] }, + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/list_zones_detailed.rb b/lib/fog/openstack/compute/requests/list_zones_detailed.rb index 375f70d03..22c623920 100644 --- a/lib/fog/openstack/compute/requests/list_zones_detailed.rb +++ b/lib/fog/openstack/compute/requests/list_zones_detailed.rb @@ -4,10 +4,10 @@ class Compute class Real def list_zones_detailed(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-availability-zone/detail', - :query => options + expects: 200, + method: 'GET', + path: 'os-availability-zone/detail', + query: options ) end end @@ -15,51 +15,51 @@ def list_zones_detailed(options = {}) class Mock def list_zones_detailed(_options = {}) Excon::Response.new( - :body => { + body: { "availabilityZoneInfo" => [ { "zoneState" => { "available" => true }, - "hosts" => { + "hosts" => { "instack.localdomain" => { - "nova-conductor" => { - "available" => true, - "active" => true, + "nova-conductor" => { + "available" => true, + "active" => true, "updated_at" => "2015-07-22T07:40:08.000000" }, - "nova-scheduler" => { - "available" => true, - "active" => true, + "nova-scheduler" => { + "available" => true, + "active" => true, "updated_at" => "2015-07-22T07:40:04.000000" }, "nova-consoleauth" => { - "available" => true, - "active" => true, + "available" => true, + "active" => true, "updated_at" => "2015-07-22T07:40:09.000000" } } }, - "zoneName" => "internal" + "zoneName" => "internal" }, { "zoneState" => { "available" => true }, - "hosts" => { + "hosts" => { "instack.localdomain" => { "nova-compute" => { - "available" => true, - "active" => true, + "available" => true, + "active" => true, "updated_at" => "2015-07-22T07:40:04.000000" } } }, - "zoneName" => "nova" + "zoneName" => "nova" } ] }, - :status => 200 + status: 200 ) end end diff --git a/lib/fog/openstack/compute/requests/live_migrate_server.rb b/lib/fog/openstack/compute/requests/live_migrate_server.rb index e749a7632..9eabd3b7c 100644 --- a/lib/fog/openstack/compute/requests/live_migrate_server.rb +++ b/lib/fog/openstack/compute/requests/live_migrate_server.rb @@ -5,9 +5,9 @@ class Real def live_migrate_server(server_id, host, block_migration, disk_over_commit) body = { 'os-migrateLive' => { - 'host' => host, - 'block_migration' => block_migration, - 'disk_over_commit' => disk_over_commit, + 'host' => host, + 'block_migration' => block_migration, + 'disk_over_commit' => disk_over_commit } } server_action(server_id, body) diff --git a/lib/fog/openstack/compute/requests/migrate_server.rb b/lib/fog/openstack/compute/requests/migrate_server.rb index a4c61fb9a..0deefd4cf 100644 --- a/lib/fog/openstack/compute/requests/migrate_server.rb +++ b/lib/fog/openstack/compute/requests/migrate_server.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def migrate_server(server_id) - body = {'migrate' => nil} + body = { 'migrate' => nil } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/pause_server.rb b/lib/fog/openstack/compute/requests/pause_server.rb index 77a02c04e..f44641ed0 100644 --- a/lib/fog/openstack/compute/requests/pause_server.rb +++ b/lib/fog/openstack/compute/requests/pause_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def pause_server(server_id) - body = {'pause' => nil} + body = { 'pause' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/reboot_server.rb b/lib/fog/openstack/compute/requests/reboot_server.rb index 8ed24c712..f757356a9 100644 --- a/lib/fog/openstack/compute/requests/reboot_server.rb +++ b/lib/fog/openstack/compute/requests/reboot_server.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def reboot_server(server_id, type = 'SOFT') - body = {'reboot' => {'type' => type}} + body = { 'reboot' => { 'type' => type } } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/rebuild_server.rb b/lib/fog/openstack/compute/requests/rebuild_server.rb index 43adb63ec..20fda7d56 100644 --- a/lib/fog/openstack/compute/requests/rebuild_server.rb +++ b/lib/fog/openstack/compute/requests/rebuild_server.rb @@ -3,10 +3,10 @@ module OpenStack class Compute class Real def rebuild_server(server_id, image_ref, name, admin_pass = nil, metadata = nil, personality = nil) - body = {'rebuild' => { + body = { 'rebuild' => { 'imageRef' => image_ref, - 'name' => name - }} + 'name' => name + } } body['rebuild']['adminPass'] = admin_pass if admin_pass body['rebuild']['metadata'] = metadata if metadata if personality @@ -14,7 +14,7 @@ def rebuild_server(server_id, image_ref, name, admin_pass = nil, metadata = nil, personality.each do |file| body['rebuild']['personality'] << { 'contents' => Base64.encode64(file['contents']), - 'path' => file['path'] + 'path' => file['path'] } end end diff --git a/lib/fog/openstack/compute/requests/release_address.rb b/lib/fog/openstack/compute/requests/release_address.rb index ee563c5e7..7f534216d 100644 --- a/lib/fog/openstack/compute/requests/release_address.rb +++ b/lib/fog/openstack/compute/requests/release_address.rb @@ -4,9 +4,9 @@ class Compute class Real def release_address(address_id) request( - :expects => [200, 202], - :method => 'DELETE', - :path => "os-floating-ips/#{address_id}" + expects: [200, 202], + method: 'DELETE', + path: "os-floating-ips/#{address_id}" ) end end @@ -16,9 +16,9 @@ def release_address(_address_id) response = Excon::Response.new response.status = 202 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response.body = {} response diff --git a/lib/fog/openstack/compute/requests/remote_consoles.rb b/lib/fog/openstack/compute/requests/remote_consoles.rb index d4efe40e7..0e6c313e9 100644 --- a/lib/fog/openstack/compute/requests/remote_consoles.rb +++ b/lib/fog/openstack/compute/requests/remote_consoles.rb @@ -26,10 +26,10 @@ def remote_consoles(server_id, protocol, type) } request( - :body => Fog::JSON.encode(body), - :expects => 200, - :method => 'POST', - :path => "servers/#{server_id}/remote-consoles" + body: Fog::JSON.encode(body), + expects: 200, + method: 'POST', + path: "servers/#{server_id}/remote-consoles" ) end end @@ -41,8 +41,8 @@ def remote_consoles(_server_id, _protocol, _type) response.status = 200 response.body = { "remote_console" => { - "url" => "http://192.168.27.100:6080/vnc_auto.html?token=e629bcbf-6f9e-4276-9ea1-d6eb0e618da5", - "type" => "novnc", + "url" => "http://192.168.27.100:6080/vnc_auto.html?token=e629bcbf-6f9e-4276-9ea1-d6eb0e618da5", + "type" => "novnc", "protocol" => "vnc" } } diff --git a/lib/fog/openstack/compute/requests/remove_aggregate_host.rb b/lib/fog/openstack/compute/requests/remove_aggregate_host.rb index 9cef36b6b..6f94d09c0 100644 --- a/lib/fog/openstack/compute/requests/remove_aggregate_host.rb +++ b/lib/fog/openstack/compute/requests/remove_aggregate_host.rb @@ -3,12 +3,12 @@ module OpenStack class Compute class Real def remove_aggregate_host(uuid, host_uuid) - data = {'remove_host' => {'host' => host_uuid}} + data = { 'remove_host' => { 'host' => host_uuid } } request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'POST', - :path => "os-aggregates/#{uuid}/action" + body: Fog::JSON.encode(data), + expects: [200], + method: 'POST', + path: "os-aggregates/#{uuid}/action" ) end end @@ -18,9 +18,9 @@ def remove_aggregate_host(_uuid, _host_uuid) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/remove_flavor_access.rb b/lib/fog/openstack/compute/requests/remove_flavor_access.rb index d15628914..d63d5cf8d 100644 --- a/lib/fog/openstack/compute/requests/remove_flavor_access.rb +++ b/lib/fog/openstack/compute/requests/remove_flavor_access.rb @@ -4,12 +4,12 @@ class Compute class Real def remove_flavor_access(flavor_ref, tenant_id) request( - :body => Fog::JSON.encode("removeTenantAccess" => { - "tenant" => tenant_id.to_s - }), - :expects => [200, 203], - :method => 'POST', - :path => "flavors/#{flavor_ref}/action" + body: Fog::JSON.encode("removeTenantAccess" => { + "tenant" => tenant_id.to_s + }), + expects: [200, 203], + method: 'POST', + path: "flavors/#{flavor_ref}/action" ) end end diff --git a/lib/fog/openstack/compute/requests/remove_security_group.rb b/lib/fog/openstack/compute/requests/remove_security_group.rb index 3fabe564a..aac00efa8 100644 --- a/lib/fog/openstack/compute/requests/remove_security_group.rb +++ b/lib/fog/openstack/compute/requests/remove_security_group.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def remove_security_group(server_id, group_name) - body = {'removeSecurityGroup' => {"name" => group_name}} + body = { 'removeSecurityGroup' => { "name" => group_name } } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/rescue_server.rb b/lib/fog/openstack/compute/requests/rescue_server.rb index c23ca54ca..5e60bca93 100644 --- a/lib/fog/openstack/compute/requests/rescue_server.rb +++ b/lib/fog/openstack/compute/requests/rescue_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def rescue_server(server_id) - body = {'rescue' => nil} + body = { 'rescue' => nil } server_action(server_id, body) == 202 end end diff --git a/lib/fog/openstack/compute/requests/reset_server_state.rb b/lib/fog/openstack/compute/requests/reset_server_state.rb index 5287047f1..d5690d1d7 100644 --- a/lib/fog/openstack/compute/requests/reset_server_state.rb +++ b/lib/fog/openstack/compute/requests/reset_server_state.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def reset_server_state(server_id, status) - body = {'os-resetState' => {'state' => status}} + body = { 'os-resetState' => { 'state' => status } } server_action(server_id, body, 202) end end diff --git a/lib/fog/openstack/compute/requests/resize_server.rb b/lib/fog/openstack/compute/requests/resize_server.rb index e7eea5837..ea7215354 100644 --- a/lib/fog/openstack/compute/requests/resize_server.rb +++ b/lib/fog/openstack/compute/requests/resize_server.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def resize_server(server_id, flavor_ref) - body = {'resize' => {'flavorRef' => flavor_ref}} + body = { 'resize' => { 'flavorRef' => flavor_ref } } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/resume_server.rb b/lib/fog/openstack/compute/requests/resume_server.rb index d33638930..328226c20 100644 --- a/lib/fog/openstack/compute/requests/resume_server.rb +++ b/lib/fog/openstack/compute/requests/resume_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def resume_server(server_id) - body = {'resume' => nil} + body = { 'resume' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/revert_resize_server.rb b/lib/fog/openstack/compute/requests/revert_resize_server.rb index 83fb61b89..518351c8b 100644 --- a/lib/fog/openstack/compute/requests/revert_resize_server.rb +++ b/lib/fog/openstack/compute/requests/revert_resize_server.rb @@ -3,7 +3,7 @@ module OpenStack class Compute class Real def revert_resize_server(server_id) - body = {'revertResize' => nil} + body = { 'revertResize' => nil } server_action(server_id, body) end end diff --git a/lib/fog/openstack/compute/requests/server_action.rb b/lib/fog/openstack/compute/requests/server_action.rb index e735efd78..57c9ea294 100644 --- a/lib/fog/openstack/compute/requests/server_action.rb +++ b/lib/fog/openstack/compute/requests/server_action.rb @@ -4,10 +4,10 @@ class Compute class Real def server_action(server_id, body, expects = [200, 202]) request( - :body => Fog::JSON.encode(body), - :expects => expects, - :method => 'POST', - :path => "servers/#{server_id}/action" + body: Fog::JSON.encode(body), + expects: expects, + method: 'POST', + path: "servers/#{server_id}/action" ) end end diff --git a/lib/fog/openstack/compute/requests/server_actions.rb b/lib/fog/openstack/compute/requests/server_actions.rb index 006fa5301..ba33b02ea 100644 --- a/lib/fog/openstack/compute/requests/server_actions.rb +++ b/lib/fog/openstack/compute/requests/server_actions.rb @@ -10,9 +10,9 @@ class Real # * actions <~Array> def server_actions(server_id) request( - :expects => 200, - :method => 'GET', - :path => "servers/#{server_id}/os-instance-actions" + expects: 200, + method: 'GET', + path: "servers/#{server_id}/os-instance-actions" ).body['instanceActions'] end end @@ -23,12 +23,12 @@ def server_actions(server_id) response.status = 200 response.body = [{ 'instance_uuid' => server_id, - 'user_id' => '7067d67a2b23435ca2366588680b66c3', - 'start_time' => Time.now.iso8601, - 'request_id' => "req-#{server_id}", - 'action' => 'stop', - 'message' => nil, - 'project_id' => '9d5d0b877cf449fdae078659cfa12e86' + 'user_id' => '7067d67a2b23435ca2366588680b66c3', + 'start_time' => Time.now.iso8601, + 'request_id' => "req-#{server_id}", + 'action' => 'stop', + 'message' => nil, + 'project_id' => '9d5d0b877cf449fdae078659cfa12e86' }] response end diff --git a/lib/fog/openstack/compute/requests/server_diagnostics.rb b/lib/fog/openstack/compute/requests/server_diagnostics.rb index 45b995693..f826259c6 100644 --- a/lib/fog/openstack/compute/requests/server_diagnostics.rb +++ b/lib/fog/openstack/compute/requests/server_diagnostics.rb @@ -10,15 +10,14 @@ class Real # * actions <~Array> def server_diagnostics(server_id) request( - :method => 'GET', - :path => "servers/#{server_id}/diagnostics" + method: 'GET', + path: "servers/#{server_id}/diagnostics" ) end end class Mock - def server_diagnostics(server_id) - end + def server_diagnostics(server_id); end end end end diff --git a/lib/fog/openstack/compute/requests/set_metadata.rb b/lib/fog/openstack/compute/requests/set_metadata.rb index dba2f091d..0e16f3afd 100644 --- a/lib/fog/openstack/compute/requests/set_metadata.rb +++ b/lib/fog/openstack/compute/requests/set_metadata.rb @@ -4,10 +4,10 @@ class Compute class Real def set_metadata(collection_name, parent_id, metadata = {}) request( - :body => Fog::JSON.encode('metadata' => metadata), - :expects => 200, - :method => 'PUT', - :path => "#{collection_name}/#{parent_id}/metadata" + body: Fog::JSON.encode('metadata' => metadata), + expects: 200, + method: 'PUT', + path: "#{collection_name}/#{parent_id}/metadata" ) end end @@ -27,7 +27,7 @@ def set_metadata(collection_name, parent_id, metadata = {}) end response = Excon::Response.new - response.body = {"metadata" => metadata} + response.body = { "metadata" => metadata } response.status = 200 response end diff --git a/lib/fog/openstack/compute/requests/shelve_offload_server.rb b/lib/fog/openstack/compute/requests/shelve_offload_server.rb index 3964a411c..43e79f261 100644 --- a/lib/fog/openstack/compute/requests/shelve_offload_server.rb +++ b/lib/fog/openstack/compute/requests/shelve_offload_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def shelve_offload_server(server_id) - body = {'shelveOffload' => nil} + body = { 'shelveOffload' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/shelve_server.rb b/lib/fog/openstack/compute/requests/shelve_server.rb index c12867981..06ce123af 100644 --- a/lib/fog/openstack/compute/requests/shelve_server.rb +++ b/lib/fog/openstack/compute/requests/shelve_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def shelve_server(server_id) - body = {'shelve' => nil} + body = { 'shelve' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/start_server.rb b/lib/fog/openstack/compute/requests/start_server.rb index 9bcb326e4..705b75379 100644 --- a/lib/fog/openstack/compute/requests/start_server.rb +++ b/lib/fog/openstack/compute/requests/start_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def start_server(server_id) - body = {'os-start' => nil} + body = { 'os-start' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/stop_server.rb b/lib/fog/openstack/compute/requests/stop_server.rb index 8948bc18f..7a25c4fa9 100644 --- a/lib/fog/openstack/compute/requests/stop_server.rb +++ b/lib/fog/openstack/compute/requests/stop_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def stop_server(server_id) - body = {'os-stop' => nil} + body = { 'os-stop' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/suspend_server.rb b/lib/fog/openstack/compute/requests/suspend_server.rb index 05f8ecb41..8fd0a702c 100644 --- a/lib/fog/openstack/compute/requests/suspend_server.rb +++ b/lib/fog/openstack/compute/requests/suspend_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def suspend_server(server_id) - body = {'suspend' => nil} + body = { 'suspend' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/unpause_server.rb b/lib/fog/openstack/compute/requests/unpause_server.rb index 69aec04dc..042957a5c 100644 --- a/lib/fog/openstack/compute/requests/unpause_server.rb +++ b/lib/fog/openstack/compute/requests/unpause_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def unpause_server(server_id) - body = {'unpause' => nil} + body = { 'unpause' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/unshelve_server.rb b/lib/fog/openstack/compute/requests/unshelve_server.rb index b8589b04f..d339c6ef1 100644 --- a/lib/fog/openstack/compute/requests/unshelve_server.rb +++ b/lib/fog/openstack/compute/requests/unshelve_server.rb @@ -9,7 +9,7 @@ class Real # === Returns # * success <~Boolean> def unshelve_server(server_id) - body = {'unshelve' => nil} + body = { 'unshelve' => nil } server_action(server_id, body).status == 202 end end diff --git a/lib/fog/openstack/compute/requests/update_aggregate.rb b/lib/fog/openstack/compute/requests/update_aggregate.rb index 3d0a777b9..44cae00f5 100644 --- a/lib/fog/openstack/compute/requests/update_aggregate.rb +++ b/lib/fog/openstack/compute/requests/update_aggregate.rb @@ -5,16 +5,16 @@ class Real def update_aggregate(uuid, options = {}) vanilla_options = [:name, :availability_zone] - data = {'aggregate' => {}} + data = { 'aggregate' => {} } vanilla_options.select { |o| options[o] }.each do |key| data['aggregate'][key] = options[key] end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "os-aggregates/#{uuid}" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "os-aggregates/#{uuid}" ) end end @@ -24,11 +24,11 @@ def update_aggregate(_uuid, _options = {}) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } - response.body = {'aggregate' => data[:aggregates].first} + response.body = { 'aggregate' => data[:aggregates].first } response end end diff --git a/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb b/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb index a1718a93a..7bb30c3e9 100644 --- a/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_aggregate_metadata.rb @@ -3,12 +3,12 @@ module OpenStack class Compute class Real def update_aggregate_metadata(uuid, metadata = {}) - data = {'set_metadata' => {'metadata' => metadata}} + data = { 'set_metadata' => { 'metadata' => metadata } } request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'POST', - :path => "os-aggregates/#{uuid}/action" + body: Fog::JSON.encode(data), + expects: [200], + method: 'POST', + path: "os-aggregates/#{uuid}/action" ) end end @@ -18,9 +18,9 @@ def update_aggregate_metadata(_uuid, _metadata = {}) response = Excon::Response.new response.status = 200 response.headers = { - "Content-Type" => "text/html; charset=UTF-8", + "Content-Type" => "text/html; charset=UTF-8", "Content-Length" => "0", - "Date" => Date.new + "Date" => Date.new } response end diff --git a/lib/fog/openstack/compute/requests/update_flavor_metadata.rb b/lib/fog/openstack/compute/requests/update_flavor_metadata.rb index a63c59c39..ab30d26c2 100644 --- a/lib/fog/openstack/compute/requests/update_flavor_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_flavor_metadata.rb @@ -3,13 +3,13 @@ module OpenStack class Compute class Real def update_flavor_metadata(flavor_ref, key, value) - data = {key => value} + data = { key => value } request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "flavors/#{flavor_ref}/os-extra_specs/#{key}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "flavors/#{flavor_ref}/os-extra_specs/#{key}" ) end end @@ -20,11 +20,11 @@ def update_flavor_metadata(_flavor_ref, key, value) response.status = 200 response.headers = { "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf", - "Content-Type" => "application/json", - "Content-Length" => "356", - "Date" => Date.new + "Content-Type" => "application/json", + "Content-Length" => "356", + "Date" => Date.new } - response.body = {key => value} + response.body = { key => value } response end end diff --git a/lib/fog/openstack/compute/requests/update_meta.rb b/lib/fog/openstack/compute/requests/update_meta.rb index 0eba6aadf..5a377b90c 100644 --- a/lib/fog/openstack/compute/requests/update_meta.rb +++ b/lib/fog/openstack/compute/requests/update_meta.rb @@ -4,10 +4,10 @@ class Compute class Real def update_meta(collection_name, parent_id, key, value) request( - :body => Fog::JSON.encode('meta' => {key => value}), - :expects => 200, - :method => 'PUT', - :path => "#{collection_name}/#{parent_id}/metadata/#{key}" + body: Fog::JSON.encode('meta' => { key => value }), + expects: 200, + method: 'PUT', + path: "#{collection_name}/#{parent_id}/metadata/#{key}" ) end end @@ -28,7 +28,7 @@ def update_meta(collection_name, parent_id, key, value) # FIXME: join w/ existing metadata here response = Excon::Response.new - response.body = {"metadata" => {key => value}} + response.body = { "metadata" => { key => value } } response.status = 200 response end diff --git a/lib/fog/openstack/compute/requests/update_metadata.rb b/lib/fog/openstack/compute/requests/update_metadata.rb index 18c5af67c..b8da3612b 100644 --- a/lib/fog/openstack/compute/requests/update_metadata.rb +++ b/lib/fog/openstack/compute/requests/update_metadata.rb @@ -4,10 +4,10 @@ class Compute class Real def update_metadata(collection_name, parent_id, metadata = {}) request( - :body => Fog::JSON.encode('metadata' => metadata), - :expects => 200, - :method => 'POST', - :path => "#{collection_name}/#{parent_id}/metadata" + body: Fog::JSON.encode('metadata' => metadata), + expects: 200, + method: 'POST', + path: "#{collection_name}/#{parent_id}/metadata" ) end end @@ -28,7 +28,7 @@ def update_metadata(collection_name, parent_id, metadata = {}) # FIXME: join w/ existing metadata here response = Excon::Response.new - response.body = {"metadata" => metadata} + response.body = { "metadata" => metadata } response.status = 200 response end diff --git a/lib/fog/openstack/compute/requests/update_quota.rb b/lib/fog/openstack/compute/requests/update_quota.rb index 7acc88d80..f586b1c14 100644 --- a/lib/fog/openstack/compute/requests/update_quota.rb +++ b/lib/fog/openstack/compute/requests/update_quota.rb @@ -4,10 +4,10 @@ class Compute class Real def update_quota(tenant_id, options = {}) request( - :body => Fog::JSON.encode('quota_set' => options), - :expects => 200, - :method => 'PUT', - :path => "/os-quota-sets/#{tenant_id}" + body: Fog::JSON.encode('quota_set' => options), + expects: 200, + method: 'PUT', + path: "/os-quota-sets/#{tenant_id}" ) end end @@ -18,7 +18,7 @@ def update_quota(_tenant_id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'quota_set' => data[:quota_updated]} + response.body = { 'quota_set' => data[:quota_updated] } response end end diff --git a/lib/fog/openstack/compute/requests/update_server.rb b/lib/fog/openstack/compute/requests/update_server.rb index 5485ad820..345d64374 100644 --- a/lib/fog/openstack/compute/requests/update_server.rb +++ b/lib/fog/openstack/compute/requests/update_server.rb @@ -4,10 +4,10 @@ class Compute class Real def update_server(server_id, options = {}) request( - :body => Fog::JSON.encode('server' => options), - :expects => 200, - :method => 'PUT', - :path => "servers/#{server_id}" + body: Fog::JSON.encode('server' => options), + expects: 200, + method: 'PUT', + path: "servers/#{server_id}" ) end end diff --git a/lib/fog/openstack/container_infra.rb b/lib/fog/openstack/container_infra.rb index 30a9f1e14..63c508200 100644 --- a/lib/fog/openstack/container_infra.rb +++ b/lib/fog/openstack/container_infra.rb @@ -1,8 +1,8 @@ module Fog module OpenStack - class ContainerInfra < Fog::Service - SUPPORTED_VERSIONS = /v1/ - SUPPORTED_MICROVERSION = '1.3' + class ContainerInfra < Fog::Service + SUPPORTED_VERSIONS = /v1/.freeze + SUPPORTED_MICROVERSION = '1.3'.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -67,8 +67,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => {}, - :tenants => {} + users: {}, + tenants: {} } end end @@ -90,15 +90,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -112,10 +112,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end @@ -135,7 +135,7 @@ def default_service_type end def request(options = {}) - options[:headers] = {'OpenStack-API-Version' => "container-infra #{SUPPORTED_MICROVERSION}"} + options[:headers] = { 'OpenStack-API-Version' => "container-infra #{SUPPORTED_MICROVERSION}" } super(options) end end diff --git a/lib/fog/openstack/container_infra/models/base.rb b/lib/fog/openstack/container_infra/models/base.rb index 55094626d..ec013d6c9 100644 --- a/lib/fog/openstack/container_infra/models/base.rb +++ b/lib/fog/openstack/container_infra/models/base.rb @@ -2,16 +2,16 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Base < Fog::OpenStack::Model def convert_update_params(params) params = params.map do |key, value| - { - "path" => "/#{key}", - "op" => value ? "replace" : "remove" - }.merge(value ? {"value" => value} : {}) + { + "path" => "/#{key}", + "op" => value ? "replace" : "remove" + }.merge(value ? { "value" => value } : {}) end - params.each {|k,v| params[k] = v.to_s.capitalize if [true, false].include?(v)} + params.each { |k, v| params[k] = v.to_s.capitalize if [true, false].include?(v) } end end end diff --git a/lib/fog/openstack/container_infra/models/bay.rb b/lib/fog/openstack/container_infra/models/bay.rb index 5cdc9aa71..a02dd7a1d 100644 --- a/lib/fog/openstack/container_infra/models/bay.rb +++ b/lib/fog/openstack/container_infra/models/bay.rb @@ -2,7 +2,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Bay < Fog::OpenStack::ContainerInfra::Base identity :uuid @@ -30,7 +30,7 @@ def create def update requires :uuid, :name, :baymodel_id - attrs = attributes.select{|k,_| allowed_update_attributes.include? k} + attrs = attributes.select { |k, _| allowed_update_attributes.include? k } attrs = convert_update_params(attrs) merge_attributes(service.update_bay(uuid, attrs).body) self @@ -49,7 +49,6 @@ def allowed_update_attributes :node_count ] end - end end end diff --git a/lib/fog/openstack/container_infra/models/bay_model.rb b/lib/fog/openstack/container_infra/models/bay_model.rb index 738066630..eadc8ac56 100644 --- a/lib/fog/openstack/container_infra/models/bay_model.rb +++ b/lib/fog/openstack/container_infra/models/bay_model.rb @@ -2,7 +2,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class BayModel < Fog::OpenStack::ContainerInfra::Base identity :uuid @@ -37,14 +37,14 @@ class BayModel < Fog::OpenStack::ContainerInfra::Base attribute :volume_driver def create - requires :name, :keypair_id, :flavor_id, :image_id, + requires :name, :keypair_id, :flavor_id, :image_id, :external_network_id, :coe merge_attributes(service.create_bay_model(attributes).body) self end def update - requires :uuid, :name, :keypair_id, :flavor_id, :image_id, + requires :uuid, :name, :keypair_id, :flavor_id, :image_id, :external_network_id, :coe attrs = convert_update_params(attributes) merge_attributes(service.update_bay_model(uuid, attrs).body) diff --git a/lib/fog/openstack/container_infra/models/bay_models.rb b/lib/fog/openstack/container_infra/models/bay_models.rb index 29e8c9d45..8325bddde 100644 --- a/lib/fog/openstack/container_infra/models/bay_models.rb +++ b/lib/fog/openstack/container_infra/models/bay_models.rb @@ -3,7 +3,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class BayModels < Fog::OpenStack::Collection model Fog::OpenStack::ContainerInfra::BayModel diff --git a/lib/fog/openstack/container_infra/models/bays.rb b/lib/fog/openstack/container_infra/models/bays.rb index 03e23e19e..88882b41d 100644 --- a/lib/fog/openstack/container_infra/models/bays.rb +++ b/lib/fog/openstack/container_infra/models/bays.rb @@ -3,7 +3,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Bays < Fog::OpenStack::Collection model Fog::OpenStack::ContainerInfra::Bay diff --git a/lib/fog/openstack/container_infra/models/certificate.rb b/lib/fog/openstack/container_infra/models/certificate.rb index f6f80050f..2d21dcd12 100644 --- a/lib/fog/openstack/container_infra/models/certificate.rb +++ b/lib/fog/openstack/container_infra/models/certificate.rb @@ -2,7 +2,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Certificate < Fog::OpenStack::ContainerInfra::Base identity :bay_uuid diff --git a/lib/fog/openstack/container_infra/models/certificates.rb b/lib/fog/openstack/container_infra/models/certificates.rb index ccd0d7621..5f8508300 100644 --- a/lib/fog/openstack/container_infra/models/certificates.rb +++ b/lib/fog/openstack/container_infra/models/certificates.rb @@ -3,9 +3,8 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Certificates < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::Certificate def create(bay_uuid) diff --git a/lib/fog/openstack/container_infra/models/cluster.rb b/lib/fog/openstack/container_infra/models/cluster.rb index d9bb73205..33a5c93cc 100644 --- a/lib/fog/openstack/container_infra/models/cluster.rb +++ b/lib/fog/openstack/container_infra/models/cluster.rb @@ -2,7 +2,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Cluster < Fog::OpenStack::ContainerInfra::Base identity :uuid @@ -30,7 +30,7 @@ def create def update requires :uuid, :name, :cluster_template_id - attrs = attributes.select{|k,_| allowed_update_attributes.include? k} + attrs = attributes.select { |k, _| allowed_update_attributes.include? k } attrs = convert_update_params(attrs) merge_attributes(service.update_cluster(uuid, attrs).body) self @@ -49,7 +49,6 @@ def allowed_update_attributes :node_count ] end - end end end diff --git a/lib/fog/openstack/container_infra/models/cluster_template.rb b/lib/fog/openstack/container_infra/models/cluster_template.rb index 1b8762970..87a4fbc84 100644 --- a/lib/fog/openstack/container_infra/models/cluster_template.rb +++ b/lib/fog/openstack/container_infra/models/cluster_template.rb @@ -2,7 +2,7 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class ClusterTemplate < Fog::OpenStack::ContainerInfra::Base identity :uuid @@ -36,14 +36,14 @@ class ClusterTemplate < Fog::OpenStack::ContainerInfra::Base attribute :volume_driver def create - requires :name, :keypair_id, :flavor_id, :image_id, + requires :name, :keypair_id, :flavor_id, :image_id, :external_network_id, :coe merge_attributes(service.create_cluster_template(attributes).body) self end def update - requires :uuid, :name, :keypair_id, :flavor_id, :image_id, + requires :uuid, :name, :keypair_id, :flavor_id, :image_id, :external_network_id, :coe attrs = convert_update_params(attributes) merge_attributes(service.update_cluster_template(uuid, attrs).body) diff --git a/lib/fog/openstack/container_infra/models/cluster_templates.rb b/lib/fog/openstack/container_infra/models/cluster_templates.rb index 01a2d9e33..06a291c3b 100644 --- a/lib/fog/openstack/container_infra/models/cluster_templates.rb +++ b/lib/fog/openstack/container_infra/models/cluster_templates.rb @@ -3,9 +3,8 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class ClusterTemplates < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::ClusterTemplate def all diff --git a/lib/fog/openstack/container_infra/models/clusters.rb b/lib/fog/openstack/container_infra/models/clusters.rb index e0038aa55..905463c19 100644 --- a/lib/fog/openstack/container_infra/models/clusters.rb +++ b/lib/fog/openstack/container_infra/models/clusters.rb @@ -3,9 +3,8 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Clusters < Fog::OpenStack::Collection - model Fog::OpenStack::ContainerInfra::Cluster def all diff --git a/lib/fog/openstack/container_infra/requests/create_bay.rb b/lib/fog/openstack/container_infra/requests/create_bay.rb index 1f6e31100..b0ea2e6ad 100644 --- a/lib/fog/openstack/container_infra/requests/create_bay.rb +++ b/lib/fog/openstack/container_infra/requests/create_bay.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def create_bay(params) request( - :expects => [202, 201, 200], - :method => 'POST', - :path => "bays", - :body => Fog::JSON.encode(params) + expects: [202, 201, 200], + method: 'POST', + path: "bays", + body: Fog::JSON.encode(params) ) end end diff --git a/lib/fog/openstack/container_infra/requests/create_bay_model.rb b/lib/fog/openstack/container_infra/requests/create_bay_model.rb index e080810c6..54cae7696 100644 --- a/lib/fog/openstack/container_infra/requests/create_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/create_bay_model.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def create_bay_model(params) request( - :expects => [201, 200], - :method => 'POST', - :path => "baymodels", - :body => Fog::JSON.encode(params) + expects: [201, 200], + method: 'POST', + path: "baymodels", + body: Fog::JSON.encode(params) ) end end @@ -17,36 +17,36 @@ def create_bay_model(_params) response = Excon::Response.new response.status = 201 response.body = { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "k8s-bm2", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8" + "apiserver_port" => nil, + "name" => "k8s-bm2", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8" } response end diff --git a/lib/fog/openstack/container_infra/requests/create_certificate.rb b/lib/fog/openstack/container_infra/requests/create_certificate.rb index ce81a2512..f2566ff97 100644 --- a/lib/fog/openstack/container_infra/requests/create_certificate.rb +++ b/lib/fog/openstack/container_infra/requests/create_certificate.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def create_certificate(params) request( - :expects => [201, 200], - :method => 'POST', - :path => "certificates", - :body => Fog::JSON.encode(params) + expects: [201, 200], + method: 'POST', + path: "certificates", + body: Fog::JSON.encode(params) ) end end @@ -17,9 +17,9 @@ def create_certificate(_params) response = Excon::Response.new response.status = 201 response.body = { - "pem" => "-----BEGIN CERTIFICATE-----\nMIIDxDCCAqygAwIBAgIRALgUbIjdKUy8lqErJmCxVfkwDQYJKoZIhvcNAQELBQAw\n-----END CERTIFICATE-----\n", - "bay_uuid" => "0b4b766f-1500-44b3-9804-5a6e12fe6df4", - "csr" => "-----BEGIN CERTIFICATE REQUEST-----\nMIIEfzCCAmcCAQAwFDESMBAGA1UEAxMJWW91ciBOYW1lMIICIjANBgkqhkiG9w0B\n-----END CERTIFICATE REQUEST-----\n" + "pem" => "-----BEGIN CERTIFICATE-----\nMIIDxDCCAqygAwIBAgIRALgUbIjdKUy8lqErJmCxVfkwDQYJKoZIhvcNAQELBQAw\n-----END CERTIFICATE-----\n", + "bay_uuid" => "0b4b766f-1500-44b3-9804-5a6e12fe6df4", + "csr" => "-----BEGIN CERTIFICATE REQUEST-----\nMIIEfzCCAmcCAQAwFDESMBAGA1UEAxMJWW91ciBOYW1lMIICIjANBgkqhkiG9w0B\n-----END CERTIFICATE REQUEST-----\n" } response end diff --git a/lib/fog/openstack/container_infra/requests/create_cluster.rb b/lib/fog/openstack/container_infra/requests/create_cluster.rb index 8acd5897a..99238c210 100644 --- a/lib/fog/openstack/container_infra/requests/create_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/create_cluster.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def create_cluster(params) request( - :expects => [202, 201, 200], - :method => 'POST', - :path => "clusters", - :body => Fog::JSON.encode(params) + expects: [202, 201, 200], + method: 'POST', + path: "clusters", + body: Fog::JSON.encode(params) ) end end diff --git a/lib/fog/openstack/container_infra/requests/create_cluster_template.rb b/lib/fog/openstack/container_infra/requests/create_cluster_template.rb index a138fdcee..611393065 100644 --- a/lib/fog/openstack/container_infra/requests/create_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/create_cluster_template.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def create_cluster_template(params) request( - :expects => [201, 200], - :method => 'POST', - :path => "clustertemplates", - :body => Fog::JSON.encode(params) + expects: [201, 200], + method: 'POST', + path: "clustertemplates", + body: Fog::JSON.encode(params) ) end end @@ -17,36 +17,36 @@ def create_cluster_template(_params) response = Excon::Response.new response.status = 201 response.body = { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "k8s-bm2", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8" + "apiserver_port" => nil, + "name" => "k8s-bm2", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8" } response end diff --git a/lib/fog/openstack/container_infra/requests/delete_bay.rb b/lib/fog/openstack/container_infra/requests/delete_bay.rb index 27826933d..af5b2d626 100644 --- a/lib/fog/openstack/container_infra/requests/delete_bay.rb +++ b/lib/fog/openstack/container_infra/requests/delete_bay.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def delete_bay(uuid_or_name) request( - :expects => [204], - :method => 'DELETE', - :path => "bays/#{uuid_or_name}" + expects: [204], + method: 'DELETE', + path: "bays/#{uuid_or_name}" ) end end diff --git a/lib/fog/openstack/container_infra/requests/delete_bay_model.rb b/lib/fog/openstack/container_infra/requests/delete_bay_model.rb index 7231738a4..b64345a7e 100644 --- a/lib/fog/openstack/container_infra/requests/delete_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/delete_bay_model.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def delete_bay_model(uuid_or_name) request( - :expects => [204], - :method => 'DELETE', - :path => "baymodels/#{uuid_or_name}" + expects: [204], + method: 'DELETE', + path: "baymodels/#{uuid_or_name}" ) end end diff --git a/lib/fog/openstack/container_infra/requests/delete_cluster.rb b/lib/fog/openstack/container_infra/requests/delete_cluster.rb index 459649aa4..e9c4043ad 100644 --- a/lib/fog/openstack/container_infra/requests/delete_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/delete_cluster.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def delete_cluster(uuid_or_name) request( - :expects => [204], - :method => 'DELETE', - :path => "clusters/#{uuid_or_name}" + expects: [204], + method: 'DELETE', + path: "clusters/#{uuid_or_name}" ) end end diff --git a/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb b/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb index c2b0d16bc..e3d0200e6 100644 --- a/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/delete_cluster_template.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def delete_cluster_template(uuid_or_name) request( - :expects => [204], - :method => 'DELETE', - :path => "clustertemplates/#{uuid_or_name}" + expects: [204], + method: 'DELETE', + path: "clustertemplates/#{uuid_or_name}" ) end end diff --git a/lib/fog/openstack/container_infra/requests/get_bay.rb b/lib/fog/openstack/container_infra/requests/get_bay.rb index 77df5b3d0..f1e91ec45 100644 --- a/lib/fog/openstack/container_infra/requests/get_bay.rb +++ b/lib/fog/openstack/container_infra/requests/get_bay.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def get_bay(uuid_or_name) request( - :expects => [200], - :method => 'GET', - :path => "bays/#{uuid_or_name}" + expects: [200], + method: 'GET', + path: "bays/#{uuid_or_name}" ) end end @@ -16,30 +16,30 @@ def get_bay(_uuid_or_name) response = Excon::Response.new response.status = 200 response.body = { - "status" => "CREATE_COMPLETE", - "uuid" => "746e779a-751a-456b-a3e9-c883d734946f", - "stack_id" => "9c6f1169-7300-4d08-a444-d2be38758719", - "created_at" => "2016-08-29T06:51:31+00:00", - "api_address" => "https://172.24.4.6:6443", - "discovery_url" => "https://discovery.etcd.io/cbeb580da58915809d59ee69348a84f3", - "updated_at" => "2016-08-29T06:53:24+00:00", - "master_count" => 1, - "coe_version" => "v1.2.0", - "baymodel_id" => "0562d357-8641-4759-8fed-8173f02c9633", - "master_addresses" => ["172.24.4.6"], - "node_count" => 1, - "node_addresses" => ["172.24.4.13"], - "status_reason" => "Stack CREATE completed successfully", + "status" => "CREATE_COMPLETE", + "uuid" => "746e779a-751a-456b-a3e9-c883d734946f", + "stack_id" => "9c6f1169-7300-4d08-a444-d2be38758719", + "created_at" => "2016-08-29T06:51:31+00:00", + "api_address" => "https://172.24.4.6:6443", + "discovery_url" => "https://discovery.etcd.io/cbeb580da58915809d59ee69348a84f3", + "updated_at" => "2016-08-29T06:53:24+00:00", + "master_count" => 1, + "coe_version" => "v1.2.0", + "baymodel_id" => "0562d357-8641-4759-8fed-8173f02c9633", + "master_addresses" => ["172.24.4.6"], + "node_count" => 1, + "node_addresses" => ["172.24.4.13"], + "status_reason" => "Stack CREATE completed successfully", "bay_create_timeout" => 60, - "name" => "k8s", - "links" => [ + "name" => "k8s", + "links" => [ { - "href" => "http://10.164.180.104:9511/v1/bays/746e779a-751a-456b-a3e9-c883d734946f", - "rel" => "self" + "href" => "http://10.164.180.104:9511/v1/bays/746e779a-751a-456b-a3e9-c883d734946f", + "rel" => "self" }, { - "href" => "http://10.164.180.104:9511/bays/746e779a-751a-456b-a3e9-c883d734946f", - "rel" => "bookmark" + "href" => "http://10.164.180.104:9511/bays/746e779a-751a-456b-a3e9-c883d734946f", + "rel" => "bookmark" } ] } diff --git a/lib/fog/openstack/container_infra/requests/get_bay_model.rb b/lib/fog/openstack/container_infra/requests/get_bay_model.rb index 31017b396..b2c7b94c8 100644 --- a/lib/fog/openstack/container_infra/requests/get_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/get_bay_model.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def get_bay_model(uuid_or_name) request( - :expects => [200], - :method => 'GET', - :path => "baymodels/#{uuid_or_name}" + expects: [200], + method: 'GET', + path: "baymodels/#{uuid_or_name}" ) end end @@ -16,36 +16,36 @@ def get_bay_model(_uuid_or_name) response = Excon::Response.new response.status = 200 response.body = { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "k8s-bm2", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8" + "apiserver_port" => nil, + "name" => "k8s-bm2", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8" } response end diff --git a/lib/fog/openstack/container_infra/requests/get_certificate.rb b/lib/fog/openstack/container_infra/requests/get_certificate.rb index 9fff2dcb9..024139a16 100644 --- a/lib/fog/openstack/container_infra/requests/get_certificate.rb +++ b/lib/fog/openstack/container_infra/requests/get_certificate.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real - def get_certificate(bay_uuid) + def get_certificate(_bay_uuid) request( - :expects => [200], - :method => 'GET', - :path => "certificates/#{cluster_uuid}" + expects: [200], + method: 'GET', + path: "certificates/#{cluster_uuid}" ) end end @@ -15,10 +15,10 @@ class Mock def get_certificate(_bay_uuid) response = Excon::Response.new response.status = 200 - response.body = { - "pem" => "-----BEGIN CERTIFICATE-----\nMIICzDCCAbSgAwIBAgIQOOkVcEN7TNa9E80GoUs4xDANBgkqhkiG9w0BAQsFADAO\n-----END CERTIFICATE-----\n", - "bay_uuid" => "0b4b766f-1500-44b3-9804-5a6e12fe6df4" - } + response.body = { + "pem" => "-----BEGIN CERTIFICATE-----\nMIICzDCCAbSgAwIBAgIQOOkVcEN7TNa9E80GoUs4xDANBgkqhkiG9w0BAQsFADAO\n-----END CERTIFICATE-----\n", + "bay_uuid" => "0b4b766f-1500-44b3-9804-5a6e12fe6df4" + } response end end diff --git a/lib/fog/openstack/container_infra/requests/get_cluster.rb b/lib/fog/openstack/container_infra/requests/get_cluster.rb index 96b9e43c5..d3c924fc0 100644 --- a/lib/fog/openstack/container_infra/requests/get_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/get_cluster.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def get_cluster(uuid_or_name) request( - :expects => [200], - :method => 'GET', - :path => "clusters/#{uuid_or_name}" + expects: [200], + method: 'GET', + path: "clusters/#{uuid_or_name}" ) end end @@ -16,22 +16,22 @@ def get_cluster(_uuid_or_name) response = Excon::Response.new response.status = 200 response.body = { - "status" => "CREATE_COMPLETE", - "uuid" => "746e779a-751a-456b-a3e9-c883d734946f", - "stack_id" => "9c6f1169-7300-4d08-a444-d2be38758719", - "created_at" => "2016-08-29T06:51:31+00:00", - "api_address" => "https://172.24.4.6:6443", - "discovery_url" => "https://discovery.etcd.io/cbeb580da58915809d59ee69348a84f3", - "updated_at" => "2016-08-29T06:53:24+00:00", - "master_count" => 1, - "coe_version" => "v1.2.0", + "status" => "CREATE_COMPLETE", + "uuid" => "746e779a-751a-456b-a3e9-c883d734946f", + "stack_id" => "9c6f1169-7300-4d08-a444-d2be38758719", + "created_at" => "2016-08-29T06:51:31+00:00", + "api_address" => "https://172.24.4.6:6443", + "discovery_url" => "https://discovery.etcd.io/cbeb580da58915809d59ee69348a84f3", + "updated_at" => "2016-08-29T06:53:24+00:00", + "master_count" => 1, + "coe_version" => "v1.2.0", "cluster_template_id" => "0562d357-8641-4759-8fed-8173f02c9633", - "master_addresses" => ["172.24.4.6"], - "node_count" => 1, - "node_addresses" => ["172.24.4.13"], - "status_reason" => "Stack CREATE completed successfully", - "create_timeout" => 60, - "name" => "k8s" + "master_addresses" => ["172.24.4.6"], + "node_count" => 1, + "node_addresses" => ["172.24.4.13"], + "status_reason" => "Stack CREATE completed successfully", + "create_timeout" => 60, + "name" => "k8s" } response end diff --git a/lib/fog/openstack/container_infra/requests/get_cluster_template.rb b/lib/fog/openstack/container_infra/requests/get_cluster_template.rb index afe36620c..00cce9c9c 100644 --- a/lib/fog/openstack/container_infra/requests/get_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/get_cluster_template.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def get_cluster_template(uuid_or_name) request( - :expects => [200], - :method => 'GET', - :path => "clustertemplates/#{uuid_or_name}" + expects: [200], + method: 'GET', + path: "clustertemplates/#{uuid_or_name}" ) end end @@ -16,36 +16,36 @@ def get_cluster_template(_uuid_or_name) response = Excon::Response.new response.status = 200 response.body = { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "k8s-bm2", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8" + "apiserver_port" => nil, + "name" => "k8s-bm2", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8" } response end diff --git a/lib/fog/openstack/container_infra/requests/list_bay_models.rb b/lib/fog/openstack/container_infra/requests/list_bay_models.rb index d7faae6c5..4aba2bd20 100644 --- a/lib/fog/openstack/container_infra/requests/list_bay_models.rb +++ b/lib/fog/openstack/container_infra/requests/list_bay_models.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def list_bay_models request( - :expects => [200], - :method => 'GET', - :path => "baymodels/detail" + expects: [200], + method: 'GET', + path: "baymodels/detail" ) end end @@ -18,44 +18,44 @@ def list_bay_models response.body = { "baymodels" => [ { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "k8s-bm2", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8", + "apiserver_port" => nil, + "name" => "k8s-bm2", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8", "links" => [ { - "href" => "http://10.164.180.104:9511/v1/baymodels/085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "rel" => "self" + "href" => "http://10.164.180.104:9511/v1/baymodels/085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "rel" => "self" }, { - "href" => "http://10.164.180.104:9511/baymodels/085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "rel" => "bookmark" + "href" => "http://10.164.180.104:9511/baymodels/085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "rel" => "bookmark" } ] } diff --git a/lib/fog/openstack/container_infra/requests/list_bays.rb b/lib/fog/openstack/container_infra/requests/list_bays.rb index 784913155..cd945e329 100644 --- a/lib/fog/openstack/container_infra/requests/list_bays.rb +++ b/lib/fog/openstack/container_infra/requests/list_bays.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def list_bays request( - :expects => [200], - :method => 'GET', - :path => "bays/detail" + expects: [200], + method: 'GET', + path: "bays/detail" ) end end @@ -18,30 +18,30 @@ def list_bays response.body = { "bays" => [ { - "status" => "CREATE_COMPLETE", - "uuid" => "746e779a-751a-456b-a3e9-c883d734946f", - "stack_id" => "9c6f1169-7300-4d08-a444-d2be38758719", - "created_at" => "2016-08-29T06:51:31+00:00", - "api_address" => "https://172.24.4.6:6443", - "discovery_url" => "https://discovery.etcd.io/cbeb580da58915809d59ee69348a84f3", - "updated_at" => "2016-08-29T06:53:24+00:00", - "master_count" => 1, - "coe_version" => "v1.2.0", - "baymodel_id" => "0562d357-8641-4759-8fed-8173f02c9633", - "master_addresses" => ["172.24.4.6"], - "node_count" => 1, - "node_addresses" => ["172.24.4.13"], - "status_reason" => "Stack CREATE completed successfully", + "status" => "CREATE_COMPLETE", + "uuid" => "746e779a-751a-456b-a3e9-c883d734946f", + "stack_id" => "9c6f1169-7300-4d08-a444-d2be38758719", + "created_at" => "2016-08-29T06:51:31+00:00", + "api_address" => "https://172.24.4.6:6443", + "discovery_url" => "https://discovery.etcd.io/cbeb580da58915809d59ee69348a84f3", + "updated_at" => "2016-08-29T06:53:24+00:00", + "master_count" => 1, + "coe_version" => "v1.2.0", + "baymodel_id" => "0562d357-8641-4759-8fed-8173f02c9633", + "master_addresses" => ["172.24.4.6"], + "node_count" => 1, + "node_addresses" => ["172.24.4.13"], + "status_reason" => "Stack CREATE completed successfully", "bay_create_timeout" => 60, - "name" => "k8s", - "links" => [ + "name" => "k8s", + "links" => [ { - "href" => "http://10.164.180.104:9511/v1/bays/746e779a-751a-456b-a3e9-c883d734946f", - "rel" => "self" + "href" => "http://10.164.180.104:9511/v1/bays/746e779a-751a-456b-a3e9-c883d734946f", + "rel" => "self" }, { - "href" => "http://10.164.180.104:9511/bays/746e779a-751a-456b-a3e9-c883d734946f", - "rel" => "bookmark" + "href" => "http://10.164.180.104:9511/bays/746e779a-751a-456b-a3e9-c883d734946f", + "rel" => "bookmark" } ] } diff --git a/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb b/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb index 7eb4a3c6d..ab4f26d26 100644 --- a/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb +++ b/lib/fog/openstack/container_infra/requests/list_cluster_templates.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def list_cluster_templates request( - :expects => [200], - :method => 'GET', - :path => "clustertemplates/detail" + expects: [200], + method: 'GET', + path: "clustertemplates/detail" ) end end @@ -18,36 +18,36 @@ def list_cluster_templates response.body = { "clustertemplates" => [ { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "0562d357-8641-4759-8fed-8173f02c9633", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "0562d357-8641-4759-8fed-8173f02c9633", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "k8s-bm", - "created_at" => "2016-08-26T09:34:41+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => false, - "dns_nameserver" => "8.8.8.8" + "apiserver_port" => nil, + "name" => "k8s-bm", + "created_at" => "2016-08-26T09:34:41+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => false, + "dns_nameserver" => "8.8.8.8" } ] } diff --git a/lib/fog/openstack/container_infra/requests/list_clusters.rb b/lib/fog/openstack/container_infra/requests/list_clusters.rb index 8f302f1a0..5ca91c762 100644 --- a/lib/fog/openstack/container_infra/requests/list_clusters.rb +++ b/lib/fog/openstack/container_infra/requests/list_clusters.rb @@ -1,12 +1,12 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def list_clusters request( - :expects => [200], - :method => 'GET', - :path => "clusters/detail" + expects: [200], + method: 'GET', + path: "clusters/detail" ) end end @@ -18,14 +18,14 @@ def list_clusters response.body = { "clusters" => [ { - "status" => "CREATE_IN_PROGRESS", + "status" => "CREATE_IN_PROGRESS", "cluster_template_id" => "0562d357-8641-4759-8fed-8173f02c9633", - "uuid" => "731387cf-a92b-4c36-981e-3271d63e5597", - "stack_id" => "31c1ee6c-081e-4f39-9f0f-f1d87a7defa1", - "master_count" => 1, - "create_timeout" => 60, - "node_count" => 1, - "name" => "k8s" + "uuid" => "731387cf-a92b-4c36-981e-3271d63e5597", + "stack_id" => "31c1ee6c-081e-4f39-9f0f-f1d87a7defa1", + "master_count" => 1, + "create_timeout" => 60, + "node_count" => 1, + "name" => "k8s" } ] } diff --git a/lib/fog/openstack/container_infra/requests/update_bay.rb b/lib/fog/openstack/container_infra/requests/update_bay.rb index 306225c7e..dd18c6489 100644 --- a/lib/fog/openstack/container_infra/requests/update_bay.rb +++ b/lib/fog/openstack/container_infra/requests/update_bay.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def update_bay(uuid_or_name, params) request( - :expects => [202, 200], - :method => 'PATCH', - :path => "bays/#{uuid_or_name}", - :body => Fog::JSON.encode(params) + expects: [202, 200], + method: 'PATCH', + path: "bays/#{uuid_or_name}", + body: Fog::JSON.encode(params) ) end end diff --git a/lib/fog/openstack/container_infra/requests/update_bay_model.rb b/lib/fog/openstack/container_infra/requests/update_bay_model.rb index 8db575ba8..93940e24b 100644 --- a/lib/fog/openstack/container_infra/requests/update_bay_model.rb +++ b/lib/fog/openstack/container_infra/requests/update_bay_model.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def update_bay_model(uuid_or_name, params) request( - :expects => [200], - :method => 'PATCH', - :path => "baymodels/#{uuid_or_name}", - :body => Fog::JSON.encode(params) + expects: [200], + method: 'PATCH', + path: "baymodels/#{uuid_or_name}", + body: Fog::JSON.encode(params) ) end end @@ -17,36 +17,36 @@ def update_bay_model(_uuid_or_name, _params) response = Excon::Response.new response.status = 200 response.body = { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "rename-test-bay-model", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8", + "apiserver_port" => nil, + "name" => "rename-test-bay-model", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8" } response end diff --git a/lib/fog/openstack/container_infra/requests/update_cluster.rb b/lib/fog/openstack/container_infra/requests/update_cluster.rb index 0cc20bb90..6746337b2 100644 --- a/lib/fog/openstack/container_infra/requests/update_cluster.rb +++ b/lib/fog/openstack/container_infra/requests/update_cluster.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def update_cluster(uuid_or_name, params) request( - :expects => [202, 200], - :method => 'PATCH', - :path => "clusters/#{uuid_or_name}", - :body => Fog::JSON.encode(params) + expects: [202, 200], + method: 'PATCH', + path: "clusters/#{uuid_or_name}", + body: Fog::JSON.encode(params) ) end end diff --git a/lib/fog/openstack/container_infra/requests/update_cluster_template.rb b/lib/fog/openstack/container_infra/requests/update_cluster_template.rb index 78e8cbf66..855ae9eca 100644 --- a/lib/fog/openstack/container_infra/requests/update_cluster_template.rb +++ b/lib/fog/openstack/container_infra/requests/update_cluster_template.rb @@ -1,13 +1,13 @@ module Fog module OpenStack - class ContainerInfra + class ContainerInfra class Real def update_cluster_template(uuid_or_name, params) request( - :expects => [200], - :method => 'PATCH', - :path => "clustertemplates/#{uuid_or_name}", - :body => Fog::JSON.encode(params) + expects: [200], + method: 'PATCH', + path: "clustertemplates/#{uuid_or_name}", + body: Fog::JSON.encode(params) ) end end @@ -17,36 +17,36 @@ def update_cluster_template(_uuid_or_name, _params) response = Excon::Response.new response.status = 200 response.body = { - "insecure_registry" => nil, - "http_proxy" => "http://10.164.177.169:8080", - "updated_at" => nil, - "floating_ip_enabled" => true, - "fixed_subnet" => nil, - "master_flavor_id" => nil, - "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", - "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", - "https_proxy" => "http://10.164.177.169:8080", - "tls_disabled" => false, - "keypair_id" => "kp", - "public" => false, - "labels" => {}, - "docker_volume_size" => 3, - "server_type" => "vm", - "external_network_id" => "public", - "cluster_distro" => "fedora-atomic", - "image_id" => "fedora-atomic-latest", - "volume_driver" => "cinder", - "registry_enabled" => false, + "insecure_registry" => nil, + "http_proxy" => "http://10.164.177.169:8080", + "updated_at" => nil, + "floating_ip_enabled" => true, + "fixed_subnet" => nil, + "master_flavor_id" => nil, + "uuid" => "085e1c4d-4f68-4bfd-8462-74b9e14e4f39", + "no_proxy" => "10.0.0.0/8,172.0.0.0/8,192.0.0.0/8,localhost", + "https_proxy" => "http://10.164.177.169:8080", + "tls_disabled" => false, + "keypair_id" => "kp", + "public" => false, + "labels" => {}, + "docker_volume_size" => 3, + "server_type" => "vm", + "external_network_id" => "public", + "cluster_distro" => "fedora-atomic", + "image_id" => "fedora-atomic-latest", + "volume_driver" => "cinder", + "registry_enabled" => false, "docker_storage_driver" => "devicemapper", - "apiserver_port" => nil, - "name" => "rename-test-cluster-template", - "created_at" => "2016-08-29T02:08:08+00:00", - "network_driver" => "flannel", - "fixed_network" => nil, - "coe" => "kubernetes", - "flavor_id" => "m1.small", - "master_lb_enabled" => true, - "dns_nameserver" => "8.8.8.8" + "apiserver_port" => nil, + "name" => "rename-test-cluster-template", + "created_at" => "2016-08-29T02:08:08+00:00", + "network_driver" => "flannel", + "fixed_network" => nil, + "coe" => "kubernetes", + "flavor_id" => "m1.small", + "master_lb_enabled" => true, + "dns_nameserver" => "8.8.8.8" } response end diff --git a/lib/fog/openstack/core.rb b/lib/fog/openstack/core.rb index 68198b35e..7df5a5362 100644 --- a/lib/fog/openstack/core.rb +++ b/lib/fog/openstack/core.rb @@ -128,7 +128,7 @@ def headers(additional_headers) { 'Content-Type' => 'application/json', - 'Accept' => 'application/json', + 'Accept' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(additional_headers) end @@ -190,6 +190,7 @@ def setup(options) unless missing_credentials.empty? raise ArgumentError, "Missing required arguments: #{missing_credentials.join(', ')}" end + @openstack_can_reauthenticate = true end diff --git a/lib/fog/openstack/dns/v1.rb b/lib/fog/openstack/dns/v1.rb index 1788f37b4..8c501c57c 100644 --- a/lib/fog/openstack/dns/v1.rb +++ b/lib/fog/openstack/dns/v1.rb @@ -27,22 +27,22 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :domains => [{ - "id" => "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3", - "name" => "example.org.", - "email" => "joe@example.org", - "ttl" => 7200, - "serial" => 1_404_757_531, + domains: [{ + "id" => "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3", + "name" => "example.org.", + "email" => "joe@example.org", + "ttl" => 7200, + "serial" => 1_404_757_531, "description" => "This is an example zone.", - "created_at" => "2014-07-07T18:25:31.275934", - "updated_at" => '' + "created_at" => "2014-07-07T18:25:31.275934", + "updated_at" => '' }], - :quota => { - "api_export_size" => 1000, + quota: { + "api_export_size" => 1000, "recordset_records" => 20, - "domain_records" => 500, + "domain_records" => 500, "domain_recordsets" => 500, - "domains" => 100 + "domains" => 100 } } end @@ -65,15 +65,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].detect { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -87,11 +87,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/dns/v1/requests/get_quota.rb b/lib/fog/openstack/dns/v1/requests/get_quota.rb index 38df7615a..c4b59941f 100644 --- a/lib/fog/openstack/dns/v1/requests/get_quota.rb +++ b/lib/fog/openstack/dns/v1/requests/get_quota.rb @@ -5,9 +5,9 @@ class V1 class Real def get_quota(project_id) request( - :expects => 200, - :method => 'GET', - :path => "quotas/#{project_id}" + expects: 200, + method: 'GET', + path: "quotas/#{project_id}" ) end end diff --git a/lib/fog/openstack/dns/v1/requests/list_domains.rb b/lib/fog/openstack/dns/v1/requests/list_domains.rb index 57e2db2c2..559d235b5 100644 --- a/lib/fog/openstack/dns/v1/requests/list_domains.rb +++ b/lib/fog/openstack/dns/v1/requests/list_domains.rb @@ -5,10 +5,10 @@ class V1 class Real def list_domains(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'domains', - :query => options + expects: 200, + method: 'GET', + path: 'domains', + query: options ) end end @@ -17,7 +17,7 @@ class Mock def list_domains(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'domains' => data[:domains]} + response.body = { 'domains' => data[:domains] } response end end diff --git a/lib/fog/openstack/dns/v1/requests/update_quota.rb b/lib/fog/openstack/dns/v1/requests/update_quota.rb index 0009f6e74..77bef5af3 100644 --- a/lib/fog/openstack/dns/v1/requests/update_quota.rb +++ b/lib/fog/openstack/dns/v1/requests/update_quota.rb @@ -5,10 +5,10 @@ class V1 class Real def update_quota(project_id, options = {}) request( - :body => Fog::JSON.encode(options), - :expects => 200, - :method => 'PUT', - :path => "quotas/#{project_id}" + body: Fog::JSON.encode(options), + expects: 200, + method: 'PUT', + path: "quotas/#{project_id}" ) end end diff --git a/lib/fog/openstack/dns/v2.rb b/lib/fog/openstack/dns/v2.rb index 782ae0de0..0bd00b5cc 100644 --- a/lib/fog/openstack/dns/v2.rb +++ b/lib/fog/openstack/dns/v2.rb @@ -4,7 +4,7 @@ module Fog module OpenStack class DNS class V2 < Fog::Service - SUPPORTED_VERSIONS = /v2/ + SUPPORTED_VERSIONS = /v2/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -60,7 +60,6 @@ class V2 < Fog::Service request :get_zone_transfer_accept request :list_zone_transfer_accepts - def self.setup_headers(options) # user needs to have admin privileges to ask for all projects all_projects = options.delete(:all_projects) || false @@ -69,7 +68,7 @@ def self.setup_headers(options) # don't ask for all and one project at the same time project_id = options.delete(:project_id) unless all_projects - headers = {'X-Auth-All-Projects' => all_projects} + headers = { 'X-Auth-All-Projects' => all_projects } headers['X-Auth-Sudo-Project-Id'] = project_id unless project_id.nil? [headers, options] @@ -79,111 +78,111 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :zones => [{ - "id" => "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3", - "pool_id" => "572ba08c-d929-4c70-8e42-03824bb24ca2", - "project_id" => "4335d1f0-f793-11e2-b778-0800200c9a66", - "name" => "example.org.", - "email" => "joe@example.org", - "ttl" => 7200, - "serial" => 1_404_757_531, - "status" => "ACTIVE", - "action" => "NONE", - "description" => "This is an example zone.", - "masters" => [], - "type" => "PRIMARY", + zones: [{ + "id" => "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3", + "pool_id" => "572ba08c-d929-4c70-8e42-03824bb24ca2", + "project_id" => "4335d1f0-f793-11e2-b778-0800200c9a66", + "name" => "example.org.", + "email" => "joe@example.org", + "ttl" => 7200, + "serial" => 1_404_757_531, + "status" => "ACTIVE", + "action" => "NONE", + "description" => "This is an example zone.", + "masters" => [], + "type" => "PRIMARY", "transferred_at" => '', - "version" => 1, - "created_at" => "2014-07-07T18:25:31.275934", - "updated_at" => '', - "links" => { + "version" => 1, + "created_at" => "2014-07-07T18:25:31.275934", + "updated_at" => '', + "links" => { "self" => "https://127.0.0.1:9001/v2/zones/a86dba58-0043-4cc6-a1bb-69d5e86f3ca3" } }], - :pools => { + pools: { "metadata" => { "total_count" => 2 }, - "links" => { + "links" => { "self" => "http://127.0.0.1:9001/v2/pools" }, - "pools" => [ + "pools" => [ { "description" => '', - "id" => "794ccc2c-d751-44fe-b57f-8894c9f5c842", - "project_id" => '', - "created_at" => "2015-02-18T22:18:58.000000", - "attributes" => '', - "ns_records" => [ + "id" => "794ccc2c-d751-44fe-b57f-8894c9f5c842", + "project_id" => '', + "created_at" => "2015-02-18T22:18:58.000000", + "attributes" => '', + "ns_records" => [ { "hostname" => "ns1.example.org.", "priority" => 1 } ], - "links" => { + "links" => { "self" => "http://127.0.0.1:9001/v2/pools/794ccc2c-d751-44fe-b57f-8894c9f5c842" }, - "name" => "default", - "updated_at" => "2015-02-19T15:59:44.000000" + "name" => "default", + "updated_at" => "2015-02-19T15:59:44.000000" }, { "description" => '', - "id" => "d1716333-8c16-490f-85ee-29af36907605", - "project_id" => "noauth-project", - "created_at" => "2015-02-23T21:56:33.000000", - "attributes" => '', - "ns_records" => [ + "id" => "d1716333-8c16-490f-85ee-29af36907605", + "project_id" => "noauth-project", + "created_at" => "2015-02-23T21:56:33.000000", + "attributes" => '', + "ns_records" => [ { "hostname" => "ns2.example.org.", "priority" => 1 } ], - "links" => { + "links" => { "self" => "http://127.0.0.1:9001/v2/pools/d1716333-8c16-490f-85ee-29af36907605" }, - "name" => "example_pool", - "updated_at" => '' + "name" => "example_pool", + "updated_at" => '' } ] }, - :quota => { - "api_export_size" => 1000, + quota: { + "api_export_size" => 1000, "recordset_records" => 20, - "zone_records" => 500, - "zone_recordsets" => 500, - "zones" => 100 + "zone_records" => 500, + "zone_recordsets" => 500, + "zones" => 100 }, - :recordsets => { + recordsets: { "recordsets" => [{ "description" => "This is an example record set.", - "links" => { + "links" => { "self" => "https://127.0.0.1:9001/v2/zones/2150b1bf-dee2-4221-9d85-11f7886fb15f/recordsets/f7b10e9b-0cae-4a91-b162-562bc6096648" }, - "updated_at" => '', - "records" => [ + "updated_at" => '', + "records" => [ "10.1.0.2" ], - "ttl" => 3600, - "id" => "f7b10e9b-0cae-4a91-b162-562bc6096648", - "name" => "example.org.", - "project_id" => "4335d1f0-f793-11e2-b778-0800200c9a66", - "zone_id" => "2150b1bf-dee2-4221-9d85-11f7886fb15f", - "zone_name" => "example.com.", - "created_at" => "2014-10-24T19:59:44.000000", - "version" => 1, - "type" => "A", - "status" => "ACTIVE", - "action" => "NONE" + "ttl" => 3600, + "id" => "f7b10e9b-0cae-4a91-b162-562bc6096648", + "name" => "example.org.", + "project_id" => "4335d1f0-f793-11e2-b778-0800200c9a66", + "zone_id" => "2150b1bf-dee2-4221-9d85-11f7886fb15f", + "zone_name" => "example.com.", + "created_at" => "2014-10-24T19:59:44.000000", + "version" => 1, + "type" => "A", + "status" => "ACTIVE", + "action" => "NONE" }], - "links" => { + "links" => { "self" => "http://127.0.0.1:9001/v2/recordsets?limit=1", "next" => "http://127.0.0.1:9001/v2/recordsets?limit=1&marker=45fd892d-7a67-4f65-9df0-87273f228d6c" }, - "metadata" => { + "metadata" => { "total_count" => 2 } }, - :zone_transfer_requests => { + zone_transfer_requests: { "transfer_requests" => [ { "created_at" => "2014-07-17T20:34:40.882579", @@ -215,44 +214,44 @@ def self.data "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_requests" } }, - :zone_transfer_accepts => { + zone_transfer_accepts: { "metadata" => { - "total_count" => 2 - }, - "links" => { - "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_accepts" - }, - "transfer_accepts" => [ - { - "status" => "COMPLETE", - "zone_id" => "8db93d1a-59e3-4143-a393-5821abea0a46", - "links" => { - "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_accepts/afb4222b-18b3-44b3-9f54-e0dfdba1be44", - "zone" => "http://127.0.0.1:9001/v2/zones/8db93d1a-59e3-4143-a393-5821abea0a46" - }, - "created_at" => "2016-06-01 05:35:35", - "updated_at" => "2016-06-01 05:35:35", - "key" => nil, - "project_id" => "85604ecfb5334b50bd40ca53fc1d710f", - "id" => "afb4222b-18b3-44b3-9f54-e0dfdba1be44", - "zone_transfer_request_id" => "d223f7ef-77a6-459e-abd3-b4dbc97338e7" - }, - { - "status" => "COMPLETE", - "zone_id" => "925bfc45-8901-4aca-aa12-18afaf0879e2", - "links" => { - "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_accepts/ecbc7091-c498-4ec4-9893-68b06297fe50", - "zone" => "http://127.0.0.1:9001/v2/zones/925bfc45-8901-4aca-aa12-18afaf0879e2" - }, - "created_at" => "2016-06-01 10:06:36", - "updated_at" => "2016-06-01 10:06:37", - "key" => nil, - "project_id" => "85604ecfb5334b50bd40ca53fc1d710f", - "id" => "ecbc7091-c498-4ec4-9893-68b06297fe50", - "zone_transfer_request_id" => "94cf9bd3-4137-430b-bf75-4e690430258c" - } - ] - } + "total_count" => 2 + }, + "links" => { + "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_accepts" + }, + "transfer_accepts" => [ + { + "status" => "COMPLETE", + "zone_id" => "8db93d1a-59e3-4143-a393-5821abea0a46", + "links" => { + "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_accepts/afb4222b-18b3-44b3-9f54-e0dfdba1be44", + "zone" => "http://127.0.0.1:9001/v2/zones/8db93d1a-59e3-4143-a393-5821abea0a46" + }, + "created_at" => "2016-06-01 05:35:35", + "updated_at" => "2016-06-01 05:35:35", + "key" => nil, + "project_id" => "85604ecfb5334b50bd40ca53fc1d710f", + "id" => "afb4222b-18b3-44b3-9f54-e0dfdba1be44", + "zone_transfer_request_id" => "d223f7ef-77a6-459e-abd3-b4dbc97338e7" + }, + { + "status" => "COMPLETE", + "zone_id" => "925bfc45-8901-4aca-aa12-18afaf0879e2", + "links" => { + "self" => "http://127.0.0.1:9001/v2/zones/tasks/transfer_accepts/ecbc7091-c498-4ec4-9893-68b06297fe50", + "zone" => "http://127.0.0.1:9001/v2/zones/925bfc45-8901-4aca-aa12-18afaf0879e2" + }, + "created_at" => "2016-06-01 10:06:36", + "updated_at" => "2016-06-01 10:06:37", + "key" => nil, + "project_id" => "85604ecfb5334b50bd40ca53fc1d710f", + "id" => "ecbc7091-c498-4ec4-9893-68b06297fe50", + "zone_transfer_request_id" => "94cf9bd3-4137-430b-bf75-4e690430258c" + } + ] + } } end end @@ -274,15 +273,15 @@ def initialize(options = {}) management_url.path = '/v2' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].detect { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -296,11 +295,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/dns/v2/models/pools.rb b/lib/fog/openstack/dns/v2/models/pools.rb index 4c81a4118..9d693468f 100644 --- a/lib/fog/openstack/dns/v2/models/pools.rb +++ b/lib/fog/openstack/dns/v2/models/pools.rb @@ -14,7 +14,7 @@ def all(options = {}) def find_by_id(id, options = {}) pool_hash = service.get_pool(id, options).body - new(pool_hash.merge(:service => service)) + new(pool_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/dns/v2/models/recordset.rb b/lib/fog/openstack/dns/v2/models/recordset.rb index fca03eaf0..bbe3c2a40 100644 --- a/lib/fog/openstack/dns/v2/models/recordset.rb +++ b/lib/fog/openstack/dns/v2/models/recordset.rb @@ -25,6 +25,7 @@ class Recordset < Fog::OpenStack::Model def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + requires :zone_id, :name, :type, :records merge_attributes(service.create_recordset(zone_id, name, type, records, attributes).body) true diff --git a/lib/fog/openstack/dns/v2/models/recordsets.rb b/lib/fog/openstack/dns/v2/models/recordsets.rb index 293b56d29..027932db5 100644 --- a/lib/fog/openstack/dns/v2/models/recordsets.rb +++ b/lib/fog/openstack/dns/v2/models/recordsets.rb @@ -14,7 +14,7 @@ def all(options = {}) def find_by_id(zone_id, id, options = {}) recordset_hash = service.get_recordset(zone_id, id, options).body - new(recordset_hash.merge(:service => service)) + new(recordset_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/dns/v2/models/zone.rb b/lib/fog/openstack/dns/v2/models/zone.rb index 3fc16d48f..4762c9c29 100644 --- a/lib/fog/openstack/dns/v2/models/zone.rb +++ b/lib/fog/openstack/dns/v2/models/zone.rb @@ -27,6 +27,7 @@ class Zone < Fog::OpenStack::Model def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + requires :name, :email merge_attributes(service.create_zone(name, email, attributes).body) true diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb index 5a68159c7..ae7fba57d 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_accepts.rb @@ -14,7 +14,7 @@ def all(options = {}) def find_by_id(id) zone_transfer_accept_hash = service.get_zone_transfer_accept(id).body - new(zone_transfer_accept_hash.merge(:service => service)) + new(zone_transfer_accept_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb index 5610145d0..0aceaf52d 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_request.rb @@ -21,24 +21,22 @@ def save if persisted? update(description: description, target_project_id: target_project_id) else - merge_attributes(ervice.create_zone_transfer_request(zone_id, { - :target_project_id => target_project_id, - :description => description, - :project_id => project_id - })) + merge_attributes(ervice.create_zone_transfer_request(zone_id, + target_project_id: target_project_id, + description: description, + project_id: project_id)) end true end def update(options = nil) requires :id - merge_attributes(ervice.update_zone_transfer_request(id,options[:description],{ - :target_project_id => options[:target_project_id] - })) + merge_attributes(ervice.update_zone_transfer_request(id, options[:description], + target_project_id: options[:target_project_id])) self end - def destroy(options = {}) + def destroy(_options = {}) requires :id service.delete_zone_transfer_request(id) true diff --git a/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb b/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb index 66d4323b6..05086c47a 100644 --- a/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb +++ b/lib/fog/openstack/dns/v2/models/zone_transfer_requests.rb @@ -14,7 +14,7 @@ def all(options = {}) def find_by_id(id) zone_transfer_request_hash = service.get_zone_transfer_request(id).body - new(zone_transfer_request_hash.merge(:service => service)) + new(zone_transfer_request_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/dns/v2/models/zones.rb b/lib/fog/openstack/dns/v2/models/zones.rb index 132cff248..b903f10f1 100644 --- a/lib/fog/openstack/dns/v2/models/zones.rb +++ b/lib/fog/openstack/dns/v2/models/zones.rb @@ -14,7 +14,7 @@ def all(options = {}) def find_by_id(id, options = {}) zone_hash = service.get_zone(id, options).body - new(zone_hash.merge(:service => service)) + new(zone_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/dns/v2/requests/create_recordset.rb b/lib/fog/openstack/dns/v2/requests/create_recordset.rb index d489b2698..8af52b5a6 100644 --- a/lib/fog/openstack/dns/v2/requests/create_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/create_recordset.rb @@ -5,8 +5,8 @@ class V2 class Real def create_recordset(zone_id, name, type, records, options = {}) data = { - 'name' => name, - 'type' => type, + 'name' => name, + 'type' => type, 'records' => records } @@ -17,10 +17,10 @@ def create_recordset(zone_id, name, type, records, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 202, - :method => 'POST', - :path => "zones/#{zone_id}/recordsets" + body: Fog::JSON.encode(data), + expects: 202, + method: 'POST', + path: "zones/#{zone_id}/recordsets" ) end end diff --git a/lib/fog/openstack/dns/v2/requests/create_zone.rb b/lib/fog/openstack/dns/v2/requests/create_zone.rb index 311e72847..5d1a11912 100644 --- a/lib/fog/openstack/dns/v2/requests/create_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone.rb @@ -5,7 +5,7 @@ class V2 class Real def create_zone(name, email, options = {}) data = { - 'name' => name, + 'name' => name, 'email' => email } @@ -16,10 +16,10 @@ def create_zone(name, email, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 202, - :method => 'POST', - :path => "zones" + body: Fog::JSON.encode(data), + expects: 202, + method: 'POST', + path: "zones" ) end end diff --git a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb index 1b71288f3..8662b27e3 100644 --- a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_accept.rb @@ -5,24 +5,24 @@ class V2 class Real def create_zone_transfer_accept(key, zone_transfer_request_id, options = {}) data = { - :key => key, - :zone_transfer_request_id => zone_transfer_request_id + key: key, + zone_transfer_request_id: zone_transfer_request_id } headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :headers => headers, - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'POST', - :path => "zones/tasks/transfer_accepts" + headers: headers, + body: Fog::JSON.encode(data), + expects: 200, + method: 'POST', + path: "zones/tasks/transfer_accepts" ) end end class Mock - def create_zone_transfer_accept(key, zone_transfer_request_id) + def create_zone_transfer_accept(_key, _zone_transfer_request_id) response = Excon::Response.new response.status = 200 response.body = data[:zone_transfer_accepts]["transfer_accepts"].first diff --git a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb index ba435a7ee..20fc4b873 100644 --- a/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/create_zone_transfer_request.rb @@ -1,4 +1,3 @@ - module Fog module OpenStack class DNS @@ -6,22 +5,21 @@ class V2 class Real def create_zone_transfer_request(zone_id, options = {}) vanilla_options = [:target_project_id, :description, :project_id] - data = vanilla_options.inject({}) do |result,option| + data = vanilla_options.each_with_object({}) do |option, result| result[option] = options[option] if options[option] - result end request( - :body => Fog::JSON.encode(data), - :expects => 201, - :method => 'POST', - :path => "zones/#{zone_id}/tasks/transfer_requests" + body: Fog::JSON.encode(data), + expects: 201, + method: 'POST', + path: "zones/#{zone_id}/tasks/transfer_requests" ) end end class Mock - def create_zone_transfer_request(zone_id, options = {}) + def create_zone_transfer_request(_zone_id, _options = {}) response = Excon::Response.new response.status = 201 response.body = data[:zone_transfer_requests]["transfer_requests"].first diff --git a/lib/fog/openstack/dns/v2/requests/delete_recordset.rb b/lib/fog/openstack/dns/v2/requests/delete_recordset.rb index 4ea01a619..d1a52d58b 100644 --- a/lib/fog/openstack/dns/v2/requests/delete_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_recordset.rb @@ -6,10 +6,10 @@ class Real def delete_recordset(zone_id, id, options = {}) headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 202, - :method => 'DELETE', - :path => "zones/#{zone_id}/recordsets/#{id}", - :headers => headers + expects: 202, + method: 'DELETE', + path: "zones/#{zone_id}/recordsets/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/delete_zone.rb b/lib/fog/openstack/dns/v2/requests/delete_zone.rb index 566b8ed81..0355b7a53 100644 --- a/lib/fog/openstack/dns/v2/requests/delete_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_zone.rb @@ -6,10 +6,10 @@ class Real def delete_zone(id, options = {}) headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 202, - :method => 'DELETE', - :path => "zones/#{id}", - :headers => headers + expects: 202, + method: 'DELETE', + path: "zones/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb index 957dc5f8b..9aa729d7c 100644 --- a/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/delete_zone_transfer_request.rb @@ -1,4 +1,3 @@ - module Fog module OpenStack class DNS @@ -6,15 +5,15 @@ class V2 class Real def delete_zone_transfer_request(zone_transfer_request_id) request( - :expects => 204, - :method => 'DELETE', - :path => "zones/tasks/transfer_requests/#{zone_transfer_request_id}" + expects: 204, + method: 'DELETE', + path: "zones/tasks/transfer_requests/#{zone_transfer_request_id}" ) end end class Mock - def delete_zone_transfer_request(zone_transfer_request_id) + def delete_zone_transfer_request(_zone_transfer_request_id) response = Excon::Response.new response.status = 204 response diff --git a/lib/fog/openstack/dns/v2/requests/get_pool.rb b/lib/fog/openstack/dns/v2/requests/get_pool.rb index 780a6b19a..2c271b2bc 100644 --- a/lib/fog/openstack/dns/v2/requests/get_pool.rb +++ b/lib/fog/openstack/dns/v2/requests/get_pool.rb @@ -6,10 +6,10 @@ class Real def get_pool(id, options = {}) headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 200, - :method => 'GET', - :path => "pools/#{id}", - :headers => headers + expects: 200, + method: 'GET', + path: "pools/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/get_quota.rb b/lib/fog/openstack/dns/v2/requests/get_quota.rb index 584af54a8..dc08f4635 100644 --- a/lib/fog/openstack/dns/v2/requests/get_quota.rb +++ b/lib/fog/openstack/dns/v2/requests/get_quota.rb @@ -4,13 +4,13 @@ class DNS class V2 class Real def get_quota(project_id = nil) - headers, _options = Fog::OpenStack::DNS::V2.setup_headers(:all_projects => !project_id.nil?) + headers, _options = Fog::OpenStack::DNS::V2.setup_headers(all_projects: !project_id.nil?) request( - :expects => 200, - :method => 'GET', - :path => "quotas/#{project_id}", - :headers => headers + expects: 200, + method: 'GET', + path: "quotas/#{project_id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/get_recordset.rb b/lib/fog/openstack/dns/v2/requests/get_recordset.rb index 2d8c64a60..a2396e3ae 100644 --- a/lib/fog/openstack/dns/v2/requests/get_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/get_recordset.rb @@ -6,10 +6,10 @@ class Real def get_recordset(zone_id, id, options = {}) headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 200, - :method => 'GET', - :path => "zones/#{zone_id}/recordsets/#{id}", - :headers => headers + expects: 200, + method: 'GET', + path: "zones/#{zone_id}/recordsets/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/get_zone.rb b/lib/fog/openstack/dns/v2/requests/get_zone.rb index ab0f42b8e..fcbb47734 100644 --- a/lib/fog/openstack/dns/v2/requests/get_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone.rb @@ -6,10 +6,10 @@ class Real def get_zone(id, options = {}) headers, _options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 200, - :method => 'GET', - :path => "zones/#{id}", - :headers => headers + expects: 200, + method: 'GET', + path: "zones/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb index a4c57d490..30b8ec44d 100644 --- a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_accept.rb @@ -5,9 +5,9 @@ class V2 class Real def get_zone_transfer_accept(zone_transfer_accept_id) request( - :expects => 200, - :method => 'GET', - :path => "zones/tasks/transfer_requests/#{zone_transfer_accept_id}" + expects: 200, + method: 'GET', + path: "zones/tasks/transfer_requests/#{zone_transfer_accept_id}" ) end end diff --git a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb index d98e1a36a..d7c1cdb42 100644 --- a/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/get_zone_transfer_request.rb @@ -1,4 +1,3 @@ - module Fog module OpenStack class DNS @@ -6,9 +5,9 @@ class V2 class Real def get_zone_transfer_request(zone_transfer_request_id) request( - :expects => 200, - :method => 'GET', - :path => "zones/tasks/transfer_requests/#{zone_transfer_request_id}" + expects: 200, + method: 'GET', + path: "zones/tasks/transfer_requests/#{zone_transfer_request_id}" ) end end diff --git a/lib/fog/openstack/dns/v2/requests/list_pools.rb b/lib/fog/openstack/dns/v2/requests/list_pools.rb index 5e30111e6..a027b82ac 100644 --- a/lib/fog/openstack/dns/v2/requests/list_pools.rb +++ b/lib/fog/openstack/dns/v2/requests/list_pools.rb @@ -7,11 +7,11 @@ def list_pools(options = {}) headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 200, - :method => 'GET', - :path => 'pools', - :query => options, - :headers => headers + expects: 200, + method: 'GET', + path: 'pools', + query: options, + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/list_recordsets.rb b/lib/fog/openstack/dns/v2/requests/list_recordsets.rb index 8f46c4d17..4dcd29aea 100644 --- a/lib/fog/openstack/dns/v2/requests/list_recordsets.rb +++ b/lib/fog/openstack/dns/v2/requests/list_recordsets.rb @@ -22,11 +22,11 @@ def list_recordsets(zone_id = nil, options = {}) headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 200, - :method => 'GET', - :path => path, - :query => options, - :headers => headers + expects: 200, + method: 'GET', + path: path, + query: options, + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb index d326b401f..c62ec6f72 100644 --- a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_accepts.rb @@ -3,18 +3,18 @@ module OpenStack class DNS class V2 class Real - def list_zone_transfer_accepts(options={}) + def list_zone_transfer_accepts(options = {}) request( - :expects => 200, - :method => 'GET', - :path => "zones/tasks/transfer_accepts", - :query => options + expects: 200, + method: 'GET', + path: "zones/tasks/transfer_accepts", + query: options ) end end class Mock - def list_zone_transfer_accepts(options={}) + def list_zone_transfer_accepts(_options = {}) response = Excon::Response.new response.status = 200 response.body = data[:zone_transfer_accepts]["transfer_accepts"] diff --git a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb index 8357c0f86..4948704ff 100644 --- a/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zone_transfer_requests.rb @@ -3,18 +3,18 @@ module OpenStack class DNS class V2 class Real - def list_zone_transfer_requests(options={}) + def list_zone_transfer_requests(options = {}) request( - :expects => 200, - :method => 'GET', - :path => "zones/tasks/transfer_requests", - :query => options + expects: 200, + method: 'GET', + path: "zones/tasks/transfer_requests", + query: options ) end end class Mock - def list_zone_transfer_requests(options={}) + def list_zone_transfer_requests(_options = {}) response = Excon::Response.new response.status = 200 response.body = data[:zone_transfer_requests]["transfer_requests"] diff --git a/lib/fog/openstack/dns/v2/requests/list_zones.rb b/lib/fog/openstack/dns/v2/requests/list_zones.rb index 498494700..269601706 100644 --- a/lib/fog/openstack/dns/v2/requests/list_zones.rb +++ b/lib/fog/openstack/dns/v2/requests/list_zones.rb @@ -7,11 +7,11 @@ def list_zones(options = {}) headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :expects => 200, - :method => 'GET', - :path => 'zones', - :query => options, - :headers => headers + expects: 200, + method: 'GET', + path: 'zones', + query: options, + headers: headers ) end end @@ -20,7 +20,7 @@ class Mock def list_zones(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'zones' => data[:zones]} + response.body = { 'zones' => data[:zones] } response end end diff --git a/lib/fog/openstack/dns/v2/requests/update_quota.rb b/lib/fog/openstack/dns/v2/requests/update_quota.rb index 3431c7988..18a655c5a 100644 --- a/lib/fog/openstack/dns/v2/requests/update_quota.rb +++ b/lib/fog/openstack/dns/v2/requests/update_quota.rb @@ -7,11 +7,11 @@ def update_quota(project_id, options = {}) headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :body => Fog::JSON.encode(options), - :expects => 200, - :method => 'PATCH', - :path => "quotas/#{project_id}", - :headers => headers + body: Fog::JSON.encode(options), + expects: 200, + method: 'PATCH', + path: "quotas/#{project_id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/update_recordset.rb b/lib/fog/openstack/dns/v2/requests/update_recordset.rb index 654c4e2cd..812790fd1 100644 --- a/lib/fog/openstack/dns/v2/requests/update_recordset.rb +++ b/lib/fog/openstack/dns/v2/requests/update_recordset.rb @@ -7,11 +7,11 @@ def update_recordset(zone_id, id, options = {}) headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :body => Fog::JSON.encode(options), - :expects => 202, - :method => 'PUT', - :path => "zones/#{zone_id}/recordsets/#{id}", - :headers => headers + body: Fog::JSON.encode(options), + expects: 202, + method: 'PUT', + path: "zones/#{zone_id}/recordsets/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/update_zone.rb b/lib/fog/openstack/dns/v2/requests/update_zone.rb index 345eaeab6..8bfb852d1 100644 --- a/lib/fog/openstack/dns/v2/requests/update_zone.rb +++ b/lib/fog/openstack/dns/v2/requests/update_zone.rb @@ -7,11 +7,11 @@ def update_zone(id, options = {}) headers, options = Fog::OpenStack::DNS::V2.setup_headers(options) request( - :body => Fog::JSON.encode(options), - :expects => 202, - :method => 'PATCH', - :path => "zones/#{id}", - :headers => headers + body: Fog::JSON.encode(options), + expects: 202, + method: 'PATCH', + path: "zones/#{id}", + headers: headers ) end end diff --git a/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb b/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb index 61980f621..d68a6a28b 100644 --- a/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb +++ b/lib/fog/openstack/dns/v2/requests/update_zone_transfer_request.rb @@ -3,29 +3,28 @@ module OpenStack class DNS class V2 class Real - def update_zone_transfer_request(zone_transfer_request_id,description,options={}) + def update_zone_transfer_request(zone_transfer_request_id, _description, options = {}) vanilla_options = [:target_project_id] - data = vanilla_options.inject({}) do |result,option| + data = vanilla_options.each_with_object({}) do |option, result| result[option] = options[option] if options[option] - result end request( - :expects => 200, - :method => 'PATCH', - :path => "zones/tasks/transfer_requests/#{zone_transfer_request_id}", - :body => Fog::JSON.encode(data) + expects: 200, + method: 'PATCH', + path: "zones/tasks/transfer_requests/#{zone_transfer_request_id}", + body: Fog::JSON.encode(data) ) end end class Mock - def update_zone_transfer_request(zone_transfer_request_id,description,options={}) + def update_zone_transfer_request(zone_transfer_request_id, description, _options = {}) response = Excon::Response.new response.status = 200 request = data[:zone_transfer_requests]["transfer_requests"] request.id = zone_transfer_request_id - request.description =description + request.description = description response.body = request response end diff --git a/lib/fog/openstack/event.rb b/lib/fog/openstack/event.rb index b03b41593..e2f0a18a9 100644 --- a/lib/fog/openstack/event.rb +++ b/lib/fog/openstack/event.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class Event < Fog::Service - SUPPORTED_VERSIONS = /v2/ + SUPPORTED_VERSIONS = /v2/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -29,8 +29,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => {}, - :tenants => {} + users: {}, + tenants: {} } end end @@ -52,15 +52,15 @@ def initialize(options = {}) management_url.path = '/v2' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -74,10 +74,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/event/requests/get_event.rb b/lib/fog/openstack/event/requests/get_event.rb index 86c28f7e6..2ecdc1939 100644 --- a/lib/fog/openstack/event/requests/get_event.rb +++ b/lib/fog/openstack/event/requests/get_event.rb @@ -4,9 +4,9 @@ class Event class Real def get_event(message_id) request( - :expects => 200, - :method => 'GET', - :path => "events/#{message_id}" + expects: 200, + method: 'GET', + path: "events/#{message_id}" ) end end @@ -17,7 +17,7 @@ def get_event(_message_id) response.status = 200 response.body = { 'event_type' => 'compute.instance.create', - 'message_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'message_id' => 'd646b40dea6347dfb8caee2da1484c56' } response end diff --git a/lib/fog/openstack/event/requests/list_events.rb b/lib/fog/openstack/event/requests/list_events.rb index 8172f75f8..bab36275b 100644 --- a/lib/fog/openstack/event/requests/list_events.rb +++ b/lib/fog/openstack/event/requests/list_events.rb @@ -18,10 +18,10 @@ def list_events(options = []) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'GET', - :path => 'events' + body: Fog::JSON.encode(data), + expects: 200, + method: 'GET', + path: 'events' ) end end @@ -32,7 +32,7 @@ def list_events(_options = {}) response.status = 200 response.body = [{ 'event_type' => 'compute.instance.create', - 'message_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'message_id' => 'd646b40dea6347dfb8caee2da1484c56' }] response end diff --git a/lib/fog/openstack/identity/v2.rb b/lib/fog/openstack/identity/v2.rb index 31efe3fad..af41eca88 100644 --- a/lib/fog/openstack/identity/v2.rb +++ b/lib/fog/openstack/identity/v2.rb @@ -82,11 +82,11 @@ def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => @users, - :roles => @roles, - :tenants => @tenants, - :ec2_credentials => @ec2_credentials, - :user_tenant_membership => @user_tenant_membership + users: @users, + roles: @roles, + tenants: @tenants, + ec2_credentials: @ec2_credentials, + user_tenant_membership: @user_tenant_membership } end end @@ -122,7 +122,7 @@ def initialize(options = {}) else @current_tenant_id = Fog::Mock.random_hex(32) @current_tenant = data[:tenants][@current_tenant_id] = { - 'id' => @current_tenant_id, + 'id' => @current_tenant_id, 'name' => @openstack_tenant } end @@ -140,11 +140,11 @@ def initialize(options = {}) else @current_user_id = Fog::Mock.random_hex(32) @current_user = data[:users][@current_user_id] = { - 'id' => @current_user_id, - 'name' => @openstack_username, - 'email' => "#{@openstack_username}@mock.com", + 'id' => @current_user_id, + 'name' => @openstack_username, + 'email' => "#{@openstack_username}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -158,13 +158,13 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url, - :openstack_current_user_id => @openstack_current_user_id, - :current_user => @current_user, - :current_tenant => @current_tenant} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url, + openstack_current_user_id: @openstack_current_user_id, + current_user: @current_user, + current_tenant: @current_tenant } end end @@ -183,7 +183,7 @@ def default_service_type end def version_in_path?(url) - true if url =~ /\/v2(\.0)*(\/)*.*$/ + true if url =~ %r{/v2(\.0)*(/)*.*$} end end end diff --git a/lib/fog/openstack/identity/v2/models/ec2_credential.rb b/lib/fog/openstack/identity/v2/models/ec2_credential.rb index 705022df7..2f1894e52 100644 --- a/lib/fog/openstack/identity/v2/models/ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/models/ec2_credential.rb @@ -5,9 +5,9 @@ module OpenStack class Identity class V2 class Ec2Credential < Fog::OpenStack::Model - identity :access, :aliases => 'access_key' + identity :access, aliases: 'access_key' - attribute :secret, :aliases => 'secret_key' + attribute :secret, aliases: 'secret_key' attribute :tenant_id attribute :user_id diff --git a/lib/fog/openstack/identity/v2/models/tenant.rb b/lib/fog/openstack/identity/v2/models/tenant.rb index 280bbfb36..a1a8d4dfc 100644 --- a/lib/fog/openstack/identity/v2/models/tenant.rb +++ b/lib/fog/openstack/identity/v2/models/tenant.rb @@ -17,14 +17,14 @@ def to_s def roles_for(user) service.roles( - :tenant => self, - :user => user + tenant: self, + user: user ) end def users requires :id - service.users(:tenant_id => id) + service.users(tenant_id: id) end def destroy diff --git a/lib/fog/openstack/identity/v2/models/tenants.rb b/lib/fog/openstack/identity/v2/models/tenants.rb index d779676ef..be04bebbe 100644 --- a/lib/fog/openstack/identity/v2/models/tenants.rb +++ b/lib/fog/openstack/identity/v2/models/tenants.rb @@ -15,9 +15,10 @@ def all(options = {}) def find_by_id(id) cached_tenant = find { |tenant| tenant.id == id } return cached_tenant if cached_tenant + tenant_hash = service.get_tenant(id).body['tenant'] Fog::OpenStack::Identity::V2::Tenant.new( - tenant_hash.merge(:service => service) + tenant_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/identity/v2/models/user.rb b/lib/fog/openstack/identity/v2/models/user.rb index df4740127..e3d4177e9 100644 --- a/lib/fog/openstack/identity/v2/models/user.rb +++ b/lib/fog/openstack/identity/v2/models/user.rb @@ -10,18 +10,19 @@ class User < Fog::OpenStack::Model attribute :email attribute :enabled attribute :name - attribute :tenant_id, :aliases => 'tenantId' + attribute :tenant_id, aliases: 'tenantId' attribute :password attr_accessor :email, :name, :tenant_id, :enabled, :password def ec2_credentials requires :id - service.ec2_credentials(:user => self) + service.ec2_credentials(user: self) end def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + requires :name enabled = true if enabled.nil? data = service.create_user(name, password, email, tenant_id, enabled) diff --git a/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb b/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb index 4674a5ed6..f389175d6 100644 --- a/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/add_user_to_tenant.rb @@ -5,9 +5,9 @@ class V2 class Real def add_user_to_tenant(tenant_id, user_id, role_id) request( - :expects => 200, - :method => 'PUT', - :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" + expects: 200, + method: 'PUT', + path: "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end end @@ -23,7 +23,7 @@ def add_user_to_tenant(tenant_id, user_id, role_id) response.status = 200 response.body = { 'role' => { - 'id' => role['id'], + 'id' => role['id'], 'name' => role['name'] } } diff --git a/lib/fog/openstack/identity/v2/requests/check_token.rb b/lib/fog/openstack/identity/v2/requests/check_token.rb index 15b234fe8..d0a44121f 100644 --- a/lib/fog/openstack/identity/v2/requests/check_token.rb +++ b/lib/fog/openstack/identity/v2/requests/check_token.rb @@ -5,16 +5,15 @@ class V2 class Real def check_token(token_id, tenant_id = nil) request( - :expects => [200, 203], - :method => 'HEAD', - :path => "tokens/#{token_id}" + (tenant_id ? "?belongsTo=#{tenant_id}" : '') + expects: [200, 203], + method: 'HEAD', + path: "tokens/#{token_id}" + (tenant_id ? "?belongsTo=#{tenant_id}" : '') ) end end class Mock - def check_token(token_id, tenant_id = nil) - end + def check_token(token_id, tenant_id = nil); end end end end diff --git a/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb index ffe19f619..57856ab24 100644 --- a/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/create_ec2_credential.rb @@ -23,13 +23,13 @@ class Real # * 'tenant_id'<~String>: The tenant id def create_ec2_credential(user_id, tenant_id) - data = {'tenant_id' => tenant_id} + data = { 'tenant_id' => tenant_id } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "users/#{user_id}/credentials/OS-EC2" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "users/#{user_id}/credentials/OS-EC2" ) end end @@ -40,15 +40,15 @@ def create_ec2_credential(user_id, tenant_id) response.status = 200 data = { - 'access' => Fog::Mock.random_hex(32), - 'secret' => Fog::Mock.random_hex(32), + 'access' => Fog::Mock.random_hex(32), + 'secret' => Fog::Mock.random_hex(32), 'tenant_id' => tenant_id, - 'user_id' => user_id, + 'user_id' => user_id } self.data[:ec2_credentials][user_id][data['access']] = data - response.body = {'credential' => data} + response.body = { 'credential' => data } response end diff --git a/lib/fog/openstack/identity/v2/requests/create_role.rb b/lib/fog/openstack/identity/v2/requests/create_role.rb index 5a4ef4fce..814d27d6c 100644 --- a/lib/fog/openstack/identity/v2/requests/create_role.rb +++ b/lib/fog/openstack/identity/v2/requests/create_role.rb @@ -11,10 +11,10 @@ def create_role(name) } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => '/OS-KSADM/roles' + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: '/OS-KSADM/roles' ) end end @@ -22,13 +22,13 @@ def create_role(name) class Mock def create_role(name) data = { - 'id' => Fog::Mock.random_hex(32), + 'id' => Fog::Mock.random_hex(32), 'name' => name } self.data[:roles][data['id']] = data Excon::Response.new( - :body => {'role' => data}, - :status => 202 + body: { 'role' => data }, + status: 202 ) end end diff --git a/lib/fog/openstack/identity/v2/requests/create_tenant.rb b/lib/fog/openstack/identity/v2/requests/create_tenant.rb index cabb9f37f..64f0810b3 100644 --- a/lib/fog/openstack/identity/v2/requests/create_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/create_tenant.rb @@ -5,10 +5,10 @@ class V2 class Real def create_tenant(attributes) request( - :expects => [200], - :method => 'POST', - :path => "tenants", - :body => Fog::JSON.encode('tenant' => attributes) + expects: [200], + method: 'POST', + path: "tenants", + body: Fog::JSON.encode('tenant' => attributes) ) end end @@ -19,10 +19,10 @@ def create_tenant(attributes) response.status = [200, 204][rand(2)] response.body = { 'tenant' => { - 'id' => "df9a815161eba9b76cc748fd5c5af73e", + 'id' => "df9a815161eba9b76cc748fd5c5af73e", 'description' => attributes[:description] || 'normal tenant', - 'enabled' => true, - 'name' => attributes[:name] || 'default' + 'enabled' => true, + 'name' => attributes[:name] || 'default' } } response diff --git a/lib/fog/openstack/identity/v2/requests/create_user.rb b/lib/fog/openstack/identity/v2/requests/create_user.rb index bf1c5b256..3d0a1667d 100644 --- a/lib/fog/openstack/identity/v2/requests/create_user.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user.rb @@ -6,19 +6,19 @@ class Real def create_user(name, password, email, tenantId = nil, enabled = true) data = { 'user' => { - 'name' => name, + 'name' => name, 'password' => password, 'tenantId' => tenantId, - 'email' => email, - 'enabled' => enabled, + 'email' => email, + 'enabled' => enabled } } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => '/users' + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: '/users' ) end end @@ -28,14 +28,14 @@ def create_user(name, _password, email, tenantId = nil, enabled = true) response = Excon::Response.new response.status = 200 data = { - 'id' => Fog::Mock.random_hex(32), - 'name' => name, - 'email' => email, + 'id' => Fog::Mock.random_hex(32), + 'name' => name, + 'email' => email, 'tenantId' => tenantId, - 'enabled' => enabled + 'enabled' => enabled } self.data[:users][data['id']] = data - response.body = {'user' => data} + response.body = { 'user' => data } response end end diff --git a/lib/fog/openstack/identity/v2/requests/create_user_role.rb b/lib/fog/openstack/identity/v2/requests/create_user_role.rb index 9a5e3c07c..e1e741477 100644 --- a/lib/fog/openstack/identity/v2/requests/create_user_role.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user_role.rb @@ -5,9 +5,9 @@ class V2 class Real def create_user_role(tenant_id, user_id, role_id) request( - :expects => 200, - :method => 'PUT', - :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" + expects: 200, + method: 'PUT', + path: "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end end @@ -15,8 +15,8 @@ def create_user_role(tenant_id, user_id, role_id) class Mock def create_user_role(_tenant_id, _user_id, role_id) Excon::Response.new( - :body => {'role' => data[:roles][role_id]}, - :status => 200 + body: { 'role' => data[:roles][role_id] }, + status: 200 ) end end diff --git a/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb index 9fc30ca5e..1e5edbef8 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_ec2_credential.rb @@ -18,9 +18,9 @@ class Real def delete_ec2_credential(user_id, access) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "users/#{user_id}/credentials/OS-EC2/#{access}" + expects: [200, 204], + method: 'DELETE', + path: "users/#{user_id}/credentials/OS-EC2/#{access}" ) end end @@ -34,7 +34,7 @@ def delete_ec2_credential(user_id, access) response = Excon::Response.new response.status = 204 response - rescue + rescue StandardError end end end diff --git a/lib/fog/openstack/identity/v2/requests/delete_role.rb b/lib/fog/openstack/identity/v2/requests/delete_role.rb index aecf3f2d9..74531408a 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_role.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_role.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_role(role_id) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "/OS-KSADM/roles/#{role_id}" + expects: [200, 204], + method: 'DELETE', + path: "/OS-KSADM/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/delete_tenant.rb b/lib/fog/openstack/identity/v2/requests/delete_tenant.rb index e187d8438..99f1ce390 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_tenant.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_tenant(id) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "tenants/#{id}" + expects: [200, 204], + method: 'DELETE', + path: "tenants/#{id}" ) end end @@ -18,10 +18,10 @@ def delete_tenant(_attributes) response.status = [200, 204][rand(2)] response.body = { 'tenant' => { - 'id' => '1', + 'id' => '1', 'description' => 'Has access to everything', - 'enabled' => true, - 'name' => 'admin' + 'enabled' => true, + 'name' => 'admin' } } response diff --git a/lib/fog/openstack/identity/v2/requests/delete_user.rb b/lib/fog/openstack/identity/v2/requests/delete_user.rb index 3ccfcb258..ceef572b1 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_user.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_user.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_user(user_id) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "users/#{user_id}" + expects: [200, 204], + method: 'DELETE', + path: "users/#{user_id}" ) end end @@ -21,7 +21,7 @@ def delete_user(user_id) response = Excon::Response.new response.status = 204 response - rescue + rescue StandardError raise Fog::OpenStack::Identity::NotFound end end diff --git a/lib/fog/openstack/identity/v2/requests/delete_user_role.rb b/lib/fog/openstack/identity/v2/requests/delete_user_role.rb index 2f6a477d8..7cd6d8c1b 100644 --- a/lib/fog/openstack/identity/v2/requests/delete_user_role.rb +++ b/lib/fog/openstack/identity/v2/requests/delete_user_role.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_user_role(tenant_id, user_id, role_id) request( - :expects => 204, - :method => 'DELETE', - :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" + expects: 204, + method: 'DELETE', + path: "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb b/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb index 800d04791..e8a85ed15 100644 --- a/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb +++ b/lib/fog/openstack/identity/v2/requests/get_ec2_credential.rb @@ -23,9 +23,9 @@ class Real def get_ec2_credential(user_id, access) request( - :expects => [200, 202], - :method => 'GET', - :path => "users/#{user_id}/credentials/OS-EC2/#{access}" + expects: [200, 202], + method: 'GET', + path: "users/#{user_id}/credentials/OS-EC2/#{access}" ) rescue Excon::Errors::Unauthorized raise Fog::OpenStack::Identity::NotFound @@ -40,7 +40,7 @@ def get_ec2_credential(user_id, access) response = Excon::Response.new response.status = 200 - response.body = {'credential' => ec2_credential} + response.body = { 'credential' => ec2_credential } response end end diff --git a/lib/fog/openstack/identity/v2/requests/get_role.rb b/lib/fog/openstack/identity/v2/requests/get_role.rb index defaac045..acfbe4989 100644 --- a/lib/fog/openstack/identity/v2/requests/get_role.rb +++ b/lib/fog/openstack/identity/v2/requests/get_role.rb @@ -5,9 +5,9 @@ class V2 class Real def get_role(id) request( - :expects => [200, 204], - :method => 'GET', - :path => "/OS-KSADM/roles/#{id}" + expects: [200, 204], + method: 'GET', + path: "/OS-KSADM/roles/#{id}" ) end end @@ -17,7 +17,7 @@ def get_role(id) response = Excon::Response.new if data = self.data[:roles][id] response.status = 200 - response.body = {'role' => data} + response.body = { 'role' => data } response else raise Fog::OpenStack::Identity::NotFound diff --git a/lib/fog/openstack/identity/v2/requests/get_tenant.rb b/lib/fog/openstack/identity/v2/requests/get_tenant.rb index 6b2676cdd..ce3187176 100644 --- a/lib/fog/openstack/identity/v2/requests/get_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenant.rb @@ -5,9 +5,9 @@ class V2 class Real def get_tenant(id) request( - :expects => [200, 204], - :method => 'GET', - :path => "tenants/#{id}" + expects: [200, 204], + method: 'GET', + path: "tenants/#{id}" ) end end @@ -18,10 +18,10 @@ def get_tenant(id) response.status = [200, 204][rand(2)] response.body = { 'tenant' => { - 'id' => id, + 'id' => id, 'description' => 'Has access to everything', - 'enabled' => true, - 'name' => 'admin' + 'enabled' => true, + 'name' => 'admin' } } response diff --git a/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb b/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb index df4a0fa03..05e708f26 100644 --- a/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenants_by_id.rb @@ -5,9 +5,9 @@ class V2 class Real def get_tenants_by_id(tenant_id) request( - :expects => [200], - :method => 'GET', - :path => "tenants/#{tenant_id}" + expects: [200], + method: 'GET', + path: "tenants/#{tenant_id}" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb b/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb index bdbefb7a8..28984a667 100644 --- a/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb +++ b/lib/fog/openstack/identity/v2/requests/get_tenants_by_name.rb @@ -5,9 +5,9 @@ class V2 class Real def get_tenants_by_name(name) request( - :expects => [200], - :method => 'GET', - :path => "tenants?name=#{name}" + expects: [200], + method: 'GET', + path: "tenants?name=#{name}" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb b/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb index e8fbbb205..c7351ff82 100644 --- a/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb +++ b/lib/fog/openstack/identity/v2/requests/get_user_by_id.rb @@ -5,9 +5,9 @@ class V2 class Real def get_user_by_id(user_id) request( - :expects => [200, 203], - :method => 'GET', - :path => "users/#{user_id}" + expects: [200, 203], + method: 'GET', + path: "users/#{user_id}" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb b/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb index 79233d995..2de5b4af0 100644 --- a/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb +++ b/lib/fog/openstack/identity/v2/requests/get_user_by_name.rb @@ -5,9 +5,9 @@ class V2 class Real def get_user_by_name(name) request( - :expects => [200, 203], - :method => 'GET', - :path => "users?name=#{name}" + expects: [200, 203], + method: 'GET', + path: "users?name=#{name}" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb b/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb index 9277676df..ed812bafc 100644 --- a/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb +++ b/lib/fog/openstack/identity/v2/requests/list_ec2_credentials.rb @@ -31,10 +31,10 @@ def list_ec2_credentials(options = {}) end request( - :expects => [200, 202], - :method => 'GET', - :path => "users/#{user_id}/credentials/OS-EC2", - :query => query + expects: [200, 202], + method: 'GET', + path: "users/#{user_id}/credentials/OS-EC2", + query: query ) end end @@ -51,7 +51,7 @@ def list_ec2_credentials(options = {}) response = Excon::Response.new response.status = 200 - response.body = {'credentials' => ec2_credentials} + response.body = { 'credentials' => ec2_credentials } response end end diff --git a/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb b/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb index c4fc28bd4..677814b74 100644 --- a/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb +++ b/lib/fog/openstack/identity/v2/requests/list_endpoints_for_token.rb @@ -5,9 +5,9 @@ class V2 class Real def list_endpoints_for_token(token_id) request( - :expects => [200, 203], - :method => 'HEAD', - :path => "tokens/#{token_id}/endpoints" + expects: [200, 203], + method: 'HEAD', + path: "tokens/#{token_id}/endpoints" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/list_roles.rb b/lib/fog/openstack/identity/v2/requests/list_roles.rb index ee55cc72d..3a7aa65c4 100644 --- a/lib/fog/openstack/identity/v2/requests/list_roles.rb +++ b/lib/fog/openstack/identity/v2/requests/list_roles.rb @@ -5,10 +5,10 @@ class V2 class Real def list_roles(options = {}) request( - :expects => 200, - :method => 'GET', - :path => '/OS-KSADM/roles', - :query => options + expects: 200, + method: 'GET', + path: '/OS-KSADM/roles', + query: options ) end end @@ -18,13 +18,13 @@ def list_roles(_options = {}) if data[:roles].empty? ['admin', 'Member'].each do |name| id = Fog::Mock.random_hex(32) - data[:roles][id] = {'id' => id, 'name' => name} + data[:roles][id] = { 'id' => id, 'name' => name } end end Excon::Response.new( - :body => {'roles' => data[:roles].values}, - :status => 200 + body: { 'roles' => data[:roles].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb b/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb index 3acfade1f..1e160dbb4 100644 --- a/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/list_roles_for_user_on_tenant.rb @@ -5,9 +5,9 @@ class V2 class Real def list_roles_for_user_on_tenant(tenant_id, user_id) request( - :expects => [200], - :method => 'GET', - :path => "tenants/#{tenant_id}/users/#{user_id}/roles" + expects: [200], + method: 'GET', + path: "tenants/#{tenant_id}/users/#{user_id}/roles" ) end end @@ -21,8 +21,8 @@ def list_roles_for_user_on_tenant(tenant_id, user_id) end Excon::Response.new( - :body => {'roles' => roles}, - :status => 200 + body: { 'roles' => roles }, + status: 200 ) end end diff --git a/lib/fog/openstack/identity/v2/requests/list_tenants.rb b/lib/fog/openstack/identity/v2/requests/list_tenants.rb index bec98c056..b4a4e3b6e 100644 --- a/lib/fog/openstack/identity/v2/requests/list_tenants.rb +++ b/lib/fog/openstack/identity/v2/requests/list_tenants.rb @@ -15,10 +15,10 @@ def list_tenants(options = nil, marker = nil) end request( - :expects => [200, 204], - :method => 'GET', - :path => "tenants", - :query => params + expects: [200, 204], + method: 'GET', + path: "tenants", + query: params ) end end @@ -26,24 +26,24 @@ def list_tenants(options = nil, marker = nil) class Mock def list_tenants(_options = nil, _marker = nil) Excon::Response.new( - :body => { + body: { 'tenants_links' => [], - 'tenants' => [ - {'id' => '1', - 'description' => 'Has access to everything', - 'enabled' => true, - 'name' => 'admin'}, - {'id' => '2', - 'description' => 'Normal tenant', - 'enabled' => true, - 'name' => 'default'}, - {'id' => '3', - 'description' => 'Disabled tenant', - 'enabled' => false, - 'name' => 'disabled'} + 'tenants' => [ + { 'id' => '1', + 'description' => 'Has access to everything', + 'enabled' => true, + 'name' => 'admin' }, + { 'id' => '2', + 'description' => 'Normal tenant', + 'enabled' => true, + 'name' => 'default' }, + { 'id' => '3', + 'description' => 'Disabled tenant', + 'enabled' => false, + 'name' => 'disabled' } ] }, - :status => [200, 204][rand(2)] + status: [200, 204][rand(2)] ) end end diff --git a/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb b/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb index 2b3d493ac..eab09c3ed 100644 --- a/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb +++ b/lib/fog/openstack/identity/v2/requests/list_user_global_roles.rb @@ -5,9 +5,9 @@ class V2 class Real def list_user_global_roles(user_id) request( - :expects => [200], - :method => 'GET', - :path => "users/#{user_id}/roles" + expects: [200], + method: 'GET', + path: "users/#{user_id}/roles" ) end end diff --git a/lib/fog/openstack/identity/v2/requests/list_users.rb b/lib/fog/openstack/identity/v2/requests/list_users.rb index 55305f221..409992393 100644 --- a/lib/fog/openstack/identity/v2/requests/list_users.rb +++ b/lib/fog/openstack/identity/v2/requests/list_users.rb @@ -15,10 +15,10 @@ def list_users(options = {}) path = tenant_id ? "tenants/#{tenant_id}/users" : 'users' request( - :expects => [200, 204], - :method => 'GET', - :path => path, - :query => query + expects: [200, 204], + method: 'GET', + path: path, + query: query ) end end @@ -36,8 +36,8 @@ def list_users(options = {}) end Excon::Response.new( - :body => {'users' => users}, - :status => 200 + body: { 'users' => users }, + status: 200 ) end end diff --git a/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb b/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb index 8814dc518..1221070ec 100644 --- a/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/remove_user_from_tenant.rb @@ -5,16 +5,15 @@ class V2 class Real def remove_user_from_tenant(tenant_id, user_id, role_id) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" + expects: [200, 204], + method: 'DELETE', + path: "/tenants/#{tenant_id}/users/#{user_id}/roles/OS-KSADM/#{role_id}" ) end end class Mock - def remove_user_from_tenant(tenant_id, user_id, role_id) - end + def remove_user_from_tenant(tenant_id, user_id, role_id); end end end end diff --git a/lib/fog/openstack/identity/v2/requests/update_tenant.rb b/lib/fog/openstack/identity/v2/requests/update_tenant.rb index 956b8fd01..504e8fb45 100644 --- a/lib/fog/openstack/identity/v2/requests/update_tenant.rb +++ b/lib/fog/openstack/identity/v2/requests/update_tenant.rb @@ -5,10 +5,10 @@ class V2 class Real def update_tenant(id, attributes) request( - :expects => [200], - :method => 'PUT', - :path => "tenants/#{id}", - :body => Fog::JSON.encode('tenant' => attributes) + expects: [200], + method: 'PUT', + path: "tenants/#{id}", + body: Fog::JSON.encode('tenant' => attributes) ) end end @@ -17,7 +17,7 @@ class Mock def update_tenant(_id, attributes) response = Excon::Response.new response.status = [200, 204][rand(2)] - attributes = {'enabled' => true, 'id' => '1'}.merge(attributes) + attributes = { 'enabled' => true, 'id' => '1' }.merge(attributes) response.body = { 'tenant' => attributes } diff --git a/lib/fog/openstack/identity/v2/requests/update_user.rb b/lib/fog/openstack/identity/v2/requests/update_user.rb index 0d8622d1d..a32503b2b 100644 --- a/lib/fog/openstack/identity/v2/requests/update_user.rb +++ b/lib/fog/openstack/identity/v2/requests/update_user.rb @@ -6,10 +6,10 @@ class Real def update_user(user_id, options = {}) url = options.delete('url') || "/users/#{user_id}" request( - :body => Fog::JSON.encode('user' => options), - :expects => 200, - :method => 'PUT', - :path => url + body: Fog::JSON.encode('user' => options), + expects: 200, + method: 'PUT', + path: url ) end end diff --git a/lib/fog/openstack/identity/v2/requests/validate_token.rb b/lib/fog/openstack/identity/v2/requests/validate_token.rb index a7d4a1cb7..77dba5060 100644 --- a/lib/fog/openstack/identity/v2/requests/validate_token.rb +++ b/lib/fog/openstack/identity/v2/requests/validate_token.rb @@ -5,16 +5,15 @@ class V2 class Real def validate_token(token_id, tenant_id = nil) request( - :expects => [200, 203], - :method => 'GET', - :path => "tokens/#{token_id}" + (tenant_id ? "?belongsTo=#{tenant_id}" : '') + expects: [200, 203], + method: 'GET', + path: "tokens/#{token_id}" + (tenant_id ? "?belongsTo=#{tenant_id}" : '') ) end end class Mock - def validate_token(token_id, tenant_id = nil) - end + def validate_token(token_id, tenant_id = nil); end end end end diff --git a/lib/fog/openstack/identity/v3.rb b/lib/fog/openstack/identity/v3.rb index 3798b7c29..2f0551afa 100644 --- a/lib/fog/openstack/identity/v3.rb +++ b/lib/fog/openstack/identity/v3.rb @@ -118,16 +118,15 @@ class V3 < Fog::Service class Mock include Fog::OpenStack::Core - def initialize(options = {}) - end + def initialize(options = {}); end end def self.get_api_version(uri, connection_options = {}) connection = Fog::Core::Connection.new(uri, false, connection_options) - response = connection.request(:expects => [200], - :headers => {'Content-Type' => 'application/json', - 'Accept' => 'application/json'}, - :method => 'GET') + response = connection.request(expects: [200], + headers: { 'Content-Type' => 'application/json', + 'Accept' => 'application/json' }, + method: 'GET') body = Fog::JSON.decode(response.body) version = nil @@ -156,7 +155,7 @@ def default_service_type end def version_in_path?(url) - true if url =~ /\/v3(\/)*.*$/ + true if url =~ %r{/v3(/)*.*$} end end end diff --git a/lib/fog/openstack/identity/v3/models/domains.rb b/lib/fog/openstack/identity/v3/models/domains.rb index 43d33c12f..f5195a7f8 100644 --- a/lib/fog/openstack/identity/v3/models/domains.rb +++ b/lib/fog/openstack/identity/v3/models/domains.rb @@ -10,16 +10,16 @@ class Domains < Fog::OpenStack::Collection def all(options = {}) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, - :options => options}] + cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{ token: service.auth_token, + options: options }] return cached_domain if cached_domain && expires > Time.now end domain_to_cache = load_response(service.list_domains(options), 'domains') if service.openstack_cache_ttl > 0 cache = Fog::OpenStack::Identity::V3::Domain.cache - cache[{:token => service.auth_token, :options => options}] = [domain_to_cache, - Time.now + service.openstack_cache_ttl] + cache[{ token: service.auth_token, options: options }] = [domain_to_cache, + Time.now + service.openstack_cache_ttl] Fog::OpenStack::Identity::V3::Domain.cache = cache end domain_to_cache @@ -35,18 +35,18 @@ def auth_domains(options = {}) def find_by_id(id) if service.openstack_cache_ttl > 0 - cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{:token => service.auth_token, - :id => id}] + cached_domain, expires = Fog::OpenStack::Identity::V3::Domain.cache[{ token: service.auth_token, + id: id }] return cached_domain if cached_domain && expires > Time.now end domain_hash = service.get_domain(id).body['domain'] domain_to_cache = Fog::OpenStack::Identity::V3::Domain.new( - domain_hash.merge(:service => service) + domain_hash.merge(service: service) ) if service.openstack_cache_ttl > 0 cache = Fog::OpenStack::Identity::V3::Domain.cache - cache[{:token => service.auth_token, :id => id}] = [domain_to_cache, Time.now + service.openstack_cache_ttl] + cache[{ token: service.auth_token, id: id }] = [domain_to_cache, Time.now + service.openstack_cache_ttl] Fog::OpenStack::Identity::V3::Domain.cache = cache end domain_to_cache diff --git a/lib/fog/openstack/identity/v3/models/endpoints.rb b/lib/fog/openstack/identity/v3/models/endpoints.rb index 4351b5984..b6a680bbb 100644 --- a/lib/fog/openstack/identity/v3/models/endpoints.rb +++ b/lib/fog/openstack/identity/v3/models/endpoints.rb @@ -15,9 +15,10 @@ def all(options = {}) def find_by_id(id) cached_endpoint = find { |endpoint| endpoint.id == id } return cached_endpoint if cached_endpoint + endpoint_hash = service.get_endpoint(id).body['endpoint'] Fog::OpenStack::Identity::V3::Endpoint.new( - endpoint_hash.merge(:service => service) + endpoint_hash.merge(service: service) ) end end diff --git a/lib/fog/openstack/identity/v3/models/groups.rb b/lib/fog/openstack/identity/v3/models/groups.rb index 9af758aae..f5e19de65 100644 --- a/lib/fog/openstack/identity/v3/models/groups.rb +++ b/lib/fog/openstack/identity/v3/models/groups.rb @@ -15,9 +15,10 @@ def all(options = {}) def find_by_id(id) cached_group = find { |group| group.id == id } return cached_group if cached_group + group_hash = service.get_group(id).body['group'] Fog::OpenStack::Identity::V3.group.new( - group_hash.merge(:service => service) + group_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/identity/v3/models/os_credential.rb b/lib/fog/openstack/identity/v3/models/os_credential.rb index 70efbf741..9f1c9b166 100644 --- a/lib/fog/openstack/identity/v3/models/os_credential.rb +++ b/lib/fog/openstack/identity/v3/models/os_credential.rb @@ -48,7 +48,7 @@ def create end def parsed_blob - @parsed_blob = ::JSON.parse(blob) unless @parsed_blob + @parsed_blob ||= ::JSON.parse(blob) @parsed_blob end diff --git a/lib/fog/openstack/identity/v3/models/os_credentials.rb b/lib/fog/openstack/identity/v3/models/os_credentials.rb index afa764fdd..db2e54279 100644 --- a/lib/fog/openstack/identity/v3/models/os_credentials.rb +++ b/lib/fog/openstack/identity/v3/models/os_credentials.rb @@ -15,9 +15,10 @@ def all(options = {}) def find_by_id(id) cached_credential = find { |credential| credential.id == id } return cached_credential if cached_credential + credential_hash = service.get_os_credential(id).body['credential'] Fog::OpenStack::Identity::V3::Credential.new( - credential_hash.merge(:service => service) + credential_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/identity/v3/models/policies.rb b/lib/fog/openstack/identity/v3/models/policies.rb index 9641bc30a..b3cd8a703 100644 --- a/lib/fog/openstack/identity/v3/models/policies.rb +++ b/lib/fog/openstack/identity/v3/models/policies.rb @@ -15,9 +15,10 @@ def all(options = {}) def find_by_id(id) cached_policy = find { |policy| policy.id == id } return cached_policy if cached_policy + policy_hash = service.get_policy(id).body['policy'] Fog::OpenStack::Identity::V3::Policy.new( - policy_hash.merge(:service => service) + policy_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/identity/v3/models/projects.rb b/lib/fog/openstack/identity/v3/models/projects.rb index e17eafca9..f9d287af2 100644 --- a/lib/fog/openstack/identity/v3/models/projects.rb +++ b/lib/fog/openstack/identity/v3/models/projects.rb @@ -10,16 +10,16 @@ class Projects < Fog::OpenStack::Collection def all(options = {}) if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, - :options => options}] + cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{ token: service.auth_token, + options: options }] return cached_project if cached_project && expires > Time.now end project_to_cache = load_response(service.list_projects(options), 'projects') if service.openstack_cache_ttl > 0 cache = Fog::OpenStack::Identity::V3::Project.cache - cache[{:token => service.auth_token, :options => options}] = [project_to_cache, - Time.now + service.openstack_cache_ttl] + cache[{ token: service.auth_token, options: options }] = [project_to_cache, + Time.now + service.openstack_cache_ttl] Fog::OpenStack::Identity::V3::Project.cache = cache end project_to_cache @@ -35,13 +35,13 @@ def auth_projects(options = {}) def find_by_id(id, options = {}) # options can include :subtree_as_ids, :subtree_as_list, :parents_as_ids, :parents_as_list if options.kind_of? Symbol # Deal with a single option being passed on its own - options = {options => nil} + options = { options => nil } end if service.openstack_cache_ttl > 0 - cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{:token => service.auth_token, - :id => id, - :options => options}] + cached_project, expires = Fog::OpenStack::Identity::V3::Project.cache[{ token: service.auth_token, + id: id, + options: options }] return cached_project if cached_project && expires > Time.now end project_hash = service.get_project(id, options).body['project'] @@ -55,7 +55,7 @@ def find_by_id(id, options = {}) # options can include :subtree_as_ids, :subtree if service.openstack_cache_ttl > 0 cache = Fog::OpenStack::Identity::V3::Project.cache - cache[{:token => service.auth_token, :id => id, :options => options}] = [ + cache[{ token: service.auth_token, id: id, options: options }] = [ top_project, Time.now + service.openstack_cache_ttl ] Fog::OpenStack::Identity::V3::Project.cache = cache @@ -66,7 +66,7 @@ def find_by_id(id, options = {}) # options can include :subtree_as_ids, :subtree private def project_from_hash(project_hash, service) - Fog::OpenStack::Identity::V3::Project.new(project_hash.merge(:service => service)) + Fog::OpenStack::Identity::V3::Project.new(project_hash.merge(service: service)) end end end diff --git a/lib/fog/openstack/identity/v3/models/roles.rb b/lib/fog/openstack/identity/v3/models/roles.rb index 707fddc8d..c2914f49f 100644 --- a/lib/fog/openstack/identity/v3/models/roles.rb +++ b/lib/fog/openstack/identity/v3/models/roles.rb @@ -23,9 +23,10 @@ def assignments(options = {}) def find_by_id(id) cached_role = find { |role| role.id == id } return cached_role if cached_role + role_hash = service.get_role(id).body['role'] Fog::OpenStack::Identity::V3.role.new( - role_hash.merge(:service => service) + role_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/identity/v3/models/services.rb b/lib/fog/openstack/identity/v3/models/services.rb index c60569839..de90a6e6a 100644 --- a/lib/fog/openstack/identity/v3/models/services.rb +++ b/lib/fog/openstack/identity/v3/models/services.rb @@ -15,9 +15,10 @@ def all(options = {}) def find_by_id(id) cached_service = find { |service| service.id == id } return cached_service if cached_service + service_hash = service.get_service(id).body['service'] Fog::OpenStack::Identity::V3::Service.new( - service_hash.merge(:service => service) + service_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/identity/v3/models/tokens.rb b/lib/fog/openstack/identity/v3/models/tokens.rb index 028eb9a8e..b258ecaf7 100644 --- a/lib/fog/openstack/identity/v3/models/tokens.rb +++ b/lib/fog/openstack/identity/v3/models/tokens.rb @@ -12,7 +12,7 @@ def authenticate(auth) response = service.token_authenticate(auth) token_hash = response.body['token'] Fog::OpenStack::Identity::V3::Token.new( - token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) + token_hash.merge(service: service, value: response.headers['X-Subject-Token']) ) end @@ -20,7 +20,7 @@ def validate(subject_token) response = service.token_validate(subject_token) token_hash = response.body['token'] Fog::OpenStack::Identity::V3::Token.new( - token_hash.merge(:service => service, :value => response.headers['X-Subject-Token']) + token_hash.merge(service: service, value: response.headers['X-Subject-Token']) ) end diff --git a/lib/fog/openstack/identity/v3/models/users.rb b/lib/fog/openstack/identity/v3/models/users.rb index 109476747..e96bdfa6e 100644 --- a/lib/fog/openstack/identity/v3/models/users.rb +++ b/lib/fog/openstack/identity/v3/models/users.rb @@ -15,14 +15,15 @@ def all(options = {}) def find_by_id(id) cached_user = find { |user| user.id == id } return cached_user if cached_user + user_hash = service.get_user(id).body['user'] Fog::OpenStack::Identity::V3::User.new( - user_hash.merge(:service => service) + user_hash.merge(service: service) ) end def find_by_name(name, options = {}) - load(service.list_users(options.merge(:name => name)).body["users"]) + load(service.list_users(options.merge(name: name)).body["users"]) end def destroy(id) diff --git a/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb b/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb index 852191bf0..2c201e3e2 100644 --- a/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb +++ b/lib/fog/openstack/identity/v3/requests/add_user_to_group.rb @@ -5,9 +5,9 @@ class V3 class Real def add_user_to_group(group_id, user_id) request( - :expects => [204], - :method => 'PUT', - :path => "groups/#{group_id}/users/#{user_id}" + expects: [204], + method: 'PUT', + path: "groups/#{group_id}/users/#{user_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/auth_domains.rb b/lib/fog/openstack/identity/v3/requests/auth_domains.rb index 883a386ed..a4d0cc1dd 100644 --- a/lib/fog/openstack/identity/v3/requests/auth_domains.rb +++ b/lib/fog/openstack/identity/v3/requests/auth_domains.rb @@ -5,17 +5,16 @@ class V3 class Real def auth_domains(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "auth/domains", - :query => options + expects: [200], + method: 'GET', + path: "auth/domains", + query: options ) end end class Mock - def auth_domains - end + def auth_domains; end end end end diff --git a/lib/fog/openstack/identity/v3/requests/auth_projects.rb b/lib/fog/openstack/identity/v3/requests/auth_projects.rb index f4861a39d..0e4cbce14 100644 --- a/lib/fog/openstack/identity/v3/requests/auth_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/auth_projects.rb @@ -5,17 +5,16 @@ class V3 class Real def auth_projects(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "auth/projects", - :query => options + expects: [200], + method: 'GET', + path: "auth/projects", + query: options ) end end class Mock - def auth_projects - end + def auth_projects; end end end end diff --git a/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb index 63f84fd99..900efd97c 100644 --- a/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_domain_group_role.rb @@ -5,9 +5,9 @@ class V3 class Real def check_domain_group_role(id, group_id, role_id) request( - :expects => [204], - :method => 'HEAD', - :path => "domains/#{id}/groups/#{group_id}/roles/#{role_id}" + expects: [204], + method: 'HEAD', + path: "domains/#{id}/groups/#{group_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb index ea40b6541..25188d9b5 100644 --- a/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_domain_user_role.rb @@ -5,9 +5,9 @@ class V3 class Real def check_domain_user_role(id, user_id, role_id) request( - :expects => [204], - :method => 'HEAD', - :path => "domains/#{id}/users/#{user_id}/roles/#{role_id}" + expects: [204], + method: 'HEAD', + path: "domains/#{id}/users/#{user_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb index d3a84af5b..b6167d99c 100644 --- a/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_project_group_role.rb @@ -5,9 +5,9 @@ class V3 class Real def check_project_group_role(id, group_id, role_id) request( - :expects => [204], - :method => 'HEAD', - :path => "projects/#{id}/groups/#{group_id}/roles/#{role_id}" + expects: [204], + method: 'HEAD', + path: "projects/#{id}/groups/#{group_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb index 36da39e1a..ef8f550dc 100644 --- a/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/check_project_user_role.rb @@ -5,9 +5,9 @@ class V3 class Real def check_project_user_role(id, user_id, role_id) request( - :expects => [204], - :method => 'HEAD', - :path => "projects/#{id}/users/#{user_id}/roles/#{role_id}" + expects: [204], + method: 'HEAD', + path: "projects/#{id}/users/#{user_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_domain.rb b/lib/fog/openstack/identity/v3/requests/create_domain.rb index cf2403dd9..0921ef17d 100644 --- a/lib/fog/openstack/identity/v3/requests/create_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/create_domain.rb @@ -5,10 +5,10 @@ class V3 class Real def create_domain(domain) request( - :expects => [201], - :method => 'POST', - :path => "domains", - :body => Fog::JSON.encode(:domain => domain) + expects: [201], + method: 'POST', + path: "domains", + body: Fog::JSON.encode(domain: domain) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_endpoint.rb b/lib/fog/openstack/identity/v3/requests/create_endpoint.rb index d1f3e8017..7c20c867c 100644 --- a/lib/fog/openstack/identity/v3/requests/create_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/create_endpoint.rb @@ -5,10 +5,10 @@ class V3 class Real def create_endpoint(endpoint) request( - :expects => [201], - :method => 'POST', - :path => "endpoints", - :body => Fog::JSON.encode(:endpoint => endpoint) + expects: [201], + method: 'POST', + path: "endpoints", + body: Fog::JSON.encode(endpoint: endpoint) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_group.rb b/lib/fog/openstack/identity/v3/requests/create_group.rb index 5411edcc4..e2af374ba 100644 --- a/lib/fog/openstack/identity/v3/requests/create_group.rb +++ b/lib/fog/openstack/identity/v3/requests/create_group.rb @@ -5,10 +5,10 @@ class V3 class Real def create_group(group) request( - :expects => [201], - :method => 'POST', - :path => "groups", - :body => Fog::JSON.encode(:group => group) + expects: [201], + method: 'POST', + path: "groups", + body: Fog::JSON.encode(group: group) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_os_credential.rb b/lib/fog/openstack/identity/v3/requests/create_os_credential.rb index 61d555c16..2c69ec43d 100644 --- a/lib/fog/openstack/identity/v3/requests/create_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/create_os_credential.rb @@ -5,10 +5,10 @@ class V3 class Real def create_os_credential(credential) request( - :expects => [201], - :method => 'POST', - :path => "credentials", - :body => Fog::JSON.encode(:credential => credential) + expects: [201], + method: 'POST', + path: "credentials", + body: Fog::JSON.encode(credential: credential) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_policy.rb b/lib/fog/openstack/identity/v3/requests/create_policy.rb index 125d8354d..c29d3034a 100644 --- a/lib/fog/openstack/identity/v3/requests/create_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/create_policy.rb @@ -5,10 +5,10 @@ class V3 class Real def create_policy(policy) request( - :expects => [201], - :method => 'POST', - :path => "policies", - :body => Fog::JSON.encode(:policy => policy) + expects: [201], + method: 'POST', + path: "policies", + body: Fog::JSON.encode(policy: policy) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_project.rb b/lib/fog/openstack/identity/v3/requests/create_project.rb index 1fcf1e21a..1511d00e2 100644 --- a/lib/fog/openstack/identity/v3/requests/create_project.rb +++ b/lib/fog/openstack/identity/v3/requests/create_project.rb @@ -5,10 +5,10 @@ class V3 class Real def create_project(project) request( - :expects => [201], - :method => 'POST', - :path => "projects", - :body => Fog::JSON.encode(:project => project) + expects: [201], + method: 'POST', + path: "projects", + body: Fog::JSON.encode(project: project) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_role.rb b/lib/fog/openstack/identity/v3/requests/create_role.rb index e985bddae..691be48b0 100644 --- a/lib/fog/openstack/identity/v3/requests/create_role.rb +++ b/lib/fog/openstack/identity/v3/requests/create_role.rb @@ -5,10 +5,10 @@ class V3 class Real def create_role(role) request( - :expects => [201], - :method => 'POST', - :path => "roles", - :body => Fog::JSON.encode(:role => role) + expects: [201], + method: 'POST', + path: "roles", + body: Fog::JSON.encode(role: role) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_service.rb b/lib/fog/openstack/identity/v3/requests/create_service.rb index d765fdbb1..97ce45dda 100644 --- a/lib/fog/openstack/identity/v3/requests/create_service.rb +++ b/lib/fog/openstack/identity/v3/requests/create_service.rb @@ -5,10 +5,10 @@ class V3 class Real def create_service(service) request( - :expects => [201], - :method => 'POST', - :path => "services", - :body => Fog::JSON.encode(:service => service) + expects: [201], + method: 'POST', + path: "services", + body: Fog::JSON.encode(service: service) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/create_user.rb b/lib/fog/openstack/identity/v3/requests/create_user.rb index 841d689d3..972a22cf2 100644 --- a/lib/fog/openstack/identity/v3/requests/create_user.rb +++ b/lib/fog/openstack/identity/v3/requests/create_user.rb @@ -5,10 +5,10 @@ class V3 class Real def create_user(user) request( - :expects => [201], - :method => 'POST', - :path => "users", - :body => Fog::JSON.encode(:user => user) + expects: [201], + method: 'POST', + path: "users", + body: Fog::JSON.encode(user: user) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_domain.rb b/lib/fog/openstack/identity/v3/requests/delete_domain.rb index d2eb6d06c..3a8992c67 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_domain.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_domain(id) request( - :expects => [204], - :method => 'DELETE', - :path => "domains/#{id}" + expects: [204], + method: 'DELETE', + path: "domains/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb b/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb index 57023a664..30484ec95 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_endpoint.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_endpoint(id) request( - :expects => [204], - :method => 'DELETE', - :path => "endpoints/#{id}" + expects: [204], + method: 'DELETE', + path: "endpoints/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_group.rb b/lib/fog/openstack/identity/v3/requests/delete_group.rb index d494c5794..206e2d391 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_group.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_group.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_group(id) request( - :expects => [204], - :method => 'DELETE', - :path => "groups/#{id}" + expects: [204], + method: 'DELETE', + path: "groups/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb b/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb index 45b9223f2..7b0ead35f 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_os_credential.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_os_credential(id) request( - :expects => [204], - :method => 'DELETE', - :path => "credentials/#{id}" + expects: [204], + method: 'DELETE', + path: "credentials/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_policy.rb b/lib/fog/openstack/identity/v3/requests/delete_policy.rb index 3264965b4..b67a82e99 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_policy.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_policy(id) request( - :expects => [204], - :method => 'DELETE', - :path => "policies/#{id}" + expects: [204], + method: 'DELETE', + path: "policies/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_project.rb b/lib/fog/openstack/identity/v3/requests/delete_project.rb index 634186beb..9b037ba47 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_project.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_project.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_project(id) request( - :expects => [204], - :method => 'DELETE', - :path => "projects/#{id}" + expects: [204], + method: 'DELETE', + path: "projects/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_role.rb b/lib/fog/openstack/identity/v3/requests/delete_role.rb index 0a5baf05d..82995cba0 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_role.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_role.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_role(id) request( - :expects => [204], - :method => 'DELETE', - :path => "roles/#{id}" + expects: [204], + method: 'DELETE', + path: "roles/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_service.rb b/lib/fog/openstack/identity/v3/requests/delete_service.rb index 16761e478..604ac2311 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_service.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_service.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_service(id) request( - :expects => [204], - :method => 'DELETE', - :path => "services/#{id}" + expects: [204], + method: 'DELETE', + path: "services/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/delete_user.rb b/lib/fog/openstack/identity/v3/requests/delete_user.rb index eef6ee128..8d816aba2 100644 --- a/lib/fog/openstack/identity/v3/requests/delete_user.rb +++ b/lib/fog/openstack/identity/v3/requests/delete_user.rb @@ -5,9 +5,9 @@ class V3 class Real def delete_user(id) request( - :expects => [204], - :method => 'DELETE', - :path => "users/#{id}" + expects: [204], + method: 'DELETE', + path: "users/#{id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/get_domain.rb b/lib/fog/openstack/identity/v3/requests/get_domain.rb index 0a2bd126f..cdcf047bc 100644 --- a/lib/fog/openstack/identity/v3/requests/get_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/get_domain.rb @@ -5,16 +5,15 @@ class V3 class Real def get_domain(id) request( - :expects => [200], - :method => 'GET', - :path => "domains/#{id}" + expects: [200], + method: 'GET', + path: "domains/#{id}" ) end end class Mock - def get_domain(id) - end + def get_domain(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_endpoint.rb b/lib/fog/openstack/identity/v3/requests/get_endpoint.rb index cd8fed07d..6eea30bb8 100644 --- a/lib/fog/openstack/identity/v3/requests/get_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/get_endpoint.rb @@ -5,16 +5,15 @@ class V3 class Real def get_endpoint(id) request( - :expects => [200], - :method => 'GET', - :path => "endpoints/#{id}" + expects: [200], + method: 'GET', + path: "endpoints/#{id}" ) end end class Mock - def get_endpoint(id) - end + def get_endpoint(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_group.rb b/lib/fog/openstack/identity/v3/requests/get_group.rb index 706cc4880..e38440c23 100644 --- a/lib/fog/openstack/identity/v3/requests/get_group.rb +++ b/lib/fog/openstack/identity/v3/requests/get_group.rb @@ -5,16 +5,15 @@ class V3 class Real def get_group(id) request( - :expects => [200], - :method => 'GET', - :path => "groups/#{id}" + expects: [200], + method: 'GET', + path: "groups/#{id}" ) end end class Mock - def get_group(id) - end + def get_group(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_os_credential.rb b/lib/fog/openstack/identity/v3/requests/get_os_credential.rb index ed42db756..7688d3f95 100644 --- a/lib/fog/openstack/identity/v3/requests/get_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/get_os_credential.rb @@ -5,16 +5,15 @@ class V3 class Real def get_os_credential(id) request( - :expects => [200], - :method => 'GET', - :path => "credentials/#{id}" + expects: [200], + method: 'GET', + path: "credentials/#{id}" ) end end class Mock - def get_os_credential(id) - end + def get_os_credential(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_policy.rb b/lib/fog/openstack/identity/v3/requests/get_policy.rb index 3bfb57755..fa24ba65a 100644 --- a/lib/fog/openstack/identity/v3/requests/get_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/get_policy.rb @@ -5,16 +5,15 @@ class V3 class Real def get_policy(id) request( - :expects => [200], - :method => 'GET', - :path => "policies/#{id}" + expects: [200], + method: 'GET', + path: "policies/#{id}" ) end end class Mock - def get_policy(id) - end + def get_policy(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_project.rb b/lib/fog/openstack/identity/v3/requests/get_project.rb index 23340099d..05347ad0d 100644 --- a/lib/fog/openstack/identity/v3/requests/get_project.rb +++ b/lib/fog/openstack/identity/v3/requests/get_project.rb @@ -5,17 +5,16 @@ class V3 class Real def get_project(id, options = {}) request( - :expects => [200], - :method => 'GET', - :path => "projects/#{id}", - :query => options + expects: [200], + method: 'GET', + path: "projects/#{id}", + query: options ) end end class Mock - def get_domain(id) - end + def get_domain(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_role.rb b/lib/fog/openstack/identity/v3/requests/get_role.rb index fecf25b45..f40b5c18c 100644 --- a/lib/fog/openstack/identity/v3/requests/get_role.rb +++ b/lib/fog/openstack/identity/v3/requests/get_role.rb @@ -5,16 +5,15 @@ class V3 class Real def get_role(id) request( - :expects => [200], - :method => 'GET', - :path => "roles/#{id}" + expects: [200], + method: 'GET', + path: "roles/#{id}" ) end end class Mock - def get_role(id) - end + def get_role(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_service.rb b/lib/fog/openstack/identity/v3/requests/get_service.rb index 0a83c3e88..588ba8e5d 100644 --- a/lib/fog/openstack/identity/v3/requests/get_service.rb +++ b/lib/fog/openstack/identity/v3/requests/get_service.rb @@ -5,16 +5,15 @@ class V3 class Real def get_service(id) request( - :expects => [200], - :method => 'GET', - :path => "projects/#{id}" + expects: [200], + method: 'GET', + path: "projects/#{id}" ) end end class Mock - def get_service(id) - end + def get_service(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/get_user.rb b/lib/fog/openstack/identity/v3/requests/get_user.rb index 93f119a01..8963e5801 100644 --- a/lib/fog/openstack/identity/v3/requests/get_user.rb +++ b/lib/fog/openstack/identity/v3/requests/get_user.rb @@ -5,16 +5,15 @@ class V3 class Real def get_user(id) request( - :expects => [200], - :method => 'GET', - :path => "users/#{id}" + expects: [200], + method: 'GET', + path: "users/#{id}" ) end end class Mock - def get_user(id) - end + def get_user(id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb index ed7d90405..6172c1005 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_domain_group_role.rb @@ -5,9 +5,9 @@ class V3 class Real def grant_domain_group_role(id, group_id, role_id) request( - :expects => [204], - :method => 'PUT', - :path => "domains/#{id}/groups/#{group_id}/roles/#{role_id}" + expects: [204], + method: 'PUT', + path: "domains/#{id}/groups/#{group_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb index b91bc7da4..03ed2d304 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_domain_user_role.rb @@ -5,9 +5,9 @@ class V3 class Real def grant_domain_user_role(id, user_id, role_id) request( - :expects => [204], - :method => 'PUT', - :path => "domains/#{id}/users/#{user_id}/roles/#{role_id}" + expects: [204], + method: 'PUT', + path: "domains/#{id}/users/#{user_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb index 99a5939b8..664b24575 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_project_group_role.rb @@ -5,9 +5,9 @@ class V3 class Real def grant_project_group_role(id, group_id, role_id) request( - :expects => [204], - :method => 'PUT', - :path => "projects/#{id}/groups/#{group_id}/roles/#{role_id}" + expects: [204], + method: 'PUT', + path: "projects/#{id}/groups/#{group_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb index 1dee70dba..2fba36d9f 100644 --- a/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/grant_project_user_role.rb @@ -5,9 +5,9 @@ class V3 class Real def grant_project_user_role(id, user_id, role_id) request( - :expects => [204], - :method => 'PUT', - :path => "projects/#{id}/users/#{user_id}/roles/#{role_id}" + expects: [204], + method: 'PUT', + path: "projects/#{id}/users/#{user_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/group_user_check.rb b/lib/fog/openstack/identity/v3/requests/group_user_check.rb index 14a2b2001..2353b9555 100644 --- a/lib/fog/openstack/identity/v3/requests/group_user_check.rb +++ b/lib/fog/openstack/identity/v3/requests/group_user_check.rb @@ -5,9 +5,9 @@ class V3 class Real def group_user_check(group_id, user_id) request( - :expects => [204], - :method => 'HEAD', - :path => "groups/#{group_id}/users/#{user_id}" + expects: [204], + method: 'HEAD', + path: "groups/#{group_id}/users/#{user_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb b/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb index 3e0ff8620..732900150 100644 --- a/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domain_group_roles.rb @@ -5,16 +5,15 @@ class V3 class Real def list_domain_group_roles(id, group_id) request( - :expects => [200], - :method => 'GET', - :path => "domains/#{id}/groups/#{group_id}/roles" + expects: [200], + method: 'GET', + path: "domains/#{id}/groups/#{group_id}/roles" ) end end class Mock - def list_domain_user_roles(id, group_id) - end + def list_domain_user_roles(id, group_id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb b/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb index a11a8e053..59484956d 100644 --- a/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domain_user_roles.rb @@ -5,16 +5,15 @@ class V3 class Real def list_domain_user_roles(id, user_id) request( - :expects => [200], - :method => 'GET', - :path => "domains/#{id}/users/#{user_id}/roles" + expects: [200], + method: 'GET', + path: "domains/#{id}/users/#{user_id}/roles" ) end end class Mock - def list_domain_user_roles(id, user_id) - end + def list_domain_user_roles(id, user_id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_domains.rb b/lib/fog/openstack/identity/v3/requests/list_domains.rb index 884002d33..766224c56 100644 --- a/lib/fog/openstack/identity/v3/requests/list_domains.rb +++ b/lib/fog/openstack/identity/v3/requests/list_domains.rb @@ -5,17 +5,16 @@ class V3 class Real def list_domains(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "domains", - :query => options + expects: [200], + method: 'GET', + path: "domains", + query: options ) end end class Mock - def list_domains(options = {}) - end + def list_domains(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_endpoints.rb b/lib/fog/openstack/identity/v3/requests/list_endpoints.rb index c72e27f10..cd8915e03 100644 --- a/lib/fog/openstack/identity/v3/requests/list_endpoints.rb +++ b/lib/fog/openstack/identity/v3/requests/list_endpoints.rb @@ -5,17 +5,16 @@ class V3 class Real def list_endpoints(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "endpoints", - :query => options + expects: [200], + method: 'GET', + path: "endpoints", + query: options ) end end class Mock - def list_endpoints(options = {}) - end + def list_endpoints(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_group_users.rb b/lib/fog/openstack/identity/v3/requests/list_group_users.rb index a474bced0..1fc0669b2 100644 --- a/lib/fog/openstack/identity/v3/requests/list_group_users.rb +++ b/lib/fog/openstack/identity/v3/requests/list_group_users.rb @@ -5,17 +5,16 @@ class V3 class Real def list_group_users(id, options = {}) request( - :expects => [200], - :method => 'GET', - :path => "groups/#{id}/users", - :query => options + expects: [200], + method: 'GET', + path: "groups/#{id}/users", + query: options ) end end class Mock - def list_group_users - end + def list_group_users; end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_groups.rb b/lib/fog/openstack/identity/v3/requests/list_groups.rb index ab54244cd..45d8fe458 100644 --- a/lib/fog/openstack/identity/v3/requests/list_groups.rb +++ b/lib/fog/openstack/identity/v3/requests/list_groups.rb @@ -13,17 +13,16 @@ def list_groups(options = {}) end request( - :expects => [200], - :method => 'GET', - :path => path, - :query => options + expects: [200], + method: 'GET', + path: path, + query: options ) end end class Mock - def list_groups(options = {}) - end + def list_groups(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb b/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb index bf74399fb..280b96754 100644 --- a/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb +++ b/lib/fog/openstack/identity/v3/requests/list_os_credentials.rb @@ -5,17 +5,16 @@ class V3 class Real def list_os_credentials(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "credentials", - :query => options + expects: [200], + method: 'GET', + path: "credentials", + query: options ) end end class Mock - def list_os_credentials(options = {}) - end + def list_os_credentials(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_policies.rb b/lib/fog/openstack/identity/v3/requests/list_policies.rb index acd7be6ed..1061a18fc 100644 --- a/lib/fog/openstack/identity/v3/requests/list_policies.rb +++ b/lib/fog/openstack/identity/v3/requests/list_policies.rb @@ -5,17 +5,16 @@ class V3 class Real def list_policies(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "policies", - :query => options + expects: [200], + method: 'GET', + path: "policies", + query: options ) end end class Mock - def list_policies(options = {}) - end + def list_policies(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb b/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb index 87f37aa4b..b76985f2d 100644 --- a/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_project_group_roles.rb @@ -5,16 +5,15 @@ class V3 class Real def list_project_group_roles(id, group_id) request( - :expects => [200], - :method => 'GET', - :path => "projects/#{id}/groups/#{group_id}/roles" + expects: [200], + method: 'GET', + path: "projects/#{id}/groups/#{group_id}/roles" ) end end class Mock - def list_project_user_roles(id, group_id) - end + def list_project_user_roles(id, group_id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb b/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb index cdcdae06a..4f0d72a83 100644 --- a/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_project_user_roles.rb @@ -5,16 +5,15 @@ class V3 class Real def list_project_user_roles(id, user_id) request( - :expects => [200], - :method => 'GET', - :path => "projects/#{id}/users/#{user_id}/roles" + expects: [200], + method: 'GET', + path: "projects/#{id}/users/#{user_id}/roles" ) end end class Mock - def list_project_user_roles(id, user_id) - end + def list_project_user_roles(id, user_id); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_projects.rb b/lib/fog/openstack/identity/v3/requests/list_projects.rb index 25edd6a79..f18fd738d 100644 --- a/lib/fog/openstack/identity/v3/requests/list_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/list_projects.rb @@ -12,17 +12,16 @@ def list_projects(options = {}) end request( - :expects => [200], - :method => 'GET', - :path => path, - :query => options + expects: [200], + method: 'GET', + path: path, + query: options ) end end class Mock - def list_projects(options = {}) - end + def list_projects(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb b/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb index 49611fadd..ca0e183d3 100644 --- a/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb +++ b/lib/fog/openstack/identity/v3/requests/list_role_assignments.rb @@ -7,11 +7,11 @@ def list_role_assignments(options = {}) # Backwards compatibility name mapping, also serves as single pane of glass, since keystone broke # consistency in naming of options, just for this one API call name_mapping = { - :group_id => 'group.id', - :role_id => 'role.id', - :domain_id => 'scope.domain.id', - :project_id => 'scope.project.id', - :user_id => 'user.id', + group_id: 'group.id', + role_id: 'role.id', + domain_id: 'scope.domain.id', + project_id: 'scope.project.id', + user_id: 'user.id' } name_mapping.keys.each do |key| if (opt = options.delete(key)) @@ -20,17 +20,16 @@ def list_role_assignments(options = {}) end request( - :expects => [200], - :method => 'GET', - :path => "role_assignments", - :query => options + expects: [200], + method: 'GET', + path: "role_assignments", + query: options ) end end class Mock - def list_role_assignments(options = {}) - end + def list_role_assignments(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_roles.rb b/lib/fog/openstack/identity/v3/requests/list_roles.rb index e9a538311..58adb6896 100644 --- a/lib/fog/openstack/identity/v3/requests/list_roles.rb +++ b/lib/fog/openstack/identity/v3/requests/list_roles.rb @@ -5,17 +5,16 @@ class V3 class Real def list_roles(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "roles", - :query => options + expects: [200], + method: 'GET', + path: "roles", + query: options ) end end class Mock - def list_roles(options = {}) - end + def list_roles(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_services.rb b/lib/fog/openstack/identity/v3/requests/list_services.rb index b0e0c446f..5997ea863 100644 --- a/lib/fog/openstack/identity/v3/requests/list_services.rb +++ b/lib/fog/openstack/identity/v3/requests/list_services.rb @@ -5,17 +5,16 @@ class V3 class Real def list_services(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "services", - :query => options + expects: [200], + method: 'GET', + path: "services", + query: options ) end end class Mock - def list_services(options = {}) - end + def list_services(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_user_groups.rb b/lib/fog/openstack/identity/v3/requests/list_user_groups.rb index a6d6ac77e..e489009b4 100644 --- a/lib/fog/openstack/identity/v3/requests/list_user_groups.rb +++ b/lib/fog/openstack/identity/v3/requests/list_user_groups.rb @@ -5,16 +5,15 @@ class V3 class Real def list_user_groups(user_id) request( - :expects => [200], - :method => 'GET', - :path => "users/#{user_id}/groups" + expects: [200], + method: 'GET', + path: "users/#{user_id}/groups" ) end end class Mock - def list_user_groups - end + def list_user_groups; end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_user_projects.rb b/lib/fog/openstack/identity/v3/requests/list_user_projects.rb index cf96a30a0..28c3ee9f2 100644 --- a/lib/fog/openstack/identity/v3/requests/list_user_projects.rb +++ b/lib/fog/openstack/identity/v3/requests/list_user_projects.rb @@ -5,17 +5,16 @@ class V3 class Real def list_user_projects(user_id, options = {}) request( - :expects => [200], - :method => 'GET', - :path => "users/#{user_id}/projects", - :query => options + expects: [200], + method: 'GET', + path: "users/#{user_id}/projects", + query: options ) end end class Mock - def list_user_projects - end + def list_user_projects; end end end end diff --git a/lib/fog/openstack/identity/v3/requests/list_users.rb b/lib/fog/openstack/identity/v3/requests/list_users.rb index 0a5159a85..7d3aad686 100644 --- a/lib/fog/openstack/identity/v3/requests/list_users.rb +++ b/lib/fog/openstack/identity/v3/requests/list_users.rb @@ -5,17 +5,16 @@ class V3 class Real def list_users(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "users", - :query => options + expects: [200], + method: 'GET', + path: "users", + query: options ) end end class Mock - def list_users(options = {}) - end + def list_users(options = {}); end end end end diff --git a/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb b/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb index f9b770883..7bf1a7245 100644 --- a/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb +++ b/lib/fog/openstack/identity/v3/requests/remove_user_from_group.rb @@ -5,9 +5,9 @@ class V3 class Real def remove_user_from_group(group_id, user_id) request( - :expects => [204], - :method => 'DELETE', - :path => "groups/#{group_id}/users/#{user_id}" + expects: [204], + method: 'DELETE', + path: "groups/#{group_id}/users/#{user_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb index 0e69b4a2d..b619bc890 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_domain_group_role.rb @@ -5,9 +5,9 @@ class V3 class Real def revoke_domain_group_role(id, group_id, role_id) request( - :expects => [204], - :method => 'DELETE', - :path => "domains/#{id}/groups/#{group_id}/roles/#{role_id}" + expects: [204], + method: 'DELETE', + path: "domains/#{id}/groups/#{group_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb index 2aac1107f..eb8772944 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_domain_user_role.rb @@ -5,9 +5,9 @@ class V3 class Real def revoke_domain_user_role(id, user_id, role_id) request( - :expects => [204], - :method => 'DELETE', - :path => "domains/#{id}/users/#{user_id}/roles/#{role_id}" + expects: [204], + method: 'DELETE', + path: "domains/#{id}/users/#{user_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb index f069db266..8d7dd595c 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_project_group_role.rb @@ -5,9 +5,9 @@ class V3 class Real def revoke_project_group_role(id, group_id, role_id) request( - :expects => [204], - :method => 'DELETE', - :path => "projects/#{id}/groups/#{group_id}/roles/#{role_id}" + expects: [204], + method: 'DELETE', + path: "projects/#{id}/groups/#{group_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb b/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb index 6262bfec9..a7c9d2021 100644 --- a/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb +++ b/lib/fog/openstack/identity/v3/requests/revoke_project_user_role.rb @@ -5,9 +5,9 @@ class V3 class Real def revoke_project_user_role(id, user_id, role_id) request( - :expects => [204], - :method => 'DELETE', - :path => "projects/#{id}/users/#{user_id}/roles/#{role_id}" + expects: [204], + method: 'DELETE', + path: "projects/#{id}/users/#{user_id}/roles/#{role_id}" ) end end diff --git a/lib/fog/openstack/identity/v3/requests/token_authenticate.rb b/lib/fog/openstack/identity/v3/requests/token_authenticate.rb index d6facf733..f6200b65e 100644 --- a/lib/fog/openstack/identity/v3/requests/token_authenticate.rb +++ b/lib/fog/openstack/identity/v3/requests/token_authenticate.rb @@ -5,10 +5,10 @@ class V3 class Real def token_authenticate(auth) request( - :expects => [201], - :method => 'POST', - :path => "auth/tokens", - :body => Fog::JSON.encode(auth) + expects: [201], + method: 'POST', + path: "auth/tokens", + body: Fog::JSON.encode(auth) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/token_check.rb b/lib/fog/openstack/identity/v3/requests/token_check.rb index 5f850af1d..5859f3464 100644 --- a/lib/fog/openstack/identity/v3/requests/token_check.rb +++ b/lib/fog/openstack/identity/v3/requests/token_check.rb @@ -5,10 +5,10 @@ class V3 class Real def token_check(subject_token) request( - :expects => [200, 204], - :method => 'HEAD', - :path => "auth/tokens", - :headers => {"X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token,} + expects: [200, 204], + method: 'HEAD', + path: "auth/tokens", + headers: { "X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token } ) end end diff --git a/lib/fog/openstack/identity/v3/requests/token_revoke.rb b/lib/fog/openstack/identity/v3/requests/token_revoke.rb index e1c0b6f97..9d3c9597c 100644 --- a/lib/fog/openstack/identity/v3/requests/token_revoke.rb +++ b/lib/fog/openstack/identity/v3/requests/token_revoke.rb @@ -5,10 +5,10 @@ class V3 class Real def token_revoke(subject_token) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "auth/tokens", - :headers => {"X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token,} + expects: [200, 204], + method: 'DELETE', + path: "auth/tokens", + headers: { "X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token } ) end end diff --git a/lib/fog/openstack/identity/v3/requests/token_validate.rb b/lib/fog/openstack/identity/v3/requests/token_validate.rb index c2b842753..ce732bbc4 100644 --- a/lib/fog/openstack/identity/v3/requests/token_validate.rb +++ b/lib/fog/openstack/identity/v3/requests/token_validate.rb @@ -5,10 +5,10 @@ class V3 class Real def token_validate(subject_token) request( - :expects => [200], - :method => 'GET', - :path => "auth/tokens", - :headers => {"X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token} + expects: [200], + method: 'GET', + path: "auth/tokens", + headers: { "X-Subject-Token" => subject_token, "X-Auth-Token" => auth_token } ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_domain.rb b/lib/fog/openstack/identity/v3/requests/update_domain.rb index 7f430dec3..f35c3e456 100644 --- a/lib/fog/openstack/identity/v3/requests/update_domain.rb +++ b/lib/fog/openstack/identity/v3/requests/update_domain.rb @@ -5,10 +5,10 @@ class V3 class Real def update_domain(id, domain) request( - :expects => [200], - :method => 'PATCH', - :path => "domains/#{id}", - :body => Fog::JSON.encode(:domain => domain) + expects: [200], + method: 'PATCH', + path: "domains/#{id}", + body: Fog::JSON.encode(domain: domain) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_endpoint.rb b/lib/fog/openstack/identity/v3/requests/update_endpoint.rb index e54a9725b..bf4c95881 100644 --- a/lib/fog/openstack/identity/v3/requests/update_endpoint.rb +++ b/lib/fog/openstack/identity/v3/requests/update_endpoint.rb @@ -5,10 +5,10 @@ class V3 class Real def update_endpoint(id, endpoint) request( - :expects => [200], - :method => 'PATCH', - :path => "endpoints/#{id}", - :body => Fog::JSON.encode(:endpoint => endpoint) + expects: [200], + method: 'PATCH', + path: "endpoints/#{id}", + body: Fog::JSON.encode(endpoint: endpoint) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_group.rb b/lib/fog/openstack/identity/v3/requests/update_group.rb index e93f851c2..00223629a 100644 --- a/lib/fog/openstack/identity/v3/requests/update_group.rb +++ b/lib/fog/openstack/identity/v3/requests/update_group.rb @@ -5,10 +5,10 @@ class V3 class Real def update_group(id, group) request( - :expects => [200], - :method => 'PATCH', - :path => "groups/#{id}", - :body => Fog::JSON.encode(:group => group) + expects: [200], + method: 'PATCH', + path: "groups/#{id}", + body: Fog::JSON.encode(group: group) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_os_credential.rb b/lib/fog/openstack/identity/v3/requests/update_os_credential.rb index 74281369d..669e31dc3 100644 --- a/lib/fog/openstack/identity/v3/requests/update_os_credential.rb +++ b/lib/fog/openstack/identity/v3/requests/update_os_credential.rb @@ -5,10 +5,10 @@ class V3 class Real def update_os_credential(id, credential) request( - :expects => [200], - :method => 'PATCH', - :path => "credentials/#{id}", - :body => Fog::JSON.encode(:credential => credential) + expects: [200], + method: 'PATCH', + path: "credentials/#{id}", + body: Fog::JSON.encode(credential: credential) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_policy.rb b/lib/fog/openstack/identity/v3/requests/update_policy.rb index ad2a19691..c8a28aa8c 100644 --- a/lib/fog/openstack/identity/v3/requests/update_policy.rb +++ b/lib/fog/openstack/identity/v3/requests/update_policy.rb @@ -5,10 +5,10 @@ class V3 class Real def update_policy(id, policy) request( - :expects => [200], - :method => 'PATCH', - :path => "policies/#{id}", - :body => Fog::JSON.encode(:policy => policy) + expects: [200], + method: 'PATCH', + path: "policies/#{id}", + body: Fog::JSON.encode(policy: policy) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_project.rb b/lib/fog/openstack/identity/v3/requests/update_project.rb index 91e7e2150..7d86def5e 100644 --- a/lib/fog/openstack/identity/v3/requests/update_project.rb +++ b/lib/fog/openstack/identity/v3/requests/update_project.rb @@ -5,10 +5,10 @@ class V3 class Real def update_project(id, project) request( - :expects => [200], - :method => 'PATCH', - :path => "projects/#{id}", - :body => Fog::JSON.encode(:project => project) + expects: [200], + method: 'PATCH', + path: "projects/#{id}", + body: Fog::JSON.encode(project: project) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_role.rb b/lib/fog/openstack/identity/v3/requests/update_role.rb index a93e33291..386b9ef2c 100644 --- a/lib/fog/openstack/identity/v3/requests/update_role.rb +++ b/lib/fog/openstack/identity/v3/requests/update_role.rb @@ -5,10 +5,10 @@ class V3 class Real def update_role(id, role) request( - :expects => [200], - :method => 'PATCH', - :path => "roles/#{id}", - :body => Fog::JSON.encode(:role => role) + expects: [200], + method: 'PATCH', + path: "roles/#{id}", + body: Fog::JSON.encode(role: role) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_service.rb b/lib/fog/openstack/identity/v3/requests/update_service.rb index bdfc39f8f..95dec777b 100644 --- a/lib/fog/openstack/identity/v3/requests/update_service.rb +++ b/lib/fog/openstack/identity/v3/requests/update_service.rb @@ -5,10 +5,10 @@ class V3 class Real def update_service(id, service) request( - :expects => [200], - :method => 'PATCH', - :path => "services/#{id}", - :body => Fog::JSON.encode(:service => service) + expects: [200], + method: 'PATCH', + path: "services/#{id}", + body: Fog::JSON.encode(service: service) ) end end diff --git a/lib/fog/openstack/identity/v3/requests/update_user.rb b/lib/fog/openstack/identity/v3/requests/update_user.rb index 9d928493d..4f0439757 100644 --- a/lib/fog/openstack/identity/v3/requests/update_user.rb +++ b/lib/fog/openstack/identity/v3/requests/update_user.rb @@ -5,10 +5,10 @@ class V3 class Real def update_user(id, user) request( - :expects => [200], - :method => 'PATCH', - :path => "users/#{id}", - :body => Fog::JSON.encode(:user => user) + expects: [200], + method: 'PATCH', + path: "users/#{id}", + body: Fog::JSON.encode(user: user) ) end end diff --git a/lib/fog/openstack/image.rb b/lib/fog/openstack/image.rb index 7d9d9a20d..3f08404b4 100644 --- a/lib/fog/openstack/image.rb +++ b/lib/fog/openstack/image.rb @@ -1,5 +1,3 @@ - - module Fog module OpenStack class Image < Fog::Service diff --git a/lib/fog/openstack/image/v1.rb b/lib/fog/openstack/image/v1.rb index 004677cd6..9f63e5adb 100644 --- a/lib/fog/openstack/image/v1.rb +++ b/lib/fog/openstack/image/v1.rb @@ -4,7 +4,7 @@ module Fog module OpenStack class Image class V1 < Fog::Service - SUPPORTED_VERSIONS = /v1(\.(0|1))*/ + SUPPORTED_VERSIONS = /v1(\.(0|1))*/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -43,7 +43,7 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :images => {} + images: {} } end end @@ -65,15 +65,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].detect { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -87,11 +87,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/image/v1/models/images.rb b/lib/fog/openstack/image/v1/models/images.rb index 095a3a4a3..b2f32bd9d 100644 --- a/lib/fog/openstack/image/v1/models/images.rb +++ b/lib/fog/openstack/image/v1/models/images.rb @@ -60,7 +60,7 @@ def destroy(id) def method_missing(method_sym, *arguments, &block) if method_sym.to_s =~ /^find_by_(.*)$/ - load(service.list_public_images_detailed($1, arguments.first).body['images']) + load(service.list_public_images_detailed(Regexp.last_match(1), arguments.first).body['images']) else super end diff --git a/lib/fog/openstack/image/v1/requests/add_member_to_image.rb b/lib/fog/openstack/image/v1/requests/add_member_to_image.rb index 9dec5a819..d963ce132 100644 --- a/lib/fog/openstack/image/v1/requests/add_member_to_image.rb +++ b/lib/fog/openstack/image/v1/requests/add_member_to_image.rb @@ -5,9 +5,9 @@ class V1 class Real def add_member_to_image(image_id, tenant_id) request( - :expects => [200, 204], - :method => 'PUT', - :path => "images/#{image_id}/members/#{tenant_id}" + expects: [200, 204], + method: 'PUT', + path: "images/#{image_id}/members/#{tenant_id}" ) end end diff --git a/lib/fog/openstack/image/v1/requests/create_image.rb b/lib/fog/openstack/image/v1/requests/create_image.rb index 16306b353..2b9e12c69 100644 --- a/lib/fog/openstack/image/v1/requests/create_image.rb +++ b/lib/fog/openstack/image/v1/requests/create_image.rb @@ -5,17 +5,17 @@ class V1 class Real def create_image(attributes) data = { - 'Content-Type' => 'application/octet-stream', - 'x-image-meta-name' => attributes[:name], - 'x-image-meta-disk-format' => attributes[:disk_format], + 'Content-Type' => 'application/octet-stream', + 'x-image-meta-name' => attributes[:name], + 'x-image-meta-disk-format' => attributes[:disk_format], 'x-image-meta-container-format' => attributes[:container_format], - 'x-image-meta-size' => attributes[:size], - 'x-image-meta-is-public' => attributes[:is_public], - 'x-image-meta-min-ram' => attributes[:min_ram], - 'x-image-meta-min-disk' => attributes[:min_disk], - 'x-image-meta-checksum' => attributes[:checksum], - 'x-image-meta-owner' => attributes[:owner], - 'x-glance-api-copy-from' => attributes[:copy_from] + 'x-image-meta-size' => attributes[:size], + 'x-image-meta-is-public' => attributes[:is_public], + 'x-image-meta-min-ram' => attributes[:min_ram], + 'x-image-meta-min-disk' => attributes[:min_disk], + 'x-image-meta-checksum' => attributes[:checksum], + 'x-image-meta-owner' => attributes[:owner], + 'x-glance-api-copy-from' => attributes[:copy_from] }.reject { |_k, v| v.nil? } body = '' @@ -32,11 +32,11 @@ def create_image(attributes) end request( - :headers => data, - :body => body, - :expects => 201, - :method => 'POST', - :path => "images" + headers: data, + body: body, + expects: 201, + method: 'POST', + path: "images" ) ensure body.close if body.respond_to?(:close) @@ -50,25 +50,25 @@ def create_image(attributes) image_id = Fog::Mock.random_hex(32) image = data[:images][image_id] = { - 'name' => attributes[:name], - 'size' => attributes[:size] || Fog::Mock.random_numbers(8).to_i, - 'min_disk' => attributes[:min_disk] || 0, - 'disk_format' => attributes[:disk_format] || 'raw', - 'created_at' => Time.now.strftime('%FT%T.%6N'), + 'name' => attributes[:name], + 'size' => attributes[:size] || Fog::Mock.random_numbers(8).to_i, + 'min_disk' => attributes[:min_disk] || 0, + 'disk_format' => attributes[:disk_format] || 'raw', + 'created_at' => Time.now.strftime('%FT%T.%6N'), 'container_format' => attributes[:container_format] || 'bare', - 'deleted_at' => nil, - 'updated_at' => Time.now.strftime('%FT%T.%6N'), - 'checksum' => attributes[:checksum] || Fog::Mock.random_hex(32), - 'id' => image_id, - 'deleted' => false, - 'protected' => false, - 'is_public' => attributes[:is_public].to_s == 'true', - 'status' => 'queued', - 'min_ram' => attributes[:min_ram] || 0, - 'owner' => attributes[:owner], - 'properties' => attributes[:properties] || {} + 'deleted_at' => nil, + 'updated_at' => Time.now.strftime('%FT%T.%6N'), + 'checksum' => attributes[:checksum] || Fog::Mock.random_hex(32), + 'id' => image_id, + 'deleted' => false, + 'protected' => false, + 'is_public' => attributes[:is_public].to_s == 'true', + 'status' => 'queued', + 'min_ram' => attributes[:min_ram] || 0, + 'owner' => attributes[:owner], + 'properties' => attributes[:properties] || {} } - response.body = {'image' => image} + response.body = { 'image' => image } response end end diff --git a/lib/fog/openstack/image/v1/requests/delete_image.rb b/lib/fog/openstack/image/v1/requests/delete_image.rb index 36393e08b..948cb9176 100644 --- a/lib/fog/openstack/image/v1/requests/delete_image.rb +++ b/lib/fog/openstack/image/v1/requests/delete_image.rb @@ -5,9 +5,9 @@ class V1 class Real def delete_image(image_id) request( - :expects => 200, - :method => 'DELETE', - :path => "images/#{image_id}" + expects: 200, + method: 'DELETE', + path: "images/#{image_id}" ) end end diff --git a/lib/fog/openstack/image/v1/requests/get_image.rb b/lib/fog/openstack/image/v1/requests/get_image.rb index 87a68789f..b7237273f 100644 --- a/lib/fog/openstack/image/v1/requests/get_image.rb +++ b/lib/fog/openstack/image/v1/requests/get_image.rb @@ -5,9 +5,9 @@ class V1 class Real def get_image(image_id) request( - :expects => [200, 204], - :method => 'HEAD', - :path => "images/#{image_id}" + expects: [200, 204], + method: 'HEAD', + path: "images/#{image_id}" ) end end @@ -16,27 +16,27 @@ class Mock def get_image(_image_id) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.headers = {"X-Image-Meta-Is_public" => "True", - "X-Image-Meta-Min_disk" => "0", - "X-Image-Meta-Property-Ramdisk_id" => "b45aa128-cd36-4ad9-a026-1a1c2bfd8fdc", - "X-Image-Meta-Disk_format" => "ami", - "X-Image-Meta-Created_at" => "2012-02-21T07:32:26", - "X-Image-Meta-Container_format" => "ami", - "Etag" => "2f81976cae15c16ef0010c51e3a6c163", - "Location" => "http://192.168.27.100:9292/v1/images/0e09fbd6-43c5-448a-83e9-0d3d05f9747e", - "X-Image-Meta-Protected" => "False", - "Date" => "Fri, 24 Feb 2012 02:14:25 GMT", - "X-Image-Meta-Name" => "cirros-0.3.0-x86_64-blank", - "X-Image-Meta-Min_ram" => "0", "Content-Type" => "text/html; charset=UTF-8", - "X-Image-Meta-Updated_at" => "2012-02-21T07:32:29", - "X-Image-Meta-Property-Kernel_id" => "cd28951e-e1c2-4bc5-95d3-f0495abbcdc5", - "X-Image-Meta-Size" => "25165824", - "X-Image-Meta-Checksum" => "2f81976cae15c16ef0010c51e3a6c163", - "X-Image-Meta-Deleted" => "False", - "Content-Length" => "0", - "X-Image-Meta-Owner" => "ff528b20431645ebb5fa4b0a71ca002f", - "X-Image-Meta-Status" => "active", - "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e"} + response.headers = { "X-Image-Meta-Is_public" => "True", + "X-Image-Meta-Min_disk" => "0", + "X-Image-Meta-Property-Ramdisk_id" => "b45aa128-cd36-4ad9-a026-1a1c2bfd8fdc", + "X-Image-Meta-Disk_format" => "ami", + "X-Image-Meta-Created_at" => "2012-02-21T07:32:26", + "X-Image-Meta-Container_format" => "ami", + "Etag" => "2f81976cae15c16ef0010c51e3a6c163", + "Location" => "http://192.168.27.100:9292/v1/images/0e09fbd6-43c5-448a-83e9-0d3d05f9747e", + "X-Image-Meta-Protected" => "False", + "Date" => "Fri, 24 Feb 2012 02:14:25 GMT", + "X-Image-Meta-Name" => "cirros-0.3.0-x86_64-blank", + "X-Image-Meta-Min_ram" => "0", "Content-Type" => "text/html; charset=UTF-8", + "X-Image-Meta-Updated_at" => "2012-02-21T07:32:29", + "X-Image-Meta-Property-Kernel_id" => "cd28951e-e1c2-4bc5-95d3-f0495abbcdc5", + "X-Image-Meta-Size" => "25165824", + "X-Image-Meta-Checksum" => "2f81976cae15c16ef0010c51e3a6c163", + "X-Image-Meta-Deleted" => "False", + "Content-Length" => "0", + "X-Image-Meta-Owner" => "ff528b20431645ebb5fa4b0a71ca002f", + "X-Image-Meta-Status" => "active", + "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e" } response.body = "" response end diff --git a/lib/fog/openstack/image/v1/requests/get_image_by_id.rb b/lib/fog/openstack/image/v1/requests/get_image_by_id.rb index ef9441edf..f670eeede 100644 --- a/lib/fog/openstack/image/v1/requests/get_image_by_id.rb +++ b/lib/fog/openstack/image/v1/requests/get_image_by_id.rb @@ -5,9 +5,9 @@ class V1 class Real def get_image_by_id(image_id) request( - :expects => [200], - :method => 'HEAD', - :path => "images/#{image_id}" + expects: [200], + method: 'HEAD', + path: "images/#{image_id}" ) end end @@ -17,22 +17,22 @@ def get_image_by_id(image_id) response = Excon::Response.new response.status = [200, 204][rand(2)] response.headers = { - 'X-Image-Meta-Checksum' => '8a40c862b5735975d82605c1dd395796', + 'X-Image-Meta-Checksum' => '8a40c862b5735975d82605c1dd395796', 'X-Image-Meta-Container_format' => 'aki', - 'X-Image-Meta-Created_at' => '2016-01-06T03:22:20.000000', - 'X-Image-Meta-Deleted' => 'False', - 'X-Image-Meta-Disk_format' => 'aki', - 'X-Image-Meta-Id' => image_id, - 'X-Image-Meta-Is_public' => 'True', - 'X-Image-Meta-Min_disk' => 0, - 'X-Image-Meta-Min_ram' => 0, - 'X-Image-Meta-Name' => 'cirros-0.3.4-x86_64-uec-kernel', - 'X-Image-Meta-Owner' => '13cc6052265b41529e2fd0fc461fa8ef', - 'X-Image-Meta-Protected' => 'False', - 'X-Image-Meta-Size' => 4979632, - 'X-Image-Meta-Status' => 'deactivated', - 'X-Image-Meta-Updated_at' => '2016-02-25T03:02:05.000000', - 'X-Image-Meta-Property-foo' => 'bar' + 'X-Image-Meta-Created_at' => '2016-01-06T03:22:20.000000', + 'X-Image-Meta-Deleted' => 'False', + 'X-Image-Meta-Disk_format' => 'aki', + 'X-Image-Meta-Id' => image_id, + 'X-Image-Meta-Is_public' => 'True', + 'X-Image-Meta-Min_disk' => 0, + 'X-Image-Meta-Min_ram' => 0, + 'X-Image-Meta-Name' => 'cirros-0.3.4-x86_64-uec-kernel', + 'X-Image-Meta-Owner' => '13cc6052265b41529e2fd0fc461fa8ef', + 'X-Image-Meta-Protected' => 'False', + 'X-Image-Meta-Size' => 4979632, + 'X-Image-Meta-Status' => 'deactivated', + 'X-Image-Meta-Updated_at' => '2016-02-25T03:02:05.000000', + 'X-Image-Meta-Property-foo' => 'bar' } response.body = {} response diff --git a/lib/fog/openstack/image/v1/requests/get_image_members.rb b/lib/fog/openstack/image/v1/requests/get_image_members.rb index 89b479b53..9ac3ad015 100644 --- a/lib/fog/openstack/image/v1/requests/get_image_members.rb +++ b/lib/fog/openstack/image/v1/requests/get_image_members.rb @@ -5,9 +5,9 @@ class V1 class Real def get_image_members(image_id) request( - :expects => [200, 204], - :method => 'GET', - :path => "images/#{image_id}/members" + expects: [200, 204], + method: 'GET', + path: "images/#{image_id}/members" ) end end @@ -18,8 +18,8 @@ def get_image_members(_image_id) response.status = [200, 204][rand(2)] response.body = { "members" => [ - {"member_id" => "ff528b20431645ebb5fa4b0a71ca002f", - "can_share" => false} + { "member_id" => "ff528b20431645ebb5fa4b0a71ca002f", + "can_share" => false } ] } response diff --git a/lib/fog/openstack/image/v1/requests/get_shared_images.rb b/lib/fog/openstack/image/v1/requests/get_shared_images.rb index 5c25aac42..de3067837 100644 --- a/lib/fog/openstack/image/v1/requests/get_shared_images.rb +++ b/lib/fog/openstack/image/v1/requests/get_shared_images.rb @@ -5,9 +5,9 @@ class V1 class Real def get_shared_images(tenant_id) request( - :expects => [200, 204], - :method => 'GET', - :path => "shared-images/#{tenant_id}" + expects: [200, 204], + method: 'GET', + path: "shared-images/#{tenant_id}" ) end end @@ -18,8 +18,8 @@ def get_shared_images(_tenant_id) response.status = [200, 204][rand(2)] response.body = { "shared_images" => [ - {"image_id" => "ff528b20431645ebb5fa4b0a71ca002f", - "can_share" => false} + { "image_id" => "ff528b20431645ebb5fa4b0a71ca002f", + "can_share" => false } ] } response diff --git a/lib/fog/openstack/image/v1/requests/list_public_images.rb b/lib/fog/openstack/image/v1/requests/list_public_images.rb index 34fd231ec..61236bd5d 100644 --- a/lib/fog/openstack/image/v1/requests/list_public_images.rb +++ b/lib/fog/openstack/image/v1/requests/list_public_images.rb @@ -5,10 +5,10 @@ class V1 class Real def list_public_images(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'images', - :query => options + expects: [200, 204], + method: 'GET', + path: 'images', + query: options ) end end @@ -19,12 +19,12 @@ def list_public_images(_options = {}) response.status = [200, 204][rand(2)] response.body = { "images" => [{ - "name" => Fog::Mock.random_letters(10), - "size" => Fog::Mock.random_numbers(8).to_i, - "disk_format" => "iso", + "name" => Fog::Mock.random_letters(10), + "size" => Fog::Mock.random_numbers(8).to_i, + "disk_format" => "iso", "container_format" => "bare", - "id" => Fog::Mock.random_hex(36), - "checksum" => Fog::Mock.random_hex(32) + "id" => Fog::Mock.random_hex(36), + "checksum" => Fog::Mock.random_hex(32) }] } response diff --git a/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb b/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb index d6c18c623..64c3fddbb 100644 --- a/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb +++ b/lib/fog/openstack/image/v1/requests/list_public_images_detailed.rb @@ -9,16 +9,16 @@ def list_public_images_detailed(options = {}, query_deprecated = nil) elsif options Fog::Logger.deprecation("Calling OpenStack[:glance].list_public_images_detailed(attribute, query) format"\ " is deprecated, call .list_public_images_detailed(attribute => query) instead") - query = {options => query_deprecated} + query = { options => query_deprecated } else query = {} end request( - :expects => [200, 204], - :method => 'GET', - :path => 'images/detail', - :query => query + expects: [200, 204], + method: 'GET', + path: 'images/detail', + query: query ) end end @@ -27,7 +27,7 @@ class Mock def list_public_images_detailed(_options = {}, _query_deprecated = nil) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.body = {'images' => data[:images].values} + response.body = { 'images' => data[:images].values } response end end diff --git a/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb b/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb index a40e457bb..0e54036b8 100644 --- a/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb +++ b/lib/fog/openstack/image/v1/requests/remove_member_from_image.rb @@ -5,9 +5,9 @@ class V1 class Real def remove_member_from_image(image_id, member_id) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "images/#{image_id}/members/#{member_id}" + expects: [200, 204], + method: 'DELETE', + path: "images/#{image_id}/members/#{member_id}" ) end end diff --git a/lib/fog/openstack/image/v1/requests/update_image.rb b/lib/fog/openstack/image/v1/requests/update_image.rb index a7d0e238c..d8f30b88c 100644 --- a/lib/fog/openstack/image/v1/requests/update_image.rb +++ b/lib/fog/openstack/image/v1/requests/update_image.rb @@ -5,15 +5,15 @@ class V1 class Real def update_image(attributes) data = { - 'x-image-meta-name' => attributes[:name], - 'x-image-meta-disk-format' => attributes[:disk_format], + 'x-image-meta-name' => attributes[:name], + 'x-image-meta-disk-format' => attributes[:disk_format], 'x-image-meta-container-format' => attributes[:container_format], - 'x-image-meta-size' => attributes[:size], - 'x-image-meta-is-public' => attributes[:is_public], - 'x-image-meta-min-ram' => attributes[:min_ram], - 'x-image-meta-min-disk' => attributes[:min_disk], - 'x-image-meta-checksum' => attributes[:checksum], - 'x-image-meta-owner' => attributes[:owner] + 'x-image-meta-size' => attributes[:size], + 'x-image-meta-is-public' => attributes[:is_public], + 'x-image-meta-min-ram' => attributes[:min_ram], + 'x-image-meta-min-disk' => attributes[:min_disk], + 'x-image-meta-checksum' => attributes[:checksum], + 'x-image-meta-owner' => attributes[:owner] }.reject { |_k, v| v.nil? } unless attributes[:properties].nil? @@ -23,10 +23,10 @@ def update_image(attributes) end request( - :headers => data, - :expects => 200, - :method => 'PUT', - :path => "images/#{attributes[:id]}" + headers: data, + expects: 200, + method: 'PUT', + path: "images/#{attributes[:id]}" ) end end @@ -38,23 +38,23 @@ def update_image(attributes) image = images.last response.body = { 'image' => { - 'name' => attributes[:name] || image.name, - 'size' => image.size, - 'min_disk' => (attributes[:min_disk] || image.min_disk).to_i, - 'disk_format' => attributes[:disk_format] || image.disk_format, - 'created_at' => image.created_at, + 'name' => attributes[:name] || image.name, + 'size' => image.size, + 'min_disk' => (attributes[:min_disk] || image.min_disk).to_i, + 'disk_format' => attributes[:disk_format] || image.disk_format, + 'created_at' => image.created_at, 'container_format' => attributes[:container_format] || image.container_format, - 'deleted_at' => nil, - 'updated_at' => Time.now.to_s, - 'checksum' => image.checksum, - 'id' => attributes[:id], - 'deleted' => false, - 'protected' => false, - 'is_public' => attributes[:is_public] || image.is_public, - 'status' => image.status, - 'min_ram' => (attributes[:min_ram] || image.min_ram).to_i, - 'owner' => attributes[:owner] || image.owner, - 'properties' => attributes[:properties] || image.properties + 'deleted_at' => nil, + 'updated_at' => Time.now.to_s, + 'checksum' => image.checksum, + 'id' => attributes[:id], + 'deleted' => false, + 'protected' => false, + 'is_public' => attributes[:is_public] || image.is_public, + 'status' => image.status, + 'min_ram' => (attributes[:min_ram] || image.min_ram).to_i, + 'owner' => attributes[:owner] || image.owner, + 'properties' => attributes[:properties] || image.properties } } response diff --git a/lib/fog/openstack/image/v1/requests/update_image_members.rb b/lib/fog/openstack/image/v1/requests/update_image_members.rb index 65751cb34..30983a67b 100644 --- a/lib/fog/openstack/image/v1/requests/update_image_members.rb +++ b/lib/fog/openstack/image/v1/requests/update_image_members.rb @@ -9,13 +9,13 @@ def update_image_members(image_id, members) # {'member_id' => 'tenant1', 'can_share' => true }, # {'member_id' => 'tenant2', 'can_share' => false } # ] - data = {'memberships' => members} + data = { 'memberships' => members } request( - :body => Fog::JSON.encode(data), - :expects => [204], - :method => 'PUT', - :path => "images/#{image_id}/members" + body: Fog::JSON.encode(data), + expects: [204], + method: 'PUT', + path: "images/#{image_id}/members" ) end end @@ -26,8 +26,8 @@ def update_image_members(_image_id, _members) response.status = 204 response.body = { 'members' => [ - {'member_id' => 'ff528b20431645ebb5fa4b0a71ca002f', 'can_share' => false}, - {'member_id' => 'ff528b20431645ebb5fa4b0a71ca002f', 'can_share' => true} + { 'member_id' => 'ff528b20431645ebb5fa4b0a71ca002f', 'can_share' => false }, + { 'member_id' => 'ff528b20431645ebb5fa4b0a71ca002f', 'can_share' => true } ] } response diff --git a/lib/fog/openstack/image/v2.rb b/lib/fog/openstack/image/v2.rb index a2e641e77..dd787ef1b 100644 --- a/lib/fog/openstack/image/v2.rb +++ b/lib/fog/openstack/image/v2.rb @@ -4,7 +4,7 @@ module Fog module OpenStack class Image class V2 < Fog::Service - SUPPORTED_VERSIONS = /v2(\.(0|1|2|3))*/ + SUPPORTED_VERSIONS = /v2(\.(0|1|2|3))*/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -49,7 +49,7 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :images => {} + images: {} } end end @@ -71,15 +71,15 @@ def initialize(options = {}) management_url.path = '/v2' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].detect { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -93,11 +93,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end class Upload # Exists for image_v2_upload_spec "describe" diff --git a/lib/fog/openstack/image/v2/models/image.rb b/lib/fog/openstack/image/v2/models/image.rb index 69fcc0c99..5130bc9fa 100644 --- a/lib/fog/openstack/image/v2/models/image.rb +++ b/lib/fog/openstack/image/v2/models/image.rb @@ -178,7 +178,7 @@ def build_update_json_patch(client_attributes, server_attributes) [ build_patch_operation('remove', patch_attributes_to_remove(client_attributes, server_attributes)), build_patch_operation('add', patch_attributes_to_add(client_attributes, server_attributes)), - build_patch_operation('replace', patch_attributes_to_replace(client_attributes, server_attributes)), + build_patch_operation('replace', patch_attributes_to_replace(client_attributes, server_attributes)) ].flatten end @@ -203,7 +203,7 @@ def patch_attributes_to_replace(client_attributes, server_attributes) def build_patch_operation(op_name, attributes) json_patch = [] attributes.each do |key, value| - json_patch << {:op => op_name, :path => "/#{key}", :value => value} + json_patch << { op: op_name, path: "/#{key}", value: value } end json_patch end diff --git a/lib/fog/openstack/image/v2/models/images.rb b/lib/fog/openstack/image/v2/models/images.rb index 4030816ac..dba4fbc8b 100644 --- a/lib/fog/openstack/image/v2/models/images.rb +++ b/lib/fog/openstack/image/v2/models/images.rb @@ -41,7 +41,7 @@ def destroy(id) def method_missing(method_sym, *arguments, &block) if method_sym.to_s =~ /^find_by_(.*)$/ - load(service.list_images($1.to_sym => arguments.first).body['images']) + load(service.list_images(Regexp.last_match(1).to_sym => arguments.first).body['images']) else super end diff --git a/lib/fog/openstack/image/v2/requests/add_member_to_image.rb b/lib/fog/openstack/image/v2/requests/add_member_to_image.rb index 512392f23..5adcf43fe 100644 --- a/lib/fog/openstack/image/v2/requests/add_member_to_image.rb +++ b/lib/fog/openstack/image/v2/requests/add_member_to_image.rb @@ -5,10 +5,10 @@ class V2 class Real def add_member_to_image(image_id, tenant_id) request( - :expects => [200], - :method => 'POST', - :path => "images/#{image_id}/members", - :body => Fog::JSON.encode(:member => tenant_id) + expects: [200], + method: 'POST', + path: "images/#{image_id}/members", + body: Fog::JSON.encode(member: tenant_id) ) end end diff --git a/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb b/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb index 682bd64de..dbdbc4621 100644 --- a/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb +++ b/lib/fog/openstack/image/v2/requests/add_tag_to_image.rb @@ -5,9 +5,9 @@ class V2 class Real def add_tag_to_image(image_id, tag) request( - :expects => [204], - :method => 'PUT', - :path => "images/#{image_id}/tags/#{tag}" + expects: [204], + method: 'PUT', + path: "images/#{image_id}/tags/#{tag}" ) end end diff --git a/lib/fog/openstack/image/v2/requests/create_image.rb b/lib/fog/openstack/image/v2/requests/create_image.rb index 8c92fe7cb..7594feb7f 100644 --- a/lib/fog/openstack/image/v2/requests/create_image.rb +++ b/lib/fog/openstack/image/v2/requests/create_image.rb @@ -9,11 +9,11 @@ def create_image(image) headers["Location"] = location if location request( - :headers => headers, - :expects => [201], - :method => 'POST', - :path => "images", - :body => Fog::JSON.encode(image) + headers: headers, + expects: [201], + method: 'POST', + path: "images", + body: Fog::JSON.encode(image) ) end end @@ -25,21 +25,21 @@ def create_image(attributes) image_id = Fog::Mock.random_hex(32) image = data[:images][image_id] = { - 'tags' => attributes[:tags] || [], - 'name' => attributes[:name], - 'size' => nil, - 'min_disk' => attributes[:min_disk] || 0, - 'disk_format' => attributes[:disk_format] || 'raw', - 'created_at' => Time.now.strftime('%FT%T.%6N'), + 'tags' => attributes[:tags] || [], + 'name' => attributes[:name], + 'size' => nil, + 'min_disk' => attributes[:min_disk] || 0, + 'disk_format' => attributes[:disk_format] || 'raw', + 'created_at' => Time.now.strftime('%FT%T.%6N'), 'container_format' => attributes[:container_format] || 'bare', - 'deleted_at' => nil, - 'updated_at' => Time.now.strftime('%FT%T.%6N'), - 'checksum' => nil, - 'id' => image_id, - 'visibility' => attributes[:visibility] || 'public', - 'status' => 'queued', - 'min_ram' => attributes[:min_ram] || 0, - 'owner' => attributes[:owner] || Fog::Mock.random_hex(32) + 'deleted_at' => nil, + 'updated_at' => Time.now.strftime('%FT%T.%6N'), + 'checksum' => nil, + 'id' => image_id, + 'visibility' => attributes[:visibility] || 'public', + 'status' => 'queued', + 'min_ram' => attributes[:min_ram] || 0, + 'owner' => attributes[:owner] || Fog::Mock.random_hex(32) } response.body = image response diff --git a/lib/fog/openstack/image/v2/requests/deactivate_image.rb b/lib/fog/openstack/image/v2/requests/deactivate_image.rb index 02f8c2c43..40e8f7d43 100644 --- a/lib/fog/openstack/image/v2/requests/deactivate_image.rb +++ b/lib/fog/openstack/image/v2/requests/deactivate_image.rb @@ -5,9 +5,9 @@ class V2 class Real def deactivate_image(image_id) request( - :expects => 204, - :method => 'POST', - :path => "images/#{image_id}/actions/deactivate" + expects: 204, + method: 'POST', + path: "images/#{image_id}/actions/deactivate" ) end end diff --git a/lib/fog/openstack/image/v2/requests/delete_image.rb b/lib/fog/openstack/image/v2/requests/delete_image.rb index 8275cd351..c87475eb8 100644 --- a/lib/fog/openstack/image/v2/requests/delete_image.rb +++ b/lib/fog/openstack/image/v2/requests/delete_image.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_image(image_id) request( - :expects => 204, - :method => 'DELETE', - :path => "images/#{image_id}" + expects: 204, + method: 'DELETE', + path: "images/#{image_id}" ) end end diff --git a/lib/fog/openstack/image/v2/requests/download_image.rb b/lib/fog/openstack/image/v2/requests/download_image.rb index 76924090d..41447d882 100644 --- a/lib/fog/openstack/image/v2/requests/download_image.rb +++ b/lib/fog/openstack/image/v2/requests/download_image.rb @@ -5,10 +5,10 @@ class V2 class Real def download_image(image_id, _content_range = nil, params) # TODO: implement content range handling request_hash = { - :expects => [200, 204], - :method => 'GET', - :raw_body => true, - :path => "images/#{image_id}/file", + expects: [200, 204], + method: 'GET', + raw_body: true, + path: "images/#{image_id}/file" } request_hash[:response_block] = params[:response_block] if params[:response_block] request(request_hash).body diff --git a/lib/fog/openstack/image/v2/requests/get_image.rb b/lib/fog/openstack/image/v2/requests/get_image.rb index d686ef716..133ca6810 100644 --- a/lib/fog/openstack/image/v2/requests/get_image.rb +++ b/lib/fog/openstack/image/v2/requests/get_image.rb @@ -5,9 +5,9 @@ class V2 class Real def get_image(image_id) request( - :expects => [200, 204], - :method => 'HEAD', - :path => "images/#{image_id}" + expects: [200, 204], + method: 'HEAD', + path: "images/#{image_id}" ) end end @@ -16,27 +16,27 @@ class Mock def get_image(_image_id) response = Excon::Response.new response.status = [200, 204][rand(2)] - response.headers = {"X-Image-Meta-Is_public" => "True", - "X-Image-Meta-Min_disk" => "0", - "X-Image-Meta-Property-Ramdisk_id" => "b45aa128-cd36-4ad9-a026-1a1c2bfd8fdc", - "X-Image-Meta-Disk_format" => "ami", - "X-Image-Meta-Created_at" => "2012-02-21T07:32:26", - "X-Image-Meta-Container_format" => "ami", - "Etag" => "2f81976cae15c16ef0010c51e3a6c163", - "Location" => "http://192.168.27.100:9292/v1/images/0e09fbd6-43c5-448a-83e9-0d3d05f9747e", - "X-Image-Meta-Protected" => "False", - "Date" => "Fri, 24 Feb 2012 02:14:25 GMT", - "X-Image-Meta-Name" => "cirros-0.3.0-x86_64-blank", - "X-Image-Meta-Min_ram" => "0", "Content-Type" => "text/html; charset=UTF-8", - "X-Image-Meta-Updated_at" => "2012-02-21T07:32:29", - "X-Image-Meta-Property-Kernel_id" => "cd28951e-e1c2-4bc5-95d3-f0495abbcdc5", - "X-Image-Meta-Size" => "25165824", - "X-Image-Meta-Checksum" => "2f81976cae15c16ef0010c51e3a6c163", - "X-Image-Meta-Deleted" => "False", - "Content-Length" => "0", - "X-Image-Meta-Owner" => "ff528b20431645ebb5fa4b0a71ca002f", - "X-Image-Meta-Status" => "active", - "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e"} + response.headers = { "X-Image-Meta-Is_public" => "True", + "X-Image-Meta-Min_disk" => "0", + "X-Image-Meta-Property-Ramdisk_id" => "b45aa128-cd36-4ad9-a026-1a1c2bfd8fdc", + "X-Image-Meta-Disk_format" => "ami", + "X-Image-Meta-Created_at" => "2012-02-21T07:32:26", + "X-Image-Meta-Container_format" => "ami", + "Etag" => "2f81976cae15c16ef0010c51e3a6c163", + "Location" => "http://192.168.27.100:9292/v1/images/0e09fbd6-43c5-448a-83e9-0d3d05f9747e", + "X-Image-Meta-Protected" => "False", + "Date" => "Fri, 24 Feb 2012 02:14:25 GMT", + "X-Image-Meta-Name" => "cirros-0.3.0-x86_64-blank", + "X-Image-Meta-Min_ram" => "0", "Content-Type" => "text/html; charset=UTF-8", + "X-Image-Meta-Updated_at" => "2012-02-21T07:32:29", + "X-Image-Meta-Property-Kernel_id" => "cd28951e-e1c2-4bc5-95d3-f0495abbcdc5", + "X-Image-Meta-Size" => "25165824", + "X-Image-Meta-Checksum" => "2f81976cae15c16ef0010c51e3a6c163", + "X-Image-Meta-Deleted" => "False", + "Content-Length" => "0", + "X-Image-Meta-Owner" => "ff528b20431645ebb5fa4b0a71ca002f", + "X-Image-Meta-Status" => "active", + "X-Image-Meta-Id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e" } response.body = "" response end diff --git a/lib/fog/openstack/image/v2/requests/get_image_by_id.rb b/lib/fog/openstack/image/v2/requests/get_image_by_id.rb index 4f9943347..4242423c2 100644 --- a/lib/fog/openstack/image/v2/requests/get_image_by_id.rb +++ b/lib/fog/openstack/image/v2/requests/get_image_by_id.rb @@ -5,9 +5,9 @@ class V2 class Real def get_image_by_id(image_id) request( - :expects => [200], - :method => 'GET', - :path => "images/#{image_id}" + expects: [200], + method: 'GET', + path: "images/#{image_id}" ) end end @@ -18,12 +18,12 @@ def get_image_by_id(_image_id) response.status = [200][rand(2)] response.body = { "images" => [{ - "name" => "mock-image-name", - "size" => 25165824, - "disk_format" => "ami", + "name" => "mock-image-name", + "size" => 25165824, + "disk_format" => "ami", "container_format" => "ami", - "id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e", - "checksum" => "2f81976cae15c16ef0010c51e3a6c163" + "id" => "0e09fbd6-43c5-448a-83e9-0d3d05f9747e", + "checksum" => "2f81976cae15c16ef0010c51e3a6c163" }] } response diff --git a/lib/fog/openstack/image/v2/requests/get_image_members.rb b/lib/fog/openstack/image/v2/requests/get_image_members.rb index 9f788c7f4..5fc560dbd 100644 --- a/lib/fog/openstack/image/v2/requests/get_image_members.rb +++ b/lib/fog/openstack/image/v2/requests/get_image_members.rb @@ -5,9 +5,9 @@ class V2 class Real def get_image_members(image_id) request( - :expects => [200, 204], - :method => 'GET', - :path => "images/#{image_id}/members" + expects: [200, 204], + method: 'GET', + path: "images/#{image_id}/members" ) end end @@ -18,8 +18,8 @@ def get_image_members(_image_id) response.status = [200, 204][rand(2)] response.body = { "members" => [ - {"member_id" => "ff528b20431645ebb5fa4b0a71ca002f", - "can_share" => false} + { "member_id" => "ff528b20431645ebb5fa4b0a71ca002f", + "can_share" => false } ] } response diff --git a/lib/fog/openstack/image/v2/requests/get_member_details.rb b/lib/fog/openstack/image/v2/requests/get_member_details.rb index 6d8942ead..677f6b460 100644 --- a/lib/fog/openstack/image/v2/requests/get_member_details.rb +++ b/lib/fog/openstack/image/v2/requests/get_member_details.rb @@ -5,9 +5,9 @@ class V2 class Real def get_member_details(image_id, member_id) request( - :expects => [200], - :method => 'GET', - :path => "images/#{image_id}/members/#{member_id}" + expects: [200], + method: 'GET', + path: "images/#{image_id}/members/#{member_id}" ).body end end @@ -17,12 +17,12 @@ def get_member_details(_image_id, _member_id) response = Excon::Response.new response.status = 200 response.body = { - :status => "pending", - :created_at => "2013-11-26T07:21:21Z", - :updated_at => "2013-11-26T07:21:21Z", - :image_id => "0ae74cc5-5147-4239-9ce2-b0c580f7067e", - :member_id => "8989447062e04a818baf9e073fd04fa7", - :schema => "/v2/schemas/member" + status: "pending", + created_at: "2013-11-26T07:21:21Z", + updated_at: "2013-11-26T07:21:21Z", + image_id: "0ae74cc5-5147-4239-9ce2-b0c580f7067e", + member_id: "8989447062e04a818baf9e073fd04fa7", + schema: "/v2/schemas/member" } response end diff --git a/lib/fog/openstack/image/v2/requests/get_shared_images.rb b/lib/fog/openstack/image/v2/requests/get_shared_images.rb index 9f9479b41..891d3c3ee 100644 --- a/lib/fog/openstack/image/v2/requests/get_shared_images.rb +++ b/lib/fog/openstack/image/v2/requests/get_shared_images.rb @@ -5,9 +5,9 @@ class V2 class Real def get_shared_images(tenant_id) request( - :expects => [200, 204], - :method => 'GET', - :path => "shared-images/#{tenant_id}" + expects: [200, 204], + method: 'GET', + path: "shared-images/#{tenant_id}" ) end end @@ -18,8 +18,8 @@ def get_shared_images(_tenant_id) response.status = [200, 204][rand(2)] response.body = { "shared_images" => [ - {"image_id" => "ff528b20431645ebb5fa4b0a71ca002f", - "can_share" => false} + { "image_id" => "ff528b20431645ebb5fa4b0a71ca002f", + "can_share" => false } ] } response diff --git a/lib/fog/openstack/image/v2/requests/list_images.rb b/lib/fog/openstack/image/v2/requests/list_images.rb index e4ac2e794..ba3f97ec7 100644 --- a/lib/fog/openstack/image/v2/requests/list_images.rb +++ b/lib/fog/openstack/image/v2/requests/list_images.rb @@ -5,10 +5,10 @@ class V2 class Real def list_images(options = {}) request( - :expects => [200], - :method => 'GET', - :path => 'images', - :query => options + expects: [200], + method: 'GET', + path: 'images', + query: options ) end end @@ -19,12 +19,12 @@ def list_images(_options = {}) response.status = [200, 204][rand(2)] response.body = { "images" => [{ - "name" => Fog::Mock.random_letters(10), - "size" => Fog::Mock.random_numbers(8).to_i, - "disk_format" => "iso", + "name" => Fog::Mock.random_letters(10), + "size" => Fog::Mock.random_numbers(8).to_i, + "disk_format" => "iso", "container_format" => "bare", - "id" => Fog::Mock.random_hex(36), - "checksum" => Fog::Mock.random_hex(32) + "id" => Fog::Mock.random_hex(36), + "checksum" => Fog::Mock.random_hex(32) }] } response diff --git a/lib/fog/openstack/image/v2/requests/reactivate_image.rb b/lib/fog/openstack/image/v2/requests/reactivate_image.rb index 49fc76802..88d73291e 100644 --- a/lib/fog/openstack/image/v2/requests/reactivate_image.rb +++ b/lib/fog/openstack/image/v2/requests/reactivate_image.rb @@ -5,9 +5,9 @@ class V2 class Real def reactivate_image(image_id) request( - :expects => 204, - :method => 'POST', - :path => "images/#{image_id}/actions/reactivate" + expects: 204, + method: 'POST', + path: "images/#{image_id}/actions/reactivate" ) end end diff --git a/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb b/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb index ef5ee7b76..57c9fdf64 100644 --- a/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb +++ b/lib/fog/openstack/image/v2/requests/remove_member_from_image.rb @@ -5,9 +5,9 @@ class V2 class Real def remove_member_from_image(image_id, member_id) request( - :expects => [200, 204], - :method => 'DELETE', - :path => "images/#{image_id}/members/#{member_id}" + expects: [200, 204], + method: 'DELETE', + path: "images/#{image_id}/members/#{member_id}" ) end end diff --git a/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb b/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb index e550f63d3..00d22eb9a 100644 --- a/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb +++ b/lib/fog/openstack/image/v2/requests/remove_tag_from_image.rb @@ -5,9 +5,9 @@ class V2 class Real def remove_tag_from_image(image_id, tag) request( - :expects => [204], - :method => 'DELETE', - :path => "images/#{image_id}/tags/#{tag}" + expects: [204], + method: 'DELETE', + path: "images/#{image_id}/tags/#{tag}" ) end end diff --git a/lib/fog/openstack/image/v2/requests/update_image.rb b/lib/fog/openstack/image/v2/requests/update_image.rb index cead9ed33..409762520 100644 --- a/lib/fog/openstack/image/v2/requests/update_image.rb +++ b/lib/fog/openstack/image/v2/requests/update_image.rb @@ -5,11 +5,11 @@ class V2 class Real def update_image(id, json_patch) request( - :headers => {'Content-Type' => 'application/openstack-images-v2.1-json-patch'}, - :expects => [200], - :method => 'PATCH', - :path => "images/#{id}", - :body => Fog::JSON.encode(json_patch) + headers: { 'Content-Type' => 'application/openstack-images-v2.1-json-patch' }, + expects: [200], + method: 'PATCH', + path: "images/#{id}", + body: Fog::JSON.encode(json_patch) ) end end @@ -21,23 +21,23 @@ def update_image(attributes) image = images.last response.body = { 'image' => { - 'name' => attributes[:name] || image.name, - 'size' => image.size, - 'min_disk' => (attributes[:min_disk] || image.min_disk).to_i, - 'disk_format' => attributes[:disk_format] || image.disk_format, - 'created_at' => image.created_at, + 'name' => attributes[:name] || image.name, + 'size' => image.size, + 'min_disk' => (attributes[:min_disk] || image.min_disk).to_i, + 'disk_format' => attributes[:disk_format] || image.disk_format, + 'created_at' => image.created_at, 'container_format' => attributes[:container_format] || image.container_format, - 'deleted_at' => nil, - 'updated_at' => Time.now.to_s, - 'checksum' => image.checksum, - 'id' => attributes[:id], - 'deleted' => false, - 'protected' => false, - 'is_public' => attributes[:is_public] || image.is_public, - 'status' => image.status, - 'min_ram' => (attributes[:min_ram] || image.min_ram).to_i, - 'owner' => attributes[:owner] || image.owner, - 'properties' => attributes[:properties] || image.properties + 'deleted_at' => nil, + 'updated_at' => Time.now.to_s, + 'checksum' => image.checksum, + 'id' => attributes[:id], + 'deleted' => false, + 'protected' => false, + 'is_public' => attributes[:is_public] || image.is_public, + 'status' => image.status, + 'min_ram' => (attributes[:min_ram] || image.min_ram).to_i, + 'owner' => attributes[:owner] || image.owner, + 'properties' => attributes[:properties] || image.properties } } response diff --git a/lib/fog/openstack/image/v2/requests/update_image_member.rb b/lib/fog/openstack/image/v2/requests/update_image_member.rb index 40fa17a2e..d865712b9 100644 --- a/lib/fog/openstack/image/v2/requests/update_image_member.rb +++ b/lib/fog/openstack/image/v2/requests/update_image_member.rb @@ -5,10 +5,10 @@ class V2 class Real def update_image_member(image_id, member) request( # 'status' is the only property we can update - :body => Fog::JSON.encode(member.select { |key, _value| key == 'status' }), - :expects => [200], - :method => 'PUT', - :path => "images/#{image_id}/members/#{member['member_id']}" + body: Fog::JSON.encode(member.select { |key, _value| key == 'status' }), + expects: [200], + method: 'PUT', + path: "images/#{image_id}/members/#{member['member_id']}" ) end end @@ -18,12 +18,12 @@ def update_image_members(image_id, member) response = Excon::Response.new response.status = 204 response.body = { - :status => "accepted", - :created_at => "2013-11-26T07:21:21Z", - :updated_at => "2013-11-26T07:21:21Z", - :image_id => image_id, - :member_id => member['member_id'], - :schema => "/v2/schemas/member" + status: "accepted", + created_at: "2013-11-26T07:21:21Z", + updated_at: "2013-11-26T07:21:21Z", + image_id: image_id, + member_id: member['member_id'], + schema: "/v2/schemas/member" } response end diff --git a/lib/fog/openstack/image/v2/requests/upload_image.rb b/lib/fog/openstack/image/v2/requests/upload_image.rb index e0ef0906b..d593a3edf 100644 --- a/lib/fog/openstack/image/v2/requests/upload_image.rb +++ b/lib/fog/openstack/image/v2/requests/upload_image.rb @@ -5,10 +5,10 @@ class V2 class Real def upload_image(image_id, body, params = {}) request_hash = { - :headers => {'Content-Type' => 'application/octet-stream'}, - :expects => 204, - :method => 'PUT', - :path => "images/#{image_id}/file" + headers: { 'Content-Type' => 'application/octet-stream' }, + expects: 204, + method: 'PUT', + path: "images/#{image_id}/file" } request_hash[:request_block] = params[:request_block] if params[:request_block] request_hash[:body] = body if body diff --git a/lib/fog/openstack/introspection.rb b/lib/fog/openstack/introspection.rb index 67430dd00..10d5a998d 100644 --- a/lib/fog/openstack/introspection.rb +++ b/lib/fog/openstack/introspection.rb @@ -3,7 +3,7 @@ module Fog module OpenStack class Introspection < Fog::Service - SUPPORTED_VERSIONS = /v1/ + SUPPORTED_VERSIONS = /v1/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -45,7 +45,7 @@ def self.data @data ||= Hash.new do |hash, key| # Introspection data is *huge* we load it from a yaml file file = "test/fixtures/introspection.yaml" - hash[key] = YAML.load(File.read(file)) + hash[key] = YAML.safe_load(File.read(file)) end end @@ -55,7 +55,7 @@ def self.reset include Fog::OpenStack::Core - def initialize(options = {}) + def initialize(_options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86_400).iso8601 end diff --git a/lib/fog/openstack/introspection/requests/abort_introspection.rb b/lib/fog/openstack/introspection/requests/abort_introspection.rb index 51f127952..2f16e4c4a 100644 --- a/lib/fog/openstack/introspection/requests/abort_introspection.rb +++ b/lib/fog/openstack/introspection/requests/abort_introspection.rb @@ -4,10 +4,10 @@ class Introspection class Real def abort_introspection(node_id) request( - :body => "", - :expects => 202, - :method => "POST", - :path => "introspection/#{node_id}/abort" + body: "", + expects: 202, + method: "POST", + path: "introspection/#{node_id}/abort" ) end end diff --git a/lib/fog/openstack/introspection/requests/create_introspection.rb b/lib/fog/openstack/introspection/requests/create_introspection.rb index cc05eeb7c..850508375 100644 --- a/lib/fog/openstack/introspection/requests/create_introspection.rb +++ b/lib/fog/openstack/introspection/requests/create_introspection.rb @@ -14,10 +14,10 @@ def create_introspection(node_id, options = {}) end request( - :body => body, - :expects => 202, - :method => "POST", - :path => "introspection/#{node_id}" + body: body, + expects: 202, + method: "POST", + path: "introspection/#{node_id}" ) end end diff --git a/lib/fog/openstack/introspection/requests/create_rules.rb b/lib/fog/openstack/introspection/requests/create_rules.rb index d3332186f..c4d5e5253 100644 --- a/lib/fog/openstack/introspection/requests/create_rules.rb +++ b/lib/fog/openstack/introspection/requests/create_rules.rb @@ -16,10 +16,10 @@ def create_rules(attributes) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => "POST", - :path => "rules" + body: Fog::JSON.encode(data), + expects: 200, + method: "POST", + path: "rules" ) end end @@ -28,7 +28,7 @@ class Mock def create_rules(_) response = Excon::Response.new response.status = 200 - response.body = {"rules" => data[:rules].first} + response.body = { "rules" => data[:rules].first } response end end diff --git a/lib/fog/openstack/introspection/requests/delete_rules.rb b/lib/fog/openstack/introspection/requests/delete_rules.rb index 6a8eba027..1f7e9e906 100644 --- a/lib/fog/openstack/introspection/requests/delete_rules.rb +++ b/lib/fog/openstack/introspection/requests/delete_rules.rb @@ -4,9 +4,9 @@ class Introspection class Real def delete_rules(rule_id) request( - :expects => 204, - :method => "DELETE", - :path => "rules/#{rule_id}" + expects: 204, + method: "DELETE", + path: "rules/#{rule_id}" ) end end diff --git a/lib/fog/openstack/introspection/requests/delete_rules_all.rb b/lib/fog/openstack/introspection/requests/delete_rules_all.rb index 086296f73..3e4bb8a45 100644 --- a/lib/fog/openstack/introspection/requests/delete_rules_all.rb +++ b/lib/fog/openstack/introspection/requests/delete_rules_all.rb @@ -4,9 +4,9 @@ class Introspection class Real def delete_rules_all request( - :expects => 204, - :method => "DELETE", - :path => "rules" + expects: 204, + method: "DELETE", + path: "rules" ) end end diff --git a/lib/fog/openstack/introspection/requests/get_introspection.rb b/lib/fog/openstack/introspection/requests/get_introspection.rb index 04cacb96e..d2cc97d5a 100644 --- a/lib/fog/openstack/introspection/requests/get_introspection.rb +++ b/lib/fog/openstack/introspection/requests/get_introspection.rb @@ -4,9 +4,9 @@ class Introspection class Real def get_introspection(node_id) request( - :expects => 200, - :method => "GET", - :path => "introspection/#{node_id}" + expects: 200, + method: "GET", + path: "introspection/#{node_id}" ) end end @@ -15,7 +15,7 @@ class Mock def get_introspection(_node_id) response = Excon::Response.new response.status = 200 - response.body = {"error" => "null", "finished" => "true"} + response.body = { "error" => "null", "finished" => "true" } response end end diff --git a/lib/fog/openstack/introspection/requests/get_introspection_details.rb b/lib/fog/openstack/introspection/requests/get_introspection_details.rb index 610c86955..8d38f2367 100644 --- a/lib/fog/openstack/introspection/requests/get_introspection_details.rb +++ b/lib/fog/openstack/introspection/requests/get_introspection_details.rb @@ -4,9 +4,9 @@ class Introspection class Real def get_introspection_details(node_id) request( - :expects => 200, - :method => 'GET', - :path => "introspection/#{node_id}/data" + expects: 200, + method: 'GET', + path: "introspection/#{node_id}/data" ) end end @@ -15,7 +15,7 @@ class Mock def get_introspection_details(_node_id) response = Excon::Response.new response.status = 200 - response.body = {"data" => data[:introspection_data]} + response.body = { "data" => data[:introspection_data] } response end end diff --git a/lib/fog/openstack/introspection/requests/get_rules.rb b/lib/fog/openstack/introspection/requests/get_rules.rb index c5df3e31f..d863072c4 100644 --- a/lib/fog/openstack/introspection/requests/get_rules.rb +++ b/lib/fog/openstack/introspection/requests/get_rules.rb @@ -4,9 +4,9 @@ class Introspection class Real def get_rules(rule_id) request( - :expects => 200, - :method => 'GET', - :path => "rules/#{rule_id}" + expects: 200, + method: 'GET', + path: "rules/#{rule_id}" ) end end @@ -15,7 +15,7 @@ class Mock def get_rules(_rule_id) response = Excon::Response.new response.status = 200 - response.body = {"rules" => data[:rules].first} + response.body = { "rules" => data[:rules].first } response end end diff --git a/lib/fog/openstack/introspection/requests/list_rules.rb b/lib/fog/openstack/introspection/requests/list_rules.rb index c05261574..35dad18dc 100644 --- a/lib/fog/openstack/introspection/requests/list_rules.rb +++ b/lib/fog/openstack/introspection/requests/list_rules.rb @@ -4,9 +4,9 @@ class Introspection class Real def list_rules request( - :expects => 200, - :method => 'GET', - :path => "rules" + expects: 200, + method: 'GET', + path: "rules" ) end end @@ -15,7 +15,7 @@ class Mock def list_rules response = Excon::Response.new response.status = 200 - response.body = {"rules" => data[:rules].first} + response.body = { "rules" => data[:rules].first } response end end diff --git a/lib/fog/openstack/key_manager.rb b/lib/fog/openstack/key_manager.rb index 5c411cc31..0c4dbe96f 100644 --- a/lib/fog/openstack/key_manager.rb +++ b/lib/fog/openstack/key_manager.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class KeyManager < Fog::Service - SUPPORTED_VERSIONS = /v1(\.0)*/ + SUPPORTED_VERSIONS = /v1(\.0)*/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -15,7 +15,6 @@ class KeyManager < Fog::Service :openstack_project_domain_id, :openstack_user_domain_id, :openstack_domain_id, :openstack_identity_api_version, :openstack_temp_url_key, :openstack_cache_ttl - ## MODELS # model_path 'fog/openstack/key_manager/models' @@ -42,7 +41,7 @@ class KeyManager < Fog::Service request :list_containers request :delete_container - #ACL + # ACL request :get_secret_acl request :update_secret_acl request :replace_secret_acl @@ -67,25 +66,25 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].detect { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/key_manager/models/acl.rb b/lib/fog/openstack/key_manager/models/acl.rb index 1b52d7cfa..5005a089b 100644 --- a/lib/fog/openstack/key_manager/models/acl.rb +++ b/lib/fog/openstack/key_manager/models/acl.rb @@ -1,10 +1,8 @@ - require 'fog/openstack/models/model' module Fog module OpenStack class KeyManager - class ACL < Fog::OpenStack::Model identity :acl_ref @@ -16,7 +14,6 @@ class ACL < Fog::OpenStack::Model attribute :created attribute :creator_id attribute :updated - end end end diff --git a/lib/fog/openstack/key_manager/models/container.rb b/lib/fog/openstack/key_manager/models/container.rb index 4d5fb89ca..3a15885f3 100644 --- a/lib/fog/openstack/key_manager/models/container.rb +++ b/lib/fog/openstack/key_manager/models/container.rb @@ -4,7 +4,6 @@ module Fog module OpenStack class KeyManager - class Container < Fog::OpenStack::Model identity :container_ref @@ -21,8 +20,8 @@ class Container < Fog::OpenStack::Model attribute :updated def uuid - URI(self.container_ref).path.split('/').last - rescue + URI(container_ref).path.split('/').last + rescue StandardError nil end @@ -36,9 +35,7 @@ def destroy service.delete_container(uuid) true end - end - end end end diff --git a/lib/fog/openstack/key_manager/models/containers.rb b/lib/fog/openstack/key_manager/models/containers.rb index 0df3c9762..118599416 100644 --- a/lib/fog/openstack/key_manager/models/containers.rb +++ b/lib/fog/openstack/key_manager/models/containers.rb @@ -18,7 +18,6 @@ def get(secret_ref) rescue Fog::OpenStack::Compute::NotFound nil end - end end end diff --git a/lib/fog/openstack/key_manager/models/secret.rb b/lib/fog/openstack/key_manager/models/secret.rb index af55f07de..33da26156 100644 --- a/lib/fog/openstack/key_manager/models/secret.rb +++ b/lib/fog/openstack/key_manager/models/secret.rb @@ -4,7 +4,6 @@ module Fog module OpenStack class KeyManager - class Secret < Fog::OpenStack::Model identity :secret_ref @@ -30,8 +29,8 @@ class Secret < Fog::OpenStack::Model attribute :metadata def uuid - URI(self.secret_ref).path.split('/').last - rescue + URI(secret_ref).path.split('/').last + rescue StandardError nil end @@ -45,9 +44,7 @@ def destroy service.delete_secret(uuid) true end - end - end end end diff --git a/lib/fog/openstack/key_manager/models/secrets.rb b/lib/fog/openstack/key_manager/models/secrets.rb index 5d133965d..080cffe3f 100644 --- a/lib/fog/openstack/key_manager/models/secrets.rb +++ b/lib/fog/openstack/key_manager/models/secrets.rb @@ -18,7 +18,6 @@ def get(secret_ref) rescue Fog::OpenStack::Compute::NotFound nil end - end end end diff --git a/lib/fog/openstack/key_manager/requests/create_container.rb b/lib/fog/openstack/key_manager/requests/create_container.rb index 3ce4b3a0e..fff6edfd8 100644 --- a/lib/fog/openstack/key_manager/requests/create_container.rb +++ b/lib/fog/openstack/key_manager/requests/create_container.rb @@ -4,10 +4,10 @@ class KeyManager class Real def create_container(options) request( - :body => Fog::JSON.encode(options), - :expects => [201], - :method => 'POST', - :path => 'containers' + body: Fog::JSON.encode(options), + expects: [201], + method: 'POST', + path: 'containers' ) end end diff --git a/lib/fog/openstack/key_manager/requests/create_secret.rb b/lib/fog/openstack/key_manager/requests/create_secret.rb index fad47e055..0792f2805 100644 --- a/lib/fog/openstack/key_manager/requests/create_secret.rb +++ b/lib/fog/openstack/key_manager/requests/create_secret.rb @@ -4,10 +4,10 @@ class KeyManager class Real def create_secret(options) request( - :body => Fog::JSON.encode(options), - :expects => [201], - :method => 'POST', - :path => 'secrets' + body: Fog::JSON.encode(options), + expects: [201], + method: 'POST', + path: 'secrets' ) end end diff --git a/lib/fog/openstack/key_manager/requests/delete_container.rb b/lib/fog/openstack/key_manager/requests/delete_container.rb index 571ae2a98..c0b50f41d 100644 --- a/lib/fog/openstack/key_manager/requests/delete_container.rb +++ b/lib/fog/openstack/key_manager/requests/delete_container.rb @@ -4,9 +4,9 @@ class KeyManager class Real def delete_container(id) request( - :expects => [204], - :method => 'DELETE', - :path => "containers/#{id}" + expects: [204], + method: 'DELETE', + path: "containers/#{id}" ) end end diff --git a/lib/fog/openstack/key_manager/requests/delete_container_acl.rb b/lib/fog/openstack/key_manager/requests/delete_container_acl.rb index 803712bc8..c74d93299 100644 --- a/lib/fog/openstack/key_manager/requests/delete_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/delete_container_acl.rb @@ -4,9 +4,9 @@ class KeyManager class Real def delete_container_acl(uuid) request( - :expects => [200], - :method => 'DELETE', - :path => "containers/#{uuid}/acl" + expects: [200], + method: 'DELETE', + path: "containers/#{uuid}/acl" ) end end diff --git a/lib/fog/openstack/key_manager/requests/delete_secret.rb b/lib/fog/openstack/key_manager/requests/delete_secret.rb index d5f439c3a..f1b17e879 100644 --- a/lib/fog/openstack/key_manager/requests/delete_secret.rb +++ b/lib/fog/openstack/key_manager/requests/delete_secret.rb @@ -4,9 +4,9 @@ class KeyManager class Real def delete_secret(id) request( - :expects => [204], - :method => 'DELETE', - :path => "secrets/#{id}" + expects: [204], + method: 'DELETE', + path: "secrets/#{id}" ) end end diff --git a/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb b/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb index 446d8ff4a..043f590c6 100644 --- a/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/delete_secret_acl.rb @@ -4,9 +4,9 @@ class KeyManager class Real def delete_secret_acl(uuid) request( - :expects => [200], - :method => 'DELETE', - :path => "secrets/#{uuid}/acl" + expects: [200], + method: 'DELETE', + path: "secrets/#{uuid}/acl" ) end end diff --git a/lib/fog/openstack/key_manager/requests/get_container.rb b/lib/fog/openstack/key_manager/requests/get_container.rb index b8293f7ba..e0c85a949 100644 --- a/lib/fog/openstack/key_manager/requests/get_container.rb +++ b/lib/fog/openstack/key_manager/requests/get_container.rb @@ -4,9 +4,9 @@ class KeyManager class Real def get_container(uuid) request( - :expects => [200], - :method => 'GET', - :path => "containers/#{uuid}", + expects: [200], + method: 'GET', + path: "containers/#{uuid}" ) end end diff --git a/lib/fog/openstack/key_manager/requests/get_container_acl.rb b/lib/fog/openstack/key_manager/requests/get_container_acl.rb index 07c33ca93..b10f7247e 100644 --- a/lib/fog/openstack/key_manager/requests/get_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/get_container_acl.rb @@ -4,9 +4,9 @@ class KeyManager class Real def get_container_acl(uuid) request( - :expects => [200], - :method => 'GET', - :path => "containers/#{uuid}/acl" + expects: [200], + method: 'GET', + path: "containers/#{uuid}/acl" ) end end @@ -18,9 +18,9 @@ def get_container_acl(_uuid) response.body = { "read" => { "project-access" => true, - "updated" => "2017-04-25T19:10:52", - "users" => ["45895d3a393f42b2a8760f5dafa9c6d8"], - "created" => "2017-04-25T19:10:52" + "updated" => "2017-04-25T19:10:52", + "users" => ["45895d3a393f42b2a8760f5dafa9c6d8"], + "created" => "2017-04-25T19:10:52" } } response diff --git a/lib/fog/openstack/key_manager/requests/get_secret.rb b/lib/fog/openstack/key_manager/requests/get_secret.rb index 52814f8f7..87e9e85a7 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret.rb @@ -4,9 +4,9 @@ class KeyManager class Real def get_secret(uuid) request( - :expects => [200], - :method => 'GET', - :path => "secrets/#{uuid}", + expects: [200], + method: 'GET', + path: "secrets/#{uuid}" ) end end diff --git a/lib/fog/openstack/key_manager/requests/get_secret_acl.rb b/lib/fog/openstack/key_manager/requests/get_secret_acl.rb index 5205edecf..07bad0c23 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_acl.rb @@ -4,9 +4,9 @@ class KeyManager class Real def get_secret_acl(uuid) request( - :expects => [200], - :method => 'GET', - :path => "secrets/#{uuid}/acl" + expects: [200], + method: 'GET', + path: "secrets/#{uuid}/acl" ) end end @@ -18,9 +18,9 @@ def get_secret_acl(_uuid) response.body = { "read" => { "project-access" => false, - "updated" => "2017-04-25T19:10:52", - "users" => %w(45895d3a393f42b2a8760f5dafa9c6d8 dc2cb4f0d30044e2b0251409c94cc955), - "created" => "2017-04-25T19:10:52" + "updated" => "2017-04-25T19:10:52", + "users" => %w(45895d3a393f42b2a8760f5dafa9c6d8 dc2cb4f0d30044e2b0251409c94cc955), + "created" => "2017-04-25T19:10:52" } } response diff --git a/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb b/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb index 05ae2fc98..b832eac5a 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_metadata.rb @@ -4,9 +4,9 @@ class KeyManager class Real def get_secret_metadata(uuid) request( - :expects => [200], - :method => 'GET', - :path => "secrets/#{uuid}/metadata", + expects: [200], + method: 'GET', + path: "secrets/#{uuid}/metadata" ) end end diff --git a/lib/fog/openstack/key_manager/requests/get_secret_payload.rb b/lib/fog/openstack/key_manager/requests/get_secret_payload.rb index 042855c51..e1f4c121e 100644 --- a/lib/fog/openstack/key_manager/requests/get_secret_payload.rb +++ b/lib/fog/openstack/key_manager/requests/get_secret_payload.rb @@ -4,10 +4,10 @@ class KeyManager class Real def get_secret_payload(uuid) request( - :expects => [200], - :method => 'GET', - :path => "secrets/#{uuid}/payload", - :headers => { + expects: [200], + method: 'GET', + path: "secrets/#{uuid}/payload", + headers: { 'Accept' => '*/*' } ) diff --git a/lib/fog/openstack/key_manager/requests/list_containers.rb b/lib/fog/openstack/key_manager/requests/list_containers.rb index f89b699c1..606128472 100644 --- a/lib/fog/openstack/key_manager/requests/list_containers.rb +++ b/lib/fog/openstack/key_manager/requests/list_containers.rb @@ -4,10 +4,10 @@ class KeyManager class Real def list_containers(options = {}) request( - :expects => [200], - :method => 'GET', - :path => 'containers', - :query => options + expects: [200], + method: 'GET', + path: 'containers', + query: options ) end end diff --git a/lib/fog/openstack/key_manager/requests/list_secrets.rb b/lib/fog/openstack/key_manager/requests/list_secrets.rb index 612da0d7b..b4c15a547 100644 --- a/lib/fog/openstack/key_manager/requests/list_secrets.rb +++ b/lib/fog/openstack/key_manager/requests/list_secrets.rb @@ -4,10 +4,10 @@ class KeyManager class Real def list_secrets(options = {}) request( - :expects => [200], - :method => 'GET', - :path => 'secrets', - :query => options + expects: [200], + method: 'GET', + path: 'secrets', + query: options ) end end diff --git a/lib/fog/openstack/key_manager/requests/replace_container_acl.rb b/lib/fog/openstack/key_manager/requests/replace_container_acl.rb index 24ec6fb12..ca9fdd8f6 100644 --- a/lib/fog/openstack/key_manager/requests/replace_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/replace_container_acl.rb @@ -4,10 +4,10 @@ class KeyManager class Real def replace_container_acl(uuid, options) request( - :body => Fog::JSON.encode(options), - :expects => [200], - :method => 'PUT', - :path => "containers/#{uuid}/acl" + body: Fog::JSON.encode(options), + expects: [200], + method: 'PUT', + path: "containers/#{uuid}/acl" ) end end diff --git a/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb b/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb index 62559ebaa..5b5e05e8c 100644 --- a/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/replace_secret_acl.rb @@ -4,10 +4,10 @@ class KeyManager class Real def replace_secret_acl(uuid, options) request( - :body => Fog::JSON.encode(options), - :expects => [200], - :method => 'PUT', - :path => "secrets/#{uuid}/acl" + body: Fog::JSON.encode(options), + expects: [200], + method: 'PUT', + path: "secrets/#{uuid}/acl" ) end end diff --git a/lib/fog/openstack/key_manager/requests/update_container_acl.rb b/lib/fog/openstack/key_manager/requests/update_container_acl.rb index f65ccdff2..5c0c378fa 100644 --- a/lib/fog/openstack/key_manager/requests/update_container_acl.rb +++ b/lib/fog/openstack/key_manager/requests/update_container_acl.rb @@ -4,10 +4,10 @@ class KeyManager class Real def update_container_acl(uuid, options) request( - :body => Fog::JSON.encode(options), - :expects => [200], - :method => 'PATCH', - :path => "containers/#{uuid}/acl" + body: Fog::JSON.encode(options), + expects: [200], + method: 'PATCH', + path: "containers/#{uuid}/acl" ) end end diff --git a/lib/fog/openstack/key_manager/requests/update_secret_acl.rb b/lib/fog/openstack/key_manager/requests/update_secret_acl.rb index 3bca98a31..dd581ed49 100644 --- a/lib/fog/openstack/key_manager/requests/update_secret_acl.rb +++ b/lib/fog/openstack/key_manager/requests/update_secret_acl.rb @@ -4,10 +4,10 @@ class KeyManager class Real def update_secret_acl(uuid, options) request( - :body => Fog::JSON.encode(options), - :expects => [200], - :method => 'PATCH', - :path => "secrets/#{uuid}/acl" + body: Fog::JSON.encode(options), + expects: [200], + method: 'PATCH', + path: "secrets/#{uuid}/acl" ) end end diff --git a/lib/fog/openstack/metering.rb b/lib/fog/openstack/metering.rb index ab6d9c294..2db58b298 100644 --- a/lib/fog/openstack/metering.rb +++ b/lib/fog/openstack/metering.rb @@ -1,9 +1,7 @@ - - module Fog module OpenStack class Metering < Fog::Service - SUPPORTED_VERSIONS = /v2/ + SUPPORTED_VERSIONS = /v2/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -41,8 +39,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => {}, - :tenants => {} + users: {}, + tenants: {} } end end @@ -64,15 +62,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -86,10 +84,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/metering/requests/get_event.rb b/lib/fog/openstack/metering/requests/get_event.rb index 26d92b355..2e4d0bce7 100644 --- a/lib/fog/openstack/metering/requests/get_event.rb +++ b/lib/fog/openstack/metering/requests/get_event.rb @@ -4,9 +4,9 @@ class Metering class Real def get_event(message_id) request( - :expects => 200, - :method => 'GET', - :path => "events/#{message_id}" + expects: 200, + method: 'GET', + path: "events/#{message_id}" ) end end @@ -17,7 +17,7 @@ def get_event(_message_id) response.status = 200 response.body = { 'event_type' => 'compute.instance.create', - 'message_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'message_id' => 'd646b40dea6347dfb8caee2da1484c56' } response end diff --git a/lib/fog/openstack/metering/requests/get_resource.rb b/lib/fog/openstack/metering/requests/get_resource.rb index 8a807c3a1..713ea6865 100644 --- a/lib/fog/openstack/metering/requests/get_resource.rb +++ b/lib/fog/openstack/metering/requests/get_resource.rb @@ -4,9 +4,9 @@ class Metering class Real def get_resource(resource_id) request( - :expects => 200, - :method => 'GET', - :path => "resources/#{resource_id}" + expects: 200, + method: 'GET', + path: "resources/#{resource_id}" ) end end @@ -17,9 +17,9 @@ def get_resource(_resource_id) response.status = 200 response.body = { 'resource_id' => 'glance', - 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', - 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', - 'metadata' => {} + 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', + 'metadata' => {} } response end diff --git a/lib/fog/openstack/metering/requests/get_samples.rb b/lib/fog/openstack/metering/requests/get_samples.rb index 791b6b9e7..1693cba0e 100644 --- a/lib/fog/openstack/metering/requests/get_samples.rb +++ b/lib/fog/openstack/metering/requests/get_samples.rb @@ -19,10 +19,10 @@ def get_samples(meter_id, options = [], limit = 10000000) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'GET', - :path => "meters/#{meter_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'GET', + path: "meters/#{meter_id}" ) end end @@ -32,17 +32,17 @@ def get_samples(_meter_id) response = Excon::Response.new response.status = 200 response.body = [{ - 'counter_name' => 'image.size', - 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', - 'resource_id' => 'glance', - 'timestamp' => '2013-04-03T23:44:21', + 'counter_name' => 'image.size', + 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', + 'resource_id' => 'glance', + 'timestamp' => '2013-04-03T23:44:21', 'resource_metadata' => {}, - 'source' => 'artificial', - 'counter_unit' => 'bytes', - 'counter_volume' => 10.0, - 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', - 'message_id' => '14e4a902-9cf3-11e2-a054-003048f5eafc', - 'counter_type' => 'gauge' + 'source' => 'artificial', + 'counter_unit' => 'bytes', + 'counter_volume' => 10.0, + 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'message_id' => '14e4a902-9cf3-11e2-a054-003048f5eafc', + 'counter_type' => 'gauge' }] response end diff --git a/lib/fog/openstack/metering/requests/get_statistics.rb b/lib/fog/openstack/metering/requests/get_statistics.rb index 841666b96..ba14dc9aa 100644 --- a/lib/fog/openstack/metering/requests/get_statistics.rb +++ b/lib/fog/openstack/metering/requests/get_statistics.rb @@ -5,24 +5,26 @@ class Real def get_statistics(meter_id, options = {}) data = { 'period' => options['period'], - 'q' => [] + 'q' => [] } - options['q'].each do |opt| - filter = {} + if options['q'].kind_of? Array + options['q'].each do |opt| + filter = {} - ['field', 'op', 'value'].each do |key| - filter[key] = opt[key] if opt[key] - end + ['field', 'op', 'value'].each do |key| + filter[key] = opt[key] if opt[key] + end - data['q'] << filter unless filter.empty? - end if options['q'].kind_of? Array + data['q'] << filter unless filter.empty? + end + end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'GET', - :path => "meters/#{meter_id}/statistics" + body: Fog::JSON.encode(data), + expects: 200, + method: 'GET', + path: "meters/#{meter_id}/statistics" ) end end @@ -32,17 +34,17 @@ def get_statistics(_meter_id, _options = {}) response = Excon::Response.new response.status = 200 response.body = [{ - 'count' => 143, + 'count' => 143, 'duration_start' => '2013-04-03T23:44:21', - 'min' => 10.0, - 'max' => 10.0, - 'duration_end' => '2013-04-04T23:24:21', - 'period' => 0, - 'period_end' => '2013-04-04T23:24:21', - 'duration' => 85200.0, - 'period_start' => '2013-04-03T23:44:21', - 'avg' => 10.0, - 'sum' => 1430.0 + 'min' => 10.0, + 'max' => 10.0, + 'duration_end' => '2013-04-04T23:24:21', + 'period' => 0, + 'period_end' => '2013-04-04T23:24:21', + 'duration' => 85200.0, + 'period_start' => '2013-04-03T23:44:21', + 'avg' => 10.0, + 'sum' => 1430.0 }] response end diff --git a/lib/fog/openstack/metering/requests/list_events.rb b/lib/fog/openstack/metering/requests/list_events.rb index e94ac857b..1c5147f6e 100644 --- a/lib/fog/openstack/metering/requests/list_events.rb +++ b/lib/fog/openstack/metering/requests/list_events.rb @@ -18,10 +18,10 @@ def list_events(options = []) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'GET', - :path => 'events' + body: Fog::JSON.encode(data), + expects: 200, + method: 'GET', + path: 'events' ) end end @@ -32,7 +32,7 @@ def list_events(_options = {}) response.status = 200 response.body = [{ 'event_type' => 'compute.instance.create', - 'message_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'message_id' => 'd646b40dea6347dfb8caee2da1484c56' }] response end diff --git a/lib/fog/openstack/metering/requests/list_meters.rb b/lib/fog/openstack/metering/requests/list_meters.rb index 728797d0d..f0d1f688f 100644 --- a/lib/fog/openstack/metering/requests/list_meters.rb +++ b/lib/fog/openstack/metering/requests/list_meters.rb @@ -18,10 +18,10 @@ def list_meters(options = []) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'GET', - :path => 'meters' + body: Fog::JSON.encode(data), + expects: 200, + method: 'GET', + path: 'meters' ) end end @@ -31,12 +31,12 @@ def list_meters(_options = {}) response = Excon::Response.new response.status = 200 response.body = [{ - 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', - 'name' => 'image.size', + 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', + 'name' => 'image.size', 'resource_id' => 'glance', - 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', - 'type' => 'gauge', - 'unit' => 'bytes' + 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'type' => 'gauge', + 'unit' => 'bytes' }] response end diff --git a/lib/fog/openstack/metering/requests/list_resources.rb b/lib/fog/openstack/metering/requests/list_resources.rb index 4b574fe9b..28ecd0943 100644 --- a/lib/fog/openstack/metering/requests/list_resources.rb +++ b/lib/fog/openstack/metering/requests/list_resources.rb @@ -4,9 +4,9 @@ class Metering class Real def list_resources(_options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'resources' + expects: 200, + method: 'GET', + path: 'resources' ) end end @@ -17,9 +17,9 @@ def list_resources(_options = {}) response.status = 200 response.body = [{ 'resource_id' => 'glance', - 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', - 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', - 'metadata' => {} + 'project_id' => 'd646b40dea6347dfb8caee2da1484c56', + 'user_id' => '1d5fd9eda19142289a60ed9330b5d284', + 'metadata' => {} }] response end diff --git a/lib/fog/openstack/metric.rb b/lib/fog/openstack/metric.rb index 3feed8b09..221f6a454 100644 --- a/lib/fog/openstack/metric.rb +++ b/lib/fog/openstack/metric.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class Metric < Fog::Service - SUPPORTED_VERSIONS = /v1/ + SUPPORTED_VERSIONS = /v1/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -35,8 +35,8 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => {}, - :tenants => {} + users: {}, + tenants: {} } end end @@ -58,15 +58,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -80,10 +80,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/metric/models/metrics.rb b/lib/fog/openstack/metric/models/metrics.rb index 594e5c3ac..e5e752d20 100644 --- a/lib/fog/openstack/metric/models/metrics.rb +++ b/lib/fog/openstack/metric/models/metrics.rb @@ -5,7 +5,6 @@ module Fog module OpenStack class Metric class Metrics < Fog::OpenStack::Collection - model Fog::OpenStack::Metric::Metric def all(options = {}) diff --git a/lib/fog/openstack/metric/models/resources.rb b/lib/fog/openstack/metric/models/resources.rb index d58807c18..f5b1c6ee0 100644 --- a/lib/fog/openstack/metric/models/resources.rb +++ b/lib/fog/openstack/metric/models/resources.rb @@ -5,7 +5,6 @@ module Fog module OpenStack class Metric class Resources < Fog::OpenStack::Collection - model Fog::OpenStack::Metric::Resource def all(options = {}) diff --git a/lib/fog/openstack/metric/requests/get_metric.rb b/lib/fog/openstack/metric/requests/get_metric.rb index 3bbfd904b..4f9c18de4 100644 --- a/lib/fog/openstack/metric/requests/get_metric.rb +++ b/lib/fog/openstack/metric/requests/get_metric.rb @@ -4,9 +4,9 @@ class Metric class Real def get_metric(metric_id) request( - :expects => 200, - :method => 'GET', - :path => "metric/#{metric_id}" + expects: 200, + method: 'GET', + path: "metric/#{metric_id}" ) end end @@ -16,43 +16,43 @@ def get_metric(_metric_id) response = Excon::Response.new response.status = 200 response.body = { - "archive_policy" => { - "aggregation_methods" => [ - "95pct", - "median", - "max", - "count", - "std", - "sum", - "min", - "mean" - ], - "back_window" => 0, - "definition" => [ - { - "granularity" => "0:00:01", - "points" => 3600, - "timespan" => "1:00:00" - }, - { - "granularity" => "0:01:00", - "points" => 10080, - "timespan" => "7 days, 0:00:00" - }, - { - "granularity" => "1:00:00", - "points" => 8760, - "timespan" => "365 days, 0:00:00" - } - ], - "name" => "high" - }, - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "id" => "8bbb5f02-b654-4861-b19e-d372fcdca124", - "name" => nil, - "resource" => nil, - "unit" => nil + "archive_policy" => { + "aggregation_methods" => [ + "95pct", + "median", + "max", + "count", + "std", + "sum", + "min", + "mean" + ], + "back_window" => 0, + "definition" => [ + { + "granularity" => "0:00:01", + "points" => 3600, + "timespan" => "1:00:00" + }, + { + "granularity" => "0:01:00", + "points" => 10080, + "timespan" => "7 days, 0:00:00" + }, + { + "granularity" => "1:00:00", + "points" => 8760, + "timespan" => "365 days, 0:00:00" + } + ], + "name" => "high" + }, + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "id" => "8bbb5f02-b654-4861-b19e-d372fcdca124", + "name" => nil, + "resource" => nil, + "unit" => nil } response end diff --git a/lib/fog/openstack/metric/requests/get_metric_measures.rb b/lib/fog/openstack/metric/requests/get_metric_measures.rb index 21b207a42..8813e964e 100644 --- a/lib/fog/openstack/metric/requests/get_metric_measures.rb +++ b/lib/fog/openstack/metric/requests/get_metric_measures.rb @@ -4,10 +4,10 @@ class Metric class Real def get_metric_measures(metric_id, options = {}) request( - :expects => 200, - :method => 'GET', - :path => "metric/#{metric_id}/measures", - :query => options, + expects: 200, + method: 'GET', + path: "metric/#{metric_id}/measures", + query: options ) end end @@ -17,18 +17,18 @@ def get_metric_measures(_metric_id, _options = {}) response = Excon::Response.new response.status = 200 response.body = [ - { - "timestamp" => "2014-10-06T14:33:57", - "value" => 43.1 - }, - { - "timestamp" => "2014-10-06T14:34:12", - "value" => 12 - }, - { - "timestamp" => "2014-10-06T14:34:20", - "value" => 2 - } + { + "timestamp" => "2014-10-06T14:33:57", + "value" => 43.1 + }, + { + "timestamp" => "2014-10-06T14:34:12", + "value" => 12 + }, + { + "timestamp" => "2014-10-06T14:34:20", + "value" => 2 + } ] response end diff --git a/lib/fog/openstack/metric/requests/get_resource.rb b/lib/fog/openstack/metric/requests/get_resource.rb index 33f9f994e..d1465364d 100644 --- a/lib/fog/openstack/metric/requests/get_resource.rb +++ b/lib/fog/openstack/metric/requests/get_resource.rb @@ -4,9 +4,9 @@ class Metric class Real def get_resource(resource_id) request( - :expects => 200, - :method => 'GET', - :path => "resource/generic/#{resource_id}" + expects: 200, + method: 'GET', + path: "resource/generic/#{resource_id}" ) end end @@ -16,18 +16,18 @@ def get_resource(_resource_id) response = Excon::Response.new response.status = 200 response.body = { - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "ended_at" => nil, - "id" => "75c44741-cc60-4033-804e-2d3098c7d2e9", - "metrics" => {}, - "original_resource_id" => "75C44741-CC60-4033-804E-2D3098C7D2E9", - "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", - "revision_end" => nil, - "revision_start" => "2016-11-08T11:23:45.989977+00:00", - "started_at" => "2016-11-08T11:23:45.989960+00:00", - "type" => "generic", - "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "ended_at" => nil, + "id" => "75c44741-cc60-4033-804e-2d3098c7d2e9", + "metrics" => {}, + "original_resource_id" => "75C44741-CC60-4033-804E-2D3098C7D2E9", + "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", + "revision_end" => nil, + "revision_start" => "2016-11-08T11:23:45.989977+00:00", + "started_at" => "2016-11-08T11:23:45.989960+00:00", + "type" => "generic", + "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" } response end diff --git a/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb b/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb index 91dbc33bb..832bd723e 100644 --- a/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb +++ b/lib/fog/openstack/metric/requests/get_resource_metric_measures.rb @@ -4,10 +4,10 @@ class Metric class Real def get_resource_metric_measures(resource_id, metric_name, options = {}) request( - :expects => 200, - :method => 'GET', - :path => "resource/generic/#{resource_id}/metric/#{metric_name}/measures", - :query => options + expects: 200, + method: 'GET', + path: "resource/generic/#{resource_id}/metric/#{metric_name}/measures", + query: options ) end end @@ -17,26 +17,26 @@ def get_resource_metric_measures(_resource_id, _metric_name, _options = {}) response = Excon::Response.new response.status = 200 response.body = [ - [ - "2014-10-06T14:00:00+00:00", - 3600.0, - 24.7 - ], - [ - "2014-10-06T14:34:00+00:00", - 60.0, - 15.5 - ], - [ - "2014-10-06T14:34:12+00:00", - 1.0, - 6.0 - ], - [ - "2014-10-06T14:34:20+00:00", - 1.0, - 25.0 - ] + [ + "2014-10-06T14:00:00+00:00", + 3600.0, + 24.7 + ], + [ + "2014-10-06T14:34:00+00:00", + 60.0, + 15.5 + ], + [ + "2014-10-06T14:34:12+00:00", + 1.0, + 6.0 + ], + [ + "2014-10-06T14:34:20+00:00", + 1.0, + 25.0 + ] ] response end diff --git a/lib/fog/openstack/metric/requests/list_metrics.rb b/lib/fog/openstack/metric/requests/list_metrics.rb index 736fb9dd2..c26053a56 100644 --- a/lib/fog/openstack/metric/requests/list_metrics.rb +++ b/lib/fog/openstack/metric/requests/list_metrics.rb @@ -4,10 +4,10 @@ class Metric class Real def list_metrics(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'metric', - :query => options + expects: 200, + method: 'GET', + path: 'metric', + query: options ) end end @@ -17,84 +17,84 @@ def list_metrics(_options = {}) response = Excon::Response.new response.status = 200 response.body = [ - { - "archive_policy" => { - "aggregation_methods" => [ - "95pct", - "median", - "max", - "count", - "std", - "sum", - "min", - "mean" - ], - "back_window" => 0, - "definition" => [ - { - "granularity" => "0:00:01", - "points" => 3600, - "timespan" => "1:00:00" - }, - { - "granularity" => "0:01:00", - "points" => 10080, - "timespan" => "7 days, 0:00:00" - }, - { - "granularity" => "1:00:00", - "points" => 8760, - "timespan" => "365 days, 0:00:00" - } - ], - "name" => "high" + { + "archive_policy" => { + "aggregation_methods" => [ + "95pct", + "median", + "max", + "count", + "std", + "sum", + "min", + "mean" + ], + "back_window" => 0, + "definition" => [ + { + "granularity" => "0:00:01", + "points" => 3600, + "timespan" => "1:00:00" }, - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "id" => "8bbb5f02-b654-4861-b19e-d372fcdca124", - "name" => nil, - "resource_id" => nil, - "unit" => nil + { + "granularity" => "0:01:00", + "points" => 10080, + "timespan" => "7 days, 0:00:00" + }, + { + "granularity" => "1:00:00", + "points" => 8760, + "timespan" => "365 days, 0:00:00" + } + ], + "name" => "high" }, - { - "archive_policy" => { - "aggregation_methods" => [ - "95pct", - "median", - "max", - "count", - "std", - "sum", - "min", - "mean" - ], - "back_window" => 0, - "definition" => [ - { - "granularity" => "0:05:00", - "points" => 12, - "timespan" => "1:00:00" - }, - { - "granularity" => "1:00:00", - "points" => 24, - "timespan" => "1 day, 0:00:00" - }, - { - "granularity" => "1 day, 0:00:00", - "points" => 30, - "timespan" => "30 days, 0:00:00" - } - ], - "name" => "low" + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "id" => "8bbb5f02-b654-4861-b19e-d372fcdca124", + "name" => nil, + "resource_id" => nil, + "unit" => nil + }, + { + "archive_policy" => { + "aggregation_methods" => [ + "95pct", + "median", + "max", + "count", + "std", + "sum", + "min", + "mean" + ], + "back_window" => 0, + "definition" => [ + { + "granularity" => "0:05:00", + "points" => 12, + "timespan" => "1:00:00" + }, + { + "granularity" => "1:00:00", + "points" => 24, + "timespan" => "1 day, 0:00:00" }, - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "id" => "af3446dc-e20f-4ecf-aaaa-1240c05ff19b", - "name" => nil, - "resource_id" => nil, - "unit" => nil - } + { + "granularity" => "1 day, 0:00:00", + "points" => 30, + "timespan" => "30 days, 0:00:00" + } + ], + "name" => "low" + }, + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "id" => "af3446dc-e20f-4ecf-aaaa-1240c05ff19b", + "name" => nil, + "resource_id" => nil, + "unit" => nil + } ] response end diff --git a/lib/fog/openstack/metric/requests/list_resources.rb b/lib/fog/openstack/metric/requests/list_resources.rb index 2b32f609e..bac206ffc 100644 --- a/lib/fog/openstack/metric/requests/list_resources.rb +++ b/lib/fog/openstack/metric/requests/list_resources.rb @@ -4,10 +4,10 @@ class Metric class Real def list_resources(type = "generic", options = {}) request( - :expects => 200, - :method => 'GET', - :path => "resource/#{Fog::OpenStack.escape(type)}", - :query => options + expects: 200, + method: 'GET', + path: "resource/#{Fog::OpenStack.escape(type)}", + query: options ) end end @@ -17,50 +17,50 @@ def list_resources(_type = "generic", _options = {}) response = Excon::Response.new response.status = 200 response.body = [ - { - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "ended_at" => nil, - "id" => "75c44741-cc60-4033-804e-2d3098c7d2e9", - "metrics" => {}, - "original_resource_id" => "75C44741-CC60-4033-804E-2D3098C7D2E9", - "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", - "revision_end" => nil, - "revision_start" => "2016-11-08T11:23:45.989977+00:00", - "started_at" => "2016-11-08T11:23:45.989960+00:00", - "type" => "generic", - "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" + { + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "ended_at" => nil, + "id" => "75c44741-cc60-4033-804e-2d3098c7d2e9", + "metrics" => {}, + "original_resource_id" => "75C44741-CC60-4033-804E-2D3098C7D2E9", + "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", + "revision_end" => nil, + "revision_start" => "2016-11-08T11:23:45.989977+00:00", + "started_at" => "2016-11-08T11:23:45.989960+00:00", + "type" => "generic", + "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" + }, + { + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "ended_at" => nil, + "id" => "ab68da77-fa82-4e67-aba9-270c5a98cbcb", + "metrics" => { + "temperature" => "ed51c966-8890-4f4e-96c4-f0a753dbad42" }, - { - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "ended_at" => nil, - "id" => "ab68da77-fa82-4e67-aba9-270c5a98cbcb", - "metrics" => { - "temperature" => "ed51c966-8890-4f4e-96c4-f0a753dbad42" - }, - "original_resource_id" => "AB68DA77-FA82-4E67-ABA9-270C5A98CBCB", - "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", - "revision_end" => nil, - "revision_start" => "2016-11-08T11:23:46.177259+00:00", - "started_at" => "2016-11-08T11:23:46.177236+00:00", - "type" => "generic", - "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" - }, - { - "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", - "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", - "ended_at" => "2014-01-04T10:00:12+00:00", - "id" => "6868da77-fa82-4e67-aba9-270c5ae8cbca", - "metrics" => {}, - "original_resource_id" => "6868DA77-FA82-4E67-ABA9-270C5AE8CBCA", - "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", - "revision_end" => nil, - "revision_start" => "2016-11-08T11:23:46.781604+00:00", - "started_at" => "2014-01-02T23:23:34+00:00", - "type" => "instance", - "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" - } + "original_resource_id" => "AB68DA77-FA82-4E67-ABA9-270C5A98CBCB", + "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", + "revision_end" => nil, + "revision_start" => "2016-11-08T11:23:46.177259+00:00", + "started_at" => "2016-11-08T11:23:46.177236+00:00", + "type" => "generic", + "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" + }, + { + "created_by_project_id" => "384a902b-6856-424c-9d30-6b5325ac20a5", + "created_by_user_id" => "d040def9-fd68-45f0-a19f-253014f397c3", + "ended_at" => "2014-01-04T10:00:12+00:00", + "id" => "6868da77-fa82-4e67-aba9-270c5ae8cbca", + "metrics" => {}, + "original_resource_id" => "6868DA77-FA82-4E67-ABA9-270C5AE8CBCA", + "project_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D", + "revision_end" => nil, + "revision_start" => "2016-11-08T11:23:46.781604+00:00", + "started_at" => "2014-01-02T23:23:34+00:00", + "type" => "instance", + "user_id" => "BD3A1E52-1C62-44CB-BF04-660BD88CD74D" + } ] response end diff --git a/lib/fog/openstack/monitoring.rb b/lib/fog/openstack/monitoring.rb index 85f60452b..607ea7705 100644 --- a/lib/fog/openstack/monitoring.rb +++ b/lib/fog/openstack/monitoring.rb @@ -1,4 +1,3 @@ - module Fog module OpenStack class Monitoring < Fog::Service diff --git a/lib/fog/openstack/monitoring/models/alarm_definitions.rb b/lib/fog/openstack/monitoring/models/alarm_definitions.rb index 0366033fe..51468c309 100644 --- a/lib/fog/openstack/monitoring/models/alarm_definitions.rb +++ b/lib/fog/openstack/monitoring/models/alarm_definitions.rb @@ -26,9 +26,10 @@ def all(options = {}) def find_by_id(id) cached_alarm_definition = detect { |alarm_definition| alarm_definition.id == id } return cached_alarm_definition if cached_alarm_definition + alarm_definition_hash = service.get_alarm_definition(id).body Fog::OpenStack::Monitoring::AlarmDefinition.new( - alarm_definition_hash.merge(:service => service) + alarm_definition_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/monitoring/models/alarms.rb b/lib/fog/openstack/monitoring/models/alarms.rb index f3aa14f1a..b185c9033 100644 --- a/lib/fog/openstack/monitoring/models/alarms.rb +++ b/lib/fog/openstack/monitoring/models/alarms.rb @@ -14,9 +14,10 @@ def all(options = {}) def find_by_id(id) cached_alarm = detect { |alarm| alarm.id == id } return cached_alarm if cached_alarm + alarm_hash = service.get_alarm(id).body Fog::OpenStack::Monitoring::Alarm.new( - alarm_hash.merge(:service => service) + alarm_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/monitoring/models/notification_methods.rb b/lib/fog/openstack/monitoring/models/notification_methods.rb index 4d1fbaa07..9d89c6470 100644 --- a/lib/fog/openstack/monitoring/models/notification_methods.rb +++ b/lib/fog/openstack/monitoring/models/notification_methods.rb @@ -22,9 +22,10 @@ def patch(attributes) def find_by_id(id) cached_notification_method = detect { |notification_method| notification_method.id == id } return cached_notification_method if cached_notification_method + notification_method_hash = service.get_notification_method(id).body Fog::OpenStack::Monitoring::NotificationMethod.new( - notification_method_hash.merge(:service => service) + notification_method_hash.merge(service: service) ) end diff --git a/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb index 1a145cb8e..87c4039f7 100644 --- a/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/create_alarm_definition.rb @@ -4,10 +4,10 @@ class Monitoring class Real def create_alarm_definition(options) request( - :body => Fog::JSON.encode(options), - :expects => [201, 204], - :method => 'POST', - :path => 'alarm-definitions' + body: Fog::JSON.encode(options), + expects: [201, 204], + method: 'POST', + path: 'alarm-definitions' ) end end diff --git a/lib/fog/openstack/monitoring/requests/create_metric.rb b/lib/fog/openstack/monitoring/requests/create_metric.rb index 569641d67..4707f2ee2 100644 --- a/lib/fog/openstack/monitoring/requests/create_metric.rb +++ b/lib/fog/openstack/monitoring/requests/create_metric.rb @@ -14,10 +14,10 @@ def create_metric(options) # _create_metric(data) request( - :body => Fog::JSON.encode(data), - :expects => [204], - :method => 'POST', - :path => 'metrics' + body: Fog::JSON.encode(data), + expects: [204], + method: 'POST', + path: 'metrics' ) end end diff --git a/lib/fog/openstack/monitoring/requests/create_metric_array.rb b/lib/fog/openstack/monitoring/requests/create_metric_array.rb index 87307b981..8767f3038 100644 --- a/lib/fog/openstack/monitoring/requests/create_metric_array.rb +++ b/lib/fog/openstack/monitoring/requests/create_metric_array.rb @@ -4,10 +4,10 @@ class Monitoring class Real def create_metric_array(metrics_list) request( - :body => Fog::JSON.encode(metrics_list), - :expects => [204], - :method => 'POST', - :path => 'metrics' + body: Fog::JSON.encode(metrics_list), + expects: [204], + method: 'POST', + path: 'metrics' ) end end diff --git a/lib/fog/openstack/monitoring/requests/create_notification_method.rb b/lib/fog/openstack/monitoring/requests/create_notification_method.rb index 33b21d8b0..70f121f30 100644 --- a/lib/fog/openstack/monitoring/requests/create_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/create_notification_method.rb @@ -4,10 +4,10 @@ class Monitoring class Real def create_notification_method(options) request( - :body => Fog::JSON.encode(options), - :expects => [201, 204], - :method => 'POST', - :path => 'notification-methods' + body: Fog::JSON.encode(options), + expects: [201, 204], + method: 'POST', + path: 'notification-methods' ) end end diff --git a/lib/fog/openstack/monitoring/requests/delete_alarm.rb b/lib/fog/openstack/monitoring/requests/delete_alarm.rb index ec16a8c0b..c9a19bdfc 100644 --- a/lib/fog/openstack/monitoring/requests/delete_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/delete_alarm.rb @@ -4,9 +4,9 @@ class Monitoring class Real def delete_alarm(id) request( - :expects => [204], - :method => 'DELETE', - :path => "alarms/#{id}" + expects: [204], + method: 'DELETE', + path: "alarms/#{id}" ) end end diff --git a/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb index 396544111..264bd332e 100644 --- a/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/delete_alarm_definition.rb @@ -4,9 +4,9 @@ class Monitoring class Real def delete_alarm_definition(id) request( - :expects => [204], - :method => 'DELETE', - :path => "alarm-definitions/#{id}" + expects: [204], + method: 'DELETE', + path: "alarm-definitions/#{id}" ) end end diff --git a/lib/fog/openstack/monitoring/requests/delete_notification_method.rb b/lib/fog/openstack/monitoring/requests/delete_notification_method.rb index 9bee9bf3a..1b7df9c40 100644 --- a/lib/fog/openstack/monitoring/requests/delete_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/delete_notification_method.rb @@ -4,9 +4,9 @@ class Monitoring class Real def delete_notification_method(id) request( - :expects => [204], - :method => 'DELETE', - :path => "notification-methods/#{id}" + expects: [204], + method: 'DELETE', + path: "notification-methods/#{id}" ) end end diff --git a/lib/fog/openstack/monitoring/requests/find_measurements.rb b/lib/fog/openstack/monitoring/requests/find_measurements.rb index 31e123df7..2065dad47 100644 --- a/lib/fog/openstack/monitoring/requests/find_measurements.rb +++ b/lib/fog/openstack/monitoring/requests/find_measurements.rb @@ -4,10 +4,10 @@ class Monitoring class Real def find_measurements(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "metrics/measurements", - :query => options + expects: [200], + method: 'GET', + path: "metrics/measurements", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/get_alarm.rb b/lib/fog/openstack/monitoring/requests/get_alarm.rb index b20a0c049..9e191f233 100644 --- a/lib/fog/openstack/monitoring/requests/get_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm.rb @@ -4,9 +4,9 @@ class Monitoring class Real def get_alarm(id) request( - :expects => [200], - :method => 'GET', - :path => "alarms/#{id}" + expects: [200], + method: 'GET', + path: "alarms/#{id}" ) end end diff --git a/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb b/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb index 42da01d93..8fedb3aae 100644 --- a/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm_counts.rb @@ -4,10 +4,10 @@ class Monitoring class Real def get_alarm_counts(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "alarms/count", - :query => options + expects: [200], + method: 'GET', + path: "alarms/count", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb index 656ed7350..e6ecf406c 100644 --- a/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/get_alarm_definition.rb @@ -4,9 +4,9 @@ class Monitoring class Real def get_alarm_definition(id) request( - :expects => [200], - :method => 'GET', - :path => "alarm-definitions/#{id}" + expects: [200], + method: 'GET', + path: "alarm-definitions/#{id}" ) end end diff --git a/lib/fog/openstack/monitoring/requests/get_notification_method.rb b/lib/fog/openstack/monitoring/requests/get_notification_method.rb index ad42e476e..14d790a60 100644 --- a/lib/fog/openstack/monitoring/requests/get_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/get_notification_method.rb @@ -4,9 +4,9 @@ class Monitoring class Real def get_notification_method(id) request( - :expects => [200], - :method => 'GET', - :path => "notification-methods/#{id}" + expects: [200], + method: 'GET', + path: "notification-methods/#{id}" ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb b/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb index b76ab5a31..7b5713855 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_definitions.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_alarm_definitions(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "alarm-definitions", - :query => options + expects: [200], + method: 'GET', + path: "alarm-definitions", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb index 770a11f31..efd6babd7 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_all_alarms.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_alarm_state_history_for_all_alarms(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "alarms/state-history", - :query => options + expects: [200], + method: 'GET', + path: "alarms/state-history", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb index 2fb5c4a54..1783b5f42 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarm_state_history_for_specific_alarm.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_alarm_state_history_for_specific_alarm(id, options = {}) request( - :expects => [200], - :method => 'GET', - :path => "alarms/#{id}/state-history", - :query => options + expects: [200], + method: 'GET', + path: "alarms/#{id}/state-history", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_alarms.rb b/lib/fog/openstack/monitoring/requests/list_alarms.rb index 3288b1f54..603266d41 100644 --- a/lib/fog/openstack/monitoring/requests/list_alarms.rb +++ b/lib/fog/openstack/monitoring/requests/list_alarms.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_alarms(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "alarms", - :query => options + expects: [200], + method: 'GET', + path: "alarms", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_dimension_values.rb b/lib/fog/openstack/monitoring/requests/list_dimension_values.rb index 0e29b215e..c00160061 100644 --- a/lib/fog/openstack/monitoring/requests/list_dimension_values.rb +++ b/lib/fog/openstack/monitoring/requests/list_dimension_values.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_dimension_values(dimension_name, options = {}) request( - :expects => [200], - :method => 'GET', - :path => "metrics/dimensions/names/values", - :query => options.merge(:dimension_name => dimension_name) + expects: [200], + method: 'GET', + path: "metrics/dimensions/names/values", + query: options.merge(dimension_name: dimension_name) ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_metric_names.rb b/lib/fog/openstack/monitoring/requests/list_metric_names.rb index 2aae310cc..3f5286082 100644 --- a/lib/fog/openstack/monitoring/requests/list_metric_names.rb +++ b/lib/fog/openstack/monitoring/requests/list_metric_names.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_metric_names(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "metrics/names", - :query => options + expects: [200], + method: 'GET', + path: "metrics/names", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_metrics.rb b/lib/fog/openstack/monitoring/requests/list_metrics.rb index c2baeb595..8ac5bf7c4 100644 --- a/lib/fog/openstack/monitoring/requests/list_metrics.rb +++ b/lib/fog/openstack/monitoring/requests/list_metrics.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_metrics(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "metrics", - :query => options + expects: [200], + method: 'GET', + path: "metrics", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb b/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb index 74b8c1bfa..4977dbc54 100644 --- a/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb +++ b/lib/fog/openstack/monitoring/requests/list_notification_method_types.rb @@ -4,9 +4,9 @@ class Monitoring class Real def list_notification_method_types request( - :expects => [200], - :method => 'GET', - :path => "notification-methods/types" + expects: [200], + method: 'GET', + path: "notification-methods/types" ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_notification_methods.rb b/lib/fog/openstack/monitoring/requests/list_notification_methods.rb index 21639c200..f12d9ce2f 100644 --- a/lib/fog/openstack/monitoring/requests/list_notification_methods.rb +++ b/lib/fog/openstack/monitoring/requests/list_notification_methods.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_notification_methods(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "notification-methods", - :query => options + expects: [200], + method: 'GET', + path: "notification-methods", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/list_statistics.rb b/lib/fog/openstack/monitoring/requests/list_statistics.rb index 03df6c7fe..19bf32bde 100644 --- a/lib/fog/openstack/monitoring/requests/list_statistics.rb +++ b/lib/fog/openstack/monitoring/requests/list_statistics.rb @@ -4,10 +4,10 @@ class Monitoring class Real def list_statistics(options = {}) request( - :expects => [200], - :method => 'GET', - :path => "metrics/statistics", - :query => options + expects: [200], + method: 'GET', + path: "metrics/statistics", + query: options ) end end diff --git a/lib/fog/openstack/monitoring/requests/patch_alarm.rb b/lib/fog/openstack/monitoring/requests/patch_alarm.rb index aa5df3082..1902ac07f 100644 --- a/lib/fog/openstack/monitoring/requests/patch_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/patch_alarm.rb @@ -4,10 +4,10 @@ class Monitoring class Real def patch_alarm(id, options) request( - :expects => [200], - :method => 'PATCH', - :path => "alarms/#{id}", - :body => Fog::JSON.encode(options) + expects: [200], + method: 'PATCH', + path: "alarms/#{id}", + body: Fog::JSON.encode(options) ) end end diff --git a/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb index 3e3354d08..59e0b97bc 100644 --- a/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/patch_alarm_definition.rb @@ -4,10 +4,10 @@ class Monitoring class Real def patch_alarm_definition(id, alarm_definition) request( - :expects => [200], - :method => 'PATCH', - :path => "alarm-definitions/#{id}", - :body => Fog::JSON.encode(alarm_definition) + expects: [200], + method: 'PATCH', + path: "alarm-definitions/#{id}", + body: Fog::JSON.encode(alarm_definition) ) end end diff --git a/lib/fog/openstack/monitoring/requests/patch_notification_method.rb b/lib/fog/openstack/monitoring/requests/patch_notification_method.rb index 34a3b92f5..3c28d6579 100644 --- a/lib/fog/openstack/monitoring/requests/patch_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/patch_notification_method.rb @@ -4,10 +4,10 @@ class Monitoring class Real def update_notification_method(id, notification) request( - :expects => [200], - :method => 'PATCH', - :path => "notification-methods/#{id}", - :body => Fog::JSON.encode(notification) + expects: [200], + method: 'PATCH', + path: "notification-methods/#{id}", + body: Fog::JSON.encode(notification) ) end end diff --git a/lib/fog/openstack/monitoring/requests/put_notification_method.rb b/lib/fog/openstack/monitoring/requests/put_notification_method.rb index 219d97144..f8054209b 100644 --- a/lib/fog/openstack/monitoring/requests/put_notification_method.rb +++ b/lib/fog/openstack/monitoring/requests/put_notification_method.rb @@ -4,10 +4,10 @@ class Monitoring class Real def put_notification_method(id, notification) request( - :expects => [200], - :method => 'PUT', - :path => "notification-methods/#{id}", - :body => Fog::JSON.encode(notification) + expects: [200], + method: 'PUT', + path: "notification-methods/#{id}", + body: Fog::JSON.encode(notification) ) end end diff --git a/lib/fog/openstack/monitoring/requests/update_alarm.rb b/lib/fog/openstack/monitoring/requests/update_alarm.rb index cbd4384b2..a7b567210 100644 --- a/lib/fog/openstack/monitoring/requests/update_alarm.rb +++ b/lib/fog/openstack/monitoring/requests/update_alarm.rb @@ -4,10 +4,10 @@ class Monitoring class Real def update_alarm(id, options) request( - :expects => [200], - :method => 'PUT', - :path => "alarms/#{id}", - :body => Fog::JSON.encode(options) + expects: [200], + method: 'PUT', + path: "alarms/#{id}", + body: Fog::JSON.encode(options) ) end end diff --git a/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb b/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb index 3e5fb81fe..f0c576222 100644 --- a/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb +++ b/lib/fog/openstack/monitoring/requests/update_alarm_definition.rb @@ -4,10 +4,10 @@ class Monitoring class Real def update_alarm_definition(id, alarm_definition) request( - :expects => [200], - :method => 'PUT', - :path => "alarm-definitions/#{id}", - :body => Fog::JSON.encode(alarm_definition) + expects: [200], + method: 'PUT', + path: "alarm-definitions/#{id}", + body: Fog::JSON.encode(alarm_definition) ) end end diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 10070d4d3..096fdb303 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -1,5 +1,3 @@ - - module Fog module OpenStack class Network < Fog::Service @@ -269,149 +267,149 @@ def self.data tenant_id = Fog::Mock.random_hex(8) hash[key] = { - :extensions => { + extensions: { extension_id => { - 'id' => extension_id, - 'alias' => 'dvr', + 'id' => extension_id, + 'alias' => 'dvr', 'description' => 'Enables configuration of Distributed Virtual Routers.', - 'links' => [], - 'name' => 'Distributed Virtual Router' + 'links' => [], + 'name' => 'Distributed Virtual Router' } }, - :networks => { - network_id => { - 'id' => network_id, - 'name' => 'Public', - 'subnets' => [subnet_id], - 'shared' => true, - 'status' => 'ACTIVE', - 'tenant_id' => tenant_id, + networks: { + network_id => { + 'id' => network_id, + 'name' => 'Public', + 'subnets' => [subnet_id], + 'shared' => true, + 'status' => 'ACTIVE', + 'tenant_id' => tenant_id, 'provider:network:type' => 'vlan', - 'router:external' => false, - 'admin_state_up' => true, - 'qos_policy_id' => qos_policy_id, + 'router:external' => false, + 'admin_state_up' => true, + 'qos_policy_id' => qos_policy_id, 'port_security_enabled' => true }, 'e624a36d-762b-481f-9b50-4154ceb78bbb' => { - 'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb', - 'name' => 'network_1', - 'subnets' => ['2e4ec6a4-0150-47f5-8523-e899ac03026e'], - 'shared' => false, - 'status' => 'ACTIVE', - 'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9', + 'id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb', + 'name' => 'network_1', + 'subnets' => ['2e4ec6a4-0150-47f5-8523-e899ac03026e'], + 'shared' => false, + 'status' => 'ACTIVE', + 'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9', 'provider:network:type' => 'vlan', - 'router:external' => false, - 'admin_state_up' => true, - 'qos_policy_id' => qos_policy_id, + 'router:external' => false, + 'admin_state_up' => true, + 'qos_policy_id' => qos_policy_id, 'port_security_enabled' => true } }, - :ports => {}, - :subnets => { + ports: {}, + subnets: { subnet_id => { - 'id' => subnet_id, - 'name' => "Public", - 'network_id' => network_id, - 'cidr' => "192.168.0.0/22", - 'ip_version' => 4, - 'gateway_ip' => Fog::Mock.random_ip, + 'id' => subnet_id, + 'name' => "Public", + 'network_id' => network_id, + 'cidr' => "192.168.0.0/22", + 'ip_version' => 4, + 'gateway_ip' => Fog::Mock.random_ip, 'allocation_pools' => [], - 'dns_nameservers' => [Fog::Mock.random_ip, Fog::Mock.random_ip], - 'host_routes' => [Fog::Mock.random_ip], - 'enable_dhcp' => true, - 'tenant_id' => tenant_id, + 'dns_nameservers' => [Fog::Mock.random_ip, Fog::Mock.random_ip], + 'host_routes' => [Fog::Mock.random_ip], + 'enable_dhcp' => true, + 'tenant_id' => tenant_id } }, - :subnet_pools => {}, - :floating_ips => {}, - :routers => {}, - :lb_pools => {}, - :lb_members => {}, - :lb_health_monitors => {}, - :lb_vips => {}, - :lbaas_loadbalancers => {}, - :lbaas_listeners => {}, - :lbaas_pools => {}, - :lbaas_pool_members => {}, - :lbaas_health_monitorss => {}, - :lbaas_l7policies => {}, - :lbaas_l7rules => {}, - :vpn_services => {}, - :ike_policies => {}, - :ipsec_policies => {}, - :ipsec_site_connections => {}, - :rbac_policies => {}, - :quota => { - "subnet" => 10, - "router" => 10, - "port" => 50, - "network" => 10, + subnet_pools: {}, + floating_ips: {}, + routers: {}, + lb_pools: {}, + lb_members: {}, + lb_health_monitors: {}, + lb_vips: {}, + lbaas_loadbalancers: {}, + lbaas_listeners: {}, + lbaas_pools: {}, + lbaas_pool_members: {}, + lbaas_health_monitorss: {}, + lbaas_l7policies: {}, + lbaas_l7rules: {}, + vpn_services: {}, + ike_policies: {}, + ipsec_policies: {}, + ipsec_site_connections: {}, + rbac_policies: {}, + quota: { + "subnet" => 10, + "router" => 10, + "port" => 50, + "network" => 10, "floatingip" => 50 }, - :quotas => [ + quotas: [ { - "subnet" => 10, - "network" => 10, + "subnet" => 10, + "network" => 10, "floatingip" => 50, - "tenant_id" => tenant_id, - "router" => 10, - "port" => 30 + "tenant_id" => tenant_id, + "router" => 10, + "port" => 30 } ], - :security_groups => {}, - :security_group_rules => {}, - :network_ip_availabilities => [ + security_groups: {}, + security_group_rules: {}, + network_ip_availabilities: [ { - "network_id" => "4cf895c9-c3d1-489e-b02e-59b5c8976809", - "network_name" => "public", - "subnet_ip_availability" => [ + "network_id" => "4cf895c9-c3d1-489e-b02e-59b5c8976809", + "network_name" => "public", + "subnet_ip_availability" => [ { - "cidr" => "2001:db8::/64", - "ip_version" => 6, - "subnet_id" => "ca3f46c4-c6ff-4272-9be4-0466f84c6077", - "subnet_name" => "ipv6-public-subnet", - "total_ips" => 18446744073709552000, - "used_ips" => 1 + "cidr" => "2001:db8::/64", + "ip_version" => 6, + "subnet_id" => "ca3f46c4-c6ff-4272-9be4-0466f84c6077", + "subnet_name" => "ipv6-public-subnet", + "total_ips" => 18446744073709552000, + "used_ips" => 1 }, { - "cidr" => "172.24.4.0/24", - "ip_version" => 4, - "subnet_id" => "cc02efc1-9d47-46bd-bab6-760919c836b5", - "subnet_name" => "public-subnet", - "total_ips" => 253, - "used_ips" => 1 + "cidr" => "172.24.4.0/24", + "ip_version" => 4, + "subnet_id" => "cc02efc1-9d47-46bd-bab6-760919c836b5", + "subnet_name" => "public-subnet", + "total_ips" => 253, + "used_ips" => 1 } ], - "project_id" => "1a02cc95f1734fcc9d3c753818f03002", - "tenant_id" => "1a02cc95f1734fcc9d3c753818f03002", - "total_ips" => 253, - "used_ips" => 2 + "project_id" => "1a02cc95f1734fcc9d3c753818f03002", + "tenant_id" => "1a02cc95f1734fcc9d3c753818f03002", + "total_ips" => 253, + "used_ips" => 2 }, { - "network_id" => "6801d9c8-20e6-4b27-945d-62499f00002e", - "network_name" => "private", - "subnet_ip_availability" => [ + "network_id" => "6801d9c8-20e6-4b27-945d-62499f00002e", + "network_name" => "private", + "subnet_ip_availability" => [ { - "cidr" => "10.0.0.0/24", - "ip_version" => 4, - "subnet_id" => "44e70d00-80a2-4fb1-ab59-6190595ceb61", + "cidr" => "10.0.0.0/24", + "ip_version" => 4, + "subnet_id" => "44e70d00-80a2-4fb1-ab59-6190595ceb61", "subnet_name" => "private-subnet", - "total_ips" => 253, - "used_ips" => 2 + "total_ips" => 253, + "used_ips" => 2 }, { - "ip_version" => 6, - "cidr" => "fdbf:ac66:9be8::/64", - "subnet_id" => "a90623df-00e1-4902-a675-40674385d74c", + "ip_version" => 6, + "cidr" => "fdbf:ac66:9be8::/64", + "subnet_id" => "a90623df-00e1-4902-a675-40674385d74c", "subnet_name" => "ipv6-private-subnet", - "total_ips" => 18446744073709552000, - "used_ips" => 2 + "total_ips" => 18446744073709552000, + "used_ips" => 2 } ], - "project_id" => "d56d3b8dd6894a508cf41b96b522328c", - "tenant_id" => "d56d3b8dd6894a508cf41b96b522328c", - "total_ips" => 18446744073709552000, - "used_ips" => 4 + "project_id" => "d56d3b8dd6894a508cf41b96b522328c", + "tenant_id" => "d56d3b8dd6894a508cf41b96b522328c", + "total_ips" => 18446744073709552000, + "used_ips" => 4 } ] } @@ -424,7 +422,7 @@ def self.reset include Fog::OpenStack::Core - def initialize(options = {}) + def initialize(_options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86400).iso8601 end diff --git a/lib/fog/openstack/network/models/floating_ip.rb b/lib/fog/openstack/network/models/floating_ip.rb index 434ebe7f3..c3770c776 100644 --- a/lib/fog/openstack/network/models/floating_ip.rb +++ b/lib/fog/openstack/network/models/floating_ip.rb @@ -21,7 +21,6 @@ def initialize(attributes) def create requires :floating_network_id merge_attributes(service.create_floating_ip(floating_network_id, - attributes).body['floatingip']) self end @@ -56,7 +55,7 @@ def disassociate(fixed_ip_address = nil) private def options(fixed_ip_address) - fixed_ip_address ? {'fixed_ip_address' => fixed_ip_address} : {} + fixed_ip_address ? { 'fixed_ip_address' => fixed_ip_address } : {} end end end diff --git a/lib/fog/openstack/network/models/network.rb b/lib/fog/openstack/network/models/network.rb index 7daec5c02..465c4a54a 100644 --- a/lib/fog/openstack/network/models/network.rb +++ b/lib/fog/openstack/network/models/network.rb @@ -11,10 +11,10 @@ class Network < Fog::OpenStack::Model attribute :status attribute :admin_state_up attribute :tenant_id - attribute :provider_network_type, :aliases => 'provider:network_type' - attribute :provider_physical_network, :aliases => 'provider:physical_network' - attribute :provider_segmentation_id, :aliases => 'provider:segmentation_id' - attribute :router_external, :aliases => 'router:external' + attribute :provider_network_type, aliases: 'provider:network_type' + attribute :provider_physical_network, aliases: 'provider:physical_network' + attribute :provider_segmentation_id, aliases: 'provider:segmentation_id' + attribute :router_external, aliases: 'router:external' def subnets service.subnets.select { |s| s.network_id == id } diff --git a/lib/fog/openstack/network/models/router.rb b/lib/fog/openstack/network/models/router.rb index e7059ee8a..a4465fea3 100644 --- a/lib/fog/openstack/network/models/router.rb +++ b/lib/fog/openstack/network/models/router.rb @@ -47,11 +47,11 @@ def options options = attributes.dup if options[:external_gateway_info] - if options[:external_gateway_info].kind_of?(Fog::OpenStack::Network::Network) - options[:external_gateway_info] = {:network_id => options[:external_gateway_info].id} - else - options[:external_gateway_info] = {:network_id => options[:external_gateway_info]} - end + options[:external_gateway_info] = if options[:external_gateway_info].kind_of?(Fog::OpenStack::Network::Network) + { network_id: options[:external_gateway_info].id } + else + { network_id: options[:external_gateway_info] } + end end options end diff --git a/lib/fog/openstack/network/models/security_group.rb b/lib/fog/openstack/network/models/security_group.rb index 307b412b1..4b9c10a24 100644 --- a/lib/fog/openstack/network/models/security_group.rb +++ b/lib/fog/openstack/network/models/security_group.rb @@ -18,7 +18,7 @@ def destroy end def security_group_rules - Fog::OpenStack::Network::SecurityGroupRules.new(:service => service).load(attributes[:security_group_rules]) + Fog::OpenStack::Network::SecurityGroupRules.new(service: service).load(attributes[:security_group_rules]) end def save diff --git a/lib/fog/openstack/network/models/security_group_rule.rb b/lib/fog/openstack/network/models/security_group_rule.rb index 73f67ae53..d3a13bbf0 100644 --- a/lib/fog/openstack/network/models/security_group_rule.rb +++ b/lib/fog/openstack/network/models/security_group_rule.rb @@ -24,6 +24,7 @@ def destroy def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + merge_attributes(service.create_security_group_rule(security_group_id, direction, attributes).body['security_group_rule']) true end diff --git a/lib/fog/openstack/network/requests/add_router_interface.rb b/lib/fog/openstack/network/requests/add_router_interface.rb index ad6f8748d..836b58a1d 100644 --- a/lib/fog/openstack/network/requests/add_router_interface.rb +++ b/lib/fog/openstack/network/requests/add_router_interface.rb @@ -5,7 +5,7 @@ class Real def add_router_interface(router_id, subnet_id_or_options) if subnet_id_or_options.kind_of? String data = { - 'subnet_id' => subnet_id_or_options, + 'subnet_id' => subnet_id_or_options } elsif subnet_id_or_options.kind_of? Hash data = subnet_id_or_options @@ -14,10 +14,10 @@ def add_router_interface(router_id, subnet_id_or_options) end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "routers/#{router_id}/add_router_interface" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "routers/#{router_id}/add_router_interface" ) end end @@ -27,23 +27,23 @@ def add_router_interface(_router_id, _subnet_id, _options = {}) response = Excon::Response.new response.status = 201 data = { - 'status' => 'ACTIVE', - 'name' => '', + 'status' => 'ACTIVE', + 'name' => '', 'admin_state_up' => true, - 'network_id' => '5307648b-e836-4658-8f1a-ff7536870c64', - 'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3', - 'device_owner' => 'network:router_interface', - 'mac_address' => 'fa:16:3e:f7:d1:9c', - 'fixed_ips' => { - 'subnet_id' => 'a2f1f29d-571b-4533-907f-5803ab96ead1', + 'network_id' => '5307648b-e836-4658-8f1a-ff7536870c64', + 'tenant_id' => '6b96ff0cb17a4b859e1e575d221683d3', + 'device_owner' => 'network:router_interface', + 'mac_address' => 'fa:16:3e:f7:d1:9c', + 'fixed_ips' => { + 'subnet_id' => 'a2f1f29d-571b-4533-907f-5803ab96ead1', 'ip_address' => '10.1.1.1' }, - 'id' => '3a44f4e5-1694-493a-a1fb-393881c673a4', - 'device_id' => '7177abc4-5ae9-4bb7-b0d4-89e94a4abf3b' + 'id' => '3a44f4e5-1694-493a-a1fb-393881c673a4', + 'device_id' => '7177abc4-5ae9-4bb7-b0d4-89e94a4abf3b' } self.data[:routers][data['router_id']] = data - response.body = {'router' => data} + response.body = { 'router' => data } response end end diff --git a/lib/fog/openstack/network/requests/associate_floating_ip.rb b/lib/fog/openstack/network/requests/associate_floating_ip.rb index 6ffa8d498..17cedc044 100644 --- a/lib/fog/openstack/network/requests/associate_floating_ip.rb +++ b/lib/fog/openstack/network/requests/associate_floating_ip.rb @@ -5,7 +5,7 @@ class Real def associate_floating_ip(floating_ip_id, port_id, options = {}) data = { 'floatingip' => { - 'port_id' => port_id, + 'port_id' => port_id } } @@ -15,10 +15,10 @@ def associate_floating_ip(floating_ip_id, port_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "floatingips/#{floating_ip_id}" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "floatingips/#{floating_ip_id}" ) end end @@ -28,17 +28,17 @@ def associate_floating_ip(_floating_ip_id, port_id, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => '00000000-0000-0000-0000-000000000000', - 'router_id' => '00000000-0000-0000-0000-000000000000', - 'tenant_id' => options["tenant_id"], + 'id' => '00000000-0000-0000-0000-000000000000', + 'router_id' => '00000000-0000-0000-0000-000000000000', + 'tenant_id' => options["tenant_id"], 'floating_network_id' => options["floating_network_id"], - 'fixed_ip_address' => options["fixed_ip_address"], + 'fixed_ip_address' => options["fixed_ip_address"], 'floating_ip_address' => options["floating_ip_address"], - 'port_id' => port_id, + 'port_id' => port_id } self.data[:floating_ips][data['floating_ip_id']] = data - response.body = {'floatingip' => data} + response.body = { 'floatingip' => data } response end end diff --git a/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb b/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb index 523310005..45926d554 100644 --- a/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/associate_lb_health_monitor.rb @@ -5,15 +5,15 @@ class Real def associate_lb_health_monitor(pool_id, health_monitor_id) data = { 'health_monitor' => { - 'id' => health_monitor_id, + 'id' => health_monitor_id } } request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => "lb/pools/#{pool_id}/health_monitors" + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: "lb/pools/#{pool_id}/health_monitors" ) end end @@ -24,7 +24,7 @@ def associate_lb_health_monitor(pool_id, health_monitor_id) if pool = list_lb_pools.body['pools'].find { |_| _['id'] == pool_id } pool['health_monitors'] << health_monitor_id data[:lb_pools][pool_id] = pool - response.body = {'health_monitor' => {}} + response.body = { 'health_monitor' => {} } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/create_floating_ip.rb b/lib/fog/openstack/network/requests/create_floating_ip.rb index ec71f30a4..3d6565db1 100644 --- a/lib/fog/openstack/network/requests/create_floating_ip.rb +++ b/lib/fog/openstack/network/requests/create_floating_ip.rb @@ -15,10 +15,10 @@ def create_floating_ip(floating_network_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'floatingips' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'floatingips' ) end end @@ -28,15 +28,15 @@ def create_floating_ip(floating_network_id, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => floating_network_id, + 'id' => floating_network_id, 'floating_network_id' => floating_network_id, - 'port_id' => options[:port_id], - 'tenant_id' => options[:tenant_id], - 'fixed_ip_address' => options[:fixed_ip_address], - 'router_id' => nil, + 'port_id' => options[:port_id], + 'tenant_id' => options[:tenant_id], + 'fixed_ip_address' => options[:fixed_ip_address], + 'router_id' => nil } self.data[:floating_ips][data['id']] = data - response.body = {'floatingip' => data} + response.body = { 'floatingip' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_ike_policy.rb b/lib/fog/openstack/network/requests/create_ike_policy.rb index 28b33df7f..ddf731aa1 100644 --- a/lib/fog/openstack/network/requests/create_ike_policy.rb +++ b/lib/fog/openstack/network/requests/create_ike_policy.rb @@ -17,10 +17,10 @@ def create_ike_policy(options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'vpn/ikepolicies' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'vpn/ikepolicies' ) end end @@ -30,20 +30,20 @@ def create_ike_policy(options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => options[:name], - 'description' => options[:description], - 'tenant_id' => options[:tenant_id], - 'auth_algorithm' => options[:auth_algorithm], - 'encryption_algorithm' => options[:encryption_algorithm], - 'pfs' => options[:pfs], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => options[:name], + 'description' => options[:description], + 'tenant_id' => options[:tenant_id], + 'auth_algorithm' => options[:auth_algorithm], + 'encryption_algorithm' => options[:encryption_algorithm], + 'pfs' => options[:pfs], 'phase1_negotiation_mode' => options[:phase1_negotiation_mode], - 'lifetime' => options[:lifetime], - 'ike_version' => options[:ike_version] + 'lifetime' => options[:lifetime], + 'ike_version' => options[:ike_version] } self.data[:ike_policies][data['id']] = data - response.body = {'ikepolicy' => data} + response.body = { 'ikepolicy' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_ipsec_policy.rb b/lib/fog/openstack/network/requests/create_ipsec_policy.rb index 0a0fd904d..d61b7e349 100644 --- a/lib/fog/openstack/network/requests/create_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/create_ipsec_policy.rb @@ -17,10 +17,10 @@ def create_ipsec_policy(options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'vpn/ipsecpolicies' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'vpn/ipsecpolicies' ) end end @@ -30,20 +30,20 @@ def create_ipsec_policy(options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => options[:name], - 'description' => options[:description], - 'tenant_id' => options[:tenant_id], - 'auth_algorithm' => options[:auth_algorithm], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => options[:name], + 'description' => options[:description], + 'tenant_id' => options[:tenant_id], + 'auth_algorithm' => options[:auth_algorithm], 'encryption_algorithm' => options[:encryption_algorithm], - 'pfs' => options[:pfs], - 'transform_protocol' => options[:transform_protocol], - 'lifetime' => options[:lifetime], - 'encapsulation_mode' => options[:encapsulation_mode] + 'pfs' => options[:pfs], + 'transform_protocol' => options[:transform_protocol], + 'lifetime' => options[:lifetime], + 'encapsulation_mode' => options[:encapsulation_mode] } self.data[:ipsec_policies][data['id']] = data - response.body = {'ipsecpolicy' => data} + response.body = { 'ipsecpolicy' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb index a5b674a13..3afc37585 100644 --- a/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/create_ipsec_site_connection.rb @@ -5,8 +5,8 @@ class Real def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, options = {}) data = { 'ipsec_site_connection' => { - 'vpnservice_id' => vpn_service_id, - 'ikepolicy_id' => ike_policy_id, + 'vpnservice_id' => vpn_service_id, + 'ikepolicy_id' => ike_policy_id, 'ipsecpolicy_id' => ipsec_policy_id } } @@ -20,10 +20,10 @@ def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'vpn/ipsec-site-connections' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'vpn/ipsec-site-connections' ) end end @@ -33,30 +33,30 @@ def create_ipsec_site_connection(vpn_service_id, ike_policy_id, ipsec_policy_id, response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => options[:name], - 'description' => options[:description], - 'status' => 'ACTIVE', - 'tenant_id' => options[:tenant_id], - 'admin_state_up' => options[:admin_state_up], - 'psk' => options[:psk], - 'initiator' => options[:initiator], - 'auth_mode' => "psk", - 'peer_cidrs' => options[:peer_cidrs], - 'mtu' => options[:mtu], - 'peer_ep_group_id' => Fog::Mock.random_numbers(6).to_s, - 'ikepolicy_id' => ike_policy_id, - 'vpnservice_id' => vpn_service_id, - 'dpd' => options[:dpd], - 'route_mode' => "static", - 'ipsecpolicy_id' => ipsec_policy_id, + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => options[:name], + 'description' => options[:description], + 'status' => 'ACTIVE', + 'tenant_id' => options[:tenant_id], + 'admin_state_up' => options[:admin_state_up], + 'psk' => options[:psk], + 'initiator' => options[:initiator], + 'auth_mode' => "psk", + 'peer_cidrs' => options[:peer_cidrs], + 'mtu' => options[:mtu], + 'peer_ep_group_id' => Fog::Mock.random_numbers(6).to_s, + 'ikepolicy_id' => ike_policy_id, + 'vpnservice_id' => vpn_service_id, + 'dpd' => options[:dpd], + 'route_mode' => "static", + 'ipsecpolicy_id' => ipsec_policy_id, 'local_ep_group_id' => Fog::Mock.random_numbers(6).to_s, - 'peer_address' => options[:peer_address], - 'peer_id' => options[:peer_id] + 'peer_address' => options[:peer_address], + 'peer_id' => options[:peer_id] } self.data[:ipsec_site_connections][data['id']] = data - response.body = {'ipsec_site_connection' => data} + response.body = { 'ipsec_site_connection' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lb_health_monitor.rb b/lib/fog/openstack/network/requests/create_lb_health_monitor.rb index 944c40cd6..e5648ea7f 100644 --- a/lib/fog/openstack/network/requests/create_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/create_lb_health_monitor.rb @@ -5,9 +5,9 @@ class Real def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) data = { 'health_monitor' => { - 'type' => type, - 'delay' => delay, - 'timeout' => timeout, + 'type' => type, + 'delay' => delay, + 'timeout' => timeout, 'max_retries' => max_retries } } @@ -18,10 +18,10 @@ def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lb/health_monitors' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lb/health_monitors' ) end end @@ -31,21 +31,21 @@ def create_lb_health_monitor(type, delay, timeout, max_retries, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'type' => type, - 'delay' => delay, - 'timeout' => timeout, - 'max_retries' => max_retries, - 'http_method' => options[:http_method], - 'url_path' => options[:url_path], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'type' => type, + 'delay' => delay, + 'timeout' => timeout, + 'max_retries' => max_retries, + 'http_method' => options[:http_method], + 'url_path' => options[:url_path], 'expected_codes' => options[:expected_codes], - 'status' => 'ACTIVE', + 'status' => 'ACTIVE', 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], + 'tenant_id' => options[:tenant_id] } self.data[:lb_health_monitors][data['id']] = data - response.body = {'health_monitor' => data} + response.body = { 'health_monitor' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lb_member.rb b/lib/fog/openstack/network/requests/create_lb_member.rb index 262201a48..214912bd5 100644 --- a/lib/fog/openstack/network/requests/create_lb_member.rb +++ b/lib/fog/openstack/network/requests/create_lb_member.rb @@ -5,10 +5,10 @@ class Real def create_lb_member(pool_id, address, protocol_port, weight, options = {}) data = { 'member' => { - 'pool_id' => pool_id, - 'address' => address, + 'pool_id' => pool_id, + 'address' => address, 'protocol_port' => protocol_port, - 'weight' => weight + 'weight' => weight } } @@ -18,10 +18,10 @@ def create_lb_member(pool_id, address, protocol_port, weight, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lb/members' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lb/members' ) end end @@ -31,18 +31,18 @@ def create_lb_member(pool_id, address, protocol_port, weight, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'pool_id' => pool_id, - 'address' => address, - 'protocol_port' => protocol_port, - 'weight' => weight, - 'status' => 'ACTIVE', + 'id' => Fog::Mock.random_numbers(6).to_s, + 'pool_id' => pool_id, + 'address' => address, + 'protocol_port' => protocol_port, + 'weight' => weight, + 'status' => 'ACTIVE', 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], + 'tenant_id' => options[:tenant_id] } self.data[:lb_members][data['id']] = data - response.body = {'member' => data} + response.body = { 'member' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lb_pool.rb b/lib/fog/openstack/network/requests/create_lb_pool.rb index e4ebd5cd1..7f2648e5e 100644 --- a/lib/fog/openstack/network/requests/create_lb_pool.rb +++ b/lib/fog/openstack/network/requests/create_lb_pool.rb @@ -6,7 +6,7 @@ def create_lb_pool(subnet_id, protocol, lb_method, options = {}) data = { 'pool' => { 'subnet_id' => subnet_id, - 'protocol' => protocol, + 'protocol' => protocol, 'lb_method' => lb_method } } @@ -17,10 +17,10 @@ def create_lb_pool(subnet_id, protocol, lb_method, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lb/pools' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lb/pools' ) end end @@ -30,26 +30,26 @@ def create_lb_pool(subnet_id, protocol, lb_method, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'subnet_id' => subnet_id, - 'protocol' => protocol, - 'lb_method' => lb_method, - 'name' => options[:name], - 'description' => options[:description], - 'health_monitors' => [], - 'members' => [], - 'status' => 'ACTIVE', - 'admin_state_up' => options[:admin_state_up], - 'vip_id' => nil, - 'tenant_id' => options[:tenant_id], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'subnet_id' => subnet_id, + 'protocol' => protocol, + 'lb_method' => lb_method, + 'name' => options[:name], + 'description' => options[:description], + 'health_monitors' => [], + 'members' => [], + 'status' => 'ACTIVE', + 'admin_state_up' => options[:admin_state_up], + 'vip_id' => nil, + 'tenant_id' => options[:tenant_id], 'active_connections' => nil, - 'bytes_in' => nil, - 'bytes_out' => nil, - 'total_connections' => nil + 'bytes_in' => nil, + 'bytes_out' => nil, + 'total_connections' => nil } self.data[:lb_pools][data['id']] = data - response.body = {'pool' => data} + response.body = { 'pool' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lb_vip.rb b/lib/fog/openstack/network/requests/create_lb_vip.rb index 70a3358e7..25bae6815 100644 --- a/lib/fog/openstack/network/requests/create_lb_vip.rb +++ b/lib/fog/openstack/network/requests/create_lb_vip.rb @@ -5,9 +5,9 @@ class Real def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) data = { 'vip' => { - 'subnet_id' => subnet_id, - 'pool_id' => pool_id, - 'protocol' => protocol, + 'subnet_id' => subnet_id, + 'pool_id' => pool_id, + 'protocol' => protocol, 'protocol_port' => protocol_port } } @@ -19,37 +19,37 @@ def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lb/vips' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lb/vips' ) end end class Mock - def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) + def create_lb_vip(subnet_id, pool_id, protocol, protocol_port, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'subnet_id' => subnet_id, - 'pool_id' => pool_id, - 'protocol' => protocol, - 'protocol_port' => protocol_port, - 'name' => options[:name], - 'description' => options[:description], - 'address' => options[:address], - 'port_id' => Fog::Mock.random_numbers(6).to_s, + 'id' => Fog::Mock.random_numbers(6).to_s, + 'subnet_id' => subnet_id, + 'pool_id' => pool_id, + 'protocol' => protocol, + 'protocol_port' => protocol_port, + 'name' => options[:name], + 'description' => options[:description], + 'address' => options[:address], + 'port_id' => Fog::Mock.random_numbers(6).to_s, 'session_persistence' => options[:session_persistence], - 'connection_limit' => options[:connection_limit], - 'status' => 'ACTIVE', - 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], + 'connection_limit' => options[:connection_limit], + 'status' => 'ACTIVE', + 'admin_state_up' => options[:admin_state_up], + 'tenant_id' => options[:tenant_id] } self.data[:lb_vips][data['id']] = data - response.body = {'vip' => data} + response.body = { 'vip' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb index be0a68f66..e0afd5344 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_healthmonitor.rb @@ -5,10 +5,10 @@ class Real def create_lbaas_healthmonitor(pool_id, type, delay, timeout, max_retries, options = {}) data = { 'healthmonitor' => { - 'pool_id' => pool_id, - 'type' => type, - 'delay' => delay, - 'timeout' => timeout, + 'pool_id' => pool_id, + 'type' => type, + 'delay' => delay, + 'timeout' => timeout, 'max_retries' => max_retries } } @@ -19,10 +19,10 @@ def create_lbaas_healthmonitor(pool_id, type, delay, timeout, max_retries, optio end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lbaas/healthmonitors' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lbaas/healthmonitors' ) end end @@ -32,23 +32,23 @@ def create_lbaas_healthmonitor(type, delay, timeout, max_retries, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'type' => type, - 'delay' => delay, - 'timeout' => timeout, - 'max_retries' => max_retries, - 'http_method' => options[:http_method], - 'url_path' => options[:url_path], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'type' => type, + 'delay' => delay, + 'timeout' => timeout, + 'max_retries' => max_retries, + 'http_method' => options[:http_method], + 'url_path' => options[:url_path], 'expected_codes' => options[:expected_codes], - 'status' => 'ACTIVE', + 'status' => 'ACTIVE', 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], - 'name' => options[:name], - 'pools' => [{ 'id'=> Fog::Mock.random_numbers(6).to_s}] + 'tenant_id' => options[:tenant_id], + 'name' => options[:name], + 'pools' => [{ 'id' => Fog::Mock.random_numbers(6).to_s }] } self.data[:lbaas_healthmonitors][data['id']] = data - response.body = {'healthmonitor' => data} + response.body = { 'healthmonitor' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb index 7ef1c2333..14f09b6ed 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_l7policy.rb @@ -5,8 +5,8 @@ class Real def create_lbaas_l7policy(listener_id, action, options = {}) data = { 'l7policy' => { - 'listener_id' => listener_id, - 'action' => action + 'listener_id' => listener_id, + 'action' => action } } @@ -16,10 +16,10 @@ def create_lbaas_l7policy(listener_id, action, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lbaas/l7policies' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lbaas/l7policies' ) end end @@ -29,19 +29,19 @@ def create_lbaas_l7policy(listener_id, action, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'listener_id' => listener_id, - 'action' => action, - 'position' => options[:position], - 'tenant_id' => options[:tenant_id], - 'name' => options[:name], - 'description' => options[:description], - 'redirect_pool_id' => options[:redirect_pool_id], - 'redirect_url' => options[:redirect_url] + 'id' => Fog::Mock.random_numbers(6).to_s, + 'listener_id' => listener_id, + 'action' => action, + 'position' => options[:position], + 'tenant_id' => options[:tenant_id], + 'name' => options[:name], + 'description' => options[:description], + 'redirect_pool_id' => options[:redirect_pool_id], + 'redirect_url' => options[:redirect_url] } self.data[:lbaas_l7policies][data['id']] = data - response.body = {'l7policy' => data} + response.body = { 'l7policy' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb index e2992aa8e..1e57d14c9 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_l7rule.rb @@ -5,9 +5,9 @@ class Real def create_lbaas_l7rule(l7policy_id, type, compare_type, value, options = {}) data = { 'rule' => { - 'type' => type, - 'compare_type' => compare_type, - 'value' => value + 'type' => type, + 'compare_type' => compare_type, + 'value' => value } } @@ -17,10 +17,10 @@ def create_lbaas_l7rule(l7policy_id, type, compare_type, value, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => "lbaas/l7policies/#{l7policy_id}/rules" + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: "lbaas/l7policies/#{l7policy_id}/rules" ) end end @@ -30,18 +30,18 @@ def create_lbaas_l7rule(l7policy_id, type, compare_type, value, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'type' => type, - 'compare_type' => compare_type, - 'value' => value, - 'tenant_id' => options[:tenant_id], - 'key' => options[:key], - 'invert' => options[:invert], - 'l7policy_id' => l7policy_id + 'id' => Fog::Mock.random_numbers(6).to_s, + 'type' => type, + 'compare_type' => compare_type, + 'value' => value, + 'tenant_id' => options[:tenant_id], + 'key' => options[:key], + 'invert' => options[:invert], + 'l7policy_id' => l7policy_id } self.data[:lbaas_l7rules][data['id']] = data - response.body = {'rule' => data} + response.body = { 'rule' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_listener.rb b/lib/fog/openstack/network/requests/create_lbaas_listener.rb index 5abeccaac..360aa99ee 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_listener.rb @@ -6,8 +6,8 @@ def create_lbaas_listener(loadbalancer_id, protocol, protocol_port, options = {} data = { 'listener' => { 'loadbalancer_id' => loadbalancer_id, - 'protocol' => protocol, - 'protocol_port' => protocol_port + 'protocol' => protocol, + 'protocol_port' => protocol_port } } @@ -18,10 +18,10 @@ def create_lbaas_listener(loadbalancer_id, protocol, protocol_port, options = {} end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lbaas/listeners' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lbaas/listeners' ) end end @@ -31,22 +31,22 @@ def create_lbaas_listener(loadbalancer_id, protocol, protocol_port, options = {} response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'loadbalancers' => [{'id' => loadbalancer_id }], - 'protocol' => protocol, - 'protocol_port' => protocol_port, - 'name' => options[:name], - 'description' => options[:description], - 'default_pool_id' => options[:default_pool_id], - 'connection_limit' => options[:connection_limit], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'loadbalancers' => [{ 'id' => loadbalancer_id }], + 'protocol' => protocol, + 'protocol_port' => protocol_port, + 'name' => options[:name], + 'description' => options[:description], + 'default_pool_id' => options[:default_pool_id], + 'connection_limit' => options[:connection_limit], 'default_tls_container_ref' => options[:default_tls_container_ref], - 'sni_container_refs' => options[:sni_container_refs], - 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id] + 'sni_container_refs' => options[:sni_container_refs], + 'admin_state_up' => options[:admin_state_up], + 'tenant_id' => options[:tenant_id] } self.data[:lbaas_listener][data['id']] = data - response.body = {'listener' => data} + response.body = { 'listener' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb index dd7d61118..e63bfe5f5 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_loadbalancer.rb @@ -4,9 +4,9 @@ class Network class Real def create_lbaas_loadbalancer(vip_subnet_id, options = {}) data = { - 'loadbalancer' => { - 'vip_subnet_id' => vip_subnet_id - } + 'loadbalancer' => { + 'vip_subnet_id' => vip_subnet_id + } } vanilla_options = [:name, :description, :vip_address, :provider, :flavor, :admin_state_up, :tenant_id] vanilla_options.reject { |o| options[o].nil? }.each do |key| @@ -14,10 +14,10 @@ def create_lbaas_loadbalancer(vip_subnet_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lbaas/loadbalancers' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lbaas/loadbalancers' ) end end @@ -27,23 +27,23 @@ def create_lbaas_loadbalancer(vip_subnet_id, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'subnet_id' => vip_subnet_id, - 'name' => options[:name], - 'description' => options[:description], - 'vip_address' => options[:vip_address], - 'vip_port_id'=> Fog::Mock.random_numbers(6).to_s, - 'vip_subnet_id'=> vip_subnet_id, - 'flavor' => options[:flavor], - 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], - 'listeners'=> [{ 'id'=> Fog::Mock.random_numbers(6).to_s}], - 'operating_status'=> 'ONLINE', - 'provider'=> 'lbprovider', - 'provisioning_status'=> 'ACTIVE' + 'id' => Fog::Mock.random_numbers(6).to_s, + 'subnet_id' => vip_subnet_id, + 'name' => options[:name], + 'description' => options[:description], + 'vip_address' => options[:vip_address], + 'vip_port_id' => Fog::Mock.random_numbers(6).to_s, + 'vip_subnet_id' => vip_subnet_id, + 'flavor' => options[:flavor], + 'admin_state_up' => options[:admin_state_up], + 'tenant_id' => options[:tenant_id], + 'listeners' => [{ 'id' => Fog::Mock.random_numbers(6).to_s }], + 'operating_status' => 'ONLINE', + 'provider' => 'lbprovider', + 'provisioning_status' => 'ACTIVE' } self.data[:lbaas_loadbalancer][data['id']] = data - response.body = {'loadbalancer' => data} + response.body = { 'loadbalancer' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_pool.rb b/lib/fog/openstack/network/requests/create_lbaas_pool.rb index cddffc9bd..da4ef6bf5 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_pool.rb @@ -6,7 +6,7 @@ def create_lbaas_pool(listener_id, protocol, lb_algorithm, options = {}) data = { 'pool' => { 'listener_id' => listener_id, - 'protocol' => protocol, + 'protocol' => protocol, 'lb_algorithm' => lb_algorithm } } @@ -17,10 +17,10 @@ def create_lbaas_pool(listener_id, protocol, lb_algorithm, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'lbaas/pools' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'lbaas/pools' ) end end @@ -30,21 +30,21 @@ def create_lbaas_pool(listener_id, protocol, lb_algorithm, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'protocol' => protocol, - 'lb_algorithm' => lb_algorithm, - 'name' => options[:name], - 'description' => options[:description], - 'healthmonitor_id' => Fog::Mock.random_numbers(6).to_s, - 'members' => [Fog::Mock.random_numbers(6).to_s], - 'status' => 'ACTIVE', - 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], - 'listeners' => [ 'id' => listener_id ], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'protocol' => protocol, + 'lb_algorithm' => lb_algorithm, + 'name' => options[:name], + 'description' => options[:description], + 'healthmonitor_id' => Fog::Mock.random_numbers(6).to_s, + 'members' => [Fog::Mock.random_numbers(6).to_s], + 'status' => 'ACTIVE', + 'admin_state_up' => options[:admin_state_up], + 'tenant_id' => options[:tenant_id], + 'listeners' => ['id' => listener_id], 'session_persistence' => {} } self.data[:lbaas_pools][data['id']] = data - response.body = {'pool' => data} + response.body = { 'pool' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb index 547158991..6b805dffd 100644 --- a/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/create_lbaas_pool_member.rb @@ -4,10 +4,10 @@ class Network class Real def create_lbaas_pool_member(pool_id, address, protocol_port, options = {}) data = { - 'member' => { - 'address' => address, - 'protocol_port' => protocol_port - } + 'member' => { + 'address' => address, + 'protocol_port' => protocol_port + } } vanilla_options = [:admin_state_up, :tenant_id, :weight, :subnet_id] @@ -16,10 +16,10 @@ def create_lbaas_pool_member(pool_id, address, protocol_port, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => "lbaas/pools/#{pool_id}/members" + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: "lbaas/pools/#{pool_id}/members" ) end end @@ -29,18 +29,18 @@ def create_lbaas_pool_member(pool_id, address, protocol_port, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'pool_id' => pool_id, - 'address' => address, - 'protocol_port' => protocol_port, - 'weight' => options[:weight], - 'status' => 'ACTIVE', - 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], - 'subnet_id' => ptions[:subnet_id] + 'id' => Fog::Mock.random_numbers(6).to_s, + 'pool_id' => pool_id, + 'address' => address, + 'protocol_port' => protocol_port, + 'weight' => options[:weight], + 'status' => 'ACTIVE', + 'admin_state_up' => options[:admin_state_up], + 'tenant_id' => options[:tenant_id], + 'subnet_id' => ptions[:subnet_id] } self.data[:lb_members][data['id']] = data - response.body = {'member' => data} + response.body = { 'member' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_network.rb b/lib/fog/openstack/network/requests/create_network.rb index bee8dc484..ee8d3dd4f 100644 --- a/lib/fog/openstack/network/requests/create_network.rb +++ b/lib/fog/openstack/network/requests/create_network.rb @@ -8,7 +8,7 @@ class Real :admin_state_up, :qos_policy_id, :port_security_enabled, - :tenant_id, + :tenant_id ].freeze # Advanced Features through API Extensions @@ -22,19 +22,19 @@ class Real :provider_network_type, :provider_segmentation_id, :provider_physical_network, - :router_external, + :router_external ].freeze # Map Fog::OpenStack::Network::Network # model attributes to OpenStack provider attributes ALIASES = { - :provider_network_type => 'provider:network_type', + provider_network_type: 'provider:network_type', # Not applicable to the "local" or "gre" network types - :provider_physical_network => 'provider:physical_network', - :provider_segmentation_id => 'provider:segmentation_id', + provider_physical_network: 'provider:physical_network', + provider_segmentation_id: 'provider:segmentation_id', - :router_external => 'router:external' + router_external: 'router:external' }.freeze def self.create(options) @@ -54,10 +54,10 @@ def create_network(options = {}) data = {} data['network'] = self.class.create(options) request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'networks' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'networks' ) end end @@ -67,19 +67,19 @@ def create_network(options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => options[:name], - 'shared' => options[:shared] || false, - 'subnets' => [], - 'status' => 'ACTIVE', - 'admin_state_up' => options[:admin_state_up] || false, - 'tenant_id' => options[:tenant_id], - 'qos_policy_id' => options[:qos_policy_id], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => options[:name], + 'shared' => options[:shared] || false, + 'subnets' => [], + 'status' => 'ACTIVE', + 'admin_state_up' => options[:admin_state_up] || false, + 'tenant_id' => options[:tenant_id], + 'qos_policy_id' => options[:qos_policy_id], 'port_security_enabled' => options[:port_security_enabled] || false } data.merge!(Fog::OpenStack::Network::Real.create(options)) self.data[:networks][data['id']] = data - response.body = {'network' => data} + response.body = { 'network' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_port.rb b/lib/fog/openstack/network/requests/create_port.rb index 75d41a049..63687087c 100644 --- a/lib/fog/openstack/network/requests/create_port.rb +++ b/lib/fog/openstack/network/requests/create_port.rb @@ -5,7 +5,7 @@ class Real def create_port(network_id, options = {}) data = { 'port' => { - 'network_id' => network_id, + 'network_id' => network_id } } @@ -17,10 +17,10 @@ def create_port(network_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'ports' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'ports' ) end end @@ -30,21 +30,21 @@ def create_port(network_id, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => options[:name], - 'network_id' => network_id, - 'fixed_ips' => options[:fixed_ips], - 'mac_address' => options[:mac_address], - 'status' => 'ACTIVE', - 'admin_state_up' => options[:admin_state_up], - 'device_owner' => options[:device_owner], - 'device_id' => options[:device_id], - 'tenant_id' => options[:tenant_id], - 'security_groups' => options[:security_groups], - 'allowed_address_pairs' => options[:allowed_address_pairs], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => options[:name], + 'network_id' => network_id, + 'fixed_ips' => options[:fixed_ips], + 'mac_address' => options[:mac_address], + 'status' => 'ACTIVE', + 'admin_state_up' => options[:admin_state_up], + 'device_owner' => options[:device_owner], + 'device_id' => options[:device_id], + 'tenant_id' => options[:tenant_id], + 'security_groups' => options[:security_groups], + 'allowed_address_pairs' => options[:allowed_address_pairs] } self.data[:ports][data['id']] = data - response.body = {'port' => data} + response.body = { 'port' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_rbac_policy.rb b/lib/fog/openstack/network/requests/create_rbac_policy.rb index 661dd5ae8..99604f0d0 100644 --- a/lib/fog/openstack/network/requests/create_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/create_rbac_policy.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def create_rbac_policy(options = {}) - data = {'rbac_policy' => {}} + data = { 'rbac_policy' => {} } vanilla_options = [:object_type, :object_id, :tenant_id, :target_tenant, :action] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def create_rbac_policy(options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'rbac-policies' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'rbac-policies' ) end end @@ -24,16 +24,16 @@ def create_rbac_policy(options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'object_type' => options[:object_type], - 'object_id' => options[:object_id], - 'tenant_id' => options[:tenant_id], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'object_type' => options[:object_type], + 'object_id' => options[:object_id], + 'tenant_id' => options[:tenant_id], 'target_tenant' => options[:target_tenant], - 'action' => options[:action] + 'action' => options[:action] } self.data[:rbac_policies][data['id']] = data - response.body = {'rbac_policy' => data} + response.body = { 'rbac_policy' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_router.rb b/lib/fog/openstack/network/requests/create_router.rb index d02b67be8..7813d2c21 100644 --- a/lib/fog/openstack/network/requests/create_router.rb +++ b/lib/fog/openstack/network/requests/create_router.rb @@ -5,7 +5,7 @@ class Real def create_router(name, options = {}) data = { 'router' => { - 'name' => name, + 'name' => name } } @@ -26,7 +26,7 @@ def create_router(name, options = {}) if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" - data['router'][:external_gateway_info] = {:network_id => egi.id} + data['router'][:external_gateway_info] = { network_id: egi.id } elsif egi.kind_of?(Hash) && egi[:network_id] data['router'][:external_gateway_info] = egi else @@ -35,10 +35,10 @@ def create_router(name, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'routers' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'routers' ) end end @@ -53,17 +53,17 @@ def create_router(name, options = {}) if egi && egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" - egi = {:network_id => egi.id} + egi = { network_id: egi.id } end data = { 'router' => { - :id => Fog::Mock.random_numbers(6).to_s, - :status => options[:status] || 'ACTIVE', - :external_gateway_info => egi, - :name => name, - :admin_state_up => options[:admin_state_up], - :tenant_id => '6b96ff0cb17a4b859e1e575d221683d3' + id: Fog::Mock.random_numbers(6).to_s, + status: options[:status] || 'ACTIVE', + external_gateway_info: egi, + name: name, + admin_state_up: options[:admin_state_up], + tenant_id: '6b96ff0cb17a4b859e1e575d221683d3' } } self.data[:routers][data['router'][:id]] = data['router'] diff --git a/lib/fog/openstack/network/requests/create_security_group.rb b/lib/fog/openstack/network/requests/create_security_group.rb index 84800e80b..6f3cced02 100644 --- a/lib/fog/openstack/network/requests/create_security_group.rb +++ b/lib/fog/openstack/network/requests/create_security_group.rb @@ -30,16 +30,16 @@ class Real # * 'remote_ip_prefix'<~String> - IP cidr range address i.e. '0.0.0.0/0' # * 'tenant_id'<~String> - Tenant id that owns the security group rule def create_security_group(options = {}) - data = {"security_group" => {}} + data = { "security_group" => {} } desired_options = [:name, :description, :tenant_id] selected_options = desired_options.select { |o| options[o] } selected_options.each { |key| data["security_group"][key] = options[key] } request( - :body => Fog::JSON.encode(data), - :expects => 201, - :method => "POST", - :path => "security-groups" + body: Fog::JSON.encode(data), + expects: 201, + method: "POST", + path: "security-groups" ) end end @@ -55,35 +55,35 @@ def create_security_group(options = {}) # by default every security group will come setup with an egress rule to "allow all out" data = { "security_group_rules" => [ - {"remote_group_id" => nil, - "direction" => "egress", - "remote_ip_prefix" => nil, - "protocol" => nil, - "ethertype" => "IPv4", - "tenant_id" => tenant_id, - "port_range_max" => nil, - "port_range_min" => nil, - "id" => Fog::UUID.uuid, - "security_group_id" => sec_group_id}, - {"remote_group_id" => nil, - "direction" => "egress", - "remote_ip_prefix" => nil, - "protocol" => nil, - "ethertype" => "IPv6", - "tenant_id" => tenant_id, - "port_range_max" => nil, - "port_range_min" => nil, - "id" => Fog::UUID.uuid, - "security_group_id" => sec_group_id} + { "remote_group_id" => nil, + "direction" => "egress", + "remote_ip_prefix" => nil, + "protocol" => nil, + "ethertype" => "IPv4", + "tenant_id" => tenant_id, + "port_range_max" => nil, + "port_range_min" => nil, + "id" => Fog::UUID.uuid, + "security_group_id" => sec_group_id }, + { "remote_group_id" => nil, + "direction" => "egress", + "remote_ip_prefix" => nil, + "protocol" => nil, + "ethertype" => "IPv6", + "tenant_id" => tenant_id, + "port_range_max" => nil, + "port_range_min" => nil, + "id" => Fog::UUID.uuid, + "security_group_id" => sec_group_id } ], - "id" => sec_group_id, - "tenant_id" => tenant_id, - "name" => options[:name] || "", - "description" => options[:description] || "" + "id" => sec_group_id, + "tenant_id" => tenant_id, + "name" => options[:name] || "", + "description" => options[:description] || "" } self.data[:security_groups][data["id"]] = data - response.body = {"security_group" => data} + response.body = { "security_group" => data } response end end diff --git a/lib/fog/openstack/network/requests/create_security_group_rule.rb b/lib/fog/openstack/network/requests/create_security_group_rule.rb index 3de620781..a3fcc7a20 100644 --- a/lib/fog/openstack/network/requests/create_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/create_security_group_rule.rb @@ -31,7 +31,7 @@ class Real # * 'remote_ip_prefix'<~String> - IP cidr range address i.e. '0.0.0.0/0' # * 'tenant_id'<~String> - Tenant id that owns the security group rule def create_security_group_rule(security_group_id, direction, options = {}) - data = {"security_group_rule" => {"security_group_id" => security_group_id, "direction" => direction}} + data = { "security_group_rule" => { "security_group_id" => security_group_id, "direction" => direction } } desired_options = [ :port_range_min, :port_range_max, @@ -45,10 +45,10 @@ def create_security_group_rule(security_group_id, direction, options = {}) selected_options.each { |key| data["security_group_rule"][key] = options[key] } request( - :body => Fog::JSON.encode(data), - :expects => 201, - :method => "POST", - :path => "security-group-rules" + body: Fog::JSON.encode(data), + expects: 201, + method: "POST", + path: "security-group-rules" ) end end @@ -57,20 +57,20 @@ class Mock def create_security_group_rule(security_group_id, direction, options = {}) response = Excon::Response.new data = { - "id" => Fog::UUID.uuid, - "remote_group_id" => options[:remote_group_id], - "direction" => direction, - "remote_ip_prefix" => options[:remote_ip_prefix], - "protocol" => options[:protocol], - "ethertype" => options[:ethertype] || "IPv4", - "tenant_id" => options[:tenant_id] || Fog::Mock.random_numbers(14).to_s, - "port_range_max" => options[:port_range_max], - "port_range_min" => options[:port_range_min], + "id" => Fog::UUID.uuid, + "remote_group_id" => options[:remote_group_id], + "direction" => direction, + "remote_ip_prefix" => options[:remote_ip_prefix], + "protocol" => options[:protocol], + "ethertype" => options[:ethertype] || "IPv4", + "tenant_id" => options[:tenant_id] || Fog::Mock.random_numbers(14).to_s, + "port_range_max" => options[:port_range_max], + "port_range_min" => options[:port_range_min], "security_group_id" => security_group_id } self.data[:security_group_rules][data["id"]] = data response.status = 201 - response.body = {"security_group_rule" => data} + response.body = { "security_group_rule" => data } response end end diff --git a/lib/fog/openstack/network/requests/create_subnet.rb b/lib/fog/openstack/network/requests/create_subnet.rb index 1d49b1a34..5c0036bc0 100644 --- a/lib/fog/openstack/network/requests/create_subnet.rb +++ b/lib/fog/openstack/network/requests/create_subnet.rb @@ -6,7 +6,7 @@ def create_subnet(network_id, cidr, ip_version, options = {}) data = { 'subnet' => { 'network_id' => network_id, - 'cidr' => cidr, + 'cidr' => cidr, 'ip_version' => ip_version } } @@ -19,10 +19,10 @@ def create_subnet(network_id, cidr, ip_version, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'subnets' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'subnets' ) end end @@ -32,20 +32,20 @@ def create_subnet(network_id, cidr, ip_version, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => options[:name], - 'network_id' => network_id, - 'cidr' => cidr, - 'ip_version' => ip_version, - 'gateway_ip' => options[:gateway_ip], + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => options[:name], + 'network_id' => network_id, + 'cidr' => cidr, + 'ip_version' => ip_version, + 'gateway_ip' => options[:gateway_ip], 'allocation_pools' => options[:allocation_pools], - 'dns_nameservers' => options[:dns_nameservers], - 'host_routes' => options[:host_routes], - 'enable_dhcp' => options[:enable_dhcp], - 'tenant_id' => options[:tenant_id] + 'dns_nameservers' => options[:dns_nameservers], + 'host_routes' => options[:host_routes], + 'enable_dhcp' => options[:enable_dhcp], + 'tenant_id' => options[:tenant_id] } self.data[:subnets][data['id']] = data - response.body = {'subnet' => data} + response.body = { 'subnet' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_subnet_pool.rb b/lib/fog/openstack/network/requests/create_subnet_pool.rb index 3b56580f7..1170fe942 100644 --- a/lib/fog/openstack/network/requests/create_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/create_subnet_pool.rb @@ -5,7 +5,7 @@ class Real def create_subnet_pool(name, prefixes, options = {}) data = { 'subnetpool' => { - 'name' => name, + 'name' => name, 'prefixes' => prefixes } } @@ -17,10 +17,10 @@ def create_subnet_pool(name, prefixes, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'subnetpools' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'subnetpools' ) end end @@ -30,24 +30,24 @@ def create_subnet_pool(name, prefixes, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'name' => name, - 'prefixes' => prefixes, - 'description' => options[:description], - 'min_prefixlen' => options[:min_prefixlen] || 64, - 'max_prefixlen' => options[:max_prefixlen] || 64, + 'id' => Fog::Mock.random_numbers(6).to_s, + 'name' => name, + 'prefixes' => prefixes, + 'description' => options[:description], + 'min_prefixlen' => options[:min_prefixlen] || 64, + 'max_prefixlen' => options[:max_prefixlen] || 64, 'default_prefixlen' => options[:default_prefixlen] || 64, - 'address_scope_id' => options[:address_scope_id], - 'default_quota' => options[:default_quota], - 'ip_version' => options[:ip_version] || 4, - 'shared' => options[:shared].nil? ? false : options[:shared], - 'is_default' => options[:is_default].nil? ? false : options[:is_default], - 'created_at' => Time.now.to_s, - 'updated_at' => Time.now.to_s, - 'tenant_id' => Fog::Mock.random_hex(8).to_s + 'address_scope_id' => options[:address_scope_id], + 'default_quota' => options[:default_quota], + 'ip_version' => options[:ip_version] || 4, + 'shared' => options[:shared].nil? ? false : options[:shared], + 'is_default' => options[:is_default].nil? ? false : options[:is_default], + 'created_at' => Time.now.to_s, + 'updated_at' => Time.now.to_s, + 'tenant_id' => Fog::Mock.random_hex(8).to_s } self.data[:subnet_pools][data['id']] = data - response.body = {'subnetpool' => data} + response.body = { 'subnetpool' => data } response end end diff --git a/lib/fog/openstack/network/requests/create_vpn_service.rb b/lib/fog/openstack/network/requests/create_vpn_service.rb index 811658e66..04b0d421d 100644 --- a/lib/fog/openstack/network/requests/create_vpn_service.rb +++ b/lib/fog/openstack/network/requests/create_vpn_service.rb @@ -16,10 +16,10 @@ def create_vpn_service(subnet_id, router_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [201], - :method => 'POST', - :path => 'vpn/vpnservices' + body: Fog::JSON.encode(data), + expects: [201], + method: 'POST', + path: 'vpn/vpnservices' ) end end @@ -29,20 +29,20 @@ def create_vpn_service(subnet_id, router_id, options = {}) response = Excon::Response.new response.status = 201 data = { - 'id' => Fog::Mock.random_numbers(6).to_s, - 'subnet_id' => subnet_id, - 'router_id' => router_id, - 'name' => options[:name], - 'description' => options[:description], - 'status' => 'ACTIVE', + 'id' => Fog::Mock.random_numbers(6).to_s, + 'subnet_id' => subnet_id, + 'router_id' => router_id, + 'name' => options[:name], + 'description' => options[:description], + 'status' => 'ACTIVE', 'admin_state_up' => options[:admin_state_up], - 'tenant_id' => options[:tenant_id], + 'tenant_id' => options[:tenant_id], 'external_v4_ip' => '1.2.3.4', 'external_v6_ip' => '::1' } self.data[:vpn_services][data['id']] = data - response.body = {'vpnservice' => data} + response.body = { 'vpnservice' => data } response end end diff --git a/lib/fog/openstack/network/requests/delete_floating_ip.rb b/lib/fog/openstack/network/requests/delete_floating_ip.rb index a5ed2249b..d5eb77b68 100644 --- a/lib/fog/openstack/network/requests/delete_floating_ip.rb +++ b/lib/fog/openstack/network/requests/delete_floating_ip.rb @@ -4,9 +4,9 @@ class Network class Real def delete_floating_ip(floating_ip_id) request( - :expects => 204, - :method => 'DELETE', - :path => "floatingips/#{floating_ip_id}" + expects: 204, + method: 'DELETE', + path: "floatingips/#{floating_ip_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_ike_policy.rb b/lib/fog/openstack/network/requests/delete_ike_policy.rb index 7ded4a686..2e6c821b1 100644 --- a/lib/fog/openstack/network/requests/delete_ike_policy.rb +++ b/lib/fog/openstack/network/requests/delete_ike_policy.rb @@ -4,9 +4,9 @@ class Network class Real def delete_ike_policy(ike_policy_id) request( - :expects => 204, - :method => 'DELETE', - :path => "vpn/ikepolicies/#{ike_policy_id}" + expects: 204, + method: 'DELETE', + path: "vpn/ikepolicies/#{ike_policy_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_ipsec_policy.rb b/lib/fog/openstack/network/requests/delete_ipsec_policy.rb index ab38153de..1936c6179 100644 --- a/lib/fog/openstack/network/requests/delete_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/delete_ipsec_policy.rb @@ -4,9 +4,9 @@ class Network class Real def delete_ipsec_policy(ipsec_policy_id) request( - :expects => 204, - :method => 'DELETE', - :path => "vpn/ipsecpolicies/#{ipsec_policy_id}" + expects: 204, + method: 'DELETE', + path: "vpn/ipsecpolicies/#{ipsec_policy_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb index 685b2201e..1a81b28eb 100644 --- a/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/delete_ipsec_site_connection.rb @@ -4,9 +4,9 @@ class Network class Real def delete_ipsec_site_connection(ipsec_site_connection_id) request( - :expects => 204, - :method => 'DELETE', - :path => "vpn/ipsec-site-connections/#{ipsec_site_connection_id}" + expects: 204, + method: 'DELETE', + path: "vpn/ipsec-site-connections/#{ipsec_site_connection_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb b/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb index bcda68445..3e6d88bcf 100644 --- a/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/delete_lb_health_monitor.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lb_health_monitor(health_monitor_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lb/health_monitors/#{health_monitor_id}" + expects: 204, + method: 'DELETE', + path: "lb/health_monitors/#{health_monitor_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lb_member.rb b/lib/fog/openstack/network/requests/delete_lb_member.rb index 5f59c5b87..1a3b366d3 100644 --- a/lib/fog/openstack/network/requests/delete_lb_member.rb +++ b/lib/fog/openstack/network/requests/delete_lb_member.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lb_member(member_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lb/members/#{member_id}" + expects: 204, + method: 'DELETE', + path: "lb/members/#{member_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lb_pool.rb b/lib/fog/openstack/network/requests/delete_lb_pool.rb index c74ddf3e9..d38853117 100644 --- a/lib/fog/openstack/network/requests/delete_lb_pool.rb +++ b/lib/fog/openstack/network/requests/delete_lb_pool.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lb_pool(pool_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lb/pools/#{pool_id}" + expects: 204, + method: 'DELETE', + path: "lb/pools/#{pool_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lb_vip.rb b/lib/fog/openstack/network/requests/delete_lb_vip.rb index feb25b5fc..c7c8dbab2 100644 --- a/lib/fog/openstack/network/requests/delete_lb_vip.rb +++ b/lib/fog/openstack/network/requests/delete_lb_vip.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lb_vip(vip_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lb/vips/#{vip_id}" + expects: 204, + method: 'DELETE', + path: "lb/vips/#{vip_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb index 54987f35a..b144d02a1 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_healthmonitor.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lbaas_healthmonitor(healthmonitor_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/healthmonitors/#{healthmonitor_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/healthmonitors/#{healthmonitor_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb index 932da19e1..373be541e 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_l7policy.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lbaas_l7policy(l7policy_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/l7policies/#{l7policy_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/l7policies/#{l7policy_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb index e8c238b53..4cf3209de 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_l7rule.rb @@ -4,15 +4,15 @@ class Network class Real def delete_lbaas_l7rule(l7policy_id, l7rule_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/l7policies/#{l7policy_id}/rules/#{l7rule_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/l7policies/#{l7policy_id}/rules/#{l7rule_id}" ) end end class Mock - def delete_lbaas_l7rule(l7policy_id, l7rule_id) + def delete_lbaas_l7rule(_l7policy_id, l7rule_id) response = Excon::Response.new if list_lbaas_l7rules.body['l7rules'].map { |r| r['id'] }.include? l7rule_id data[:lbaas_l7rules].delete(l7rule_id) diff --git a/lib/fog/openstack/network/requests/delete_lbaas_listener.rb b/lib/fog/openstack/network/requests/delete_lbaas_listener.rb index 757f4dbd6..1b74cd31e 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_listener.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lbaas_listener(listener_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/listeners/#{listener_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/listeners/#{listener_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb index 86bd24c1e..4625d00eb 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_loadbalancer.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lbaas_loadbalancer(loadbalancer_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/loadbalancers/#{loadbalancer_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/loadbalancers/#{loadbalancer_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_pool.rb b/lib/fog/openstack/network/requests/delete_lbaas_pool.rb index 3034c130a..7d9f72118 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_pool.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lbaas_pool(pool_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/pools/#{pool_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/pools/#{pool_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb index 82ef9e421..441fd94ef 100644 --- a/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/delete_lbaas_pool_member.rb @@ -4,9 +4,9 @@ class Network class Real def delete_lbaas_pool_member(pool_id, member_id) request( - :expects => 204, - :method => 'DELETE', - :path => "lbaas/pools/#{pool_id}/members/#{member_id}" + expects: 204, + method: 'DELETE', + path: "lbaas/pools/#{pool_id}/members/#{member_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_network.rb b/lib/fog/openstack/network/requests/delete_network.rb index abd10a4c0..5be821ec6 100644 --- a/lib/fog/openstack/network/requests/delete_network.rb +++ b/lib/fog/openstack/network/requests/delete_network.rb @@ -4,9 +4,9 @@ class Network class Real def delete_network(network_id) request( - :expects => 204, - :method => 'DELETE', - :path => "networks/#{network_id}" + expects: 204, + method: 'DELETE', + path: "networks/#{network_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_port.rb b/lib/fog/openstack/network/requests/delete_port.rb index 270b5eb25..930b30f2b 100644 --- a/lib/fog/openstack/network/requests/delete_port.rb +++ b/lib/fog/openstack/network/requests/delete_port.rb @@ -4,9 +4,9 @@ class Network class Real def delete_port(port_id) request( - :expects => 204, - :method => 'DELETE', - :path => "ports/#{port_id}" + expects: 204, + method: 'DELETE', + path: "ports/#{port_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_quota.rb b/lib/fog/openstack/network/requests/delete_quota.rb index 8cb55f731..cb2109adc 100644 --- a/lib/fog/openstack/network/requests/delete_quota.rb +++ b/lib/fog/openstack/network/requests/delete_quota.rb @@ -4,9 +4,9 @@ class Network class Real def delete_quota(tenant_id) request( - :expects => 204, - :method => 'DELETE', - :path => "/quotas/#{tenant_id}" + expects: 204, + method: 'DELETE', + path: "/quotas/#{tenant_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_rbac_policy.rb b/lib/fog/openstack/network/requests/delete_rbac_policy.rb index 61ab9a190..67d23f0eb 100644 --- a/lib/fog/openstack/network/requests/delete_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/delete_rbac_policy.rb @@ -4,9 +4,9 @@ class Network class Real def delete_rbac_policy(rbac_policy_id) request( - :expects => 204, - :method => 'DELETE', - :path => "rbac-policies/#{rbac_policy_id}" + expects: 204, + method: 'DELETE', + path: "rbac-policies/#{rbac_policy_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_router.rb b/lib/fog/openstack/network/requests/delete_router.rb index 40b558328..3987f52c0 100644 --- a/lib/fog/openstack/network/requests/delete_router.rb +++ b/lib/fog/openstack/network/requests/delete_router.rb @@ -4,9 +4,9 @@ class Network class Real def delete_router(router_id) request( - :expects => 204, - :method => 'DELETE', - :path => "routers/#{router_id}" + expects: 204, + method: 'DELETE', + path: "routers/#{router_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_security_group.rb b/lib/fog/openstack/network/requests/delete_security_group.rb index d467dc440..2845b304b 100644 --- a/lib/fog/openstack/network/requests/delete_security_group.rb +++ b/lib/fog/openstack/network/requests/delete_security_group.rb @@ -8,9 +8,9 @@ class Real # * 'security_group_id'<~String> - UUID of the security group to delete def delete_security_group(security_group_id) request( - :expects => 204, - :method => 'DELETE', - :path => "security-groups/#{security_group_id}" + expects: 204, + method: 'DELETE', + path: "security-groups/#{security_group_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_security_group_rule.rb b/lib/fog/openstack/network/requests/delete_security_group_rule.rb index 0ad7a8ac5..aae442411 100644 --- a/lib/fog/openstack/network/requests/delete_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/delete_security_group_rule.rb @@ -8,9 +8,9 @@ class Real # * 'security_group_rule_id'<~String> - UUID of the security group rule to delete def delete_security_group_rule(security_group_rule_id) request( - :expects => 204, - :method => "DELETE", - :path => "security-group-rules/#{security_group_rule_id}" + expects: 204, + method: "DELETE", + path: "security-group-rules/#{security_group_rule_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_subnet.rb b/lib/fog/openstack/network/requests/delete_subnet.rb index 0d47b2563..83daea103 100644 --- a/lib/fog/openstack/network/requests/delete_subnet.rb +++ b/lib/fog/openstack/network/requests/delete_subnet.rb @@ -4,9 +4,9 @@ class Network class Real def delete_subnet(subnet_id) request( - :expects => 204, - :method => 'DELETE', - :path => "subnets/#{subnet_id}" + expects: 204, + method: 'DELETE', + path: "subnets/#{subnet_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_subnet_pool.rb b/lib/fog/openstack/network/requests/delete_subnet_pool.rb index ed2f970c2..d5ac9f442 100644 --- a/lib/fog/openstack/network/requests/delete_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/delete_subnet_pool.rb @@ -4,9 +4,9 @@ class Network class Real def delete_subnet_pool(subnet_pool_id) request( - :expects => 204, - :method => 'DELETE', - :path => "subnetpools/#{subnet_pool_id}" + expects: 204, + method: 'DELETE', + path: "subnetpools/#{subnet_pool_id}" ) end end diff --git a/lib/fog/openstack/network/requests/delete_vpn_service.rb b/lib/fog/openstack/network/requests/delete_vpn_service.rb index 37665346e..377ef5b5d 100644 --- a/lib/fog/openstack/network/requests/delete_vpn_service.rb +++ b/lib/fog/openstack/network/requests/delete_vpn_service.rb @@ -4,9 +4,9 @@ class Network class Real def delete_vpn_service(vpn_service_id) request( - :expects => 204, - :method => 'DELETE', - :path => "vpn/vpnservices/#{vpn_service_id}" + expects: 204, + method: 'DELETE', + path: "vpn/vpnservices/#{vpn_service_id}" ) end end diff --git a/lib/fog/openstack/network/requests/disassociate_floating_ip.rb b/lib/fog/openstack/network/requests/disassociate_floating_ip.rb index f82c61378..38e16d834 100644 --- a/lib/fog/openstack/network/requests/disassociate_floating_ip.rb +++ b/lib/fog/openstack/network/requests/disassociate_floating_ip.rb @@ -5,7 +5,7 @@ class Real def disassociate_floating_ip(floating_ip_id, options = {}) data = { 'floatingip' => { - 'port_id' => nil, + 'port_id' => nil } } @@ -15,10 +15,10 @@ def disassociate_floating_ip(floating_ip_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "floatingips/#{floating_ip_id}" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "floatingips/#{floating_ip_id}" ) end end @@ -28,17 +28,17 @@ def disassociate_floating_ip(_floating_ip_id, options = {}) response = Excon::Response.new response.status = 200 data = { - 'id' => '00000000-0000-0000-0000-000000000000', - 'router_id' => nil, - 'tenant_id' => options["tenant_id"], + 'id' => '00000000-0000-0000-0000-000000000000', + 'router_id' => nil, + 'tenant_id' => options["tenant_id"], 'floating_network_id' => options["floating_network_id"], - 'fixed_ip_address' => nil, + 'fixed_ip_address' => nil, 'floating_ip_address' => options["floating_ip_address"], - 'port_id' => options["port_id"], + 'port_id' => options["port_id"] } self.data[:floating_ips][data['floating_ip_id']] = data - response.body = {'floatingip' => data} + response.body = { 'floatingip' => data } response end end diff --git a/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb b/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb index 473fa2ffe..d864d9bbf 100644 --- a/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/disassociate_lb_health_monitor.rb @@ -4,9 +4,9 @@ class Network class Real def disassociate_lb_health_monitor(pool_id, health_monitor_id) request( - :expects => [204], - :method => 'DELETE', - :path => "lb/pools/#{pool_id}/health_monitors/#{health_monitor_id}" + expects: [204], + method: 'DELETE', + path: "lb/pools/#{pool_id}/health_monitors/#{health_monitor_id}" ) end end diff --git a/lib/fog/openstack/network/requests/get_extension.rb b/lib/fog/openstack/network/requests/get_extension.rb index 4bf4bd7c1..897f61f96 100644 --- a/lib/fog/openstack/network/requests/get_extension.rb +++ b/lib/fog/openstack/network/requests/get_extension.rb @@ -4,9 +4,9 @@ class Network class Real def get_extension(name) request( - :expects => [200], - :method => 'GET', - :path => "extensions/#{name}" + expects: [200], + method: 'GET', + path: "extensions/#{name}" ) end end @@ -16,7 +16,7 @@ def get_extension(name) response = Excon::Response.new if data = self.data[:extensions][name] response.status = 200 - response.body = {'extension' => data} + response.body = { 'extension' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_floating_ip.rb b/lib/fog/openstack/network/requests/get_floating_ip.rb index 4bd6ac2a5..baac191dc 100644 --- a/lib/fog/openstack/network/requests/get_floating_ip.rb +++ b/lib/fog/openstack/network/requests/get_floating_ip.rb @@ -4,9 +4,9 @@ class Network class Real def get_floating_ip(floating_ip_id) request( - :expects => [200], - :method => 'GET', - :path => "floatingips/#{floating_ip_id}" + expects: [200], + method: 'GET', + path: "floatingips/#{floating_ip_id}" ) end end @@ -18,14 +18,14 @@ def get_floating_ip(floating_ip_id) response.status = 200 response.body = { "floatingip" => { - "id" => "00000000-0000-0000-0000-000000000000", + "id" => "00000000-0000-0000-0000-000000000000", # changed # "floating_ip_id" => floating_ip_id, - "port_id" => data["port_id"], - "tenant_id" => data["tenant_id"], - "fixed_ip_address" => data["fixed_ip_address"], - "router_id" => "00000000-0000-0000-0000-000000000000", - "floating_ip_address" => data["floating_ip_address"], + "port_id" => data["port_id"], + "tenant_id" => data["tenant_id"], + "fixed_ip_address" => data["fixed_ip_address"], + "router_id" => "00000000-0000-0000-0000-000000000000", + "floating_ip_address" => data["floating_ip_address"] } } response diff --git a/lib/fog/openstack/network/requests/get_ike_policy.rb b/lib/fog/openstack/network/requests/get_ike_policy.rb index 4eacb6261..c366a81d5 100644 --- a/lib/fog/openstack/network/requests/get_ike_policy.rb +++ b/lib/fog/openstack/network/requests/get_ike_policy.rb @@ -4,9 +4,9 @@ class Network class Real def get_ike_policy(ike_policy_id) request( - :expects => [200], - :method => 'GET', - :path => "vpn/ikepolicies/#{ike_policy_id}" + expects: [200], + method: 'GET', + path: "vpn/ikepolicies/#{ike_policy_id}" ) end end @@ -16,7 +16,7 @@ def get_ike_policy(ike_policy_id) response = Excon::Response.new if data = self.data[:ike_policies][ike_policy_id] response.status = 200 - response.body = {'ikepolicy' => data} + response.body = { 'ikepolicy' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_ipsec_policy.rb b/lib/fog/openstack/network/requests/get_ipsec_policy.rb index b8c7d7b2f..688e25562 100644 --- a/lib/fog/openstack/network/requests/get_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/get_ipsec_policy.rb @@ -4,9 +4,9 @@ class Network class Real def get_ipsec_policy(ipsec_policy_id) request( - :expects => [200], - :method => 'GET', - :path => "vpn/ipsecpolicies/#{ipsec_policy_id}" + expects: [200], + method: 'GET', + path: "vpn/ipsecpolicies/#{ipsec_policy_id}" ) end end @@ -16,7 +16,7 @@ def get_ipsec_policy(ipsec_policy_id) response = Excon::Response.new if data = self.data[:ipsec_policies][ipsec_policy_id] response.status = 200 - response.body = {'ipsecpolicy' => data} + response.body = { 'ipsecpolicy' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb index e100d18b4..7c06e01b3 100644 --- a/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/get_ipsec_site_connection.rb @@ -4,9 +4,9 @@ class Network class Real def get_ipsec_site_connection(ipsec_site_connection_id) request( - :expects => [200], - :method => 'GET', - :path => "vpn/ipsec-site-connections/#{ipsec_site_connection_id}" + expects: [200], + method: 'GET', + path: "vpn/ipsec-site-connections/#{ipsec_site_connection_id}" ) end end @@ -16,7 +16,7 @@ def get_ipsec_site_connection(ipsec_site_connection_id) response = Excon::Response.new if data = self.data[:ipsec_site_connections][ipsec_site_connection_id] response.status = 200 - response.body = {'ipsec_site_connection' => data} + response.body = { 'ipsec_site_connection' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lb_health_monitor.rb b/lib/fog/openstack/network/requests/get_lb_health_monitor.rb index 1ac983470..3bc4dcada 100644 --- a/lib/fog/openstack/network/requests/get_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/get_lb_health_monitor.rb @@ -4,9 +4,9 @@ class Network class Real def get_lb_health_monitor(health_monitor_id) request( - :expects => [200], - :method => 'GET', - :path => "lb/health_monitors/#{health_monitor_id}" + expects: [200], + method: 'GET', + path: "lb/health_monitors/#{health_monitor_id}" ) end end @@ -16,7 +16,7 @@ def get_lb_health_monitor(health_monitor_id) response = Excon::Response.new if data = self.data[:lb_health_monitors][health_monitor_id] response.status = 200 - response.body = {'health_monitor' => data} + response.body = { 'health_monitor' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lb_member.rb b/lib/fog/openstack/network/requests/get_lb_member.rb index cd18a27d7..d2285190d 100644 --- a/lib/fog/openstack/network/requests/get_lb_member.rb +++ b/lib/fog/openstack/network/requests/get_lb_member.rb @@ -4,9 +4,9 @@ class Network class Real def get_lb_member(member_id) request( - :expects => [200], - :method => 'GET', - :path => "lb/members/#{member_id}" + expects: [200], + method: 'GET', + path: "lb/members/#{member_id}" ) end end @@ -16,7 +16,7 @@ def get_lb_member(member_id) response = Excon::Response.new if data = self.data[:lb_members][member_id] response.status = 200 - response.body = {'member' => data} + response.body = { 'member' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lb_pool.rb b/lib/fog/openstack/network/requests/get_lb_pool.rb index 93668dd60..d3e2adff4 100644 --- a/lib/fog/openstack/network/requests/get_lb_pool.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool.rb @@ -4,9 +4,9 @@ class Network class Real def get_lb_pool(pool_id) request( - :expects => [200], - :method => 'GET', - :path => "lb/pools/#{pool_id}" + expects: [200], + method: 'GET', + path: "lb/pools/#{pool_id}" ) end end @@ -16,7 +16,7 @@ def get_lb_pool(pool_id) response = Excon::Response.new if data = self.data[:lb_pools][pool_id] response.status = 200 - response.body = {'pool' => data} + response.body = { 'pool' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb index 385cec020..3b97a3b7e 100644 --- a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb @@ -4,9 +4,9 @@ class Network class Real def get_lb_pool_stats(pool_id) request( - :expects => [200], - :method => 'GET', - :path => "lb/pools/#{pool_id}/stats" + expects: [200], + method: 'GET', + path: "lb/pools/#{pool_id}/stats" ) end end @@ -21,7 +21,7 @@ def get_lb_pool_stats(pool_id) stats["bytes_out"] = 0 stats["total_connections"] = 0 response.status = 200 - response.body = {'stats' => stats} + response.body = { 'stats' => stats } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lb_vip.rb b/lib/fog/openstack/network/requests/get_lb_vip.rb index 54b85101a..53cb8c56b 100644 --- a/lib/fog/openstack/network/requests/get_lb_vip.rb +++ b/lib/fog/openstack/network/requests/get_lb_vip.rb @@ -4,9 +4,9 @@ class Network class Real def get_lb_vip(vip_id) request( - :expects => [200], - :method => 'GET', - :path => "lb/vips/#{vip_id}" + expects: [200], + method: 'GET', + path: "lb/vips/#{vip_id}" ) end end @@ -16,7 +16,7 @@ def get_lb_vip(vip_id) response = Excon::Response.new if data = self.data[:lb_vips][vip_id] response.status = 200 - response.body = {'vip' => data} + response.body = { 'vip' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb index 6a02762b6..d4b0c0292 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_healthmonitor.rb @@ -4,9 +4,9 @@ class Network class Real def get_lbaas_healthmonitor(healthmonitor_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/healthmonitors/#{healthmonitor_id}" + expects: [200], + method: 'GET', + path: "lbaas/healthmonitors/#{healthmonitor_id}" ) end end @@ -16,7 +16,7 @@ def get_lbaas_healthmonitor(healthmonitor_id) response = Excon::Response.new if data = self.data[:lbaas_healthmonitors][healthmonitor_id] response.status = 200 - response.body = {'healthmonitor' => data} + response.body = { 'healthmonitor' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb index e1a319869..0879798fd 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_l7policy.rb @@ -4,9 +4,9 @@ class Network class Real def get_lbaas_l7policy(l7policy_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/l7policies/#{l7policy_id}" + expects: [200], + method: 'GET', + path: "lbaas/l7policies/#{l7policy_id}" ) end end @@ -16,7 +16,7 @@ def get_lbaas_l7policy(l7policy_id) response = Excon::Response.new if data = self.data[:lbaas_l7policies][l7policy_id] response.status = 200 - response.body = {'l7policy' => data} + response.body = { 'l7policy' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb index 5f628dd1d..7385fdaf6 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_l7rule.rb @@ -4,19 +4,19 @@ class Network class Real def get_lbaas_l7rule(l7policy_id, l7rule_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/l7policies/#{l7policy_id}/rules/#{l7rule_id}" + expects: [200], + method: 'GET', + path: "lbaas/l7policies/#{l7policy_id}/rules/#{l7rule_id}" ) end end class Mock - def get_lbaas_l7rule(l7policy_id, l7rule_id) + def get_lbaas_l7rule(_l7policy_id, l7rule_id) response = Excon::Response.new if data = self.data[:lbaas_l7rules][l7rule_id] response.status = 200 - response.body = {'rule' => data} + response.body = { 'rule' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_listener.rb b/lib/fog/openstack/network/requests/get_lbaas_listener.rb index 2e3e9c360..c4c32fc74 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_listener.rb @@ -4,9 +4,9 @@ class Network class Real def get_lbaas_listener(listener_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/listeners/#{listener_id}" + expects: [200], + method: 'GET', + path: "lbaas/listeners/#{listener_id}" ) end end @@ -16,7 +16,7 @@ def get_lbaas_listener(listener_id) response = Excon::Response.new if data = self.data[:lbaas_listeners][listener_id] response.status = 200 - response.body = {'listener' => data} + response.body = { 'listener' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb index 9adbc292f..061446d1a 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_loadbalancer.rb @@ -4,9 +4,9 @@ class Network class Real def get_lbaas_loadbalancer(loadbalancer_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/loadbalancers/#{loadbalancer_id}" + expects: [200], + method: 'GET', + path: "lbaas/loadbalancers/#{loadbalancer_id}" ) end end @@ -16,7 +16,7 @@ def get_lbaas_loadbalancer(loadbalancer_id) response = Excon::Response.new if data = self.data[:lbaas_loadbalancer][loadbalancer_id] response.status = 200 - response.body = {'loadbalancer' => data[:lbaas_loadbalancer]} + response.body = { 'loadbalancer' => data[:lbaas_loadbalancer] } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_pool.rb b/lib/fog/openstack/network/requests/get_lbaas_pool.rb index 7ee764d14..c84e512b5 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_pool.rb @@ -4,9 +4,9 @@ class Network class Real def get_lbaas_pool(pool_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/pools/#{pool_id}" + expects: [200], + method: 'GET', + path: "lbaas/pools/#{pool_id}" ) end end @@ -16,7 +16,7 @@ def get_lbaas_pool(pool_id) response = Excon::Response.new if data = self.data[:lbaas_pools][pool_id] response.status = 200 - response.body = {'pool' => data} + response.body = { 'pool' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb index d91f8358c..8af45cd44 100644 --- a/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/get_lbaas_pool_member.rb @@ -4,19 +4,19 @@ class Network class Real def get_lbaas_pool_member(pool_id, member_id) request( - :expects => [200], - :method => 'GET', - :path => "lbaas/pools/#{pool_id}/members/#{member_id}" + expects: [200], + method: 'GET', + path: "lbaas/pools/#{pool_id}/members/#{member_id}" ) end end class Mock - def get_lbaas_pool_member(pool_id, member_id) + def get_lbaas_pool_member(_pool_id, member_id) response = Excon::Response.new if data = self.data[:lbaas_pool_members][member_id] response.status = 200 - response.body = {'member' => data} + response.body = { 'member' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_network.rb b/lib/fog/openstack/network/requests/get_network.rb index 86968552d..b9fd960a4 100644 --- a/lib/fog/openstack/network/requests/get_network.rb +++ b/lib/fog/openstack/network/requests/get_network.rb @@ -4,9 +4,9 @@ class Network class Real def get_network(network_id) request( - :expects => [200], - :method => 'GET', - :path => "networks/#{network_id}" + expects: [200], + method: 'GET', + path: "networks/#{network_id}" ) end end @@ -16,7 +16,7 @@ def get_network(network_id) response = Excon::Response.new if data = self.data[:networks][network_id] response.status = 200 - response.body = {'network' => data} + response.body = { 'network' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_network_ip_availability.rb b/lib/fog/openstack/network/requests/get_network_ip_availability.rb index 08c2319cb..f79039a6b 100644 --- a/lib/fog/openstack/network/requests/get_network_ip_availability.rb +++ b/lib/fog/openstack/network/requests/get_network_ip_availability.rb @@ -4,19 +4,19 @@ class Network class Real def get_network_ip_availability(network_id) request( - :expects => [200], - :method => 'GET', - :path => "network-ip-availabilities/#{network_id}" + expects: [200], + method: 'GET', + path: "network-ip-availabilities/#{network_id}" ) end end class Mock - def get_network_ip_availability(network_id) + def get_network_ip_availability(_network_id) response = Excon::Response.new if data = self.data[:network_ip_availabilities].first response.status = 200 - response.body = {'network_ip_availability' => data} + response.body = { 'network_ip_availability' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_port.rb b/lib/fog/openstack/network/requests/get_port.rb index da6159748..0d67b1f21 100644 --- a/lib/fog/openstack/network/requests/get_port.rb +++ b/lib/fog/openstack/network/requests/get_port.rb @@ -4,9 +4,9 @@ class Network class Real def get_port(port_id) request( - :expects => [200], - :method => 'GET', - :path => "ports/#{port_id}" + expects: [200], + method: 'GET', + path: "ports/#{port_id}" ) end end @@ -18,24 +18,24 @@ def get_port(port_id) response.status = 200 response.body = { 'port' => { - 'id' => '5c81d975-5fea-4674-9c1f-b8aa10bf9a79', - 'name' => 'port_1', - 'network_id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb', - 'fixed_ips' => [ + 'id' => '5c81d975-5fea-4674-9c1f-b8aa10bf9a79', + 'name' => 'port_1', + 'network_id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb', + 'fixed_ips' => [ { 'ip_address' => '10.2.2.2', - 'subnet_id' => '2e4ec6a4-0150-47f5-8523-e899ac03026e', + 'subnet_id' => '2e4ec6a4-0150-47f5-8523-e899ac03026e' } ], - 'mac_address' => 'fa:16:3e:62:91:7f', - 'status' => 'ACTIVE', - 'admin_state_up' => true, - 'device_id' => 'dhcp724fc160-2b2e-597e-b9ed-7f65313cd73f-e624a36d-762b-481f-9b50-4154ceb78bbb', - 'device_owner' => 'network:dhcp', - 'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9', - 'security_groups' => ['3ddde803-e550-4737-b5de-0862401dc834'], + 'mac_address' => 'fa:16:3e:62:91:7f', + 'status' => 'ACTIVE', + 'admin_state_up' => true, + 'device_id' => 'dhcp724fc160-2b2e-597e-b9ed-7f65313cd73f-e624a36d-762b-481f-9b50-4154ceb78bbb', + 'device_owner' => 'network:dhcp', + 'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9', + 'security_groups' => ['3ddde803-e550-4737-b5de-0862401dc834'], 'allowed_address_pairs' => [ - 'ip_address' => '10.1.1.1', + 'ip_address' => '10.1.1.1', 'mac_address' => 'fa:16:3e:3d:2a:cc' ] } diff --git a/lib/fog/openstack/network/requests/get_quota.rb b/lib/fog/openstack/network/requests/get_quota.rb index 7caa56c36..573a67164 100644 --- a/lib/fog/openstack/network/requests/get_quota.rb +++ b/lib/fog/openstack/network/requests/get_quota.rb @@ -4,9 +4,9 @@ class Network class Real def get_quota(tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "/quotas/#{tenant_id}" + expects: 200, + method: 'GET', + path: "/quotas/#{tenant_id}" ) end end diff --git a/lib/fog/openstack/network/requests/get_quotas.rb b/lib/fog/openstack/network/requests/get_quotas.rb index 295caca5a..4ae1e8795 100644 --- a/lib/fog/openstack/network/requests/get_quotas.rb +++ b/lib/fog/openstack/network/requests/get_quotas.rb @@ -4,9 +4,9 @@ class Network class Real def get_quotas request( - :expects => 200, - :method => 'GET', - :path => "/quotas" + expects: 200, + method: 'GET', + path: "/quotas" ) end end diff --git a/lib/fog/openstack/network/requests/get_rbac_policy.rb b/lib/fog/openstack/network/requests/get_rbac_policy.rb index c42f505d9..982dcc6ee 100644 --- a/lib/fog/openstack/network/requests/get_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/get_rbac_policy.rb @@ -4,9 +4,9 @@ class Network class Real def get_rbac_policy(rbac_policy_id) request( - :expects => [200], - :method => 'GET', - :path => "rbac-policies/#{rbac_policy_id}" + expects: [200], + method: 'GET', + path: "rbac-policies/#{rbac_policy_id}" ) end end @@ -16,7 +16,7 @@ def get_rbac_policy(rbac_policy_id) response = Excon::Response.new if data = self.data[:rbac_policies][rbac_policy_id] response.status = 200 - response.body = {'rbac_policy' => data} + response.body = { 'rbac_policy' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_router.rb b/lib/fog/openstack/network/requests/get_router.rb index dc69e2be8..303fb7122 100644 --- a/lib/fog/openstack/network/requests/get_router.rb +++ b/lib/fog/openstack/network/requests/get_router.rb @@ -4,9 +4,9 @@ class Network class Real def get_router(router_id) request( - :expects => [200], - :method => 'GET', - :path => "routers/#{router_id}" + expects: [200], + method: 'GET', + path: "routers/#{router_id}" ) end end @@ -17,7 +17,7 @@ def get_router(router_id) if data = (self.data[:routers].find { |id, _value| id == router_id }) response.status = 200 response.body = { - 'router' => data[1], + 'router' => data[1] } response else diff --git a/lib/fog/openstack/network/requests/get_security_group.rb b/lib/fog/openstack/network/requests/get_security_group.rb index 7ef1c916d..20952ecd6 100644 --- a/lib/fog/openstack/network/requests/get_security_group.rb +++ b/lib/fog/openstack/network/requests/get_security_group.rb @@ -28,9 +28,9 @@ class Real # * 'tenant_id'<~String> - Tenant id that owns the security group rule def get_security_group(security_group_id) request( - :expects => 200, - :method => "GET", - :path => "security-groups/#{security_group_id}" + expects: 200, + method: "GET", + path: "security-groups/#{security_group_id}" ) end end @@ -40,7 +40,7 @@ def get_security_group(security_group_id) response = Excon::Response.new if sec_group = data[:security_groups][security_group_id] response.status = 200 - response.body = {"security_group" => sec_group} + response.body = { "security_group" => sec_group } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_security_group_rule.rb b/lib/fog/openstack/network/requests/get_security_group_rule.rb index ac746088e..0d74a55fc 100644 --- a/lib/fog/openstack/network/requests/get_security_group_rule.rb +++ b/lib/fog/openstack/network/requests/get_security_group_rule.rb @@ -23,9 +23,9 @@ class Real # * 'tenant_id'<~String> - Tenant id that owns the security group rule def get_security_group_rule(security_group_rule_id) request( - :expects => 200, - :method => "GET", - :path => "security-group-rules/#{security_group_rule_id}" + expects: 200, + method: "GET", + path: "security-group-rules/#{security_group_rule_id}" ) end end @@ -35,7 +35,7 @@ def get_security_group_rule(security_group_rule_id) response = Excon::Response.new if sec_group_rule = data[:security_group_rules][security_group_rule_id] response.status = 200 - response.body = {"security_group_rule" => sec_group_rule} + response.body = { "security_group_rule" => sec_group_rule } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_subnet.rb b/lib/fog/openstack/network/requests/get_subnet.rb index 8271a4dbf..a747c145a 100644 --- a/lib/fog/openstack/network/requests/get_subnet.rb +++ b/lib/fog/openstack/network/requests/get_subnet.rb @@ -4,9 +4,9 @@ class Network class Real def get_subnet(subnet_id) request( - :expects => [200], - :method => 'GET', - :path => "subnets/#{subnet_id}" + expects: [200], + method: 'GET', + path: "subnets/#{subnet_id}" ) end end @@ -18,22 +18,22 @@ def get_subnet(subnet_id) response.status = 200 response.body = { "subnet" => { - "id" => "2e4ec6a4-0150-47f5-8523-e899ac03026e", - "name" => "subnet_1", - "network_id" => "e624a36d-762b-481f-9b50-4154ceb78bbb", - "cidr" => "10.2.2.0/24", - "ip_version" => 4, - "gateway_ip" => "10.2.2.1", + "id" => "2e4ec6a4-0150-47f5-8523-e899ac03026e", + "name" => "subnet_1", + "network_id" => "e624a36d-762b-481f-9b50-4154ceb78bbb", + "cidr" => "10.2.2.0/24", + "ip_version" => 4, + "gateway_ip" => "10.2.2.1", "allocation_pools" => [ { "start" => "10.2.2.2", - "end" => "10.2.2.254" + "end" => "10.2.2.254" } ], - "dns_nameservers" => [], - "host_routes" => [], - "enable_dhcp" => true, - "tenant_id" => "f8b26a6032bc47718a7702233ac708b9", + "dns_nameservers" => [], + "host_routes" => [], + "enable_dhcp" => true, + "tenant_id" => "f8b26a6032bc47718a7702233ac708b9" } } response diff --git a/lib/fog/openstack/network/requests/get_subnet_pool.rb b/lib/fog/openstack/network/requests/get_subnet_pool.rb index c1159b4ed..e95381338 100644 --- a/lib/fog/openstack/network/requests/get_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/get_subnet_pool.rb @@ -4,9 +4,9 @@ class Network class Real def get_subnet_pool(subnet_pool_id) request( - :expects => [200], - :method => 'GET', - :path => "subnetpools/#{subnet_pool_id}" + expects: [200], + method: 'GET', + path: "subnetpools/#{subnet_pool_id}" ) end end @@ -17,7 +17,7 @@ def get_subnet_pool(subnet_pool_id) if data response = Excon::Response.new response.status = 200 - response.body = {'subnetpool' => data} + response.body = { 'subnetpool' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_vpn_service.rb b/lib/fog/openstack/network/requests/get_vpn_service.rb index ac0825e43..048640287 100644 --- a/lib/fog/openstack/network/requests/get_vpn_service.rb +++ b/lib/fog/openstack/network/requests/get_vpn_service.rb @@ -4,9 +4,9 @@ class Network class Real def get_vpn_service(vpn_service_id) request( - :expects => [200], - :method => 'GET', - :path => "vpn/vpnservices/#{vpn_service_id}" + expects: [200], + method: 'GET', + path: "vpn/vpnservices/#{vpn_service_id}" ) end end @@ -16,7 +16,7 @@ def get_vpn_service(vpn_service_id) response = Excon::Response.new if data = self.data[:vpn_services][vpn_service_id] response.status = 200 - response.body = {'vpnservice' => data} + response.body = { 'vpnservice' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/list_extensions.rb b/lib/fog/openstack/network/requests/list_extensions.rb index 2eee193a2..240f0033f 100644 --- a/lib/fog/openstack/network/requests/list_extensions.rb +++ b/lib/fog/openstack/network/requests/list_extensions.rb @@ -4,10 +4,10 @@ class Network class Real def list_extensions(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'extensions', - :query => filters + expects: 200, + method: 'GET', + path: 'extensions', + query: filters ) end end @@ -15,8 +15,8 @@ def list_extensions(filters = {}) class Mock def list_extensions(_filters = {}) Excon::Response.new( - :body => {'extensions' => data[:extensions].values}, - :status => 200 + body: { 'extensions' => data[:extensions].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_floating_ips.rb b/lib/fog/openstack/network/requests/list_floating_ips.rb index 5932a7e87..4a13d104f 100644 --- a/lib/fog/openstack/network/requests/list_floating_ips.rb +++ b/lib/fog/openstack/network/requests/list_floating_ips.rb @@ -4,10 +4,10 @@ class Network class Real def list_floating_ips(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'floatingips', - :query => filters + expects: 200, + method: 'GET', + path: 'floatingips', + query: filters ) end end @@ -15,8 +15,8 @@ def list_floating_ips(filters = {}) class Mock def list_floating_ips(_filters = {}) Excon::Response.new( - :body => {'floatingips' => data[:floating_ips].values}, - :status => 200 + body: { 'floatingips' => data[:floating_ips].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_ike_policies.rb b/lib/fog/openstack/network/requests/list_ike_policies.rb index ede627f96..e2da0ffa3 100644 --- a/lib/fog/openstack/network/requests/list_ike_policies.rb +++ b/lib/fog/openstack/network/requests/list_ike_policies.rb @@ -4,10 +4,10 @@ class Network class Real def list_ike_policies(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'vpn/ikepolicies', - :query => filters + expects: 200, + method: 'GET', + path: 'vpn/ikepolicies', + query: filters ) end end @@ -15,8 +15,8 @@ def list_ike_policies(filters = {}) class Mock def list_ike_policies(*) Excon::Response.new( - :body => {'ikepolicies' => data[:ike_policies].values}, - :status => 200 + body: { 'ikepolicies' => data[:ike_policies].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_ipsec_policies.rb b/lib/fog/openstack/network/requests/list_ipsec_policies.rb index 9cca1ca17..5a736d4c4 100644 --- a/lib/fog/openstack/network/requests/list_ipsec_policies.rb +++ b/lib/fog/openstack/network/requests/list_ipsec_policies.rb @@ -4,10 +4,10 @@ class Network class Real def list_ipsec_policies(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'vpn/ipsecpolicies', - :query => filters + expects: 200, + method: 'GET', + path: 'vpn/ipsecpolicies', + query: filters ) end end @@ -15,8 +15,8 @@ def list_ipsec_policies(filters = {}) class Mock def list_ipsec_policies(*) Excon::Response.new( - :body => {'ipsecpolicies' => data[:ipsec_policies].values}, - :status => 200 + body: { 'ipsecpolicies' => data[:ipsec_policies].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb b/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb index cd50b9e5a..d0fd467f8 100644 --- a/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb +++ b/lib/fog/openstack/network/requests/list_ipsec_site_connections.rb @@ -4,10 +4,10 @@ class Network class Real def list_ipsec_site_connections(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'vpn/ipsec-site-connections', - :query => filters + expects: 200, + method: 'GET', + path: 'vpn/ipsec-site-connections', + query: filters ) end end @@ -15,8 +15,8 @@ def list_ipsec_site_connections(filters = {}) class Mock def list_ipsec_site_connections(*) Excon::Response.new( - :body => {'ipsec_site_connections' => data[:ipsec_site_connections].values}, - :status => 200 + body: { 'ipsec_site_connections' => data[:ipsec_site_connections].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lb_health_monitors.rb b/lib/fog/openstack/network/requests/list_lb_health_monitors.rb index 60a1a9532..043f2313a 100644 --- a/lib/fog/openstack/network/requests/list_lb_health_monitors.rb +++ b/lib/fog/openstack/network/requests/list_lb_health_monitors.rb @@ -4,10 +4,10 @@ class Network class Real def list_lb_health_monitors(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lb/health_monitors', - :query => filters + expects: 200, + method: 'GET', + path: 'lb/health_monitors', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lb_health_monitors(filters = {}) class Mock def list_lb_health_monitors(_filters = {}) Excon::Response.new( - :body => {'health_monitors' => data[:lb_health_monitors].values}, - :status => 200 + body: { 'health_monitors' => data[:lb_health_monitors].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lb_members.rb b/lib/fog/openstack/network/requests/list_lb_members.rb index 0c4c1f53e..45a66fcfb 100644 --- a/lib/fog/openstack/network/requests/list_lb_members.rb +++ b/lib/fog/openstack/network/requests/list_lb_members.rb @@ -4,10 +4,10 @@ class Network class Real def list_lb_members(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lb/members', - :query => filters + expects: 200, + method: 'GET', + path: 'lb/members', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lb_members(filters = {}) class Mock def list_lb_members(_filters = {}) Excon::Response.new( - :body => {'members' => data[:lb_members].values}, - :status => 200 + body: { 'members' => data[:lb_members].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lb_pools.rb b/lib/fog/openstack/network/requests/list_lb_pools.rb index aaa853b3f..031b77c42 100644 --- a/lib/fog/openstack/network/requests/list_lb_pools.rb +++ b/lib/fog/openstack/network/requests/list_lb_pools.rb @@ -4,10 +4,10 @@ class Network class Real def list_lb_pools(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lb/pools', - :query => filters + expects: 200, + method: 'GET', + path: 'lb/pools', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lb_pools(filters = {}) class Mock def list_lb_pools(_filters = {}) Excon::Response.new( - :body => {'pools' => data[:lb_pools].values}, - :status => 200 + body: { 'pools' => data[:lb_pools].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lb_vips.rb b/lib/fog/openstack/network/requests/list_lb_vips.rb index 0e1749afc..b73df0a8f 100644 --- a/lib/fog/openstack/network/requests/list_lb_vips.rb +++ b/lib/fog/openstack/network/requests/list_lb_vips.rb @@ -4,10 +4,10 @@ class Network class Real def list_lb_vips(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lb/vips', - :query => filters + expects: 200, + method: 'GET', + path: 'lb/vips', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lb_vips(filters = {}) class Mock def list_lb_vips(_filters = {}) Excon::Response.new( - :body => {'vips' => data[:lb_vips].values}, - :status => 200 + body: { 'vips' => data[:lb_vips].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb b/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb index 17e68f45b..1fda26e54 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_healthmonitors.rb @@ -4,10 +4,10 @@ class Network class Real def list_lbaas_healthmonitors(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lbaas/healthmonitors', - :query => filters + expects: 200, + method: 'GET', + path: 'lbaas/healthmonitors', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lbaas_healthmonitors(filters = {}) class Mock def list_lbaas_healthmonitors(_filters = {}) Excon::Response.new( - :body => {'healthmonitors' => data[:lbaas_healthmonitors].values}, - :status => 200 + body: { 'healthmonitors' => data[:lbaas_healthmonitors].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb b/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb index c3e12db3f..5a4ebc382 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_l7policies.rb @@ -4,19 +4,19 @@ class Network class Real def list_lbaas_l7policies(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => "lbaas/l7policies", - :query => filters + expects: 200, + method: 'GET', + path: "lbaas/l7policies", + query: filters ) end end class Mock - def list_lbaas_l7policies(filters = {}) + def list_lbaas_l7policies(_filters = {}) Excon::Response.new( - :body => {'l7policies' => data[:lbaas_l7policies].values}, - :status => 200 + body: { 'l7policies' => data[:lbaas_l7policies].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb b/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb index 49321df5d..b39172d6e 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_l7rules.rb @@ -4,19 +4,19 @@ class Network class Real def list_lbaas_l7rules(l7policy_id, filters = {}) request( - :expects => 200, - :method => 'GET', - :path => "lbaas/l7policies/#{l7policy_id}/rules", - :query => filters + expects: 200, + method: 'GET', + path: "lbaas/l7policies/#{l7policy_id}/rules", + query: filters ) end end class Mock - def list_lbaas_l7rules(l7policy_id, filters = {}) + def list_lbaas_l7rules(_l7policy_id, _filters = {}) Excon::Response.new( - :body => {'rules' => data[:lbaas_l7rules].values}, - :status => 200 + body: { 'rules' => data[:lbaas_l7rules].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_listeners.rb b/lib/fog/openstack/network/requests/list_lbaas_listeners.rb index f6c4cf266..54649f5d6 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_listeners.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_listeners.rb @@ -4,10 +4,10 @@ class Network class Real def list_lbaas_listeners(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lbaas/listeners', - :query => filters + expects: 200, + method: 'GET', + path: 'lbaas/listeners', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lbaas_listeners(filters = {}) class Mock def list_lbaas_listeners(_filters = {}) Excon::Response.new( - :body => {'listeners' => data[:lbaas_listeners].values}, - :status => 200 + body: { 'listeners' => data[:lbaas_listeners].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb b/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb index c548296ec..5632ef768 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_loadbalancers.rb @@ -4,19 +4,19 @@ class Network class Real def list_lbaas_loadbalancers(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lbaas/loadbalancers', - :query => filters + expects: 200, + method: 'GET', + path: 'lbaas/loadbalancers', + query: filters ) end end class Mock def list_lbaas_loadbalancers(_filters = {}) - Excon::Response.new( - :body => {'loadbalancers' => [data[:lbaas_loadbalancer]]}, - :status => 200 + Excon::Response.new( + body: { 'loadbalancers' => [data[:lbaas_loadbalancer]] }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb b/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb index 8bf197228..dacb1e3a0 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_pool_members.rb @@ -4,19 +4,19 @@ class Network class Real def list_lbaas_pool_members(pool_id, filters = {}) request( - :expects => 200, - :method => 'GET', - :path => "lbaas/pools/#{pool_id}/members", - :query => filters + expects: 200, + method: 'GET', + path: "lbaas/pools/#{pool_id}/members", + query: filters ) end end class Mock - def list_lbaas_pool_members(pool_id, _filters = {}) - Excon::Response.new( - :body => {'members' => data[:lbaas_pool_members].values}, - :status => 200 + def list_lbaas_pool_members(_pool_id, _filters = {}) + Excon::Response.new( + body: { 'members' => data[:lbaas_pool_members].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_lbaas_pools.rb b/lib/fog/openstack/network/requests/list_lbaas_pools.rb index d792cb075..2ce3d97d1 100644 --- a/lib/fog/openstack/network/requests/list_lbaas_pools.rb +++ b/lib/fog/openstack/network/requests/list_lbaas_pools.rb @@ -4,10 +4,10 @@ class Network class Real def list_lbaas_pools(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'lbaas/pools', - :query => filters + expects: 200, + method: 'GET', + path: 'lbaas/pools', + query: filters ) end end @@ -15,8 +15,8 @@ def list_lbaas_pools(filters = {}) class Mock def list_lbaas_pools(_filters = {}) Excon::Response.new( - :body => {'pools' => data[:lbaas_pools].values}, - :status => 200 + body: { 'pools' => data[:lbaas_pools].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb b/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb index df4269d78..0c1ef1599 100644 --- a/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb +++ b/lib/fog/openstack/network/requests/list_network_ip_availabilities.rb @@ -4,9 +4,9 @@ class Network class Real def list_network_ip_availabilities request( - :expects => [200], - :method => 'GET', - :path => "network-ip-availabilities" + expects: [200], + method: 'GET', + path: "network-ip-availabilities" ) end end @@ -16,7 +16,7 @@ def list_network_ip_availabilities response = Excon::Response.new if data = self.data[:network_ip_availabilities] response.status = 200 - response.body = {'network_ip_availabilities' => data} + response.body = { 'network_ip_availabilities' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/list_networks.rb b/lib/fog/openstack/network/requests/list_networks.rb index e21c89971..9f9ffd4f8 100644 --- a/lib/fog/openstack/network/requests/list_networks.rb +++ b/lib/fog/openstack/network/requests/list_networks.rb @@ -4,10 +4,10 @@ class Network class Real def list_networks(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'networks', - :query => filters + expects: 200, + method: 'GET', + path: 'networks', + query: filters ) end end @@ -15,8 +15,8 @@ def list_networks(filters = {}) class Mock def list_networks(_filters = {}) Excon::Response.new( - :body => {'networks' => data[:networks].values}, - :status => 200 + body: { 'networks' => data[:networks].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_ports.rb b/lib/fog/openstack/network/requests/list_ports.rb index 46fe03b6c..fb03cf643 100644 --- a/lib/fog/openstack/network/requests/list_ports.rb +++ b/lib/fog/openstack/network/requests/list_ports.rb @@ -4,10 +4,10 @@ class Network class Real def list_ports(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'ports', - :query => filters + expects: 200, + method: 'GET', + path: 'ports', + query: filters ) end end @@ -15,8 +15,8 @@ def list_ports(filters = {}) class Mock def list_ports(_filters = {}) Excon::Response.new( - :body => {'ports' => data[:ports].values}, - :status => 200 + body: { 'ports' => data[:ports].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_rbac_policies.rb b/lib/fog/openstack/network/requests/list_rbac_policies.rb index 0e2b95e70..d9369c8d8 100644 --- a/lib/fog/openstack/network/requests/list_rbac_policies.rb +++ b/lib/fog/openstack/network/requests/list_rbac_policies.rb @@ -4,10 +4,10 @@ class Network class Real def list_rbac_policies(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'rbac-policies', - :query => filters + expects: 200, + method: 'GET', + path: 'rbac-policies', + query: filters ) end end @@ -15,8 +15,8 @@ def list_rbac_policies(filters = {}) class Mock def list_rbac_policies(*) Excon::Response.new( - :body => {'rbac_policies' => data[:rbac_policies].values}, - :status => 200 + body: { 'rbac_policies' => data[:rbac_policies].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_routers.rb b/lib/fog/openstack/network/requests/list_routers.rb index 3c9010c6f..d7e10672a 100644 --- a/lib/fog/openstack/network/requests/list_routers.rb +++ b/lib/fog/openstack/network/requests/list_routers.rb @@ -4,10 +4,10 @@ class Network class Real def list_routers(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'routers', - :query => filters + expects: 200, + method: 'GET', + path: 'routers', + query: filters ) end end @@ -15,8 +15,8 @@ def list_routers(filters = {}) class Mock def list_routers(_filters = {}) Excon::Response.new( - :body => {'routers' => data[:routers].values}, - :status => 200 + body: { 'routers' => data[:routers].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_security_group_rules.rb b/lib/fog/openstack/network/requests/list_security_group_rules.rb index d985d6fdd..4c01fc924 100644 --- a/lib/fog/openstack/network/requests/list_security_group_rules.rb +++ b/lib/fog/openstack/network/requests/list_security_group_rules.rb @@ -23,10 +23,10 @@ class Real # * 'tenant_id'<~String> - Tenant id that owns the security group rule def list_security_group_rules(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'security-group-rules', - :query => options + expects: 200, + method: 'GET', + path: 'security-group-rules', + query: options ) end end @@ -39,7 +39,7 @@ def list_security_group_rules(_options = {}) sec_group_rules = data[:security_group_rules].values unless data[:security_group_rules].nil? response.status = 200 - response.body = {'security_group_rules' => sec_group_rules} + response.body = { 'security_group_rules' => sec_group_rules } response end end diff --git a/lib/fog/openstack/network/requests/list_security_groups.rb b/lib/fog/openstack/network/requests/list_security_groups.rb index ceb16c9da..87e44eb55 100644 --- a/lib/fog/openstack/network/requests/list_security_groups.rb +++ b/lib/fog/openstack/network/requests/list_security_groups.rb @@ -28,10 +28,10 @@ class Real # * 'tenant_id'<~String> - Tenant id that owns the security group rule def list_security_groups(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'security-groups', - :query => options + expects: 200, + method: 'GET', + path: 'security-groups', + query: options ) end end @@ -44,7 +44,7 @@ def list_security_groups(_options = {}) sec_groups = data[:security_groups].values unless data[:security_groups].nil? response.status = 200 - response.body = {'security_groups' => sec_groups} + response.body = { 'security_groups' => sec_groups } response end end diff --git a/lib/fog/openstack/network/requests/list_subnet_pools.rb b/lib/fog/openstack/network/requests/list_subnet_pools.rb index eee578c22..b598121ad 100644 --- a/lib/fog/openstack/network/requests/list_subnet_pools.rb +++ b/lib/fog/openstack/network/requests/list_subnet_pools.rb @@ -4,10 +4,10 @@ class Network class Real def list_subnet_pools(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'subnetpools', - :query => filters + expects: 200, + method: 'GET', + path: 'subnetpools', + query: filters ) end end @@ -15,8 +15,8 @@ def list_subnet_pools(filters = {}) class Mock def list_subnet_pools(_filters = {}) Excon::Response.new( - :body => {'subnetpools' => data[:subnet_pools].values}, - :status => 200 + body: { 'subnetpools' => data[:subnet_pools].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_subnets.rb b/lib/fog/openstack/network/requests/list_subnets.rb index aae439beb..7828e72bd 100644 --- a/lib/fog/openstack/network/requests/list_subnets.rb +++ b/lib/fog/openstack/network/requests/list_subnets.rb @@ -4,10 +4,10 @@ class Network class Real def list_subnets(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'subnets', - :query => filters + expects: 200, + method: 'GET', + path: 'subnets', + query: filters ) end end @@ -15,8 +15,8 @@ def list_subnets(filters = {}) class Mock def list_subnets(_filters = {}) Excon::Response.new( - :body => {'subnets' => data[:subnets].values}, - :status => 200 + body: { 'subnets' => data[:subnets].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/list_vpn_services.rb b/lib/fog/openstack/network/requests/list_vpn_services.rb index 277c447f9..76489d93d 100644 --- a/lib/fog/openstack/network/requests/list_vpn_services.rb +++ b/lib/fog/openstack/network/requests/list_vpn_services.rb @@ -4,10 +4,10 @@ class Network class Real def list_vpn_services(filters = {}) request( - :expects => 200, - :method => 'GET', - :path => 'vpn/vpnservices', - :query => filters + expects: 200, + method: 'GET', + path: 'vpn/vpnservices', + query: filters ) end end @@ -15,8 +15,8 @@ def list_vpn_services(filters = {}) class Mock def list_vpn_services(*) Excon::Response.new( - :body => {'vpnservices' => data[:vpn_services].values}, - :status => 200 + body: { 'vpnservices' => data[:vpn_services].values }, + status: 200 ) end end diff --git a/lib/fog/openstack/network/requests/remove_router_interface.rb b/lib/fog/openstack/network/requests/remove_router_interface.rb index 81de8ea05..3a6d8cdb9 100644 --- a/lib/fog/openstack/network/requests/remove_router_interface.rb +++ b/lib/fog/openstack/network/requests/remove_router_interface.rb @@ -4,14 +4,14 @@ class Network class Real def remove_router_interface(router_id, subnet_id, _options = {}) data = { - 'subnet_id' => subnet_id, + 'subnet_id' => subnet_id } request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "routers/#{router_id}/remove_router_interface" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "routers/#{router_id}/remove_router_interface" ) end end @@ -25,7 +25,7 @@ def remove_router_interface(_router_id, _subnet_id, _options = {}) } self.data[:routers][data['router_id']] = data - response.body = {'router' => data} + response.body = { 'router' => data } response end end diff --git a/lib/fog/openstack/network/requests/update_ike_policy.rb b/lib/fog/openstack/network/requests/update_ike_policy.rb index feb337958..a6235f71a 100644 --- a/lib/fog/openstack/network/requests/update_ike_policy.rb +++ b/lib/fog/openstack/network/requests/update_ike_policy.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_ike_policy(ike_policy_id, options = {}) - data = {'ikepolicy' => {}} + data = { 'ikepolicy' => {} } vanilla_options = [:name, :description, :tenant_id, :auth_algorithm, :encryption_algorithm, @@ -14,10 +14,10 @@ def update_ike_policy(ike_policy_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "vpn/ikepolicies/#{ike_policy_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "vpn/ikepolicies/#{ike_policy_id}" ) end end @@ -35,7 +35,7 @@ def update_ike_policy(ike_policy_id, options = {}) ike_policy['phase1_negotiation_mode'] = options[:phase1_negotiation_mode] ike_policy['lifetime'] = options[:lifetime] ike_policy['ike_version'] = options[:ike_version] - response.body = {'ikepolicy' => ike_policy} + response.body = { 'ikepolicy' => ike_policy } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_ipsec_policy.rb b/lib/fog/openstack/network/requests/update_ipsec_policy.rb index db3ea1344..58a4e9191 100644 --- a/lib/fog/openstack/network/requests/update_ipsec_policy.rb +++ b/lib/fog/openstack/network/requests/update_ipsec_policy.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_ipsec_policy(ipsec_policy_id, options = {}) - data = {'ipsecpolicy' => {}} + data = { 'ipsecpolicy' => {} } vanilla_options = [:name, :description, :tenant_id, :auth_algorithm, :encryption_algorithm, @@ -14,10 +14,10 @@ def update_ipsec_policy(ipsec_policy_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "vpn/ipsecpolicies/#{ipsec_policy_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "vpn/ipsecpolicies/#{ipsec_policy_id}" ) end end @@ -38,7 +38,7 @@ def update_ipsec_policy(ipsec_policy_id, options = {}) ipsec_policy['transform_protocol'] = options[:transform_protocol] ipsec_policy['encapsulation_mode'] = options[:encapsulation_mode] ipsec_policy['lifetime'] = options[:lifetime] - response.body = {'ipsecpolicy' => ipsec_policy} + response.body = { 'ipsecpolicy' => ipsec_policy } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb b/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb index 894e65041..7d64724ea 100644 --- a/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb +++ b/lib/fog/openstack/network/requests/update_ipsec_site_connection.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) - data = {'ipsec_site_connection' => {}} + data = { 'ipsec_site_connection' => {} } vanilla_options = [:name, :description, :tenant_id, :peer_address, :peer_id, :peer_cidrs, @@ -15,10 +15,10 @@ def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "vpn/ipsec-site-connections/#{ipsec_site_connection_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "vpn/ipsec-site-connections/#{ipsec_site_connection_id}" ) end end @@ -50,7 +50,7 @@ def update_ipsec_site_connection(ipsec_site_connection_id, options = {}) ipsec_site_connection['peer_address'] = options[:peer_address] ipsec_site_connection['peer_id'] = options[:peer_id] - response.body = {'ipsec_site_connection' => ipsec_site_connection} + response.body = { 'ipsec_site_connection' => ipsec_site_connection } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lb_health_monitor.rb b/lib/fog/openstack/network/requests/update_lb_health_monitor.rb index 7c4bfcf7c..991a703c8 100644 --- a/lib/fog/openstack/network/requests/update_lb_health_monitor.rb +++ b/lib/fog/openstack/network/requests/update_lb_health_monitor.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lb_health_monitor(health_monitor_id, options = {}) - data = {'health_monitor' => {}} + data = { 'health_monitor' => {} } vanilla_options = [:delay, :timeout, :max_retries, :http_method, :url_path, :expected_codes, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_lb_health_monitor(health_monitor_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lb/health_monitors/#{health_monitor_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lb/health_monitors/#{health_monitor_id}" ) end end @@ -30,7 +30,7 @@ def update_lb_health_monitor(health_monitor_id, options = {}) health_monitor['url_path'] = options[:url_path] health_monitor['expected_codes'] = options[:expected_codes] health_monitor['admin_state_up'] = options[:admin_state_up] - response.body = {'health_monitor' => health_monitor} + response.body = { 'health_monitor' => health_monitor } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lb_member.rb b/lib/fog/openstack/network/requests/update_lb_member.rb index c12aa1e98..68c66ee9f 100644 --- a/lib/fog/openstack/network/requests/update_lb_member.rb +++ b/lib/fog/openstack/network/requests/update_lb_member.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lb_member(member_id, options = {}) - data = {'member' => {}} + data = { 'member' => {} } vanilla_options = [:pool_id, :weight, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_lb_member(member_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lb/members/#{member_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lb/members/#{member_id}" ) end end @@ -26,7 +26,7 @@ def update_lb_member(member_id, options = {}) member['pool_id'] = options[:pool_id] member['weight'] = options[:weight] member['admin_state_up'] = options[:admin_state_up] - response.body = {'member' => member} + response.body = { 'member' => member } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lb_pool.rb b/lib/fog/openstack/network/requests/update_lb_pool.rb index 5bb101a04..2e8116d69 100644 --- a/lib/fog/openstack/network/requests/update_lb_pool.rb +++ b/lib/fog/openstack/network/requests/update_lb_pool.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lb_pool(pool_id, options = {}) - data = {'pool' => {}} + data = { 'pool' => {} } vanilla_options = [:name, :description, :lb_method, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_lb_pool(pool_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lb/pools/#{pool_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lb/pools/#{pool_id}" ) end end @@ -27,7 +27,7 @@ def update_lb_pool(pool_id, options = {}) pool['description'] = options[:description] pool['lb_method'] = options[:lb_method] pool['admin_state_up'] = options[:admin_state_up] - response.body = {'pool' => pool} + response.body = { 'pool' => pool } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lb_vip.rb b/lib/fog/openstack/network/requests/update_lb_vip.rb index 103f2bb5d..c9e5ef9fb 100644 --- a/lib/fog/openstack/network/requests/update_lb_vip.rb +++ b/lib/fog/openstack/network/requests/update_lb_vip.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lb_vip(vip_id, options = {}) - data = {'vip' => {}} + data = { 'vip' => {} } vanilla_options = [:pool_id, :name, :description, :session_persistence, :connection_limit, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_lb_vip(vip_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lb/vips/#{vip_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lb/vips/#{vip_id}" ) end end @@ -29,7 +29,7 @@ def update_lb_vip(vip_id, options = {}) vip['session_persistence'] = options[:session_persistence] vip['connection_limit'] = options[:connection_limit] vip['admin_state_up'] = options[:admin_state_up] - response.body = {'vip' => vip} + response.body = { 'vip' => vip } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb b/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb index 6289ad379..90f8e581a 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_healthmonitor.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lbaas_healthmonitor(healthmonitor_id, options = {}) - data = {'healthmonitor' => {}} + data = { 'healthmonitor' => {} } vanilla_options = [:name, :delay, :timeout, :max_retries, :http_method, :url_path, :expected_codes, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_lbaas_healthmonitor(healthmonitor_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lbaas/healthmonitors/#{healthmonitor_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lbaas/healthmonitors/#{healthmonitor_id}" ) end end @@ -30,7 +30,7 @@ def update_lbaas_healthmonitor(healthmonitor_id, options = {}) healthmonitor['url_path'] = options[:url_path] healthmonitor['expected_codes'] = options[:expected_codes] healthmonitor['admin_state_up'] = options[:admin_state_up] - response.body = {'healthmonitor' => healthmonitor} + response.body = { 'healthmonitor' => healthmonitor } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb b/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb index 2f17e8bf6..e0b66924c 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_l7policy.rb @@ -3,8 +3,7 @@ module OpenStack class Network class Real def update_lbaas_l7policy(l7policy_id, options = {}) - - data = {'l7policy' => {}} + data = { 'l7policy' => {} } vanilla_options = [:action, :name, :description, :redirect_pool_id, :redirect_url, :position] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -12,10 +11,10 @@ def update_lbaas_l7policy(l7policy_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "lbaas/l7policies/#{l7policy_id}" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "lbaas/l7policies/#{l7policy_id}" ) end end @@ -30,7 +29,7 @@ def update_lbaas_l7rule(l7policy_id, options = {}) l7policy['redirect_pool_id'] = options[:redirect_pool_id] l7policy['redirect_url'] = options[:redirect_url] l7policy['position'] = options[:position] - response.body = {'l7policy' => l7policy} + response.body = { 'l7policy' => l7policy } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb b/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb index c464c2e11..de6582662 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_l7rule.rb @@ -3,7 +3,6 @@ module OpenStack class Network class Real def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) - data = { 'rule' => {} } vanilla_options = [:type, :compare_type, :key, :value, :invert] @@ -12,16 +11,16 @@ def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "lbaas/l7policies/#{l7policy_id}/rules/#{l7rule_id}" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "lbaas/l7policies/#{l7policy_id}/rules/#{l7rule_id}" ) end end class Mock - def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) + def update_lbaas_l7rule(_l7policy_id, l7rule_id, options = {}) response = Excon::Response.new if l7rule = list_l7rules.body['l7rules'].find { |_| _['id'] == l7rule_id } l7rule['type'] = options[:type] @@ -29,7 +28,7 @@ def update_lbaas_l7rule(l7policy_id, l7rule_id, options = {}) l7rule['key'] = options[:key] l7rule['value'] = options[:value] l7rule['invert'] = options[:invert] - response.body = {'rule' => l7rule} + response.body = { 'rule' => l7rule } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_listener.rb b/lib/fog/openstack/network/requests/update_lbaas_listener.rb index 02b46fb77..5cb9540f2 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_listener.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_listener.rb @@ -3,7 +3,6 @@ module OpenStack class Network class Real def update_lbaas_listener(listener_id, options = {}) - data = { 'listener' => {} } vanilla_options = [:name, :description, :connection_limit, :default_tls_container_ref, :sni_container_refs, @@ -13,10 +12,10 @@ def update_lbaas_listener(listener_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lbaas/listeners/#{listener_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lbaas/listeners/#{listener_id}" ) end end @@ -28,10 +27,10 @@ def update_lbaas_listener(listener_id, options = {}) listener['name'] = options[:name] listener['description'] = options[:description] listener['connection_limit'] = options[:connection_limit] - listener['default_tls_container_ref'] = options[:default_tls_container_ref] + listener['default_tls_container_ref'] = options[:default_tls_container_ref] listener['sni_container_refs'] = options[:sni_container_refs] listener['admin_state_up'] = options[:admin_state_up] - response.body = {'listener' => listener} + response.body = { 'listener' => listener } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb b/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb index 8a6aeb255..9c61507a7 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_loadbalancer.rb @@ -4,7 +4,7 @@ class Network class Real def update_lbaas_loadbalancer(loadbalancer_id, options = {}) data = { - 'loadbalancer' => {} + 'loadbalancer' => {} } vanilla_options = [:name, :description, :admin_state_up] @@ -13,10 +13,10 @@ def update_lbaas_loadbalancer(loadbalancer_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lbaas/loadbalancers/#{loadbalancer_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lbaas/loadbalancers/#{loadbalancer_id}" ) end end @@ -28,7 +28,7 @@ def update_lbaas_loadbalancer(loadbalancer_id, options = {}) loadbalancer['name'] = options[:name] loadbalancer['description'] = options[:description] loadbalancer['admin_state_up'] = options[:admin_state_up] - response.body = {'loadbalancer' => loadbalancer} + response.body = { 'loadbalancer' => loadbalancer } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_pool.rb b/lib/fog/openstack/network/requests/update_lbaas_pool.rb index 9e4e30dd5..2eb26adff 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_pool.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_pool.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lbaas_pool(pool_id, options = {}) - data = {'pool' => {}} + data = { 'pool' => {} } vanilla_options = [:name, :description, :lb_algorithm, :session_persistence, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_lbaas_pool(pool_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lbaas/pools/#{pool_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lbaas/pools/#{pool_id}" ) end end @@ -27,7 +27,7 @@ def update_lbaas_pool(pool_id, options = {}) pool['description'] = options[:description] pool['lb_algorithm'] = options[:lb_algorithm] pool['admin_state_up'] = options[:admin_state_up] - response.body = {'pool' => pool} + response.body = { 'pool' => pool } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb b/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb index 78c0a5a13..94d155f9b 100644 --- a/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb +++ b/lib/fog/openstack/network/requests/update_lbaas_pool_member.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_lbaas_pool_member(pool_id, member_id, options = {}) - data = {'member' => {}} + data = { 'member' => {} } vanilla_options = [:weight, :admin_state_up, :name] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,22 +11,22 @@ def update_lbaas_pool_member(pool_id, member_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "lbaas/pools/#{pool_id}/members/#{member_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "lbaas/pools/#{pool_id}/members/#{member_id}" ) end end class Mock - def update_lbaas_pool_member(pool_id, member_id, options = {}) + def update_lbaas_pool_member(_pool_id, member_id, options = {}) response = Excon::Response.new if member = list_lbaas_pool_members.body['members'].find { |_| _['id'] == member_id } member['pool_id'] = options[:pool_id] member['weight'] = options[:weight] member['admin_state_up'] = options[:admin_state_up] - response.body = {'member' => member} + response.body = { 'member' => member } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_network.rb b/lib/fog/openstack/network/requests/update_network.rb index fa88d8d04..d03e87970 100644 --- a/lib/fog/openstack/network/requests/update_network.rb +++ b/lib/fog/openstack/network/requests/update_network.rb @@ -30,12 +30,12 @@ def self.update(options) end def update_network(network_id, options = {}) - data = {'network' => self.class.update(options)} + data = { 'network' => self.class.update(options) } request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "networks/#{network_id}.json" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "networks/#{network_id}.json" ) end end @@ -45,7 +45,7 @@ def update_network(network_id, options = {}) response = Excon::Response.new if network = list_networks.body['networks'].find { |_| _['id'] == network_id } network.merge!(Fog::OpenStack::Network::Real.update(options)) - response.body = {'network' => network} + response.body = { 'network' => network } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_port.rb b/lib/fog/openstack/network/requests/update_port.rb index b3ffcaed5..5fa9bdf15 100644 --- a/lib/fog/openstack/network/requests/update_port.rb +++ b/lib/fog/openstack/network/requests/update_port.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_port(port_id, options = {}) - data = {'port' => {}} + data = { 'port' => {} } vanilla_options = [:name, :fixed_ips, :admin_state_up, :device_owner, :device_id, :security_groups, :allowed_address_pairs] @@ -12,10 +12,10 @@ def update_port(port_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "ports/#{port_id}.json" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "ports/#{port_id}.json" ) end end @@ -31,7 +31,7 @@ def update_port(port_id, options = {}) port['device_id'] = options[:device_id] port['security_groups'] = options[:security_groups] || [] port['allowed_address_pairs'] = options[:allowed_address_pairs] || [] - response.body = {'port' => port} + response.body = { 'port' => port } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_quota.rb b/lib/fog/openstack/network/requests/update_quota.rb index 9d774b016..13c6cb153 100644 --- a/lib/fog/openstack/network/requests/update_quota.rb +++ b/lib/fog/openstack/network/requests/update_quota.rb @@ -4,10 +4,10 @@ class Network class Real def update_quota(tenant_id, options = {}) request( - :body => Fog::JSON.encode('quota' => options), - :expects => 200, - :method => 'PUT', - :path => "/quotas/#{tenant_id}" + body: Fog::JSON.encode('quota' => options), + expects: 200, + method: 'PUT', + path: "/quotas/#{tenant_id}" ) end end @@ -18,7 +18,7 @@ def update_quota(_tenant_id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'quota' => data[:quota_updated]} + response.body = { 'quota' => data[:quota_updated] } response end end diff --git a/lib/fog/openstack/network/requests/update_rbac_policy.rb b/lib/fog/openstack/network/requests/update_rbac_policy.rb index 98fd3483f..03c159442 100644 --- a/lib/fog/openstack/network/requests/update_rbac_policy.rb +++ b/lib/fog/openstack/network/requests/update_rbac_policy.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_rbac_policy(rbac_policy_id, options = {}) - data = {'rbac_policy' => {}} + data = { 'rbac_policy' => {} } vanilla_options = [:target_tenant] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_rbac_policy(rbac_policy_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "rbac-policies/#{rbac_policy_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "rbac-policies/#{rbac_policy_id}" ) end end @@ -28,7 +28,7 @@ def update_rbac_policy(rbac_policy_id, options = {}) if rbac_policy rbac_policy['target_tenant'] = options[:target_tenant] - response.body = {'rbac_policy' => rbac_policy} + response.body = { 'rbac_policy' => rbac_policy } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_router.rb b/lib/fog/openstack/network/requests/update_router.rb index cf76566cf..e3da0097d 100644 --- a/lib/fog/openstack/network/requests/update_router.rb +++ b/lib/fog/openstack/network/requests/update_router.rb @@ -9,7 +9,7 @@ class Real # the external gateway. # @see http://docs.openstack.org/api/openstack-network/2.0/content/router_update.html def update_router(router_id, options = {}) - data = {'router' => {}} + data = { 'router' => {} } [:name, :admin_state_up, :routes].each do |key| data['router'][key] = options[key] if options[key] @@ -21,7 +21,7 @@ def update_router(router_id, options = {}) if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" - data['router'][:external_gateway_info] = {:network_id => egi.id} + data['router'][:external_gateway_info] = { network_id: egi.id } elsif egi.kind_of?(Hash) data['router'][:external_gateway_info] = egi else @@ -30,10 +30,10 @@ def update_router(router_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "routers/#{router_id}.json" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "routers/#{router_id}.json" ) end end @@ -53,15 +53,15 @@ def update_router(router_id, options = {}) if egi.kind_of?(Fog::OpenStack::Network::Network) Fog::Logger.deprecation "Passing a model objects into options[:external_gateway_info] is deprecated. \ Please pass external external gateway as follows options[:external_gateway_info] = { :network_id => NETWORK_ID }]" - router[:external_gateway_info] = { :network_id => egi.id } + router[:external_gateway_info] = { network_id: egi.id } elsif egi.is_a?(Hash) router[:external_gateway_info] = egi else - raise ArgumentError.new('Invalid external_gateway_info attribute') + raise ArgumentError, 'Invalid external_gateway_info attribute' end end - response.body = {'router' => router} + response.body = { 'router' => router } response.status = 200 response end diff --git a/lib/fog/openstack/network/requests/update_security_group.rb b/lib/fog/openstack/network/requests/update_security_group.rb index 69824e119..ea4bb4013 100644 --- a/lib/fog/openstack/network/requests/update_security_group.rb +++ b/lib/fog/openstack/network/requests/update_security_group.rb @@ -3,17 +3,17 @@ module OpenStack class Network class Real def update_security_group(security_group_id, options = {}) - data = {'security_group' => {}} + data = { 'security_group' => {} } [:name, :description].each do |key| data['security_group'][key] = options[key] if options[key] end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "security-groups/#{security_group_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "security-groups/#{security_group_id}" ) end end @@ -28,7 +28,7 @@ def update_security_group(security_group_id, options = {}) if security_group security_group['name'] = options[:name] security_group['description'] = options[:description] - response.body = {'security_group' => security_group} + response.body = { 'security_group' => security_group } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_subnet.rb b/lib/fog/openstack/network/requests/update_subnet.rb index 11e886890..6afcc2c56 100644 --- a/lib/fog/openstack/network/requests/update_subnet.rb +++ b/lib/fog/openstack/network/requests/update_subnet.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_subnet(subnet_id, options = {}) - data = {'subnet' => {}} + data = { 'subnet' => {} } vanilla_options = [:name, :gateway_ip, :allocation_pools, :dns_nameservers, :host_routes, :enable_dhcp] @@ -12,10 +12,10 @@ def update_subnet(subnet_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "subnets/#{subnet_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "subnets/#{subnet_id}" ) end end @@ -30,7 +30,7 @@ def update_subnet(subnet_id, options = {}) subnet['host_routes'] = options[:host_routes] || [] subnet['allocation_pools'] = options[:allocation_pools] || [] subnet['enable_dhcp'] = options[:enable_dhcp] - response.body = {'subnet' => subnet} + response.body = { 'subnet' => subnet } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_subnet_pool.rb b/lib/fog/openstack/network/requests/update_subnet_pool.rb index 8833a2568..294e484cc 100644 --- a/lib/fog/openstack/network/requests/update_subnet_pool.rb +++ b/lib/fog/openstack/network/requests/update_subnet_pool.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_subnet_pool(subnet_pool_id, options = {}) - data = {'subnetpool' => {}} + data = { 'subnetpool' => {} } vanilla_options = [:name, :description, :prefixes, :address_scope_id, :min_prefixlen, :max_prefixlen, :default_prefixlen] @@ -12,10 +12,10 @@ def update_subnet_pool(subnet_pool_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "subnetpools/#{subnet_pool_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "subnetpools/#{subnet_pool_id}" ) end end @@ -33,7 +33,7 @@ def update_subnet_pool(subnet_pool_id, options = {}) subnet_pool['address_scope_id'] = options[:address_scope_id] subnet_pool['updated_at'] = Time.now.to_s response = Excon::Response.new - response.body = {'subnetpool' => subnet_pool} + response.body = { 'subnetpool' => subnet_pool } response.status = 200 response else diff --git a/lib/fog/openstack/network/requests/update_vpn_service.rb b/lib/fog/openstack/network/requests/update_vpn_service.rb index 8a65c83b9..f34f860e7 100644 --- a/lib/fog/openstack/network/requests/update_vpn_service.rb +++ b/lib/fog/openstack/network/requests/update_vpn_service.rb @@ -3,7 +3,7 @@ module OpenStack class Network class Real def update_vpn_service(vpn_service_id, options = {}) - data = {'vpnservice' => {}} + data = { 'vpnservice' => {} } vanilla_options = [:name, :description, :admin_state_up] vanilla_options.select { |o| options.key?(o) }.each do |key| @@ -11,10 +11,10 @@ def update_vpn_service(vpn_service_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => 'PUT', - :path => "vpn/vpnservices/#{vpn_service_id}" + body: Fog::JSON.encode(data), + expects: 200, + method: 'PUT', + path: "vpn/vpnservices/#{vpn_service_id}" ) end end @@ -33,7 +33,7 @@ def update_vpn_service(vpn_service_id, options = {}) vpn_service['tenant_id'] = options[:tenant_id] vpn_service['external_v4_ip'] = '1.2.3.4' vpn_service['external_v6_ip'] = '::1' - response.body = {'vpnservice' => vpn_service} + response.body = { 'vpnservice' => vpn_service } response.status = 200 response else diff --git a/lib/fog/openstack/nfv.rb b/lib/fog/openstack/nfv.rb index b0cd206fc..79c2abe19 100644 --- a/lib/fog/openstack/nfv.rb +++ b/lib/fog/openstack/nfv.rb @@ -3,7 +3,7 @@ module Fog module OpenStack class NFV < Fog::Service - SUPPORTED_VERSIONS = /v1.0/ + SUPPORTED_VERSIONS = /v1.0/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -46,28 +46,28 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :vnfs => [ + vnfs: [ { - "status" => "ACTIVE", + "status" => "ACTIVE", "description" => "demo-example", - "tenant_id" => "943b6ff8229a4ec2bed0a306f869a0ea", + "tenant_id" => "943b6ff8229a4ec2bed0a306f869a0ea", "instance_id" => "5a9a7d3b-24f5-4226-8d43-262972a1776e", - "mgmt_url" => "{\"vdu1\": \"192.168.0.8\"}", - "attributes" => {"monitoring_policy" => "{\"vdus\": {}}"}, - "id" => "cb4cdbd8-cf1a-4758-8d36-40db788a37a1", - "name" => "LadasTest" + "mgmt_url" => "{\"vdu1\": \"192.168.0.8\"}", + "attributes" => { "monitoring_policy" => "{\"vdus\": {}}" }, + "id" => "cb4cdbd8-cf1a-4758-8d36-40db788a37a1", + "name" => "LadasTest" } ], - :vnfds => [ + vnfds: [ { - "service_types" => [{"service_type" => "vnfd", "id" => "f9211d81-b58a-4849-8d38-e25376c421bd"}], - "description" => "demo-example", - "tenant_id" => "943b6ff8229a4ec2bed0a306f869a0ea", - "mgmt_driver" => "noop", - "infra_driver" => "heat", - "attributes" => {"vnfd" => "template_name: sample-vnfd"}, - "id" => "1f8f33cf-8c94-427e-a040-f3e393b773b7", - "name" => "sample-vnfd" + "service_types" => [{ "service_type" => "vnfd", "id" => "f9211d81-b58a-4849-8d38-e25376c421bd" }], + "description" => "demo-example", + "tenant_id" => "943b6ff8229a4ec2bed0a306f869a0ea", + "mgmt_driver" => "noop", + "infra_driver" => "heat", + "attributes" => { "vnfd" => "template_name: sample-vnfd" }, + "id" => "1f8f33cf-8c94-427e-a040-f3e393b773b7", + "name" => "sample-vnfd" } ] } @@ -80,7 +80,7 @@ def self.reset include Fog::OpenStack::Core - def initialize(options = {}) + def initialize(_options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86_400).iso8601 end diff --git a/lib/fog/openstack/nfv/models/vnf.rb b/lib/fog/openstack/nfv/models/vnf.rb index 8229f4992..9dcbc0fe3 100644 --- a/lib/fog/openstack/nfv/models/vnf.rb +++ b/lib/fog/openstack/nfv/models/vnf.rb @@ -40,8 +40,8 @@ def destroy def default_options { - :vnf => vnf, - :auth => auth + vnf: vnf, + auth: auth } end diff --git a/lib/fog/openstack/nfv/models/vnfd.rb b/lib/fog/openstack/nfv/models/vnfd.rb index ebcda3ec1..4cf4d8549 100644 --- a/lib/fog/openstack/nfv/models/vnfd.rb +++ b/lib/fog/openstack/nfv/models/vnfd.rb @@ -39,8 +39,8 @@ def destroy def default_options { - :vnfd => vnfd, - :auth => auth + vnfd: vnfd, + auth: auth } end diff --git a/lib/fog/openstack/nfv/requests/create_vnf.rb b/lib/fog/openstack/nfv/requests/create_vnf.rb index ca6220d8e..d097090f3 100644 --- a/lib/fog/openstack/nfv/requests/create_vnf.rb +++ b/lib/fog/openstack/nfv/requests/create_vnf.rb @@ -5,7 +5,7 @@ class Real def create_vnf(options) options_valid = [ :auth, - :vnf, + :vnf ] # Filter only allowed creation attributes @@ -14,10 +14,10 @@ def create_vnf(options) end request( - :body => Fog::JSON.encode(data), - :expects => 201, - :method => "POST", - :path => "vnfs" + body: Fog::JSON.encode(data), + expects: 201, + method: "POST", + path: "vnfs" ) end end @@ -28,7 +28,7 @@ def create_vnf(_) response.status = 201 create_data = data[:vnfs].first.merge("vnfd_id" => "id") - response.body = {"vnf" => create_data} + response.body = { "vnf" => create_data } response end end diff --git a/lib/fog/openstack/nfv/requests/create_vnfd.rb b/lib/fog/openstack/nfv/requests/create_vnfd.rb index 3cc9f441d..4cbf2cbaf 100644 --- a/lib/fog/openstack/nfv/requests/create_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/create_vnfd.rb @@ -5,7 +5,7 @@ class Real def create_vnfd(options) options_valid = [ :auth, - :vnfd, + :vnfd ] # Filter only allowed creation attributes @@ -14,10 +14,10 @@ def create_vnfd(options) end request( - :body => Fog::JSON.encode(data), - :expects => 201, - :method => "POST", - :path => "vnfds" + body: Fog::JSON.encode(data), + expects: 201, + method: "POST", + path: "vnfds" ) end end @@ -26,7 +26,7 @@ class Mock def create_vnfd(_) response = Excon::Response.new response.status = 201 - response.body = {"vnfd" => data[:vnfds].first} + response.body = { "vnfd" => data[:vnfds].first } response end end diff --git a/lib/fog/openstack/nfv/requests/delete_vnf.rb b/lib/fog/openstack/nfv/requests/delete_vnf.rb index 979c6cfa3..f41b94c4e 100644 --- a/lib/fog/openstack/nfv/requests/delete_vnf.rb +++ b/lib/fog/openstack/nfv/requests/delete_vnf.rb @@ -4,9 +4,9 @@ class NFV class Real def delete_vnf(vnf_id) request( - :expects => 204, - :method => "DELETE", - :path => "vnfs/#{vnf_id}" + expects: 204, + method: "DELETE", + path: "vnfs/#{vnf_id}" ) end end diff --git a/lib/fog/openstack/nfv/requests/delete_vnfd.rb b/lib/fog/openstack/nfv/requests/delete_vnfd.rb index f8d1ec581..5fab9d336 100644 --- a/lib/fog/openstack/nfv/requests/delete_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/delete_vnfd.rb @@ -4,9 +4,9 @@ class NFV class Real def delete_vnfd(vnfd_id) request( - :expects => 204, - :method => "DELETE", - :path => "vnfds/#{vnfd_id}" + expects: 204, + method: "DELETE", + path: "vnfds/#{vnfd_id}" ) end end diff --git a/lib/fog/openstack/nfv/requests/get_vnf.rb b/lib/fog/openstack/nfv/requests/get_vnf.rb index 62a7df092..3da02adc2 100644 --- a/lib/fog/openstack/nfv/requests/get_vnf.rb +++ b/lib/fog/openstack/nfv/requests/get_vnf.rb @@ -4,9 +4,9 @@ class NFV class Real def get_vnf(vnf_id) request( - :expects => 200, - :method => 'GET', - :path => "vnfs/#{vnf_id}" + expects: 200, + method: 'GET', + path: "vnfs/#{vnf_id}" ) end end @@ -15,7 +15,7 @@ class Mock def get_vnf(_vnf_id) response = Excon::Response.new response.status = 200 - response.body = {"vnf" => data[:vnfs].first} + response.body = { "vnf" => data[:vnfs].first } response end end diff --git a/lib/fog/openstack/nfv/requests/get_vnfd.rb b/lib/fog/openstack/nfv/requests/get_vnfd.rb index 5e47de284..66df9070d 100644 --- a/lib/fog/openstack/nfv/requests/get_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/get_vnfd.rb @@ -4,9 +4,9 @@ class NFV class Real def get_vnfd(vnfd_id) request( - :expects => 200, - :method => 'GET', - :path => "vnfds/#{vnfd_id}" + expects: 200, + method: 'GET', + path: "vnfds/#{vnfd_id}" ) end end @@ -15,7 +15,7 @@ class Mock def get_vnfd(_vnfd_id) response = Excon::Response.new response.status = 200 - response.body = {"vnfd" => data[:vnfds].first} + response.body = { "vnfd" => data[:vnfds].first } response end end diff --git a/lib/fog/openstack/nfv/requests/list_vnfds.rb b/lib/fog/openstack/nfv/requests/list_vnfds.rb index f1a7793ed..3861c1985 100644 --- a/lib/fog/openstack/nfv/requests/list_vnfds.rb +++ b/lib/fog/openstack/nfv/requests/list_vnfds.rb @@ -4,10 +4,10 @@ class NFV class Real def list_vnfds(options = {}) request( - :expects => 200, - :method => 'GET', - :path => "vnfds", - :query => options + expects: 200, + method: 'GET', + path: "vnfds", + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_vnfds(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {"vnfds" => data[:vnfds]} + response.body = { "vnfds" => data[:vnfds] } response end end diff --git a/lib/fog/openstack/nfv/requests/list_vnfs.rb b/lib/fog/openstack/nfv/requests/list_vnfs.rb index a89b6723e..792ff149a 100644 --- a/lib/fog/openstack/nfv/requests/list_vnfs.rb +++ b/lib/fog/openstack/nfv/requests/list_vnfs.rb @@ -4,10 +4,10 @@ class NFV class Real def list_vnfs(options = {}) request( - :expects => 200, - :method => 'GET', - :path => "vnfs", - :query => options + expects: 200, + method: 'GET', + path: "vnfs", + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_vnfs(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {"vnfs" => data[:vnfs]} + response.body = { "vnfs" => data[:vnfs] } response end end diff --git a/lib/fog/openstack/nfv/requests/update_vnf.rb b/lib/fog/openstack/nfv/requests/update_vnf.rb index 47d1fcde8..605c25a10 100644 --- a/lib/fog/openstack/nfv/requests/update_vnf.rb +++ b/lib/fog/openstack/nfv/requests/update_vnf.rb @@ -5,7 +5,7 @@ class Real def update_vnf(id, options) options_valid = [ :auth, - :vnf, + :vnf ] # Filter only allowed creation attributes @@ -14,10 +14,10 @@ def update_vnf(id, options) end request( - :body => Fog::JSON.encode(data), - :expects => 200, - :method => "PUT", - :path => "vnfs/#{id}" + body: Fog::JSON.encode(data), + expects: 200, + method: "PUT", + path: "vnfs/#{id}" ) end end @@ -26,7 +26,7 @@ class Mock def update_vnf(_, _) response = Excon::Response.new response.status = 200 - response.body = {"vnf" => data[:vnfs].first} + response.body = { "vnf" => data[:vnfs].first } response end end diff --git a/lib/fog/openstack/orchestration.rb b/lib/fog/openstack/orchestration.rb index 8542a7760..7d8438c6a 100644 --- a/lib/fog/openstack/orchestration.rb +++ b/lib/fog/openstack/orchestration.rb @@ -54,7 +54,7 @@ class Orchestration < Fog::Service request :cancel_update module Reflectable - REFLECTION_REGEX = /\/stacks\/(\w+)\/([\w|-]+)\/resources\/(\w+)/ + REFLECTION_REGEX = %r{/stacks/(\w+)/([\w|-]+)/resources/(\w+)}.freeze def resource @resource ||= service.resources.get(r[3], stack) @@ -81,7 +81,7 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :stacks => {} + stacks: {} } end end @@ -114,10 +114,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end diff --git a/lib/fog/openstack/orchestration/models/stack.rb b/lib/fog/openstack/orchestration/models/stack.rb index 7c54a6e33..7ef6e3a47 100644 --- a/lib/fog/openstack/orchestration/models/stack.rb +++ b/lib/fog/openstack/orchestration/models/stack.rb @@ -15,7 +15,7 @@ class Stack < Fog::OpenStack::Model def save(options = {}) if persisted? stack_default_options = default_options - if (options.key?(:template_url)) + if options.key?(:template_url) stack_default_options.delete(:template) end service.update_stack(self, stack_default_options.merge(options)).body['stack'] @@ -53,7 +53,7 @@ def details end def resources(options = {}) - @resources ||= service.resources.all({:stack => self}.merge(options)) + @resources ||= service.resources.all({ stack: self }.merge(options)) end def events(options = {}) @@ -112,9 +112,9 @@ def default_options end options = { - :stack_name => stack_name, - :disable_rollback => disable_rollback, - :timeout_mins => timeout_mins + stack_name: stack_name, + disable_rollback: disable_rollback, + timeout_mins: timeout_mins } options[:template] = template_content if template_content options[:template_url] = @template_url if @template_url diff --git a/lib/fog/openstack/orchestration/requests/abandon_stack.rb b/lib/fog/openstack/orchestration/requests/abandon_stack.rb index c0a8a0f44..3c7ef6344 100644 --- a/lib/fog/openstack/orchestration/requests/abandon_stack.rb +++ b/lib/fog/openstack/orchestration/requests/abandon_stack.rb @@ -4,9 +4,9 @@ class Orchestration class Real def abandon_stack(stack) request( - :expects => [200], - :method => 'DELETE', - :path => "stacks/#{stack.stack_name}/#{stack.id}/abandon" + expects: [200], + method: 'DELETE', + path: "stacks/#{stack.stack_name}/#{stack.id}/abandon" ) end end diff --git a/lib/fog/openstack/orchestration/requests/build_info.rb b/lib/fog/openstack/orchestration/requests/build_info.rb index cb0ae3482..d0ef9d2c1 100644 --- a/lib/fog/openstack/orchestration/requests/build_info.rb +++ b/lib/fog/openstack/orchestration/requests/build_info.rb @@ -4,9 +4,9 @@ class Orchestration class Real def build_info request( - :expects => [200], - :method => 'GET', - :path => 'build_info' + expects: [200], + method: 'GET', + path: 'build_info' ) end end diff --git a/lib/fog/openstack/orchestration/requests/cancel_update.rb b/lib/fog/openstack/orchestration/requests/cancel_update.rb index 878326cd2..521bc2725 100644 --- a/lib/fog/openstack/orchestration/requests/cancel_update.rb +++ b/lib/fog/openstack/orchestration/requests/cancel_update.rb @@ -1,14 +1,15 @@ # frozen_string_literal: true + module Fog module OpenStack class Orchestration class Real def cancel_update(stack) request( - :expects => 200, - :method => 'POST', - :path => "stacks/#{stack.stack_name}/#{stack.id}/actions", - :body => Fog::JSON.encode('cancel_update' => nil) + expects: 200, + method: 'POST', + path: "stacks/#{stack.stack_name}/#{stack.id}/actions", + body: Fog::JSON.encode('cancel_update' => nil) ) end end diff --git a/lib/fog/openstack/orchestration/requests/create_stack.rb b/lib/fog/openstack/orchestration/requests/create_stack.rb index 9377719fc..1b84c1f72 100644 --- a/lib/fog/openstack/orchestration/requests/create_stack.rb +++ b/lib/fog/openstack/orchestration/requests/create_stack.rb @@ -25,7 +25,7 @@ def create_stack(arg1, arg2 = nil) # Deprecated: create_stack(stack_name, options = {}) Fog::Logger.deprecation("#create_stack(stack_name, options) is deprecated, use #create_stack(options) instead [light_black](#{caller.first})[/]") options = { - :stack_name => arg1 + stack_name: arg1 }.merge(arg2.nil? ? {} : arg2) end @@ -42,10 +42,10 @@ def create_stack(arg1, arg2 = nil) options[:files] = file_resolver.files unless file_resolver.files.empty? request( - :expects => 201, - :path => 'stacks', - :method => 'POST', - :body => Fog::JSON.encode(options) + expects: 201, + path: 'stacks', + method: 'POST', + body: Fog::JSON.encode(options) ) end end @@ -59,31 +59,31 @@ def create_stack(arg1, arg2 = nil) # Deprecated: create_stack(stack_name, options = {}) Fog::Logger.deprecation("#create_stack(stack_name, options) is deprecated, use #create_stack(options) instead [light_black](#{caller.first})[/]") options = { - :stack_name => arg1 + stack_name: arg1 }.merge(arg2.nil? ? {} : arg2) end stack_id = Fog::Mock.random_hex(32) stack = data[:stacks][stack_id] = { - 'id' => stack_id, - 'stack_name' => options[:stack_name], - 'links' => [], - 'description' => options[:description], - 'stack_status' => 'CREATE_COMPLETE', + 'id' => stack_id, + 'stack_name' => options[:stack_name], + 'links' => [], + 'description' => options[:description], + 'stack_status' => 'CREATE_COMPLETE', 'stack_status_reason' => 'Stack successfully created', - 'creation_time' => Time.now, - 'updated_time' => Time.now + 'creation_time' => Time.now, + 'updated_time' => Time.now } response = Excon::Response.new response.status = 201 response.body = { - 'id' => stack_id, - 'links' => [{"href" => "http://localhost:8004/v1/fake_tenant_id/stacks/#{options[:stack_name]}/#{stack_id}", "rel" => "self"}] + 'id' => stack_id, + 'links' => [{ "href" => "http://localhost:8004/v1/fake_tenant_id/stacks/#{options[:stack_name]}/#{stack_id}", "rel" => "self" }] } if options.key?(:files) - response.body['files'] = {'foo.sh' => 'hello'} + response.body['files'] = { 'foo.sh' => 'hello' } end if options.key?(:template) || options.key?(:template_url) diff --git a/lib/fog/openstack/orchestration/requests/delete_stack.rb b/lib/fog/openstack/orchestration/requests/delete_stack.rb index ba2e917aa..dd0b510fe 100644 --- a/lib/fog/openstack/orchestration/requests/delete_stack.rb +++ b/lib/fog/openstack/orchestration/requests/delete_stack.rb @@ -24,9 +24,9 @@ def delete_stack(arg1, arg2 = nil) end request( - :expects => 204, - :path => "stacks/#{stack_name}/#{stack_id}", - :method => 'DELETE' + expects: 204, + path: "stacks/#{stack_name}/#{stack_id}", + method: 'DELETE' ) end end diff --git a/lib/fog/openstack/orchestration/requests/get_stack_template.rb b/lib/fog/openstack/orchestration/requests/get_stack_template.rb index b053a5150..884e73c2b 100644 --- a/lib/fog/openstack/orchestration/requests/get_stack_template.rb +++ b/lib/fog/openstack/orchestration/requests/get_stack_template.rb @@ -4,16 +4,15 @@ class Orchestration class Real def get_stack_template(stack) request( - :method => 'GET', - :path => "stacks/#{stack.stack_name}/#{stack.id}/template", - :expects => 200 + method: 'GET', + path: "stacks/#{stack.stack_name}/#{stack.id}/template", + expects: 200 ) end end class Mock - def get_stack_template(stack) - end + def get_stack_template(stack); end end end end diff --git a/lib/fog/openstack/orchestration/requests/list_events.rb b/lib/fog/openstack/orchestration/requests/list_events.rb index 1dedd2f1c..e0d63777e 100644 --- a/lib/fog/openstack/orchestration/requests/list_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_events.rb @@ -24,10 +24,10 @@ def list_events(options = {}) "stacks/#{stack_name}/#{stack_id}/events" end - request(:method => 'GET', - :path => path, - :expects => 200, - :query => options) + request(method: 'GET', + path: path, + expects: 200, + query: options) end end @@ -36,8 +36,8 @@ def list_events(_options = {}) events = data[:events].values Excon::Response.new( - :body => {'events' => events}, - :status => 200 + body: { 'events' => events }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/list_resource_events.rb b/lib/fog/openstack/orchestration/requests/list_resource_events.rb index d82e77a7b..45ac73ea8 100644 --- a/lib/fog/openstack/orchestration/requests/list_resource_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_resource_events.rb @@ -9,7 +9,7 @@ def list_resource_events(stack, resource, options = {}) ' instead') uri = "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource.resource_name}/events" - request(:method => 'GET', :path => uri, :expects => 200, :query => options) + request(method: 'GET', path: uri, expects: 200, query: options) end end @@ -18,8 +18,8 @@ def list_resource_events(_stack, _resource, _options = {}) events = data[:events].values Excon::Response.new( - :body => {'events' => events}, - :status => 200 + body: { 'events' => events }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/list_resource_types.rb b/lib/fog/openstack/orchestration/requests/list_resource_types.rb index 7de2aef4b..33cd97976 100644 --- a/lib/fog/openstack/orchestration/requests/list_resource_types.rb +++ b/lib/fog/openstack/orchestration/requests/list_resource_types.rb @@ -4,10 +4,10 @@ class Orchestration class Real def list_resource_types(_options = {}) request( - :method => 'GET', - :path => "resource_types", - :expects => 200, - :query => {} + method: 'GET', + path: "resource_types", + expects: 200, + query: {} ) end end @@ -17,8 +17,8 @@ def list_resource_types resources = data[:resource_types].values Excon::Response.new( - :body => {'resource_types' => resources}, - :status => 200 + body: { 'resource_types' => resources }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/list_resources.rb b/lib/fog/openstack/orchestration/requests/list_resources.rb index e8826638c..e62b8c11e 100644 --- a/lib/fog/openstack/orchestration/requests/list_resources.rb +++ b/lib/fog/openstack/orchestration/requests/list_resources.rb @@ -24,10 +24,10 @@ def list_resources(options = {}, options_deprecated = {}) params = options_deprecated end - request(:method => 'GET', - :path => path, - :expects => 200, - :query => params) + request(method: 'GET', + path: path, + expects: 200, + query: params) end end @@ -36,8 +36,8 @@ def list_resources(_options = {}, _options_deprecated = {}) resources = data[:resources].values Excon::Response.new( - :body => {'resources' => resources}, - :status => 200 + body: { 'resources' => resources }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/list_stack_data.rb b/lib/fog/openstack/orchestration/requests/list_stack_data.rb index b5d12a8ef..b86dcd2c7 100644 --- a/lib/fog/openstack/orchestration/requests/list_stack_data.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_data.rb @@ -4,10 +4,10 @@ class Orchestration class Real def list_stack_data(options = {}) request( - :method => 'GET', - :path => 'stacks', - :expects => 200, - :query => options + method: 'GET', + path: 'stacks', + expects: 200, + query: options ) end end @@ -17,8 +17,8 @@ def list_stack_data(_options = {}) stacks = data[:stacks].values Excon::Response.new( - :body => {'stacks' => stacks}, - :status => 200 + body: { 'stacks' => stacks }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb b/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb index 1bf382733..68e2864f1 100644 --- a/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_data_detailed.rb @@ -4,10 +4,10 @@ class Orchestration class Real def list_stack_data_detailed(options = {}) request( - :method => 'GET', - :path => 'stacks/detail', - :expects => 200, - :query => options + method: 'GET', + path: 'stacks/detail', + expects: 200, + query: options ) end end @@ -15,32 +15,32 @@ def list_stack_data_detailed(options = {}) class Mock def list_stack_data_detailed(_options = {}) Excon::Response.new( - :body => { + body: { 'stacks' => - [{"parent" => nil, - "disable_rollback" => true, - "description" => "No description", - "links" => [{"href" => "http://192.0.2.1:8004/v1/ae084f19a7974d5b95703f633e57fd64/stacks/overcloud/9ea5226f-0bb3-40bf-924b-f89ea11bb69c", - "rel" => "self"}], - "stack_status_reason" => "Stack CREATE completed successfully", - "stack_name" => "overcloud", - "stack_user_project_id" => "ae084f19a7974d5b95703f633e57fd64", - "stack_owner" => "admin", - "creation_time" => "2015-06-24T07:19:01Z", - "capabilities" => [], - "notification_topics" => [], - "updated_time" => nil, - "timeout_mins" => nil, - "stack_status" => "CREATE_COMPLETE", - "parameters" => {"Controller-1::SSLKey" => "******", - "Compute-1::RabbitClientUseSSL" => "False", - "Controller-1::KeystoneSSLCertificate" => "", - "Controller-1::CinderLVMLoopDeviceSize" => "5000"}, - "id" => "9ea5226f-0bb3-40bf-924b-f89ea11bb69c", - "outputs" => [], - "template_description" => "No description"}] + [{ "parent" => nil, + "disable_rollback" => true, + "description" => "No description", + "links" => [{ "href" => "http://192.0.2.1:8004/v1/ae084f19a7974d5b95703f633e57fd64/stacks/overcloud/9ea5226f-0bb3-40bf-924b-f89ea11bb69c", + "rel" => "self" }], + "stack_status_reason" => "Stack CREATE completed successfully", + "stack_name" => "overcloud", + "stack_user_project_id" => "ae084f19a7974d5b95703f633e57fd64", + "stack_owner" => "admin", + "creation_time" => "2015-06-24T07:19:01Z", + "capabilities" => [], + "notification_topics" => [], + "updated_time" => nil, + "timeout_mins" => nil, + "stack_status" => "CREATE_COMPLETE", + "parameters" => { "Controller-1::SSLKey" => "******", + "Compute-1::RabbitClientUseSSL" => "False", + "Controller-1::KeystoneSSLCertificate" => "", + "Controller-1::CinderLVMLoopDeviceSize" => "5000" }, + "id" => "9ea5226f-0bb3-40bf-924b-f89ea11bb69c", + "outputs" => [], + "template_description" => "No description" }] }, - :status => 200 + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/list_stack_events.rb b/lib/fog/openstack/orchestration/requests/list_stack_events.rb index 61d9979cb..45e49f729 100644 --- a/lib/fog/openstack/orchestration/requests/list_stack_events.rb +++ b/lib/fog/openstack/orchestration/requests/list_stack_events.rb @@ -8,7 +8,7 @@ def list_stack_events(stack, options = {}) ' .list_events(:stack_name => value, :stack_id => value) instead') uri = "stacks/#{stack.stack_name}/#{stack.id}/events" - request(:method => 'GET', :path => uri, :expects => 200, :query => options) + request(method: 'GET', path: uri, expects: 200, query: options) end end @@ -17,8 +17,8 @@ def list_stack_events(_stack, _options = {}) events = data[:events].values Excon::Response.new( - :body => {'events' => events}, - :status => 200 + body: { 'events' => events }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/patch_stack.rb b/lib/fog/openstack/orchestration/requests/patch_stack.rb index 2a25511a5..bc20deb85 100644 --- a/lib/fog/openstack/orchestration/requests/patch_stack.rb +++ b/lib/fog/openstack/orchestration/requests/patch_stack.rb @@ -16,10 +16,10 @@ def patch_stack(stack, options = {}) stack_id = stack.id request( - :expects => 202, - :path => "stacks/#{stack_name}/#{stack_id}", - :method => 'PATCH', - :body => Fog::JSON.encode(options) + expects: 202, + path: "stacks/#{stack_name}/#{stack_id}", + method: 'PATCH', + body: Fog::JSON.encode(options) ) end end diff --git a/lib/fog/openstack/orchestration/requests/preview_stack.rb b/lib/fog/openstack/orchestration/requests/preview_stack.rb index 440ed4da4..cd03e14f6 100644 --- a/lib/fog/openstack/orchestration/requests/preview_stack.rb +++ b/lib/fog/openstack/orchestration/requests/preview_stack.rb @@ -4,10 +4,10 @@ class Orchestration class Real def preview_stack(options = {}) request( - :body => Fog::JSON.encode(options), - :expects => [200], - :method => 'POST', - :path => 'stacks/preview' + body: Fog::JSON.encode(options), + expects: [200], + method: 'POST', + path: 'stacks/preview' ) end end diff --git a/lib/fog/openstack/orchestration/requests/show_event_details.rb b/lib/fog/openstack/orchestration/requests/show_event_details.rb index 739666e43..5ccf8901a 100644 --- a/lib/fog/openstack/orchestration/requests/show_event_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_event_details.rb @@ -4,9 +4,9 @@ class Orchestration class Real def show_event_details(stack, resource, event_id) request( - :method => 'GET', - :path => "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource.resource_name}/events/#{event_id}", - :expects => 200 + method: 'GET', + path: "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource.resource_name}/events/#{event_id}", + expects: 200 ) end end @@ -16,8 +16,8 @@ def show_event_details(_stack, _event) events = data[:events].values Excon::Response.new( - :body => {'events' => events}, - :status => 200 + body: { 'events' => events }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/show_resource_data.rb b/lib/fog/openstack/orchestration/requests/show_resource_data.rb index 9225efd5d..d825c6022 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_data.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_data.rb @@ -4,9 +4,9 @@ class Orchestration class Real def show_resource_data(stack_name, stack_id, resource_name) request( - :method => 'GET', - :path => "stacks/#{stack_name}/#{stack_id}/resources/#{resource_name}", - :expects => 200 + method: 'GET', + path: "stacks/#{stack_name}/#{stack_id}/resources/#{resource_name}", + expects: 200 ) end end @@ -16,8 +16,8 @@ def show_resource_data(_stack_name, _stack_id, _resource_name) resources = data[:resources].values Excon::Response.new( - :body => {'resources' => resources}, - :status => 200 + body: { 'resources' => resources }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb b/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb index 486259bfc..48c18b073 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_metadata.rb @@ -4,9 +4,9 @@ class Orchestration class Real def show_resource_metadata(stack, resource_name) request( - :method => 'GET', - :path => "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource_name}/metadata", - :expects => 200 + method: 'GET', + path: "stacks/#{stack.stack_name}/#{stack.id}/resources/#{resource_name}/metadata", + expects: 200 ) end end @@ -16,8 +16,8 @@ def show_resource_metadata(_stack, _resource_name) resources = data[:resources].values Excon::Response.new( - :body => {'resources' => resources}, - :status => 200 + body: { 'resources' => resources }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/show_resource_schema.rb b/lib/fog/openstack/orchestration/requests/show_resource_schema.rb index 7df1b5fe3..7287570b1 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_schema.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_schema.rb @@ -4,9 +4,9 @@ class Orchestration class Real def show_resource_schema(name) request( - :method => 'GET', - :path => "resource_types/#{name}", - :expects => 200 + method: 'GET', + path: "resource_types/#{name}", + expects: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/show_resource_template.rb b/lib/fog/openstack/orchestration/requests/show_resource_template.rb index 496cbe568..04594930a 100644 --- a/lib/fog/openstack/orchestration/requests/show_resource_template.rb +++ b/lib/fog/openstack/orchestration/requests/show_resource_template.rb @@ -4,16 +4,15 @@ class Orchestration class Real def show_resource_template(name) request( - :method => 'GET', - :path => "resource_types/#{name}/template", - :expects => 200 + method: 'GET', + path: "resource_types/#{name}/template", + expects: 200 ) end end class Mock - def show_resource_template(name) - end + def show_resource_template(name); end end end end diff --git a/lib/fog/openstack/orchestration/requests/show_stack_details.rb b/lib/fog/openstack/orchestration/requests/show_stack_details.rb index 3568a669e..b5a1a14cd 100644 --- a/lib/fog/openstack/orchestration/requests/show_stack_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_stack_details.rb @@ -4,9 +4,9 @@ class Orchestration class Real def show_stack_details(name, id) request( - :method => 'GET', - :path => "stacks/#{name}/#{id}", - :expects => 200 + method: 'GET', + path: "stacks/#{name}/#{id}", + expects: 200 ) end end @@ -16,8 +16,8 @@ def show_stack_details(_name, _id) stack = data[:stack].values Excon::Response.new( - :body => {'stack' => stack}, - :status => 200 + body: { 'stack' => stack }, + status: 200 ) end end diff --git a/lib/fog/openstack/orchestration/requests/update_stack.rb b/lib/fog/openstack/orchestration/requests/update_stack.rb index 585a7f63f..14ee0fa50 100644 --- a/lib/fog/openstack/orchestration/requests/update_stack.rb +++ b/lib/fog/openstack/orchestration/requests/update_stack.rb @@ -25,7 +25,7 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) stack_id = arg1 stack_name = arg2 options = { - :stack_name => stack_name + stack_name: stack_name }.merge(arg3.nil? ? {} : arg3) end @@ -42,10 +42,10 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) options[:files] = file_resolver.files unless file_resolver.files.empty? request( - :expects => 202, - :path => "stacks/#{stack_name}/#{stack_id}", - :method => 'PUT', - :body => Fog::JSON.encode(options) + expects: 202, + path: "stacks/#{stack_name}/#{stack_id}", + method: 'PUT', + body: Fog::JSON.encode(options) ) end end @@ -64,12 +64,12 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) stack_id = arg1 stack_name = arg2 options = { - :stack_name => stack_name + stack_name: stack_name }.merge(arg3.nil? ? {} : arg3) end if options.key?(:files) - response.body['files'] = {'foo.sh' => 'hello'} + response.body['files'] = { 'foo.sh' => 'hello' } end if options.key?(:template) || options.key?(:template_url) diff --git a/lib/fog/openstack/orchestration/requests/validate_template.rb b/lib/fog/openstack/orchestration/requests/validate_template.rb index c0c962376..5c4d76bab 100644 --- a/lib/fog/openstack/orchestration/requests/validate_template.rb +++ b/lib/fog/openstack/orchestration/requests/validate_template.rb @@ -4,10 +4,10 @@ class Orchestration class Real def validate_template(options = {}) request( - :body => Fog::JSON.encode(options), - :expects => [200], - :method => 'POST', - :path => 'validate' + body: Fog::JSON.encode(options), + expects: [200], + method: 'POST', + path: 'validate' ) end end diff --git a/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb index 826f51b4a..d739999e1 100644 --- a/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb +++ b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb @@ -102,6 +102,7 @@ def get_file_contents(from_data, base_url) # I'm on a Hash, process it. return unless from_data.kind_of?(Hash) + from_data.each do |key, value| next if ignore_if(key, value) diff --git a/lib/fog/openstack/planning.rb b/lib/fog/openstack/planning.rb index b9743c115..c95756507 100644 --- a/lib/fog/openstack/planning.rb +++ b/lib/fog/openstack/planning.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class Planning < Fog::Service - SUPPORTED_VERSIONS = /v2/ + SUPPORTED_VERSIONS = /v2/.freeze requires :openstack_auth_url recognizes :openstack_auth_token, :openstack_management_url, @@ -62,15 +62,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -84,11 +84,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end @@ -116,7 +116,7 @@ def default_service_type # TODO: get rid of inconform self.[] & self.new & self.services def self.[](service) - new(:service => service) + new(service: service) end def self.new(attributes) @@ -125,6 +125,7 @@ def self.new(attributes) if services.include?(service) return Fog::OpenStack.const_get(service.to_s.capitalize).new(attributes) end + raise ArgumentError, "Openstack has no #{service} service" end diff --git a/lib/fog/openstack/planning/models/plan.rb b/lib/fog/openstack/planning/models/plan.rb index 088368c25..9a0006560 100644 --- a/lib/fog/openstack/planning/models/plan.rb +++ b/lib/fog/openstack/planning/models/plan.rb @@ -29,8 +29,8 @@ def environment end def provider_resource_templates - templates.select do |key, _template| - ![MASTER_TEMPLATE_NAME, ENVIRONMENT_NAME].include?(key) + templates.reject do |key, _template| + [MASTER_TEMPLATE_NAME, ENVIRONMENT_NAME].include?(key) end end diff --git a/lib/fog/openstack/planning/models/plans.rb b/lib/fog/openstack/planning/models/plans.rb index cc0c915a5..753bc7087 100644 --- a/lib/fog/openstack/planning/models/plans.rb +++ b/lib/fog/openstack/planning/models/plans.rb @@ -19,7 +19,7 @@ def find_by_uuid(plan_uuid) def method_missing(method_sym, *arguments, &block) if method_sym.to_s =~ /^find_by_(.*)$/ all.find do |plan| - plan.send($1) == arguments.first + plan.send(Regexp.last_match(1)) == arguments.first end else super diff --git a/lib/fog/openstack/planning/requests/add_role_to_plan.rb b/lib/fog/openstack/planning/requests/add_role_to_plan.rb index d4f3cec59..a120846b8 100644 --- a/lib/fog/openstack/planning/requests/add_role_to_plan.rb +++ b/lib/fog/openstack/planning/requests/add_role_to_plan.rb @@ -4,10 +4,10 @@ class Planning class Real def add_role_to_plan(plan_uuid, role_uuid) request( - :expects => [201], - :method => 'POST', - :path => "plans/#{plan_uuid}/roles", - :body => Fog::JSON.encode('uuid' => role_uuid) + expects: [201], + method: 'POST', + path: "plans/#{plan_uuid}/roles", + body: Fog::JSON.encode('uuid' => role_uuid) ) end end @@ -17,20 +17,20 @@ def add_role_to_plan(_plan_uuid, _role_uuid) response = Excon::Response.new response.status = 201 response.body = { - "created_at" => "2014-09-26T20:23:14.222815", + "created_at" => "2014-09-26T20:23:14.222815", "description" => "Development testing cloud", - "name" => "dev-cloud", - "parameters" => [], - "roles" => [ + "name" => "dev-cloud", + "parameters" => [], + "roles" => [ { "description" => "OpenStack hypervisor node. Can be wrapped in a ResourceGroup for scaling.\n", - "name" => "compute", - "uuid" => "f72c0656-5696-4c66-81a5-d6d88a48e385", - "version" => 1 + "name" => "compute", + "uuid" => "f72c0656-5696-4c66-81a5-d6d88a48e385", + "version" => 1 } ], - "updated_at" => nil, - "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" + "updated_at" => nil, + "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response end diff --git a/lib/fog/openstack/planning/requests/create_plan.rb b/lib/fog/openstack/planning/requests/create_plan.rb index 0445353e5..4e0cea2bd 100644 --- a/lib/fog/openstack/planning/requests/create_plan.rb +++ b/lib/fog/openstack/planning/requests/create_plan.rb @@ -4,10 +4,10 @@ class Planning class Real def create_plan(parameters) request( - :expects => [201], - :method => 'POST', - :path => "plans", - :body => Fog::JSON.encode(parameters) + expects: [201], + method: 'POST', + path: "plans", + body: Fog::JSON.encode(parameters) ) end end @@ -17,13 +17,13 @@ def create_plan(_parameters) response = Excon::Response.new response.status = 201 response.body = { - "created_at" => "2014-09-26T20:23:14.222815", + "created_at" => "2014-09-26T20:23:14.222815", "description" => "Development testing cloud", - "name" => "dev-cloud", - "parameters" => [], - "roles" => [], - "updated_at" => nil, - "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" + "name" => "dev-cloud", + "parameters" => [], + "roles" => [], + "updated_at" => nil, + "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response end diff --git a/lib/fog/openstack/planning/requests/delete_plan.rb b/lib/fog/openstack/planning/requests/delete_plan.rb index e0d663e3a..326250e0e 100644 --- a/lib/fog/openstack/planning/requests/delete_plan.rb +++ b/lib/fog/openstack/planning/requests/delete_plan.rb @@ -4,9 +4,9 @@ class Planning class Real def delete_plan(plan_uuid) request( - :expects => [204], - :method => 'DELETE', - :path => "plans/#{plan_uuid}" + expects: [204], + method: 'DELETE', + path: "plans/#{plan_uuid}" ) end end diff --git a/lib/fog/openstack/planning/requests/get_plan.rb b/lib/fog/openstack/planning/requests/get_plan.rb index a6f3f6d32..b000914aa 100644 --- a/lib/fog/openstack/planning/requests/get_plan.rb +++ b/lib/fog/openstack/planning/requests/get_plan.rb @@ -4,9 +4,9 @@ class Planning class Real def get_plan(plan_uuid) request( - :expects => [200, 204], - :method => 'GET', - :path => "plans/#{plan_uuid}" + expects: [200, 204], + method: 'GET', + path: "plans/#{plan_uuid}" ) end end @@ -16,39 +16,39 @@ def get_plan(_parameters = nil) response = Excon::Response.new response.status = [200, 204][rand(2)] response.body = { - "created_at" => "2014-09-26T20:23:14.222815", + "created_at" => "2014-09-26T20:23:14.222815", "description" => "Development testing cloud", - "name" => "dev-cloud", - "parameters" => + "name" => "dev-cloud", + "parameters" => [ { - "default" => "guest", + "default" => "guest", "description" => "The password for RabbitMQ", - "hidden" => true, - "label" => nil, - "name" => "compute-1 => =>RabbitPassword", - "value" => "secret-password" + "hidden" => true, + "label" => nil, + "name" => "compute-1 => =>RabbitPassword", + "value" => "secret-password" }, { - "default" => "default", + "default" => "default", "description" => "description", - "hidden" => true, - "label" => nil, - "name" => "name", - "value" => "value" - }, + "hidden" => true, + "label" => nil, + "name" => "name", + "value" => "value" + } ], - "roles" => + "roles" => [ { "description" => "OpenStack hypervisor node. Can be wrapped in a ResourceGroup for scaling.\n", - "name" => "compute", - "uuid" => "b7b1583c-5c80-481f-a25b-708ed4a39734", - "version" => 1 + "name" => "compute", + "uuid" => "b7b1583c-5c80-481f-a25b-708ed4a39734", + "version" => 1 } ], - "updated_at" => nil, - "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" + "updated_at" => nil, + "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response end diff --git a/lib/fog/openstack/planning/requests/get_plan_templates.rb b/lib/fog/openstack/planning/requests/get_plan_templates.rb index 18773b30f..00abe1b6c 100644 --- a/lib/fog/openstack/planning/requests/get_plan_templates.rb +++ b/lib/fog/openstack/planning/requests/get_plan_templates.rb @@ -4,9 +4,9 @@ class Planning class Real def get_plan_templates(plan_uuid) request( - :expects => [200, 204], - :method => 'GET', - :path => "plans/#{plan_uuid}/templates" + expects: [200, 204], + method: 'GET', + path: "plans/#{plan_uuid}/templates" ) end end @@ -16,8 +16,8 @@ def get_plan_templates(_plan_uuid) response = Excon::Response.new response.status = [200, 204][rand(2)] response.body = { - "environment.yaml" => "... content of template file ...", - "plan.yaml" => "... content of template file ...", + "environment.yaml" => "... content of template file ...", + "plan.yaml" => "... content of template file ...", "provider-compute-1.yaml" => "... content of template file ..." } response diff --git a/lib/fog/openstack/planning/requests/list_plans.rb b/lib/fog/openstack/planning/requests/list_plans.rb index 99906b4b1..e53db8a5d 100644 --- a/lib/fog/openstack/planning/requests/list_plans.rb +++ b/lib/fog/openstack/planning/requests/list_plans.rb @@ -4,10 +4,10 @@ class Planning class Real def list_plans(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'plans', - :query => options + expects: [200, 204], + method: 'GET', + path: 'plans', + query: options ) end end @@ -18,39 +18,39 @@ def list_plans(_options = {}) response.status = [200, 204][rand(2)] response.body = [ { - "created_at" => "2014-09-26T20:23:14.222815", + "created_at" => "2014-09-26T20:23:14.222815", "description" => "Development testing cloud", - "name" => "dev-cloud", - "parameters" => + "name" => "dev-cloud", + "parameters" => [ { - "default" => "guest", + "default" => "guest", "description" => "The password for RabbitMQ", - "hidden" => true, - "label" => nil, - "name" => "compute-1 => =>RabbitPassword", - "value" => "secret-password" + "hidden" => true, + "label" => nil, + "name" => "compute-1 => =>RabbitPassword", + "value" => "secret-password" }, { - "default" => "default", + "default" => "default", "description" => "description", - "hidden" => true, - "label" => nil, - "name" => "name", - "value" => "value" - }, + "hidden" => true, + "label" => nil, + "name" => "name", + "value" => "value" + } ], - "roles" => + "roles" => [ { "description" => "OpenStack hypervisor node. Can be wrapped in a ResourceGroup for scaling.\n", - "name" => "compute", - "uuid" => "b7b1583c-5c80-481f-a25b-708ed4a39734", - "version" => 1 + "name" => "compute", + "uuid" => "b7b1583c-5c80-481f-a25b-708ed4a39734", + "version" => 1 } ], - "updated_at" => nil, - "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" + "updated_at" => nil, + "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } ] response diff --git a/lib/fog/openstack/planning/requests/list_roles.rb b/lib/fog/openstack/planning/requests/list_roles.rb index b2d83a226..74ed1e000 100644 --- a/lib/fog/openstack/planning/requests/list_roles.rb +++ b/lib/fog/openstack/planning/requests/list_roles.rb @@ -4,10 +4,10 @@ class Planning class Real def list_roles(options = {}) request( - :expects => [200, 204], - :method => 'GET', - :path => 'roles', - :query => options + expects: [200, 204], + method: 'GET', + path: 'roles', + query: options ) end end @@ -19,9 +19,9 @@ def list_roles(_options = {}) response.body = [ { "description" => "OpenStack hypervisor node. Can be wrapped in a ResourceGroup for scaling.\n", - "name" => "compute", - "uuid" => "f72c0656-5696-4c66-81a5-d6d88a48e385", - "version" => 1 + "name" => "compute", + "uuid" => "f72c0656-5696-4c66-81a5-d6d88a48e385", + "version" => 1 } ] response diff --git a/lib/fog/openstack/planning/requests/patch_plan.rb b/lib/fog/openstack/planning/requests/patch_plan.rb index 7475d17b4..9baf0a9e4 100644 --- a/lib/fog/openstack/planning/requests/patch_plan.rb +++ b/lib/fog/openstack/planning/requests/patch_plan.rb @@ -4,10 +4,10 @@ class Planning class Real def patch_plan(plan_uuid, parameters) request( - :expects => [201], - :method => 'PATCH', - :path => "plans/#{plan_uuid}", - :body => Fog::JSON.encode(parameters) + expects: [201], + method: 'PATCH', + path: "plans/#{plan_uuid}", + body: Fog::JSON.encode(parameters) ) end end @@ -17,31 +17,31 @@ def patch_plan(_plan_uuid, _parameters) response = Excon::Response.new response.status = 201 response.body = { - "created_at" => "2014-09-26T20:23:14.222815", + "created_at" => "2014-09-26T20:23:14.222815", "description" => "Development testing cloud", - "name" => "dev-cloud", - "parameters" => + "name" => "dev-cloud", + "parameters" => [ { - "default" => "guest", + "default" => "guest", "description" => "The password for RabbitMQ", - "hidden" => true, - "label" => nil, - "name" => "compute-1::RabbitPassword", - "value" => "secret-password" + "hidden" => true, + "label" => nil, + "name" => "compute-1::RabbitPassword", + "value" => "secret-password" } ], - "roles" => + "roles" => [ { "description" => "OpenStack hypervisor node. Can be wrapped in a ResourceGroup for scaling.\n", - "name" => "compute", - "uuid" => "b7b1583c-5c80-481f-a25b-708ed4a39734", - "version" => 1 + "name" => "compute", + "uuid" => "b7b1583c-5c80-481f-a25b-708ed4a39734", + "version" => 1 } ], - "updated_at" => nil, - "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" + "updated_at" => nil, + "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response end diff --git a/lib/fog/openstack/planning/requests/remove_role_from_plan.rb b/lib/fog/openstack/planning/requests/remove_role_from_plan.rb index 5d756be17..016397821 100644 --- a/lib/fog/openstack/planning/requests/remove_role_from_plan.rb +++ b/lib/fog/openstack/planning/requests/remove_role_from_plan.rb @@ -4,9 +4,9 @@ class Planning class Real def remove_role_from_plan(plan_uuid, role_uuid) request( - :expects => [200], - :method => 'DELETE', - :path => "plans/#{plan_uuid}/roles/#{role_uuid}" + expects: [200], + method: 'DELETE', + path: "plans/#{plan_uuid}/roles/#{role_uuid}" ) end end @@ -16,13 +16,13 @@ def remove_role_from_plan(_plan_uuid, _role_uuid) response = Excon::Response.new response.status = 200 response.body = { - "created_at" => "2014-09-26T20:23:14.222815", + "created_at" => "2014-09-26T20:23:14.222815", "description" => "Development testing cloud", - "name" => "dev-cloud", - "parameters" => [], - "roles" => [], - "updated_at" => nil, - "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" + "name" => "dev-cloud", + "parameters" => [], + "roles" => [], + "updated_at" => nil, + "uuid" => "53268a27-afc8-4b21-839f-90227dd7a001" } response end diff --git a/lib/fog/openstack/shared_file_system.rb b/lib/fog/openstack/shared_file_system.rb index 1f70859de..69fe88849 100644 --- a/lib/fog/openstack/shared_file_system.rb +++ b/lib/fog/openstack/shared_file_system.rb @@ -1,7 +1,7 @@ module Fog module OpenStack class SharedFileSystem < Fog::Service - SUPPORTED_VERSIONS = /v2(\.0)*/ + SUPPORTED_VERSIONS = /v2(\.0)*/.freeze SUPPORTED_MICROVERSION = '2.15'.freeze requires :openstack_auth_url @@ -81,216 +81,216 @@ class SharedFileSystem < Fog::Service # availability zones request :list_availability_zones - # rubocop:disable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize + # rubocop:disable Metrics/MethodLength class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :shares => [ + shares: [ { - "id" => "d94a8548-2079-4be0-b21c-0a887acd31ca", + "id" => "d94a8548-2079-4be0-b21c-0a887acd31ca", "links" => [ { "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/shares/d94a8548-2079-4be0-b21c-0a887acd31ca", - "rel" => "self" + "rel" => "self" }, { "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/shares/d94a8548-2079-4be0-b21c-0a887acd31ca", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "name" => "My_share" + "name" => "My_share" }, { - "id" => "406ea93b-32e9-4907-a117-148b3945749f", + "id" => "406ea93b-32e9-4907-a117-148b3945749f", "links" => [ { "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/shares/406ea93b-32e9-4907-a117-148b3945749f", - "rel" => "self" + "rel" => "self" }, { "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/shares/406ea93b-32e9-4907-a117-148b3945749f", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "name" => "Share1" + "name" => "Share1" } ], - :shares_detail => [ + shares_detail: [ { - "links" => [ + "links" => [ { "href" => "http://172.18.198.54:8786/v2/16e1ab15c35a457e9c2b2aa189f544e1/shares/f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc", - "rel" => "self" + "rel" => "self" }, { "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/shares/f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "availability_zone" => "nova", - "share_network_id" => "f9b2e754-ac01-4466-86e1-5c569424754e", - "export_locations" => [], - "share_server_id" => "87d8943a-f5da-47a4-b2f2-ddfa6794aa82", - "snapshot_id" => '', - "id" => "f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc", - "size" => 1, - "share_type" => "25747776-08e5-494f-ab40-a64b9d20d8f7", - "share_type_name" => "default", - "export_location" => '', - "consistency_group_id" => "9397c191-8427-4661-a2e8-b23820dc01d4", - "project_id" => "16e1ab15c35a457e9c2b2aa189f544e1", - "metadata" => {}, - "status" => "available", - "access_rules_status" => "active", - "description" => "There is a share description.", - "host" => "manila2@generic1#GENERIC1", - "task_state" => '', - "is_public" => 'true', - "snapshot_support" => 'true', - "name" => "my_share4", - "has_replicas" => 'false', - "replication_type" => '', - "created_at" => "2015-09-16T18:19:50.000000", - "share_proto" => "NFS", - "volume_type" => "default", + "availability_zone" => "nova", + "share_network_id" => "f9b2e754-ac01-4466-86e1-5c569424754e", + "export_locations" => [], + "share_server_id" => "87d8943a-f5da-47a4-b2f2-ddfa6794aa82", + "snapshot_id" => '', + "id" => "f45cc5b2-d1bb-4a3e-ba5b-5c4125613adc", + "size" => 1, + "share_type" => "25747776-08e5-494f-ab40-a64b9d20d8f7", + "share_type_name" => "default", + "export_location" => '', + "consistency_group_id" => "9397c191-8427-4661-a2e8-b23820dc01d4", + "project_id" => "16e1ab15c35a457e9c2b2aa189f544e1", + "metadata" => {}, + "status" => "available", + "access_rules_status" => "active", + "description" => "There is a share description.", + "host" => "manila2@generic1#GENERIC1", + "task_state" => '', + "is_public" => 'true', + "snapshot_support" => 'true', + "name" => "my_share4", + "has_replicas" => 'false', + "replication_type" => '', + "created_at" => "2015-09-16T18:19:50.000000", + "share_proto" => "NFS", + "volume_type" => "default", "source_cgsnapshot_member_id" => '' } ], - :share_networks => [ + share_networks: [ { - "id" => "32763294-e3d4-456a-998d-60047677c2fb", + "id" => "32763294-e3d4-456a-998d-60047677c2fb", "name" => "net_my1" }, { - "id" => "713df749-aac0-4a54-af52-10f6c991e80c", + "id" => "713df749-aac0-4a54-af52-10f6c991e80c", "name" => "net_my" } ], - :share_networks_detail => [ + share_networks_detail: [ { - "name" => "net_my1", - "segmentation_id" => '', - "created_at" => "2015-09-04T14:57:13.000000", + "name" => "net_my1", + "segmentation_id" => '', + "created_at" => "2015-09-04T14:57:13.000000", "neutron_subnet_id" => "53482b62-2c84-4a53-b6ab-30d9d9800d06", - "updated_at" => '', - "id" => "32763294-e3d4-456a-998d-60047677c2fb", - "neutron_net_id" => "998b42ee-2cee-4d36-8b95-67b5ca1f2109", - "ip_version" => '', - "nova_net_id" => '', - "cidr" => '', - "project_id" => "16e1ab15c35a457e9c2b2aa189f544e1", - "network_type" => '', - "description" => "descr" + "updated_at" => '', + "id" => "32763294-e3d4-456a-998d-60047677c2fb", + "neutron_net_id" => "998b42ee-2cee-4d36-8b95-67b5ca1f2109", + "ip_version" => '', + "nova_net_id" => '', + "cidr" => '', + "project_id" => "16e1ab15c35a457e9c2b2aa189f544e1", + "network_type" => '', + "description" => "descr" } ], - :snapshots => [ + snapshots: [ { - "id" => "086a1aa6-c425-4ecd-9612-391a3b1b9375", + "id" => "086a1aa6-c425-4ecd-9612-391a3b1b9375", "links" => [ { "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375", - "rel" => "self" + "rel" => "self" }, { "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "name" => "snapshot_My_share" + "name" => "snapshot_My_share" } ], - :security_services_detail => [ + security_services_detail: [ { - "status" => "new", - "domain" => "", - "project_id" => "16e1ab15c35a457e9c2b2aa189f544e1", - "name" => "SecServ1", - "created_at" => "2015-09-07T12:19:10.000000", - "updated_at" => "", - "server" => "", - "dns_ip" => "10.0.0.0/24", - "user" => "demo", - "password" => "supersecret", - "type" => "kerberos", - "id" => "3c829734-0679-4c17-9637-801da48c0d5f", + "status" => "new", + "domain" => "", + "project_id" => "16e1ab15c35a457e9c2b2aa189f544e1", + "name" => "SecServ1", + "created_at" => "2015-09-07T12:19:10.000000", + "updated_at" => "", + "server" => "", + "dns_ip" => "10.0.0.0/24", + "user" => "demo", + "password" => "supersecret", + "type" => "kerberos", + "id" => "3c829734-0679-4c17-9637-801da48c0d5f", "description" => "Creating my first Security Service" } ], - :security_services => [ + security_services: [ { "status" => "new", - "type" => "ldap", - "id" => "5a1d3a12-34a7-4087-8983-50e9ed03509a", - "name" => "SecServ2" + "type" => "ldap", + "id" => "5a1d3a12-34a7-4087-8983-50e9ed03509a", + "name" => "SecServ2" } ], - :availability_zones => [ - { - "name" => "nova", - "created_at" => "2015-09-18T09:50:55.000000", - "updated_at" => nil, - "id" => "388c983d-258e-4a0e-b1ba-10da37d766db" - } + availability_zones: [ + { + "name" => "nova", + "created_at" => "2015-09-18T09:50:55.000000", + "updated_at" => nil, + "id" => "388c983d-258e-4a0e-b1ba-10da37d766db" + } ], - :snapshots_detail => [ + snapshots_detail: [ { - "status" => "available", - "share_id" => "d94a8548-2079-4be0-b21c-0a887acd31ca", - "name" => "snapshot_My_share", - "links" => [ + "status" => "available", + "share_id" => "d94a8548-2079-4be0-b21c-0a887acd31ca", + "name" => "snapshot_My_share", + "links" => [ { "href" => "http://172.18.198.54:8786/v1/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375", - "rel" => "self" + "rel" => "self" }, { "href" => "http://172.18.198.54:8786/16e1ab15c35a457e9c2b2aa189f544e1/snapshots/086a1aa6-c425-4ecd-9612-391a3b1b9375", - "rel" => "bookmark" + "rel" => "bookmark" } ], - "created_at" => "2015-09-07T11:55:09.000000", + "created_at" => "2015-09-07T11:55:09.000000", "description" => "Here is a snapshot of share My_share", "share_proto" => "NFS", - "share_size" => 1, - "id" => "086a1aa6-c425-4ecd-9612-391a3b1b9375", - "size" => 1 + "share_size" => 1, + "id" => "086a1aa6-c425-4ecd-9612-391a3b1b9375", + "size" => 1 } ], - :export_locations => [ + export_locations: [ { - "path" => "10.254.0.3:/shares/share-e1c2d35e-fe67-4028-ad7a-45f668732b1d", + "path" => "10.254.0.3:/shares/share-e1c2d35e-fe67-4028-ad7a-45f668732b1d", "share_instance_id" => "e1c2d35e-fe67-4028-ad7a-45f668732b1d", - "is_admin_only" => false, - "id" => "b6bd76ce-12a2-42a9-a30a-8a43b503867d", - "preferred" => false + "is_admin_only" => false, + "id" => "b6bd76ce-12a2-42a9-a30a-8a43b503867d", + "preferred" => false }, { - "path" => "10.0.0.3:/shares/share-e1c2d35e-fe67-4028-ad7a-45f668732b1d", + "path" => "10.0.0.3:/shares/share-e1c2d35e-fe67-4028-ad7a-45f668732b1d", "share_instance_id" => "e1c2d35e-fe67-4028-ad7a-45f668732b1d", - "is_admin_only" => true, - "id" => "6921e862-88bc-49a5-a2df-efeed9acd583", - "preferred" => false + "is_admin_only" => true, + "id" => "6921e862-88bc-49a5-a2df-efeed9acd583", + "preferred" => false } ], - :access_rules => [ + access_rules: [ { - "share_id" => "406ea93b-32e9-4907-a117-148b3945749f", - "created_at" => "2015-09-07T09:14:48.000000", - "updated_at" => '', - "access_type" => "ip", - "access_to" => "0.0.0.0/0", + "share_id" => "406ea93b-32e9-4907-a117-148b3945749f", + "created_at" => "2015-09-07T09:14:48.000000", + "updated_at" => '', + "access_type" => "ip", + "access_to" => "0.0.0.0/0", "access_level" => "rw", - "access_key" => '', - "id" => "a25b2df3-90bd-4add-afa6-5f0dbbd50452" + "access_key" => '', + "id" => "a25b2df3-90bd-4add-afa6-5f0dbbd50452" } ], - :quota => { - "gigabytes" => 1000, - "shares" => 50, + quota: { + "gigabytes" => 1000, + "shares" => 50, "snapshot_gigabytes" => 1000, - "snapshots" => 50, - "share_networks" => 10, - "id" => "16e1ab15c35a457e9c2b2aa189f544e1" + "snapshots" => 50, + "share_networks" => 10, + "id" => "16e1ab15c35a457e9c2b2aa189f544e1" } } end @@ -313,15 +313,15 @@ def initialize(options = {}) management_url.path = '/v2' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].detect { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -335,11 +335,11 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_region => @openstack_region, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_region: @openstack_region, + openstack_management_url: @openstack_management_url } end end # rubocop:enable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize diff --git a/lib/fog/openstack/shared_file_system/models/availability_zones.rb b/lib/fog/openstack/shared_file_system/models/availability_zones.rb index 47ee8eb43..e6c9b0443 100644 --- a/lib/fog/openstack/shared_file_system/models/availability_zones.rb +++ b/lib/fog/openstack/shared_file_system/models/availability_zones.rb @@ -8,7 +8,7 @@ class AvailabilityZones < Fog::OpenStack::Collection model Fog::OpenStack::SharedFileSystem::AvailabilityZone def all - load_response(service.list_availability_zones(), 'availability_zones') + load_response(service.list_availability_zones, 'availability_zones') end end end diff --git a/lib/fog/openstack/shared_file_system/models/network.rb b/lib/fog/openstack/shared_file_system/models/network.rb index 7787cdf2a..c0652980d 100644 --- a/lib/fog/openstack/shared_file_system/models/network.rb +++ b/lib/fog/openstack/shared_file_system/models/network.rb @@ -21,6 +21,7 @@ class Network < Fog::OpenStack::Model def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + merge_attributes(service.create_share_network(attributes).body['share_network']) true end diff --git a/lib/fog/openstack/shared_file_system/models/networks.rb b/lib/fog/openstack/shared_file_system/models/networks.rb index 4bdd9026c..2edc0209a 100644 --- a/lib/fog/openstack/shared_file_system/models/networks.rb +++ b/lib/fog/openstack/shared_file_system/models/networks.rb @@ -13,7 +13,7 @@ def all(options = {}) def find_by_id(id) net_hash = service.get_share_network(id).body['share_network'] - new(net_hash.merge(:service => service)) + new(net_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/shared_file_system/models/share.rb b/lib/fog/openstack/shared_file_system/models/share.rb index bfedd2b9a..b8c76571f 100644 --- a/lib/fog/openstack/shared_file_system/models/share.rb +++ b/lib/fog/openstack/shared_file_system/models/share.rb @@ -37,6 +37,7 @@ class Share < Fog::OpenStack::Model def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + requires :size, :share_proto merge_attributes(service.create_share(share_proto, size, attributes).body['share']) true @@ -83,11 +84,11 @@ def revoke_access(access_id) end def access_rules - service.share_access_rules(:share => self) + service.share_access_rules(share: self) end def export_locations - service.share_export_locations(:share => self) + service.share_export_locations(share: self) end end end diff --git a/lib/fog/openstack/shared_file_system/models/share_access_rule.rb b/lib/fog/openstack/shared_file_system/models/share_access_rule.rb index 923efa78f..d314578bc 100644 --- a/lib/fog/openstack/shared_file_system/models/share_access_rule.rb +++ b/lib/fog/openstack/shared_file_system/models/share_access_rule.rb @@ -16,6 +16,7 @@ class ShareAccessRule < Fog::OpenStack::Model def save requires :share, :access_level, :access_type, :access_to raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + merge_attributes(service.grant_share_access(@share.id, access_to, access_type, access_level).body['access']) true end diff --git a/lib/fog/openstack/shared_file_system/models/share_access_rules.rb b/lib/fog/openstack/shared_file_system/models/share_access_rules.rb index 88ce81d50..6674131a1 100644 --- a/lib/fog/openstack/shared_file_system/models/share_access_rules.rb +++ b/lib/fog/openstack/shared_file_system/models/share_access_rules.rb @@ -22,7 +22,7 @@ def find_by_id(id) def new(attributes = {}) requires :share - super({:share => @share}.merge!(attributes)) + super({ share: @share }.merge!(attributes)) end end end diff --git a/lib/fog/openstack/shared_file_system/models/share_export_locations.rb b/lib/fog/openstack/shared_file_system/models/share_export_locations.rb index 49bf13206..b0d0d6025 100644 --- a/lib/fog/openstack/shared_file_system/models/share_export_locations.rb +++ b/lib/fog/openstack/shared_file_system/models/share_export_locations.rb @@ -15,15 +15,15 @@ def all end def find_by_id(id) - location_hash = service.get_share_export_location(@share.id,id).body['export_location'] - new(location_hash.merge(:service => service)) + location_hash = service.get_share_export_location(@share.id, id).body['export_location'] + new(location_hash.merge(service: service)) end alias get find_by_id def new(attributes = {}) requires :share - super({:share => @share}.merge!(attributes)) + super({ share: @share }.merge!(attributes)) end end end diff --git a/lib/fog/openstack/shared_file_system/models/shares.rb b/lib/fog/openstack/shared_file_system/models/shares.rb index 06e4ae729..f26777bd4 100644 --- a/lib/fog/openstack/shared_file_system/models/shares.rb +++ b/lib/fog/openstack/shared_file_system/models/shares.rb @@ -13,7 +13,7 @@ def all(options = {}) def find_by_id(id) share_hash = service.get_share(id).body['share'] - new(share_hash.merge(:service => service)) + new(share_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/shared_file_system/models/snapshot.rb b/lib/fog/openstack/shared_file_system/models/snapshot.rb index 6fefca9be..c7f1598a0 100644 --- a/lib/fog/openstack/shared_file_system/models/snapshot.rb +++ b/lib/fog/openstack/shared_file_system/models/snapshot.rb @@ -19,6 +19,7 @@ class Snapshot < Fog::OpenStack::Model def save raise Fog::Errors::Error, 'Resaving an existing object may create a duplicate' if persisted? + requires :share_id merge_attributes(service.create_snapshot(share_id, attributes).body['snapshot']) true diff --git a/lib/fog/openstack/shared_file_system/models/snapshots.rb b/lib/fog/openstack/shared_file_system/models/snapshots.rb index 3a6756f7c..7c150f76c 100644 --- a/lib/fog/openstack/shared_file_system/models/snapshots.rb +++ b/lib/fog/openstack/shared_file_system/models/snapshots.rb @@ -13,7 +13,7 @@ def all(options = {}) def find_by_id(id) snapshot_hash = service.get_snapshot(id).body['snapshot'] - new(snapshot_hash.merge(:service => service)) + new(snapshot_hash.merge(service: service)) end alias get find_by_id diff --git a/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb b/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb index 8ad8537e1..0383482e4 100644 --- a/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/add_security_service_to_share_network.rb @@ -19,7 +19,7 @@ def add_security_service_to_share_network(_security_service_id, share_network_id share_net = data[:share_network_updated] || data[:share_networks].first share_net['id'] = share_network_id - response.body = {'share_network' => share_net} + response.body = { 'share_network' => share_net } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/create_security_service.rb b/lib/fog/openstack/shared_file_system/requests/create_security_service.rb index a32ce1b09..b1074367b 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_security_service.rb @@ -17,10 +17,10 @@ def create_security_service(type, name, options = {}) end request( - :body => Fog::JSON.encode('security_service' => data), - :expects => 200, - :method => 'POST', - :path => 'security-services' + body: Fog::JSON.encode('security_service' => data), + expects: 200, + method: 'POST', + path: 'security-services' ) end end @@ -38,7 +38,7 @@ def create_security_service(type, name, options = {}) security_service['type'] = type security_service['name'] = name - response.body = {'security_service' => security_service.merge(options)} + response.body = { 'security_service' => security_service.merge(options) } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/create_share.rb b/lib/fog/openstack/shared_file_system/requests/create_share.rb index 8222a6465..2486caaad 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_share.rb @@ -5,7 +5,7 @@ class Real def create_share(protocol, size, options = {}) data = { 'share_proto' => protocol, - 'size' => size + 'size' => size } vanilla_options = [ @@ -18,10 +18,10 @@ def create_share(protocol, size, options = {}) end request( - :body => Fog::JSON.encode('share' => data), - :expects => 200, - :method => 'POST', - :path => 'shares' + body: Fog::JSON.encode('share' => data), + expects: 200, + method: 'POST', + path: 'shares' ) end end @@ -40,7 +40,7 @@ def create_share(protocol, size, options = {}) share['size'] = size share['status'] = 'creating' - response.body = {'share' => share.merge(options)} + response.body = { 'share' => share.merge(options) } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/create_share_network.rb b/lib/fog/openstack/shared_file_system/requests/create_share_network.rb index 6a38d5b9c..7891ff48a 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_share_network.rb @@ -14,10 +14,10 @@ def create_share_network(options = {}) end request( - :body => Fog::JSON.encode('share_network' => data), - :expects => 200, - :method => 'POST', - :path => 'share-networks' + body: Fog::JSON.encode('share_network' => data), + expects: 200, + method: 'POST', + path: 'share-networks' ) end end @@ -32,7 +32,7 @@ def create_share_network(options = {}) share_net = data[:share_networks_detail].first.dup - response.body = {'share_networks' => share_net.merge(options)} + response.body = { 'share_networks' => share_net.merge(options) } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb index 9e4befabd..7d224d2df 100644 --- a/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/create_snapshot.rb @@ -16,10 +16,10 @@ def create_snapshot(share_id, options = {}) end request( - :body => Fog::JSON.encode('snapshot' => data), - :expects => 202, - :method => 'POST', - :path => 'snapshots' + body: Fog::JSON.encode('snapshot' => data), + expects: 202, + method: 'POST', + path: 'snapshots' ) end end @@ -37,7 +37,7 @@ def create_snapshot(share_id, options = {}) snapshot['share_id'] = share_id snapshot['status'] = 'creating' - response.body = {'snapshot' => snapshot.merge(options)} + response.body = { 'snapshot' => snapshot.merge(options) } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb b/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb index b304d2d22..6be0c2c59 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_security_service.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def delete_security_service(id) request( - :expects => 202, - :method => 'DELETE', - :path => "security-services/#{id}" + expects: 202, + method: 'DELETE', + path: "security-services/#{id}" ) end end diff --git a/lib/fog/openstack/shared_file_system/requests/delete_share.rb b/lib/fog/openstack/shared_file_system/requests/delete_share.rb index 41c1113d2..83714e6e2 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_share.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def delete_share(id) request( - :expects => 202, - :method => 'DELETE', - :path => "shares/#{id}" + expects: 202, + method: 'DELETE', + path: "shares/#{id}" ) end end @@ -20,7 +20,7 @@ def delete_share(id) share['id'] = id share['links']['self'] = "https://127.0.0.1:8786/v2/shares/#{id}" - response.body = {'share' => share} + response.body = { 'share' => share } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb b/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb index 3211b2cf2..d080a8b61 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_share_network.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def delete_share_network(id) request( - :expects => 202, - :method => 'DELETE', - :path => "share-networks/#{id}" + expects: 202, + method: 'DELETE', + path: "share-networks/#{id}" ) end end @@ -19,7 +19,7 @@ def delete_share_network(id) share_net = data[:share_net_updated] || data[:share_networks_detail].first.dup share_net['id'] = id - response.body = {'share_network' => share_net} + response.body = { 'share_network' => share_net } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb index e48dfd759..f5cd95d21 100644 --- a/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/delete_snapshot.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def delete_snapshot(id) request( - :expects => 202, - :method => 'DELETE', - :path => "snapshots/#{id}" + expects: 202, + method: 'DELETE', + path: "snapshots/#{id}" ) end end @@ -21,7 +21,7 @@ def delete_snapshot(id) snapshot['status'] = 'deleting' snapshot['links']['self'] = "https://127.0.0.1:8786/v2/snapshots/#{id}" - response.body = {'snapshot' => snapshot} + response.body = { 'snapshot' => snapshot } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/get_limits.rb b/lib/fog/openstack/shared_file_system/requests/get_limits.rb index eea8774ca..9ab1a68b3 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_limits.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_limits.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def get_limits request( - :expects => 200, - :method => 'GET', - :path => 'limits' + expects: 200, + method: 'GET', + path: 'limits' ) end end @@ -15,25 +15,25 @@ class Mock def get_limits absolute_limits = { # Max - 'maxTotalShareGigabytes' => 1000, - 'maxTotalShareNetworks' => 10, - 'maxTotalShares' => 50, - 'maxTotalSnapshotGigabytes' => 1000, - 'maxTotalShareSnapshots' => 50, + 'maxTotalShareGigabytes' => 1000, + 'maxTotalShareNetworks' => 10, + 'maxTotalShares' => 50, + 'maxTotalSnapshotGigabytes' => 1000, + 'maxTotalShareSnapshots' => 50, # Used - 'totalShareNetworksUsed' => 0, - 'totalSharesUsed' => 0, - 'totalShareGigabytesUsed' => 0, - 'totalShareSnapshotsUsed' => 0, + 'totalShareNetworksUsed' => 0, + 'totalSharesUsed' => 0, + 'totalShareGigabytesUsed' => 0, + 'totalShareSnapshotsUsed' => 0, 'totalSnapshotGigabytesUsed' => 0 } Excon::Response.new( - :status => 200, - :body => { + status: 200, + body: { 'limits' => { - 'rate' => [], + 'rate' => [], 'absolute' => absolute_limits } } diff --git a/lib/fog/openstack/shared_file_system/requests/get_quota.rb b/lib/fog/openstack/shared_file_system/requests/get_quota.rb index 28dff4787..64392a23f 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_quota.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_quota.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def get_quota(project_id) request( - :expects => 200, - :method => 'GET', - :path => "#{action_prefix}quota-sets/#{project_id}" + expects: 200, + method: 'GET', + path: "#{action_prefix}quota-sets/#{project_id}" ) end end @@ -17,7 +17,7 @@ def get_quota(project_id) response.status = 200 quota_data = data[:quota_updated] || data[:quota] quota_data['id'] = project_id - response.body = {'quota_set' => quota_data} + response.body = { 'quota_set' => quota_data } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/get_security_service.rb b/lib/fog/openstack/shared_file_system/requests/get_security_service.rb index 42682244e..161ec0017 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_security_service.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def get_security_service(id) request( - :expects => 200, - :method => 'GET', - :path => "security-services/#{id}" + expects: 200, + method: 'GET', + path: "security-services/#{id}" ) end end @@ -17,7 +17,7 @@ def get_security_service(id) response.status = 200 security_service = data[:security_service_updated] || data[:security_services_detail].first security_service['id'] = id - response.body = {'security_service' => security_service} + response.body = { 'security_service' => security_service } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/get_share.rb b/lib/fog/openstack/shared_file_system/requests/get_share.rb index 60103a993..b78cf305f 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def get_share(id) request( - :expects => 200, - :method => 'GET', - :path => "shares/#{id}" + expects: 200, + method: 'GET', + path: "shares/#{id}" ) end end diff --git a/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb b/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb index 8c3400ef3..99f886b2c 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share_export_location.rb @@ -5,11 +5,11 @@ class Real # For older versions v1.0-2.8 the export locations are responsed as an attribute of share (export_locations). # For newer API versions (>= 2.9) it is available in separate APIs. # This method returns the export location detail. - def get_share_export_location(share_id,export_location_id) + def get_share_export_location(share_id, _export_location_id) request( - :expects => 200, - :method => 'GET', - :path => "shares/#{share_id}/export_locations/​{export_location_id}​" + expects: 200, + method: 'GET', + path: "shares/#{share_id}/export_locations/​{export_location_id}​" ) end end diff --git a/lib/fog/openstack/shared_file_system/requests/get_share_network.rb b/lib/fog/openstack/shared_file_system/requests/get_share_network.rb index befa8fb1a..59e453bb0 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_share_network.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def get_share_network(id) request( - :expects => 200, - :method => 'GET', - :path => "share-networks/#{id}" + expects: 200, + method: 'GET', + path: "share-networks/#{id}" ) end end @@ -17,7 +17,7 @@ def get_share_network(id) response.status = 200 share_net = data[:share_network_updated] || data[:share_networks].first share_net['id'] = id - response.body = {'share_network' => share_net} + response.body = { 'share_network' => share_net } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb index b9acf812a..40eb902d7 100644 --- a/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/get_snapshot.rb @@ -4,9 +4,9 @@ class SharedFileSystem class Real def get_snapshot(id) request( - :expects => 200, - :method => 'GET', - :path => "snapshots/#{id}" + expects: 200, + method: 'GET', + path: "snapshots/#{id}" ) end end diff --git a/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb b/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb index 92b3136a9..2db83b69e 100644 --- a/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb +++ b/lib/fog/openstack/shared_file_system/requests/grant_share_access.rb @@ -5,8 +5,8 @@ class Real def grant_share_access(share_id, access_to = '0.0.0.0/0', access_type = 'ip', access_level = 'rw') action = { "#{action_prefix}allow_access" => { - 'access_to' => access_to, - 'access_type' => access_type, + 'access_to' => access_to, + 'access_type' => access_type, 'access_level' => access_level } } @@ -25,7 +25,7 @@ def grant_share_access(share_id, access_to, access_type, access_level) access[:access_type] = access_type access[:access_to] = access_to - response.body = {'access' => access} + response.body = { 'access' => access } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb b/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb index a2b8639b2..8f4dee5a7 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_availability_zones.rb @@ -2,20 +2,20 @@ module Fog module OpenStack class SharedFileSystem class Real - def list_availability_zones() + def list_availability_zones request( - :expects => 200, - :method => 'GET', - :path => microversion_newer_than?('2.6') ? 'availability-zones' : 'os-availability-zone' + expects: 200, + method: 'GET', + path: microversion_newer_than?('2.6') ? 'availability-zones' : 'os-availability-zone' ) end end class Mock - def list_availability_zones() + def list_availability_zones response = Excon::Response.new response.status = 200 - response.body = {'availability_zones' => data[:availability_zones]} + response.body = { 'availability_zones' => data[:availability_zones] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_security_services.rb b/lib/fog/openstack/shared_file_system/requests/list_security_services.rb index e6588d094..2fe46a207 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_security_services.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_security_services.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_security_services(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'security-services', - :query => options + expects: 200, + method: 'GET', + path: 'security-services', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_security_services(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'security_services' => data[:security_services]} + response.body = { 'security_services' => data[:security_services] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb index 5d9750b6d..4f18a16b4 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_security_services_detail.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_security_services_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'security-services/detail', - :query => options + expects: 200, + method: 'GET', + path: 'security-services/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_security_services_detail(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'security_services' => data[:security_services_detail]} + response.body = { 'security_services' => data[:security_services_detail] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb b/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb index b232a1de6..892250a83 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_access_rules.rb @@ -20,7 +20,7 @@ def list_share_access_rules(share_id) rule[:share_id] = share_id end - response.body = {'access_list' => rules} + response.body = { 'access_list' => rules } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb b/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb index b2c283432..6ece116c6 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_export_locations.rb @@ -7,18 +7,18 @@ class Real # This method returns a list of the export locations. def list_share_export_locations(share_id) request( - :expects => 200, - :method => 'GET', - :path => "shares/#{share_id}/export_locations" + expects: 200, + method: 'GET', + path: "shares/#{share_id}/export_locations" ) end end class Mock - def list_share_export_locations(share_id) + def list_share_export_locations(_share_id) response = Excon::Response.new response.status = 200 - response.body = {'export_locations' => data[:export_locations]} + response.body = { 'export_locations' => data[:export_locations] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb b/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb index eec063415..847e40f29 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_networks.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_share_networks(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'share-networks', - :query => options + expects: 200, + method: 'GET', + path: 'share-networks', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_share_networks(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'share_networks' => data[:share_networks]} + response.body = { 'share_networks' => data[:share_networks] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb index 1555248f4..0b588102b 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_share_networks_detail.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_share_networks_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'share-networks/detail', - :query => options + expects: 200, + method: 'GET', + path: 'share-networks/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_share_networks_detail(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'share_networks' => data[:share_networks_detail]} + response.body = { 'share_networks' => data[:share_networks_detail] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_shares.rb b/lib/fog/openstack/shared_file_system/requests/list_shares.rb index 13fd4e2a0..959ddce5a 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_shares.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_shares.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_shares(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'shares', - :query => options + expects: 200, + method: 'GET', + path: 'shares', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_shares(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'shares' => data[:shares]} + response.body = { 'shares' => data[:shares] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb index 30abb0331..aaf5d7549 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_shares_detail.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_shares_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'shares/detail', - :query => options + expects: 200, + method: 'GET', + path: 'shares/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_shares_detail(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'shares' => data[:shares_detail]} + response.body = { 'shares' => data[:shares_detail] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb b/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb index b62e978ab..9278d51d3 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_snapshots.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_snapshots(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'snapshots', - :query => options + expects: 200, + method: 'GET', + path: 'snapshots', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_snapshots(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'snapshots' => data[:snapshots]} + response.body = { 'snapshots' => data[:snapshots] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb b/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb index 15e69cad1..7a69b6e1e 100644 --- a/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb +++ b/lib/fog/openstack/shared_file_system/requests/list_snapshots_detail.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def list_snapshots_detail(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'snapshots/detail', - :query => options + expects: 200, + method: 'GET', + path: 'snapshots/detail', + query: options ) end end @@ -16,7 +16,7 @@ class Mock def list_snapshots_detail(_options = {}) response = Excon::Response.new response.status = 200 - response.body = {'snapshots' => data[:snapshots_detail]} + response.body = { 'snapshots' => data[:snapshots_detail] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb b/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb index a2072ddd4..18311722f 100644 --- a/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/remove_security_service_from_share_network.rb @@ -19,7 +19,7 @@ def remove_security_service_from_share_network(_security_service_id, share_netwo share_net = data[:share_network_updated] || data[:share_networks].first share_net['id'] = share_network_id - response.body = {'share_network' => share_net} + response.body = { 'share_network' => share_net } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/share_action.rb b/lib/fog/openstack/shared_file_system/requests/share_action.rb index c5c3cd97a..64a95d3bc 100644 --- a/lib/fog/openstack/shared_file_system/requests/share_action.rb +++ b/lib/fog/openstack/shared_file_system/requests/share_action.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def share_action(id, options = {}, expects_status = 202) request( - :body => Fog::JSON.encode(options), - :expects => expects_status, - :method => 'POST', - :path => "shares/#{id}/action" + body: Fog::JSON.encode(options), + expects: expects_status, + method: 'POST', + path: "shares/#{id}/action" ) end end diff --git a/lib/fog/openstack/shared_file_system/requests/share_network_action.rb b/lib/fog/openstack/shared_file_system/requests/share_network_action.rb index 9d78c1fe0..804f0255e 100644 --- a/lib/fog/openstack/shared_file_system/requests/share_network_action.rb +++ b/lib/fog/openstack/shared_file_system/requests/share_network_action.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def share_network_action(id, options = {}, expects_status = 200) request( - :body => Fog::JSON.encode(options), - :expects => expects_status, - :method => 'POST', - :path => "share-networks/#{id}/action" + body: Fog::JSON.encode(options), + expects: expects_status, + method: 'POST', + path: "share-networks/#{id}/action" ) end end diff --git a/lib/fog/openstack/shared_file_system/requests/update_quota.rb b/lib/fog/openstack/shared_file_system/requests/update_quota.rb index 55392410d..11cc8dbda 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_quota.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_quota.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def update_quota(project_id, options = {}) request( - :body => Fog::JSON.encode('quota_set' => options), - :expects => 200, - :method => 'PUT', - :path => "#{action_prefix}quota-sets/#{project_id}" + body: Fog::JSON.encode('quota_set' => options), + expects: 200, + method: 'PUT', + path: "#{action_prefix}quota-sets/#{project_id}" ) end end @@ -21,7 +21,7 @@ def update_quota(project_id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'quota_set' => data[:quota_updated]} + response.body = { 'quota_set' => data[:quota_updated] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/update_security_service.rb b/lib/fog/openstack/shared_file_system/requests/update_security_service.rb index a1be0a855..76bf4342a 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_security_service.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_security_service.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def update_security_service(id, options = {}) request( - :body => Fog::JSON.encode('security_service' => options), - :expects => 200, - :method => 'PUT', - :path => "security-services/#{id}" + body: Fog::JSON.encode('security_service' => options), + expects: 200, + method: 'PUT', + path: "security-services/#{id}" ) end end @@ -22,7 +22,7 @@ def update_security_service(id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'security_service' => data[:security_service_updated]} + response.body = { 'security_service' => data[:security_service_updated] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/update_share.rb b/lib/fog/openstack/shared_file_system/requests/update_share.rb index d283878b6..2a0e66880 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_share.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_share.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def update_share(id, options = {}) request( - :body => Fog::JSON.encode('share' => options), - :expects => 200, - :method => 'PUT', - :path => "shares/#{id}" + body: Fog::JSON.encode('share' => options), + expects: 200, + method: 'PUT', + path: "shares/#{id}" ) end end @@ -21,7 +21,7 @@ def update_share(id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'share' => data[:share_updated]} + response.body = { 'share' => data[:share_updated] } response end diff --git a/lib/fog/openstack/shared_file_system/requests/update_share_network.rb b/lib/fog/openstack/shared_file_system/requests/update_share_network.rb index b5c55dac1..3d7a1ce20 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_share_network.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_share_network.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def update_share_network(id, options = {}) request( - :body => Fog::JSON.encode('share_network' => options), - :expects => 200, - :method => 'PUT', - :path => "share-networks/#{id}" + body: Fog::JSON.encode('share_network' => options), + expects: 200, + method: 'PUT', + path: "share-networks/#{id}" ) end end @@ -22,7 +22,7 @@ def update_share_network(id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'share_network' => data[:share_net_updated]} + response.body = { 'share_network' => data[:share_net_updated] } response end end diff --git a/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb b/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb index 3898a9715..910c362a4 100644 --- a/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb +++ b/lib/fog/openstack/shared_file_system/requests/update_snapshot.rb @@ -4,10 +4,10 @@ class SharedFileSystem class Real def update_snapshot(id, options = {}) request( - :body => Fog::JSON.encode('snapshot' => options), - :expects => 200, - :method => 'PUT', - :path => "snapshots/#{id}" + body: Fog::JSON.encode('snapshot' => options), + expects: 200, + method: 'PUT', + path: "snapshots/#{id}" ) end end @@ -22,7 +22,7 @@ def update_snapshot(id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'snapshot' => data[:snapshot_updated]} + response.body = { 'snapshot' => data[:snapshot_updated] } response end end diff --git a/lib/fog/openstack/storage.rb b/lib/fog/openstack/storage.rb index c369f0753..a5947d70f 100644 --- a/lib/fog/openstack/storage.rb +++ b/lib/fog/openstack/storage.rb @@ -1,5 +1,3 @@ - - module Fog module OpenStack class Storage < Fog::Service @@ -48,13 +46,13 @@ module Utils def require_mime_types # Use mime/types/columnar if available, for reduced memory usage require 'mime/types/columnar' + rescue LoadError + begin + require 'mime/types' rescue LoadError - begin - require 'mime/types' - rescue LoadError - Fog::Logger.warning("'mime-types' missing, please install and try again.") - exit(1) - end + Fog::Logger.warning("'mime-types' missing, please install and try again.") + exit(1) + end end end @@ -77,7 +75,7 @@ def initialize(options = {}) @openstack_management_url = options[:openstack_management_url] || 'http://example:8774/v2/AUTH_1234' @openstack_management_uri = URI.parse(@openstack_management_url) - @path = @openstack_management_uri.path + @path = @openstack_management_uri.path @path.sub!(%r{/$}, '') end diff --git a/lib/fog/openstack/storage/models/directories.rb b/lib/fog/openstack/storage/models/directories.rb index f4dd7e6be..1ef5303d1 100644 --- a/lib/fog/openstack/storage/models/directories.rb +++ b/lib/fog/openstack/storage/models/directories.rb @@ -14,8 +14,8 @@ def all(options = {}) def get(key, options = {}) data = service.get_container(key, options) - directory = new(:key => key) - for key, value in data.headers + directory = new(key: key) + data.headers.each do |key, value| if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key) directory.merge_attributes(key => value) end diff --git a/lib/fog/openstack/storage/models/directory.rb b/lib/fog/openstack/storage/models/directory.rb index 9d2f4ccbb..cfbf7e060 100644 --- a/lib/fog/openstack/storage/models/directory.rb +++ b/lib/fog/openstack/storage/models/directory.rb @@ -5,10 +5,10 @@ module Fog module OpenStack class Storage class Directory < Fog::OpenStack::Model - identity :key, :aliases => 'name' + identity :key, aliases: 'name' - attribute :bytes, :aliases => 'X-Container-Bytes-Used' - attribute :count, :aliases => 'X-Container-Object-Count' + attribute :bytes, aliases: 'X-Container-Bytes-Used' + attribute :count, aliases: 'X-Container-Object-Count' attr_writer :public @@ -23,8 +23,8 @@ def destroy def files @files ||= begin Fog::OpenStack::Storage::Files.new( - :directory => self, - :service => service + directory: self, + service: service ) end end @@ -34,14 +34,14 @@ def public_url @public_url ||= begin service.public_url(key) - rescue Fog::OpenStack::Storage::NotFound => err - nil + rescue Fog::OpenStack::Storage::NotFound => err + nil end end def save requires :key - service.put_container(key, :public => @public) + service.put_container(key, public: @public) true end end diff --git a/lib/fog/openstack/storage/models/file.rb b/lib/fog/openstack/storage/models/file.rb index 8096f3e94..51ccb1c08 100644 --- a/lib/fog/openstack/storage/models/file.rb +++ b/lib/fog/openstack/storage/models/file.rb @@ -4,39 +4,39 @@ module Fog module OpenStack class Storage class File < Fog::OpenStack::Model - identity :key, :aliases => 'name' - - attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin'] - attribute :cache_control, :aliases => ['Cache-Control'] - attribute :content_length, :aliases => ['bytes', 'Content-Length'], :type => :integer - attribute :content_type, :aliases => ['content_type', 'Content-Type'] - attribute :content_disposition, :aliases => ['content_disposition', 'Content-Disposition'] - attribute :etag, :aliases => ['hash', 'Etag'] - attribute :last_modified, :aliases => ['last_modified', 'Last-Modified'], :type => :time + identity :key, aliases: 'name' + + attribute :access_control_allow_origin, aliases: ['Access-Control-Allow-Origin'] + attribute :cache_control, aliases: ['Cache-Control'] + attribute :content_length, aliases: ['bytes', 'Content-Length'], type: :integer + attribute :content_type, aliases: ['content_type', 'Content-Type'] + attribute :content_disposition, aliases: ['content_disposition', 'Content-Disposition'] + attribute :etag, aliases: ['hash', 'Etag'] + attribute :last_modified, aliases: ['last_modified', 'Last-Modified'], type: :time attribute :metadata - attribute :origin, :aliases => ['Origin'] + attribute :origin, aliases: ['Origin'] # @!attribute [rw] delete_at # A Unix Epoch Timestamp, in integer form, representing the time when this object will be automatically deleted. # @return [Integer] the unix epoch timestamp of when this object will be automatically deleted # @see http://docs.openstack.org/developer/swift/overview_expiring_objects.html - attribute :delete_at, :aliases => ['X-Delete-At'] + attribute :delete_at, aliases: ['X-Delete-At'] # @!attribute [rw] delete_after # A number of seconds representing how long from now this object will be automatically deleted. # @return [Integer] the number of seconds until this object will be automatically deleted # @see http://docs.openstack.org/developer/swift/overview_expiring_objects.html - attribute :delete_after, :aliases => ['X-Delete-After'] + attribute :delete_after, aliases: ['X-Delete-After'] # @!attribute [rw] content_encoding # When you create an object or update its metadata, you can optionally set the Content-Encoding metadata. # This metadata enables you to indicate that the object content is compressed without losing the identity of the # underlying media type (Content-Type) of the file, such as a video. # @see http://docs.openstack.org/developer/swift/api/use_content-encoding_metadata.html#use-content-encoding-metadata - attribute :content_encoding, :aliases => 'Content-Encoding' + attribute :content_encoding, aliases: 'Content-Encoding' def initialize(new_attributes = {}) super - @dirty = if last_modified then false else true end + @dirty = last_modified ? false : true end def body @@ -61,7 +61,7 @@ def copy(target_directory_key, target_file_key, options = {}) options['Origin'] ||= origin if origin options['Content-Encoding'] ||= content_encoding if content_encoding service.copy_object(directory.key, key, target_directory_key, target_file_key, options) - target_directory = service.directories.new(:key => target_directory_key) + target_directory = service.directories.new(key: target_directory_key) target_directory.files.get(target_file_key) end @@ -79,8 +79,8 @@ def metadata def owner=(new_owner) if new_owner attributes[:owner] = { - :display_name => new_owner['DisplayName'], - :id => new_owner['ID'] + display_name: new_owner['DisplayName'], + id: new_owner['ID'] } end end @@ -119,7 +119,7 @@ def save(options = {}) options['Content-Encoding'] = content_encoding if content_encoding options.merge!(metadata_to_headers) - if not @dirty + if !@dirty data = service.post_object(directory.key, key, options) else requires :body @@ -172,7 +172,7 @@ def key_to_header(key) def metadata_attributes if last_modified headers = service.head_object(directory.key, key).headers - headers.reject! { |k, _v| !metadata_attribute?(k) } + headers.select! { |k, _v| metadata_attribute?(k) } else {} end diff --git a/lib/fog/openstack/storage/models/files.rb b/lib/fog/openstack/storage/models/files.rb index 9b4437830..9f0a2caac 100644 --- a/lib/fog/openstack/storage/models/files.rb +++ b/lib/fog/openstack/storage/models/files.rb @@ -16,9 +16,9 @@ class Files < Fog::OpenStack::Collection def all(options = {}) requires :directory options = { - 'limit' => limit, + 'limit' => limit, 'marker' => marker, - 'path' => path, + 'path' => path, 'prefix' => prefix }.merge!(options) merge_attributes(options) @@ -41,7 +41,7 @@ def each subset.each_file_this_page { |f| yield f } while subset.length == (subset.limit || 10000) - subset = subset.all(:marker => subset.last.key) + subset = subset.all(marker: subset.last.key) subset.each_file_this_page { |f| yield f } end @@ -52,8 +52,8 @@ def each def get(key, &block) requires :directory data = service.get_object(directory.key, key, &block) - file_data = data.headers.merge(:body => data.body, - :key => key) + file_data = data.headers.merge(body: data.body, + key: key) new(file_data) rescue Fog::OpenStack::Storage::NotFound nil @@ -79,7 +79,7 @@ def get_https_url(key, expires, options = {}) def head(key, _options = {}) requires :directory data = service.head_object(directory.key, key) - file_data = data.headers.merge(:key => key) + file_data = data.headers.merge(key: key) new(file_data) rescue Fog::OpenStack::Storage::NotFound nil @@ -87,7 +87,7 @@ def head(key, _options = {}) def new(attributes = {}) requires :directory - super({:directory => directory}.merge!(attributes)) + super({ directory: directory }.merge!(attributes)) end end end diff --git a/lib/fog/openstack/storage/requests/copy_object.rb b/lib/fog/openstack/storage/requests/copy_object.rb index f94a723a9..6aa2287b7 100644 --- a/lib/fog/openstack/storage/requests/copy_object.rb +++ b/lib/fog/openstack/storage/requests/copy_object.rb @@ -11,11 +11,11 @@ class Real # * target_object_name<~String> - Name for new copy of object # * options<~Hash> - Additional headers def copy_object(source_container_name, source_object_name, target_container_name, target_object_name, options = {}) - headers = {'X-Copy-From' => "/#{source_container_name}/#{source_object_name}"}.merge(options) - request(:expects => [201, 202], - :headers => headers, - :method => 'PUT', - :path => "#{Fog::OpenStack.escape(target_container_name)}/#{Fog::OpenStack.escape(target_object_name)}") + headers = { 'X-Copy-From' => "/#{source_container_name}/#{source_object_name}" }.merge(options) + request(expects: [201, 202], + headers: headers, + method: 'PUT', + path: "#{Fog::OpenStack.escape(target_container_name)}/#{Fog::OpenStack.escape(target_object_name)}") end end end diff --git a/lib/fog/openstack/storage/requests/delete_container.rb b/lib/fog/openstack/storage/requests/delete_container.rb index 2fa501eb3..a63c9764d 100644 --- a/lib/fog/openstack/storage/requests/delete_container.rb +++ b/lib/fog/openstack/storage/requests/delete_container.rb @@ -9,9 +9,9 @@ class Real # def delete_container(name) request( - :expects => 204, - :method => 'DELETE', - :path => Fog::OpenStack.escape(name) + expects: 204, + method: 'DELETE', + path: Fog::OpenStack.escape(name) ) end end diff --git a/lib/fog/openstack/storage/requests/delete_multiple_objects.rb b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb index ca69fecfa..2424ed1ef 100644 --- a/lib/fog/openstack/storage/requests/delete_multiple_objects.rb +++ b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb @@ -49,12 +49,12 @@ def delete_multiple_objects(container, object_names, options = {}) end.join("\n") response = request({ - :expects => 200, - :method => 'DELETE', - :headers => options.merge('Content-Type' => 'text/plain', - 'Accept' => 'application/json'), - :body => body, - :query => {'bulk-delete' => true} + expects: 200, + method: 'DELETE', + headers: options.merge('Content-Type' => 'text/plain', + 'Accept' => 'application/json'), + body: body, + query: { 'bulk-delete' => true } }, false) response.body = Fog::JSON.decode(response.body) response diff --git a/lib/fog/openstack/storage/requests/delete_object.rb b/lib/fog/openstack/storage/requests/delete_object.rb index 7b6954cea..fc83bc711 100644 --- a/lib/fog/openstack/storage/requests/delete_object.rb +++ b/lib/fog/openstack/storage/requests/delete_object.rb @@ -10,9 +10,9 @@ class Real # def delete_object(container, object) request( - :expects => 204, - :method => 'DELETE', - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" + expects: 204, + method: 'DELETE', + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" ) end end diff --git a/lib/fog/openstack/storage/requests/delete_static_large_object.rb b/lib/fog/openstack/storage/requests/delete_static_large_object.rb index 50e6dd0f1..33b85fe1f 100644 --- a/lib/fog/openstack/storage/requests/delete_static_large_object.rb +++ b/lib/fog/openstack/storage/requests/delete_static_large_object.rb @@ -25,12 +25,12 @@ class Real # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/static-large-objects.html def delete_static_large_object(container, object, options = {}) response = request({ - :expects => 200, - :method => 'DELETE', - :headers => options.merge('Content-Type' => 'text/plain', - 'Accept' => 'application/json'), - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}", - :query => {'multipart-manifest' => 'delete'} + expects: 200, + method: 'DELETE', + headers: options.merge('Content-Type' => 'text/plain', + 'Accept' => 'application/json'), + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}", + query: { 'multipart-manifest' => 'delete' } }, false) response.body = Fog::JSON.decode(response.body) response diff --git a/lib/fog/openstack/storage/requests/get_container.rb b/lib/fog/openstack/storage/requests/get_container.rb index 8f8f2b1c2..1583e07cc 100644 --- a/lib/fog/openstack/storage/requests/get_container.rb +++ b/lib/fog/openstack/storage/requests/get_container.rb @@ -30,10 +30,10 @@ class Real def get_container(container, options = {}) options = options.reject { |_key, value| value.nil? } request( - :expects => 200, - :method => 'GET', - :path => Fog::OpenStack.escape(container), - :query => {'format' => 'json'}.merge!(options) + expects: 200, + method: 'GET', + path: Fog::OpenStack.escape(container), + query: { 'format' => 'json' }.merge!(options) ) end end diff --git a/lib/fog/openstack/storage/requests/get_containers.rb b/lib/fog/openstack/storage/requests/get_containers.rb index b3d0835f4..64a6cc2d3 100644 --- a/lib/fog/openstack/storage/requests/get_containers.rb +++ b/lib/fog/openstack/storage/requests/get_containers.rb @@ -19,10 +19,10 @@ class Real def get_containers(options = {}) options = options.reject { |_key, value| value.nil? } request( - :expects => [200, 204], - :method => 'GET', - :path => '', - :query => {'format' => 'json'}.merge!(options) + expects: [200, 204], + method: 'GET', + path: '', + query: { 'format' => 'json' }.merge!(options) ) end end diff --git a/lib/fog/openstack/storage/requests/get_object.rb b/lib/fog/openstack/storage/requests/get_object.rb index 479038723..1ebe3d431 100644 --- a/lib/fog/openstack/storage/requests/get_object.rb +++ b/lib/fog/openstack/storage/requests/get_object.rb @@ -10,9 +10,9 @@ class Real # def get_object(container, object, &block) params = { - :expects => 200, - :method => 'GET', - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" + expects: 200, + method: 'GET', + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" } if block_given? diff --git a/lib/fog/openstack/storage/requests/get_object_http_url.rb b/lib/fog/openstack/storage/requests/get_object_http_url.rb index ef79757d4..cdbc7c8df 100644 --- a/lib/fog/openstack/storage/requests/get_object_http_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_http_url.rb @@ -13,7 +13,7 @@ class Real # * response<~Excon::Response>: # * body<~String> - url for object def get_object_http_url(container, object, expires, options = {}) - create_temp_url(container, object, expires, "GET", {:port => 80}.merge(options).merge(:scheme => "http")) + create_temp_url(container, object, expires, "GET", { port: 80 }.merge(options).merge(scheme: "http")) end end end diff --git a/lib/fog/openstack/storage/requests/get_object_https_url.rb b/lib/fog/openstack/storage/requests/get_object_https_url.rb index 268df6726..e13720a68 100644 --- a/lib/fog/openstack/storage/requests/get_object_https_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_https_url.rb @@ -13,7 +13,7 @@ class Real # * response<~Excon::Response>: # * body<~String> - url for object def get_object_https_url(container, object, expires, options = {}) - create_temp_url(container, object, expires, "GET", {:port => 443}.merge(options).merge(:scheme => "https")) + create_temp_url(container, object, expires, "GET", { port: 443 }.merge(options).merge(scheme: "https")) end # creates a temporary url @@ -51,7 +51,7 @@ def create_temp_url(container, object, expires, method, options = {}) end expires = expires.to_i - object_path_escaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object, "/")}" + object_path_escaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object, '/')}" object_path_unescaped = "#{@path}/#{Fog::OpenStack.escape(container)}/#{object}" string_to_sign = "#{method}\n#{expires}\n#{object_path_unescaped}" @@ -64,11 +64,11 @@ def create_temp_url(container, object, expires, method, options = {}) query[:filename] = options[:filename] if options[:filename] temp_url_options = { - :scheme => scheme, - :host => host, - :port => port, - :path => object_path_escaped, - :query => query.map { |k, v| "#{k}=#{v}" }.join('&') + scheme: scheme, + host: host, + port: port, + path: object_path_escaped, + query: query.map { |k, v| "#{k}=#{v}" }.join('&') } URI::Generic.build(temp_url_options).to_s end diff --git a/lib/fog/openstack/storage/requests/head_container.rb b/lib/fog/openstack/storage/requests/head_container.rb index 141e4cb04..da9be9196 100644 --- a/lib/fog/openstack/storage/requests/head_container.rb +++ b/lib/fog/openstack/storage/requests/head_container.rb @@ -14,10 +14,10 @@ class Real # * 'X-Container-Bytes-Used'<~String> - Bytes used def head_container(container) request( - :expects => 204, - :method => 'HEAD', - :path => Fog::OpenStack.escape(container), - :query => {'format' => 'json'} + expects: 204, + method: 'HEAD', + path: Fog::OpenStack.escape(container), + query: { 'format' => 'json' } ) end end diff --git a/lib/fog/openstack/storage/requests/head_containers.rb b/lib/fog/openstack/storage/requests/head_containers.rb index 1cbdffe18..8fff2cebd 100644 --- a/lib/fog/openstack/storage/requests/head_containers.rb +++ b/lib/fog/openstack/storage/requests/head_containers.rb @@ -11,10 +11,10 @@ class Real # * 'X-Account-Bytes-Used'<~String> - Bytes used def head_containers request( - :expects => 200..299, - :method => 'HEAD', - :path => '', - :query => {'format' => 'json'} + expects: 200..299, + method: 'HEAD', + path: '', + query: { 'format' => 'json' } ) end end diff --git a/lib/fog/openstack/storage/requests/head_object.rb b/lib/fog/openstack/storage/requests/head_object.rb index 647e289e6..545793f02 100644 --- a/lib/fog/openstack/storage/requests/head_object.rb +++ b/lib/fog/openstack/storage/requests/head_object.rb @@ -10,9 +10,9 @@ class Real # def head_object(container, object) request({ - :expects => 200, - :method => 'HEAD', - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" + expects: 200, + method: 'HEAD', + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" }, false) end end diff --git a/lib/fog/openstack/storage/requests/post_object.rb b/lib/fog/openstack/storage/requests/post_object.rb index 2b66db150..094f22abb 100644 --- a/lib/fog/openstack/storage/requests/post_object.rb +++ b/lib/fog/openstack/storage/requests/post_object.rb @@ -10,12 +10,11 @@ class Real # * headers<~Hash> - metadata headers for object. Defaults to {}. # def post_object(container, object, headers = {}) - params = { - :expects => 202, - :headers => headers, - :method => 'POST', - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" + expects: 202, + headers: headers, + method: 'POST', + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" } request(params) diff --git a/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb b/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb index c5ca3a455..3cc484236 100644 --- a/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb +++ b/lib/fog/openstack/storage/requests/post_set_meta_temp_url_key.rb @@ -22,9 +22,9 @@ class Real # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Set_Account_Metadata-d1a4460.html def post_set_meta_temp_url_key(key) request( - :expects => [201, 202, 204], - :method => 'POST', - :headers => {'X-Account-Meta-Temp-Url-Key' => key} + expects: [201, 202, 204], + method: 'POST', + headers: { 'X-Account-Meta-Temp-Url-Key' => key } ) end end diff --git a/lib/fog/openstack/storage/requests/public_url.rb b/lib/fog/openstack/storage/requests/public_url.rb index ca2261863..70ffcfa98 100644 --- a/lib/fog/openstack/storage/requests/public_url.rb +++ b/lib/fog/openstack/storage/requests/public_url.rb @@ -10,6 +10,7 @@ module PublicUrl # def public_url(container = nil, object = nil) return nil if container.nil? + u = "#{url}/#{Fog::OpenStack.escape(container)}" u << "/#{Fog::OpenStack.escape(object)}" unless object.nil? u diff --git a/lib/fog/openstack/storage/requests/put_container.rb b/lib/fog/openstack/storage/requests/put_container.rb index ba09d8f5d..af17f86bb 100644 --- a/lib/fog/openstack/storage/requests/put_container.rb +++ b/lib/fog/openstack/storage/requests/put_container.rb @@ -12,10 +12,10 @@ def put_container(name, options = {}) headers['X-Container-Read'] = '.r:*' if options[:public] headers['X-Remove-Container-Read'] = 'x' if options[:public] == false request( - :expects => [201, 202], - :method => 'PUT', - :path => Fog::OpenStack.escape(name), - :headers => headers + expects: [201, 202], + method: 'PUT', + path: Fog::OpenStack.escape(name), + headers: headers ) end end diff --git a/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb b/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb index 4c0124ab5..058a45d2c 100644 --- a/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_dynamic_obj_manifest.rb @@ -27,12 +27,12 @@ class Real # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/dynamic-large-object-creation.html def put_dynamic_obj_manifest(container, object, options = {}) path = "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" - headers = {'X-Object-Manifest' => path}.merge(options) + headers = { 'X-Object-Manifest' => path }.merge(options) request( - :expects => 201, - :headers => headers, - :method => 'PUT', - :path => path + expects: 201, + headers: headers, + method: 'PUT', + path: path ) end end diff --git a/lib/fog/openstack/storage/requests/put_object.rb b/lib/fog/openstack/storage/requests/put_object.rb index ce1a3d187..c3cf26a65 100644 --- a/lib/fog/openstack/storage/requests/put_object.rb +++ b/lib/fog/openstack/storage/requests/put_object.rb @@ -17,20 +17,20 @@ class Real # def put_object(container, object, data, options = {}, &block) if block_given? - params = {:request_block => block} + params = { request_block: block } headers = options else data = Fog::Storage.parse_data(data) headers = data[:headers].merge!(options) - params = {:body => data[:body]} + params = { body: data[:body] } end params.merge!( - :expects => [201, 202], - :idempotent => !params[:request_block], - :headers => headers, - :method => 'PUT', - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" + expects: [201, 202], + idempotent: !params[:request_block], + headers: headers, + method: 'PUT', + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}" ) request(params) @@ -40,12 +40,13 @@ def put_object(container, object, data, options = {}, &block) class Mock require 'digest' - def put_object(container, object, data, options = {}, &block) + def put_object(_container, _object, data, _options = {}) dgst = Digest::MD5.new if block_given? Kernel.loop do chunk = yield break if chunk.empty? + dgst.update chunk end elsif data.kind_of?(String) @@ -56,7 +57,7 @@ def put_object(container, object, data, options = {}, &block) response = Excon::Response.new response.status = 201 response.body = '' - response.headers = {'ETag' => dgst.hexdigest} + response.headers = { 'ETag' => dgst.hexdigest } response end end diff --git a/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb b/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb index f031c1093..87441f023 100644 --- a/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb +++ b/lib/fog/openstack/storage/requests/put_static_obj_manifest.rb @@ -41,12 +41,12 @@ class Real # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/static-large-objects.html def put_static_obj_manifest(container, object, segments, options = {}) request( - :expects => 201, - :method => 'PUT', - :headers => options, - :body => Fog::JSON.encode(segments), - :path => "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}", - :query => {'multipart-manifest' => 'put'} + expects: 201, + method: 'PUT', + headers: options, + body: Fog::JSON.encode(segments), + path: "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}", + query: { 'multipart-manifest' => 'put' } ) end end diff --git a/lib/fog/openstack/volume.rb b/lib/fog/openstack/volume.rb index 6fc49815c..70a6403fd 100644 --- a/lib/fog/openstack/volume.rb +++ b/lib/fog/openstack/volume.rb @@ -1,5 +1,3 @@ - - module Fog module OpenStack class Volume < Fog::Service diff --git a/lib/fog/openstack/volume/models/transfer.rb b/lib/fog/openstack/volume/models/transfer.rb index fc711e972..949336015 100644 --- a/lib/fog/openstack/volume/models/transfer.rb +++ b/lib/fog/openstack/volume/models/transfer.rb @@ -6,7 +6,7 @@ class Volume class Transfer < Fog::OpenStack::Model def save requires :name, :volume_id - data = service.create_transfer(volume_id, :name => name) + data = service.create_transfer(volume_id, name: name) merge_attributes(data.body['transfer']) true end diff --git a/lib/fog/openstack/volume/models/volume.rb b/lib/fog/openstack/volume/models/volume.rb index 565e71c09..b78460d3b 100644 --- a/lib/fog/openstack/volume/models/volume.rb +++ b/lib/fog/openstack/volume/models/volume.rb @@ -7,11 +7,11 @@ class Volume < Fog::OpenStack::Model attribute :metadata attribute :status attribute :size - attribute :volume_type, :aliases => %w(volumeType type) - attribute :snapshot_id, :aliases => 'snapshotId' - attribute :imageRef, :aliases => 'image_id' - attribute :availability_zone, :aliases => 'availabilityZone' - attribute :created_at, :aliases => 'createdAt' + attribute :volume_type, aliases: %w(volumeType type) + attribute :snapshot_id, aliases: 'snapshotId' + attribute :imageRef, aliases: 'image_id' + attribute :availability_zone, aliases: 'availabilityZone' + attribute :created_at, aliases: 'createdAt' attribute :attachments attribute :source_volid @@ -33,7 +33,7 @@ def ready? def reset_status(status) requires :id - service.action(id, 'os-reset_status' => {:status => status}) + service.action(id, 'os-reset_status' => { status: status }) end def create_metadata(metadata) diff --git a/lib/fog/openstack/volume/requests/accept_transfer.rb b/lib/fog/openstack/volume/requests/accept_transfer.rb index aaceb873b..c56ddf838 100644 --- a/lib/fog/openstack/volume/requests/accept_transfer.rb +++ b/lib/fog/openstack/volume/requests/accept_transfer.rb @@ -10,10 +10,10 @@ def accept_transfer(transfer_id, auth_key) } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "os-volume-transfer/#{transfer_id}/accept" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "os-volume-transfer/#{transfer_id}/accept" ) end end diff --git a/lib/fog/openstack/volume/requests/action.rb b/lib/fog/openstack/volume/requests/action.rb index 1b9addcc7..630e0bf1a 100644 --- a/lib/fog/openstack/volume/requests/action.rb +++ b/lib/fog/openstack/volume/requests/action.rb @@ -4,10 +4,10 @@ class Volume module Real def action(id, data) request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "volumes/#{id}/action" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "volumes/#{id}/action" ) end end diff --git a/lib/fog/openstack/volume/requests/create_backup.rb b/lib/fog/openstack/volume/requests/create_backup.rb index 8e5278191..fa5542635 100644 --- a/lib/fog/openstack/volume/requests/create_backup.rb +++ b/lib/fog/openstack/volume/requests/create_backup.rb @@ -9,19 +9,19 @@ def create_backup(attributes) :description, :volume_id, :incremental, - :force, + :force ] # Filter only allowed creation attributes data = { - :backup => attributes.select { |key, _value| desired_options.include?(key.to_sym) } + backup: attributes.select { |key, _value| desired_options.include?(key.to_sym) } } request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => 'backups' + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: 'backups' ) end end @@ -38,7 +38,7 @@ def create_backup(_options = {}) "status" => "available", "size" => 1, "object_count" => 16, - "container" => "testcontainer", + "container" => "testcontainer" } } response diff --git a/lib/fog/openstack/volume/requests/create_snapshot.rb b/lib/fog/openstack/volume/requests/create_snapshot.rb index 1d6c394a3..9cd5b3c8e 100644 --- a/lib/fog/openstack/volume/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/requests/create_snapshot.rb @@ -6,10 +6,10 @@ module Real def _create_snapshot(data) request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "snapshots" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "snapshots" ) end end diff --git a/lib/fog/openstack/volume/requests/create_transfer.rb b/lib/fog/openstack/volume/requests/create_transfer.rb index 94e2e2857..956337824 100644 --- a/lib/fog/openstack/volume/requests/create_transfer.rb +++ b/lib/fog/openstack/volume/requests/create_transfer.rb @@ -13,10 +13,10 @@ def create_transfer(volume_id, options = {}) end request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => 'os-volume-transfer' + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: 'os-volume-transfer' ) end end diff --git a/lib/fog/openstack/volume/requests/create_volume.rb b/lib/fog/openstack/volume/requests/create_volume.rb index 498739e2d..fb1b1b923 100644 --- a/lib/fog/openstack/volume/requests/create_volume.rb +++ b/lib/fog/openstack/volume/requests/create_volume.rb @@ -12,10 +12,10 @@ def _create_volume(data, options = {}) data['volume'][key] = options[key] end request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "volumes" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "volumes" ) end end diff --git a/lib/fog/openstack/volume/requests/create_volume_type.rb b/lib/fog/openstack/volume/requests/create_volume_type.rb index b0eca9574..a63c8d258 100644 --- a/lib/fog/openstack/volume/requests/create_volume_type.rb +++ b/lib/fog/openstack/volume/requests/create_volume_type.rb @@ -12,10 +12,10 @@ def create_volume_type(options = {}) data['volume_type'][key] = options[key] end request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "types" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "types" ) end end @@ -26,8 +26,8 @@ def create_volume_type(_options = {}) response.status = 202 response.body = { "volume_type" => { - "id" => "6685584b-1eac-4da6-b5c3-555430cf68ff", - "name" => "vol-type-001", + "id" => "6685584b-1eac-4da6-b5c3-555430cf68ff", + "name" => "vol-type-001", "extra_specs" => { "capabilities" => "gpu" } diff --git a/lib/fog/openstack/volume/requests/delete_backup.rb b/lib/fog/openstack/volume/requests/delete_backup.rb index bf76b0ffa..848c6e675 100644 --- a/lib/fog/openstack/volume/requests/delete_backup.rb +++ b/lib/fog/openstack/volume/requests/delete_backup.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_backup(backup_id) request( - :expects => 202, - :method => 'DELETE', - :path => "backups/#{backup_id}" + expects: 202, + method: 'DELETE', + path: "backups/#{backup_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/delete_metadata.rb b/lib/fog/openstack/volume/requests/delete_metadata.rb index e93ba9e92..5108460c6 100644 --- a/lib/fog/openstack/volume/requests/delete_metadata.rb +++ b/lib/fog/openstack/volume/requests/delete_metadata.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_metadata(volume_id, key_name) request( - :expects => [200], - :method => 'DELETE', - :path => "volumes/#{volume_id}/metadata/#{key_name}" + expects: [200], + method: 'DELETE', + path: "volumes/#{volume_id}/metadata/#{key_name}" ) end end diff --git a/lib/fog/openstack/volume/requests/delete_snapshot.rb b/lib/fog/openstack/volume/requests/delete_snapshot.rb index e03d3fefb..0928a61a7 100644 --- a/lib/fog/openstack/volume/requests/delete_snapshot.rb +++ b/lib/fog/openstack/volume/requests/delete_snapshot.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_snapshot(snapshot_id) request( - :expects => 202, - :method => 'DELETE', - :path => "snapshots/#{snapshot_id}" + expects: 202, + method: 'DELETE', + path: "snapshots/#{snapshot_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb b/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb index 69bb6fda1..93d276ed7 100644 --- a/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb +++ b/lib/fog/openstack/volume/requests/delete_snapshot_metadata.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_snapshot_metadata(snapshot_id, key_name) request( - :expects => [200], - :method => 'DELETE', - :path => "snapshots/#{snapshot_id}/metadata/#{key_name}" + expects: [200], + method: 'DELETE', + path: "snapshots/#{snapshot_id}/metadata/#{key_name}" ) end end diff --git a/lib/fog/openstack/volume/requests/delete_transfer.rb b/lib/fog/openstack/volume/requests/delete_transfer.rb index 84ceedbbd..e9678158e 100644 --- a/lib/fog/openstack/volume/requests/delete_transfer.rb +++ b/lib/fog/openstack/volume/requests/delete_transfer.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_transfer(transfer_id) request( - :expects => 202, - :method => 'DELETE', - :path => "os-volume-transfer/#{transfer_id}" + expects: 202, + method: 'DELETE', + path: "os-volume-transfer/#{transfer_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/delete_volume.rb b/lib/fog/openstack/volume/requests/delete_volume.rb index fbc0748c3..1124fcbaf 100644 --- a/lib/fog/openstack/volume/requests/delete_volume.rb +++ b/lib/fog/openstack/volume/requests/delete_volume.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_volume(volume_id) request( - :expects => 202, - :method => 'DELETE', - :path => "volumes/#{volume_id}" + expects: 202, + method: 'DELETE', + path: "volumes/#{volume_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/delete_volume_type.rb b/lib/fog/openstack/volume/requests/delete_volume_type.rb index 2313d5559..5e26b2a6a 100644 --- a/lib/fog/openstack/volume/requests/delete_volume_type.rb +++ b/lib/fog/openstack/volume/requests/delete_volume_type.rb @@ -4,9 +4,9 @@ class Volume module Real def delete_volume_type(volume_type_id) request( - :expects => 202, - :method => 'DELETE', - :path => "types/#{volume_type_id}" + expects: 202, + method: 'DELETE', + path: "types/#{volume_type_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/extend_volume.rb b/lib/fog/openstack/volume/requests/extend_volume.rb index 421cc40dd..41b66358e 100644 --- a/lib/fog/openstack/volume/requests/extend_volume.rb +++ b/lib/fog/openstack/volume/requests/extend_volume.rb @@ -3,12 +3,12 @@ module OpenStack class Volume module Real def extend_volume(volume_id, size) - body = {'os-extend' => {'new_size' => size}} + body = { 'os-extend' => { 'new_size' => size } } request( - :expects => 202, - :method => 'POST', - :path => "volumes/#{volume_id}/action", - :body => Fog::JSON.encode(body) + expects: 202, + method: 'POST', + path: "volumes/#{volume_id}/action", + body: Fog::JSON.encode(body) ) end end diff --git a/lib/fog/openstack/volume/requests/get_backup_details.rb b/lib/fog/openstack/volume/requests/get_backup_details.rb index 1f5a346be..a317e1329 100644 --- a/lib/fog/openstack/volume/requests/get_backup_details.rb +++ b/lib/fog/openstack/volume/requests/get_backup_details.rb @@ -4,9 +4,9 @@ class Volume module Real def get_backup_details(backup_id) request( - :expects => 200, - :method => 'GET', - :path => "backups/#{backup_id}" + expects: 200, + method: 'GET', + path: "backups/#{backup_id}" ) end end @@ -23,7 +23,7 @@ def get_backup_details(_backup_id) "status" => "available", "size" => 1, "object_count" => 16, - "container" => "testcontainer", + "container" => "testcontainer" } } response diff --git a/lib/fog/openstack/volume/requests/get_quota.rb b/lib/fog/openstack/volume/requests/get_quota.rb index 1e25662c8..f54f40e8a 100644 --- a/lib/fog/openstack/volume/requests/get_quota.rb +++ b/lib/fog/openstack/volume/requests/get_quota.rb @@ -4,9 +4,9 @@ class Volume module Real def get_quota(tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "/os-quota-sets/#{tenant_id}" + expects: 200, + method: 'GET', + path: "/os-quota-sets/#{tenant_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/get_quota_defaults.rb b/lib/fog/openstack/volume/requests/get_quota_defaults.rb index 101cfa266..70a1a4298 100644 --- a/lib/fog/openstack/volume/requests/get_quota_defaults.rb +++ b/lib/fog/openstack/volume/requests/get_quota_defaults.rb @@ -4,9 +4,9 @@ class Volume module Real def get_quota_defaults(tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "/os-quota-sets/#{tenant_id}/defaults" + expects: 200, + method: 'GET', + path: "/os-quota-sets/#{tenant_id}/defaults" ) end end diff --git a/lib/fog/openstack/volume/requests/get_quota_usage.rb b/lib/fog/openstack/volume/requests/get_quota_usage.rb index 18431fe33..4e251ae78 100644 --- a/lib/fog/openstack/volume/requests/get_quota_usage.rb +++ b/lib/fog/openstack/volume/requests/get_quota_usage.rb @@ -4,9 +4,9 @@ class Volume module Real def get_quota_usage(tenant_id) request( - :expects => 200, - :method => 'GET', - :path => "/os-quota-sets/#{tenant_id}?usage=True" + expects: 200, + method: 'GET', + path: "/os-quota-sets/#{tenant_id}?usage=True" ) end end @@ -19,20 +19,20 @@ def get_quota_usage(tenant_id) 'quota_set' => { 'gigabytes' => { 'reserved' => 0, - 'limit' => -1, - 'in_use' => 160 + 'limit' => -1, + 'in_use' => 160 }, 'snapshots' => { 'reserved' => 0, - 'limit' => 50, - 'in_use' => 3 + 'limit' => 50, + 'in_use' => 3 }, - 'volumes' => { + 'volumes' => { 'reserved' => 0, - 'limit' => 50, - 'in_use' => 5 + 'limit' => 50, + 'in_use' => 5 }, - 'id' => tenant_id + 'id' => tenant_id } } response diff --git a/lib/fog/openstack/volume/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/requests/get_snapshot_details.rb index 46a198a90..495c3dc82 100644 --- a/lib/fog/openstack/volume/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/requests/get_snapshot_details.rb @@ -4,9 +4,9 @@ class Volume module Real def get_snapshot_details(snapshot_id) request( - :expects => 200, - :method => 'GET', - :path => "snapshots/#{snapshot_id}" + expects: 200, + method: 'GET', + path: "snapshots/#{snapshot_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/get_transfer_details.rb b/lib/fog/openstack/volume/requests/get_transfer_details.rb index 58ac36d37..1ecd0fca7 100644 --- a/lib/fog/openstack/volume/requests/get_transfer_details.rb +++ b/lib/fog/openstack/volume/requests/get_transfer_details.rb @@ -6,9 +6,9 @@ class Volume module Real def get_transfer_details(transfer_id) request( - :expects => 200, - :method => 'GET', - :path => "os-volume-transfer/#{transfer_id}" + expects: 200, + method: 'GET', + path: "os-volume-transfer/#{transfer_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/get_volume_details.rb b/lib/fog/openstack/volume/requests/get_volume_details.rb index 7e9e85fdc..0986d9625 100644 --- a/lib/fog/openstack/volume/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/requests/get_volume_details.rb @@ -4,9 +4,9 @@ class Volume module Real def get_volume_details(volume_id) request( - :expects => 200, - :method => 'GET', - :path => "volumes/#{volume_id}" + expects: 200, + method: 'GET', + path: "volumes/#{volume_id}" ) end end diff --git a/lib/fog/openstack/volume/requests/get_volume_type_details.rb b/lib/fog/openstack/volume/requests/get_volume_type_details.rb index 57cd39aa0..26302d088 100644 --- a/lib/fog/openstack/volume/requests/get_volume_type_details.rb +++ b/lib/fog/openstack/volume/requests/get_volume_type_details.rb @@ -4,9 +4,9 @@ class Volume module Real def get_volume_type_details(volume_type_id) request( - :expects => 200, - :method => 'GET', - :path => "types/#{volume_type_id}" + expects: 200, + method: 'GET', + path: "types/#{volume_type_id}" ) end end @@ -17,8 +17,8 @@ def get_volume_type_details(_volume_type_id) response.status = 200 response.body = { "volume_type" => { - "id" => "1", - "name" => "type 1", + "id" => "1", + "name" => "type 1", "extra_specs" => { "volume_backend_name" => "type 1 backend name" } diff --git a/lib/fog/openstack/volume/requests/list_backups.rb b/lib/fog/openstack/volume/requests/list_backups.rb index 74fcec90c..797fb0397 100644 --- a/lib/fog/openstack/volume/requests/list_backups.rb +++ b/lib/fog/openstack/volume/requests/list_backups.rb @@ -4,10 +4,10 @@ class Volume module Real def list_backups(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'backups', - :query => options + expects: 200, + method: 'GET', + path: 'backups', + query: options ) end end diff --git a/lib/fog/openstack/volume/requests/list_backups_detailed.rb b/lib/fog/openstack/volume/requests/list_backups_detailed.rb index b9f425523..f95d32a0b 100644 --- a/lib/fog/openstack/volume/requests/list_backups_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_backups_detailed.rb @@ -4,10 +4,10 @@ class Volume module Real def list_backups_detailed(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'backups/detail', - :query => options + expects: 200, + method: 'GET', + path: 'backups/detail', + query: options ) end end @@ -24,7 +24,7 @@ def list_backups_detailed(_options = {}) "status" => "available", "size" => 1, "object_count" => 16, - "container" => "testcontainer", + "container" => "testcontainer" }, { "id" => "2", @@ -33,7 +33,7 @@ def list_backups_detailed(_options = {}) "status" => "available", "size" => 1, "object_count" => 16, - "container" => "testcontainer", + "container" => "testcontainer" } ] response.body = { 'backups' => data[:backups] } diff --git a/lib/fog/openstack/volume/requests/list_snapshots.rb b/lib/fog/openstack/volume/requests/list_snapshots.rb index acc7242d5..facd337e0 100644 --- a/lib/fog/openstack/volume/requests/list_snapshots.rb +++ b/lib/fog/openstack/volume/requests/list_snapshots.rb @@ -18,10 +18,10 @@ def list_snapshots(options = true, options_deprecated = {}) end request( - :expects => 200, - :method => 'GET', - :path => path, - :query => query + expects: 200, + method: 'GET', + path: path, + query: query ) end end diff --git a/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb b/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb index 3879ecf97..7a6c9efb5 100644 --- a/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_snapshots_detailed.rb @@ -4,10 +4,10 @@ class Volume module Real def list_snapshots_detailed(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'snapshots/detail', - :query => options + expects: 200, + method: 'GET', + path: 'snapshots/detail', + query: options ) end end diff --git a/lib/fog/openstack/volume/requests/list_transfers.rb b/lib/fog/openstack/volume/requests/list_transfers.rb index 52868e450..73932b8cf 100644 --- a/lib/fog/openstack/volume/requests/list_transfers.rb +++ b/lib/fog/openstack/volume/requests/list_transfers.rb @@ -6,10 +6,10 @@ class Volume module Real def list_transfers(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-volume-transfer', - :query => options + expects: 200, + method: 'GET', + path: 'os-volume-transfer', + query: options ) end end diff --git a/lib/fog/openstack/volume/requests/list_transfers_detailed.rb b/lib/fog/openstack/volume/requests/list_transfers_detailed.rb index 824e2c477..5d02054b8 100644 --- a/lib/fog/openstack/volume/requests/list_transfers_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_transfers_detailed.rb @@ -6,10 +6,10 @@ class Volume module Real def list_transfers_detailed(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-volume-transfer/detail', - :query => options + expects: 200, + method: 'GET', + path: 'os-volume-transfer/detail', + query: options ) end end diff --git a/lib/fog/openstack/volume/requests/list_volume_types.rb b/lib/fog/openstack/volume/requests/list_volume_types.rb index ef76d8e1e..76b5c0d95 100644 --- a/lib/fog/openstack/volume/requests/list_volume_types.rb +++ b/lib/fog/openstack/volume/requests/list_volume_types.rb @@ -4,10 +4,10 @@ class Volume module Real def list_volume_types(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'types', - :query => options + expects: 200, + method: 'GET', + path: 'types', + query: options ) end end @@ -18,21 +18,21 @@ def list_volume_types(_options = {}) response.status = 200 data[:volume_types] ||= [ { - "id" => "1", - "name" => "type 1", + "id" => "1", + "name" => "type 1", "extra_specs" => { "volume_backend_name" => "type 1 backend name" } }, { - "id" => "2", - "name" => "type 2", + "id" => "2", + "name" => "type 2", "extra_specs" => { "volume_backend_name" => "type 2 backend name" } } ] - response.body = {'volume_types' => data[:volume_types]} + response.body = { 'volume_types' => data[:volume_types] } response end end diff --git a/lib/fog/openstack/volume/requests/list_volumes.rb b/lib/fog/openstack/volume/requests/list_volumes.rb index 5f5e776d0..73353be21 100644 --- a/lib/fog/openstack/volume/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/requests/list_volumes.rb @@ -18,10 +18,10 @@ def list_volumes(options = true, options_deprecated = {}) end request( - :expects => 200, - :method => 'GET', - :path => path, - :query => query + expects: 200, + method: 'GET', + path: path, + query: query ) end end diff --git a/lib/fog/openstack/volume/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/requests/list_volumes_detailed.rb index a2dc53479..51c9aa037 100644 --- a/lib/fog/openstack/volume/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/requests/list_volumes_detailed.rb @@ -4,10 +4,10 @@ class Volume module Real def list_volumes_detailed(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'volumes/detail', - :query => options + expects: 200, + method: 'GET', + path: 'volumes/detail', + query: options ) end end diff --git a/lib/fog/openstack/volume/requests/list_zones.rb b/lib/fog/openstack/volume/requests/list_zones.rb index f2f606050..a1bd76eda 100644 --- a/lib/fog/openstack/volume/requests/list_zones.rb +++ b/lib/fog/openstack/volume/requests/list_zones.rb @@ -4,10 +4,10 @@ class Volume module Real def list_zones(options = {}) request( - :expects => 200, - :method => 'GET', - :path => 'os-availability-zone.json', - :query => options + expects: 200, + method: 'GET', + path: 'os-availability-zone.json', + query: options ) end end @@ -15,15 +15,15 @@ def list_zones(options = {}) module Mock def list_zones(_options = {}) Excon::Response.new( - :body => { + body: { "availabilityZoneInfo" => [ { - "zoneState" => {"available" => true}, - "zoneName" => "nova" + "zoneState" => { "available" => true }, + "zoneName" => "nova" } ] }, - :status => 200 + status: 200 ) end end diff --git a/lib/fog/openstack/volume/requests/replace_metadata.rb b/lib/fog/openstack/volume/requests/replace_metadata.rb index c03c45cc5..4de81d237 100644 --- a/lib/fog/openstack/volume/requests/replace_metadata.rb +++ b/lib/fog/openstack/volume/requests/replace_metadata.rb @@ -8,10 +8,10 @@ def replace_metadata(volume_id, metadata = {}) } request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'PUT', - :path => "volumes/#{volume_id}/metadata" + body: Fog::JSON.encode(data), + expects: [200], + method: 'PUT', + path: "volumes/#{volume_id}/metadata" ) end end diff --git a/lib/fog/openstack/volume/requests/restore_backup.rb b/lib/fog/openstack/volume/requests/restore_backup.rb index 2b5298cc0..e28b52dd3 100644 --- a/lib/fog/openstack/volume/requests/restore_backup.rb +++ b/lib/fog/openstack/volume/requests/restore_backup.rb @@ -3,12 +3,12 @@ module OpenStack class Volume module Real def restore_backup(backup_id, volume_id = nil, name = nil) - data = {'restore' => {'volume_id' => volume_id, 'name' => name}} + data = { 'restore' => { 'volume_id' => volume_id, 'name' => name } } request( - :expects => 202, - :method => 'POST', - :path => "backups/#{backup_id}/restore", - :body => Fog::JSON.encode(data) + expects: 202, + method: 'POST', + path: "backups/#{backup_id}/restore", + body: Fog::JSON.encode(data) ) end end diff --git a/lib/fog/openstack/volume/requests/snapshot_action.rb b/lib/fog/openstack/volume/requests/snapshot_action.rb index 6065298ba..441a8cad6 100644 --- a/lib/fog/openstack/volume/requests/snapshot_action.rb +++ b/lib/fog/openstack/volume/requests/snapshot_action.rb @@ -4,10 +4,10 @@ class Volume module Real def snapshot_action(id, data) request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'POST', - :path => "snapshots/#{id}/action" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "snapshots/#{id}/action" ) end end diff --git a/lib/fog/openstack/volume/requests/update_metadata.rb b/lib/fog/openstack/volume/requests/update_metadata.rb index 18b480049..091c09aba 100644 --- a/lib/fog/openstack/volume/requests/update_metadata.rb +++ b/lib/fog/openstack/volume/requests/update_metadata.rb @@ -8,10 +8,10 @@ def update_metadata(volume_id, metadata = {}) } request( - :body => Fog::JSON.encode(data), - :expects => [200,202], - :method => 'POST', - :path => "volumes/#{volume_id}/metadata" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'POST', + path: "volumes/#{volume_id}/metadata" ) end end diff --git a/lib/fog/openstack/volume/requests/update_quota.rb b/lib/fog/openstack/volume/requests/update_quota.rb index 3fc2b86e3..aa83df754 100644 --- a/lib/fog/openstack/volume/requests/update_quota.rb +++ b/lib/fog/openstack/volume/requests/update_quota.rb @@ -4,10 +4,10 @@ class Volume module Real def update_quota(tenant_id, options = {}) request( - :body => Fog::JSON.encode('quota_set' => options), - :expects => 200, - :method => 'PUT', - :path => "/os-quota-sets/#{tenant_id}" + body: Fog::JSON.encode('quota_set' => options), + expects: 200, + method: 'PUT', + path: "/os-quota-sets/#{tenant_id}" ) end end @@ -18,7 +18,7 @@ def update_quota(_tenant_id, options = {}) response = Excon::Response.new response.status = 200 - response.body = {'quota_set' => data[:quota_updated]} + response.body = { 'quota_set' => data[:quota_updated] } response end end diff --git a/lib/fog/openstack/volume/requests/update_snapshot.rb b/lib/fog/openstack/volume/requests/update_snapshot.rb index 3c7703550..eb6b8bccd 100644 --- a/lib/fog/openstack/volume/requests/update_snapshot.rb +++ b/lib/fog/openstack/volume/requests/update_snapshot.rb @@ -4,10 +4,10 @@ class Volume module Real def update_snapshot(snapshot_id, data = {}) request( - :body => Fog::JSON.encode('snapshot' => data), - :expects => 200, - :method => 'PUT', - :path => "snapshots/#{snapshot_id}" + body: Fog::JSON.encode('snapshot' => data), + expects: 200, + method: 'PUT', + path: "snapshots/#{snapshot_id}" ) end end @@ -17,6 +17,7 @@ def update_snapshot(snapshot_id, options = {}) unless snapshot_id raise ArgumentError, 'snapshot_id is required' end + response = Excon::Response.new if snapshot = data[:snapshots][snapshot_id] response.status = 200 @@ -25,7 +26,7 @@ def update_snapshot(snapshot_id, options = {}) snapshot['name'] = options['name'] if options['name'] snapshot['description'] = options['description'] if options['description'] snapshot['metadata'] = options['metadata'] if options['metadata'] - response.body = {'snapshot' => snapshot} + response.body = { 'snapshot' => snapshot } response else raise Fog::HP::BlockStorageV2::NotFound diff --git a/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb b/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb index 0ba7015f6..7cd6bfd90 100644 --- a/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb +++ b/lib/fog/openstack/volume/requests/update_snapshot_metadata.rb @@ -8,10 +8,10 @@ def update_snapshot_metadata(snapshot_id, metadata = {}) } request( - :body => Fog::JSON.encode(data), - :expects => [200], - :method => 'POST', - :path => "snapshots/#{snapshot_id}/metadata" + body: Fog::JSON.encode(data), + expects: [200], + method: 'POST', + path: "snapshots/#{snapshot_id}/metadata" ) end end diff --git a/lib/fog/openstack/volume/requests/update_volume.rb b/lib/fog/openstack/volume/requests/update_volume.rb index 67ec2e861..8ecd71a3d 100644 --- a/lib/fog/openstack/volume/requests/update_volume.rb +++ b/lib/fog/openstack/volume/requests/update_volume.rb @@ -5,7 +5,7 @@ module Mock def update_volume(volume_id, data = {}) response = Excon::Response.new response.status = 200 - response.body = {'volume' => data.merge('id' => volume_id)} + response.body = { 'volume' => data.merge('id' => volume_id) } response end end diff --git a/lib/fog/openstack/volume/requests/update_volume_type.rb b/lib/fog/openstack/volume/requests/update_volume_type.rb index 5ba12c889..9c8798233 100644 --- a/lib/fog/openstack/volume/requests/update_volume_type.rb +++ b/lib/fog/openstack/volume/requests/update_volume_type.rb @@ -12,10 +12,10 @@ def update_volume_type(volume_type_id, options = {}) data['volume_type'][key] = options[key] end request( - :body => Fog::JSON.encode(data), - :expects => [200, 202], - :method => 'PUT', - :path => "types/#{volume_type_id}" + body: Fog::JSON.encode(data), + expects: [200, 202], + method: 'PUT', + path: "types/#{volume_type_id}" ) end end @@ -26,8 +26,8 @@ def update_volume_type(_volume_type_id, _options = {}) response.status = 202 response.body = { "volume_type" => { - "id" => "6685584b-1eac-4da6-b5c3-555430cf68ff", - "name" => "vol-type-001", + "id" => "6685584b-1eac-4da6-b5c3-555430cf68ff", + "name" => "vol-type-001", "extra_specs" => { "capabilities" => "gpu" } diff --git a/lib/fog/openstack/volume/v1.rb b/lib/fog/openstack/volume/v1.rb index b46df6fe5..b1208166e 100644 --- a/lib/fog/openstack/volume/v1.rb +++ b/lib/fog/openstack/volume/v1.rb @@ -5,7 +5,7 @@ module Fog module OpenStack class Volume class V1 < Fog::OpenStack::Volume - SUPPORTED_VERSIONS = /v1(\.(0-9))*/ + SUPPORTED_VERSIONS = /v1(\.(0-9))*/.freeze requires :openstack_auth_url diff --git a/lib/fog/openstack/volume/v1/mock.rb b/lib/fog/openstack/volume/v1/mock.rb index dbafe15ce..1ddc6ae1f 100644 --- a/lib/fog/openstack/volume/v1/mock.rb +++ b/lib/fog/openstack/volume/v1/mock.rb @@ -6,11 +6,11 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => {}, - :tenants => {}, - :quota => { + users: {}, + tenants: {}, + quota: { 'gigabytes' => 1000, - 'volumes' => 10, + 'volumes' => 10, 'snapshots' => 10 } } @@ -34,15 +34,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -56,10 +56,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end end diff --git a/lib/fog/openstack/volume/v1/models/transfer.rb b/lib/fog/openstack/volume/v1/models/transfer.rb index 9ef55cd98..8d5e14961 100644 --- a/lib/fog/openstack/volume/v1/models/transfer.rb +++ b/lib/fog/openstack/volume/v1/models/transfer.rb @@ -7,10 +7,10 @@ class V1 class Transfer < Fog::OpenStack::Volume::Transfer identity :id - attribute :auth_key, :aliases => 'authKey' - attribute :created_at, :aliases => 'createdAt' + attribute :auth_key, aliases: 'authKey' + attribute :created_at, aliases: 'createdAt' attribute :name - attribute :volume_id, :aliases => 'volumeId' + attribute :volume_id, aliases: 'volumeId' end end end diff --git a/lib/fog/openstack/volume/v1/models/volume.rb b/lib/fog/openstack/volume/v1/models/volume.rb index d76276add..e3aebe810 100644 --- a/lib/fog/openstack/volume/v1/models/volume.rb +++ b/lib/fog/openstack/volume/v1/models/volume.rb @@ -8,16 +8,16 @@ class Volume < Fog::OpenStack::Volume::Volume identity :id superclass.attributes.each { |attrib| attribute attrib } - attribute :display_name, :aliases => 'displayName' - attribute :display_description, :aliases => 'displayDescription' - attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id' + attribute :display_name, aliases: 'displayName' + attribute :display_description, aliases: 'displayDescription' + attribute :tenant_id, aliases: 'os-vol-tenant-attr:tenant_id' def save requires :display_name, :size data = if id.nil? service.create_volume(display_name, display_description, size, attributes) else - attrib = attributes.select { |key| %i(display_name display_description metadata).include?(key) } + attrib = attributes.select { |key| [:display_name, :display_description, :metadata].include?(key) } service.update_volume(id, attrib) end merge_attributes(data.body['volume']) diff --git a/lib/fog/openstack/volume/v1/requests/create_snapshot.rb b/lib/fog/openstack/volume/v1/requests/create_snapshot.rb index 7cfcfad93..5df79854f 100644 --- a/lib/fog/openstack/volume/v1/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/v1/requests/create_snapshot.rb @@ -10,10 +10,10 @@ class Real def create_snapshot(volume_id, name, description, force = false) data = { 'snapshot' => { - 'volume_id' => volume_id, - 'display_name' => name, + 'volume_id' => volume_id, + 'display_name' => name, 'display_description' => description, - 'force' => force.nil? ? false : force + 'force' => force.nil? ? false : force } } @@ -27,13 +27,13 @@ def create_snapshot(volume_id, name, description, _force = false) response.status = 202 response.body = { "snapshot" => { - "status" => "creating", - "display_name" => name, - "created_at" => Time.now, + "status" => "creating", + "display_name" => name, + "created_at" => Time.now, "display_description" => description, - "volume_id" => volume_id, - "id" => "5", - "size" => 1 + "volume_id" => volume_id, + "id" => "5", + "size" => 1 } } response diff --git a/lib/fog/openstack/volume/v1/requests/create_volume.rb b/lib/fog/openstack/volume/v1/requests/create_volume.rb index 86c0d2ce1..4cb6b3ffb 100644 --- a/lib/fog/openstack/volume/v1/requests/create_volume.rb +++ b/lib/fog/openstack/volume/v1/requests/create_volume.rb @@ -8,9 +8,9 @@ class Real def create_volume(name, description, size, options = {}) data = { 'volume' => { - 'display_name' => name, + 'display_name' => name, 'display_description' => description, - 'size' => size + 'size' => size } } @@ -26,18 +26,18 @@ def create_volume(name, description, size, options = {}) response.status = 202 response.body = { 'volume' => { - 'id' => Fog::Mock.random_numbers(2), - 'display_name' => name, + 'id' => Fog::Mock.random_numbers(2), + 'display_name' => name, 'display_description' => description, - 'metadata' => options['metadata'] || {}, - 'size' => size, - 'status' => 'creating', - 'snapshot_id' => options[:snapshot_id] || nil, - 'image_id' => options[:imageRef] || nil, - 'volume_type' => nil, - 'availability_zone' => 'nova', - 'created_at' => Time.now, - 'attachments' => [] + 'metadata' => options['metadata'] || {}, + 'size' => size, + 'status' => 'creating', + 'snapshot_id' => options[:snapshot_id] || nil, + 'image_id' => options[:imageRef] || nil, + 'volume_type' => nil, + 'availability_zone' => 'nova', + 'created_at' => Time.now, + 'attachments' => [] } } response diff --git a/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb index 6429db1cc..b6557fd94 100644 --- a/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/v1/requests/get_snapshot_details.rb @@ -14,13 +14,13 @@ def get_snapshot_details(_detailed = true) response.status = 200 response.body = { 'snapshot' => { - 'id' => '1', - 'display_name' => 'Snapshot1', + 'id' => '1', + 'display_name' => 'Snapshot1', 'display_description' => 'Volume1 snapshot', - 'size' => 1, - 'volume_id' => '1', - 'status' => 'available', - 'created_at' => Time.now + 'size' => 1, + 'volume_id' => '1', + 'status' => 'available', + 'created_at' => Time.now } } response diff --git a/lib/fog/openstack/volume/v1/requests/get_volume_details.rb b/lib/fog/openstack/volume/v1/requests/get_volume_details.rb index cf43edf2c..344a993f9 100644 --- a/lib/fog/openstack/volume/v1/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/v1/requests/get_volume_details.rb @@ -14,16 +14,16 @@ def get_volume_details(_detailed = true) response.status = 200 response.body = { 'volume' => { - 'id' => '1', - 'display_name' => Fog::Mock.random_letters(rand(8) + 5), - 'display_description' => Fog::Mock.random_letters(rand(12) + 10), - 'size' => 3, - 'volume_type' => nil, - 'snapshot_id' => '4', - 'status' => 'online', - 'availability_zone' => 'nova', - 'created_at' => Time.now, - 'attachments' => [] + 'id' => '1', + 'display_name' => Fog::Mock.random_letters(rand(5..12)), + 'display_description' => Fog::Mock.random_letters(rand(10..21)), + 'size' => 3, + 'volume_type' => nil, + 'snapshot_id' => '4', + 'status' => 'online', + 'availability_zone' => 'nova', + 'created_at' => Time.now, + 'attachments' => [] } } response diff --git a/lib/fog/openstack/volume/v1/requests/list_volumes.rb b/lib/fog/openstack/volume/v1/requests/list_volumes.rb index 805cdd57d..95b158634 100644 --- a/lib/fog/openstack/volume/v1/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/v1/requests/list_volumes.rb @@ -13,30 +13,30 @@ def list_volumes(_options = true, _options_deprecated = {}) response = Excon::Response.new response.status = 200 data[:volumes] ||= [ - {"status" => "available", - "display_description" => "test 1 desc", - "availability_zone" => "nova", - "display_name" => "Volume1", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 1, - "created_at" => Time.now, - "metadata" => {}}, - {"status" => "available", - "display_description" => "test 2 desc", - "availability_zone" => "nova", - "display_name" => "Volume2", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 2, - "created_at" => Time.now, - "metadata" => {}} + { "status" => "available", + "display_description" => "test 1 desc", + "availability_zone" => "nova", + "display_name" => "Volume1", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 1, + "created_at" => Time.now, + "metadata" => {} }, + { "status" => "available", + "display_description" => "test 2 desc", + "availability_zone" => "nova", + "display_name" => "Volume2", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 2, + "created_at" => Time.now, + "metadata" => {} } ] - response.body = {'volumes' => data[:volumes]} + response.body = { 'volumes' => data[:volumes] } response end end diff --git a/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb index 12c461552..c35ec9200 100644 --- a/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/v1/requests/list_volumes_detailed.rb @@ -13,30 +13,30 @@ def list_volumes_detailed(_options = {}) response = Excon::Response.new response.status = 200 data[:volumes] ||= [ - {"status" => "available", - "display_description" => "test 1 desc", - "availability_zone" => "nova", - "display_name" => "Volume1", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 1, - "created_at" => Time.now, - "metadata" => {}}, - {"status" => "available", - "display_description" => "test 2 desc", - "availability_zone" => "nova", - "display_name" => "Volume2", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 2, - "created_at" => Time.now, - "metadata" => {}} + { "status" => "available", + "display_description" => "test 1 desc", + "availability_zone" => "nova", + "display_name" => "Volume1", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 1, + "created_at" => Time.now, + "metadata" => {} }, + { "status" => "available", + "display_description" => "test 2 desc", + "availability_zone" => "nova", + "display_name" => "Volume2", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 2, + "created_at" => Time.now, + "metadata" => {} } ] - response.body = {'volumes' => data[:volumes]} + response.body = { 'volumes' => data[:volumes] } response end end diff --git a/lib/fog/openstack/volume/v1/requests/update_volume.rb b/lib/fog/openstack/volume/v1/requests/update_volume.rb index 3dd666ea6..e83436e10 100644 --- a/lib/fog/openstack/volume/v1/requests/update_volume.rb +++ b/lib/fog/openstack/volume/v1/requests/update_volume.rb @@ -7,10 +7,10 @@ class Volume module Real def update_volume(volume_id, data = {}) request( - :body => Fog::JSON.encode('volume' => data), - :expects => 200, - :method => 'PUT', - :path => "volumes/#{volume_id}" + body: Fog::JSON.encode('volume' => data), + expects: 200, + method: 'PUT', + path: "volumes/#{volume_id}" ) end end diff --git a/lib/fog/openstack/volume/v2.rb b/lib/fog/openstack/volume/v2.rb index d4efd4fae..ad2b07911 100644 --- a/lib/fog/openstack/volume/v2.rb +++ b/lib/fog/openstack/volume/v2.rb @@ -5,7 +5,7 @@ module Fog module OpenStack class Volume class V2 < Fog::OpenStack::Volume - SUPPORTED_VERSIONS = /v2(\.(0-9))*/ + SUPPORTED_VERSIONS = /v2(\.(0-9))*/.freeze requires :openstack_auth_url diff --git a/lib/fog/openstack/volume/v2/mock.rb b/lib/fog/openstack/volume/v2/mock.rb index 262441dbd..c739aea0a 100644 --- a/lib/fog/openstack/volume/v2/mock.rb +++ b/lib/fog/openstack/volume/v2/mock.rb @@ -6,11 +6,11 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :users => {}, - :tenants => {}, - :quota => { + users: {}, + tenants: {}, + quota: { 'gigabytes' => 1000, - 'volumes' => 10, + 'volumes' => 10, 'snapshots' => 10 } } @@ -34,15 +34,15 @@ def initialize(options = {}) management_url.path = '/v1' @openstack_management_url = management_url.to_s - @data ||= {:users => {}} + @data ||= { users: {} } unless @data[:users].find { |u| u['name'] == options[:openstack_username] } id = Fog::Mock.random_numbers(6).to_s @data[:users][id] = { - 'id' => id, - 'name' => options[:openstack_username], - 'email' => "#{options[:openstack_username]}@mock.com", + 'id' => id, + 'name' => options[:openstack_username], + 'email' => "#{options[:openstack_username]}@mock.com", 'tenantId' => Fog::Mock.random_numbers(6).to_s, - 'enabled' => true + 'enabled' => true } end end @@ -56,10 +56,10 @@ def reset_data end def credentials - {:provider => 'openstack', - :openstack_auth_url => @openstack_auth_uri.to_s, - :openstack_auth_token => @auth_token, - :openstack_management_url => @openstack_management_url} + { provider: 'openstack', + openstack_auth_url: @openstack_auth_uri.to_s, + openstack_auth_token: @auth_token, + openstack_management_url: @openstack_management_url } end end end diff --git a/lib/fog/openstack/volume/v2/models/transfer.rb b/lib/fog/openstack/volume/v2/models/transfer.rb index 2739831f5..a29c75f31 100644 --- a/lib/fog/openstack/volume/v2/models/transfer.rb +++ b/lib/fog/openstack/volume/v2/models/transfer.rb @@ -7,10 +7,10 @@ class V2 class Transfer < Fog::OpenStack::Volume::Transfer identity :id - attribute :auth_key, :aliases => 'authKey' - attribute :created_at, :aliases => 'createdAt' + attribute :auth_key, aliases: 'authKey' + attribute :created_at, aliases: 'createdAt' attribute :name - attribute :volume_id, :aliases => 'volumeId' + attribute :volume_id, aliases: 'volumeId' end end end diff --git a/lib/fog/openstack/volume/v2/models/volume.rb b/lib/fog/openstack/volume/v2/models/volume.rb index 79c558c36..b78ea76fe 100644 --- a/lib/fog/openstack/volume/v2/models/volume.rb +++ b/lib/fog/openstack/volume/v2/models/volume.rb @@ -10,14 +10,14 @@ class Volume < Fog::OpenStack::Volume::Volume superclass.attributes.each { |attrib| attribute attrib } attribute :name attribute :description - attribute :tenant_id, :aliases => 'os-vol-tenant-attr:tenant_id' + attribute :tenant_id, aliases: 'os-vol-tenant-attr:tenant_id' def save requires :name, :size data = if id.nil? service.create_volume(name, description, size, attributes) else - service.update_volume(id, attributes.select { |key| %i(name description metadata).include?(key) }) + service.update_volume(id, attributes.select { |key| [:name, :description, :metadata].include?(key) }) end merge_attributes(data.body['volume']) true diff --git a/lib/fog/openstack/volume/v2/requests/create_snapshot.rb b/lib/fog/openstack/volume/v2/requests/create_snapshot.rb index 95fbd0efc..84afdf222 100644 --- a/lib/fog/openstack/volume/v2/requests/create_snapshot.rb +++ b/lib/fog/openstack/volume/v2/requests/create_snapshot.rb @@ -10,10 +10,10 @@ class Real def create_snapshot(volume_id, name, description, force = false) data = { 'snapshot' => { - 'volume_id' => volume_id, - 'name' => name, + 'volume_id' => volume_id, + 'name' => name, 'description' => description, - 'force' => force.nil? ? false : force + 'force' => force.nil? ? false : force } } @@ -27,13 +27,13 @@ def create_snapshot(volume_id, name, description, _force = false) response.status = 202 response.body = { "snapshot" => { - "status" => "creating", - "name" => name, - "created_at" => Time.now, + "status" => "creating", + "name" => name, + "created_at" => Time.now, "description" => description, - "volume_id" => volume_id, - "id" => "5", - "size" => 1 + "volume_id" => volume_id, + "id" => "5", + "size" => 1 } } response diff --git a/lib/fog/openstack/volume/v2/requests/create_volume.rb b/lib/fog/openstack/volume/v2/requests/create_volume.rb index ca5361214..17dd3fbce 100644 --- a/lib/fog/openstack/volume/v2/requests/create_volume.rb +++ b/lib/fog/openstack/volume/v2/requests/create_volume.rb @@ -8,9 +8,9 @@ class Real def create_volume(name, description, size, options = {}) data = { 'volume' => { - 'name' => name, + 'name' => name, 'description' => description, - 'size' => size + 'size' => size } } @@ -26,18 +26,18 @@ def create_volume(name, description, size, options = {}) response.status = 202 response.body = { 'volume' => { - 'id' => Fog::Mock.random_numbers(2), - 'name' => name, - 'description' => description, - 'metadata' => options['metadata'] || {}, - 'size' => size, - 'status' => 'creating', - 'snapshot_id' => options[:snapshot_id] || nil, - 'image_id' => options[:imageRef] || nil, - 'volume_type' => nil, + 'id' => Fog::Mock.random_numbers(2), + 'name' => name, + 'description' => description, + 'metadata' => options['metadata'] || {}, + 'size' => size, + 'status' => 'creating', + 'snapshot_id' => options[:snapshot_id] || nil, + 'image_id' => options[:imageRef] || nil, + 'volume_type' => nil, 'availability_zone' => 'nova', - 'created_at' => Time.now, - 'attachments' => [] + 'created_at' => Time.now, + 'attachments' => [] } } response diff --git a/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb b/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb index 8594d9ddb..ab6727e2e 100644 --- a/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb +++ b/lib/fog/openstack/volume/v2/requests/get_snapshot_details.rb @@ -14,13 +14,13 @@ def get_snapshot_details(_detailed = true) response.status = 200 response.body = { 'snapshot' => { - 'id' => '1', - 'name' => 'Snapshot1', + 'id' => '1', + 'name' => 'Snapshot1', 'description' => 'Volume1 snapshot', - 'size' => 1, - 'volume_id' => '1', - 'status' => 'available', - 'created_at' => Time.now + 'size' => 1, + 'volume_id' => '1', + 'status' => 'available', + 'created_at' => Time.now } } response diff --git a/lib/fog/openstack/volume/v2/requests/get_volume_details.rb b/lib/fog/openstack/volume/v2/requests/get_volume_details.rb index b87a61760..289245790 100644 --- a/lib/fog/openstack/volume/v2/requests/get_volume_details.rb +++ b/lib/fog/openstack/volume/v2/requests/get_volume_details.rb @@ -14,16 +14,16 @@ def get_volume_details(_detailed = true) response.status = 200 response.body = { 'volume' => { - 'id' => '1', - 'name' => Fog::Mock.random_letters(rand(8) + 5), - 'description' => Fog::Mock.random_letters(rand(12) + 10), - 'size' => 3, - 'volume_type' => nil, - 'snapshot_id' => '4', - 'status' => 'online', + 'id' => '1', + 'name' => Fog::Mock.random_letters(rand(5..12)), + 'description' => Fog::Mock.random_letters(rand(10..21)), + 'size' => 3, + 'volume_type' => nil, + 'snapshot_id' => '4', + 'status' => 'online', 'availability_zone' => 'nova', - 'created_at' => Time.now, - 'attachments' => [] + 'created_at' => Time.now, + 'attachments' => [] } } response diff --git a/lib/fog/openstack/volume/v2/requests/list_volumes.rb b/lib/fog/openstack/volume/v2/requests/list_volumes.rb index c3e1b9363..9bab0f2a1 100644 --- a/lib/fog/openstack/volume/v2/requests/list_volumes.rb +++ b/lib/fog/openstack/volume/v2/requests/list_volumes.rb @@ -13,30 +13,30 @@ def list_volumes(_options = true, _options_deprecated = {}) response = Excon::Response.new response.status = 200 data[:volumes] ||= [ - {"status" => "available", - "description" => "test 1 desc", - "availability_zone" => "nova", - "name" => "Volume1", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 1, - "created_at" => Time.now, - "metadata" => {}}, - {"status" => "available", - "description" => "test 2 desc", - "availability_zone" => "nova", - "name" => "Volume2", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 2, - "created_at" => Time.now, - "metadata" => {}} + { "status" => "available", + "description" => "test 1 desc", + "availability_zone" => "nova", + "name" => "Volume1", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 1, + "created_at" => Time.now, + "metadata" => {} }, + { "status" => "available", + "description" => "test 2 desc", + "availability_zone" => "nova", + "name" => "Volume2", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 2, + "created_at" => Time.now, + "metadata" => {} } ] - response.body = {'volumes' => data[:volumes]} + response.body = { 'volumes' => data[:volumes] } response end end diff --git a/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb b/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb index 55565c2b7..d8cca58c8 100644 --- a/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb +++ b/lib/fog/openstack/volume/v2/requests/list_volumes_detailed.rb @@ -13,30 +13,30 @@ def list_volumes_detailed(_options = {}) response = Excon::Response.new response.status = 200 data[:volumes] ||= [ - {"status" => "available", - "description" => "test 1 desc", - "availability_zone" => "nova", - "name" => "Volume1", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 1, - "created_at" => Time.now, - "metadata" => {}}, - {"status" => "available", - "description" => "test 2 desc", - "availability_zone" => "nova", - "name" => "Volume2", - "attachments" => [{}], - "volume_type" => nil, - "snapshot_id" => nil, - "size" => 1, - "id" => 2, - "created_at" => Time.now, - "metadata" => {}} + { "status" => "available", + "description" => "test 1 desc", + "availability_zone" => "nova", + "name" => "Volume1", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 1, + "created_at" => Time.now, + "metadata" => {} }, + { "status" => "available", + "description" => "test 2 desc", + "availability_zone" => "nova", + "name" => "Volume2", + "attachments" => [{}], + "volume_type" => nil, + "snapshot_id" => nil, + "size" => 1, + "id" => 2, + "created_at" => Time.now, + "metadata" => {} } ] - response.body = {'volumes' => data[:volumes]} + response.body = { 'volumes' => data[:volumes] } response end end diff --git a/lib/fog/openstack/volume/v2/requests/update_volume.rb b/lib/fog/openstack/volume/v2/requests/update_volume.rb index 056e2275e..18e7f894e 100644 --- a/lib/fog/openstack/volume/v2/requests/update_volume.rb +++ b/lib/fog/openstack/volume/v2/requests/update_volume.rb @@ -8,10 +8,10 @@ module Real def update_volume(volume_id, data = {}) data = data.select { |key| key == :name || key == :description || key == :metadata } request( - :body => Fog::JSON.encode('volume' => data), - :expects => 200, - :method => 'PUT', - :path => "volumes/#{volume_id}" + body: Fog::JSON.encode('volume' => data), + expects: 200, + method: 'PUT', + path: "volumes/#{volume_id}" ) end end diff --git a/lib/fog/openstack/workflow/v2.rb b/lib/fog/openstack/workflow/v2.rb index 0aa747089..64c1547d1 100644 --- a/lib/fog/openstack/workflow/v2.rb +++ b/lib/fog/openstack/workflow/v2.rb @@ -4,7 +4,7 @@ module Fog module OpenStack class Workflow class V2 < Fog::Service - SUPPORTED_VERSIONS = /v2/ + SUPPORTED_VERSIONS = /v2/.freeze requires :openstack_auth_url recognizes :openstack_username, :openstack_api_key, @@ -69,7 +69,7 @@ class Mock def self.data @data ||= Hash.new do |hash, key| hash[key] = { - :workflows => {} + workflows: {} } end end @@ -80,7 +80,7 @@ def self.reset include Fog::OpenStack::Core - def initialize(options = {}) + def initialize(_options = {}) @auth_token = Fog::Mock.random_base64(64) @auth_token_expiration = (Time.now.utc + 86_400).iso8601 end @@ -108,11 +108,11 @@ def default_service_type def request(params) response = @connection.request( params.merge( - :headers => { + headers: { 'Content-Type' => 'application/json', 'X-Auth-Token' => @auth_token }.merge!(params[:headers] || {}), - :path => "#{@path}/#{params[:path]}" + path: "#{@path}/#{params[:path]}" ) ) rescue Excon::Errors::Unauthorized => error diff --git a/lib/fog/openstack/workflow/v2/requests/create_action.rb b/lib/fog/openstack/workflow/v2/requests/create_action.rb index 4ee532b19..43f11297e 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_action.rb @@ -6,10 +6,10 @@ class Real def create_action(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "actions" + body: body, + expects: 201, + method: "POST", + path: "actions" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb index baf281247..a76b5b8a1 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_action_execution.rb @@ -4,15 +4,15 @@ class Workflow class V2 class Real def create_action_execution(action, input = {}, params = {}) - data = {:name => action} + data = { name: action } data[:input] = Fog::JSON.encode(input) unless input.empty? data[:params] = Fog::JSON.encode(params) unless params.empty? body = Fog::JSON.encode(data) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "action_executions" + body: body, + expects: 201, + method: "POST", + path: "action_executions" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb index ad2032176..0413de5b7 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_cron_trigger.rb @@ -11,10 +11,10 @@ def create_cron_trigger(name, first_time = nil, count = nil) data = { - :name => name, - :pattern => pattern, - :first_execution_time => first_time, - :remaining_executions => count + name: name, + pattern: pattern, + first_execution_time: first_time, + remaining_executions: count } if workflow_identifier data[:workflow_id] = workflow_identifier @@ -27,10 +27,10 @@ def create_cron_trigger(name, end body = Fog::JSON.encode(data) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "cron_triggers" + body: body, + expects: 201, + method: "POST", + path: "cron_triggers" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/create_environment.rb b/lib/fog/openstack/workflow/v2/requests/create_environment.rb index ec6b372d3..2157ea728 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_environment.rb @@ -9,10 +9,10 @@ def create_environment(definition) end body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "environments" + body: body, + expects: 201, + method: "POST", + path: "environments" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/create_execution.rb b/lib/fog/openstack/workflow/v2/requests/create_execution.rb index 56ac002c8..2cfae41d1 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_execution.rb @@ -4,14 +4,14 @@ class Workflow class V2 class Real def create_execution(workflow, input = {}) - data = {:workflow_name => workflow} + data = { workflow_name: workflow } data[:input] = Fog::JSON.encode(input) unless input.empty? body = Fog::JSON.encode(data) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "executions" + body: body, + expects: 201, + method: "POST", + path: "executions" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/create_workbook.rb b/lib/fog/openstack/workflow/v2/requests/create_workbook.rb index 52a44346f..11ce85ce3 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_workbook.rb @@ -6,10 +6,10 @@ class Real def create_workbook(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "workbooks" + body: body, + expects: 201, + method: "POST", + path: "workbooks" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/create_workflow.rb b/lib/fog/openstack/workflow/v2/requests/create_workflow.rb index 483ae8de1..ba2d7a426 100644 --- a/lib/fog/openstack/workflow/v2/requests/create_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/create_workflow.rb @@ -6,10 +6,10 @@ class Real def create_workflow(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 201, - :method => "POST", - :path => "workflows" + body: body, + expects: 201, + method: "POST", + path: "workflows" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_action.rb b/lib/fog/openstack/workflow/v2/requests/delete_action.rb index 4c4918980..9a2d9b111 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_action(name) request( - :expects => 204, - :method => "DELETE", - :path => "actions/#{URI.encode(name)}" + expects: 204, + method: "DELETE", + path: "actions/#{URI.encode(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb index c4e6e41c4..a208ae858 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action_execution.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_action_execution(id) request( - :expects => 204, - :method => "DELETE", - :path => "action_executions/#{id}" + expects: 204, + method: "DELETE", + path: "action_executions/#{id}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb index 9cf48bc51..fe981f574 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_cron_trigger(name) request( - :expects => 204, - :method => "DELETE", - :path => "cron_triggers/#{URI.encode(name)}" + expects: 204, + method: "DELETE", + path: "cron_triggers/#{URI.encode(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_environment.rb b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb index 21308810f..23c8d3fa7 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_environment(name) request( - :expects => 204, - :method => "DELETE", - :path => "environments/#{URI.encode(name)}" + expects: 204, + method: "DELETE", + path: "environments/#{URI.encode(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_execution.rb b/lib/fog/openstack/workflow/v2/requests/delete_execution.rb index b43dc71b1..c6fe90faa 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_execution.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_execution(id) request( - :expects => 204, - :method => "DELETE", - :path => "executions/#{id}" + expects: 204, + method: "DELETE", + path: "executions/#{id}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb index 649caea29..a87f1288a 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_workbook(name) request( - :expects => 204, - :method => "DELETE", - :path => "workbooks/#{URI.encode(name)}" + expects: 204, + method: "DELETE", + path: "workbooks/#{URI.encode(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb b/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb index a2d7a3da8..ce5e56268 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workflow.rb @@ -5,9 +5,9 @@ class V2 class Real def delete_workflow(identifier) request( - :expects => 204, - :method => "DELETE", - :path => "workflows/#{identifier}" + expects: 204, + method: "DELETE", + path: "workflows/#{identifier}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_action.rb b/lib/fog/openstack/workflow/v2/requests/get_action.rb index c937c48f7..95e847ca6 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action.rb @@ -5,9 +5,9 @@ class V2 class Real def get_action(name) request( - :expects => 200, - :method => "GET", - :path => "actions/#{URI.encode(name)}" + expects: 200, + method: "GET", + path: "actions/#{URI.encode(name)}" ) end end @@ -16,8 +16,8 @@ class Mock def get_action(_name) response = Excon::Response.new response.status = 200 - response.body = {"version" => "2.0", - "action1" => {"input" => ['test_id']}} + response.body = { "version" => "2.0", + "action1" => { "input" => ['test_id'] } } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb index 6478d96b4..0d2bdb488 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action_execution.rb @@ -5,9 +5,9 @@ class V2 class Real def get_action_execution(execution_id) request( - :expects => 200, - :method => "GET", - :path => "action_executions/#{execution_id}" + expects: 200, + method: "GET", + path: "action_executions/#{execution_id}" ) end end @@ -16,7 +16,7 @@ class Mock def get_action_execution(_execution_id) response = Excon::Response.new response.status = 200 - response.body = {"state" => "running", "id" => "1111"} + response.body = { "state" => "running", "id" => "1111" } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb index 924362d6d..a9c445199 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb @@ -5,9 +5,9 @@ class V2 class Real def get_cron_trigger(name) request( - :expects => 200, - :method => "GET", - :path => "cron_triggers/#{URI.encode(name)}" + expects: 200, + method: "GET", + path: "cron_triggers/#{URI.encode(name)}" ) end end @@ -16,9 +16,9 @@ class Mock def get_cron_trigger(_name) response = Excon::Response.new response.status = 200 - response.body = {"version" => "2.0", - "name" => "cron_trigger1", - "description" => "d1"} + response.body = { "version" => "2.0", + "name" => "cron_trigger1", + "description" => "d1" } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_environment.rb b/lib/fog/openstack/workflow/v2/requests/get_environment.rb index 5bdad97db..4b1febd78 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_environment.rb @@ -5,9 +5,9 @@ class V2 class Real def get_environment(name) request( - :expects => 200, - :method => "GET", - :path => "environments/#{URI.encode(name)}" + expects: 200, + method: "GET", + path: "environments/#{URI.encode(name)}" ) end end @@ -16,9 +16,9 @@ class Mock def get_environment(_name) response = Excon::Response.new response.status = 200 - response.body = {"name" => "environment1", - "variables" => {"var1" => "value1", - "var2" => "value2"}} + response.body = { "name" => "environment1", + "variables" => { "var1" => "value1", + "var2" => "value2" } } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_execution.rb b/lib/fog/openstack/workflow/v2/requests/get_execution.rb index 9c499161f..8052dc743 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_execution.rb @@ -5,9 +5,9 @@ class V2 class Real def get_execution(execution_id) request( - :expects => 200, - :method => "GET", - :path => "executions/#{execution_id}" + expects: 200, + method: "GET", + path: "executions/#{execution_id}" ) end end @@ -16,7 +16,7 @@ class Mock def get_execution(_execution_id) response = Excon::Response.new response.status = 200 - response.body = {"state" => "running", "id" => "1111"} + response.body = { "state" => "running", "id" => "1111" } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_task.rb b/lib/fog/openstack/workflow/v2/requests/get_task.rb index 09c1e4250..cd0ecd5c9 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_task.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_task.rb @@ -5,9 +5,9 @@ class V2 class Real def get_task(id) request( - :expects => 200, - :method => "GET", - :path => "tasks/#{id}" + expects: 200, + method: "GET", + path: "tasks/#{id}" ) end end @@ -16,8 +16,8 @@ class Mock def get_task(_id) response = Excon::Response.new response.status = 200 - response.body = {"version" => "2.0", - "task1" => {"id" => ['test_id']}} + response.body = { "version" => "2.0", + "task1" => { "id" => ['test_id'] } } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_workbook.rb b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb index 33597a310..1ea5b915a 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb @@ -5,9 +5,9 @@ class V2 class Real def get_workbook(name) request( - :expects => 200, - :method => "GET", - :path => "workbooks/#{URI.encode(name)}" + expects: 200, + method: "GET", + path: "workbooks/#{URI.encode(name)}" ) end end @@ -16,9 +16,9 @@ class Mock def get_workbook(_name) response = Excon::Response.new response.status = 200 - response.body = {"version" => "2.0", - "name" => "workbook1", - "description" => "d1"} + response.body = { "version" => "2.0", + "name" => "workbook1", + "description" => "d1" } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_workflow.rb b/lib/fog/openstack/workflow/v2/requests/get_workflow.rb index 27ca108a6..8ee0bdc49 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workflow.rb @@ -5,9 +5,9 @@ class V2 class Real def get_workflow(identifier) request( - :expects => 200, - :method => "GET", - :path => "workflows/#{identifier}" + expects: 200, + method: "GET", + path: "workflows/#{identifier}" ) end end @@ -16,9 +16,9 @@ class Mock def get_workflow(_identifier) response = Excon::Response.new response.status = 200 - response.body = {"version" => "2.0", - "name" => "workflow1", - "description" => "d1"} + response.body = { "version" => "2.0", + "name" => "workflow1", + "description" => "d1" } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb b/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb index 16b08c121..bea67450f 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_action_executions.rb @@ -5,9 +5,9 @@ class V2 class Real def list_action_executions request( - :expects => 200, - :method => "GET", - :path => "action_executions" + expects: 200, + method: "GET", + path: "action_executions" ) end end @@ -16,9 +16,9 @@ class Mock def list_action_executions response = Excon::Response.new response.status = 200 - response.body = {"action_executions" => - [{"state" => "ERROR", "id" => "1111"}, - {"state" => "RUNNING", "id" => "2222"}]} + response.body = { "action_executions" => + [{ "state" => "ERROR", "id" => "1111" }, + { "state" => "RUNNING", "id" => "2222" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_actions.rb b/lib/fog/openstack/workflow/v2/requests/list_actions.rb index 58dd4b73c..a28baa5db 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_actions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_actions.rb @@ -6,10 +6,10 @@ class Real def list_actions(params = {}) body = Fog::JSON.encode(params) request( - :body => body, - :expects => 200, - :method => "GET", - :path => "actions" + body: body, + expects: 200, + method: "GET", + path: "actions" ) end end @@ -18,9 +18,9 @@ class Mock def list_actions(_params = {}) response = Excon::Response.new response.status = 200 - response.body = {"actions" => - [{"name" => "action1", "description" => "d1"}, - {"name" => "action2", "description" => "d2"}]} + response.body = { "actions" => + [{ "name" => "action1", "description" => "d1" }, + { "name" => "action2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb b/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb index 6fce0012b..81a2f10e0 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_cron_triggers.rb @@ -5,9 +5,9 @@ class V2 class Real def list_cron_triggers request( - :expects => 200, - :method => "GET", - :path => "cron_triggers" + expects: 200, + method: "GET", + path: "cron_triggers" ) end end @@ -16,9 +16,9 @@ class Mock def list_cron_triggers response = Excon::Response.new response.status = 200 - response.body = {"cron_triggers" => - [{"name" => "cron_trigger1", "description" => "d1"}, - {"name" => "cron_trigger2", "description" => "d2"}]} + response.body = { "cron_triggers" => + [{ "name" => "cron_trigger1", "description" => "d1" }, + { "name" => "cron_trigger2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_environments.rb b/lib/fog/openstack/workflow/v2/requests/list_environments.rb index cefb642dd..28835edb6 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_environments.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_environments.rb @@ -5,9 +5,9 @@ class V2 class Real def list_environments request( - :expects => 200, - :method => "GET", - :path => "environments" + expects: 200, + method: "GET", + path: "environments" ) end end @@ -16,9 +16,9 @@ class Mock def list_environments response = Excon::Response.new response.status = 200 - response.body = {"environments" => - [{"name" => "environment1", "description" => "d1"}, - {"name" => "environment2", "description" => "d2"}]} + response.body = { "environments" => + [{ "name" => "environment1", "description" => "d1" }, + { "name" => "environment2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_executions.rb b/lib/fog/openstack/workflow/v2/requests/list_executions.rb index 8fe847e06..4f5b2d233 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_executions.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_executions.rb @@ -5,9 +5,9 @@ class V2 class Real def list_executions request( - :expects => 200, - :method => "GET", - :path => "executions" + expects: 200, + method: "GET", + path: "executions" ) end end @@ -16,9 +16,9 @@ class Mock def list_executions response = Excon::Response.new response.status = 200 - response.body = {"executions" => - [{"state" => "ERROR", "id" => "1111"}, - {"state" => "RUNNING", "id" => "2222"}]} + response.body = { "executions" => + [{ "state" => "ERROR", "id" => "1111" }, + { "state" => "RUNNING", "id" => "2222" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_services.rb b/lib/fog/openstack/workflow/v2/requests/list_services.rb index bbed40bff..30b9de427 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_services.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_services.rb @@ -5,9 +5,9 @@ class V2 class Real def list_services request( - :expects => 200, - :method => "GET", - :path => "services" + expects: 200, + method: "GET", + path: "services" ) end end @@ -16,9 +16,9 @@ class Mock def list_services response = Excon::Response.new response.status = 200 - response.body = {"services" => - [{"name" => "service1", "description" => "d1"}, - {"name" => "service2", "description" => "d2"}]} + response.body = { "services" => + [{ "name" => "service1", "description" => "d1" }, + { "name" => "service2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_tasks.rb b/lib/fog/openstack/workflow/v2/requests/list_tasks.rb index 1bba660a6..833d49667 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_tasks.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_tasks.rb @@ -5,9 +5,9 @@ class V2 class Real def list_tasks(workflow_execution_id) request( - :expects => 200, - :method => "GET", - :path => "executions/#{workflow_execution_id}/tasks" + expects: 200, + method: "GET", + path: "executions/#{workflow_execution_id}/tasks" ) end end @@ -16,9 +16,9 @@ class Mock def list_tasks(_workflow_execution_id) response = Excon::Response.new response.status = 200 - response.body = {"tasks" => - [{"name" => "task1", "description" => "d1"}, - {"name" => "task2", "description" => "d2"}]} + response.body = { "tasks" => + [{ "name" => "task1", "description" => "d1" }, + { "name" => "task2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb b/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb index 0173cb87b..13fbbed01 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_workbooks.rb @@ -5,9 +5,9 @@ class V2 class Real def list_workbooks request( - :expects => 200, - :method => "GET", - :path => "workbooks" + expects: 200, + method: "GET", + path: "workbooks" ) end end @@ -16,9 +16,9 @@ class Mock def list_workbooks response = Excon::Response.new response.status = 200 - response.body = {"workbooks" => - [{"name" => "workbook1", "description" => "d1"}, - {"name" => "workbook2", "description" => "d2"}]} + response.body = { "workbooks" => + [{ "name" => "workbook1", "description" => "d1" }, + { "name" => "workbook2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/list_workflows.rb b/lib/fog/openstack/workflow/v2/requests/list_workflows.rb index 7fed8b8bb..cfa79c002 100644 --- a/lib/fog/openstack/workflow/v2/requests/list_workflows.rb +++ b/lib/fog/openstack/workflow/v2/requests/list_workflows.rb @@ -6,10 +6,10 @@ class Real def list_workflows(params = {}) body = Fog::JSON.encode(params) request( - :body => body, - :expects => 200, - :method => "GET", - :path => "workflows" + body: body, + expects: 200, + method: "GET", + path: "workflows" ) end end @@ -18,9 +18,9 @@ class Mock def list_workflows(_params = {}) response = Excon::Response.new response.status = 200 - response.body = {"workflows" => - [{"name" => "workflow1", "description" => "d1"}, - {"name" => "workflow2", "description" => "d2"}]} + response.body = { "workflows" => + [{ "name" => "workflow1", "description" => "d1" }, + { "name" => "workflow2", "description" => "d2" }] } response end end diff --git a/lib/fog/openstack/workflow/v2/requests/rerun_task.rb b/lib/fog/openstack/workflow/v2/requests/rerun_task.rb index b999a925d..a3141f350 100644 --- a/lib/fog/openstack/workflow/v2/requests/rerun_task.rb +++ b/lib/fog/openstack/workflow/v2/requests/rerun_task.rb @@ -5,16 +5,16 @@ class V2 class Real def rerun_task(task_ex_id) rerun_payload = { - :id => task_ex_id, - :state => 'RUNNING', - :reset => true + id: task_ex_id, + state: 'RUNNING', + reset: true } body = Fog::JSON.encode(rerun_payload) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "tasks/#{task_ex_id}" + body: body, + expects: 200, + method: "PUT", + path: "tasks/#{task_ex_id}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/update_action.rb b/lib/fog/openstack/workflow/v2/requests/update_action.rb index 4dfb8c003..f297f04b2 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_action.rb @@ -6,10 +6,10 @@ class Real def update_action(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "actions" + body: body, + expects: 200, + method: "PUT", + path: "actions" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb b/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb index f8620b015..954fd29fe 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_action_execution.rb @@ -7,14 +7,14 @@ def update_action_execution(id, name, value) # valid values for name are: # state, output # https://github.com/openstack/python-mistralclient/blob/master/mistralclient/commands/v2/action_executions.py - data = {:id => id} + data = { id: id } data[name] = Fog::JSON.encode(value) body = Fog::JSON.encode(data) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "action_executions" + body: body, + expects: 200, + method: "PUT", + path: "action_executions" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/update_environment.rb b/lib/fog/openstack/workflow/v2/requests/update_environment.rb index e428b1332..71c09e2ff 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_environment.rb @@ -9,10 +9,10 @@ def update_environment(definition) end body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "environments" + body: body, + expects: 200, + method: "PUT", + path: "environments" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/update_execution.rb b/lib/fog/openstack/workflow/v2/requests/update_execution.rb index 121b9cc10..44824ce10 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_execution.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_execution.rb @@ -7,14 +7,14 @@ def update_execution(id, name, value) # valid values for name are: # state, description, env # https://github.com/openstack/python-mistralclient/blob/master/mistralclient/commands/v2/executions.py - data = {:id => id} + data = { id: id } data[name] = Fog::JSON.encode(value) body = Fog::JSON.encode(data) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "executions" + body: body, + expects: 200, + method: "PUT", + path: "executions" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/update_workbook.rb b/lib/fog/openstack/workflow/v2/requests/update_workbook.rb index 46f2abec2..5901e5f3d 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_workbook.rb @@ -6,10 +6,10 @@ class Real def update_workbook(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "workbooks" + body: body, + expects: 200, + method: "PUT", + path: "workbooks" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/update_workflow.rb b/lib/fog/openstack/workflow/v2/requests/update_workflow.rb index 311fe9f22..c068d7667 100644 --- a/lib/fog/openstack/workflow/v2/requests/update_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/update_workflow.rb @@ -6,10 +6,10 @@ class Real def update_workflow(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "PUT", - :path => "workflows" + body: body, + expects: 200, + method: "PUT", + path: "workflows" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/validate_action.rb b/lib/fog/openstack/workflow/v2/requests/validate_action.rb index 81c62717c..26296e37f 100644 --- a/lib/fog/openstack/workflow/v2/requests/validate_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_action.rb @@ -6,10 +6,10 @@ class Real def validate_action(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "POST", - :path => "actions/validate" + body: body, + expects: 200, + method: "POST", + path: "actions/validate" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb b/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb index 195997b5b..967f4c1ab 100644 --- a/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_workbook.rb @@ -6,10 +6,10 @@ class Real def validate_workbook(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "POST", - :path => "workbooks/validate" + body: body, + expects: 200, + method: "POST", + path: "workbooks/validate" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb b/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb index a4bbd3f43..0650937f1 100644 --- a/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb +++ b/lib/fog/openstack/workflow/v2/requests/validate_workflow.rb @@ -6,10 +6,10 @@ class Real def validate_workflow(definition) body = Fog::JSON.encode(definition) request( - :body => body, - :expects => 200, - :method => "POST", - :path => "workflows/validate" + body: body, + expects: 200, + method: "POST", + path: "workflows/validate" ) end end diff --git a/spec/identity_v3_spec.rb b/spec/identity_v3_spec.rb index ce31aef34..a4d860468 100644 --- a/spec/identity_v3_spec.rb +++ b/spec/identity_v3_spec.rb @@ -25,7 +25,7 @@ it 'authenticates with password, username and domain_id' do VCR.use_cassette('authv3_b') do -Fog::OpenStack::Identity::V3.new( + Fog::OpenStack::Identity::V3.new( openstack_domain_id: @openstack_vcr.domain_id, openstack_api_key: @openstack_vcr.password, openstack_username: @openstack_vcr.username, @@ -453,35 +453,35 @@ skip "Manipulates roles on domain groups to be fixed" begin # Create a domain called foobar - foobar_domain = @service.domains.create(:name => 'd-foobar') + foobar_domain = @service.domains.create(name: 'd-foobar') # Create a group in this domain - foobar_group = @service.groups.create(:name => 'g-foobar', - :description => "Group of Foobar users", - :domain_id => foobar_domain.id) + foobar_group = @service.groups.create(name: 'g-foobar', + description: "Group of Foobar users", + domain_id: foobar_domain.id) # Create a user in the domain - foobar_user = @service.users.create(:name => 'u-foobar_foobar', - :email => 'foobar@example.com', - :password => 's3cret!', - :domain_id => foobar_domain.id) + foobar_user = @service.users.create(name: 'u-foobar_foobar', + email: 'foobar@example.com', + password: 's3cret!', + domain_id: foobar_domain.id) # User has no roles initially foobar_user.roles.length.must_equal 0 # Create a role and add it to the domain group foobar_role = @service.roles.all.select { |role| role.name == 'foobar_role' }.first foobar_role.destroy if foobar_role - foobar_role = @service.roles.create(:name => 'foobar_role') + foobar_role = @service.roles.create(name: 'foobar_role') foobar_group.grant_role foobar_role.id foobar_group.roles.length.must_equal 1 # Add user to the group and check that it inherits the role foobar_user.check_role foobar_role.id.wont_equal nil - @service.role_assignments.all(:user_id => foobar_user.id, :effective => true).length.must_equal 0 + @service.role_assignments.all(user_id: foobar_user.id, effective: true).length.must_equal 0 foobar_group.add_user foobar_user.id foobar_user.check_role(foobar_role.id).must_equal false # Still false in absolute assignment terms - assignments = @service.role_assignments.all(:user_id => foobar_user.id, :effective => true) + assignments = @service.role_assignments.all(user_id: foobar_user.id, effective: true) assignments.length.must_equal 1 assignments.first.role['id'].must_equal foobar_role.id @@ -490,7 +490,7 @@ assignments.first.links['assignment'].must_match %r{/v3/domains/#{foobar_domain.id}/groups/#{foobar_group.id}/roles/#{foobar_role.id}} assignments.first.links['membership'].must_match %r{/v3/groups/#{foobar_group.id}/users/#{foobar_user.id}} - group_assignments = @service.role_assignments.all(:group_id => foobar_group.id) + group_assignments = @service.role_assignments.all(group_id: foobar_group.id) group_assignments.length.must_equal 1 group_assignments.first.role['id'].must_equal foobar_role.id group_assignments.first.group['id'].must_equal foobar_group.id @@ -499,7 +499,7 @@ # Revoke the role from the group and check the user no longer has it foobar_group.revoke_role foobar_role.id - @service.role_assignments.all(:user_id => foobar_user.id, :effective => true).length.must_equal 0 + @service.role_assignments.all(user_id: foobar_user.id, effective: true).length.must_equal 0 ensure # Clean up foobar_user ||= @service.users.find_by_name('u-foobar_foobar').first @@ -510,7 +510,7 @@ foobar_role.destroyif foobar_role foobar_domain ||= @service.domains.all.select { |domain| domain.name == 'd-foobar' }.first if foobar_domain - foobar_domain.update(:enabled => false) + foobar_domain.update(enabled: false) foobar_domain.destroy end end diff --git a/spec/image_v2_spec.rb b/spec/image_v2_spec.rb index a72955354..4363a8c06 100644 --- a/spec/image_v2_spec.rb +++ b/spec/image_v2_spec.rb @@ -18,7 +18,7 @@ def cleanup_image(image, image_name = nil, image_id = nil) if image_id begin image_by_id = @service.images.find_by_id(image_id) - rescue + rescue StandardError false end end @@ -142,7 +142,7 @@ def cleanup_image(image, image_name = nil, image_id = nil) found_image.save created_image.name.must_equal image_name + '_original', - created_image.reload + created_image.reload created_image.name.must_equal image_name + '_updated' # verify an image provided by `find_by_id` can be reloaded diff --git a/spec/monitoring_spec.rb b/spec/monitoring_spec.rb index 0c61c7960..820b9c48c 100644 --- a/spec/monitoring_spec.rb +++ b/spec/monitoring_spec.rb @@ -76,7 +76,7 @@ end.must_raise ArgumentError proc do - @service.metrics.create(name: "this wont't be created due to invalid timestamp", :timestamp => 1234) + @service.metrics.create(name: "this wont't be created due to invalid timestamp", timestamp: 1234) end.must_raise ArgumentError end end diff --git a/spec/shared_context.rb b/spec/shared_context.rb index 8d774ffd0..e195bd91d 100644 --- a/spec/shared_context.rb +++ b/spec/shared_context.rb @@ -69,7 +69,7 @@ def initialize(options) if use_recorded config.cassette_library_dir = ENV['SPEC_PATH'] || @vcr_directory config.default_cassette_options = { record: :none } - config.default_cassette_options.merge! match_requests_on: %i[method uri body] + config.default_cassette_options[:match_requests_on] = [:method, :uri, :body] else config.cassette_library_dir = "spec/debug" config.default_cassette_options = { record: :all } diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb index 1ca0f7ca0..47ff35513 100644 --- a/spec/volume_spec.rb +++ b/spec/volume_spec.rb @@ -105,10 +105,10 @@ def cleanup_test_object(collection, id) volume_size = 1 # in GB # create volume - volume_id = setup_test_object(:type => :volume, - @name_param => volume_name, + volume_id = setup_test_object(:type => :volume, + @name_param => volume_name, @description_param => volume_description, - :size => volume_size).id + :size => volume_size).id @service.volumes.all(@name_param => volume_name).length.must_equal 1 @@ -205,9 +205,9 @@ def cleanup_test_object(collection, id) volume_size_small = 1 # in GB volume_size_large = 2 # in GB - volume = setup_test_object(:type => :volume, + volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => volume_size_small) + :size => volume_size_small) volume.wait_for { ready? && size == volume_size_small } # extend volume @@ -241,9 +241,9 @@ def cleanup_test_object(collection, id) transfer_name = 'fog-testtransfer-1' # create volume object - volume = setup_test_object(:type => :volume, + volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1) + :size => 1) volume.wait_for { ready? } # create transfer object @@ -344,9 +344,9 @@ def cleanup_test_object(collection, id) VCR.use_cassette('volume_transfer_and_delete') do begin # create volume object - volume = setup_test_object(:type => :volume, + volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1) + :size => 1) volume.wait_for { ready? } # create transfer object @@ -386,16 +386,16 @@ def cleanup_test_object(collection, id) VCR.use_cassette('volume_snapshot_and_delete') do begin # create volume object - volume = setup_test_object(:type => :volume, + volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1) + :size => 1) volume.wait_for { ready? } # create snapshot object - snapshot = setup_test_object(:type => :snapshot, - @name_param => 'fog-testsnapshot-1', + snapshot = setup_test_object(:type => :snapshot, + @name_param => 'fog-testsnapshot-1', @description_param => 'Test snapshot', - :volume_id => volume.id) + :volume_id => volume.id) snapshot_id = snapshot.id # wait for the snapshot to be available @@ -442,11 +442,11 @@ def cleanup_test_object(collection, id) VCR.use_cassette('volume_metadata_crud') do begin # create volume object with metadata - volume = setup_test_object(:type => :volume, + volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1, - :metadata => { 'some_metadata' => 'this is meta', - 'more_metadata' => 'even more meta' }) + :size => 1, + :metadata => { 'some_metadata' => 'this is meta', + 'more_metadata' => 'even more meta' }) volume.wait_for { ready? } updated_volume = @service.volumes.get(volume.id) @@ -457,7 +457,7 @@ def cleanup_test_object(collection, id) # update metadata volume.update_metadata('some_metadata' => 'this is updated', - 'new_metadata' => 'this is new') + 'new_metadata' => 'this is new') updated_volume = @service.volumes.get(volume.id) check_metadata = updated_volume.metadata @@ -467,7 +467,7 @@ def cleanup_test_object(collection, id) check_metadata['new_metadata'].must_equal 'this is new' # replace metadata - volume.replace_metadata('some_metadata' => 'this is updated again', + volume.replace_metadata('some_metadata' => 'this is updated again', 'newer_metadata' => 'this is newer') updated_volume = @service.volumes.get(volume.id) @@ -494,18 +494,18 @@ def cleanup_test_object(collection, id) VCR.use_cassette('volume_snapshot_metadata_crud') do begin # create volume object with metadata - volume = setup_test_object(:type => :volume, + volume = setup_test_object(:type => :volume, @name_param => 'fog-testvolume-1', - :size => 1, - :metadata => { 'some_metadata' => 'this is meta', - 'more_metadata' => 'even more meta' }) + :size => 1, + :metadata => { 'some_metadata' => 'this is meta', + 'more_metadata' => 'even more meta' }) volume.wait_for { ready? } # create snapshot object - snapshot = setup_test_object(:type => :snapshot, - @name_param => 'fog-testsnapshot-1', + snapshot = setup_test_object(:type => :snapshot, + @name_param => 'fog-testsnapshot-1', @description_param => 'Test snapshot', - :volume_id => volume.id) + :volume_id => volume.id) snapshot_id = snapshot.id # wait for the snapshot to be available @@ -524,7 +524,7 @@ def cleanup_test_object(collection, id) # update metadata snapshot.update_metadata('some_snapshot_metadata' => 'this is data', - 'new_snapshot_metadata' => 'this is new') + 'new_snapshot_metadata' => 'this is new') updated_snapshot = @service.snapshots.get(snapshot_id) check_metadata = updated_snapshot.metadata diff --git a/test/authenticate_tests.rb b/test/authenticate_tests.rb index d5a2961d8..4ee7ba294 100644 --- a/test/authenticate_tests.rb +++ b/test/authenticate_tests.rb @@ -14,49 +14,49 @@ "access" => { "token" => { "expires" => @expires.iso8601, - "id" => @token, - "tenant" => { - "enabled" => true, + "id" => @token, + "tenant" => { + "enabled" => true, "description" => nil, - "name" => "admin", - "id" => @tenant_token + "name" => "admin", + "id" => @tenant_token } }, "serviceCatalog" => [ { "endpoints" => [ { - "adminURL" => "http://example:8774/v2/#{@tenant_token}", - "region" => "RegionOne", + "adminURL" => "http://example:8774/v2/#{@tenant_token}", + "region" => "RegionOne", "internalURL" => "http://example:8774/v2/#{@tenant_token}", - "id" => Fog::Mock.random_numbers(8).to_s, - "publicURL" => "http://example:8774/v2/#{@tenant_token}" + "id" => Fog::Mock.random_numbers(8).to_s, + "publicURL" => "http://example:8774/v2/#{@tenant_token}" } ], "endpoints_links" => [], - "type" => "compute", - "name" => "nova" + "type" => "compute", + "name" => "nova" }, { - "endpoints" => [ + "endpoints" => [ { - "adminURL" => "http://example:9292", - "region" => "RegionOne", + "adminURL" => "http://example:9292", + "region" => "RegionOne", "internalURL" => "http://example:9292", - "id" => Fog::Mock.random_numbers(8).to_s, - "publicURL" => "http://example:9292" + "id" => Fog::Mock.random_numbers(8).to_s, + "publicURL" => "http://example:9292" } ], "endpoints_links" => [], - "type" => "image", - "name" => "glance" + "type" => "image", + "name" => "glance" } ], "user" => { - "username" => "admin", + "username" => "admin", "roles_links" => [], - "id" => Fog::Mock.random_numbers(8).to_s, - "roles" => [ + "id" => Fog::Mock.random_numbers(8).to_s, + "roles" => [ { "name" => "admin" }, { "name" => "KeystoneAdmin" }, { "name" => "KeystoneServiceAdmin" } @@ -65,7 +65,7 @@ }, "metadata" => { "is_admin" => 0, - "roles" => [ + "roles" => [ Fog::Mock.random_numbers(8).to_s, Fog::Mock.random_numbers(8).to_s, Fog::Mock.random_numbers(8).to_s @@ -123,7 +123,8 @@ it "v2 missing service" do Excon.stub( { method: 'POST', path: '/v2.0/tokens' }, - { status: 200, body: Fog::JSON.encode(@body) }) + status: 200, body: Fog::JSON.encode(@body) + ) service = Object.new service.extend(Fog::OpenStack::Core) @@ -133,7 +134,8 @@ openstack_tenant: 'admin', openstack_service_type: %w[network], openstack_api_key: 'secret', - openstack_username: 'user') + openstack_username: 'user' + ) proc do service.send(:authenticate) end.must_raise Fog::OpenStack::Auth::Catalog::ServiceTypeError @@ -153,7 +155,8 @@ openstack_tenant: 'admin', openstack_api_key: 'secret', openstack_username: 'user', - openstack_service_type: 'object-store') + openstack_service_type: 'object-store' + ) proc do service.send(:authenticate) @@ -166,21 +169,22 @@ { "endpoints" => [ { - "adminURL" => "http://example2:8774/v2/#{@tenant_token}", - "region" => "RegionOne", + "adminURL" => "http://example2:8774/v2/#{@tenant_token}", + "region" => "RegionOne", "internalURL" => "http://example2:8774/v2/#{@tenant_token}", - "id" => Fog::Mock.random_numbers(8).to_s, - "publicURL" => "http://example2:8774/v2/#{@tenant_token}" + "id" => Fog::Mock.random_numbers(8).to_s, + "publicURL" => "http://example2:8774/v2/#{@tenant_token}" } ], "endpoints_links" => [], - "type" => "compute", - "name" => "nova2" + "type" => "compute", + "name" => "nova2" } Excon.stub( { method: 'POST', path: "/v2.0/tokens" }, - { status: 200, body: Fog::JSON.encode(body_clone) }) + status: 200, body: Fog::JSON.encode(body_clone) + ) service = Object.new service.extend(Fog::OpenStack::Core) @@ -190,7 +194,8 @@ openstack_tenant: 'admin', openstack_api_key: 'secret', openstack_username: 'user', - openstack_service_type: 'compute') + openstack_service_type: 'compute' + ) proc do service.send(:authenticate) diff --git a/test/helpers/nfv_helper.rb b/test/helpers/nfv_helper.rb index 6bf2f956f..18c460132 100644 --- a/test/helpers/nfv_helper.rb +++ b/test/helpers/nfv_helper.rb @@ -18,7 +18,7 @@ def set_nfv_data } @auth = { - "tenantName" => "admin", + "tenantName" => "admin", "passwordCredentials" => { "username" => "admin", "password" => "password" diff --git a/test/models/identity/ec2_credential_tests.rb b/test/models/identity/ec2_credential_tests.rb index 38854b852..b87d89bba 100644 --- a/test/models/identity/ec2_credential_tests.rb +++ b/test/models/identity/ec2_credential_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credential" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/ec2_credentials_tests.rb b/test/models/identity/ec2_credentials_tests.rb index 451566ee6..3efe4dcbb 100644 --- a/test/models/identity/ec2_credentials_tests.rb +++ b/test/models/identity/ec2_credentials_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | ec2_credentials" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') tenant_id = identity.list_tenants.body['tenants'].first['id'] @user = identity.users.find { |user| user.name == 'foobar' } diff --git a/test/models/identity/role_tests.rb b/test/models/identity/role_tests.rb index cbb2c36a1..7153e6de4 100644 --- a/test/models/identity/role_tests.rb +++ b/test/models/identity/role_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | role" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @instance = @identity.roles.new( name: 'Role Name', user_id: 1, diff --git a/test/models/identity/roles_tests.rb b/test/models/identity/roles_tests.rb index bd29ae7d4..3f23d9dc0 100644 --- a/test/models/identity/roles_tests.rb +++ b/test/models/identity/roles_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | roles" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @tenant = @identity.tenants.create(name: 'test_user') @user = @identity.users.create(name: 'test_user', tenant_id: @tenant.id, password: 'spoof') @role = @identity.roles(user: @user, tenant: @tenant).create(name: 'test_role') diff --git a/test/models/identity/tenant_tests.rb b/test/models/identity/tenant_tests.rb index f2e97d949..877bf3bf3 100644 --- a/test/models/identity/tenant_tests.rb +++ b/test/models/identity/tenant_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | tenant" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') end describe "success" do diff --git a/test/models/identity/tenants_tests.rb b/test/models/identity/tenants_tests.rb index e97c5754a..fa6e3f939 100644 --- a/test/models/identity/tenants_tests.rb +++ b/test/models/identity/tenants_tests.rb @@ -2,7 +2,7 @@ describe "Fog::OpenStack::Compute | tenants" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @instance = @identity.tenants.create(name: 'test') end diff --git a/test/models/identity/user_tests.rb b/test/models/identity/user_tests.rb index f450681af..a3f81c4cc 100644 --- a/test/models/identity/user_tests.rb +++ b/test/models/identity/user_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | user" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.new( name: 'User Name', diff --git a/test/models/identity/users_tests.rb b/test/models/identity/users_tests.rb index 7328aa171..43126a432 100644 --- a/test/models/identity/users_tests.rb +++ b/test/models/identity/users_tests.rb @@ -2,7 +2,7 @@ describe "Fog::Identity[:openstack] | users" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') tenant_id = @identity.list_tenants.body['tenants'].first['id'] @instance = @identity.users.create( name: 'foobar', diff --git a/test/models/network/ipsec_site_connection_tests.rb b/test/models/network/ipsec_site_connection_tests.rb index 5583c1383..13d04ed67 100644 --- a/test/models/network/ipsec_site_connection_tests.rb +++ b/test/models/network/ipsec_site_connection_tests.rb @@ -17,9 +17,9 @@ psk: "secret", mtu: 1500, dpd: { - "action" => "hold", + "action" => "hold", "interval" => 30, - "timeout" => 120 + "timeout" => 120 }, initiator: "bi-directional", admin_state_up: true @@ -43,9 +43,9 @@ @instance.initiator = "bi-directional" @instance.admin_state_up = false @instance.dpd = { - "action" => "hold", + "action" => "hold", "interval" => 50, - "timeout" => 120 + "timeout" => 120 } @instance.update.name.must_equal "rename-test-ipsec-site-connection" diff --git a/test/models/network/lb_vip_tests.rb b/test/models/network/lb_vip_tests.rb index a37e833f6..f376c363c 100644 --- a/test/models/network/lb_vip_tests.rb +++ b/test/models/network/lb_vip_tests.rb @@ -14,7 +14,7 @@ address: '10.0.0.1', session_persistence: { "cookie_name" => "COOKIE_NAME", - "type" => "APP_COOKIE" + "type" => "APP_COOKIE" }, connection_limit: 10, admin_state_up: true, diff --git a/test/models/network/security_group_rule_tests.rb b/test/models/network/security_group_rule_tests.rb index 794fbe20e..d8cc81fac 100644 --- a/test/models/network/security_group_rule_tests.rb +++ b/test/models/network/security_group_rule_tests.rb @@ -4,7 +4,7 @@ describe "Fog::OpenStack::Network | security_group_rule model" do @secgroup = network.security_groups.create(name: "fogsecgroup") - attributes = {security_group_id: @secgroup.id, direction: "ingress"} + attributes = { security_group_id: @secgroup.id, direction: "ingress" } model_tests(network.security_group_rules, attributes) describe "success" do diff --git a/test/models/planning/plan_tests.rb b/test/models/planning/plan_tests.rb index c2615551b..21ed22d5a 100644 --- a/test/models/planning/plan_tests.rb +++ b/test/models/planning/plan_tests.rb @@ -33,7 +33,7 @@ @instance.patch( parameters: [ { - "name" => parameter['name'], + "name" => parameter['name'], "value" => 'new_value' } ] diff --git a/test/models/storage/file_tests.rb b/test/models/storage/file_tests.rb index eda24763d..05a293e10 100644 --- a/test/models/storage/file_tests.rb +++ b/test/models/storage/file_tests.rb @@ -77,9 +77,9 @@ def clear_metadata describe "#cache_control" do before do @instance = @directory.files.create( - :key => 'meta-test', - :body => lorem_file, - :cache_control => 'public, max-age=31536000' + key: 'meta-test', + body: lorem_file, + cache_control: 'public, max-age=31536000' ) end diff --git a/test/requests/baremetal/chassis_tests.rb b/test/requests/baremetal/chassis_tests.rb index c01a2920b..afa121277 100644 --- a/test/requests/baremetal/chassis_tests.rb +++ b/test/requests/baremetal/chassis_tests.rb @@ -7,18 +7,18 @@ @chassis_format = { 'description' => String, - 'uuid' => String, - 'links' => Array + 'uuid' => String, + 'links' => Array } @detailed_chassis_format = { 'description' => String, - 'uuid' => String, - 'created_at' => String, - 'updated_at' => Fog::Nullable::String, - 'extra' => Hash, - 'nodes' => Array, - 'links' => Array + 'uuid' => String, + 'created_at' => String, + 'updated_at' => Fog::Nullable::String, + 'extra' => Hash, + 'nodes' => Array, + 'links' => Array } chassis_attributes = { description: 'description' } diff --git a/test/requests/baremetal/driver_tests.rb b/test/requests/baremetal/driver_tests.rb index 3cd69017c..ae3179bb8 100644 --- a/test/requests/baremetal/driver_tests.rb +++ b/test/requests/baremetal/driver_tests.rb @@ -6,23 +6,23 @@ @driver_format = { 'hosts' => Array, - 'name' => String + 'name' => String } @driver_properties_format = { - "pxe_deploy_ramdisk" => String, + "pxe_deploy_ramdisk" => String, "ipmi_transit_address" => String, - "ipmi_terminal_port" => String, - "ipmi_target_channel" => String, + "ipmi_terminal_port" => String, + "ipmi_target_channel" => String, "ipmi_transit_channel" => String, - "ipmi_local_address" => String, - "ipmi_username" => String, - "ipmi_address" => String, - "ipmi_target_address" => String, - "ipmi_password" => String, - "pxe_deploy_kernel" => String, - "ipmi_priv_level" => String, - "ipmi_bridging" => String + "ipmi_local_address" => String, + "ipmi_username" => String, + "ipmi_address" => String, + "ipmi_target_address" => String, + "ipmi_password" => String, + "pxe_deploy_kernel" => String, + "ipmi_priv_level" => String, + "ipmi_bridging" => String } @instances = @baremetal.list_drivers.body diff --git a/test/requests/baremetal/node_tests.rb b/test/requests/baremetal/node_tests.rb index c4e74221c..a640deaed 100644 --- a/test/requests/baremetal/node_tests.rb +++ b/test/requests/baremetal/node_tests.rb @@ -4,36 +4,36 @@ before do @baremetal = Fog::OpenStack::Baremetal.new @node_format = { - 'instance_uuid' => Fog::Nullable::String, - 'maintenance' => Fog::Boolean, - 'power_state' => Fog::Nullable::String, + 'instance_uuid' => Fog::Nullable::String, + 'maintenance' => Fog::Boolean, + 'power_state' => Fog::Nullable::String, 'provision_state' => Fog::Nullable::String, - 'uuid' => String, - 'links' => Array + 'uuid' => String, + 'links' => Array } @detailed_node_format = { - 'instance_uuid' => Fog::Nullable::String, - 'maintenance' => Fog::Boolean, - 'power_state' => Fog::Nullable::String, - 'provision_state' => Fog::Nullable::String, - 'uuid' => String, - 'created_at' => String, - 'updated_at' => Fog::Nullable::String, - 'chassis_uuid' => Fog::Nullable::String, - 'console_enabled' => Fog::Boolean, - 'driver' => String, - 'driver_info' => Hash, - 'extra' => Hash, - 'instance_info' => Hash, - 'last_error' => Fog::Nullable::String, - 'maintenance_reason' => Fog::Nullable::String, - 'properties' => Hash, - 'provision_updated_at' => Fog::Nullable::String, - 'reservation' => Fog::Nullable::String, - 'target_power_state' => Fog::Nullable::String, + 'instance_uuid' => Fog::Nullable::String, + 'maintenance' => Fog::Boolean, + 'power_state' => Fog::Nullable::String, + 'provision_state' => Fog::Nullable::String, + 'uuid' => String, + 'created_at' => String, + 'updated_at' => Fog::Nullable::String, + 'chassis_uuid' => Fog::Nullable::String, + 'console_enabled' => Fog::Boolean, + 'driver' => String, + 'driver_info' => Hash, + 'extra' => Hash, + 'instance_info' => Hash, + 'last_error' => Fog::Nullable::String, + 'maintenance_reason' => Fog::Nullable::String, + 'properties' => Hash, + 'provision_updated_at' => Fog::Nullable::String, + 'reservation' => Fog::Nullable::String, + 'target_power_state' => Fog::Nullable::String, 'target_provision_state' => Fog::Nullable::String, - 'links' => Array + 'links' => Array } end diff --git a/test/requests/baremetal/port_tests.rb b/test/requests/baremetal/port_tests.rb index b0f0f4bcf..fa4a9111d 100644 --- a/test/requests/baremetal/port_tests.rb +++ b/test/requests/baremetal/port_tests.rb @@ -6,17 +6,17 @@ @port_format = { 'address' => String, - 'uuid' => String + 'uuid' => String } @detailed_port_format = { - 'address' => String, - 'uuid' => String, + 'address' => String, + 'uuid' => String, 'created_at' => String, 'updated_at' => Fog::Nullable::String, - 'extra' => Hash, - 'node_uuid' => String, - 'links' => Array + 'extra' => Hash, + 'node_uuid' => String, + 'links' => Array } end diff --git a/test/requests/compute/address_tests.rb b/test/requests/compute/address_tests.rb index 2026ddd9f..1a12707d4 100644 --- a/test/requests/compute/address_tests.rb +++ b/test/requests/compute/address_tests.rb @@ -49,10 +49,10 @@ def address_ip def address_format { "instance_id" => NilClass, - "ip" => String, - "fixed_ip" => NilClass, - "id" => Integer, - "pool" => String + "ip" => String, + "fixed_ip" => NilClass, + "id" => Integer, + "pool" => String } end diff --git a/test/requests/compute/aggregate_tests.rb b/test/requests/compute/aggregate_tests.rb index bc4386d2c..e069ff31c 100644 --- a/test/requests/compute/aggregate_tests.rb +++ b/test/requests/compute/aggregate_tests.rb @@ -4,12 +4,12 @@ before do @aggregate_format = { "availability_zone" => Fog::Nullable::String, - "created_at" => String, - "deleted" => Fog::Boolean, - "deleted_at" => Fog::Nullable::String, - "id" => Integer, - "name" => String, - "updated_at" => Fog::Nullable::String + "created_at" => String, + "deleted" => Fog::Boolean, + "deleted_at" => Fog::Nullable::String, + "id" => Integer, + "name" => String, + "updated_at" => Fog::Nullable::String } @detailed_aggregate_format = @aggregate_format.merge('hosts' => Array) diff --git a/test/requests/compute/availability_zone_tests.rb b/test/requests/compute/availability_zone_tests.rb index 90ee7eff2..cd5cddf02 100644 --- a/test/requests/compute/availability_zone_tests.rb +++ b/test/requests/compute/availability_zone_tests.rb @@ -3,8 +3,8 @@ describe "Fog::OpenStack::Compute | availability zone requests" do before do @flavor_format = { - 'zoneName' => String, - 'hosts' => Fog::Nullable::Hash, + 'zoneName' => String, + 'hosts' => Fog::Nullable::Hash, 'zoneState' => Hash } end diff --git a/test/requests/compute/flavor_tests.rb b/test/requests/compute/flavor_tests.rb index 781494190..b364f06dc 100644 --- a/test/requests/compute/flavor_tests.rb +++ b/test/requests/compute/flavor_tests.rb @@ -5,17 +5,17 @@ describe "Fog::OpenStack::Compute | flavor requests" do before do @flavor_format = { - 'id' => String, - 'name' => String, - 'disk' => Integer, - 'ram' => Integer, - 'links' => Array, - 'swap' => Fog::Nullable::String, - 'rxtx_factor' => Fog::Nullable::Float, - 'OS-FLV-EXT-DATA:ephemeral' => Integer, + 'id' => String, + 'name' => String, + 'disk' => Integer, + 'ram' => Integer, + 'links' => Array, + 'swap' => Fog::Nullable::String, + 'rxtx_factor' => Fog::Nullable::Float, + 'OS-FLV-EXT-DATA:ephemeral' => Integer, 'os-flavor-access:is_public' => Fog::Nullable::Boolean, - 'OS-FLV-DISABLED:disabled' => Fog::Nullable::Boolean, - 'vcpus' => Integer + 'OS-FLV-DISABLED:disabled' => Fog::Nullable::Boolean, + 'vcpus' => Integer } @compute = Fog::OpenStack::Compute.new diff --git a/test/requests/compute/helper.rb b/test/requests/compute/helper.rb index 1a2284448..36c8fad12 100644 --- a/test/requests/compute/helper.rb +++ b/test/requests/compute/helper.rb @@ -2,8 +2,8 @@ class OpenStack module Compute module Formats SUMMARY = { - 'id' => String, - 'name' => String, + 'id' => String, + 'name' => String, 'links' => Array } end diff --git a/test/requests/compute/image_tests.rb b/test/requests/compute/image_tests.rb index e18fdad0c..0a9ec0e7c 100644 --- a/test/requests/compute/image_tests.rb +++ b/test/requests/compute/image_tests.rb @@ -5,17 +5,17 @@ describe "Fog::OpenStack::Compute | image requests" do before do @image_format = { - 'created' => Fog::Nullable::String, - 'id' => String, - 'name' => String, + 'created' => Fog::Nullable::String, + 'id' => String, + 'name' => String, 'progress' => Fog::Nullable::Integer, - 'status' => String, - 'updated' => String, - 'minRam' => Integer, - 'minDisk' => Integer, - 'server' => Fog::Nullable::Hash, + 'status' => String, + 'updated' => String, + 'minRam' => Integer, + 'minDisk' => Integer, + 'server' => Fog::Nullable::Hash, 'metadata' => Hash, - 'links' => Array + 'links' => Array } @compute = Fog::OpenStack::Compute.new diff --git a/test/requests/compute/keypair_tests.rb b/test/requests/compute/keypair_tests.rb index 2f925bf75..c938bf074 100644 --- a/test/requests/compute/keypair_tests.rb +++ b/test/requests/compute/keypair_tests.rb @@ -3,16 +3,16 @@ describe "Fog::OpenStack::Compute | keypair requests" do before do @keypair_format = { - "public_key" => String, + "public_key" => String, "private_key" => String, - "user_id" => String, - "name" => String, + "user_id" => String, + "name" => String, "fingerprint" => String } @keypair_list_format = { - "public_key" => String, - "name" => String, + "public_key" => String, + "name" => String, "fingerprint" => String } end diff --git a/test/requests/compute/limit_tests.rb b/test/requests/compute/limit_tests.rb index e1fd74de6..dc698fc4a 100644 --- a/test/requests/compute/limit_tests.rb +++ b/test/requests/compute/limit_tests.rb @@ -4,39 +4,39 @@ before do @rate_limit_format = { 'regex' => String, - 'uri' => String, + 'uri' => String, 'limit' => Array } @rate_limit_usage_format = { 'next-available' => String, - 'unit' => String, - 'verb' => String, - 'remaining' => Integer, - 'value' => Integer + 'unit' => String, + 'verb' => String, + 'remaining' => Integer, + 'value' => Integer } @absolute_limits_format = { - 'maxServerMeta' => Integer, - 'maxTotalInstances' => Integer, - 'maxPersonality' => Integer, - 'maxImageMeta' => Integer, - 'maxPersonalitySize' => Integer, - 'maxSecurityGroupRules' => Integer, - 'maxTotalKeypairs' => Integer, - 'maxSecurityGroups' => Integer, - 'maxTotalCores' => Integer, - 'maxTotalFloatingIps' => Integer, - 'maxTotalRAMSize' => Integer, - 'totalCoresUsed' => Integer, - 'totalRAMUsed' => Integer, - 'totalInstancesUsed' => Integer, + 'maxServerMeta' => Integer, + 'maxTotalInstances' => Integer, + 'maxPersonality' => Integer, + 'maxImageMeta' => Integer, + 'maxPersonalitySize' => Integer, + 'maxSecurityGroupRules' => Integer, + 'maxTotalKeypairs' => Integer, + 'maxSecurityGroups' => Integer, + 'maxTotalCores' => Integer, + 'maxTotalFloatingIps' => Integer, + 'maxTotalRAMSize' => Integer, + 'totalCoresUsed' => Integer, + 'totalRAMUsed' => Integer, + 'totalInstancesUsed' => Integer, 'totalSecurityGroupsUsed' => Integer, - 'totalFloatingIpsUsed' => Integer + 'totalFloatingIpsUsed' => Integer } @limits_format = { - 'rate' => Array, + 'rate' => Array, 'absolute' => Hash } end diff --git a/test/requests/compute/quota_tests.rb b/test/requests/compute/quota_tests.rb index 0c02dbc50..605615662 100644 --- a/test/requests/compute/quota_tests.rb +++ b/test/requests/compute/quota_tests.rb @@ -2,23 +2,23 @@ describe "Fog::OpenStack::Compute | quota requests" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { - 'key_pairs' => Integer, - 'metadata_items' => Integer, + 'key_pairs' => Integer, + 'metadata_items' => Integer, 'injected_file_content_bytes' => Integer, - 'injected_file_path_bytes' => Integer, - 'injected_files' => Integer, - 'ram' => Integer, - 'floating_ips' => Integer, - 'instances' => Integer, - 'cores' => Integer, - 'security_groups' => Fog::Nullable::Integer, - 'security_group_rules' => Fog::Nullable::Integer, - 'volumes' => Fog::Nullable::Integer, - 'gigabytes' => Fog::Nullable::Integer, - 'id' => String + 'injected_file_path_bytes' => Integer, + 'injected_files' => Integer, + 'ram' => Integer, + 'floating_ips' => Integer, + 'instances' => Integer, + 'cores' => Integer, + 'security_groups' => Fog::Nullable::Integer, + 'security_group_rules' => Fog::Nullable::Integer, + 'volumes' => Fog::Nullable::Integer, + 'gigabytes' => Fog::Nullable::Integer, + 'id' => String } @compute = Fog::OpenStack::Compute.new @@ -38,7 +38,7 @@ it "#update_quota" do new_values = @quota.merge( 'floating_ips' => @quota['floating_ips'] / 2, - 'cores' => @quota['cores'] / 2 + 'cores' => @quota['cores'] / 2 ) @compute.update_quota(@tenant_id, new_values.clone).status.must_equal 200 diff --git a/test/requests/compute/security_group_tests.rb b/test/requests/compute/security_group_tests.rb index 3066a7821..c64a98c23 100644 --- a/test/requests/compute/security_group_tests.rb +++ b/test/requests/compute/security_group_tests.rb @@ -5,20 +5,20 @@ @security_group = {} @security_group_rule = {} @security_group_format = { - "id" => Integer, - "rules" => Array, - "tenant_id" => String, - "name" => String, + "id" => Integer, + "rules" => Array, + "tenant_id" => String, + "name" => String, "description" => String } @security_group_rule_format = { - "id" => Integer, - "from_port" => Integer, - "to_port" => Integer, - "ip_protocol" => String, - "group" => Hash, - "ip_range" => Hash, + "id" => Integer, + "from_port" => Integer, + "to_port" => Integer, + "ip_protocol" => String, + "group" => Hash, + "ip_range" => Hash, "parent_group_id" => Integer } diff --git a/test/requests/compute/server_tests.rb b/test/requests/compute/server_tests.rb index edaf8be08..8785a31a9 100644 --- a/test/requests/compute/server_tests.rb +++ b/test/requests/compute/server_tests.rb @@ -16,27 +16,27 @@ def compute describe "success" do before do @create_format = { - 'adminPass' => String, - 'id' => String, - 'links' => Array, + 'adminPass' => String, + 'id' => String, + 'links' => Array, 'security_groups' => Fog::Nullable::Array } @base_server_format = { - 'id' => String, - 'addresses' => Hash, - 'flavor' => Hash, - 'hostId' => String, - 'metadata' => Hash, - 'name' => String, - 'progress' => Integer, - 'status' => String, - 'accessIPv4' => Fog::Nullable::String, - 'accessIPv6' => Fog::Nullable::String, - 'links' => Array, - 'created' => String, - 'updated' => String, - 'user_id' => String, + 'id' => String, + 'addresses' => Hash, + 'flavor' => Hash, + 'hostId' => String, + 'metadata' => Hash, + 'name' => String, + 'progress' => Integer, + 'status' => String, + 'accessIPv4' => Fog::Nullable::String, + 'accessIPv6' => Fog::Nullable::String, + 'links' => Array, + 'created' => String, + 'updated' => String, + 'user_id' => String, 'config_drive' => String } @@ -45,17 +45,17 @@ def compute @server_from_image_format = @base_server_format.merge('image' => Hash) @image_format = { - 'created' => Fog::Nullable::String, - 'id' => String, - 'name' => String, + 'created' => Fog::Nullable::String, + 'id' => String, + 'name' => String, 'progress' => Fog::Nullable::Integer, - 'status' => String, - 'updated' => String, - 'minRam' => Integer, - 'minDisk' => Integer, - 'server' => Hash, + 'status' => String, + 'updated' => String, + 'minRam' => Integer, + 'minDisk' => Integer, + 'server' => Hash, 'metadata' => Hash, - 'links' => Array + 'links' => Array } @image_id = get_image_ref diff --git a/test/requests/compute/service_tests.rb b/test/requests/compute/service_tests.rb index 74f1a6063..f38b8f8e6 100644 --- a/test/requests/compute/service_tests.rb +++ b/test/requests/compute/service_tests.rb @@ -3,13 +3,13 @@ describe "Shindo.tests('Fog::OpenStack::Compute.new | service requests" do before do @service_format = { - "id" => Integer, - "binary" => String, - "host" => String, - "state" => String, - "status" => String, - "updated_at" => String, - "zone" => String, + "id" => Integer, + "binary" => String, + "host" => String, + "state" => String, + "status" => String, + "updated_at" => String, + "zone" => String, 'disabled_reason' => Fog::Nullable::String } @services = Fog::OpenStack::Compute.new.list_services.body diff --git a/test/requests/compute/tenant_tests.rb b/test/requests/compute/tenant_tests.rb index 76e9d2c4e..6c49a7405 100644 --- a/test/requests/compute/tenant_tests.rb +++ b/test/requests/compute/tenant_tests.rb @@ -3,16 +3,16 @@ describe "Fog::OpenStack::Compute | tenant requests" do before do @tenant_format = { - 'id' => String, - 'name' => String, - 'enabled' => Fog::Boolean, + 'id' => String, + 'name' => String, + 'enabled' => Fog::Boolean, 'description' => Fog::Nullable::String } end describe "success" do it "#list_tenants" do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') identity.list_tenants.body .must_match_schema('tenants_links' => Array, 'tenants' => [@tenant_format]) end diff --git a/test/requests/compute/volume_tests.rb b/test/requests/compute/volume_tests.rb index ea397a59a..44b17ff98 100644 --- a/test/requests/compute/volume_tests.rb +++ b/test/requests/compute/volume_tests.rb @@ -3,17 +3,17 @@ describe "Fog::OpenStack::Compute | volume requests" do before do @volume_format = { - 'id' => String, - 'displayName' => String, - 'size' => Integer, + 'id' => String, + 'displayName' => String, + 'size' => Integer, 'displayDescription' => String, - 'status' => String, - 'snapshotId' => Fog::Nullable::String, - 'availabilityZone' => String, - 'attachments' => Array, - 'volumeType' => Fog::Nullable::String, - 'createdAt' => String, - 'metadata' => Hash + 'status' => String, + 'snapshotId' => Fog::Nullable::String, + 'availabilityZone' => String, + 'attachments' => Array, + 'volumeType' => Fog::Nullable::String, + 'createdAt' => String, + 'metadata' => Hash } @compute = Fog::OpenStack::Compute.new diff --git a/test/requests/container_infra/bay_model_tests.rb b/test/requests/container_infra/bay_model_tests.rb index 452ffa488..3186032be 100644 --- a/test/requests/container_infra/bay_model_tests.rb +++ b/test/requests/container_infra/bay_model_tests.rb @@ -4,36 +4,36 @@ describe "Fog::OpenStack::ContainerInfra | bay model requests" do before do @bay_model_format = { - "insecure_registry" => Fog::Nullable::String, - "http_proxy" => Fog::Nullable::String, - "updated_at" => Fog::Nullable::String, - "floating_ip_enabled" => Fog::Nullable::Boolean, - "fixed_subnet" => Fog::Nullable::String, - "master_flavor_id" => Fog::Nullable::String, - "uuid" => Fog::Nullable::String, - "no_proxy" => Fog::Nullable::String, - "https_proxy" => Fog::Nullable::String, - "tls_disabled" => Fog::Nullable::Boolean, - "keypair_id" => String, - "public" => Fog::Nullable::Boolean, - "labels" => Fog::Nullable::Hash, - "docker_volume_size" => Fog::Nullable::Integer, - "server_type" => Fog::Nullable::String, - "external_network_id" => Fog::Nullable::String, - "cluster_distro" => Fog::Nullable::String, - "image_id" => Fog::Nullable::String, - "volume_driver" => Fog::Nullable::String, - "registry_enabled" => Fog::Nullable::Boolean, + "insecure_registry" => Fog::Nullable::String, + "http_proxy" => Fog::Nullable::String, + "updated_at" => Fog::Nullable::String, + "floating_ip_enabled" => Fog::Nullable::Boolean, + "fixed_subnet" => Fog::Nullable::String, + "master_flavor_id" => Fog::Nullable::String, + "uuid" => Fog::Nullable::String, + "no_proxy" => Fog::Nullable::String, + "https_proxy" => Fog::Nullable::String, + "tls_disabled" => Fog::Nullable::Boolean, + "keypair_id" => String, + "public" => Fog::Nullable::Boolean, + "labels" => Fog::Nullable::Hash, + "docker_volume_size" => Fog::Nullable::Integer, + "server_type" => Fog::Nullable::String, + "external_network_id" => Fog::Nullable::String, + "cluster_distro" => Fog::Nullable::String, + "image_id" => Fog::Nullable::String, + "volume_driver" => Fog::Nullable::String, + "registry_enabled" => Fog::Nullable::Boolean, "docker_storage_driver" => Fog::Nullable::String, - "apiserver_port" => Fog::Nullable::Integer, - "name" => String, - "created_at" => Fog::Nullable::String, - "network_driver" => Fog::Nullable::String, - "fixed_network" => Fog::Nullable::String, - "coe" => Fog::Nullable::String, - "flavor_id" => Fog::Nullable::String, - "master_lb_enabled" => Fog::Nullable::Boolean, - "dns_nameserver" => Fog::Nullable::String + "apiserver_port" => Fog::Nullable::Integer, + "name" => String, + "created_at" => Fog::Nullable::String, + "network_driver" => Fog::Nullable::String, + "fixed_network" => Fog::Nullable::String, + "coe" => Fog::Nullable::String, + "flavor_id" => Fog::Nullable::String, + "master_lb_enabled" => Fog::Nullable::Boolean, + "dns_nameserver" => Fog::Nullable::String } end @@ -71,14 +71,14 @@ bay_model_uuid = container_infra.bay_models.all.first.uuid attributes = [ { - "path" => "/master_lb_enabled", + "path" => "/master_lb_enabled", "value" => "True", - "op" => "replace" + "op" => "replace" }, { - "path" => "/registry_enabled", + "path" => "/registry_enabled", "value" => "True", - "op" => "replace" + "op" => "replace" } ] diff --git a/test/requests/container_infra/bay_tests.rb b/test/requests/container_infra/bay_tests.rb index 1d7962d81..9c51df1ad 100644 --- a/test/requests/container_infra/bay_tests.rb +++ b/test/requests/container_infra/bay_tests.rb @@ -4,22 +4,22 @@ describe "Fog::OpenStack::ContainerInfra | bay requests" do before do @bay_format = { - "status" => String, - "uuid" => String, - "stack_id" => Fog::Nullable::String, - "created_at" => Fog::Nullable::String, - "api_address" => Fog::Nullable::String, - "discovery_url" => Fog::Nullable::String, - "updated_at" => Fog::Nullable::String, - "master_count" => Fog::Nullable::Integer, - "coe_version" => Fog::Nullable::String, - "baymodel_id" => String, - "master_addresses" => Fog::Nullable::Array, - "node_count" => Fog::Nullable::Integer, - "node_addresses" => Fog::Nullable::Array, - "status_reason" => Fog::Nullable::String, - "create_timeout" => Fog::Nullable::Integer, - "name" => String + "status" => String, + "uuid" => String, + "stack_id" => Fog::Nullable::String, + "created_at" => Fog::Nullable::String, + "api_address" => Fog::Nullable::String, + "discovery_url" => Fog::Nullable::String, + "updated_at" => Fog::Nullable::String, + "master_count" => Fog::Nullable::Integer, + "coe_version" => Fog::Nullable::String, + "baymodel_id" => String, + "master_addresses" => Fog::Nullable::Array, + "node_count" => Fog::Nullable::Integer, + "node_addresses" => Fog::Nullable::Array, + "status_reason" => Fog::Nullable::String, + "create_timeout" => Fog::Nullable::Integer, + "name" => String } end @@ -63,9 +63,9 @@ bay_uuid = container_infra.bays.all.first.uuid attributes = [ { - "path" => "/node_count", + "path" => "/node_count", "value" => 2, - "op" => "replace" + "op" => "replace" } ] diff --git a/test/requests/container_infra/certificate_tests.rb b/test/requests/container_infra/certificate_tests.rb index 6a201f866..ef2120d01 100644 --- a/test/requests/container_infra/certificate_tests.rb +++ b/test/requests/container_infra/certificate_tests.rb @@ -4,10 +4,10 @@ describe "Fog::OpenStack::ContainerInfra | certificate requests" do before do @certificate_format = { - "pem" => String, - "bay_uuid" => Fog::Nullable::String, + "pem" => String, + "bay_uuid" => Fog::Nullable::String, "cluster_uuid" => Fog::Nullable::String, - "csr" => Fog::Nullable::String + "csr" => Fog::Nullable::String } end diff --git a/test/requests/container_infra/cluster_template_tests.rb b/test/requests/container_infra/cluster_template_tests.rb index 99565c2cb..876cb5bb2 100644 --- a/test/requests/container_infra/cluster_template_tests.rb +++ b/test/requests/container_infra/cluster_template_tests.rb @@ -6,36 +6,36 @@ describe "Fog::OpenStack::ContainerInfra | cluster template requests" do before do @cluster_template_format = { - "insecure_registry" => Fog::Nullable::String, - "http_proxy" => Fog::Nullable::String, - "updated_at" => Fog::Nullable::String, - "floating_ip_enabled" => Fog::Boolean, - "fixed_subnet" => Fog::Nullable::String, - "master_flavor_id" => Fog::Nullable::String, - "uuid" => Fog::Nullable::String, - "no_proxy" => Fog::Nullable::String, - "https_proxy" => Fog::Nullable::String, - "tls_disabled" => Fog::Boolean, - "keypair_id" => String, - "public" => Fog::Boolean, - "labels" => Fog::Nullable::Hash, - "docker_volume_size" => Integer, - "server_type" => String, - "external_network_id" => String, - "cluster_distro" => String, - "image_id" => String, - "volume_driver" => String, - "registry_enabled" => Fog::Nullable::Boolean, + "insecure_registry" => Fog::Nullable::String, + "http_proxy" => Fog::Nullable::String, + "updated_at" => Fog::Nullable::String, + "floating_ip_enabled" => Fog::Boolean, + "fixed_subnet" => Fog::Nullable::String, + "master_flavor_id" => Fog::Nullable::String, + "uuid" => Fog::Nullable::String, + "no_proxy" => Fog::Nullable::String, + "https_proxy" => Fog::Nullable::String, + "tls_disabled" => Fog::Boolean, + "keypair_id" => String, + "public" => Fog::Boolean, + "labels" => Fog::Nullable::Hash, + "docker_volume_size" => Integer, + "server_type" => String, + "external_network_id" => String, + "cluster_distro" => String, + "image_id" => String, + "volume_driver" => String, + "registry_enabled" => Fog::Nullable::Boolean, "docker_storage_driver" => String, - "apiserver_port" => Fog::Nullable::Integer, - "name" => String, - "created_at" => Fog::Nullable::String, - "network_driver" => String, - "fixed_network" => Fog::Nullable::String, - "coe" => String, - "flavor_id" => String, - "master_lb_enabled" => Fog::Boolean, - "dns_nameserver" => String + "apiserver_port" => Fog::Nullable::Integer, + "name" => String, + "created_at" => Fog::Nullable::String, + "network_driver" => String, + "fixed_network" => Fog::Nullable::String, + "coe" => String, + "flavor_id" => String, + "master_lb_enabled" => Fog::Boolean, + "dns_nameserver" => String } end @@ -72,14 +72,14 @@ cluster_template_uuid = container_infra.cluster_templates.all.first.uuid attributes = [ { - "path" => "/master_lb_enabled", + "path" => "/master_lb_enabled", "value" => "True", - "op" => "replace" + "op" => "replace" }, { - "path" => "/registry_enabled", + "path" => "/registry_enabled", "value" => "True", - "op" => "replace" + "op" => "replace" } ] diff --git a/test/requests/container_infra/cluster_tests.rb b/test/requests/container_infra/cluster_tests.rb index e1d8826fd..f1a06e67f 100644 --- a/test/requests/container_infra/cluster_tests.rb +++ b/test/requests/container_infra/cluster_tests.rb @@ -4,22 +4,22 @@ describe "Fog::OpenStack::ContainerInfra | cluster requests" do before do @cluster_format = { - "status" => String, - "uuid" => String, - "stack_id" => Fog::Nullable::String, - "created_at" => Fog::Nullable::String, - "api_address" => Fog::Nullable::String, - "discovery_url" => Fog::Nullable::String, - "updated_at" => Fog::Nullable::String, - "master_count" => Fog::Nullable::Integer, - "coe_version" => Fog::Nullable::String, + "status" => String, + "uuid" => String, + "stack_id" => Fog::Nullable::String, + "created_at" => Fog::Nullable::String, + "api_address" => Fog::Nullable::String, + "discovery_url" => Fog::Nullable::String, + "updated_at" => Fog::Nullable::String, + "master_count" => Fog::Nullable::Integer, + "coe_version" => Fog::Nullable::String, "cluster_template_id" => String, - "master_addresses" => Fog::Nullable::Array, - "node_count" => Fog::Nullable::Integer, - "node_addresses" => Fog::Nullable::Array, - "status_reason" => Fog::Nullable::String, - "create_timeout" => Fog::Nullable::Integer, - "name" => String + "master_addresses" => Fog::Nullable::Array, + "node_count" => Fog::Nullable::Integer, + "node_addresses" => Fog::Nullable::Array, + "status_reason" => Fog::Nullable::String, + "create_timeout" => Fog::Nullable::Integer, + "name" => String } end @@ -63,9 +63,9 @@ cluster_uuid = container_infra.clusters.all.first.uuid attributes = [ { - "path" => "/node_count", + "path" => "/node_count", "value" => 2, - "op" => "replace" + "op" => "replace" } ] diff --git a/test/requests/dns_v1/domain_tests.rb b/test/requests/dns_v1/domain_tests.rb index 0774c6ccc..d8441cc20 100644 --- a/test/requests/dns_v1/domain_tests.rb +++ b/test/requests/dns_v1/domain_tests.rb @@ -5,14 +5,14 @@ @dns = Fog::OpenStack::DNS::V1.new @domain_format = { - "id" => String, - "name" => String, - "email" => String, - "ttl" => Integer, - "serial" => Integer, + "id" => String, + "name" => String, + "email" => String, + "ttl" => Integer, + "serial" => Integer, "description" => String, - "created_at" => String, - "updated_at" => String + "created_at" => String, + "updated_at" => String } end diff --git a/test/requests/dns_v1/quota_tests.rb b/test/requests/dns_v1/quota_tests.rb index 0733b5383..0bdd570a5 100644 --- a/test/requests/dns_v1/quota_tests.rb +++ b/test/requests/dns_v1/quota_tests.rb @@ -7,11 +7,11 @@ @project_id = Fog::Mock.random_numbers(6).to_s @quota_format = { - "api_export_size" => Integer, + "api_export_size" => Integer, "recordset_records" => Integer, - "domain_records" => Integer, + "domain_records" => Integer, "domain_recordsets" => Integer, - "domains" => Integer + "domains" => Integer } @quota = @dns.get_quota(@project_id).body @@ -25,7 +25,7 @@ it "#update_quota" do new_values = @quota.merge( 'recordset_records' => @quota['recordset_records'] + 1, - 'domains' => @quota['domains'] + 2 + 'domains' => @quota['domains'] + 2 ) @dns.update_quota(@project_id, new_values.clone).status.must_equal 200 diff --git a/test/requests/dns_v2/pool_tests.rb b/test/requests/dns_v2/pool_tests.rb index e8a68ed4c..f888fcd70 100644 --- a/test/requests/dns_v2/pool_tests.rb +++ b/test/requests/dns_v2/pool_tests.rb @@ -7,14 +7,14 @@ @pool_format = { "description" => String, - "id" => String, - "project_id" => String, - "created_at" => String, - "attributes" => String, - "ns_records" => Array, - "links" => Hash, - "name" => String, - "updated_at" => String + "id" => String, + "project_id" => String, + "created_at" => String, + "attributes" => String, + "ns_records" => Array, + "links" => Hash, + "name" => String, + "updated_at" => String } @pool_id = @dns.list_pools.body['pools'].first['id'] diff --git a/test/requests/dns_v2/quota_tests.rb b/test/requests/dns_v2/quota_tests.rb index aec0065d3..5230e9069 100644 --- a/test/requests/dns_v2/quota_tests.rb +++ b/test/requests/dns_v2/quota_tests.rb @@ -7,11 +7,11 @@ @project_id = @dns.respond_to?(:current_tenant) ? @dns.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s @quota_format = { - "api_export_size" => Integer, + "api_export_size" => Integer, "recordset_records" => Integer, - "zone_records" => Integer, - "zone_recordsets" => Integer, - "zones" => Integer + "zone_records" => Integer, + "zone_recordsets" => Integer, + "zones" => Integer } @quota = @dns.get_quota(@project_id).body end @@ -24,7 +24,7 @@ it "#update_quota" do new_values = @quota.merge( 'recordset_records' => @quota['recordset_records'] + 1, - 'zones' => @quota['zones'] + 2 + 'zones' => @quota['zones'] + 2 ) @dns.update_quota(@project_id, new_values.clone).status.must_equal 200 diff --git a/test/requests/dns_v2/recordset_tests.rb b/test/requests/dns_v2/recordset_tests.rb index d04f7bfa9..776bb8e02 100644 --- a/test/requests/dns_v2/recordset_tests.rb +++ b/test/requests/dns_v2/recordset_tests.rb @@ -9,20 +9,20 @@ @recordset_format = { "description" => String, - "links" => Hash, - "updated_at" => String, - "records" => Array, - "ttl" => Integer, - "id" => String, - "name" => String, - "project_id" => String, - "zone_id" => String, - "zone_name" => String, - "created_at" => String, - "version" => Integer, - "type" => String, - "status" => String, - "action" => String + "links" => Hash, + "updated_at" => String, + "records" => Array, + "ttl" => Integer, + "id" => String, + "name" => String, + "project_id" => String, + "zone_id" => String, + "zone_name" => String, + "created_at" => String, + "version" => Integer, + "type" => String, + "status" => String, + "action" => String } recordset_links_format = { @@ -36,8 +36,8 @@ @recordset_list_format = { "recordsets" => [@recordset_format], - "links" => recordset_links_format, - "metadata" => recordset_metadata_format + "links" => recordset_links_format, + "metadata" => recordset_metadata_format } end diff --git a/test/requests/dns_v2/zone_tests.rb b/test/requests/dns_v2/zone_tests.rb index 940777afb..b6bd3b8b8 100644 --- a/test/requests/dns_v2/zone_tests.rb +++ b/test/requests/dns_v2/zone_tests.rb @@ -6,23 +6,23 @@ @dns, @zone, @zone_id = set_dns_data @zone_format = { - "id" => String, - "pool_id" => String, - "project_id" => String, - "name" => String, - "email" => String, - "ttl" => Integer, - "serial" => Integer, - "status" => String, - "action" => String, - "description" => String, - "masters" => Array, - "type" => String, + "id" => String, + "pool_id" => String, + "project_id" => String, + "name" => String, + "email" => String, + "ttl" => Integer, + "serial" => Integer, + "status" => String, + "action" => String, + "description" => String, + "masters" => Array, + "type" => String, "transferred_at" => String, - "version" => Integer, - "created_at" => String, - "updated_at" => String, - "links" => Hash + "version" => Integer, + "created_at" => String, + "updated_at" => String, + "links" => Hash } end diff --git a/test/requests/identity/ec2_credentials_tests.rb b/test/requests/identity/ec2_credentials_tests.rb index 040f9bf4c..171dc4a4c 100644 --- a/test/requests/identity/ec2_credentials_tests.rb +++ b/test/requests/identity/ec2_credentials_tests.rb @@ -4,13 +4,13 @@ describe "Fog::Identity[:openstack] | EC2 credential requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @credential_format = { - 'access' => String, + 'access' => String, 'tenant_id' => String, - 'secret' => String, - 'user_id' => String + 'secret' => String, + 'user_id' => String } @user_id = OpenStack::Identity.get_user_id(@identity) diff --git a/test/requests/identity/role_tests.rb b/test/requests/identity/role_tests.rb index 833afeb38..4d5f971cf 100644 --- a/test/requests/identity/role_tests.rb +++ b/test/requests/identity/role_tests.rb @@ -2,10 +2,10 @@ describe "Fog::Identity[:openstack] | role requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @role_format = { - 'id' => String, + 'id' => String, 'name' => String } diff --git a/test/requests/identity/tenant_tests.rb b/test/requests/identity/tenant_tests.rb index 1c4d1d0b4..1814e0aa8 100644 --- a/test/requests/identity/tenant_tests.rb +++ b/test/requests/identity/tenant_tests.rb @@ -4,17 +4,17 @@ describe "Fog::Identity[:openstack] | tenant requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @tenant_format = { - 'id' => String, - 'name' => String, - 'enabled' => Fog::Nullable::Boolean, + 'id' => String, + 'name' => String, + 'enabled' => Fog::Nullable::Boolean, 'description' => Fog::Nullable::String } @role_format = { - 'id' => String, + 'id' => String, 'name' => String } diff --git a/test/requests/identity/user_tests.rb b/test/requests/identity/user_tests.rb index ad66cc488..abad09649 100644 --- a/test/requests/identity/user_tests.rb +++ b/test/requests/identity/user_tests.rb @@ -4,13 +4,13 @@ describe "Fog::Identity[:openstack] | user requests" do before do - @identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + @identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @user_format = { - 'id' => String, - 'name' => String, - 'enabled' => Fog::Boolean, - 'email' => String, + 'id' => String, + 'name' => String, + 'enabled' => Fog::Boolean, + 'email' => String, 'tenantId' => Fog::Nullable::String } diff --git a/test/requests/image/image_tests.rb b/test/requests/image/image_tests.rb index 360c8a319..b8a43cc5c 100644 --- a/test/requests/image/image_tests.rb +++ b/test/requests/image/image_tests.rb @@ -2,7 +2,7 @@ describe "Fog::OpenStack::Image | image requests" do before(:all) do - openstack = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + openstack = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @image_attributes = { name: 'new image', @@ -18,57 +18,57 @@ } @image_format = { - 'name' => String, + 'name' => String, 'container_format' => String, - 'disk_format' => String, - 'checksum' => String, - 'id' => String, - 'size' => Integer + 'disk_format' => String, + 'checksum' => String, + 'id' => String, + 'size' => Integer } @detailed_image_format = { - 'id' => String, - 'name' => String, - 'size' => Integer, - 'disk_format' => String, + 'id' => String, + 'name' => String, + 'size' => Integer, + 'disk_format' => String, 'container_format' => String, - 'checksum' => String, - 'min_disk' => Integer, - 'created_at' => String, - 'deleted_at' => Fog::Nullable::String, - 'updated_at' => String, - 'deleted' => Fog::Boolean, - 'protected' => Fog::Boolean, - 'is_public' => Fog::Boolean, - 'status' => String, - 'min_ram' => Integer, - 'owner' => Fog::Nullable::String, - 'properties' => Hash + 'checksum' => String, + 'min_disk' => Integer, + 'created_at' => String, + 'deleted_at' => Fog::Nullable::String, + 'updated_at' => String, + 'deleted' => Fog::Boolean, + 'protected' => Fog::Boolean, + 'is_public' => Fog::Boolean, + 'status' => String, + 'min_ram' => Integer, + 'owner' => Fog::Nullable::String, + 'properties' => Hash } @image_meta_format = { - 'X-Image-Meta-Is_public' => String, - 'X-Image-Meta-Min_disk' => Fog::Nullable::String, + 'X-Image-Meta-Is_public' => String, + 'X-Image-Meta-Min_disk' => Fog::Nullable::String, 'X-Image-Meta-Property-Ramdisk_id' => Fog::Nullable::String, - 'X-Image-Meta-Disk_format' => Fog::Nullable::String, - 'X-Image-Meta-Created_at' => String, - 'X-Image-Meta-Container_format' => Fog::Nullable::String, - 'Etag' => String, - 'Location' => String, - 'X-Image-Meta-Protected' => String, - 'Date' => String, - 'X-Image-Meta-Name' => String, - 'X-Image-Meta-Min_ram' => String, - 'Content-Type' => String, - 'X-Image-Meta-Updated_at' => String, - 'X-Image-Meta-Property-Kernel_id' => Fog::Nullable::String, - 'X-Image-Meta-Size' => String, - 'X-Image-Meta-Checksum' => Fog::Nullable::String, - 'X-Image-Meta-Deleted' => String, - 'Content-Length' => String, - 'X-Image-Meta-Status' => String, - 'X-Image-Meta-Owner' => String, - 'X-Image-Meta-Id' => String + 'X-Image-Meta-Disk_format' => Fog::Nullable::String, + 'X-Image-Meta-Created_at' => String, + 'X-Image-Meta-Container_format' => Fog::Nullable::String, + 'Etag' => String, + 'Location' => String, + 'X-Image-Meta-Protected' => String, + 'Date' => String, + 'X-Image-Meta-Name' => String, + 'X-Image-Meta-Min_ram' => String, + 'Content-Type' => String, + 'X-Image-Meta-Updated_at' => String, + 'X-Image-Meta-Property-Kernel_id' => Fog::Nullable::String, + 'X-Image-Meta-Size' => String, + 'X-Image-Meta-Checksum' => Fog::Nullable::String, + 'X-Image-Meta-Deleted' => String, + 'Content-Length' => String, + 'X-Image-Meta-Status' => String, + 'X-Image-Meta-Owner' => String, + 'X-Image-Meta-Id' => String } @image_members_format = [ diff --git a/test/requests/introspection/introspection_tests.rb b/test/requests/introspection/introspection_tests.rb index aef4d11a4..d0d7ac38a 100644 --- a/test/requests/introspection/introspection_tests.rb +++ b/test/requests/introspection/introspection_tests.rb @@ -7,157 +7,157 @@ @node_uuid = Fog::UUID.uuid @introspection_finished = { - "error" => "null", + "error" => "null", "finished" => "true" } @introspection_data = { - "cpu_arch" => String, - "macs" => Array, - "root_disk" => { - "rotational" => Fog::Boolean, - "vendor" => String, - "name" => String, + "cpu_arch" => String, + "macs" => Array, + "root_disk" => { + "rotational" => Fog::Boolean, + "vendor" => String, + "name" => String, "wwn_vendor_extension" => Fog::Nullable::String, - "wwn_with_extension" => Fog::Nullable::String, - "model" => Fog::Nullable::String, - "wwn" => Fog::Nullable::String, - "serial" => Fog::Nullable::String, - "size" => Integer + "wwn_with_extension" => Fog::Nullable::String, + "model" => Fog::Nullable::String, + "wwn" => Fog::Nullable::String, + "serial" => Fog::Nullable::String, + "size" => Integer }, "extra" => { "network" => { "eth0" => { - "vlan-challenged" => String, - "tx-udp_tnl-segmentation" => String, - "ipv4-network" => String, - "rx-vlan-stag-filter" => String, - "highdma" => String, - "tx-nocache-copy" => String, - "tx-gso-robust" => String, - "fcoe-mtu" => String, - "netns-local" => String, - "udp-fragmentation-offload" => String, - "serial" => String, - "latency" => Integer, - "tx-checksumming/tx-checksum-ipv6" => String, - "tx-checksumming/tx-checksum-ipv4" => String, - "ipv4-netmask" => String, - "tcp-segmentation-offload/tx-tcp-segmentation" => String, - "tx-ipip-segmentation" => String, - "rx-vlan-offload" => String, - "tx-gre-segmentation" => String, - "tx-checksumming/tx-checksum-ip-generic" => String, + "vlan-challenged" => String, + "tx-udp_tnl-segmentation" => String, + "ipv4-network" => String, + "rx-vlan-stag-filter" => String, + "highdma" => String, + "tx-nocache-copy" => String, + "tx-gso-robust" => String, + "fcoe-mtu" => String, + "netns-local" => String, + "udp-fragmentation-offload" => String, + "serial" => String, + "latency" => Integer, + "tx-checksumming/tx-checksum-ipv6" => String, + "tx-checksumming/tx-checksum-ipv4" => String, + "ipv4-netmask" => String, + "tcp-segmentation-offload/tx-tcp-segmentation" => String, + "tx-ipip-segmentation" => String, + "rx-vlan-offload" => String, + "tx-gre-segmentation" => String, + "tx-checksumming/tx-checksum-ip-generic" => String, "tcp-segmentation-offload/tx-tcp-ecn-segmentation" => String, - "tx-checksumming/tx-checksum-fcoe-crc" => String, - "ipv4" => String, - "businfo" => String, - "rx-vlan-stag-hw-parse" => String, - "tx-vlan-offload" => String, - "product" => String, - "vendor" => String, - "tx-checksumming/tx-checksum-sctp" => String, - "driver" => String, - "tx-sit-segmentation" => String, - "busy-poll" => String, - "tx-vlan-stag-hw-insert" => String, - "scatter-gather/tx-scatter-gather" => String, - "link" => String, - "ntuple-filters" => String, - "rx-all" => String, - "tcp-segmentation-offload" => String, - "tcp-segmentation-offload/tx-tcp6-segmentation" => String, - "rx-checksumming" => String, - "rx-fcs" => String, - "tx-lockless" => String, - "generic-segmentation-offload" => String, - "tx-fcoe-segmentation" => String, - "tx-checksumming" => String, - "ipv4-cidr" => Integer, - "large-receive-offload" => String, - "rx-vlan-filter" => String, - "receive-hashing" => String, - "scatter-gather/tx-scatter-gather-fraglist" => String, - "generic-receive-offload" => String, - "loopback" => String, - "scatter-gather" => String, - "tx-mpls-segmentation" => String + "tx-checksumming/tx-checksum-fcoe-crc" => String, + "ipv4" => String, + "businfo" => String, + "rx-vlan-stag-hw-parse" => String, + "tx-vlan-offload" => String, + "product" => String, + "vendor" => String, + "tx-checksumming/tx-checksum-sctp" => String, + "driver" => String, + "tx-sit-segmentation" => String, + "busy-poll" => String, + "tx-vlan-stag-hw-insert" => String, + "scatter-gather/tx-scatter-gather" => String, + "link" => String, + "ntuple-filters" => String, + "rx-all" => String, + "tcp-segmentation-offload" => String, + "tcp-segmentation-offload/tx-tcp6-segmentation" => String, + "rx-checksumming" => String, + "rx-fcs" => String, + "tx-lockless" => String, + "generic-segmentation-offload" => String, + "tx-fcoe-segmentation" => String, + "tx-checksumming" => String, + "ipv4-cidr" => Integer, + "large-receive-offload" => String, + "rx-vlan-filter" => String, + "receive-hashing" => String, + "scatter-gather/tx-scatter-gather-fraglist" => String, + "generic-receive-offload" => String, + "loopback" => String, + "scatter-gather" => String, + "tx-mpls-segmentation" => String }, "eth1" => { - "vlan-challenged" => String, - "tx-udp_tnl-segmentation" => String, - "tx-vlan-stag-hw-insert" => String, - "rx-vlan-stag-filter" => String, - "highdma" => String, - "tx-nocache-copy" => String, - "tx-gso-robust" => String, - "fcoe-mtu" => String, - "netns-local" => String, - "udp-fragmentation-offload" => String, - "serial" => String, - "latency" => Integer, - "tx-checksumming/tx-checksum-ipv6" => String, - "tx-checksumming/tx-checksum-ipv4" => String, - "tx-fcoe-segmentation" => String, - "tcp-segmentation-offload/tx-tcp-segmentation" => String, - "tx-ipip-segmentation" => String, - "rx-vlan-offload" => String, - "tx-gre-segmentation" => String, - "tx-checksumming/tx-checksum-ip-generic" => String, + "vlan-challenged" => String, + "tx-udp_tnl-segmentation" => String, + "tx-vlan-stag-hw-insert" => String, + "rx-vlan-stag-filter" => String, + "highdma" => String, + "tx-nocache-copy" => String, + "tx-gso-robust" => String, + "fcoe-mtu" => String, + "netns-local" => String, + "udp-fragmentation-offload" => String, + "serial" => String, + "latency" => Integer, + "tx-checksumming/tx-checksum-ipv6" => String, + "tx-checksumming/tx-checksum-ipv4" => String, + "tx-fcoe-segmentation" => String, + "tcp-segmentation-offload/tx-tcp-segmentation" => String, + "tx-ipip-segmentation" => String, + "rx-vlan-offload" => String, + "tx-gre-segmentation" => String, + "tx-checksumming/tx-checksum-ip-generic" => String, "tcp-segmentation-offload/tx-tcp-ecn-segmentation" => String, - "tx-checksumming/tx-checksum-fcoe-crc" => String, - "rx-vlan-stag-hw-parse" => String, - "businfo" => String, - "tx-vlan-offload" => String, - "product" => String, - "vendor" => String, - "tx-checksumming/tx-checksum-sctp" => String, - "driver" => String, - "tx-sit-segmentation" => String, - "busy-poll" => String, - "scatter-gather/tx-scatter-gather" => String, - "link" => String, - "ntuple-filters" => String, - "rx-all" => String, - "tcp-segmentation-offload" => String, - "tcp-segmentation-offload/tx-tcp6-segmentation" => String, - "rx-checksumming" => String, - "tx-lockless" => String, - "generic-segmentation-offload" => String, - "loopback" => String, - "tx-checksumming" => String, - "large-receive-offload" => String, - "rx-vlan-filter" => String, - "receive-hashing" => String, - "scatter-gather/tx-scatter-gather-fraglist" => String, - "generic-receive-offload" => String, - "rx-fcs" => String, - "scatter-gather" => String, - "tx-mpls-segmentation" => String + "tx-checksumming/tx-checksum-fcoe-crc" => String, + "rx-vlan-stag-hw-parse" => String, + "businfo" => String, + "tx-vlan-offload" => String, + "product" => String, + "vendor" => String, + "tx-checksumming/tx-checksum-sctp" => String, + "driver" => String, + "tx-sit-segmentation" => String, + "busy-poll" => String, + "scatter-gather/tx-scatter-gather" => String, + "link" => String, + "ntuple-filters" => String, + "rx-all" => String, + "tcp-segmentation-offload" => String, + "tcp-segmentation-offload/tx-tcp6-segmentation" => String, + "rx-checksumming" => String, + "tx-lockless" => String, + "generic-segmentation-offload" => String, + "loopback" => String, + "tx-checksumming" => String, + "large-receive-offload" => String, + "rx-vlan-filter" => String, + "receive-hashing" => String, + "scatter-gather/tx-scatter-gather-fraglist" => String, + "generic-receive-offload" => String, + "rx-fcs" => String, + "scatter-gather" => String, + "tx-mpls-segmentation" => String } }, "firmware" => { "bios" => { - "date" => String, + "date" => String, "version" => String, - "vendor" => String + "vendor" => String } }, "system" => { "kernel" => { "cmdline" => String, "version" => String, - "arch" => String + "arch" => String }, "product" => { "version" => String, - "vendor" => String, - "name" => String, - "uuid" => String + "vendor" => String, + "name" => String, + "uuid" => String }, "os" => { "version" => String, - "vendor" => String + "vendor" => String } }, "memory" => { @@ -167,113 +167,113 @@ }, "disk" => { "vda" => { - "optimal_io_size" => Integer, + "optimal_io_size" => Integer, "physical_block_size" => Integer, - "rotational" => Integer, - "vendor" => String, - "size" => Integer + "rotational" => Integer, + "vendor" => String, + "size" => Integer }, "logical" => { "count" => Integer } }, "cpu" => { - "logical" => { "number" => Integer }, + "logical" => { "number" => Integer }, "physical_0" => { - "physid" => Integer, - "product" => String, + "physid" => Integer, + "product" => String, "frequency" => Integer, - "vendor" => String, - "flags" => String + "vendor" => String, + "flags" => String }, "physical_1" => { - "physid" => Integer, - "product" => String, + "physid" => Integer, + "product" => String, "frequency" => Integer, - "vendor" => String, - "flags" => String + "vendor" => String, + "flags" => String }, "physical_2" => { - "physid" => Integer, - "product" => String, + "physid" => Integer, + "product" => String, "frequency" => Integer, - "vendor" => String, - "flags" => String + "vendor" => String, + "flags" => String }, "physical_3" => { - "physid" => Integer, - "product" => String, + "physid" => Integer, + "product" => String, "frequency" => Integer, - "vendor" => String, - "flags" => String + "vendor" => String, + "flags" => String }, "physical" => { "number" => Integer } } }, "interfaces" => { "eth0" => { - "ip" => String, + "ip" => String, "mac" => String } }, - "cpus" => 4, + "cpus" => 4, "boot_interface" => String, - "memory_mb" => Integer, - "ipmi_address" => String, - "inventory" => { - "bmc_address" => String, - "interfaces" => [ + "memory_mb" => Integer, + "ipmi_address" => String, + "inventory" => { + "bmc_address" => String, + "interfaces" => [ { - "ipv4_address" => Fog::Nullable::String, - "switch_port_descr" => Fog::Nullable::String, + "ipv4_address" => Fog::Nullable::String, + "switch_port_descr" => Fog::Nullable::String, "switch_chassis_descr" => Fog::Nullable::String, - "name" => String, - "mac_address" => String + "name" => String, + "mac_address" => String }, { - "ipv4_address" => Fog::Nullable::String, - "switch_port_descr" => Fog::Nullable::String, + "ipv4_address" => Fog::Nullable::String, + "switch_port_descr" => Fog::Nullable::String, "switch_chassis_descr" => Fog::Nullable::String, - "name" => String, - "mac_address" => String + "name" => String, + "mac_address" => String } ], "disks" => [ { - "rotational" => Fog::Boolean, - "vendor" => String, - "name" => String, + "rotational" => Fog::Boolean, + "vendor" => String, + "name" => String, "wwn_vendor_extension" => Fog::Nullable::String, - "wwn_with_extension" => Fog::Nullable::String, - "model" => Fog::Nullable::String, - "wwn" => Fog::Nullable::String, - "serial" => Fog::Nullable::String, - "size" => Integer + "wwn_with_extension" => Fog::Nullable::String, + "model" => Fog::Nullable::String, + "wwn" => Fog::Nullable::String, + "serial" => Fog::Nullable::String, + "size" => Integer } ], "system_vendor" => { "serial_number" => String, - "product_name" => String, - "manufacturer" => String + "product_name" => String, + "manufacturer" => String }, - "memory" => { + "memory" => { "physical_mb" => Integer, - "total" => Integer + "total" => Integer }, "cpu" => { - "count" => Integer, - "frequency" => String, - "model_name" => String, + "count" => Integer, + "frequency" => String, + "model_name" => String, "architecture" => String } }, - "error" => Fog::Nullable::String, - "local_gb" => Integer, + "error" => Fog::Nullable::String, + "local_gb" => Integer, "all_interfaces" => { "eth0" => { - "ip" => Fog::Nullable::String, + "ip" => Fog::Nullable::String, "mac" => String }, "eth1" => { - "ip" => Fog::Nullable::String, + "ip" => Fog::Nullable::String, "mac" => String } }, diff --git a/test/requests/introspection/rules_tests.rb b/test/requests/introspection/rules_tests.rb index 48f9eb707..1a0083719 100644 --- a/test/requests/introspection/rules_tests.rb +++ b/test/requests/introspection/rules_tests.rb @@ -6,9 +6,9 @@ @rules_id = Fog::UUID.uuid @rules = { 'description' => Fog::Nullable::String, - 'actions' => Array, - 'conditions' => Array, - 'uuid' => Fog::Nullable::String + 'actions' => Array, + 'conditions' => Array, + 'uuid' => Fog::Nullable::String } end @@ -21,16 +21,16 @@ attributes = { "actions" => { "action" => "set-attribute", - "path" => "/driver_info/ipmi_address", - "value" => "{data[inventory][bmc_address]}" + "path" => "/driver_info/ipmi_address", + "value" => "{data[inventory][bmc_address]}" }, "conditions" => { "field" => "node://property.path", - "op" => "eq", + "op" => "eq", "value" => "val" }, "description" => "", - "uuid" => "" + "uuid" => "" } @inspector.create_rules(attributes).body.must_match_schema('rules' => @rules) end diff --git a/test/requests/metering/meter_tests.rb b/test/requests/metering/meter_tests.rb index c41ec5763..55a98fc5f 100644 --- a/test/requests/metering/meter_tests.rb +++ b/test/requests/metering/meter_tests.rb @@ -5,40 +5,40 @@ @metering = Fog::OpenStack::Metering.new @sample_format = { - 'counter_name' => String, - 'user_id' => String, - 'resource_id' => String, - 'timestamp' => String, + 'counter_name' => String, + 'user_id' => String, + 'resource_id' => String, + 'timestamp' => String, 'resource_metadata' => Hash, - 'source' => String, - 'counter_unit' => String, - 'counter_volume' => Float, - 'project_id' => String, - 'message_id' => String, - 'counter_type' => String + 'source' => String, + 'counter_unit' => String, + 'counter_volume' => Float, + 'project_id' => String, + 'message_id' => String, + 'counter_type' => String } @meter_format = { - 'user_id' => String, - 'name' => String, + 'user_id' => String, + 'name' => String, 'resource_id' => String, - 'project_id' => String, - 'type' => String, - 'unit' => String + 'project_id' => String, + 'type' => String, + 'unit' => String } @statistics_format = { - 'count' => Integer, + 'count' => Integer, 'duration_start' => String, - 'min' => Float, - 'max' => Float, - 'duration_end' => String, - 'period' => Integer, - 'period_end' => String, - 'duration' => Float, - 'period_start' => String, - 'avg' => Float, - 'sum' => Float + 'min' => Float, + 'max' => Float, + 'duration_end' => String, + 'period' => Integer, + 'period_end' => String, + 'duration' => Float, + 'period_start' => String, + 'avg' => Float, + 'sum' => Float } end diff --git a/test/requests/metering/resource_tests.rb b/test/requests/metering/resource_tests.rb index 16b706ba1..9fe1d8395 100644 --- a/test/requests/metering/resource_tests.rb +++ b/test/requests/metering/resource_tests.rb @@ -6,9 +6,9 @@ @resource_format = { 'resource_id' => String, - 'project_id' => String, - 'user_id' => String, - 'metadata' => Hash + 'project_id' => String, + 'user_id' => String, + 'metadata' => Hash } end diff --git a/test/requests/network/extension_tests.rb b/test/requests/network/extension_tests.rb index da22f98bd..f064eb60a 100644 --- a/test/requests/network/extension_tests.rb +++ b/test/requests/network/extension_tests.rb @@ -3,11 +3,11 @@ describe "Fog::OpenStack::Network | extension requests" do before do @extension_format = { - 'id' => String, - 'alias' => String, + 'id' => String, + 'alias' => String, 'description' => String, - 'links' => Array, - 'name' => String + 'links' => Array, + 'name' => String } end diff --git a/test/requests/network/ike_policy_tests.rb b/test/requests/network/ike_policy_tests.rb index 13e4d17d0..9aa376dd1 100644 --- a/test/requests/network/ike_policy_tests.rb +++ b/test/requests/network/ike_policy_tests.rb @@ -4,16 +4,16 @@ describe "success" do before do @ike_policy_format = { - 'id' => String, - 'name' => String, - 'description' => String, - 'tenant_id' => String, - 'auth_algorithm' => String, - 'encryption_algorithm' => String, - 'pfs' => String, + 'id' => String, + 'name' => String, + 'description' => String, + 'tenant_id' => String, + 'auth_algorithm' => String, + 'encryption_algorithm' => String, + 'pfs' => String, 'phase1_negotiation_mode' => String, - 'lifetime' => Hash, - 'ike_version' => String + 'lifetime' => Hash, + 'ike_version' => String } attributes = { diff --git a/test/requests/network/ipsec_policy_tests.rb b/test/requests/network/ipsec_policy_tests.rb index 4452b0e05..960afc6a3 100644 --- a/test/requests/network/ipsec_policy_tests.rb +++ b/test/requests/network/ipsec_policy_tests.rb @@ -3,15 +3,15 @@ describe "Fog::OpenStack::Network | ipsec_policy requests" do before do @ipsec_policy_format = { - 'id' => String, - 'name' => String, - 'description' => String, - 'tenant_id' => String, - 'lifetime' => Hash, - 'pfs' => String, - 'transform_protocol' => String, - 'auth_algorithm' => String, - 'encapsulation_mode' => String, + 'id' => String, + 'name' => String, + 'description' => String, + 'tenant_id' => String, + 'lifetime' => Hash, + 'pfs' => String, + 'transform_protocol' => String, + 'auth_algorithm' => String, + 'encapsulation_mode' => String, 'encryption_algorithm' => String } end diff --git a/test/requests/network/ipsec_site_connection_tests.rb b/test/requests/network/ipsec_site_connection_tests.rb index 089b20ec1..2754954fc 100644 --- a/test/requests/network/ipsec_site_connection_tests.rb +++ b/test/requests/network/ipsec_site_connection_tests.rb @@ -3,26 +3,26 @@ describe "Fog::OpenStack::Network | ipsec_site_connection requests" do before do @ipsec_site_connection_format = { - 'id' => String, - 'name' => String, - 'description' => String, - 'status' => String, - 'tenant_id' => String, - 'admin_state_up' => Fog::Boolean, - 'psk' => String, - 'initiator' => String, - 'auth_mode' => String, - 'peer_cidrs' => Array, - 'mtu' => Integer, - 'peer_ep_group_id' => String, - 'ikepolicy_id' => String, - 'vpnservice_id' => String, - 'dpd' => Hash, - 'route_mode' => String, - 'ipsecpolicy_id' => String, + 'id' => String, + 'name' => String, + 'description' => String, + 'status' => String, + 'tenant_id' => String, + 'admin_state_up' => Fog::Boolean, + 'psk' => String, + 'initiator' => String, + 'auth_mode' => String, + 'peer_cidrs' => Array, + 'mtu' => Integer, + 'peer_ep_group_id' => String, + 'ikepolicy_id' => String, + 'vpnservice_id' => String, + 'dpd' => Hash, + 'route_mode' => String, + 'ipsecpolicy_id' => String, 'local_ep_group_id' => String, - 'peer_address' => String, - 'peer_id' => String + 'peer_address' => String, + 'peer_id' => String } end diff --git a/test/requests/network/lb_health_monitor_tests.rb b/test/requests/network/lb_health_monitor_tests.rb index 4ab7c4952..f587cb2a2 100644 --- a/test/requests/network/lb_health_monitor_tests.rb +++ b/test/requests/network/lb_health_monitor_tests.rb @@ -3,17 +3,17 @@ describe "Fog::OpenStack::Network | lb_health_monitor requests" do before do @lb_health_monitor_format = { - 'id' => String, - 'type' => String, - 'delay' => Integer, - 'timeout' => Integer, - 'max_retries' => Integer, - 'http_method' => String, - 'url_path' => String, + 'id' => String, + 'type' => String, + 'delay' => Integer, + 'timeout' => Integer, + 'max_retries' => Integer, + 'http_method' => String, + 'url_path' => String, 'expected_codes' => String, - 'status' => String, + 'status' => String, 'admin_state_up' => Fog::Boolean, - 'tenant_id' => String + 'tenant_id' => String } end diff --git a/test/requests/network/lb_member_tests.rb b/test/requests/network/lb_member_tests.rb index a65c85bad..7ae8a5788 100644 --- a/test/requests/network/lb_member_tests.rb +++ b/test/requests/network/lb_member_tests.rb @@ -4,14 +4,14 @@ describe "success" do before do @lb_member_format = { - 'id' => String, - 'pool_id' => String, - 'address' => String, - 'protocol_port' => Integer, - 'weight' => Integer, - 'status' => String, + 'id' => String, + 'pool_id' => String, + 'address' => String, + 'protocol_port' => Integer, + 'weight' => Integer, + 'status' => String, 'admin_state_up' => Fog::Boolean, - 'tenant_id' => String + 'tenant_id' => String } pool_id = "pool_id" diff --git a/test/requests/network/lb_pool_tests.rb b/test/requests/network/lb_pool_tests.rb index df080ee8a..94114336b 100644 --- a/test/requests/network/lb_pool_tests.rb +++ b/test/requests/network/lb_pool_tests.rb @@ -3,29 +3,29 @@ describe "Fog::OpenStack::Network | lb_pool requests" do before do @lb_pool_format = { - 'id' => String, - 'subnet_id' => String, - 'protocol' => String, - 'lb_method' => String, - 'name' => String, - 'description' => String, - 'health_monitors' => Array, - 'members' => Array, - 'status' => String, - 'admin_state_up' => Fog::Boolean, - 'vip_id' => Fog::Nullable::String, - 'tenant_id' => String, + 'id' => String, + 'subnet_id' => String, + 'protocol' => String, + 'lb_method' => String, + 'name' => String, + 'description' => String, + 'health_monitors' => Array, + 'members' => Array, + 'status' => String, + 'admin_state_up' => Fog::Boolean, + 'vip_id' => Fog::Nullable::String, + 'tenant_id' => String, 'active_connections' => Fog::Nullable::Integer, - 'bytes_in' => Fog::Nullable::Integer, - 'bytes_out' => Fog::Nullable::Integer, - 'total_connections' => Fog::Nullable::Integer + 'bytes_in' => Fog::Nullable::Integer, + 'bytes_out' => Fog::Nullable::Integer, + 'total_connections' => Fog::Nullable::Integer } @lb_pool_stats_format = { 'active_connections' => Integer, - 'bytes_in' => Integer, - 'bytes_out' => Integer, - 'total_connections' => Integer + 'bytes_in' => Integer, + 'bytes_out' => Integer, + 'total_connections' => Integer } end diff --git a/test/requests/network/lb_vip_tests.rb b/test/requests/network/lb_vip_tests.rb index c43457cfe..b0a1ad081 100644 --- a/test/requests/network/lb_vip_tests.rb +++ b/test/requests/network/lb_vip_tests.rb @@ -4,20 +4,20 @@ describe "success" do before do @lb_vip_format = { - 'id' => String, - 'subnet_id' => String, - 'pool_id' => String, - 'protocol' => String, - 'protocol_port' => Integer, - 'name' => String, - 'description' => String, - 'address' => String, - 'port_id' => String, + 'id' => String, + 'subnet_id' => String, + 'pool_id' => String, + 'protocol' => String, + 'protocol_port' => Integer, + 'name' => String, + 'description' => String, + 'address' => String, + 'port_id' => String, 'session_persistence' => Hash, - 'connection_limit' => Integer, - 'status' => String, - 'admin_state_up' => Fog::Boolean, - 'tenant_id' => String + 'connection_limit' => Integer, + 'status' => String, + 'admin_state_up' => Fog::Boolean, + 'tenant_id' => String } subnet_id = "subnet_id" pool_id = "pool_id" diff --git a/test/requests/network/network_tests.rb b/test/requests/network/network_tests.rb index 966fcf8c2..5e2e18c04 100644 --- a/test/requests/network/network_tests.rb +++ b/test/requests/network/network_tests.rb @@ -5,24 +5,24 @@ describe "success" do let(:network_format) do { - "id" => String, - "subnets" => Array, - "status" => String, - "name" => String, - "shared" => Fog::Boolean, - "admin_state_up" => Fog::Boolean, - "qos_policy_id" => Fog::Nullable::String, + "id" => String, + "subnets" => Array, + "status" => String, + "name" => String, + "shared" => Fog::Boolean, + "admin_state_up" => Fog::Boolean, + "qos_policy_id" => Fog::Nullable::String, "port_security_enabled" => Fog::Boolean, - "tenant_id" => String + "tenant_id" => String } end let(:network_extentions_format) do { - "router:external" => Fog::Boolean, - "provider:network_type" => String, + "router:external" => Fog::Boolean, + "provider:network_type" => String, "provider:physical_network" => Fog::Nullable::String, - "provider:segmentation_id" => Integer + "provider:segmentation_id" => Integer } end diff --git a/test/requests/network/port_tests.rb b/test/requests/network/port_tests.rb index 74cddc49b..dea2edbb4 100644 --- a/test/requests/network/port_tests.rb +++ b/test/requests/network/port_tests.rb @@ -3,17 +3,17 @@ describe "Fog::OpenStack::Network | port requests" do before do @port_format = { - 'id' => String, - 'name' => String, - 'network_id' => String, - 'fixed_ips' => Array, - 'mac_address' => String, - 'status' => String, - 'admin_state_up' => Fog::Boolean, - 'device_owner' => String, - 'device_id' => String, - 'tenant_id' => String, - 'security_groups' => Array, + 'id' => String, + 'name' => String, + 'network_id' => String, + 'fixed_ips' => Array, + 'mac_address' => String, + 'status' => String, + 'admin_state_up' => Fog::Boolean, + 'device_owner' => String, + 'device_id' => String, + 'tenant_id' => String, + 'security_groups' => Array, 'allowed_address_pairs' => Array } end diff --git a/test/requests/network/quota_tests.rb b/test/requests/network/quota_tests.rb index e5d06c2cc..ac96504fc 100644 --- a/test/requests/network/quota_tests.rb +++ b/test/requests/network/quota_tests.rb @@ -2,24 +2,24 @@ describe "Fog::OpenStack::Network | quota requests" do before do - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_format = { - 'subnet' => Fog::Nullable::Integer, - 'router' => Fog::Nullable::Integer, - 'port' => Fog::Nullable::Integer, - 'network' => Fog::Nullable::Integer, + 'subnet' => Fog::Nullable::Integer, + 'router' => Fog::Nullable::Integer, + 'port' => Fog::Nullable::Integer, + 'network' => Fog::Nullable::Integer, 'floatingip' => Fog::Nullable::Integer } @quotas_format = [ { - 'subnet' => Fog::Nullable::Integer, - 'router' => Fog::Nullable::Integer, - 'port' => Fog::Nullable::Integer, - 'network' => Fog::Nullable::Integer, + 'subnet' => Fog::Nullable::Integer, + 'router' => Fog::Nullable::Integer, + 'port' => Fog::Nullable::Integer, + 'network' => Fog::Nullable::Integer, 'floatingip' => Fog::Nullable::Integer, - 'tenant_id' => Fog::Nullable::String + 'tenant_id' => Fog::Nullable::String } ] @@ -37,7 +37,7 @@ it "#update_quota" do new_values = @quota.merge( - 'volumes' => @quota['subnet'] / 2, + 'volumes' => @quota['subnet'] / 2, 'snapshots' => @quota['router'] / 2 ) diff --git a/test/requests/network/security_group_rule_tests.rb b/test/requests/network/security_group_rule_tests.rb index a379308a3..bc60625d1 100644 --- a/test/requests/network/security_group_rule_tests.rb +++ b/test/requests/network/security_group_rule_tests.rb @@ -3,16 +3,16 @@ describe "Fog::OpenStack::Network | security_grouprule requests" do before do @security_group_rule_format = { - "id" => String, - "remote_group_id" => Fog::Nullable::String, - "direction" => String, - "remote_ip_prefix" => Fog::Nullable::String, - "protocol" => Fog::Nullable::String, - "ethertype" => String, - "port_range_max" => Fog::Nullable::Integer, - "port_range_min" => Fog::Nullable::Integer, + "id" => String, + "remote_group_id" => Fog::Nullable::String, + "direction" => String, + "remote_ip_prefix" => Fog::Nullable::String, + "protocol" => Fog::Nullable::String, + "ethertype" => String, + "port_range_max" => Fog::Nullable::Integer, + "port_range_min" => Fog::Nullable::Integer, "security_group_id" => String, - "tenant_id" => String + "tenant_id" => String } end diff --git a/test/requests/network/security_group_tests.rb b/test/requests/network/security_group_tests.rb index ab2d1088c..481b19a96 100644 --- a/test/requests/network/security_group_tests.rb +++ b/test/requests/network/security_group_tests.rb @@ -4,10 +4,10 @@ describe "Fog::OpenStack::Network | security_group requests" do before do @security_group_format = { - "id" => String, - "name" => String, - "description" => String, - "tenant_id" => String, + "id" => String, + "name" => String, + "description" => String, + "tenant_id" => String, "security_group_rules" => [Hash] } end diff --git a/test/requests/network/subnet_pool_tests.rb b/test/requests/network/subnet_pool_tests.rb index b0aa08801..b1efca25b 100644 --- a/test/requests/network/subnet_pool_tests.rb +++ b/test/requests/network/subnet_pool_tests.rb @@ -3,21 +3,21 @@ describe "Fog::OpenStack::Network | subnet_pool requests" do before do @subnet_pool_format = { - 'id' => String, - 'name' => String, - 'prefixes' => Array, - 'description' => Fog::Nullable::String, - 'address_scope_id' => Fog::Nullable::String, - 'shared' => Fog::Boolean, - 'ip_version' => Integer, - 'min_prefixlen' => Integer, - 'max_prefixlen' => Integer, + 'id' => String, + 'name' => String, + 'prefixes' => Array, + 'description' => Fog::Nullable::String, + 'address_scope_id' => Fog::Nullable::String, + 'shared' => Fog::Boolean, + 'ip_version' => Integer, + 'min_prefixlen' => Integer, + 'max_prefixlen' => Integer, 'default_prefixlen' => Integer, - 'is_default' => Fog::Boolean, - 'default_quota' => Fog::Nullable::String, - 'created_at' => String, - 'updated_at' => String, - 'tenant_id' => String + 'is_default' => Fog::Boolean, + 'default_quota' => Fog::Nullable::String, + 'created_at' => String, + 'updated_at' => String, + 'tenant_id' => String } end diff --git a/test/requests/network/subnet_tests.rb b/test/requests/network/subnet_tests.rb index 2f3fb1b14..354447331 100644 --- a/test/requests/network/subnet_tests.rb +++ b/test/requests/network/subnet_tests.rb @@ -3,17 +3,17 @@ describe "Fog::OpenStack::Network | subnet requests" do before do @subnet_format = { - 'id' => String, - 'name' => String, - 'network_id' => String, - 'cidr' => String, - 'ip_version' => Integer, - 'gateway_ip' => String, + 'id' => String, + 'name' => String, + 'network_id' => String, + 'cidr' => String, + 'ip_version' => Integer, + 'gateway_ip' => String, 'allocation_pools' => Array, - 'dns_nameservers' => Array, - 'host_routes' => Array, - 'enable_dhcp' => Fog::Boolean, - 'tenant_id' => String + 'dns_nameservers' => Array, + 'host_routes' => Array, + 'enable_dhcp' => Fog::Boolean, + 'tenant_id' => String } end diff --git a/test/requests/network/vpn_service_tests.rb b/test/requests/network/vpn_service_tests.rb index f9acfd210..014b97bdd 100644 --- a/test/requests/network/vpn_service_tests.rb +++ b/test/requests/network/vpn_service_tests.rb @@ -3,14 +3,14 @@ describe "Fog::OpenStack::Network | vpn_service requests" do before do @vpn_service_format = { - 'id' => String, - 'subnet_id' => String, - 'router_id' => String, - 'name' => String, - 'description' => String, - 'status' => String, + 'id' => String, + 'subnet_id' => String, + 'router_id' => String, + 'name' => String, + 'description' => String, + 'status' => String, 'admin_state_up' => Fog::Boolean, - 'tenant_id' => String, + 'tenant_id' => String, 'external_v4_ip' => String, 'external_v6_ip' => String } diff --git a/test/requests/nfv/vnf_tests.rb b/test/requests/nfv/vnf_tests.rb index 216971039..6eac5c4a7 100644 --- a/test/requests/nfv/vnf_tests.rb +++ b/test/requests/nfv/vnf_tests.rb @@ -4,26 +4,26 @@ describe "@vnf | NFV vnfs requests" do before do @vnfs_create = { - "status" => String, + "status" => String, "description" => String, - "tenant_id" => String, - "name" => String, + "tenant_id" => String, + "name" => String, "instance_id" => String, - "mgmt_url" => Fog::Nullable::String, - "attributes" => Hash, - "id" => String, - "vnfd_id" => String + "mgmt_url" => Fog::Nullable::String, + "attributes" => Hash, + "id" => String, + "vnfd_id" => String } @vnfs = { - "status" => String, + "status" => String, "description" => String, - "tenant_id" => String, - "name" => String, + "tenant_id" => String, + "name" => String, "instance_id" => String, - "mgmt_url" => Fog::Nullable::String, - "attributes" => Hash, - "id" => String + "mgmt_url" => Fog::Nullable::String, + "attributes" => Hash, + "id" => String } @nfv, @vnf_data, @auth = set_nfv_data diff --git a/test/requests/nfv/vnfd_tests.rb b/test/requests/nfv/vnfd_tests.rb index a0a72afdc..97f7c1e8a 100644 --- a/test/requests/nfv/vnfd_tests.rb +++ b/test/requests/nfv/vnfd_tests.rb @@ -5,13 +5,13 @@ before do @vnfds = { "service_types" => Array, - "description" => String, - "tenant_id" => String, - "mgmt_driver" => String, - "infra_driver" => String, - "attributes" => Hash, - "id" => String, - "name" => String + "description" => String, + "tenant_id" => String, + "mgmt_driver" => String, + "infra_driver" => String, + "attributes" => Hash, + "id" => String, + "name" => String } @nfv, @vnf_data, @auth = set_nfv_data @vnfd_body = @nfv.create_vnfd(vnfd: @vnfd_data, auth: @auth).body diff --git a/test/requests/orchestration/stack_files_util_helper_tests.rb b/test/requests/orchestration/stack_files_util_helper_tests.rb index f03aa7600..2440718fb 100644 --- a/test/requests/orchestration/stack_files_util_helper_tests.rb +++ b/test/requests/orchestration/stack_files_util_helper_tests.rb @@ -4,7 +4,7 @@ describe "Fog::OpenStack::Orchestration | stack requests" do @create_format_files = { - 'id' => String, + 'id' => String, 'links' => Array, 'files' => Hash } diff --git a/test/requests/orchestration/stack_files_util_tests.rb b/test/requests/orchestration/stack_files_util_tests.rb index c71a63eea..096152ec3 100644 --- a/test/requests/orchestration/stack_files_util_tests.rb +++ b/test/requests/orchestration/stack_files_util_tests.rb @@ -8,7 +8,7 @@ def travis? describe "Fog::OpenStack::Orchestration | stack requests" do @create_format_files = { - 'id' => String, + 'id' => String, 'links' => Array, 'files' => Hash } diff --git a/test/requests/orchestration/stack_tests.rb b/test/requests/orchestration/stack_tests.rb index 15820e239..45df94241 100644 --- a/test/requests/orchestration/stack_tests.rb +++ b/test/requests/orchestration/stack_tests.rb @@ -15,44 +15,44 @@ ) @stack_format = { - 'links' => Array, - 'id' => String, - 'stack_name' => String, - 'description' => Fog::Nullable::String, - 'stack_status' => String, + 'links' => Array, + 'id' => String, + 'stack_name' => String, + 'description' => Fog::Nullable::String, + 'stack_status' => String, 'stack_status_reason' => String, - 'creation_time' => Time, - 'updated_time' => Time + 'creation_time' => Time, + 'updated_time' => Time } @stack_detailed_format = { - "parent" => Fog::Nullable::String, - "disable_rollback" => Fog::Boolean, - "description" => String, - "links" => Array, - "stack_status_reason" => String, - "stack_name" => String, + "parent" => Fog::Nullable::String, + "disable_rollback" => Fog::Boolean, + "description" => String, + "links" => Array, + "stack_status_reason" => String, + "stack_name" => String, "stack_user_project_id" => String, - "stack_owner" => String, - "creation_time" => Fog::Nullable::String, - "capabilities" => Array, - "notification_topics" => Array, - "updated_time" => Fog::Nullable::String, - "timeout_mins" => Fog::Nullable::String, - "stack_status" => String, - "parameters" => Hash, - "id" => String, - "outputs" => Array, - "template_description" => String + "stack_owner" => String, + "creation_time" => Fog::Nullable::String, + "capabilities" => Array, + "notification_topics" => Array, + "updated_time" => Fog::Nullable::String, + "timeout_mins" => Fog::Nullable::String, + "stack_status" => String, + "parameters" => Hash, + "id" => String, + "outputs" => Array, + "template_description" => String } @create_format = { - 'id' => String, + 'id' => String, 'links' => Array } @create_format_files = { - 'id' => String, + 'id' => String, 'links' => Array, 'files' => Hash } diff --git a/test/requests/planning/plan_tests.rb b/test/requests/planning/plan_tests.rb index fce02029a..0b5037db0 100644 --- a/test/requests/planning/plan_tests.rb +++ b/test/requests/planning/plan_tests.rb @@ -3,14 +3,14 @@ describe "Fog::OpenStack::Planning | Planning plan requests" do before do @plan_format = { - "created_at" => Fog::Nullable::String, + "created_at" => Fog::Nullable::String, "description" => Fog::Nullable::String, - "name" => String, - "parameters" => Fog::Nullable::Array, - "roles" => Fog::Nullable::Array, - "updated_at" => Fog::Nullable::String, - "uuid" => String, - "version" => Fog::Nullable::Integer + "name" => String, + "parameters" => Fog::Nullable::Array, + "roles" => Fog::Nullable::Array, + "updated_at" => Fog::Nullable::String, + "uuid" => String, + "version" => Fog::Nullable::Integer } @plan_templates_format = Hash @@ -53,7 +53,7 @@ .body['parameters'][0..1] plan_parameters = parameters.collect do |parameter| { - "name" => parameter['name'], + "name" => parameter['name'], "value" => "test-#{parameter['name']}-value" } end diff --git a/test/requests/planning/role_tests.rb b/test/requests/planning/role_tests.rb index e8a7725fa..c4334c870 100644 --- a/test/requests/planning/role_tests.rb +++ b/test/requests/planning/role_tests.rb @@ -4,9 +4,9 @@ before do @role_format = { 'description' => Fog::Nullable::String, - 'name' => Fog::Nullable::String, - 'uuid' => String, - 'version' => Integer + 'name' => Fog::Nullable::String, + 'uuid' => String, + 'version' => Integer } end diff --git a/test/requests/shared_file_system/quota_tests.rb b/test/requests/shared_file_system/quota_tests.rb index d2fe3db20..a4c23e2ac 100644 --- a/test/requests/shared_file_system/quota_tests.rb +++ b/test/requests/shared_file_system/quota_tests.rb @@ -7,12 +7,12 @@ @project_id = @manila.respond_to?(:current_tenant) ? @manila.current_tenant['id'] : Fog::Mock.random_numbers(6).to_s @quota_format = { - "gigabytes" => Integer, - "shares" => Integer, - "snapshots" => Integer, + "gigabytes" => Integer, + "shares" => Integer, + "snapshots" => Integer, "snapshot_gigabytes" => Integer, - "share_networks" => Integer, - "id" => String + "share_networks" => Integer, + "id" => String } @quota = @manila.get_quota(@project_id).body['quota_set'] end @@ -24,7 +24,7 @@ it "#update_quota" do new_values = @quota.merge( - 'shares' => @quota['shares'] + 1, + 'shares' => @quota['shares'] + 1, 'snapshots' => @quota['snapshots'] + 2 ) diff --git a/test/requests/storage/container_tests.rb b/test/requests/storage/container_tests.rb index 148ded79f..0ec9c6339 100644 --- a/test/requests/storage/container_tests.rb +++ b/test/requests/storage/container_tests.rb @@ -3,6 +3,7 @@ describe "Fog::OpenStack::Storage | container requests" do def cleanup_container return if Fog.mocking? + if @storage.head_container(@container_name) @storage.delete_container(@container_name) end @@ -19,7 +20,7 @@ def cleanup_container @containers_format = [{ 'bytes' => Integer, 'count' => Integer, - 'name' => String + 'name' => String }] end diff --git a/test/requests/storage/large_object_tests.rb b/test/requests/storage/large_object_tests.rb index 29a8b73f0..fe69cbe90 100644 --- a/test/requests/storage/large_object_tests.rb +++ b/test/requests/storage/large_object_tests.rb @@ -204,10 +204,10 @@ unless Fog.mocking? expected = { 'Number Not Found' => 0, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 3, - 'Response Body' => '' + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 3, + 'Response Body' => '' } @storage.delete_static_large_object(@directory.identity, 'fog_large_object').body.must_equal expected end @@ -260,10 +260,10 @@ unless Fog.mocking? expected = { 'Number Not Found' => 0, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 3, - 'Response Body' => '' + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 3, + 'Response Body' => '' } resp = @storage.delete_static_large_object(@directory2.identity, 'fog_large_object') resp.body.must_equal expected @@ -375,10 +375,10 @@ unless Fog.mocking? expected = { 'Number Not Found' => 1, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 2, - 'Response Body' => '' + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 2, + 'Response Body' => '' } @storage.delete_static_large_object(@directory.identity, 'fog_large_object').body.must_equal expected end @@ -390,10 +390,10 @@ unless Fog.mocking? expected = { 'Number Not Found' => 1, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 0, - 'Response Body' => '' + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 0, + 'Response Body' => '' } resp = @storage.delete_static_large_object('fognoncontainer', 'fog_large_object') @@ -405,10 +405,10 @@ unless Fog.mocking? expected = { 'Number Not Found' => 1, - 'Response Status' => '200 OK', - 'Errors' => [], - 'Number Deleted' => 0, - 'Response Body' => '' + 'Response Status' => '200 OK', + 'Errors' => [], + 'Number Deleted' => 0, + 'Response Body' => '' } @storage.delete_static_large_object(@directory.identity, 'fog_non_object').body.must_equal expected diff --git a/test/requests/storage/object_tests.rb b/test/requests/storage/object_tests.rb index 971f1f418..c699abe73 100644 --- a/test/requests/storage/object_tests.rb +++ b/test/requests/storage/object_tests.rb @@ -120,7 +120,7 @@ def override_path(path) it "#get_object_https_url_numeric('directory.identity', 'fog_object', expiration_timestamp)" do unless Fog.mocking? ts = Time.at(1_500_000_000) - fog = Fog::Storage.new(:provider => :openstack, :openstack_temp_url_key => '12345') + fog = Fog::Storage.new(provider: :openstack, openstack_temp_url_key: '12345') url_s = fog.get_object_https_url(@directory.identity, 'fog_object', ts) test_temp_url(url_s, ts, 'https') end @@ -177,10 +177,10 @@ def override_path(path) @expected = { "Number Not Found" => 0, - "Response Status" => "200 OK", - "Errors" => [], - "Number Deleted" => 2, - "Response Body" => "" + "Response Status" => "200 OK", + "Errors" => [], + "Number Deleted" => 2, + "Response Body" => "" } end @@ -276,10 +276,10 @@ def override_path(path) unless Fog.mocking? @expected = { "Number Not Found" => 2, - "Response Status" => "200 OK", - "Errors" => [], - "Number Deleted" => 0, - "Response Body" => "" + "Response Status" => "200 OK", + "Errors" => [], + "Number Deleted" => 0, + "Response Body" => "" } end end @@ -309,10 +309,10 @@ def override_path(path) expected = { "Number Not Found" => 0, - "Response Status" => "400 Bad Request", - "Errors" => [['fogobjecttests', '409 Conflict']], - "Number Deleted" => 0, - "Response Body" => "" + "Response Status" => "400 Bad Request", + "Errors" => [['fogobjecttests', '409 Conflict']], + "Number Deleted" => 0, + "Response Body" => "" } resp = Fog::OpenStack::Storage.new.delete_multiple_objects( diff --git a/test/requests/volume/availability_zone_tests.rb b/test/requests/volume/availability_zone_tests.rb index 9e80b3190..eaae04a10 100644 --- a/test/requests/volume/availability_zone_tests.rb +++ b/test/requests/volume/availability_zone_tests.rb @@ -3,7 +3,7 @@ describe "Fog::OpenStack::Volume | availability zone requests" do before do @flavor_format = { - 'zoneName' => String, + 'zoneName' => String, 'zoneState' => Hash } end diff --git a/test/requests/volume/backup_tests.rb b/test/requests/volume/backup_tests.rb index c4bbfd778..d6c9d87ea 100644 --- a/test/requests/volume/backup_tests.rb +++ b/test/requests/volume/backup_tests.rb @@ -4,13 +4,13 @@ before do @volume = Fog::OpenStack::Volume.new @backup_format = { - 'id' => String, - 'volume_id' => String, - 'status' => String, - 'name' => String, - 'size' => Integer, + 'id' => String, + 'volume_id' => String, + 'status' => String, + 'name' => String, + 'size' => Integer, 'object_count' => Integer, - 'container' => String + 'container' => String } @backup = @volume.create_backup(name: 'test_backup', volume_id: '2').body['backup'] diff --git a/test/requests/volume/quota_tests.rb b/test/requests/volume/quota_tests.rb index a6814c9ec..356990fec 100644 --- a/test/requests/volume/quota_tests.rb +++ b/test/requests/volume/quota_tests.rb @@ -3,13 +3,13 @@ describe "Fog::OpenStack::Volume | quota requests" do before do @volume = Fog::OpenStack::Volume.new - identity = Fog::OpenStack::Identity.new(:openstack_identity_api_version => 'v2.0') + identity = Fog::OpenStack::Identity.new(openstack_identity_api_version: 'v2.0') @tenant_id = identity.list_tenants.body['tenants'].first['id'] @quota_set_format = { - 'volumes' => Fog::Nullable::Integer, + 'volumes' => Fog::Nullable::Integer, 'gigabytes' => Fog::Nullable::Integer, 'snapshots' => Fog::Nullable::Integer, - 'id' => String + 'id' => String } @quota = @volume.get_quota(@tenant_id).body['quota_set'] end @@ -26,7 +26,7 @@ it "updates quota" do @new_values = @quota.merge( - 'volumes' => @quota['volumes'] / 2, + 'volumes' => @quota['volumes'] / 2, 'snapshots' => @quota['snapshots'] / 2 ) diff --git a/test/requests/volume/volume_type_tests.rb b/test/requests/volume/volume_type_tests.rb index 36d8e20f7..9cf29a632 100644 --- a/test/requests/volume/volume_type_tests.rb +++ b/test/requests/volume/volume_type_tests.rb @@ -5,9 +5,9 @@ @volume = Fog::OpenStack::Volume.new @volume_type_format = { - 'name' => String, + 'name' => String, 'extra_specs' => Hash, - 'id' => String + 'id' => String } @volume_type = @volume.create_volume_type(name: 'test_volume_type').body['volume_type'] diff --git a/test/requests/workflow/workflow_tests.rb b/test/requests/workflow/workflow_tests.rb index e73d04725..3f026b04b 100644 --- a/test/requests/workflow/workflow_tests.rb +++ b/test/requests/workflow/workflow_tests.rb @@ -12,18 +12,18 @@ @get_execution_response = { "state" => "running", - "id" => "1111" + "id" => "1111" } @workbook_sample = { - "version" => "2.0", - "name" => "workbook1", + "version" => "2.0", + "name" => "workbook1", "description" => "d1" } @workflow_sample = { - "version" => "2.0", - "name" => "workflow1", + "version" => "2.0", + "name" => "workflow1", "description" => "d1" } @@ -42,8 +42,8 @@ } @cron_trigger_sample = { - "version" => "2.0", - "name" => "cron_trigger1", + "version" => "2.0", + "name" => "cron_trigger1", "description" => "d1" } diff --git a/test/version_tests.rb b/test/version_tests.rb index 07714bd15..f18d48a5b 100644 --- a/test/version_tests.rb +++ b/test/version_tests.rb @@ -10,31 +10,31 @@ "versions" => [ { "status" => "CURRENT", - "id" => "v2.0", - "links" => [ + "id" => "v2.0", + "links" => [ { "href" => "http://example:9292/v2/", - "rel" => "self" + "rel" => "self" } ] }, { "status" => "CURRENT", - "id" => "v1.1", - "links" => [ + "id" => "v1.1", + "links" => [ { "href" => "http://exampple:9292/v1/", - "rel" => "self" + "rel" => "self" } ] }, { "status" => "SUPPORTED", - "id" => "v1.0", - "links" => [ + "id" => "v1.0", + "links" => [ { "href" => "http://example:9292/v1/", - "rel" => "self" + "rel" => "self" } ] } diff --git a/unit/auth/catalog_test.rb b/unit/auth/catalog_test.rb index 5766f0bd2..ebb763f3c 100644 --- a/unit/auth/catalog_test.rb +++ b/unit/auth/catalog_test.rb @@ -6,113 +6,113 @@ "endpoints" => [ { "region_id" => "regionOne", - "url" => "http://localhost:9696", - "region" => "regionOne", + "url" => "http://localhost:9696", + "region" => "regionOne", "interface" => "internal", - "id" => "id_endpoint1_internal" + "id" => "id_endpoint1_internal" }, { "region_id" => "regionOne", - "url" => "http://localhost:9696", - "region" => "regionOne", + "url" => "http://localhost:9696", + "region" => "regionOne", "interface" => "public", - "id" => "id_endpoint1_public" + "id" => "id_endpoint1_public" }, { "region_id" => "regionOne", - "url" => "http://localhost:9696", - "region" => "regionOne", + "url" => "http://localhost:9696", + "region" => "regionOne", "interface" => "admin", - "id" => "id_endpoint1_admin" + "id" => "id_endpoint1_admin" } ], - "type" => "network", - "id" => "id1", - "name" => "neutron" + "type" => "network", + "id" => "id1", + "name" => "neutron" }, { "endpoints" => [ { "region_id" => "regionOne", - "url" => "http://localhost:9292", - "region" => "regionOne", + "url" => "http://localhost:9292", + "region" => "regionOne", "interface" => "internal", - "id" => "id_endpoint1_internal" + "id" => "id_endpoint1_internal" }, { "region_id" => "regionOne", - "url" => "http://localhost:9292", - "region" => "regionOne", + "url" => "http://localhost:9292", + "region" => "regionOne", "interface" => "public", - "id" => "id_endpoint1_public" + "id" => "id_endpoint1_public" }, { "region_id" => "regionOne", - "url" => "http://localhost:9292", - "region" => "regionOne", + "url" => "http://localhost:9292", + "region" => "regionOne", "interface" => "admin", - "id" => "id_endpoint1_admin" + "id" => "id_endpoint1_admin" } ], - "type" => "image", - "id" => "id2", - "name" => "glance" + "type" => "image", + "id" => "id2", + "name" => "glance" }, { "endpoints" => [ { "region_id" => "regionOne", - "url" => "http://localhost:5000", - "region" => "regionOne", + "url" => "http://localhost:5000", + "region" => "regionOne", "interface" => "internal", - "id" => "id_endpoint1_internal" + "id" => "id_endpoint1_internal" }, { "region_id" => "regionOne", - "url" => "http://localhost:5000", - "region" => "regionOne", + "url" => "http://localhost:5000", + "region" => "regionOne", "interface" => "public", - "id" => "id_endpoint1_public" + "id" => "id_endpoint1_public" }, { "region_id" => "regionOne", - "url" => "http://localhost:35357", - "region" => "regionOne", + "url" => "http://localhost:35357", + "region" => "regionOne", "interface" => "admin", - "id" => "id_endpoint1_admin" + "id" => "id_endpoint1_admin" } ], - "type" => "identity", - "id" => "id3", - "name" => "keystone" + "type" => "identity", + "id" => "id3", + "name" => "keystone" }, { "endpoints" => [ { "region_id" => "regionOne", - "url" => "http://localhost2:5000", - "region" => "regionTwo", + "url" => "http://localhost2:5000", + "region" => "regionTwo", "interface" => "internal", - "id" => "id_endpoint1_internal" + "id" => "id_endpoint1_internal" }, { "region_id" => "regionTwo", - "url" => "http://localhost2:5000", - "region" => "regionTwo", + "url" => "http://localhost2:5000", + "region" => "regionTwo", "interface" => "public", - "id" => "id_endpoint1_public" + "id" => "id_endpoint1_public" }, { "region_id" => "regionTwo", - "url" => "http://localhost2:35357", - "region" => "regionTwo", + "url" => "http://localhost2:35357", + "region" => "regionTwo", "interface" => "admin", - "id" => "id_endpoint1_admin" + "id" => "id_endpoint1_admin" } ], - "type" => "identity", - "id" => "id3", - "name" => "keystone" + "type" => "identity", + "id" => "id3", + "name" => "keystone" } ].freeze @@ -169,40 +169,40 @@ describe Fog::OpenStack::Auth::Catalog::V2 do CATALOGV2 = [ { - 'endpoints' => [{ - 'adminURL' => 'http://localhost', - 'region' => 'regionOne', + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionOne', 'internalURL' => 'http://localhost:8888/v2.0', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], 'endpoints_links' => [], - 'type' => 'identity', - 'name' => 'keystone' + 'type' => 'identity', + 'name' => 'keystone' }, { - 'endpoints' => [{ - 'adminURL' => 'http://localhost', - 'region' => 'regionTwo', + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionTwo', 'internalURL' => 'http://localhost:9999/v2.0', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], 'endpoints_links' => [], - 'type' => 'identity', - 'name' => 'keystone' + 'type' => 'identity', + 'name' => 'keystone' }, { - 'endpoints' => [{ - 'adminURL' => 'http://localhost', - 'region' => 'regionOne', + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionOne', 'internalURL' => 'http://localhost:7777/v1.0', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], 'endpoints_links' => [], - 'type' => 'compute', - 'name' => 'nova' + 'type' => 'compute', + 'name' => 'nova' } ].freeze diff --git a/unit/auth/name_test.rb b/unit/auth/name_test.rb index 15629d9b9..2a977b949 100644 --- a/unit/auth/name_test.rb +++ b/unit/auth/name_test.rb @@ -30,8 +30,8 @@ describe '#to_h' do it 'returns the hash of provided attribute' do name = Fog::OpenStack::Auth::Name.new('default', 'Default') - name.to_h(:id).must_equal(:id => 'default') - name.to_h(:name).must_equal(:name => 'Default') + name.to_h(:id).must_equal(id: 'default') + name.to_h(:name).must_equal(name: 'Default') end end end @@ -41,7 +41,7 @@ it 'set/get password' do user = Fog::OpenStack::Auth::User.new('user_id', 'User') user.password = 'secret' - user.identity.must_equal(:user => {:id => 'user_id', :password => 'secret'}) + user.identity.must_equal(user: { id: 'user_id', password: 'secret' }) end end @@ -50,21 +50,21 @@ it "with user id and user name" do user = Fog::OpenStack::Auth::User.new('user_id', 'User') user.password = 'secret' - user.identity.must_equal(:user => {:id => 'user_id', :password => 'secret'}) + user.identity.must_equal(user: { id: 'user_id', password: 'secret' }) end it 'with user name and user domain name' do user = Fog::OpenStack::Auth::User.new(nil, 'User') user.password = 'secret' user.domain = Fog::OpenStack::Auth::Name.new('default', nil) - user.identity.must_equal(:user => {:name => 'User', :domain => {:id => 'default'}, :password => 'secret'}) + user.identity.must_equal(user: { name: 'User', domain: { id: 'default' }, password: 'secret' }) end it 'with user name and domain name' do user = Fog::OpenStack::Auth::User.new(nil, 'User') user.password = 'secret' user.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default') - user.identity.must_equal(:user => {:name => 'User', :domain => {:name => 'Default'}, :password => 'secret'}) + user.identity.must_equal(user: { name: 'User', domain: { name: 'Default' }, password: 'secret' }) end end @@ -90,19 +90,19 @@ describe '#identity' do it "when id is provided it doesn't require domain" do project = Fog::OpenStack::Auth::ProjectScope.new('project_id', 'Project') - project.identity.must_equal(:project => {:id => 'project_id'}) + project.identity.must_equal(project: { id: 'project_id' }) end it 'when id is nul and name is provided it uses domain id' do project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') project.domain = Fog::OpenStack::Auth::Name.new('default', nil) - project.identity.must_equal(:project => {:name => 'Project', :domain => {:id => 'default'}}) + project.identity.must_equal(project: { name: 'Project', domain: { id: 'default' } }) end it 'when id is nul and name is provided it uses domain name' do project = Fog::OpenStack::Auth::ProjectScope.new(nil, 'Project') project.domain = Fog::OpenStack::Auth::Name.new(nil, 'Default') - project.identity.must_equal(:project => {:name => 'Project', :domain => {:name => 'Default'}}) + project.identity.must_equal(project: { name: 'Project', domain: { name: 'Default' } }) end it 'raises an error with no project id and no domain are provided' do diff --git a/unit/auth/token_test.rb b/unit/auth/token_test.rb index 4106632ab..a97202093 100644 --- a/unit/auth/token_test.rb +++ b/unit/auth/token_test.rb @@ -5,11 +5,11 @@ describe 'V3' do describe '#new' do it 'fails when missing credentials' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return( - :status => 200, - :body => "{\"token\":{\"catalog\":[]}}", - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + status: 200, + body: "{\"token\":{\"catalog\":[]}}", + headers: { 'x-subject-token' => 'token_data' } ) proc do @@ -21,19 +21,19 @@ describe 'with a project scope' do it 'authenticates using a project id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_userid => 'user_id', - :openstack_api_key => 'secret', - :openstack_project_id => 'project_id' + openstack_auth_url: 'http://localhost/identity', + openstack_userid: 'user_id', + openstack_api_key: 'secret', + openstack_project_id: 'project_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":\ -{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data_v3'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":\ +{\"id\":\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"id\":\"project_id\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data_v3' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -42,21 +42,21 @@ it 'authenticates using a project name and a project domain id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_userid => 'user_id', - :openstack_api_key => 'secret', - :openstack_project_name => 'project', - :openstack_project_domain_id => 'project_domain_id' + openstack_auth_url: 'http://localhost/identity', + openstack_userid: 'user_id', + openstack_api_key: 'secret', + openstack_project_name: 'project', + openstack_project_domain_id: 'project_domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ \"user_id\",\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\ -\"project_domain_id\"}}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} +\"project_domain_id\"}}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -65,22 +65,22 @@ it 'authenticates using a project name and a project domain name' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_username => 'user', - :openstack_user_domain_name => 'user_domain', - :openstack_api_key => 'secret', - :openstack_project_name => 'project', - :openstack_project_domain_name => 'project_domain' + openstack_auth_url: 'http://localhost/identity', + openstack_username: 'user', + openstack_user_domain_name: 'user_domain', + openstack_api_key: 'secret', + openstack_project_name: 'project', + openstack_project_domain_name: 'project_domain' } - stub_request(:post, "http://localhost/identity/v3/auth/tokens"). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\ + stub_request(:post, "http://localhost/identity/v3/auth/tokens") + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"name\":\ \"user\",\"domain\":{\"name\":\"user_domain\"},\"password\":\"secret\"}}},\"scope\":{\"project\":{\"name\":\"project\"\ -,\"domain\":{\"name\":\"project_domain\"}}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} +,\"domain\":{\"name\":\"project_domain\"}}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -91,19 +91,19 @@ describe 'with a domain scope' do it 'authenticates using a domain id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_userid => 'user_id', - :openstack_api_key => 'secret', - :openstack_domain_id => 'domain_id' + openstack_auth_url: 'http://localhost/identity', + openstack_userid: 'user_id', + openstack_api_key: 'secret', + openstack_domain_id: 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ -\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -112,19 +112,19 @@ it 'authenticates using a domain name' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_userid => 'user_id', - :openstack_api_key => 'secret', - :openstack_domain_name => 'domain' + openstack_auth_url: 'http://localhost/identity', + openstack_userid: 'user_id', + openstack_api_key: 'secret', + openstack_domain_name: 'domain' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ -\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}},\"scope\":{\"domain\":{\"name\":\"domain\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -135,18 +135,18 @@ describe 'unscoped' do it 'authenticates' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_userid => 'user_id', - :openstack_api_key => 'secret', + openstack_auth_url: 'http://localhost/identity', + openstack_userid: 'user_id', + openstack_api_key: 'secret' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ -\"user_id\",\"password\":\"secret\"}}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"password\"],\"password\":{\"user\":{\"id\":\ +\"user_id\",\"password\":\"secret\"}}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -159,16 +159,16 @@ describe 'unscoped' do it 'authenticates using a project id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token', + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -179,18 +179,18 @@ describe 'with a project scope' do it 'authenticates using a project id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token', - :openstack_project_id => 'project_id' + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token', + openstack_project_id: 'project_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"project\":{\"id\":\"project_id\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"project\":{\"id\":\"project_id\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -199,19 +199,19 @@ it 'authenticates using a project name and a project domain id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token', - :openstack_project_name => 'project', - :openstack_project_domain_id => 'domain_id' + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token', + openstack_project_name: 'project', + openstack_project_domain_id: 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"project\":{\"name\":\"project\",\"domain\":{\"id\":\"domain_id\"}}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -222,18 +222,18 @@ describe 'with a domain scope' do it 'authenticates using a domain id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token', - :openstack_domain_id => 'domain_id' + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token', + openstack_domain_id: 'domain_id' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"domain\":{\"id\":\"domain_id\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -242,18 +242,18 @@ it 'authenticates using a domain name' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token', - :openstack_domain_name => 'domain' + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token', + openstack_domain_name: 'domain' } - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - with(:body => "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ -\"scope\":{\"domain\":{\"name\":\"domain\"}}}}"). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .with(body: "{\"auth\":{\"identity\":{\"methods\":[\"token\"],\"token\":{\"id\":\"token\"}},\ +\"scope\":{\"domain\":{\"name\":\"domain\"}}}}") + .to_return( + status: 200, + body: JSON.dump(auth_response_v3('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(auth, {}) @@ -266,21 +266,21 @@ describe 'when authenticated' do let(:authv3_creds) do { - :openstack_auth_url => 'http://localhost/identity', - :openstack_username => 'admin', - :openstack_api_key => 'secret', - :openstack_project_name => 'admin', - :openstack_project_domain_id => 'default' + openstack_auth_url: 'http://localhost/identity', + openstack_username: 'admin', + openstack_api_key: 'secret', + openstack_project_name: 'admin', + openstack_project_domain_id: 'default' } end describe '#get' do it 'when token has not expired' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return( - :status => 200, - :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + status: 200, + body: "{\"token\":{\"catalog\":[\"catalog_data\"]}}", + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) @@ -290,11 +290,11 @@ end it 'when token has expired' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return( - :status => 200, - :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + status: 200, + body: "{\"token\":{\"catalog\":[\"catalog_data\"]}}", + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) @@ -305,11 +305,11 @@ end it '#catalog' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return( - :status => 200, - :body => "{\"token\":{\"catalog\":[\"catalog_data\"]}}", - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + status: 200, + body: "{\"token\":{\"catalog\":[\"catalog_data\"]}}", + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) @@ -317,11 +317,11 @@ end it '#get_endpoint_url' do - stub_request(:post, 'http://localhost/identity/v3/auth/tokens'). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v3("identity", "keystone")), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v3/auth/tokens') + .to_return( + status: 200, + body: JSON.dump(auth_response_v3("identity", "keystone")), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(authv3_creds, {}) @@ -333,8 +333,8 @@ describe 'V2' do describe '#new' do it 'fails when missing credentials' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return(:status => 200, :body => "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return(status: 200, body: "{\"access\":{\"token\":{\"id\":\"token_data\"}}}", headers: {}) proc do Fog::OpenStack::Auth::Token.build({}, {}) @@ -344,16 +344,16 @@ describe 'using the password method' do it 'authenticates using the tenant name' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_username => 'user', - :openstack_api_key => 'secret', - :openstack_tenant => 'tenant', + openstack_auth_url: 'http://localhost/identity', + openstack_username: 'user', + openstack_api_key: 'secret', + openstack_tenant: 'tenant' } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ -\"tenantName\":\"tenant\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(body: "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ +\"tenantName\":\"tenant\"}}") + .to_return(status: 200, body: JSON.dump(auth_response_v2('identity', 'keystone')), headers: {}) token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -361,16 +361,16 @@ it 'authenticates using the tenant id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_username => 'user', - :openstack_api_key => 'secret', - :openstack_tenant_id => 'tenant_id', + openstack_auth_url: 'http://localhost/identity', + openstack_username: 'user', + openstack_api_key: 'secret', + openstack_tenant_id: 'tenant_id' } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ -\"tenantId\":\"tenant_id\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(body: "{\"auth\":{\"passwordCredentials\":{\"username\":\"user\",\"password\":\"secret\"},\ +\"tenantId\":\"tenant_id\"}}") + .to_return(status: 200, body: JSON.dump(auth_response_v2('identity', 'keystone')), headers: {}) token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -380,14 +380,14 @@ describe 'using the token method' do it 'authenticates using the tenant name' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token_id', - :openstack_tenant => 'tenant', + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token_id', + openstack_tenant: 'tenant' } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(body: "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantName\":\"tenant\"}}") + .to_return(status: 200, body: JSON.dump(auth_response_v2('identity', 'keystone')), headers: {}) token = Fog::OpenStack::Auth::Token.build(auth, {}) token.get.must_equal '4ae647d3a5294690a3c29bc658e17e26' @@ -395,14 +395,14 @@ it 'authenticates using the tenant id' do auth = { - :openstack_auth_url => 'http://localhost/identity', - :openstack_auth_token => 'token_id', - :openstack_tenant_id => 'tenant_id', + openstack_auth_url: 'http://localhost/identity', + openstack_auth_token: 'token_id', + openstack_tenant_id: 'tenant_id' } - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - with(:body => "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}"). - to_return(:status => 200, :body => JSON.dump(auth_response_v2('identity', 'keystone')), :headers => {}) + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .with(body: "{\"auth\":{\"token\":{\"id\":\"token_id\"},\"tenantId\":\"tenant_id\"}}") + .to_return(status: 200, body: JSON.dump(auth_response_v2('identity', 'keystone')), headers: {}) Fog::OpenStack::Auth::Token.build(auth, {}) end @@ -412,21 +412,21 @@ describe 'when authenticated' do let(:authv2_creds) do { - :openstack_auth_url => 'http://localhost/identity', - :openstack_username => 'admin', - :openstack_api_key => 'secret', - :openstack_tenant => 'admin' + openstack_auth_url: 'http://localhost/identity', + openstack_username: 'admin', + openstack_api_key: 'secret', + openstack_tenant: 'admin' } end describe '#get' do it 'when token has not expired' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return( - :status => 200, - :body => "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":\ + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + status: 200, + body: "{\"access\":{\"token\":{\"id\":\"token_not_expired\"},\"serviceCatalog\":\ [\"catalog_data\"]}}", - :headers => {} + headers: {} ) token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) @@ -436,11 +436,11 @@ end it 'when token has expired' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return( - :status => 200, - :body => "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", - :headers => {} + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + status: 200, + body: "{\"access\":{\"token\":{\"id\":\"token_expired\"},\"serviceCatalog\":[\"catalog_data\"]}}", + headers: {} ) token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) @@ -451,11 +451,11 @@ end it '#catalog' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return( - :status => 200, - :body => "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", - :headers => {} + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + status: 200, + body: "{\"access\":{\"token\":{\"id\":\"token_data\"},\"serviceCatalog\":[\"catalog_data\"]}}", + headers: {} ) token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) @@ -463,11 +463,11 @@ end it '#get_endpoint_url' do - stub_request(:post, 'http://localhost/identity/v2.0/tokens'). - to_return( - :status => 200, - :body => JSON.dump(auth_response_v2('identity', 'keystone')), - :headers => {'x-subject-token'=>'token_data'} + stub_request(:post, 'http://localhost/identity/v2.0/tokens') + .to_return( + status: 200, + body: JSON.dump(auth_response_v2('identity', 'keystone')), + headers: { 'x-subject-token' => 'token_data' } ) token = Fog::OpenStack::Auth::Token.build(authv2_creds, {}) diff --git a/unit/auth_helper.rb b/unit/auth_helper.rb index c015b669b..c57793332 100644 --- a/unit/auth_helper.rb +++ b/unit/auth_helper.rb @@ -1,58 +1,58 @@ def auth_response_v3(type, name) { 'token' => { - 'methods' => ['password'], - 'roles' => [{ - 'id' => 'id_roles', + 'methods' => ['password'], + 'roles' => [{ + 'id' => 'id_roles', 'name' => 'admin' }], 'expires_at' => '2017-11-29T07:45:29.908554Z', - 'project' => { + 'project' => { 'domain' => { - 'id' => 'default', + 'id' => 'default', 'name' => 'Default' }, - 'id' => 'project_id', - 'name' => 'admin' + 'id' => 'project_id', + 'name' => 'admin' }, - 'catalog' => [{ + 'catalog' => [{ 'endpoints' => [ { 'region_id' => 'regionOne', - 'url' => 'http://localhost', - 'region' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', 'interface' => 'internal', - 'id' => 'id_endpoint_internal' + 'id' => 'id_endpoint_internal' }, { 'region_id' => 'regionOne', - 'url' => 'http://localhost', - 'region' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', 'interface' => 'public', - 'id' => 'id_endpoint_public' + 'id' => 'id_endpoint_public' }, { 'region_id' => 'regionOne', - 'url' => 'http://localhost', - 'region' => 'regionOne', + 'url' => 'http://localhost', + 'region' => 'regionOne', 'interface' => 'admin', - 'id' => 'id_endpoint_admin' + 'id' => 'id_endpoint_admin' } ], - 'type' => type, - 'id' => 'id_endpoints', - 'name' => name + 'type' => type, + 'id' => 'id_endpoints', + 'name' => name }], - 'user' => { + 'user' => { 'domain' => { - 'id' => 'default', + 'id' => 'default', 'name' => 'Default' }, - 'id' => 'id_user', - 'name' => 'admin' + 'id' => 'id_user', + 'name' => 'admin' }, - 'audit_ids' => ['id_audits'], - 'issued_at' => '2017-11-29T06:45:29.908578Z' + 'audit_ids' => ['id_audits'], + 'issued_at' => '2017-11-29T06:45:29.908578Z' } } end @@ -60,42 +60,42 @@ def auth_response_v3(type, name) def auth_response_v2(type, name) { 'access' => { - 'token' => { + 'token' => { 'issued_at' => '2017-12-05T10:44:31.454741Z', - 'expires' => '2017-12-05T11:44:31Z', - 'id' => '4ae647d3a5294690a3c29bc658e17e26', - 'tenant' => { + 'expires' => '2017-12-05T11:44:31Z', + 'id' => '4ae647d3a5294690a3c29bc658e17e26', + 'tenant' => { 'description' => 'admin tenant', - 'enabled' => true, - 'id' => 'tenant_id', - 'name' => 'admin' + 'enabled' => true, + 'id' => 'tenant_id', + 'name' => 'admin' }, 'audit_ids' => ['Ye0Rq1HzTk2ggUAg8nDGbQ'] }, 'serviceCatalog' => [{ - 'endpoints' => [{ - 'adminURL' => 'http://localhost', - 'region' => 'regionOne', + 'endpoints' => [{ + 'adminURL' => 'http://localhost', + 'region' => 'regionOne', 'internalURL' => 'http://localhost', - 'id' => 'id_endpoints', - 'publicURL' => 'http://localhost' + 'id' => 'id_endpoints', + 'publicURL' => 'http://localhost' }], 'endpoints_links' => [], - 'type' => type, - 'name' => name + 'type' => type, + 'name' => name }], - 'user' => { - 'username' => 'admin', + 'user' => { + 'username' => 'admin', 'roles_links' => [], - 'id' => 'user_id', - 'roles' => [{ + 'id' => 'user_id', + 'roles' => [{ 'name' => 'admin' }], - 'name' => 'admin' + 'name' => 'admin' }, - 'metadata' => { + 'metadata' => { 'is_admin' => 0, - 'roles' => ['role_id'] + 'roles' => ['role_id'] } } } From 966b065171d989ca87d05beaad5e912a01aa3ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 15:36:36 +0100 Subject: [PATCH 118/129] Fix Lint/ShadowingOuterLocalVariable --- examples/identity/basics.rb | 4 ++-- lib/fog/openstack/storage/models/directories.rb | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/identity/basics.rb b/examples/identity/basics.rb index 8799f1323..9082cd767 100644 --- a/examples/identity/basics.rb +++ b/examples/identity/basics.rb @@ -18,14 +18,14 @@ # # Listing keystone tenants # -keystone.tenants.each do |tenant| +keystone.tenants.each do |l_tenant| # - pp tenant + pp l_tenant end # diff --git a/lib/fog/openstack/storage/models/directories.rb b/lib/fog/openstack/storage/models/directories.rb index 1ef5303d1..14c7fbb03 100644 --- a/lib/fog/openstack/storage/models/directories.rb +++ b/lib/fog/openstack/storage/models/directories.rb @@ -15,9 +15,9 @@ def all(options = {}) def get(key, options = {}) data = service.get_container(key, options) directory = new(key: key) - data.headers.each do |key, value| - if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(key) - directory.merge_attributes(key => value) + data.headers.each do |l_key, value| + if ['X-Container-Bytes-Used', 'X-Container-Object-Count'].include?(l_key) + directory.merge_attributes(l_key => value) end end directory.files.merge_attributes(options) From 4050b99d836e6d4af1beeca73c43bcd2163cabc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 15:57:32 +0100 Subject: [PATCH 119/129] Fix Naming/UncommunicativeMethodParamName --- lib/fog/openstack/auth/catalog/v3.rb | 2 +- lib/fog/openstack/event/models/events.rb | 4 ++-- lib/fog/openstack/identity/v2/requests/create_user.rb | 8 ++++---- lib/fog/openstack/image/v1/models/images.rb | 10 +++++----- .../openstack/introspection/requests/create_rules.rb | 2 +- lib/fog/openstack/metering/models/events.rb | 4 ++-- lib/fog/openstack/nfv/requests/create_vnf.rb | 2 +- lib/fog/openstack/nfv/requests/create_vnfd.rb | 2 +- lib/fog/openstack/nfv/requests/update_vnf.rb | 2 +- .../openstack/orchestration/requests/cancel_update.rb | 2 +- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/lib/fog/openstack/auth/catalog/v3.rb b/lib/fog/openstack/auth/catalog/v3.rb index aac581a82..45a2169f2 100644 --- a/lib/fog/openstack/auth/catalog/v3.rb +++ b/lib/fog/openstack/auth/catalog/v3.rb @@ -13,7 +13,7 @@ def endpoint_match?(endpoint, interface, region) end end - def endpoint_url(endpoint, _) + def endpoint_url(endpoint, _ignored_interface) endpoint['url'] end end diff --git a/lib/fog/openstack/event/models/events.rb b/lib/fog/openstack/event/models/events.rb index d8680c0b1..a6015dda8 100644 --- a/lib/fog/openstack/event/models/events.rb +++ b/lib/fog/openstack/event/models/events.rb @@ -7,8 +7,8 @@ class Event class Events < Fog::OpenStack::Collection model Fog::OpenStack::Event::Event - def all(q = []) - load_response(service.list_events(q)) + def all(query = []) + load_response(service.list_events(query)) end def find_by_id(message_id) diff --git a/lib/fog/openstack/identity/v2/requests/create_user.rb b/lib/fog/openstack/identity/v2/requests/create_user.rb index 3d0a1667d..b913013fb 100644 --- a/lib/fog/openstack/identity/v2/requests/create_user.rb +++ b/lib/fog/openstack/identity/v2/requests/create_user.rb @@ -3,12 +3,12 @@ module OpenStack class Identity class V2 class Real - def create_user(name, password, email, tenantId = nil, enabled = true) + def create_user(name, password, email, tenant_id = nil, enabled = true) data = { 'user' => { 'name' => name, 'password' => password, - 'tenantId' => tenantId, + 'tenantId' => tenant_id, 'email' => email, 'enabled' => enabled } @@ -24,14 +24,14 @@ def create_user(name, password, email, tenantId = nil, enabled = true) end class Mock - def create_user(name, _password, email, tenantId = nil, enabled = true) + def create_user(name, _password, email, tenant_id = nil, enabled = true) response = Excon::Response.new response.status = 200 data = { 'id' => Fog::Mock.random_hex(32), 'name' => name, 'email' => email, - 'tenantId' => tenantId, + 'tenantId' => tenant_id, 'enabled' => enabled } self.data[:users][data['id']] = data diff --git a/lib/fog/openstack/image/v1/models/images.rb b/lib/fog/openstack/image/v1/models/images.rb index b2f32bd9d..0dd03af48 100644 --- a/lib/fog/openstack/image/v1/models/images.rb +++ b/lib/fog/openstack/image/v1/models/images.rb @@ -81,18 +81,18 @@ def find_attribute(attribute, value) private - def convert_to_type(v) - case v + def convert_to_type(value) + case value when /^\d+$/ - v.to_i + value.to_i when 'True' true when 'False' false when /^\d\d\d\d\-\d\d\-\d\dT/ - ::Time.parse(v) + ::Time.parse(value) else - v + value end end diff --git a/lib/fog/openstack/introspection/requests/create_rules.rb b/lib/fog/openstack/introspection/requests/create_rules.rb index c4d5e5253..0c312b884 100644 --- a/lib/fog/openstack/introspection/requests/create_rules.rb +++ b/lib/fog/openstack/introspection/requests/create_rules.rb @@ -25,7 +25,7 @@ def create_rules(attributes) end class Mock - def create_rules(_) + def create_rules(_attributes) response = Excon::Response.new response.status = 200 response.body = { "rules" => data[:rules].first } diff --git a/lib/fog/openstack/metering/models/events.rb b/lib/fog/openstack/metering/models/events.rb index 8b12e73e9..a3c67f965 100644 --- a/lib/fog/openstack/metering/models/events.rb +++ b/lib/fog/openstack/metering/models/events.rb @@ -7,8 +7,8 @@ class Metering class Events < Fog::OpenStack::Collection model Fog::OpenStack::Metering::Event - def all(q = []) - load_response(service.list_events(q)) + def all(query = []) + load_response(service.list_events(query)) end def find_by_id(message_id) diff --git a/lib/fog/openstack/nfv/requests/create_vnf.rb b/lib/fog/openstack/nfv/requests/create_vnf.rb index d097090f3..4abdb4807 100644 --- a/lib/fog/openstack/nfv/requests/create_vnf.rb +++ b/lib/fog/openstack/nfv/requests/create_vnf.rb @@ -23,7 +23,7 @@ def create_vnf(options) end class Mock - def create_vnf(_) + def create_vnf(_options) response = Excon::Response.new response.status = 201 diff --git a/lib/fog/openstack/nfv/requests/create_vnfd.rb b/lib/fog/openstack/nfv/requests/create_vnfd.rb index 4cbf2cbaf..87126e96e 100644 --- a/lib/fog/openstack/nfv/requests/create_vnfd.rb +++ b/lib/fog/openstack/nfv/requests/create_vnfd.rb @@ -23,7 +23,7 @@ def create_vnfd(options) end class Mock - def create_vnfd(_) + def create_vnfd(_options) response = Excon::Response.new response.status = 201 response.body = { "vnfd" => data[:vnfds].first } diff --git a/lib/fog/openstack/nfv/requests/update_vnf.rb b/lib/fog/openstack/nfv/requests/update_vnf.rb index 605c25a10..498856132 100644 --- a/lib/fog/openstack/nfv/requests/update_vnf.rb +++ b/lib/fog/openstack/nfv/requests/update_vnf.rb @@ -23,7 +23,7 @@ def update_vnf(id, options) end class Mock - def update_vnf(_, _) + def update_vnf(_id, _options) response = Excon::Response.new response.status = 200 response.body = { "vnf" => data[:vnfs].first } diff --git a/lib/fog/openstack/orchestration/requests/cancel_update.rb b/lib/fog/openstack/orchestration/requests/cancel_update.rb index 521bc2725..0bac4df1b 100644 --- a/lib/fog/openstack/orchestration/requests/cancel_update.rb +++ b/lib/fog/openstack/orchestration/requests/cancel_update.rb @@ -15,7 +15,7 @@ def cancel_update(stack) end class Mock - def cancel_update(_) + def cancel_update(_stack) response = Excon::Response.new response.status = 200 response.body = {} From 8f92dd4b8a9b4ceee3a0272982340a9e9466e09b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 16:02:22 +0100 Subject: [PATCH 120/129] fix Lint/UnneededCopEnableDirective --- lib/fog/openstack/shared_file_system.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/shared_file_system.rb b/lib/fog/openstack/shared_file_system.rb index 69fe88849..c51a0f066 100644 --- a/lib/fog/openstack/shared_file_system.rb +++ b/lib/fog/openstack/shared_file_system.rb @@ -342,7 +342,7 @@ def credentials openstack_management_url: @openstack_management_url } end end - # rubocop:enable LineLength, Metrics/MethodLength, Metrics/ClassLength, Metrics/AbcSize + # rubocop:enable Metrics/MethodLength class Real include Fog::OpenStack::Core From 664e93de3a0a2707c3d01f75e7fe5be2854c4c9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Fri, 8 Mar 2019 17:15:41 +0100 Subject: [PATCH 121/129] fix Lint/UselessAssignment --- lib/fog/openstack/network.rb | 33 +++++++++++++- .../network/requests/get_lb_pool_stats.rb | 2 +- .../openstack/network/requests/get_port.rb | 25 +---------- .../openstack/network/requests/get_subnet.rb | 19 +------- .../openstack/orchestration/models/stack.rb | 2 +- .../orchestration/requests/create_stack.rb | 2 +- .../orchestration/requests/delete_stack.rb | 2 - .../orchestration/requests/update_stack.rb | 43 ++++++++++++++++--- lib/fog/openstack/storage/models/directory.rb | 6 +-- 9 files changed, 75 insertions(+), 59 deletions(-) diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 096fdb303..4aa3d4a0c 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -264,6 +264,7 @@ def self.data network_id = Fog::UUID.uuid extension_id = Fog::UUID.uuid subnet_id = Fog::UUID.uuid + port_id = Fog::UUID.uuid tenant_id = Fog::Mock.random_hex(8) hash[key] = { @@ -304,7 +305,30 @@ def self.data 'port_security_enabled' => true } }, - ports: {}, + ports: { + port_id => { + 'id' => port_id, + 'name' => 'port_1', + 'network_id' => network_id, + 'fixed_ips' => [ + { + 'ip_address' => '10.2.2.2', + 'subnet_id' => subnet_id + } + ], + 'mac_address' => 'fa:16:3e:62:91:7f', + 'status' => 'ACTIVE', + 'admin_state_up' => true, + 'device_id' => 'dhcp724fc160-2b2e-597e-b9ed-7f65313cd73f-e624a36d-762b-481f-9b50-4154ceb78bbb', + 'device_owner' => 'network:dhcp', + 'tenant_id' => tenant_id, + 'security_groups' => [], + 'allowed_address_pairs' => [ + 'ip_address' => '10.1.1.1', + 'mac_address' => 'fa:16:3e:3d:2a:cc' + ] + } + }, subnets: { subnet_id => { 'id' => subnet_id, @@ -313,7 +337,12 @@ def self.data 'cidr' => "192.168.0.0/22", 'ip_version' => 4, 'gateway_ip' => Fog::Mock.random_ip, - 'allocation_pools' => [], + 'allocation_pools' => [ + { + "start" => "10.2.2.2", + "end" => "10.2.2.254" + } + ], 'dns_nameservers' => [Fog::Mock.random_ip, Fog::Mock.random_ip], 'host_routes' => [Fog::Mock.random_ip], 'enable_dhcp' => true, diff --git a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb index 3b97a3b7e..4471d8893 100644 --- a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb @@ -14,7 +14,7 @@ def get_lb_pool_stats(pool_id) class Mock def get_lb_pool_stats(pool_id) response = Excon::Response.new - if data = self.data[:lb_pools][pool_id] + if self.data[:lb_pools][pool_id] stats = {} stats["active_connections"] = 0 stats["bytes_in"] = 0 diff --git a/lib/fog/openstack/network/requests/get_port.rb b/lib/fog/openstack/network/requests/get_port.rb index 0d67b1f21..83d6f4c46 100644 --- a/lib/fog/openstack/network/requests/get_port.rb +++ b/lib/fog/openstack/network/requests/get_port.rb @@ -16,30 +16,7 @@ def get_port(port_id) response = Excon::Response.new if data = self.data[:ports][port_id] response.status = 200 - response.body = { - 'port' => { - 'id' => '5c81d975-5fea-4674-9c1f-b8aa10bf9a79', - 'name' => 'port_1', - 'network_id' => 'e624a36d-762b-481f-9b50-4154ceb78bbb', - 'fixed_ips' => [ - { - 'ip_address' => '10.2.2.2', - 'subnet_id' => '2e4ec6a4-0150-47f5-8523-e899ac03026e' - } - ], - 'mac_address' => 'fa:16:3e:62:91:7f', - 'status' => 'ACTIVE', - 'admin_state_up' => true, - 'device_id' => 'dhcp724fc160-2b2e-597e-b9ed-7f65313cd73f-e624a36d-762b-481f-9b50-4154ceb78bbb', - 'device_owner' => 'network:dhcp', - 'tenant_id' => 'f8b26a6032bc47718a7702233ac708b9', - 'security_groups' => ['3ddde803-e550-4737-b5de-0862401dc834'], - 'allowed_address_pairs' => [ - 'ip_address' => '10.1.1.1', - 'mac_address' => 'fa:16:3e:3d:2a:cc' - ] - } - } + response.body = { 'port' => data } response else raise Fog::OpenStack::Network::NotFound diff --git a/lib/fog/openstack/network/requests/get_subnet.rb b/lib/fog/openstack/network/requests/get_subnet.rb index a747c145a..e6124a88b 100644 --- a/lib/fog/openstack/network/requests/get_subnet.rb +++ b/lib/fog/openstack/network/requests/get_subnet.rb @@ -17,24 +17,7 @@ def get_subnet(subnet_id) if data = self.data[:subnets][subnet_id] response.status = 200 response.body = { - "subnet" => { - "id" => "2e4ec6a4-0150-47f5-8523-e899ac03026e", - "name" => "subnet_1", - "network_id" => "e624a36d-762b-481f-9b50-4154ceb78bbb", - "cidr" => "10.2.2.0/24", - "ip_version" => 4, - "gateway_ip" => "10.2.2.1", - "allocation_pools" => [ - { - "start" => "10.2.2.2", - "end" => "10.2.2.254" - } - ], - "dns_nameservers" => [], - "host_routes" => [], - "enable_dhcp" => true, - "tenant_id" => "f8b26a6032bc47718a7702233ac708b9" - } + "subnet" => data } response else diff --git a/lib/fog/openstack/orchestration/models/stack.rb b/lib/fog/openstack/orchestration/models/stack.rb index 7ef6e3a47..444585f22 100644 --- a/lib/fog/openstack/orchestration/models/stack.rb +++ b/lib/fog/openstack/orchestration/models/stack.rb @@ -99,7 +99,7 @@ def timeout_in_minutes # Deprecated def timeout_in_minutes=(minutes) Fog::Logger.deprecation("#timeout_in_minutes=(minutes) is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller.first})[/]") - timeout_mins = minutes + self.timeout_mins = minutes end # build options to create or update stack diff --git a/lib/fog/openstack/orchestration/requests/create_stack.rb b/lib/fog/openstack/orchestration/requests/create_stack.rb index 1b84c1f72..288263525 100644 --- a/lib/fog/openstack/orchestration/requests/create_stack.rb +++ b/lib/fog/openstack/orchestration/requests/create_stack.rb @@ -64,7 +64,7 @@ def create_stack(arg1, arg2 = nil) end stack_id = Fog::Mock.random_hex(32) - stack = data[:stacks][stack_id] = { + data[:stacks][stack_id] = { 'id' => stack_id, 'stack_name' => options[:stack_name], 'links' => [], diff --git a/lib/fog/openstack/orchestration/requests/delete_stack.rb b/lib/fog/openstack/orchestration/requests/delete_stack.rb index dd0b510fe..a698440df 100644 --- a/lib/fog/openstack/orchestration/requests/delete_stack.rb +++ b/lib/fog/openstack/orchestration/requests/delete_stack.rb @@ -36,12 +36,10 @@ def delete_stack(arg1, arg2 = nil) if arg1.kind_of?(Stack) # Normal use: delete_stack(stack) stack = arg1 - stack_name = stack.stack_name stack_id = stack.id else # Deprecated: delete_stack(stack_name, stack_id) Fog::Logger.deprecation("#delete_stack(stack_name, stack_id) is deprecated, use #delete_stack(stack) instead [light_black](#{caller.first})[/]") - stack_name = arg1 stack_id = arg2 end diff --git a/lib/fog/openstack/orchestration/requests/update_stack.rb b/lib/fog/openstack/orchestration/requests/update_stack.rb index 14ee0fa50..e3fb9d37a 100644 --- a/lib/fog/openstack/orchestration/requests/update_stack.rb +++ b/lib/fog/openstack/orchestration/requests/update_stack.rb @@ -55,7 +55,6 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) if arg1.kind_of?(Stack) # Normal use, update_stack(stack, options = {}) stack = arg1 - stack_name = stack.stack_name stack_id = stack.id options = arg2.nil? ? {} : arg2 else @@ -67,14 +66,44 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) stack_name: stack_name }.merge(arg3.nil? ? {} : arg3) end + stack_obj = data[:stacks][stack_id] + raise Fog::OpenStack::Orchestration::NotFound if stack_obj.nil? - if options.key?(:files) - response.body['files'] = { 'foo.sh' => 'hello' } - end + clear_parameters = options.key?(:clear_parameters) ? options[:clear_parameters] : {} + options.each_pair do |key, value| + case key + when :files + next if options.include?(:template) || options.include?(:template_url) - if options.key?(:template) || options.key?(:template_url) - file_resolver = Util::RecursiveHotFileLoader.new(options[:template] || options[:template_url], options[:files]) - response.body['files'] = file_resolver.files unless file_resolver.files.empty? + if stack_obj['files'].nil? || clear_parameters.include?(:files) + stack_obj['files'] = value + else + stack_obj['files'].merge!(value) + end + when :template, :template_url + file_resolver = Util::RecursiveHotFileLoader.new(value, options[:files]) + n_files = file_resolver.files unless file_resolver.files.empty? + if stack_obj['files'].nil? || clear_parameters.include?(:files) + stack_obj['files'] = n_files + else + stack_obj['files'].merge!(n_files) + end + else + key_s = key.to_s + if !stack_obj.key? key_s || stack_obj[key_s].nil? || clear_parameters.include?(key) + stack_obj[key_s] = value + elsif stack_obj[key_s].kind_of(Array) + if value.kind_of(Array) + stack_obj[key_s].concat(value) + else + stack_obj[key_s].append(value) + end + elsif stack_obj[key_s].kind_of(Hash) + stack_obj[key_s].merge!(value) + else + stack_obj[key_s] = value + end + end end response = Excon::Response.new diff --git a/lib/fog/openstack/storage/models/directory.rb b/lib/fog/openstack/storage/models/directory.rb index cfbf7e060..653038e69 100644 --- a/lib/fog/openstack/storage/models/directory.rb +++ b/lib/fog/openstack/storage/models/directory.rb @@ -33,10 +33,10 @@ def public_url requires :key @public_url ||= begin - service.public_url(key) - rescue Fog::OpenStack::Storage::NotFound => err + service.public_url(key) + rescue Fog::OpenStack::Storage::NotFound => _err nil - end + end end def save From 60f8333002d0dd7a32ff3ac7b8bcce3cad283302 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Mon, 11 Mar 2019 09:31:39 +0100 Subject: [PATCH 122/129] Fix stack_tests --- .../openstack/orchestration/requests/show_stack_details.rb | 7 ++++--- test/models/network/floating_ip_tests.rb | 4 ++-- test/requests/orchestration/stack_tests.rb | 4 ++-- test/test_helper.rb | 1 + 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/lib/fog/openstack/orchestration/requests/show_stack_details.rb b/lib/fog/openstack/orchestration/requests/show_stack_details.rb index b5a1a14cd..bbc2fe6f4 100644 --- a/lib/fog/openstack/orchestration/requests/show_stack_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_stack_details.rb @@ -12,11 +12,12 @@ def show_stack_details(name, id) end class Mock - def show_stack_details(_name, _id) - stack = data[:stack].values + def show_stack_details(_name, id) + stack = data[:stacks][id] + raise Fog::OpenStack::Orchestration::NotFound if stack.nil? Excon::Response.new( - body: { 'stack' => stack }, + body: { 'stack' => stack.values }, status: 200 ) end diff --git a/test/models/network/floating_ip_tests.rb b/test/models/network/floating_ip_tests.rb index 54e11fb29..f89350dc0 100644 --- a/test/models/network/floating_ip_tests.rb +++ b/test/models/network/floating_ip_tests.rb @@ -41,11 +41,11 @@ let(:disassociate) { instance.disassociate(fixed_ip_address) } it "resets port_id" do - disassociate.port_id.must_equal nil + disassociate.port_id.must_be_nil end it "resets fixed_ip_address" do - disassociate.fixed_ip_address.must_equal nil + disassociate.fixed_ip_address.must_be_nil end end diff --git a/test/requests/orchestration/stack_tests.rb b/test/requests/orchestration/stack_tests.rb index 45df94241..de0ac8f07 100644 --- a/test/requests/orchestration/stack_tests.rb +++ b/test/requests/orchestration/stack_tests.rb @@ -9,9 +9,9 @@ @orchestration = Fog::OpenStack::Orchestration.new + created_stack = @orchestration.create_stack(stack_name: 'stack_mock') @stack_mock = Fog::OpenStack::Orchestration::Stack.new( - template_name: "stack_mock", - id: "stack_id" + @orchestration.show_stack_details('stack_mock', created_stack.body['id']).body ) @stack_format = { diff --git a/test/test_helper.rb b/test/test_helper.rb index cd429a9cd..0e11db47f 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -8,6 +8,7 @@ require 'fog/test_helpers/types_helper.rb' require 'fog/test_helpers/minitest/assertions' require 'fog/test_helpers/minitest/expectations' +require 'pry-byebug' require File.expand_path('../lib/fog/openstack', __dir__) From 4fab40b8c43666bdfead7439d0d38567f26ecfef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Mon, 11 Mar 2019 10:20:58 +0100 Subject: [PATCH 123/129] Fix Yaml.safe_load usage on Introspection --- lib/fog/openstack/introspection.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/fog/openstack/introspection.rb b/lib/fog/openstack/introspection.rb index 10d5a998d..ed92975c8 100644 --- a/lib/fog/openstack/introspection.rb +++ b/lib/fog/openstack/introspection.rb @@ -45,7 +45,7 @@ def self.data @data ||= Hash.new do |hash, key| # Introspection data is *huge* we load it from a yaml file file = "test/fixtures/introspection.yaml" - hash[key] = YAML.safe_load(File.read(file)) + hash[key] = YAML.safe_load(File.read(file), [Symbol]) end end From 8eed2d7cf9abdc662dc95fdf8fc0bd725a7ee6ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Mon, 11 Mar 2019 10:30:35 +0100 Subject: [PATCH 124/129] Fix show details and update test on stack. --- lib/fog/openstack/orchestration/requests/show_stack_details.rb | 2 +- test/requests/orchestration/stack_tests.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/fog/openstack/orchestration/requests/show_stack_details.rb b/lib/fog/openstack/orchestration/requests/show_stack_details.rb index bbc2fe6f4..3136a1987 100644 --- a/lib/fog/openstack/orchestration/requests/show_stack_details.rb +++ b/lib/fog/openstack/orchestration/requests/show_stack_details.rb @@ -17,7 +17,7 @@ def show_stack_details(_name, id) raise Fog::OpenStack::Orchestration::NotFound if stack.nil? Excon::Response.new( - body: { 'stack' => stack.values }, + body: { 'stack' => stack }, status: 200 ) end diff --git a/test/requests/orchestration/stack_tests.rb b/test/requests/orchestration/stack_tests.rb index de0ac8f07..0ff9f2ed9 100644 --- a/test/requests/orchestration/stack_tests.rb +++ b/test/requests/orchestration/stack_tests.rb @@ -11,7 +11,7 @@ created_stack = @orchestration.create_stack(stack_name: 'stack_mock') @stack_mock = Fog::OpenStack::Orchestration::Stack.new( - @orchestration.show_stack_details('stack_mock', created_stack.body['id']).body + @orchestration.show_stack_details('stack_mock', created_stack.body['id']).body['stack'] ) @stack_format = { From a663a03600c7a30ef7277703d751150a2a708f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Mon, 11 Mar 2019 12:07:19 +0100 Subject: [PATCH 125/129] Fix Style/MissingRespondToMissing --- .../openstack/baremetal/models/chassis_collection.rb | 4 ++++ lib/fog/openstack/baremetal/models/nodes.rb | 4 ++++ lib/fog/openstack/baremetal/models/ports.rb | 4 ++++ lib/fog/openstack/image/v1/models/images.rb | 4 ++++ lib/fog/openstack/image/v2/models/image.rb | 12 ++++++++++++ lib/fog/openstack/image/v2/models/images.rb | 4 ++++ lib/fog/openstack/planning/models/plans.rb | 4 ++++ 7 files changed, 36 insertions(+) diff --git a/lib/fog/openstack/baremetal/models/chassis_collection.rb b/lib/fog/openstack/baremetal/models/chassis_collection.rb index d5ba56de4..d717a3306 100644 --- a/lib/fog/openstack/baremetal/models/chassis_collection.rb +++ b/lib/fog/openstack/baremetal/models/chassis_collection.rb @@ -38,6 +38,10 @@ def method_missing(method_sym, *arguments, &block) super end end + + def respond_to_missing?(method_sym, include_private = false) + method_sym.to_s.start_with?('find_by_') || super + end end end end diff --git a/lib/fog/openstack/baremetal/models/nodes.rb b/lib/fog/openstack/baremetal/models/nodes.rb index 199c2091d..f1dbab14a 100644 --- a/lib/fog/openstack/baremetal/models/nodes.rb +++ b/lib/fog/openstack/baremetal/models/nodes.rb @@ -38,6 +38,10 @@ def method_missing(method_sym, *arguments, &block) super end end + + def respond_to_missing?(method_sym, include_private = false) + method_sym.to_s.start_with?('find_by_') || super + end end end end diff --git a/lib/fog/openstack/baremetal/models/ports.rb b/lib/fog/openstack/baremetal/models/ports.rb index eb71010f3..d7515b904 100644 --- a/lib/fog/openstack/baremetal/models/ports.rb +++ b/lib/fog/openstack/baremetal/models/ports.rb @@ -38,6 +38,10 @@ def method_missing(method_sym, *arguments, &block) super end end + + def respond_to_missing?(method_sym, include_private = false) + method_sym.to_s.start_with?('find_by_') || super + end end end end diff --git a/lib/fog/openstack/image/v1/models/images.rb b/lib/fog/openstack/image/v1/models/images.rb index 0dd03af48..1e45d3cfc 100644 --- a/lib/fog/openstack/image/v1/models/images.rb +++ b/lib/fog/openstack/image/v1/models/images.rb @@ -66,6 +66,10 @@ def method_missing(method_sym, *arguments, &block) end end + def respond_to_missing?(method_sym, include_private = false) + method_sym.to_s.start_with?('find_by_') || super + end + def find_by_size_min(size) find_attribute(__method__, size) end diff --git a/lib/fog/openstack/image/v2/models/image.rb b/lib/fog/openstack/image/v2/models/image.rb index 5130bc9fa..65ee60b2c 100644 --- a/lib/fog/openstack/image/v2/models/image.rb +++ b/lib/fog/openstack/image/v2/models/image.rb @@ -53,6 +53,18 @@ def method_missing(method_sym, *arguments, &block) end end + def respond_to_missing?(method_sym, include_private = false) + method_name = method_sym.to_s + tested_name = method_name.end_with?('=') ? method_name[0..-1] : method_name + if attributes.key?(tested_name.to_sym) + true + elsif attributes.key?(tested_name) + true + else + super + end + end + def respond_to?(method_sym, include_all = false) if attributes.key?(method_sym) true diff --git a/lib/fog/openstack/image/v2/models/images.rb b/lib/fog/openstack/image/v2/models/images.rb index dba4fbc8b..982982474 100644 --- a/lib/fog/openstack/image/v2/models/images.rb +++ b/lib/fog/openstack/image/v2/models/images.rb @@ -47,6 +47,10 @@ def method_missing(method_sym, *arguments, &block) end end + def respond_to_missing?(method_sym, include_private = false) + method_sym.to_s.start_with?('find_by_') || super + end + def find_by_size_min(size) find_attribute(__method__, size) end diff --git a/lib/fog/openstack/planning/models/plans.rb b/lib/fog/openstack/planning/models/plans.rb index 753bc7087..a0c760c4f 100644 --- a/lib/fog/openstack/planning/models/plans.rb +++ b/lib/fog/openstack/planning/models/plans.rb @@ -25,6 +25,10 @@ def method_missing(method_sym, *arguments, &block) super end end + + def respond_to_missing?(method_sym, include_private = false) + method_sym.to_s.start_with?('find_by_') || super + end end end end From a181f7f73196167bdbcc583005668983448f31bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Tue, 19 Mar 2019 10:33:21 +0100 Subject: [PATCH 126/129] Fix Performance/Caller --- lib/fog/openstack/orchestration/models/stack.rb | 14 +++++++------- lib/fog/openstack/orchestration/models/stacks.rb | 4 ++-- .../orchestration/requests/create_stack.rb | 7 +++++-- .../orchestration/requests/delete_stack.rb | 4 ++-- .../orchestration/requests/update_stack.rb | 4 ++-- 5 files changed, 18 insertions(+), 15 deletions(-) diff --git a/lib/fog/openstack/orchestration/models/stack.rb b/lib/fog/openstack/orchestration/models/stack.rb index 444585f22..1bb70732a 100644 --- a/lib/fog/openstack/orchestration/models/stack.rb +++ b/lib/fog/openstack/orchestration/models/stack.rb @@ -26,14 +26,14 @@ def save(options = {}) # Deprecated def create - Fog::Logger.deprecation("#create is deprecated, use #save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#create is deprecated, use #save(options) instead [light_black](#{caller(1..1).first})[/]") requires :stack_name service.stacks.create(default_options) end # Deprecated def update - Fog::Logger.deprecation("#update is deprecated, use #save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#update is deprecated, use #save(options) instead [light_black](#{caller(1..1).first})[/]") requires :stack_name service.update_stack(self, default_options).body['stack'] end @@ -74,31 +74,31 @@ def cancel_update # Deprecated def template_url - Fog::Logger.deprecation("#template_url is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#template_url is deprecated, use it in options for #save(options) instead [light_black](#{caller(1..1).first})[/]") @template_url end # Deprecated def template_url=(url) - Fog::Logger.deprecation("#template_url= is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#template_url= is deprecated, use it in options for #save(options) instead [light_black](#{caller(1..1).first})[/]") @template_url = url end # Deprecated def template=(content) - Fog::Logger.deprecation("#template=(content) is deprecated, use it in options for #save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#template=(content) is deprecated, use it in options for #save(options) instead [light_black](#{caller(1..1).first})[/]") @template = content end # Deprecated def timeout_in_minutes - Fog::Logger.deprecation("#timeout_in_minutes is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#timeout_in_minutes is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller(1..1).first})[/]") timeout_mins end # Deprecated def timeout_in_minutes=(minutes) - Fog::Logger.deprecation("#timeout_in_minutes=(minutes) is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#timeout_in_minutes=(minutes) is deprecated, set timeout_mins in options for save(options) instead [light_black](#{caller(1..1).first})[/]") self.timeout_mins = minutes end diff --git a/lib/fog/openstack/orchestration/models/stacks.rb b/lib/fog/openstack/orchestration/models/stacks.rb index 176b6c824..35fde56c3 100644 --- a/lib/fog/openstack/orchestration/models/stacks.rb +++ b/lib/fog/openstack/orchestration/models/stacks.rb @@ -22,14 +22,14 @@ def summary(options = {}) # Deprecated def find_by_id(id) - Fog::Logger.deprecation("#find_by_id(id) is deprecated, use #get(name, id) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#find_by_id(id) is deprecated, use #get(name, id) instead [light_black](#{caller(1..1).first})[/]") find { |stack| stack.id == id } end def get(arg1, arg2 = nil) if arg2.nil? # Deprecated: get(id) - Fog::Logger.deprecation("#get(id) is deprecated, use #get(name, id) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#get(id) is deprecated, use #get(name, id) instead [light_black](#{caller(1..1).first})[/]") return find_by_id(arg1) end diff --git a/lib/fog/openstack/orchestration/requests/create_stack.rb b/lib/fog/openstack/orchestration/requests/create_stack.rb index 288263525..92aafd6c6 100644 --- a/lib/fog/openstack/orchestration/requests/create_stack.rb +++ b/lib/fog/openstack/orchestration/requests/create_stack.rb @@ -23,7 +23,10 @@ def create_stack(arg1, arg2 = nil) options = arg1 else # Deprecated: create_stack(stack_name, options = {}) - Fog::Logger.deprecation("#create_stack(stack_name, options) is deprecated, use #create_stack(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation( + "#create_stack(stack_name, options) is deprecated, use #create_stack(options)" \ + "instead [light_black](#{caller(1..1).first})[/]" + ) options = { stack_name: arg1 }.merge(arg2.nil? ? {} : arg2) @@ -57,7 +60,7 @@ def create_stack(arg1, arg2 = nil) options = arg1 else # Deprecated: create_stack(stack_name, options = {}) - Fog::Logger.deprecation("#create_stack(stack_name, options) is deprecated, use #create_stack(options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#create_stack(stack_name, options) is deprecated, use #create_stack(options) instead [light_black](#{caller(1..1).first})[/]") options = { stack_name: arg1 }.merge(arg2.nil? ? {} : arg2) diff --git a/lib/fog/openstack/orchestration/requests/delete_stack.rb b/lib/fog/openstack/orchestration/requests/delete_stack.rb index a698440df..af25ce29a 100644 --- a/lib/fog/openstack/orchestration/requests/delete_stack.rb +++ b/lib/fog/openstack/orchestration/requests/delete_stack.rb @@ -18,7 +18,7 @@ def delete_stack(arg1, arg2 = nil) stack_id = stack.id else # Deprecated: delete_stack(stack_name, stack_id) - Fog::Logger.deprecation("#delete_stack(stack_name, stack_id) is deprecated, use #delete_stack(stack) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#delete_stack(stack_name, stack_id) is deprecated, use #delete_stack(stack) instead [light_black](#{caller(1..1).first})[/]") stack_name = arg1 stack_id = arg2 end @@ -39,7 +39,7 @@ def delete_stack(arg1, arg2 = nil) stack_id = stack.id else # Deprecated: delete_stack(stack_name, stack_id) - Fog::Logger.deprecation("#delete_stack(stack_name, stack_id) is deprecated, use #delete_stack(stack) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#delete_stack(stack_name, stack_id) is deprecated, use #delete_stack(stack) instead [light_black](#{caller(1..1).first})[/]") stack_id = arg2 end diff --git a/lib/fog/openstack/orchestration/requests/update_stack.rb b/lib/fog/openstack/orchestration/requests/update_stack.rb index e3fb9d37a..c23419c76 100644 --- a/lib/fog/openstack/orchestration/requests/update_stack.rb +++ b/lib/fog/openstack/orchestration/requests/update_stack.rb @@ -21,7 +21,7 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) options = arg2.nil? ? {} : arg2 else # Deprecated, update_stack(stack_id, stack_name, options = {}) - Fog::Logger.deprecation("#update_stack(stack_id, stack_name, options) is deprecated, use #update_stack(stack, options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#update_stack(stack_id, stack_name, options) is deprecated, use #update_stack(stack, options) instead [light_black](#{caller(1..1).first})[/]") stack_id = arg1 stack_name = arg2 options = { @@ -59,7 +59,7 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) options = arg2.nil? ? {} : arg2 else # Deprecated, update_stack(stack_id, stack_name, options = {}) - Fog::Logger.deprecation("#update_stack(stack_id, stack_name, options) is deprecated, use #update_stack(stack, options) instead [light_black](#{caller.first})[/]") + Fog::Logger.deprecation("#update_stack(stack_id, stack_name, options) is deprecated, use #update_stack(stack, options) instead [light_black](#{caller(1..1).first})[/]") stack_id = arg1 stack_name = arg2 options = { From 57cee6b73cae59efb1120c576b93150fe0f72ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Tue, 19 Mar 2019 10:59:10 +0100 Subject: [PATCH 127/129] Fix Lint/UriEscapeUnescape --- lib/fog/openstack/compute/requests/delete_service.rb | 4 +++- lib/fog/openstack/compute/requests/disable_service.rb | 4 +++- .../openstack/compute/requests/disable_service_log_reason.rb | 4 +++- lib/fog/openstack/compute/requests/enable_service.rb | 4 +++- lib/fog/openstack/storage/requests/delete_multiple_objects.rb | 2 +- lib/fog/openstack/workflow/v2/requests/delete_action.rb | 2 +- lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb | 2 +- lib/fog/openstack/workflow/v2/requests/delete_environment.rb | 2 +- lib/fog/openstack/workflow/v2/requests/delete_workbook.rb | 2 +- lib/fog/openstack/workflow/v2/requests/get_action.rb | 2 +- lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb | 2 +- lib/fog/openstack/workflow/v2/requests/get_environment.rb | 2 +- lib/fog/openstack/workflow/v2/requests/get_workbook.rb | 2 +- 13 files changed, 21 insertions(+), 13 deletions(-) diff --git a/lib/fog/openstack/compute/requests/delete_service.rb b/lib/fog/openstack/compute/requests/delete_service.rb index 93d79866a..d13174858 100644 --- a/lib/fog/openstack/compute/requests/delete_service.rb +++ b/lib/fog/openstack/compute/requests/delete_service.rb @@ -4,7 +4,9 @@ class Compute class Real def delete_service(uuid, optional_params = nil) # Encode all params - optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params + if optional_params + optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode_www_form_component(v) } + end request( expects: [202, 204], diff --git a/lib/fog/openstack/compute/requests/disable_service.rb b/lib/fog/openstack/compute/requests/disable_service.rb index 53d7fc5ec..ca07b239d 100644 --- a/lib/fog/openstack/compute/requests/disable_service.rb +++ b/lib/fog/openstack/compute/requests/disable_service.rb @@ -6,7 +6,9 @@ def disable_service(host, binary, optional_params = nil) data = { "host" => host, "binary" => binary } # Encode all params - optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params + if optional_params + optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode_www_form_component(v) } + end request( body: Fog::JSON.encode(data), diff --git a/lib/fog/openstack/compute/requests/disable_service_log_reason.rb b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb index bbbb42892..c113e5c40 100644 --- a/lib/fog/openstack/compute/requests/disable_service_log_reason.rb +++ b/lib/fog/openstack/compute/requests/disable_service_log_reason.rb @@ -6,7 +6,9 @@ def disable_service_log_reason(host, binary, disabled_reason, optional_params = data = { "host" => host, "binary" => binary, "disabled_reason" => disabled_reason } # Encode all params - optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params + if optional_params + optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode_www_form_component(v) } + end request( body: Fog::JSON.encode(data), diff --git a/lib/fog/openstack/compute/requests/enable_service.rb b/lib/fog/openstack/compute/requests/enable_service.rb index 92e1ff27b..1a8ace344 100644 --- a/lib/fog/openstack/compute/requests/enable_service.rb +++ b/lib/fog/openstack/compute/requests/enable_service.rb @@ -6,7 +6,9 @@ def enable_service(host, binary, optional_params = nil) data = { "host" => host, "binary" => binary } # Encode all params - optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode(v) } if optional_params + if optional_params + optional_params = optional_params.each { |k, v| optional_params[k] = URI.encode_www_form_component(v) } + end request( body: Fog::JSON.encode(data), diff --git a/lib/fog/openstack/storage/requests/delete_multiple_objects.rb b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb index 2424ed1ef..7fcf8e54c 100644 --- a/lib/fog/openstack/storage/requests/delete_multiple_objects.rb +++ b/lib/fog/openstack/storage/requests/delete_multiple_objects.rb @@ -45,7 +45,7 @@ class Real def delete_multiple_objects(container, object_names, options = {}) body = object_names.map do |name| object_name = container ? "#{container}/#{name}" : name - URI.encode(object_name) + URI.encode_www_form_component(object_name) end.join("\n") response = request({ diff --git a/lib/fog/openstack/workflow/v2/requests/delete_action.rb b/lib/fog/openstack/workflow/v2/requests/delete_action.rb index 9a2d9b111..95ef577e8 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_action.rb @@ -7,7 +7,7 @@ def delete_action(name) request( expects: 204, method: "DELETE", - path: "actions/#{URI.encode(name)}" + path: "actions/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb index fe981f574..85000b599 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_cron_trigger.rb @@ -7,7 +7,7 @@ def delete_cron_trigger(name) request( expects: 204, method: "DELETE", - path: "cron_triggers/#{URI.encode(name)}" + path: "cron_triggers/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_environment.rb b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb index 23c8d3fa7..633969319 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_environment.rb @@ -7,7 +7,7 @@ def delete_environment(name) request( expects: 204, method: "DELETE", - path: "environments/#{URI.encode(name)}" + path: "environments/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb index a87f1288a..27454a327 100644 --- a/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/delete_workbook.rb @@ -7,7 +7,7 @@ def delete_workbook(name) request( expects: 204, method: "DELETE", - path: "workbooks/#{URI.encode(name)}" + path: "workbooks/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_action.rb b/lib/fog/openstack/workflow/v2/requests/get_action.rb index 95e847ca6..d3e8fbe45 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_action.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_action.rb @@ -7,7 +7,7 @@ def get_action(name) request( expects: 200, method: "GET", - path: "actions/#{URI.encode(name)}" + path: "actions/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb index a9c445199..a4b5b487a 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_cron_trigger.rb @@ -7,7 +7,7 @@ def get_cron_trigger(name) request( expects: 200, method: "GET", - path: "cron_triggers/#{URI.encode(name)}" + path: "cron_triggers/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_environment.rb b/lib/fog/openstack/workflow/v2/requests/get_environment.rb index 4b1febd78..f3d214b43 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_environment.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_environment.rb @@ -7,7 +7,7 @@ def get_environment(name) request( expects: 200, method: "GET", - path: "environments/#{URI.encode(name)}" + path: "environments/#{URI.encode_www_form_component(name)}" ) end end diff --git a/lib/fog/openstack/workflow/v2/requests/get_workbook.rb b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb index 1ea5b915a..f589dbd84 100644 --- a/lib/fog/openstack/workflow/v2/requests/get_workbook.rb +++ b/lib/fog/openstack/workflow/v2/requests/get_workbook.rb @@ -7,7 +7,7 @@ def get_workbook(name) request( expects: 200, method: "GET", - path: "workbooks/#{URI.encode(name)}" + path: "workbooks/#{URI.encode_www_form_component(name)}" ) end end From 334ca31a7abe7030464e311739ff237713980863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Tue, 19 Mar 2019 11:13:28 +0100 Subject: [PATCH 128/129] Ignore Naming/AccessorMethodName --- .rubocop_todo.yml | 34 ++++++++++++++++++++++++---------- 1 file changed, 24 insertions(+), 10 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 45198144e..31ce80f90 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -134,17 +134,31 @@ Metrics/PerceivedComplexity: # Offense count: 25 Naming/AccessorMethodName: Exclude: - - 'lib/fog/baremetal/openstack/models/node.rb' - - 'lib/fog/compute/openstack/models/addresses.rb' - - 'lib/fog/compute/openstack/requests/set_tenant.rb' - - 'lib/fog/identity/openstack/v2/requests/set_tenant.rb' - - 'lib/fog/image/openstack/v1/requests/set_tenant.rb' - - 'lib/fog/image/openstack/v2/requests/set_tenant.rb' - - 'lib/fog/network/openstack/requests/get_quotas.rb' - - 'lib/fog/network/openstack/requests/set_tenant.rb' - - 'lib/fog/shared_file_system/openstack/requests/get_limits.rb' - - 'lib/fog/volume/openstack/requests/set_tenant.rb' - 'test/requests/compute/helper.rb' + - 'test/requests/compute/helper.rb' + - 'test/requests/compute/helper.rb' + - 'test/requests/compute/helper.rb' + - 'test/requests/compute/helper.rb' + - 'lib/fog/openstack/identity/v2/requests/set_tenant.rb' + - 'lib/fog/openstack/identity/v2/requests/set_tenant.rb' + - 'lib/fog/openstack/network/requests/set_tenant.rb' + - 'lib/fog/openstack/network/requests/set_tenant.rb' + - 'lib/fog/openstack/network/requests/get_quotas.rb' + - 'lib/fog/openstack/network/requests/get_quotas.rb' + - 'lib/fog/openstack/baremetal/models/node.rb' + - 'lib/fog/openstack/baremetal/models/node.rb' + - 'lib/fog/openstack/baremetal/models/node.rb' + - 'lib/fog/openstack/image/v1/requests/set_tenant.rb' + - 'lib/fog/openstack/image/v1/requests/set_tenant.rb' + - 'lib/fog/openstack/image/v2/requests/set_tenant.rb' + - 'lib/fog/openstack/image/v2/requests/set_tenant.rb' + - 'lib/fog/openstack/shared_file_system/requests/get_limits.rb' + - 'lib/fog/openstack/shared_file_system/requests/get_limits.rb' + - 'lib/fog/openstack/compute/models/addresses.rb' + - 'lib/fog/openstack/compute/requests/set_tenant.rb' + - 'lib/fog/openstack/compute/requests/set_tenant.rb' + - 'lib/fog/openstack/volume/requests/set_tenant.rb' + - 'lib/fog/openstack/volume/requests/set_tenant.rb' # Offense count: 3 # Configuration parameters: ExpectMatchingDefinition, Regex, IgnoreExecutableScripts, AllowedAcronyms. From 6080d5fea85a3ad965169a6d1322670ba991f916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20Laur=C3=A8s?= Date: Tue, 19 Mar 2019 11:47:45 +0100 Subject: [PATCH 129/129] Fix miscaelous offenses --- lib/fog/openstack/identity/v3/models/projects.rb | 3 ++- lib/fog/openstack/image/v1/models/images.rb | 4 +--- lib/fog/openstack/image/v2.rb | 4 +++- lib/fog/openstack/image/v2/requests/download_image.rb | 4 +++- lib/fog/openstack/image/v2/requests/upload_image.rb | 1 + lib/fog/openstack/network.rb | 3 +++ lib/fog/openstack/network/requests/get_lb_pool_stats.rb | 2 +- lib/fog/openstack/orchestration/models/stack.rb | 3 ++- lib/fog/openstack/orchestration/requests/update_stack.rb | 2 +- .../orchestration/util/recursive_hot_file_loader.rb | 2 +- lib/fog/openstack/storage.rb | 2 +- lib/fog/openstack/storage/models/files.rb | 7 ++----- .../openstack/storage/requests/get_object_https_url.rb | 8 +++++--- lib/fog/openstack/volume/v2/requests/update_volume.rb | 2 +- 14 files changed, 27 insertions(+), 20 deletions(-) diff --git a/lib/fog/openstack/identity/v3/models/projects.rb b/lib/fog/openstack/identity/v3/models/projects.rb index f9d287af2..154f84140 100644 --- a/lib/fog/openstack/identity/v3/models/projects.rb +++ b/lib/fog/openstack/identity/v3/models/projects.rb @@ -33,7 +33,8 @@ def auth_projects(options = {}) load(service.auth_projects(options).body['projects']) end - def find_by_id(id, options = {}) # options can include :subtree_as_ids, :subtree_as_list, :parents_as_ids, :parents_as_list + def find_by_id(id, options = {}) + # options can include :subtree_as_ids, :subtree_as_list, :parents_as_ids, :parents_as_list if options.kind_of? Symbol # Deal with a single option being passed on its own options = { options => nil } end diff --git a/lib/fog/openstack/image/v1/models/images.rb b/lib/fog/openstack/image/v1/models/images.rb index 1e45d3cfc..082154dd0 100644 --- a/lib/fog/openstack/image/v1/models/images.rb +++ b/lib/fog/openstack/image/v1/models/images.rb @@ -29,9 +29,7 @@ def find_by_id(id) # partioning on the longer prefix, leaving X-Image-Meta # headers in the second returned hash. - custom_properties, params = headers.partition do |k, _| - k.start_with?(property_marker) - end.map { |p| Hash[p] } + custom_properties, params = headers.partition { |k, _| k.start_with?(property_marker) }.map { |p| Hash[p] } params = remove_prefix_and_convert_type(params, marker) custom_properties = remove_prefix_and_convert_type(custom_properties, property_marker) diff --git a/lib/fog/openstack/image/v2.rb b/lib/fog/openstack/image/v2.rb index dd787ef1b..fd97da6f4 100644 --- a/lib/fog/openstack/image/v2.rb +++ b/lib/fog/openstack/image/v2.rb @@ -100,7 +100,9 @@ def credentials openstack_management_url: @openstack_management_url } end end - class Upload # Exists for image_v2_upload_spec "describe" + + # Exists for image_v2_upload_spec "describe" + class Upload end class Real diff --git a/lib/fog/openstack/image/v2/requests/download_image.rb b/lib/fog/openstack/image/v2/requests/download_image.rb index 41447d882..05ab0332f 100644 --- a/lib/fog/openstack/image/v2/requests/download_image.rb +++ b/lib/fog/openstack/image/v2/requests/download_image.rb @@ -3,7 +3,9 @@ module OpenStack class Image class V2 class Real - def download_image(image_id, _content_range = nil, params) # TODO: implement content range handling + # TODO: implement content range handling + # removed _content_range = nil because in the middle of parameters and not used. + def download_image(image_id, _content_range, params) request_hash = { expects: [200, 204], method: 'GET', diff --git a/lib/fog/openstack/image/v2/requests/upload_image.rb b/lib/fog/openstack/image/v2/requests/upload_image.rb index d593a3edf..8c9e9fd13 100644 --- a/lib/fog/openstack/image/v2/requests/upload_image.rb +++ b/lib/fog/openstack/image/v2/requests/upload_image.rb @@ -22,6 +22,7 @@ class Mock def upload_image(_image_id, _body) response = Excon::Response.new response.status = 204 + response end end end diff --git a/lib/fog/openstack/network.rb b/lib/fog/openstack/network.rb index 4aa3d4a0c..39e210640 100644 --- a/lib/fog/openstack/network.rb +++ b/lib/fog/openstack/network.rb @@ -258,6 +258,8 @@ class Network < Fog::Service request :delete_quota class Mock + # rubocop:disable Metrics/MethodLength + # TODO: move all these in a yaml file? def self.data @data ||= Hash.new do |hash, key| qos_policy_id = Fog::UUID.uuid @@ -444,6 +446,7 @@ def self.data } end end + # rubocop:enable Metrics/MethodLength def self.reset @data = nil diff --git a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb index 4471d8893..8467da099 100644 --- a/lib/fog/openstack/network/requests/get_lb_pool_stats.rb +++ b/lib/fog/openstack/network/requests/get_lb_pool_stats.rb @@ -14,7 +14,7 @@ def get_lb_pool_stats(pool_id) class Mock def get_lb_pool_stats(pool_id) response = Excon::Response.new - if self.data[:lb_pools][pool_id] + if data[:lb_pools][pool_id] stats = {} stats["active_connections"] = 0 stats["bytes_in"] = 0 diff --git a/lib/fog/openstack/orchestration/models/stack.rb b/lib/fog/openstack/orchestration/models/stack.rb index 1bb70732a..2569f28fe 100644 --- a/lib/fog/openstack/orchestration/models/stack.rb +++ b/lib/fog/openstack/orchestration/models/stack.rb @@ -102,6 +102,8 @@ def timeout_in_minutes=(minutes) self.timeout_mins = minutes end + private + # build options to create or update stack def default_options template_content = @@ -121,7 +123,6 @@ def default_options options[:files] = @files if @files options end - private :default_options end end end diff --git a/lib/fog/openstack/orchestration/requests/update_stack.rb b/lib/fog/openstack/orchestration/requests/update_stack.rb index c23419c76..dbfff57f1 100644 --- a/lib/fog/openstack/orchestration/requests/update_stack.rb +++ b/lib/fog/openstack/orchestration/requests/update_stack.rb @@ -90,7 +90,7 @@ def update_stack(arg1, arg2 = nil, arg3 = nil) end else key_s = key.to_s - if !stack_obj.key? key_s || stack_obj[key_s].nil? || clear_parameters.include?(key) + if !stack_obj.key?(key_s) || stack_obj[key_s].nil? || clear_parameters.include?(key) stack_obj[key_s] = value elsif stack_obj[key_s].kind_of(Array) if value.kind_of(Array) diff --git a/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb index d739999e1..fef9eaa49 100644 --- a/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb +++ b/lib/fog/openstack/orchestration/util/recursive_hot_file_loader.rb @@ -161,7 +161,7 @@ def read_uri(uri_or_filename) # open-uri doesn't open "file:///" uris. uri_or_filename = uri_or_filename.sub(/^file:/, "") - open(uri_or_filename) { |f| content = f.read } + File.open(uri_or_filename) { |f| content = f.read } content end diff --git a/lib/fog/openstack/storage.rb b/lib/fog/openstack/storage.rb index a5947d70f..1e28665ba 100644 --- a/lib/fog/openstack/storage.rb +++ b/lib/fog/openstack/storage.rb @@ -53,7 +53,7 @@ def require_mime_types Fog::Logger.warning("'mime-types' missing, please install and try again.") exit(1) end - end + end end class Mock diff --git a/lib/fog/openstack/storage/models/files.rb b/lib/fog/openstack/storage/models/files.rb index 9f0a2caac..53976eaea 100644 --- a/lib/fog/openstack/storage/models/files.rb +++ b/lib/fog/openstack/storage/models/files.rb @@ -34,9 +34,7 @@ def all(options = {}) alias each_file_this_page each def each - if !block_given? - self - else + if block_given? subset = dup.all subset.each_file_this_page { |f| yield f } @@ -44,9 +42,8 @@ def each subset = subset.all(marker: subset.last.key) subset.each_file_this_page { |f| yield f } end - - self end + self end def get(key, &block) diff --git a/lib/fog/openstack/storage/requests/get_object_https_url.rb b/lib/fog/openstack/storage/requests/get_object_https_url.rb index e13720a68..181f841b5 100644 --- a/lib/fog/openstack/storage/requests/get_object_https_url.rb +++ b/lib/fog/openstack/storage/requests/get_object_https_url.rb @@ -76,11 +76,13 @@ def create_temp_url(container, object, expires, method, options = {}) private def sig_to_hex(str) - str.unpack("C*").map do |c| + str = str.unpack("C*").map do |c| c.to_s(16) - end.map do |h| + end + str = str.map do |h| h.size == 1 ? "0#{h}" : h - end.join + end + str.join end end end diff --git a/lib/fog/openstack/volume/v2/requests/update_volume.rb b/lib/fog/openstack/volume/v2/requests/update_volume.rb index 18e7f894e..634473714 100644 --- a/lib/fog/openstack/volume/v2/requests/update_volume.rb +++ b/lib/fog/openstack/volume/v2/requests/update_volume.rb @@ -6,7 +6,7 @@ module OpenStack class Volume module Real def update_volume(volume_id, data = {}) - data = data.select { |key| key == :name || key == :description || key == :metadata } + data = data.select { |key| [:name, :description, :metadata].include? key } request( body: Fog::JSON.encode('volume' => data), expects: 200,