From 134945fe591c3a849b8ce7f2a21004caef704209 Mon Sep 17 00:00:00 2001 From: Ori Rabin Date: Tue, 8 Aug 2017 13:16:18 +0300 Subject: [PATCH] Removing ovirt provider --- Rakefile | 3 - fog.gemspec | 2 +- lib/fog/bin/ovirt.rb | 28 --- lib/fog/ovirt/compute.rb | 155 -------------- lib/fog/ovirt/core.rb | 16 -- .../ovirt/models/compute/affinity_group.rb | 25 --- .../ovirt/models/compute/affinity_groups.rb | 20 -- lib/fog/ovirt/models/compute/cluster.rb | 20 -- lib/fog/ovirt/models/compute/clusters.rb | 20 -- lib/fog/ovirt/models/compute/instance_type.rb | 39 ---- .../ovirt/models/compute/instance_types.rb | 20 -- lib/fog/ovirt/models/compute/interface.rb | 19 -- lib/fog/ovirt/models/compute/interfaces.rb | 29 --- lib/fog/ovirt/models/compute/quota.rb | 16 -- lib/fog/ovirt/models/compute/quotas.rb | 20 -- lib/fog/ovirt/models/compute/server.rb | 175 ---------------- lib/fog/ovirt/models/compute/servers.rb | 27 --- lib/fog/ovirt/models/compute/template.rb | 58 ------ lib/fog/ovirt/models/compute/templates.rb | 20 -- lib/fog/ovirt/models/compute/volume.rb | 36 ---- lib/fog/ovirt/models/compute/volumes.rb | 28 --- .../ovirt/requests/compute/add_interface.rb | 20 -- .../requests/compute/add_to_affinity_group.rb | 21 -- lib/fog/ovirt/requests/compute/add_volume.rb | 21 -- .../ovirt/requests/compute/attach_volume.rb | 22 -- .../requests/compute/create_affinity_group.rb | 18 -- lib/fog/ovirt/requests/compute/create_vm.rb | 18 -- lib/fog/ovirt/requests/compute/datacenters.rb | 20 -- .../compute/destroy_affinity_group.rb | 19 -- .../requests/compute/destroy_interface.rb | 22 -- lib/fog/ovirt/requests/compute/destroy_vm.rb | 19 -- .../ovirt/requests/compute/destroy_volume.rb | 22 -- .../ovirt/requests/compute/detach_volume.rb | 22 -- .../requests/compute/get_affinity_group.rb | 18 -- .../ovirt/requests/compute/get_api_version.rb | 16 -- lib/fog/ovirt/requests/compute/get_cluster.rb | 17 -- .../requests/compute/get_instance_type.rb | 17 -- lib/fog/ovirt/requests/compute/get_quota.rb | 17 -- .../ovirt/requests/compute/get_template.rb | 17 -- .../requests/compute/get_virtual_machine.rb | 17 -- .../compute/list_affinity_group_vms.rb | 22 -- .../requests/compute/list_affinity_groups.rb | 20 -- .../ovirt/requests/compute/list_clusters.rb | 19 -- .../requests/compute/list_instance_types.rb | 19 -- .../ovirt/requests/compute/list_networks.rb | 16 -- lib/fog/ovirt/requests/compute/list_quotas.rb | 19 -- .../compute/list_template_interfaces.rb | 19 -- .../requests/compute/list_template_volumes.rb | 19 -- .../ovirt/requests/compute/list_templates.rb | 19 -- .../requests/compute/list_virtual_machines.rb | 19 -- .../requests/compute/list_vm_interfaces.rb | 19 -- .../ovirt/requests/compute/list_vm_volumes.rb | 19 -- .../ovirt/requests/compute/list_volumes.rb | 19 -- .../compute/mock_files/affinitygroup.xml | 8 - .../compute/mock_files/affinitygroup_vms.xml | 9 - .../compute/mock_files/affinitygroups.xml | 17 -- .../requests/compute/mock_files/cluster.xml | 20 -- .../requests/compute/mock_files/clusters.xml | 39 ---- .../compute/mock_files/data_centers.xml | 17 -- .../requests/compute/mock_files/disks.xml | 58 ------ .../compute/mock_files/instance_type.xml | 42 ---- .../compute/mock_files/instance_types.xml | 197 ------------------ .../requests/compute/mock_files/nics.xml | 10 - .../requests/compute/mock_files/quotas.xml | 7 - .../compute/mock_files/storage_domains.xml | 36 ---- .../requests/compute/mock_files/template.xml | 39 ---- .../requests/compute/mock_files/templates.xml | 110 ---------- .../ovirt/requests/compute/mock_files/vm.xml | 52 ----- .../ovirt/requests/compute/mock_files/vms.xml | 152 -------------- .../requests/compute/mock_files/volumes.xml | 40 ---- .../compute/remove_from_affinity_group.rb | 21 -- .../ovirt/requests/compute/storage_domains.rb | 20 -- .../requests/compute/update_interface.rb | 35 ---- lib/fog/ovirt/requests/compute/update_vm.rb | 18 -- .../ovirt/requests/compute/update_volume.rb | 39 ---- lib/fog/ovirt/requests/compute/vm_action.rb | 22 -- .../compute/vm_start_with_cloudinit.rb | 19 -- lib/fog/ovirt/requests/compute/vm_ticket.rb | 17 -- spec/fog/bin/ovirt_spec.rb | 10 - tests/helpers/mock_helper.rb | 3 - tests/ovirt/compute_tests.rb | 25 --- tests/ovirt/models/compute/cluster_tests.rb | 31 --- tests/ovirt/models/compute/clusters_tests.rb | 9 - tests/ovirt/models/compute/interface_tests.rb | 27 --- .../ovirt/models/compute/interfaces_tests.rb | 9 - tests/ovirt/models/compute/server_tests.rb | 51 ----- tests/ovirt/models/compute/servers_tests.rb | 14 -- tests/ovirt/models/compute/template_tests.rb | 28 --- tests/ovirt/models/compute/templates_tests.rb | 9 - .../ovirt/requests/compute/create_vm_tests.rb | 26 --- .../requests/compute/destroy_vm_tests.rb | 18 -- .../compute/list_datacenters_tests.rb | 13 -- .../requests/compute/list_quotas_tests.rb | 12 -- .../compute/list_storage_domains_tests.rb | 13 -- .../ovirt/requests/compute/update_vm_tests.rb | 18 -- .../requests/compute/update_volume_tests.rb | 20 -- 96 files changed, 1 insertion(+), 2766 deletions(-) delete mode 100644 lib/fog/bin/ovirt.rb delete mode 100644 lib/fog/ovirt/compute.rb delete mode 100644 lib/fog/ovirt/core.rb delete mode 100644 lib/fog/ovirt/models/compute/affinity_group.rb delete mode 100644 lib/fog/ovirt/models/compute/affinity_groups.rb delete mode 100644 lib/fog/ovirt/models/compute/cluster.rb delete mode 100644 lib/fog/ovirt/models/compute/clusters.rb delete mode 100644 lib/fog/ovirt/models/compute/instance_type.rb delete mode 100644 lib/fog/ovirt/models/compute/instance_types.rb delete mode 100644 lib/fog/ovirt/models/compute/interface.rb delete mode 100644 lib/fog/ovirt/models/compute/interfaces.rb delete mode 100644 lib/fog/ovirt/models/compute/quota.rb delete mode 100644 lib/fog/ovirt/models/compute/quotas.rb delete mode 100644 lib/fog/ovirt/models/compute/server.rb delete mode 100644 lib/fog/ovirt/models/compute/servers.rb delete mode 100644 lib/fog/ovirt/models/compute/template.rb delete mode 100644 lib/fog/ovirt/models/compute/templates.rb delete mode 100644 lib/fog/ovirt/models/compute/volume.rb delete mode 100644 lib/fog/ovirt/models/compute/volumes.rb delete mode 100644 lib/fog/ovirt/requests/compute/add_interface.rb delete mode 100644 lib/fog/ovirt/requests/compute/add_to_affinity_group.rb delete mode 100644 lib/fog/ovirt/requests/compute/add_volume.rb delete mode 100644 lib/fog/ovirt/requests/compute/attach_volume.rb delete mode 100644 lib/fog/ovirt/requests/compute/create_affinity_group.rb delete mode 100644 lib/fog/ovirt/requests/compute/create_vm.rb delete mode 100644 lib/fog/ovirt/requests/compute/datacenters.rb delete mode 100644 lib/fog/ovirt/requests/compute/destroy_affinity_group.rb delete mode 100644 lib/fog/ovirt/requests/compute/destroy_interface.rb delete mode 100644 lib/fog/ovirt/requests/compute/destroy_vm.rb delete mode 100644 lib/fog/ovirt/requests/compute/destroy_volume.rb delete mode 100644 lib/fog/ovirt/requests/compute/detach_volume.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_affinity_group.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_api_version.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_cluster.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_instance_type.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_quota.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_template.rb delete mode 100644 lib/fog/ovirt/requests/compute/get_virtual_machine.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_affinity_group_vms.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_affinity_groups.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_clusters.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_instance_types.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_networks.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_quotas.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_template_interfaces.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_template_volumes.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_templates.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_virtual_machines.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_vm_interfaces.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_vm_volumes.rb delete mode 100644 lib/fog/ovirt/requests/compute/list_volumes.rb delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/affinitygroup.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/affinitygroup_vms.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/affinitygroups.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/cluster.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/clusters.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/data_centers.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/disks.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/instance_type.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/instance_types.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/nics.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/quotas.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/storage_domains.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/template.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/templates.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/vm.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/vms.xml delete mode 100644 lib/fog/ovirt/requests/compute/mock_files/volumes.xml delete mode 100644 lib/fog/ovirt/requests/compute/remove_from_affinity_group.rb delete mode 100644 lib/fog/ovirt/requests/compute/storage_domains.rb delete mode 100644 lib/fog/ovirt/requests/compute/update_interface.rb delete mode 100644 lib/fog/ovirt/requests/compute/update_vm.rb delete mode 100644 lib/fog/ovirt/requests/compute/update_volume.rb delete mode 100644 lib/fog/ovirt/requests/compute/vm_action.rb delete mode 100644 lib/fog/ovirt/requests/compute/vm_start_with_cloudinit.rb delete mode 100644 lib/fog/ovirt/requests/compute/vm_ticket.rb delete mode 100644 spec/fog/bin/ovirt_spec.rb delete mode 100644 tests/ovirt/compute_tests.rb delete mode 100644 tests/ovirt/models/compute/cluster_tests.rb delete mode 100644 tests/ovirt/models/compute/clusters_tests.rb delete mode 100644 tests/ovirt/models/compute/interface_tests.rb delete mode 100644 tests/ovirt/models/compute/interfaces_tests.rb delete mode 100644 tests/ovirt/models/compute/server_tests.rb delete mode 100644 tests/ovirt/models/compute/servers_tests.rb delete mode 100644 tests/ovirt/models/compute/template_tests.rb delete mode 100644 tests/ovirt/models/compute/templates_tests.rb delete mode 100644 tests/ovirt/requests/compute/create_vm_tests.rb delete mode 100644 tests/ovirt/requests/compute/destroy_vm_tests.rb delete mode 100644 tests/ovirt/requests/compute/list_datacenters_tests.rb delete mode 100644 tests/ovirt/requests/compute/list_quotas_tests.rb delete mode 100644 tests/ovirt/requests/compute/list_storage_domains_tests.rb delete mode 100644 tests/ovirt/requests/compute/update_vm_tests.rb delete mode 100644 tests/ovirt/requests/compute/update_volume_tests.rb diff --git a/Rakefile b/Rakefile index 73900c91f..f426cf43a 100644 --- a/Rakefile +++ b/Rakefile @@ -73,9 +73,6 @@ namespace :test do task :openvz do sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/openvz") end - task :ovirt do - sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/ovirt") - end task :cloudstack do sh("export FOG_MOCK=#{mock} && bundle exec shindont tests/cloudstack") end diff --git a/fog.gemspec b/fog.gemspec index 2d21122b4..8fea6a4ab 100644 --- a/fog.gemspec +++ b/fog.gemspec @@ -67,6 +67,7 @@ Gem::Specification.new do |s| s.add_dependency("fog-joyent") s.add_dependency("fog-local") s.add_dependency("fog-openstack") + s.add_dependency("fog-ovirt") s.add_dependency("fog-powerdns", ">= 0.1.1") s.add_dependency("fog-profitbricks") s.add_dependency("fog-rackspace") @@ -90,7 +91,6 @@ Gem::Specification.new do |s| s.add_development_dependency("opennebula") s.add_development_dependency("pry") s.add_development_dependency("rake") - s.add_development_dependency("rbovirt", "0.1.3") s.add_development_dependency("rbvmomi") s.add_development_dependency("rubocop", "0.41.2") s.add_development_dependency("shindo", "~> 0.3.4") diff --git a/lib/fog/bin/ovirt.rb b/lib/fog/bin/ovirt.rb deleted file mode 100644 index 14eca5e2c..000000000 --- a/lib/fog/bin/ovirt.rb +++ /dev/null @@ -1,28 +0,0 @@ -class Ovirt < Fog::Bin - class << self - def class_for(key) - case key - when :compute - Fog::Compute::Ovirt - else - raise ArgumentError, "Unrecognized service: #{key}" - end - end - - def [](service) - @@connections ||= Hash.new do |hash, key| - hash[key] = case key - when :compute - Fog::Compute.new(:provider => 'Ovirt') - else - raise ArgumentError, "Unrecognized service: #{key.inspect}" - end - end - @@connections[service] - end - - def services - Fog::Ovirt.services - end - end -end diff --git a/lib/fog/ovirt/compute.rb b/lib/fog/ovirt/compute.rb deleted file mode 100644 index e38831c1f..000000000 --- a/lib/fog/ovirt/compute.rb +++ /dev/null @@ -1,155 +0,0 @@ -require 'fog/ovirt/core' - -module Fog - module Compute - class Ovirt < Fog::Service - requires :ovirt_username, :ovirt_password - recognizes :ovirt_url, :ovirt_server, :ovirt_port, :ovirt_api_path, :ovirt_datacenter, - :ovirt_filtered_api, - :ovirt_ca_cert_store, :ovirt_ca_cert_file, :ovirt_ca_no_verify - - model_path 'fog/ovirt/models/compute' - model :server - collection :servers - model :template - collection :templates - model :instance_type - collection :instance_types - model :cluster - collection :clusters - model :interface - collection :interfaces - model :volume - collection :volumes - model :quota - collection :quotas - model :affinity_group - collection :affinity_groups - - request_path 'fog/ovirt/requests/compute' - - request :vm_action - request :vm_start_with_cloudinit - request :destroy_vm - request :create_vm - request :update_vm - request :datacenters - request :storage_domains - request :list_virtual_machines - request :get_virtual_machine - request :list_templates - request :get_template - request :list_instance_types - request :get_instance_type - request :list_clusters - request :get_cluster - request :add_interface - request :destroy_interface - request :update_interface - request :list_vm_interfaces - request :list_template_interfaces - request :list_networks - request :vm_ticket - request :list_vm_volumes - request :list_template_volumes - request :list_volumes - request :add_volume - request :destroy_volume - request :update_volume - request :attach_volume - request :detach_volume - request :activate_volume - request :deactivate_volume - request :get_api_version - request :list_quotas - request :get_quota - request :list_affinity_groups - request :get_affinity_group - request :list_affinity_group_vms - request :create_affinity_group - request :destroy_affinity_group - request :add_to_affinity_group - request :remove_from_affinity_group - - module Shared - # converts an OVIRT object into an hash for fog to consume. - def ovirt_attrs obj - opts = {:raw => obj} - obj.instance_variables.each do |v| - key = v.to_s.gsub("@","").to_sym - value = obj.instance_variable_get(v) - #ignore nil values - next if value.nil? - - opts[key] = case value - when OVIRT::Link - value.id - when OVIRT::TemplateVersion - value - when Array - value - when Hash - value - else - value.to_s.strip - end - end - opts - end - end - - class Mock - include Shared - - def initialize(options={}) - require 'rbovirt' - end - - private - - def client - return @client if defined?(@client) - end - - #read mocks xml - def read_xml(file_name) - file_path = File.join(File.dirname(__FILE__),"requests","compute","mock_files",file_name) - File.read(file_path) - end - end - - class Real - include Shared - - def initialize(options={}) - require 'rbovirt' - username = options[:ovirt_username] - password = options[:ovirt_password] - server = options[:ovirt_server] - port = options[:ovirt_port] || 8080 - api_path = options[:ovirt_api_path] || '/api' - url = options[:ovirt_url] || "#{@scheme}://#{server}:#{port}#{api_path}" - - connection_opts = {} - connection_opts[:datacenter_id] = options[:ovirt_datacenter] - connection_opts[:ca_cert_store] = options[:ovirt_ca_cert_store] - connection_opts[:ca_cert_file] = options[:ovirt_ca_cert_file] - connection_opts[:ca_no_verify] = options[:ovirt_ca_no_verify] - connection_opts[:filtered_api] = options[:ovirt_filtered_api] - - @client = OVIRT::Client.new(username, password, url, connection_opts) - end - - def api_version - client.api_version - end - - private - - def client - @client - end - end - end - end -end diff --git a/lib/fog/ovirt/core.rb b/lib/fog/ovirt/core.rb deleted file mode 100644 index b228fc72b..000000000 --- a/lib/fog/ovirt/core.rb +++ /dev/null @@ -1,16 +0,0 @@ -require 'fog/core' -require 'fog/xml' - -module Fog - module Ovirt - extend Fog::Provider - - module Errors - class ServiceError < Fog::Errors::Error; end - class SecurityError < ServiceError; end - class NotFound < ServiceError; end - end - - service(:compute, 'Compute') - end -end diff --git a/lib/fog/ovirt/models/compute/affinity_group.rb b/lib/fog/ovirt/models/compute/affinity_group.rb deleted file mode 100644 index 061148b3f..000000000 --- a/lib/fog/ovirt/models/compute/affinity_group.rb +++ /dev/null @@ -1,25 +0,0 @@ -module Fog - module Compute - class Ovirt - class AffinityGroup < Fog::Model - identity :id - - attribute :name - attribute :positive - attribute :enforcing - - def vms - id.nil? ? [] : service.list_affinity_group_vms(id) - end - - def destroy - service.destroy_affinity_group(id) - end - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/affinity_groups.rb b/lib/fog/ovirt/models/compute/affinity_groups.rb deleted file mode 100644 index 4b2af9df3..000000000 --- a/lib/fog/ovirt/models/compute/affinity_groups.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/affinity_group' - -module Fog - module Compute - class Ovirt - class AffinityGroups < Fog::Collection - model Fog::Compute::Ovirt::AffinityGroup - - def all(filters = {}) - load service.list_affinity_groups(filters) - end - - def get(id) - new service.get_affinity_group(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/cluster.rb b/lib/fog/ovirt/models/compute/cluster.rb deleted file mode 100644 index 6d948ceef..000000000 --- a/lib/fog/ovirt/models/compute/cluster.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Fog - module Compute - class Ovirt - class Cluster < Fog::Model - identity :id - - attribute :name - attribute :raw - - def networks - service.list_networks(id) - end - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/clusters.rb b/lib/fog/ovirt/models/compute/clusters.rb deleted file mode 100644 index b58507a6e..000000000 --- a/lib/fog/ovirt/models/compute/clusters.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/cluster' - -module Fog - module Compute - class Ovirt - class Clusters < Fog::Collection - model Fog::Compute::Ovirt::Cluster - - def all(filters = {}) - load service.list_clusters(filters) - end - - def get(id) - new service.get_cluster(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/instance_type.rb b/lib/fog/ovirt/models/compute/instance_type.rb deleted file mode 100644 index 7256b3546..000000000 --- a/lib/fog/ovirt/models/compute/instance_type.rb +++ /dev/null @@ -1,39 +0,0 @@ -module Fog - module Compute - class Ovirt - class InstanceType < Fog::Model - identity :id - - attr_accessor :raw - - attribute :name - attribute :description - attribute :memory - attribute :cores - attribute :creation_time - attribute :os - attribute :ha - attribute :ha_priority - attribute :display - attribute :usb - attribute :migration_downtime - attribute :type - attribute :status - attribute :cpu_shares - attribute :boot_menu - attribute :origin - attribute :stateless - attribute :delete_protected - attribute :sso - attribute :timezone - attribute :migration - attribute :io_threads - attribute :memory_garanteed - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/instance_types.rb b/lib/fog/ovirt/models/compute/instance_types.rb deleted file mode 100644 index 5e883f523..000000000 --- a/lib/fog/ovirt/models/compute/instance_types.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/instance_type' - -module Fog - module Compute - class Ovirt - class InstanceTypes < Fog::Collection - model Fog::Compute::Ovirt::InstanceType - - def all(filters = {}) - load service.list_instance_types(filters) - end - - def get(id) - new service.get_instance_type(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/interface.rb b/lib/fog/ovirt/models/compute/interface.rb deleted file mode 100644 index cebccd625..000000000 --- a/lib/fog/ovirt/models/compute/interface.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Interface < Fog::Model - attr_accessor :raw - identity :id - - attribute :name - attribute :network - attribute :interface - attribute :mac - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/interfaces.rb b/lib/fog/ovirt/models/compute/interfaces.rb deleted file mode 100644 index 1a9b0307e..000000000 --- a/lib/fog/ovirt/models/compute/interfaces.rb +++ /dev/null @@ -1,29 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/interface' - -module Fog - module Compute - class Ovirt - class Interfaces < Fog::Collection - model Fog::Compute::Ovirt::Interface - - attr_accessor :vm - - def all(filters = {}) - requires :vm - if vm.is_a? Fog::Compute::Ovirt::Server - load service.list_vm_interfaces(vm.id) - elsif vm.is_a? Fog::Compute::Ovirt::Template - load service.list_template_interfaces(vm.id) - else - raise 'interfaces should have vm or template' - end - end - - def get(id) - new service.get_interface(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/quota.rb b/lib/fog/ovirt/models/compute/quota.rb deleted file mode 100644 index df51ea4f2..000000000 --- a/lib/fog/ovirt/models/compute/quota.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Fog - module Compute - class Ovirt - class Quota < Fog::Model - identity :id - - attribute :name - attribute :description - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/quotas.rb b/lib/fog/ovirt/models/compute/quotas.rb deleted file mode 100644 index 002b391a6..000000000 --- a/lib/fog/ovirt/models/compute/quotas.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/quota' - -module Fog - module Compute - class Ovirt - class Quotas < Fog::Collection - model Fog::Compute::Ovirt::Quota - - def all(filters = {}) - load service.list_quotas(filters) - end - - def get(id) - new service.get_quota(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/server.rb b/lib/fog/ovirt/models/compute/server.rb deleted file mode 100644 index 020b450a9..000000000 --- a/lib/fog/ovirt/models/compute/server.rb +++ /dev/null @@ -1,175 +0,0 @@ -require 'fog/compute/models/server' - -module Fog - module Compute - class Ovirt - class Server < Fog::Compute::Server - # This will be the instance uuid which is globally unique across - # a oVirt deployment. - identity :id - - attribute :name - attribute :comment - attribute :description - attribute :profile - attribute :display - attribute :storage, :aliases => 'disk_size' - attribute :creation_time - attribute :os - attribute :ip - attribute :status - attribute :cores, :aliases => 'cpus' - attribute :memory - attribute :host - attribute :cluster - attribute :template - attribute :instance_type - attribute :interfaces - attribute :volumes - attribute :raw - attribute :quota - attribute :ips - attribute :ha - attribute :ha_priority - attribute :clone - attribute :disks - - def ready? - !(status =~ /down/i) - end - - def locked? - @volumes = nil # force reload volumes - !!(status =~ /locked/i) || (attributes[:volumes]=nil) || volumes.any?{|v| !!(v.status =~ /locked/i)} - end - - def stopped? - status.downcase == 'down' - end - - def mac - interfaces.first.mac unless interfaces.empty? - end - - def interfaces - @interfaces ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new( - :service => service, - :vm => self - ) - end - - def add_interface attrs - wait_for { stopped? } if attrs[:blocking] - service.add_interface(id, attrs) - end - - def update_interface attrs - wait_for { stopped? } if attrs[:blocking] - service.update_interface(id, attrs) - end - - def destroy_interface attrs - wait_for { stopped? } if attrs[:blocking] - service.destroy_interface(id, attrs) - end - - def volumes - @volumes ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new( - :service => service, - :vm => self - ) - end - - def add_volume attrs - wait_for { stopped? } if attrs[:blocking] - service.add_volume(id, attrs) - end - - def destroy_volume attrs - wait_for { stopped? } if attrs[:blocking] - service.destroy_volume(id, attrs) - end - - def update_volume attrs - wait_for { stopped? } if attrs[:blocking] - service.update_volume(id, attrs) - end - - def attach_volume(attrs) - wait_for { stopped? } if attrs[:blocking] - service.attach_volume(id, attrs) - end - - def detach_volume(attrs) - wait_for { stopped? } if attrs[:blocking] - service.detach_volume(id, attrs) - end - - def add_to_affinity_group(attrs) - wait_for { stopped? } if attrs[:blocking] - service.add_to_affinity_group(id, attrs) - end - - def remove_from_affinity_group(attrs) - wait_for { stopped? } if attrs[:blocking] - service.remove_from_affinity_group(id, attrs) - end - - def start(options = {}) - wait_for { !locked? } if options[:blocking] - service.vm_action(:id =>id, :action => :start) - reload - end - - def start_with_cloudinit(options = {}) - wait_for { !locked? } if options[:blocking] - user_data = Hash[YAML.load(options[:user_data]).map{|a| [a.first.to_sym, a.last]}] - service.vm_start_with_cloudinit(:id =>id, :user_data =>user_data) - reload - end - - def stop(options = {}) - service.vm_action(:id =>id, :action => :stop) - reload - end - - def reboot(options = {}) - unless stopped? - stop - wait_for { stopped? } - end - start options.merge(:blocking => true) - end - - def suspend(options = {}) - service.vm_action(:id =>id, :action => :suspend) - reload - end - - def destroy(options = {}) - (stop unless stopped?) rescue nil #ignore failure, destroy the machine anyway. - wait_for { stopped? } - service.destroy_vm(:id => id) - end - - def ticket(options = {}) - raise "Can not set console ticket, Server is not ready. Server status: #{status}" unless ready? - service.vm_ticket(id, options) - end - - def save - if persisted? - service.update_vm(attributes) - else - self.id = service.create_vm(attributes).id - end - reload - end - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/servers.rb b/lib/fog/ovirt/models/compute/servers.rb deleted file mode 100644 index 945a88a9a..000000000 --- a/lib/fog/ovirt/models/compute/servers.rb +++ /dev/null @@ -1,27 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/server' - -module Fog - module Compute - class Ovirt - class Servers < Fog::Collection - model Fog::Compute::Ovirt::Server - - def all(filters = {}) - load service.list_virtual_machines(filters) - end - - def get(id) - new service.get_virtual_machine(id) - end - - def bootstrap(new_attributes = {}) - server = create(new_attributes) - server.wait_for { stopped? } - server.start - server - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/template.rb b/lib/fog/ovirt/models/compute/template.rb deleted file mode 100644 index cc41d61ea..000000000 --- a/lib/fog/ovirt/models/compute/template.rb +++ /dev/null @@ -1,58 +0,0 @@ -module Fog - module Compute - class Ovirt - class Template < Fog::Model - identity :id - - attr_accessor :raw - - attribute :name - attribute :comment - attribute :description - attribute :profile - attribute :display - attribute :storage, :aliases => 'disk_size' - attribute :creation_time - attribute :os - attribute :status - attribute :cores, :aliases => 'cpus' - attribute :memory - attribute :cluster - attribute :interfaces - attribute :volumes - attribute :version - - def interfaces - attributes[:interfaces] ||= id.nil? ? [] : Fog::Compute::Ovirt::Interfaces.new( - :service => service, - :vm => self - ) - end - - def volumes - attributes[:volumes] ||= id.nil? ? [] : Fog::Compute::Ovirt::Volumes.new( - :service => service, - :vm => self - ) - end - - def ready? - !(status =~ /down/i) - end - - def destroy(options = {}) - service.client.destroy_template(id) - end - - def save - raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted? - service.client.create_template(attributes) - end - - def to_s - name - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/templates.rb b/lib/fog/ovirt/models/compute/templates.rb deleted file mode 100644 index 5193a2763..000000000 --- a/lib/fog/ovirt/models/compute/templates.rb +++ /dev/null @@ -1,20 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/template' - -module Fog - module Compute - class Ovirt - class Templates < Fog::Collection - model Fog::Compute::Ovirt::Template - - def all(filters = {}) - load service.list_templates(filters) - end - - def get(id) - new service.get_template(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/volume.rb b/lib/fog/ovirt/models/compute/volume.rb deleted file mode 100644 index 4c71b2f22..000000000 --- a/lib/fog/ovirt/models/compute/volume.rb +++ /dev/null @@ -1,36 +0,0 @@ -module Fog - module Compute - class Ovirt - class Volume < Fog::Model - attr_accessor :raw - DISK_SIZE_TO_GB = 1073741824 - identity :id - - attribute :storage_domain - attribute :size - attribute :disk_type - attribute :bootable - attribute :interface - attribute :format - attribute :sparse - attribute :size_gb - attribute :status - attribute :quota - attribute :alias - attribute :wipe_after_delete - - def size_gb - attributes[:size_gb] ||= attributes[:size].to_i / DISK_SIZE_TO_GB if attributes[:size] - end - - def size_gb= s - attributes[:size] = s.to_i * DISK_SIZE_TO_GB if s - end - - def to_s - id - end - end - end - end -end diff --git a/lib/fog/ovirt/models/compute/volumes.rb b/lib/fog/ovirt/models/compute/volumes.rb deleted file mode 100644 index cd0635f27..000000000 --- a/lib/fog/ovirt/models/compute/volumes.rb +++ /dev/null @@ -1,28 +0,0 @@ -require 'fog/core/collection' -require 'fog/ovirt/models/compute/volume' - -module Fog - module Compute - class Ovirt - class Volumes < Fog::Collection - model Fog::Compute::Ovirt::Volume - - attr_accessor :vm - - def all(filters = {}) - if vm.is_a? Fog::Compute::Ovirt::Server - load service.list_vm_volumes(vm.id) - elsif vm.is_a? Fog::Compute::Ovirt::Template - load service.list_template_volumes(vm.id) - else - load service.list_volumes - end - end - - def get(id) - new service.get_volume(id) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/add_interface.rb b/lib/fog/ovirt/requests/compute/add_interface.rb deleted file mode 100644 index 8b1113a77..000000000 --- a/lib/fog/ovirt/requests/compute/add_interface.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def add_interface(id, options = {}) - raise ArgumentError, "instance id is a required parameter" unless id - - client.add_interface(id, options) - end - end - - class Mock - def add_interface(id, options = {}) - raise ArgumentError, "instance id is a required parameter" unless id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/add_to_affinity_group.rb b/lib/fog/ovirt/requests/compute/add_to_affinity_group.rb deleted file mode 100644 index 477205644..000000000 --- a/lib/fog/ovirt/requests/compute/add_to_affinity_group.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def add_to_affinity_group(id, options = {}) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "affinity group id is a required parameter for add-to-affinity-group" unless options.key? :id - client.add_vm_to_affinity_group(options[:id], id) - end - end - - class Mock - def add_to_affinity_group(id, options = {}) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "affinity group id is a required parameter for add-to-affinity-group" unless options.key? :id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/add_volume.rb b/lib/fog/ovirt/requests/compute/add_volume.rb deleted file mode 100644 index 9ffb4b9d8..000000000 --- a/lib/fog/ovirt/requests/compute/add_volume.rb +++ /dev/null @@ -1,21 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - DISK_SIZE_TO_GB = 1073741824 - def add_volume(id, options = {}) - raise ArgumentError, "instance id is a required parameter" unless id - options[:size]=options[:size_gb].to_i*DISK_SIZE_TO_GB if options[:size_gb] - client.add_volume(id, options) - end - end - - class Mock - def add_volume(id, options = {}) - raise ArgumentError, "instance id is a required parameter" unless id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/attach_volume.rb b/lib/fog/ovirt/requests/compute/attach_volume.rb deleted file mode 100644 index 85b8fd68f..000000000 --- a/lib/fog/ovirt/requests/compute/attach_volume.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def attach_volume(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "volume id is a required parameter for attach-volume" unless options.key? :id - - client.attach_volume(id, options[:id]) - end - end - - class Mock - def attach_volume(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "volume id is a required parameter for attach-volume" unless options.key? :id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/create_affinity_group.rb b/lib/fog/ovirt/requests/compute/create_affinity_group.rb deleted file mode 100644 index 4f5c8ce8f..000000000 --- a/lib/fog/ovirt/requests/compute/create_affinity_group.rb +++ /dev/null @@ -1,18 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def create_affinity_group(attrs) - client.create_affinity_group(attrs) - end - end - - class Mock - def create_affinity_group(attrs) - xml = read_xml('affinitygroup.xml') - OVIRT::AffinityGroup::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/create_vm.rb b/lib/fog/ovirt/requests/compute/create_vm.rb deleted file mode 100644 index a6d265253..000000000 --- a/lib/fog/ovirt/requests/compute/create_vm.rb +++ /dev/null @@ -1,18 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def create_vm(attrs) - client.create_vm(attrs) - end - end - - class Mock - def create_vm(attrs) - xml = read_xml('vm.xml') - OVIRT::VM::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/datacenters.rb b/lib/fog/ovirt/requests/compute/datacenters.rb deleted file mode 100644 index 6f6a31ac5..000000000 --- a/lib/fog/ovirt/requests/compute/datacenters.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def datacenters filter={} - client.datacenters(filter).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - - class Mock - def datacenters(filters = {}) - xml = read_xml 'data_centers.xml' - Nokogiri::XML(xml).xpath('/data_centers/data_center').map do |dc| - ovirt_attrs OVIRT::DataCenter::new(self, dc) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/destroy_affinity_group.rb b/lib/fog/ovirt/requests/compute/destroy_affinity_group.rb deleted file mode 100644 index 171e206ca..000000000 --- a/lib/fog/ovirt/requests/compute/destroy_affinity_group.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def destroy_affinity_group(id) - raise ArgumentError, "instance id is a required parameter" unless id - client.destroy_affinity_group(id) - end - end - - class Mock - def destroy_affinity_group(id) - raise ArgumentError, "instance id is a required parameter" unless id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/destroy_interface.rb b/lib/fog/ovirt/requests/compute/destroy_interface.rb deleted file mode 100644 index 6e127857c..000000000 --- a/lib/fog/ovirt/requests/compute/destroy_interface.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def destroy_interface(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "interface id is a required parameter for destroy-interface" unless options.key? :id - - client.destroy_interface(id, options[:id]) - end - end - - class Mock - def destroy_interface(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "interface id is a required parameter for destroy-interface" unless options.key? :id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/destroy_vm.rb b/lib/fog/ovirt/requests/compute/destroy_vm.rb deleted file mode 100644 index 53239924b..000000000 --- a/lib/fog/ovirt/requests/compute/destroy_vm.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def destroy_vm(options = {}) - raise ArgumentError, "instance id is a required parameter" unless options.key? :id - client.destroy_vm(options[:id]) - end - end - - class Mock - def destroy_vm(options = {}) - raise ArgumentError, "instance id is a required parameter" unless options.key? :id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/destroy_volume.rb b/lib/fog/ovirt/requests/compute/destroy_volume.rb deleted file mode 100644 index e19cfd816..000000000 --- a/lib/fog/ovirt/requests/compute/destroy_volume.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def destroy_volume(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "volume id is a required parameter for destroy-volume" unless options.key? :id - - client.destroy_volume(id, options[:id]) - end - end - - class Mock - def destroy_volume(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "volume id is a required parameter for destroy-volume" unless options.key? :id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/detach_volume.rb b/lib/fog/ovirt/requests/compute/detach_volume.rb deleted file mode 100644 index 5de2d4011..000000000 --- a/lib/fog/ovirt/requests/compute/detach_volume.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def detach_volume(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "volume id is a required parameter for detach-volume" unless options.key? :id - - client.detach_volume(id, options[:id]) - end - end - - class Mock - def detach_volume(id, options) - raise ArgumentError, "instance id is a required parameter" unless id - raise ArgumentError, "volume id is a required parameter for detach-volume" unless options.key? :id - true - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_affinity_group.rb b/lib/fog/ovirt/requests/compute/get_affinity_group.rb deleted file mode 100644 index 16c97fbfa..000000000 --- a/lib/fog/ovirt/requests/compute/get_affinity_group.rb +++ /dev/null @@ -1,18 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def get_affinity_group(id) - ovirt_attrs client.affinity_group(id) - end - end - - class Mock - def get_affinity_group(id) - xml = read_xml('affinitygroup.xml') - ovirt_attrs OVIRT::AffinityGroup::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_api_version.rb b/lib/fog/ovirt/requests/compute/get_api_version.rb deleted file mode 100644 index 52643b499..000000000 --- a/lib/fog/ovirt/requests/compute/get_api_version.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def api_version - client.api_version - end - end - class Mock - def api_version - "3.1" - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_cluster.rb b/lib/fog/ovirt/requests/compute/get_cluster.rb deleted file mode 100644 index 33daddbe8..000000000 --- a/lib/fog/ovirt/requests/compute/get_cluster.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def get_cluster(id) - ovirt_attrs client.cluster(id) - end - end - class Mock - def get_cluster(id) - xml = read_xml('cluster.xml') - ovirt_attrs OVIRT::Cluster::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_instance_type.rb b/lib/fog/ovirt/requests/compute/get_instance_type.rb deleted file mode 100644 index ec5ca5297..000000000 --- a/lib/fog/ovirt/requests/compute/get_instance_type.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def get_instance_type(id) - ovirt_attrs client.instance_type(id) - end - end - class Mock - def get_instance_type(id) - xml = read_xml 'instance_type.xml' - ovirt_attrs OVIRT::InstanceType::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_quota.rb b/lib/fog/ovirt/requests/compute/get_quota.rb deleted file mode 100644 index 94b6c3c9d..000000000 --- a/lib/fog/ovirt/requests/compute/get_quota.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def get_quota(id) - ovirt_attrs client.quota(id) - end - end - class Mock - def get_quota(id) - xml = read_xml('quota.xml') - ovirt_attrs OVIRT::Quota::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_template.rb b/lib/fog/ovirt/requests/compute/get_template.rb deleted file mode 100644 index 337aa7b06..000000000 --- a/lib/fog/ovirt/requests/compute/get_template.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def get_template(id) - ovirt_attrs client.template(id) - end - end - class Mock - def get_template(id) - xml = read_xml 'template.xml' - ovirt_attrs OVIRT::Template::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/get_virtual_machine.rb b/lib/fog/ovirt/requests/compute/get_virtual_machine.rb deleted file mode 100644 index 5d8531103..000000000 --- a/lib/fog/ovirt/requests/compute/get_virtual_machine.rb +++ /dev/null @@ -1,17 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def get_virtual_machine(id) - ovirt_attrs client.vm(id) - end - end - class Mock - def get_virtual_machine(id) - xml = read_xml 'vm.xml' - ovirt_attrs OVIRT::VM::new(self, Nokogiri::XML(xml).root) - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_affinity_group_vms.rb b/lib/fog/ovirt/requests/compute/list_affinity_group_vms.rb deleted file mode 100644 index c82d2d36c..000000000 --- a/lib/fog/ovirt/requests/compute/list_affinity_group_vms.rb +++ /dev/null @@ -1,22 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_affinity_group_vms(id) - client.affinity_group_vms(id).map {|vm| servers.get(vm.id)} - end - end - - class Mock - def list_affinity_group_vms(id) - vms = [] - Nokogiri::XML(read_xml('affinitygroup_vms.xml')).xpath('/vms/vm/@id').each do |id| - xml = Nokogiri::XML(read_xml('vms.xml')).xpath("/vms/vm[@id='%s']" % id.value).first - vms << ovirt_attrs(OVIRT::VM::new(self, xml)) - end - vms - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_affinity_groups.rb b/lib/fog/ovirt/requests/compute/list_affinity_groups.rb deleted file mode 100644 index aff1c70c2..000000000 --- a/lib/fog/ovirt/requests/compute/list_affinity_groups.rb +++ /dev/null @@ -1,20 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_affinity_groups(filters = {}) - client.affinity_groups(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - - class Mock - def list_affinity_groups(filters = {}) - xml = read_xml('affinitygroups.xml') - Nokogiri::XML(xml).xpath('/affinity_groups/affinity_group').map do |ag| - ovirt_attrs OVIRT::AffinityGroup::new(self, ag) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_clusters.rb b/lib/fog/ovirt/requests/compute/list_clusters.rb deleted file mode 100644 index 014b9fd9e..000000000 --- a/lib/fog/ovirt/requests/compute/list_clusters.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_clusters(filters = {}) - client.clusters(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_clusters(filters = {}) - xml = read_xml 'clusters.xml' - Nokogiri::XML(xml).xpath('/clusters/cluster').map do |cl| - ovirt_attrs OVIRT::Cluster::new(self, cl) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_instance_types.rb b/lib/fog/ovirt/requests/compute/list_instance_types.rb deleted file mode 100644 index c91133b14..000000000 --- a/lib/fog/ovirt/requests/compute/list_instance_types.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_instance_types(filters = {}) - client.instance_types(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_instance_types(filters = {}) - xml = read_xml 'instance_types.xml' - Nokogiri::XML(xml).xpath('/instance_types/instance_type').map do |t| - ovirt_attrs OVIRT::InstanceType::new(self, t) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_networks.rb b/lib/fog/ovirt/requests/compute/list_networks.rb deleted file mode 100644 index f789d93bb..000000000 --- a/lib/fog/ovirt/requests/compute/list_networks.rb +++ /dev/null @@ -1,16 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_networks(cluster_id) - client.networks(:cluster_id => cluster_id) - end - end - class Mock - def list_networks(cluster_id) - [] - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_quotas.rb b/lib/fog/ovirt/requests/compute/list_quotas.rb deleted file mode 100644 index 7abbe05d2..000000000 --- a/lib/fog/ovirt/requests/compute/list_quotas.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_quotas(filters = {}) - client.quotas(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_quotas(filters = {}) - xml = read_xml 'quotas.xml' - Nokogiri::XML(xml).xpath('/quotas/quota').map do |q| - ovirt_attrs OVIRT::Quotas::new(self, q) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_template_interfaces.rb b/lib/fog/ovirt/requests/compute/list_template_interfaces.rb deleted file mode 100644 index 1ee237996..000000000 --- a/lib/fog/ovirt/requests/compute/list_template_interfaces.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_template_interfaces(vm_id) - client.template_interfaces(vm_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_template_interfaces(vm_id) - xml = read_xml 'nics.xml' - Nokogiri::XML(xml).xpath('/nics/nic').map do |nic| - ovirt_attrs OVIRT::Interface::new(self, nic) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_template_volumes.rb b/lib/fog/ovirt/requests/compute/list_template_volumes.rb deleted file mode 100644 index a75b7146c..000000000 --- a/lib/fog/ovirt/requests/compute/list_template_volumes.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_template_volumes(template_id) - client.template_volumes(template_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_template_volumes(template_id) - xml = read_xml 'volumes.xml' - Nokogiri::XML(xml).xpath('/disks/disk').map do |vol| - ovirt_attrs OVIRT::Volume::new(self, vol) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_templates.rb b/lib/fog/ovirt/requests/compute/list_templates.rb deleted file mode 100644 index 8b1e7374a..000000000 --- a/lib/fog/ovirt/requests/compute/list_templates.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_templates(filters = {}) - client.templates(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_templates(filters = {}) - xml = read_xml 'templates.xml' - Nokogiri::XML(xml).xpath('/templates/template').map do |t| - ovirt_attrs OVIRT::Template::new(self, t) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_virtual_machines.rb b/lib/fog/ovirt/requests/compute/list_virtual_machines.rb deleted file mode 100644 index b6760659f..000000000 --- a/lib/fog/ovirt/requests/compute/list_virtual_machines.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_virtual_machines(filters = {}) - client.vms(filters).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_virtual_machines(filters = {}) - xml = read_xml 'vms.xml' - Nokogiri::XML(xml).xpath('/vms/vm').map do |vm| - ovirt_attrs OVIRT::VM::new(self, vm) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb b/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb deleted file mode 100644 index 521cc2292..000000000 --- a/lib/fog/ovirt/requests/compute/list_vm_interfaces.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_vm_interfaces(vm_id) - client.vm_interfaces(vm_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_vm_interfaces(vm_id) - xml = read_xml 'nics.xml' - Nokogiri::XML(xml).xpath('/nics/nic').map do |nic| - ovirt_attrs OVIRT::Interface::new(self, nic) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_vm_volumes.rb b/lib/fog/ovirt/requests/compute/list_vm_volumes.rb deleted file mode 100644 index ead11f792..000000000 --- a/lib/fog/ovirt/requests/compute/list_vm_volumes.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_vm_volumes(vm_id) - client.vm_volumes(vm_id).map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_vm_volumes(vm_id) - xml = read_xml 'volumes.xml' - Nokogiri::XML(xml).xpath('/disks/disk').map do |vol| - ovirt_attrs OVIRT::Volume::new(self, vol) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/list_volumes.rb b/lib/fog/ovirt/requests/compute/list_volumes.rb deleted file mode 100644 index 998ca0d19..000000000 --- a/lib/fog/ovirt/requests/compute/list_volumes.rb +++ /dev/null @@ -1,19 +0,0 @@ -module Fog - module Compute - class Ovirt - class Real - def list_volumes - client.disks.map {|ovirt_obj| ovirt_attrs ovirt_obj} - end - end - class Mock - def list_volumes - xml = read_xml 'disks.xml' - Nokogiri::XML(xml).xpath('/disks/disk').map do |vol| - ovirt_attrs OVIRT::Volume::new(self, vol) - end - end - end - end - end -end diff --git a/lib/fog/ovirt/requests/compute/mock_files/affinitygroup.xml b/lib/fog/ovirt/requests/compute/mock_files/affinitygroup.xml deleted file mode 100644 index 852c2ce52..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/affinitygroup.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - test1_ag - - - true - false - diff --git a/lib/fog/ovirt/requests/compute/mock_files/affinitygroup_vms.xml b/lib/fog/ovirt/requests/compute/mock_files/affinitygroup_vms.xml deleted file mode 100644 index 3a0ea5f5a..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/affinitygroup_vms.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - test-vm1 - - - fosdem - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/affinitygroups.xml b/lib/fog/ovirt/requests/compute/mock_files/affinitygroups.xml deleted file mode 100644 index 7f810a77b..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/affinitygroups.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - test2_ag - - - true - true - - - test1_ag - - - true - false - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/cluster.xml b/lib/fog/ovirt/requests/compute/mock_files/cluster.xml deleted file mode 100644 index 395766b69..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/cluster.xml +++ /dev/null @@ -1,20 +0,0 @@ - - -cluster1 - - - - - - - -true - - - - - -migrate_highly_available - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/clusters.xml b/lib/fog/ovirt/requests/compute/mock_files/clusters.xml deleted file mode 100644 index 3421392dc..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/clusters.xml +++ /dev/null @@ -1,39 +0,0 @@ - - -Cluster1 -The default server cluster - - - - - - - -true - - - - - -migrate - - - -Cluster2 - - - - - - - -true - - - - - -migrate_highly_available - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/data_centers.xml b/lib/fog/ovirt/requests/compute/mock_files/data_centers.xml deleted file mode 100644 index 4df00c47a..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/data_centers.xml +++ /dev/null @@ -1,17 +0,0 @@ - - -Datacenter1 -The first Data Center - - -nfs -v1 - - - - - -up - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/disks.xml b/lib/fog/ovirt/requests/compute/mock_files/disks.xml deleted file mode 100644 index e30cfea59..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/disks.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - Disk 2 - - - Disk 2 - d6034a90-39fa-46ee-888f-208a76f3baa4 - - - - 4294967296 - 4294967296 - 1073741824 - - ok - - virtio - cow - true - false - false - false - false - - - - - - - - Disk 3 - - - Disk 3 - 3d7edbe9-54e1-484c-a77c-3d170f1906bb - - - - 21474836480 - 21474836480 - 1073741824 - - ok - - virtio - cow - true - false - false - false - false - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/instance_type.xml b/lib/fog/ovirt/requests/compute/mock_files/instance_type.xml deleted file mode 100644 index 8866608fb..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/instance_type.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - Large - Large instance type - - - - 8589934592 - - - - - - - 2014-05-05T02:30:00.000+05:30 - - false - 0 - - - spice - 1 - false - false - - - false - - -1 - - inherit - inherit - - - 0 - - - 8589934592 - false - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/instance_types.xml b/lib/fog/ovirt/requests/compute/mock_files/instance_types.xml deleted file mode 100644 index a5034207a..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/instance_types.xml +++ /dev/null @@ -1,197 +0,0 @@ - - -Large -Large instance type - - - -8589934592 - - - - - - -2014-05-05T02:30:00.000+05:30 - -false -0 - - -spice -1 -false -false - - -false - --1 - -inherit -inherit - - -0 - - -8589934592 - - - -Medium -Medium instance type - - - -4294967296 - - - - - - -2014-05-05T02:30:00.000+05:30 - -false -0 - - -spice -1 -false -false - - -false - --1 - -inherit -inherit - - -0 - - -4294967296 - - - -Small -Small instance type - - - -2147483648 - - - - - - -2014-05-05T02:30:00.000+05:30 - -false -0 - - -spice -1 -false -false - - -false - --1 - -inherit -inherit - - -0 - - -2147483648 - - - -Tiny -Tiny instance type - - - -536870912 - - - - - - -2014-05-05T02:30:00.000+05:30 - -false -0 - - -spice -1 -false -false - - -false - --1 - -inherit -inherit - - -0 - - -536870912 - - - -XLarge -Extra Large instance type - - - -17179869184 - - - - - - -2014-05-05T02:30:00.000+05:30 - -false -0 - - -spice -1 -false -false - - -false - --1 - -inherit -inherit - - -0 - - -17179869184 - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/nics.xml b/lib/fog/ovirt/requests/compute/mock_files/nics.xml deleted file mode 100644 index 501fd28cc..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/nics.xml +++ /dev/null @@ -1,10 +0,0 @@ - - -nic1 - - - -virtio - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/quotas.xml b/lib/fog/ovirt/requests/compute/mock_files/quotas.xml deleted file mode 100644 index 0de4753e5..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/quotas.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - DefaultQuota-Datacenter1 - Automatic generated Quota for Data Center Datacenter1 - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/storage_domains.xml b/lib/fog/ovirt/requests/compute/mock_files/storage_domains.xml deleted file mode 100644 index fd0d5d88e..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/storage_domains.xml +++ /dev/null @@ -1,36 +0,0 @@ - - -covirt - - -iso - -unattached - -false - -nfs -
ovirt.server.com
-/mnt/nfs - -0 -0 -0 -v1 - - -nfs - -data -true - -nfs -
storage.server.com
-/volumes/path/for/ovirt - -40802189312 -66571993088 -75161927680 -v1 - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/template.xml b/lib/fog/ovirt/requests/compute/mock_files/template.xml deleted file mode 100644 index 77620332a..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/template.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/templates.xml b/lib/fog/ovirt/requests/compute/mock_files/templates.xml deleted file mode 100644 index 65c27b7ce..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/templates.xml +++ /dev/null @@ -1,110 +0,0 @@ - - - - - diff --git a/lib/fog/ovirt/requests/compute/mock_files/vm.xml b/lib/fog/ovirt/requests/compute/mock_files/vm.xml deleted file mode 100644 index 3c8c346e1..000000000 --- a/lib/fog/ovirt/requests/compute/mock_files/vm.xml +++ /dev/null @@ -1,52 +0,0 @@ - -vm01 - - - - - - - -server - -down - -805306368 - - - - - - - - - - - -false -1 - - -spice -
host
-5900 -5901 -1 - - - -