fog 1.7.0 → 1.8.0

data/lib/fog/vsphere/requests/compute/list_vm_interfaces.rb

@@ -0,0 +1,52 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+  # => VirtualE1000(
+  #addressType: "assigned",
+  #backing: VirtualEthernetCardNetworkBackingInfo(
+  #  deviceName: "VM Network",
+  #  dynamicProperty: [],
+  #  network: Network("network-163"),
+  #  useAutoDetect: false
+  #),
+  #connectable: VirtualDeviceConnectInfo(
+  #  allowGuestControl: true,
+  #  connected: true,
+  #  dynamicProperty: [],
+  #  startConnected: true,
+  #  status: "ok"
+  #),
+  #controllerKey: 100,
+  #deviceInfo: Description(
+  #  dynamicProperty: [],
+  #  label: "Network adapter 1",
+  #  summary: "VM Network"
+  #),
+  #dynamicProperty: [],
+  #key: 4000,
+  #macAddress: "00:50:56:a9:00:28",
+  #unitNumber: 7,
+  #
+        def list_vm_interfaces(vm_id)
+          get_vm_ref(vm_id).config.hardware.device.grep(RbVmomi::VIM::VirtualEthernetCard).map do |nic|
+            {
+              :name    => nic.deviceInfo.label,
+              :mac     => nic.macAddress,
+              :network => nic.backing.network.name,
+              :status  => nic.connectable.status,
+              :summary => nic.deviceInfo.summary,
+              :type    => nic.class,
+            }
+          end
+
+        end
+
+      end
+      class Mock
+        def list_vm_interfaces(vm_id)
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/list_vm_volumes.rb

@@ -0,0 +1,51 @@
+module Fog
+  module Compute
+    class Vsphere
+      class Real
+ # [VirtualDisk(
+ #  backing: VirtualDiskFlatVer2BackingInfo(
+ #    contentId: "a172d19487e878e17d6b16ff2505d7eb",
+ #    datastore: Datastore("datastore-162"),
+ #    diskMode: "persistent",
+ #    dynamicProperty: [],
+ #    fileName: "[Storage1] rhel6-mfojtik/rhel6-mfojtik.vmdk",
+ #    split: false,
+ #    thinProvisioned: true,
+ #    uuid: "6000C29c-a47d-4cd9-5249-c371de775f06",
+ #    writeThrough: false
+ #  ),
+ #  capacityInKB: 8388608,
+ #  controllerKey: 1000,
+ #  deviceInfo: Description(
+ #    dynamicProperty: [],
+ #    label: "Hard disk 1",
+ #    summary: "8,388,608 KB"
+ #  ),
+ #  dynamicProperty: [],
+ #  key: 2001,
+ #  shares: SharesInfo( dynamicProperty: [], level: "normal", shares: 1000 ),
+ #  unitNumber: 1
+ #)]
+
+        def list_vm_volumes(vm_id)
+          get_vm_ref(vm_id).disks.map do |vol|
+            {
+              :id => vol.backing.uuid,
+              :thin => vol.backing.thinProvisioned,
+              :mode => vol.backing.diskMode,
+              :filename => vol.backing.fileName,
+              :datastore => (vol.backing.datastore.name rescue(nil)),
+              :size => vol.capacityInKB,
+              :name => vol.deviceInfo.label
+            }
+          end
+        end
+
+      end
+      class Mock
+        def list_vm_volumes(vm_id)
+        end
+      end
+    end
+  end
+end

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -21,8 +21,8 @@ module Fog
             raise ArgumentError, "vm_clone path option must start with /Datacenters.  Got: #{options['path']}"
           end
           dc_name = path_elements.shift
-          if not self.datacenters.include? dc_name then
-            raise ArgumentError, "Datacenter #{dc_name} does not exist, only datacenters #{self.datacenters.join(",")} are accessible."
+          if not datacenters.get dc_name then
+            raise ArgumentError, "Datacenter #{dc_name} does not exist, only datacenters #{datacenters.all.map(:name).join(",")} are accessible."
           end
           options
         end
@@ -75,10 +75,8 @@ module Fog
           # The template name.  The remaining elements are the folders in the
           # datacenter.
           template_name = path_elements.pop
-          # Make sure @datacenters is populated.  We need the instances from the Hash keys.
-          self.datacenters
-          # Get the datacenter managed object from the hash
-          dc = @datacenters[template_dc]
+
+          dc = find_raw_datacenter(template_dc)
           # Get the VM Folder (Group) efficiently
           vm_folder = dc.vmFolder
           # Walk the tree resetting the folder pointer as we go
@@ -195,8 +193,8 @@ module Fog
           # Option handling
           options = vm_clone_check_options(options)
           notfound = lambda { raise Fog::Compute::Vsphere::NotFound, "Could not find VM template" }
-          vm_mob_ref = list_virtual_machines['virtual_machines'].find(notfound) do |vm|
-            vm['name'] == options['path'].split("/")[-1]
+          list_virtual_machines.find(notfound) do |vm|
+            vm[:name] == options['path'].split("/")[-1]
           end
           {
             'vm_ref'   => 'vm-123',

data/lib/fog/vsphere/requests/compute/vm_destroy.rb

@@ -6,14 +6,7 @@ module Fog
         def vm_destroy(options = {})
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
 
-          # Find the VM Object
-          search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
-
-          unless vm_mob_ref.kind_of? RbVmomi::VIM::VirtualMachine
-            raise Fog::Vsphere::Errors::NotFound,
-              "Could not find VirtualMachine with instance uuid #{options['instance_uuid']}"
-          end
+          vm_mob_ref = get_vm_ref(options['instance_uuid'])
           task = vm_mob_ref.Destroy_Task
           task.wait_for_completion
           { 'task_state' => task.info.state }

data/lib/fog/vsphere/requests/compute/vm_reconfig_hardware.rb

@@ -5,8 +5,7 @@ module Fog
         def vm_reconfig_hardware(options = {})
           raise ArgumentError, "hardware_spec is a required parameter" unless options.has_key? 'hardware_spec'
           raise ArgumentError, "instance_uuid is a required parameter" unless options.has_key? 'instance_uuid'
-          search_filter = { :uuid => options['instance_uuid'], 'vmSearch' => true, 'instanceUuid' => true }
-          vm_mob_ref = @connection.searchIndex.FindAllByUuid(search_filter).first
+          vm_mob_ref = get_vm_by_ref(options['instance_uuid'])
           task = vm_mob_ref.ReconfigVM_Task(:spec => RbVmomi::VIM.VirtualMachineConfigSpec(options['hardware_spec']))
           task.wait_for_completion
            { 'task_state' => task.info.state }

data/lib/tasks/changelog_task.rb

@@ -0,0 +1,98 @@
+require "rake"
+require "rake/tasklib"
+
+module Fog
+  module Rake
+    class ChangelogTask < ::Rake::TaskLib
+
+      def initialize
+        desc "Update the changelog since the last release"
+        task(:changelog) do
+          timestamp = Time.now.utc.strftime('%m/%d/%Y')
+          sha = `git log | head -1`.split(' ').last
+          changelog = ["#{Fog::VERSION} #{timestamp} #{sha}"]
+          changelog << ('=' * changelog[0].length)
+          changelog << ''
+
+          require 'multi_json'
+          github_repo_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog').body)
+          data = github_repo_data.reject {|key, value| !['forks', 'open_issues', 'watchers'].include?(key)}
+          github_collaborator_data = Fog::JSON.decode(Excon.get('https://api.github.com/repos/fog/fog/collaborators').body)
+          data['collaborators'] = github_collaborator_data.length
+          rubygems_data = Fog::JSON.decode(Excon.get('https://rubygems.org/api/v1/gems/fog.json').body)
+          data['downloads'] = rubygems_data['downloads']
+          stats = []
+          for key in data.keys.sort
+            stats << "'#{key}' => #{data[key]}"
+          end
+          changelog << "Stats! { #{stats.join(', ')} }"
+          changelog << ''
+
+          last_sha = `cat changelog.txt | head -1`.split(' ').last
+          shortlog = `git shortlog #{last_sha}..HEAD`
+          changes = {}
+          committers = {}
+          for line in shortlog.split("\n")
+            if line =~ /^\S/
+              committer = line.split(' (', 2).first
+              committers[committer] = 0
+            elsif line =~ /^\s*((Merge.*)|(Release.*))?$/
+              # skip empty lines, Merge and Release commits
+            else
+              unless line[-1..-1] == '.'
+                line << '.'
+              end
+              line.lstrip!
+              line.gsub!(/^\[([^\]]*)\] /, '')
+              tag = $1 || 'misc'
+              changes[tag] ||= []
+              changes[tag] << (line << ' thanks ' << committer)
+              committers[committer] += 1
+            end
+          end
+
+          for committer, commits in committers.to_a.sort {|x,y| y[1] <=> x[1]}
+            if [
+              'Aaron Suggs',
+              'Brian Hartsock',
+              'Christopher Oliver',
+              'Decklin Foster',
+              'Dylan Egan',
+              'geemus',
+              'Henry Addison',
+              'Kevin Menard',
+              'Lincoln Stoll',
+              'Luqman Amjad',
+              'Michael Zeng',
+              'Nick Osborn',
+              'nightshade427',
+              'Patrick Debois',
+              'Stepan G. Fedorov',
+              'Wesley Beary'
+            ].include?(committer)
+            next
+            end
+            changelog << "MVP! #{committer}"
+            changelog << ''
+            break
+          end
+
+          for tag in changes.keys.sort
+            changelog << ('[' << tag << ']')
+            for commit in changes[tag]
+              changelog << ('  ' << commit)
+            end
+            changelog << ''
+          end
+
+          old_changelog = File.read('changelog.txt')
+          File.open('changelog.txt', 'w') do |file|
+            file.write(changelog.join("\n"))
+            file.write("\n\n")
+            file.write(old_changelog)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/tasks/documentation_task.rb

@@ -0,0 +1,155 @@
+require "rake"
+require "rake/tasklib"
+
+module Fog
+  module Rake
+    class DocumentationTask < ::Rake::TaskLib
+      def initialize
+        task :docs do
+          Rake::Task[:supported_services_docs].invoke
+          Rake::Task[:upload_fog_io].invoke
+          Rake::Task[:upload_yardoc].invoke
+
+          # connect to storage provider
+          Fog.credential = :geemus
+          storage = Fog::Storage.new(:provider => 'AWS')
+          directory = storage.directories.new(:key => 'fog.io')
+          # write base index with redirect to new version
+          directory.files.create(
+            :body         => redirecter('latest'),
+            :content_type => 'text/html',
+            :key          => 'index.html',
+            :public       => true
+          )
+
+          Formatador.display_line
+        end
+
+        task :supported_services_docs do
+          support, shared = {}, []
+          for key, values in Fog.services
+            unless values.length == 1
+              shared |= [key]
+              values.each do |value|
+                support[value] ||= {}
+                support[value][key] = '+'
+              end
+            else
+              value = values.first
+              support[value] ||= {}
+              support[value][:other] ||= []
+              support[value][:other] << key
+            end
+          end
+          shared.sort! {|x,y| x.to_s <=> y.to_s}
+          columns = [:provider] + shared + [:other]
+          data = []
+          for key in support.keys.sort {|x,y| x.to_s <=> y.to_s}
+            data << { :provider => key }.merge!(support[key])
+          end
+
+          table = ''
+          table << "<table border='1'>\n"
+
+          table << "  <tr>"
+          for column in columns
+            table << "<th>#{column}</th>"
+          end
+          table << "</tr>\n"
+
+          for datum in data
+            table << "  <tr>"
+            for column in columns
+              if value = datum[column]
+                case value
+                when Array
+                  table << "<td>#{value.join(', ')}</td>"
+                when '+'
+                  table << "<td style='text-align: center;'>#{value}</td>"
+                else
+                  table << "<th>#{value}</th>"
+                end
+              else
+                table << "<td></td>"
+              end
+            end
+            table << "</tr>\n"
+          end
+
+          table << "</table>\n"
+
+          File.open('docs/about/supported_services.markdown', 'w') do |file|
+            file.puts <<-METADATA
+---
+layout: default
+title:  Supported Services
+---
+
+            METADATA
+            file.puts(table)
+          end
+        end
+
+        desc "Builds the fog.io site content locally"
+        task :build_fog_io do
+          sh "jekyll docs docs/_site"
+        end
+
+        task :upload_fog_io => :build_fog_io do
+          # connect to storage provider
+          Fog.credential = :geemus
+          storage = Fog::Storage.new(:provider => 'AWS')
+          directory = storage.directories.new(:key => 'fog.io')
+
+          # write web page files to versioned 'folder'
+          for file_path in Dir.glob('docs/_site/**/*')
+            next if File.directory?(file_path)
+            file_name = file_path.gsub('docs/_site/', '')
+            key = '' << version << '/' << file_name
+            Formatador.redisplay(' ' * 128)
+            Formatador.redisplay("Uploading [bold]#{key}[/]")
+            if File.extname(file_name) == '.html'
+              # rewrite links with version
+              body = File.read(file_path)
+              body.gsub!(/vX.Y.Z/, 'v' << version)
+              body.gsub!(/='\//, %{='/} << version << '/')
+              body.gsub!(/="\//, %{="/} << version << '/')
+              content_type = 'text/html'
+              directory.files.create(
+                :body         => redirecter(key),
+                :content_type => 'text/html',
+                :key          => 'latest/' << file_name,
+                :public       => true
+              )
+            else
+              body = File.open(file_path)
+              content_type = nil # leave it up to mime-types
+            end
+            directory.files.create(
+              :body         => body,
+              :content_type => content_type,
+              :key          => key,
+              :public       => true
+            )
+          end
+          Formatador.redisplay(' ' * 128)
+          Formatador.redisplay("Uploaded docs/_site\n")
+        end
+
+        def redirecter(path)
+          redirecter = <<-HTML
+<!doctype html>
+<head>
+<title>fog</title>
+<meta http-equiv="REFRESH" content="0;url=http://fog.io/#{path}">
+</head>
+<body>
+  <a href="http://fog.io/#{path}">redirecting to lastest (#{path})</a>
+</body>
+</html>
+          HTML
+        end
+      end
+    end
+  end
+end

data/lib/tasks/test_task.rb

@@ -0,0 +1,46 @@
+require "rake"
+require "rake/tasklib"
+
+module Fog
+  module Rake
+    class TestTask < ::Rake::TaskLib
+
+      def initialize
+        desc "Run the mocked tests"
+        task :test do
+          Rake::Task[:mock_tests].invoke
+        end
+
+        task :mock_tests do
+          tests(true)
+        end
+
+        task :real_tests do
+          tests(false)
+        end
+      end
+
+      def tests(mocked)
+        Formatador.display_line
+        start = Time.now.to_i
+        threads = []
+        Thread.main[:results] = []
+        Fog.providers.each do |key, value|
+          threads << Thread.new do
+            Thread.main[:results] << {
+              :provider => value,
+              :success  => sh("export FOG_MOCK=#{mocked} && bundle exec shindont +#{key}")
+            }
+          end
+        end
+        threads.each do |thread|
+          thread.join
+        end
+        Formatador.display_table(Thread.main[:results].sort {|x,y| x[:provider] <=> y[:provider]})
+        Formatador.display_line("[bold]FOG_MOCK=#{mocked}[/] tests completed in [bold]#{Time.now.to_i - start}[/] seconds")
+        Formatador.display_line
+      end
+
+    end
+  end
+end