fog-maestrodev 1.8.0.20130114204828 → 1.14.0.20130806165225

data/lib/fog/xenserver/models/compute/pbd.rb

@@ -28,7 +28,7 @@ module Fog
         end
         
         def unplug
-          connection.unplug_pbd reference
+          service.unplug_pbd reference
         end
 
       end

data/lib/fog/xenserver/models/compute/pool.rb

@@ -27,7 +27,7 @@ module Fog
         end
 
         def default_sr=(sr)
-          connection.set_attribute( 'pool', reference, 'default_SR', sr.reference )
+          service.set_attribute( 'pool', reference, 'default_SR', sr.reference )
         end
         alias :default_storage_repository= :default_sr=
 
@@ -36,11 +36,11 @@ module Fog
         end
 
         def suspend_image_sr=(sr)
-          connection.set_attribute( 'pool', reference, 'suspend_image_SR', sr.reference )
+          service.set_attribute( 'pool', reference, 'suspend_image_SR', sr.reference )
         end
 
         def suspend_image_sr
-          connection.storage_repositories.get __suspend_image_sr
+          service.storage_repositories.get __suspend_image_sr
         end
 
         def master
@@ -48,7 +48,7 @@ module Fog
         end
         
         def set_attribute(name, *val)
-          data = connection.set_attribute( 'pool', reference, name, *val )
+          data = service.set_attribute( 'pool', reference, name, *val )
           # Do not reload automatically for performance reasons
           # We can set multiple attributes at the same time and
           # then reload manually

data/lib/fog/xenserver/models/compute/server.rb

@@ -14,7 +14,7 @@ module Fog
         attribute :name,                 :aliases => :name_label
         attribute :__affinity,           :aliases => :affinity
         attribute :allowed_operations
-        attribute :consoles
+        attribute :__consoles
         attribute :domarch
         attribute :domid
         attribute :tags
@@ -50,6 +50,7 @@ module Fog
         attribute :hvm_boot_policy,      :aliases => :HVM_boot_policy
         attribute :hvm_boot_params,      :aliases => :HVM_boot_params
         attribute :pci_bus,              :aliases => :PCI_bus
+        attribute :snapshots
 
         def initialize(attributes={})
           super
@@ -63,6 +64,10 @@ module Fog
           service.hosts.get __affinity
         end
 
+        def consoles
+          __consoles.collect {|console| service.consoles.get console }
+        end
+
         def destroy
           # Make sure it's halted
           stop('hard')
@@ -198,12 +203,13 @@ module Fog
           service.provision_server reference
         end
 
-        # def snapshot
-        #   requires :reference, :name_label
-        #   data = service.snapshot_server(@reference, @name_label)
-        #   merge_attributes(data.body)
-        #   true
-        # end
+        def snapshot(name)
+          service.snapshot_server(reference, name)
+        end
+
+        def revert(snapshot_ref)
+          service.snapshot_revert(snapshot_ref)
+        end
       end
 
     end

data/lib/fog/xenserver/models/compute/servers.rb

@@ -48,6 +48,11 @@ module Fog
           get ref
         end
 
+        def get_by_uuid( uuid )
+          ref = service.get_vm_by_uuid( uuid )
+          get ref
+        end
+
         def get( vm_ref )
           if vm_ref && vm = service.get_record( vm_ref, 'VM' )
             new(vm)

data/lib/fog/xenserver/models/compute/storage_repository.rb

@@ -41,7 +41,7 @@ module Fog
         end
 
         def destroy
-          connection.destroy_sr reference
+          service.destroy_sr reference
         end
         
         def save
@@ -59,8 +59,8 @@ module Fog
 
           # create_sr request provides sane defaults if some attributes are
           # missing
-          attr = connection.get_record(
-            connection.create_sr( host.reference, 
+          attr = service.get_record(
+            service.create_sr( host.reference, 
                                   name,
                                   type,
                                   description || '',
@@ -76,7 +76,7 @@ module Fog
         end
         
         def set_attribute(name, *val)
-          data = connection.set_attribute( 'SR', reference, name, *val )
+          data = service.set_attribute( 'SR', reference, name, *val )
           # Do not reload automatically for performance reasons
           # We can set multiple attributes at the same time and
           # then reload manually

data/lib/fog/xenserver/models/compute/vlan.rb

@@ -0,0 +1,80 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class XenServer
+
+      class VLAN < Fog::Model
+        # API Reference here:
+        # @see http://docs.vmd.citrix.com/XenServer/5.6.0/1.0/en_gb/api/?c=VLAN
+
+        identity :reference
+
+        attribute :uuid
+        attribute :tag,                :type => :integer
+        attribute :__untagged_pif,     :aliases => :untagged_PIF
+        attribute :__tagged_pif,       :aliases => :tagged_PIF
+
+        # @return [Fog::Compute::XenServer::PIF] interface on which traffic is tagged
+        #
+        # @see http://docs.vmd.citrix.com/XenServer/6.1.0/1.0/en_gb/api/?c=VLAN
+        #
+        def untagged_pif
+          service.pifs.get __untagged_pif
+        end
+        
+        # @return [Fog::Compute::XenServer::PIF] interface on which traffic is untagged
+        #
+        # @see http://docs.vmd.citrix.com/XenServer/6.1.0/1.0/en_gb/api/?c=VLAN
+        #
+        def tagged_pif
+          service.pifs.get __tagged_pif
+        end
+        
+        # Creates a new VLAN.
+        #
+        #     service = Fog::Compute[:xenserver]
+        #
+        #     # create a network 'foo-net'
+        #     net = service.networks.create :name => 'foo-net'
+        #
+        #     # get the eth0 physical interface where the
+        #     # VLAN subinterface will be added
+        #     pif = service.pifs.find { |p| p.device == 'eth0' and p.physical }
+        #
+        #     Fog::Compute[:xenserver].vlans.create :tag => 123,
+        #                                           :network => net,
+        #                                           :pif => pif
+        def save
+          requires :tag
+          pif = attributes[:pif]
+          net = attributes[:network]
+          unless pif and net
+            raise Fog::Error.new 'save requires :pif and :network attributes'
+          end
+          ref = service.create_vlan attributes[:pif].reference, 
+                                    tag,
+                                    attributes[:network].reference
+          data = service.get_record ref, 'VLAN'
+          merge_attributes data
+          true
+        end
+
+        # Destroys a VLAN.
+        #
+        #     service = Fog::Compute[:xenserver]
+        #
+        #     # Find VLAN 123 and destroy it
+        #     (service.vlans.find { |v| v.tag == 123 }).destroy
+        #
+        def destroy
+          requires :reference
+          service.destroy_vlan reference
+          true
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/models/compute/vlans.rb

@@ -0,0 +1,39 @@
+require 'fog/core/collection'
+require 'fog/xenserver/models/compute/vlan'
+
+module Fog
+  module Compute
+    class XenServer
+
+      class Vlans < Fog::Collection
+
+        model Fog::Compute::XenServer::VLAN
+
+        # Return the list of VLANs available
+        #
+        # @return [Array] a list of Fog::Compute::XenServer::VLAN
+        #
+        def all(options = {})
+          data = service.get_records 'VLAN'
+          load(data)
+        end
+
+        # Retrieve a VLAN object by by reference.
+        #
+        # @return [Fog::Compute::XenServer::VLAN]
+        #
+        # Returns nil if not found
+        #
+        def get( ref )
+          if ref && obj = service.get_record( ref, 'VLAN' )
+            new(obj)
+          end
+        rescue Fog::XenServer::NotFound
+          nil
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/create_network.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        # Create a Network
+        #
+        # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=network
+        #
+        def create_network( name, config = {} )
+          config.reject! { |k,v| v.nil? }
+
+          default_config = { 
+            :name_label => name, 
+            # Description is mandatory in XenAPI but we default to empty
+            :name_description => config[:description] || '',
+            # Mandatory, but can be empty
+            :other_config => {}
+          }.merge config
+
+          @connection.request(
+            {
+              :parser => Fog::Parsers::XenServer::Base.new, 
+              :method => 'network.create'
+            }, 
+            default_config 
+          )
+        end
+      end
+
+      class Mock
+        
+        def create_network( name, description = '', config = {} )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/create_server.rb

@@ -7,6 +7,10 @@ module Fog
           @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.get_by_name_label' }, label)
         end
         
+        def get_vm_by_uuid(uuid)
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.get_by_uuid' }, uuid)
+        end
+
         def create_server_raw(config = {})
           config[:name_label] = config[:name] if config[:name]
           config.delete :name

data/lib/fog/xenserver/requests/compute/create_vlan.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+        
+        # 
+        # Create a VLAN 
+        #
+        # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=VLAN
+        #
+        def create_vlan( pif_ref, vlan_id, network_ref )
+          @connection.request(
+            {
+              :parser => Fog::Parsers::XenServer::Base.new, 
+              :method => 'VLAN.create'
+            }, 
+            pif_ref,
+            vlan_id.to_s,
+            network_ref
+          )
+        end
+      end
+
+      class Mock
+        
+        def create_vlan( pif_ref, vlan_id, network_ref )
+          Fog::Mock.not_implemented
+        end
+        
+      end
+
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/destroy_network.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        # 
+        # Destroy a Network
+        #
+        # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=network
+        #
+        def destroy_network( ref )
+          @connection.request(
+            {
+              :parser => Fog::Parsers::XenServer::Base.new, 
+              :method => 'network.destroy'
+            }, 
+            ref
+          )
+        end
+
+      end
+
+      class Mock
+
+        def destroy_network( ref )
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/destroy_vlan.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        # Destroy a VLAN 
+        #
+        # @see http://docs.vmd.citrix.com/XenServer/6.0.0/1.0/en_gb/api/?c=VLAN
+        #
+        def destroy_vlan( ref )
+          @connection.request(
+            {
+              :parser => Fog::Parsers::XenServer::Base.new, 
+              :method => 'VLAN.destroy'
+            }, 
+            ref
+          )
+        end
+
+      end
+
+      class Mock
+
+        def destroy_vlan( ref )
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/snapshot_revert.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def snapshot_revert( snapshot_ref, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.revert'}, snapshot_ref)
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_revert()
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/xenserver/requests/compute/snapshot_server.rb

@@ -0,0 +1,22 @@
+module Fog
+  module Compute
+    class XenServer
+
+      class Real
+
+        def snapshot_server( vm_ref , name, extra_args = {})
+          @connection.request({:parser => Fog::Parsers::XenServer::Base.new, :method => 'VM.snapshot'}, vm_ref, name)
+        end
+
+      end
+
+      class Mock
+
+        def snapshot_server()
+          Fog::Mock.not_implemented
+        end
+
+      end
+    end
+  end
+end