fog-xenserver 0.0.1.alpha2 → 0.0.1.beta1

data/lib/fog/{xenserver/parsers → parsers/xen_server}/get_storage_repositories.rb

@@ -2,7 +2,6 @@ module Fog
   module Parsers
     module XenServer
       class GetStorageRepositories < Fog::Parsers::XenServer::Base
-
         def reset
           @response = []
         end
@@ -11,9 +10,7 @@ module Fog
           parser = Fog::Parsers::XenServer::Base.new
           data.each_pair {|reference, sr_hash| @response << parser.parse( sr_hash ).merge(:reference => reference) }
         end
-
       end
-
     end
   end
-end
+end

data/lib/fog/{xenserver/parsers → parsers/xen_server}/get_vbds.rb

@@ -1,8 +1,7 @@
 module Fog
   module Parsers
     module XenServer
-      class GetVBDs < Fog::Parsers::XenServer::Base
-
+      class GetVbds < Fog::Parsers::XenServer::Base
         def reset
           @response = []
         end
@@ -11,9 +10,7 @@ module Fog
           parser = Fog::Parsers::XenServer::Base.new
           data.each_pair {|reference, hash| @response << parser.parse( hash ).merge(:reference => reference) }
         end
-
       end
-
     end
   end
-end
+end

data/lib/fog/{xenserver/parsers → parsers/xen_server}/get_vifs.rb

@@ -1,8 +1,7 @@
 module Fog
   module Parsers
     module XenServer
-      class GetVIFs < Fog::Parsers::XenServer::Base
-
+      class GetVifs < Fog::Parsers::XenServer::Base
         def reset
           @response = []
         end
@@ -11,9 +10,7 @@ module Fog
           parser = Fog::Parsers::XenServer::Base.new
           data.each_pair {|reference, vif_hash| @response << parser.parse( vif_hash ).merge(:reference => reference) }
         end
-
       end
-
     end
   end
-end
+end

data/lib/fog/{xenserver/parsers → parsers/xen_server}/get_vms.rb

@@ -1,9 +1,7 @@
 module Fog
   module Parsers
     module XenServer
-
       class GetVms < Fog::Parsers::XenServer::Base
-
         def reset
           @response = []
         end
@@ -12,9 +10,7 @@ module Fog
           parser = Fog::Parsers::XenServer::Base.new
           data.each_pair {|reference, vm_hash| @response << parser.parse( vm_hash ).merge(:reference => reference) }
         end
-
       end
-
     end
   end
-end
+end

data/lib/fog/{xenserver/core.rb → xen_server/connection.rb}

@@ -1,19 +1,8 @@
-require 'fog/core'
-require 'fog/xml'
+require 'xmlrpc/client'
 
 module Fog
   module XenServer
-
-    class InvalidLogin < Fog::Errors::Error; end
-    class NotFound < Fog::Errors::Error; end
-    class RequestFailed < Fog::Errors::Error; end
-
-    extend Fog::Provider
-
-    service(:compute, 'Compute')
-
     class Connection
-      require 'xmlrpc/client'
 
       def initialize(host, timeout)
         @factory = XMLRPC::Client.new(host, '/')
@@ -53,32 +42,5 @@ module Fog
         end
       end
     end
-
-    class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser
-
-      def initialize
-        require 'nokogiri/xml/sax/document'
-        require 'nokogiri/xml/sax/parser'
-
-        @parser_class = Class.new(Nokogiri::XML::SAX::Document) do
-
-          include XMLRPC::XMLParser::StreamParserMixin
-
-          alias_method :start_element, :startElement
-          alias_method :end_element,   :endElement
-          alias_method :characters,    :character
-          alias_method :cdata_block,   :character
-
-          def parse(str)
-            Nokogiri::XML::SAX::Parser.new(self).parse(str)
-          end
-
-        end
-      end
-
-    end
-
   end
-end
-
-
+end

data/lib/fog/xen_server/invalid_login.rb

@@ -0,0 +1,5 @@
+module Fog
+  module XenServer
+    class InvalidLogin < Fog::Errors::Error; end
+  end
+end

data/lib/fog/xen_server/nokogiri_stream_parser.rb

@@ -0,0 +1,20 @@
+require 'nokogiri/xml/sax/document'
+require 'nokogiri/xml/sax/parser'
+
+class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser
+  def initialize
+    @parser_class = Class.new(Nokogiri::XML::SAX::Document) do
+
+      include XMLRPC::XMLParser::StreamParserMixin
+
+      alias_method :start_element, :startElement
+      alias_method :end_element,   :endElement
+      alias_method :characters,    :character
+      alias_method :cdata_block,   :character
+
+      def parse(str)
+        Nokogiri::XML::SAX::Parser.new(self).parse(str)
+      end
+    end
+  end
+end

data/lib/fog/xen_server/not_found.rb

@@ -0,0 +1,5 @@
+module Fog
+  module XenServer
+    class NotFound < Fog::Errors::Error; end
+  end
+end

data/lib/fog/xen_server/request_failed.rb

@@ -0,0 +1,5 @@
+module Fog
+  module XenServer
+    class RequestFailed < Fog::Errors::Error; end
+  end
+end

data/lib/fog/xen_server/version.rb

@@ -0,0 +1,5 @@
+module Fog
+  module XenServer
+    VERSION = "0.0.1.beta1"
+  end
+end

data/lib/fog/xenserver.rb

@@ -1 +1,27 @@
-require "#{File.join(File.dirname(__FILE__), 'compute')}"
+require 'fog/core'
+require 'fog/xml'
+require 'fog/utilities'
+require 'fog/model'
+require 'fog/collection'
+
+module Fog
+  module XenServer
+    autoload :Connection, 'fog/xen_server/connection'
+    autoload :InvalidLogin, 'fog/xen_server/invalid_login'
+    autoload :NokogiriStreamParser, 'fog/xen_server/nokogiri_stream_parser'
+    autoload :NotFound, 'fog/xen_server/not_found'
+    autoload :RequestFailed, 'fog/xen_server/request_failed'
+
+    extend Fog::Provider
+
+    service(:compute, 'Compute')
+  end
+
+  module Compute
+    autoload :XenServer, 'fog/compute/xen_server'
+  end
+
+  module Parsers
+    autoload :XenServer, 'fog/parsers/xen_server'
+  end
+end

data/lib/fog/xenserver/compute.rb

@@ -1,176 +0,0 @@
-require 'fog/xenserver/core'
-
-module Fog
-  module Compute
-    class XenServer < Fog::Service
-
-      require 'fog/xenserver/utilities'
-      require 'fog/xenserver/parser'
-
-      requires :xenserver_username
-      requires :xenserver_password
-      requires :xenserver_url
-      recognizes :xenserver_defaults
-      recognizes :xenserver_timeout
-
-      model_path 'fog/xenserver/models/compute'
-      model :blob
-      collection :blobs
-      model :bond
-      collection :bonds
-      model :crash_dump
-      collection :crash_dumps
-      model :dr_task
-      collection :dr_tasks
-      model :gpu_group
-      collection :gpu_groups
-      model :host_crash_dump
-      collection :host_crash_dumps
-      model :host_patch
-      collection :host_patchs
-      model :pci
-      collection :pcis
-      model :pgpu
-      collection :pgpus
-      model :pif_metrics
-      collection :pifs_metrics
-      model :pool_patch
-      collection :pool_patchs
-      model :role
-      collection :roles
-      model :server
-      collection :servers
-      model :server_appliance
-      collection :server_appliances
-      model :storage_manager
-      collection :storage_managers
-      model :tunnel
-      collection :tunnels
-      model :vmpp
-      collection :vmpps
-      model :vtpm
-      collection :vtpms
-      model :host
-      collection :hosts
-      collection :vifs
-      model :vif
-      collection :storage_repositories
-      model :storage_repository
-      collection :pools
-      model :pool
-      collection :vbds
-      model :vbd
-      collection :vdis
-      model :vdi
-      collection :networks
-      model :network
-      collection :pifs
-      model  :pif
-      collection :pbds
-      model  :pbd
-      model  :guest_metrics
-      model  :vbd_metrics
-      model  :host_metrics
-      model  :host_cpu
-      model  :vlan
-      collection :vlans
-      model  :console
-      collection :consoles
-
-      request_path 'fog/xenserver/requests/compute'
-      request :create_server
-      request :create_vif
-      request :create_vdi
-      request :create_vbd
-      request :destroy_vif
-      request :clone_server
-      request :destroy_server
-      request :unplug_vbd
-      request :eject_vbd
-      request :insert_vbd
-      request :destroy_vdi
-      request :shutdown_server
-      request :start_vm
-      request :start_server
-      request :get_record
-      request :get_records
-      request :set_affinity
-      request :set_attribute
-      request :reboot_server
-      request :provision_server
-      request :scan_sr
-      request :unplug_pbd
-      request :destroy_sr
-      request :create_sr
-      request :reboot_host
-      request :disable_host
-      request :enable_host
-      request :shutdown_host
-      request :create_network
-      request :destroy_network
-      request :create_vlan
-      request :destroy_vlan
-      request :snapshot_server
-      request :snapshot_revert
-
-      class Real
-
-        def initialize(options={})
-          @host        = options[:xenserver_url]
-          @username    = options[:xenserver_username]
-          @password    = options[:xenserver_password]
-          @defaults    = options[:xenserver_defaults] || {}
-          @timeout     = options[:xenserver_timeout] || 30
-          @connection  = Fog::XenServer::Connection.new(@host, @timeout)
-          @connection.authenticate(@username, @password)
-        end
-
-        def reload
-          @connection.authenticate(@username, @password)
-        end
-
-        def default_template=(name)
-          @defaults[:template] = name
-        end
-
-        def default_template
-          return nil if @defaults[:template].nil?
-          (servers.custom_templates + servers.builtin_templates).find do |s|
-            (s.name == @defaults[:template]) or (s.uuid == @defaults[:template])
-          end
-        end
-
-        def default_network
-          networks.find { |n| n.name == (@defaults[:network] || "Pool-wide network associated with eth0") }
-        end
-
-      end
-
-      class Mock
-
-        def self.data
-          @data ||= Hash.new do |hash, key|
-            hash[key] = {}
-          end
-        end
-
-        def self.reset_data(keys=data.keys)
-          for key in [*keys]
-            data.delete(key)
-          end
-        end
-
-        def initialize(options={})
-          @host        = options[:xenserver_pool_master]
-          @username    = options[:xenserver_username]
-          @password    = options[:xenserver_password]
-          @connection  = Fog::XML::Connection.new(@host)
-          @connection.authenticate(@username, @password)
-        end
-
-      end
-    end
-  end
-end
-
-

data/test/fog/compute/xen_server/models/blob_test.rb

@@ -0,0 +1,40 @@
+require 'minitest_helper'
+
+describe Fog::Compute::XenServer::Models::Blob do
+  let(:blob_class) do
+    class Fog::Compute::XenServer::Models::Blob
+      def self.read_identity
+        instance_variable_get('@identity')
+      end
+
+      def self.read_provider_class
+        instance_variable_get('@provider_class')
+      end
+    end
+    Fog::Compute::XenServer::Models::Blob
+  end
+
+  it 'should associate to a provider class' do
+    blob_class.read_provider_class.must_equal('blob')
+  end
+
+  it 'should have an unique id' do
+    blob_class.read_identity.must_equal(:reference)
+  end
+
+  it 'should have 8 attributes' do
+    blob_class.attributes.must_equal([ :reference,
+                                       :description,
+                                       :last_updated,
+                                       :mime_type,
+                                       :name,
+                                       :public,
+                                       :size,
+                                       :uuid ])
+  end
+
+  it 'should have 2 aliases' do
+    blob_class.aliases.must_equal({ :name_description => :description,
+                                    :name_label => :name })
+  end
+end

data/test/fog/compute/xen_server/models/bond_test.rb

@@ -0,0 +1,42 @@
+require 'minitest_helper'
+
+describe Fog::Compute::XenServer::Models::Bond do
+  let(:bond_class) do
+    class Fog::Compute::XenServer::Models::Bond
+      def self.read_identity
+        instance_variable_get('@identity')
+      end
+
+      def self.read_provider_class
+        instance_variable_get('@provider_class')
+      end
+    end
+    Fog::Compute::XenServer::Models::Bond
+  end
+
+  it 'should associate to a provider class' do
+    bond_class.read_provider_class.must_equal('Bond')
+  end
+
+  it 'should have an unique id' do
+    bond_class.read_identity.must_equal(:reference)
+  end
+
+  it 'should have 9 attributes' do
+    bond_class.attributes.must_equal([ :reference,
+                                       :links_up,
+                                       :mode,
+                                       :other_config,
+                                       :properties,
+                                       :uuid,
+                                       :__master,
+                                       :__primary_slave,
+                                       :__slaves ])
+  end
+
+  it 'should have 3 aliases' do
+    bond_class.aliases.must_equal({ :master => :__master,
+                                    :primary_slave => :__primary_slave,
+                                    :slaves => :__slaves })
+  end
+end