fog 1.10.0 → 1.10.1

data/lib/fog/vcloud/compute.rb

@@ -301,7 +301,7 @@ module Fog
 
         # Use this to set the Authorization header for login
         def authorization_header
-          "Basic #{Base64.encode64("#{@username}:#{@password}").chomp!}"
+          "Basic #{Base64.encode64("#{@username}:#{@password}").delete("\r\n")}"
         end
 
         # Actually do the request

data/lib/fog/vcloud/models/compute/catalog_item.rb

@@ -23,6 +23,14 @@ module Fog
           end
         end
 
+        def password_enabled?
+          load_unless_loaded!
+          customization_options = service.get_vapp_template(self.entity[:href]).body[:Children][:Vm][:GuestCustomizationSection]
+          return false if customization_options[:AdminPasswordEnabled] == "false"
+          return true if customization_options[:AdminPasswordEnabled] == "true" \
+            and customization_options[:AdminPasswordAuto] == "false" \
+            and ( options[:password].nil? or options[:password].empty? )
+        end
       end
     end
   end

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

@@ -261,6 +261,7 @@ module Fog
           @update_password = nil
           @update_cpu_value = nil
           @update_memory_value = nil
+          @update_network = nil
           @name_changed = false
           @description_changed = nil
         end

data/lib/fog/vcloud/requests/compute/configure_vm_network.rb

@@ -19,11 +19,10 @@ module Fog
               </NetworkConnection>
             </NetworkConnectionSection>
 EOF
-          print "Request: #{body}"
           request(
             :body     => body,
             :expects  => 202,
-            :headers  => {'Content-Type' => network_info[:"vcloud_type"] },
+            :headers  => {'Content-Type' => network_info[:"type"] },
             :method   => 'PUT',
             :uri      => "#{edit_uri}",
             :parse    => true

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.10.0'
+  VERSION = '1.10.1'
 end

data/lib/fog/vsphere/compute.rb

@@ -152,7 +152,7 @@ module Fog
 
         # returns vmware managed obj id string
         def managed_obj_id obj
-          obj.to_s.match(/\("(\S+)"\)/)[1]
+          obj.to_s.match(/\("([^"]+)"\)/)[1]
         end
 
       end

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

@@ -17,13 +17,15 @@ module Fog
         # 'folder' => '/Datacenters/vm/Jeff/Templates' will be MUCH faster.
         # than simply listing everything.
         def all(filters = { })
-          load service.list_virtual_machines(filters.merge(
-                                                  :datacenter    => datacenter,
-                                                  :cluster       => cluster,
-                                                  :network       => network,
-                                                  :resource_pool => resource_pool,
-                                                  :folder        => folder
-                                                ))
+          f = {
+            :datacenter    => datacenter,
+            :cluster       => cluster,
+            :network       => network,
+            :resource_pool => resource_pool,
+            :folder        => folder
+          }.merge(filters)
+
+          load service.list_virtual_machines(f)
         end
 
         def get(id, datacenter = nil)
@@ -31,9 +33,7 @@ module Fog
         rescue Fog::Compute::Vsphere::NotFound
           nil
         end
-
       end
-
     end
   end
 end

data/lib/fog/xenserver.rb

@@ -1,3 +1,5 @@
+require 'fog/core'
+
 module Fog
   module XenServer 
 

data/lib/fog/xenserver/CHANGELOG.md

@@ -1,4 +1,10 @@
-# 1.9.0 XX/XX/XXXX (XenServer ChangeLog)
+# 1.11.0 2013/04/04
+
+* It's now possible to manage XS/XCP VLANs and Networks
+
+  See https://github.com/fog/fog/blob/master/lib/fog/xenserver/examples/networks-and-vlans.rb
+
+# 1.9.0 2013/01/19 
 
 * Added missing HostCpu model
 

data/lib/fog/xenserver/compute.rb

@@ -38,6 +38,8 @@ module Fog
       model  :vbd_metrics
       model  :host_metrics
       model  :host_cpu
+      model  :vlan
+      collection :vlans
 
       request_path 'fog/xenserver/requests/compute'
       request :create_server
@@ -68,6 +70,10 @@ module Fog
       request :disable_host
       request :enable_host
       request :shutdown_host
+      request :create_network
+      request :destroy_network
+      request :create_vlan
+      request :destroy_vlan
     
       class Real
         

data/lib/fog/xenserver/examples/networks-and-vlans.rb

@@ -0,0 +1,45 @@
+require 'fog'                                                               
+
+#
+# Create the connection to the XenServer host
+#
+xenserver = Fog::Compute.new({
+  :provider           => 'XenServer',
+  :xenserver_url      => '1.2.3.4',
+  :xenserver_username => 'root',
+  :xenserver_password => 'secret',
+})
+
+# We have a bonded interface in XenServer, bond0 and
+# we want to add the VLANs there.
+# Note the VLAN ID -1, it is important since you
+# will problably have many PIFs with device == bond0
+# but we need the one without a proper VLAN ID
+#
+bondmaster_pif = xenserver.pifs.find do |pif| 
+  pif.vlan == "-1" and pif.device == "bond0"
+end
+
+# Another valid way of finding a PIF, without bonding
+# pif = xenserver.pifs.find { |pif| pif.physical and pif.device == 'eth0' }
+
+# We want to create these new VLANs
+vlans = [
+  { "name" => "VLAN 44", "vlanid" => 44},
+  { "name" => "VLAN 55", "vlanid" => 55}
+]
+
+
+vlans.each do |vlan|
+  # Do not create duplicated networks
+  if xenserver.networks.find { |n| n.name == vlan['name'] }
+    puts "Network #{vlan['name']} available, skipping"
+    next
+  end
+
+  puts "Craeting Network #{vlan['name']}, VLAN ID #{vlan['vlanid']}"
+  network = xenserver.networks.create :name => vlan['name']
+  xenserver.vlans.create :tag => vlan['vlanid'],
+                         :network => network,
+                         :pif => bondmaster_pif
+end

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

@@ -51,6 +51,39 @@ module Fog
           v
         end
 
+        # Creates a new network
+        #
+        #     service = Fog::Compute[:xenserver]
+        #
+        #     # create network 'foonet'
+        #     net = service.networks.create :name => 'foonet',
+        #                                   :description => 'test network'
+        #
+        # @returns [Boolean]
+        #
+        def save
+          requires :name
+          ref = service.create_network name, attributes
+          data = service.get_record ref, 'network'
+          merge_attributes data
+          true
+        end
+
+        # Destroys a network
+        #
+        #     service = Fog::Compute[:xenserver]
+        #
+        #     # find network 'foonet' and destroy it
+        #     net = service.networks.find { |net| net.name == 'foonet' }
+        #     net.destroy
+        #
+        # @returns [Boolean]
+        #
+        def destroy
+          requires :reference
+          service.destroy_network reference
+          true
+        end
       end
 
     end

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_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