bosh_vsphere_cpi 1.2865.0 → 1.2881.0

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2865.0'
+      VERSION = '1.2881.0'
     end
   end
 end

data/lib/cloud/vsphere/vm_creator.rb

@@ -1,25 +1,27 @@
 require 'ruby_vim_sdk'
 require 'cloud/vsphere/drs_rules/drs_rule'
 require 'cloud/vsphere/resources/disk/ephemeral_disk'
+require 'cloud/vsphere/resources/vm'
 
 module VSphereCloud
   class VmCreator
-    def initialize(memory, disk_size, cpu, placer, client, cloud_searcher, logger, cpi, agent_env, file_provider)
+    def initialize(memory, disk_size_in_mb, cpu, placer, client, cloud_searcher, logger, cpi, agent_env, file_provider, disk_provider)
       @placer = placer
       @client = client
       @cloud_searcher = cloud_searcher
       @logger = logger
       @cpi = cpi
       @memory = memory
-      @disk_size = disk_size
+      @disk_size_in_mb = disk_size_in_mb
       @cpu = cpu
       @agent_env = agent_env
       @file_provider = file_provider
+      @disk_provider = disk_provider
 
       @logger.debug("VM creator initialized with memory: #{@memory}, disk: #{@disk}, cpu: #{@cpu}, placer: #{@placer}")
     end
 
-    def create(agent_id, stemcell_cid, networks, disk_cids, environment)
+    def create(agent_id, stemcell_cid, networks, persistent_disk_cids, environment)
       stemcell_vm = @cpi.stemcell_vm(stemcell_cid)
       raise "Could not find stemcell: #{stemcell_cid}" if stemcell_vm.nil?
 
@@ -27,86 +29,83 @@ module VSphereCloud
         @cloud_searcher.get_property(stemcell_vm, VimSdk::Vim::VirtualMachine, 'summary.storage.committed', ensure_all: true)
       stemcell_size /= 1024 * 1024
 
-      disks = @cpi.disk_spec(disk_cids)
-      # need to include swap and linked clone log
-      ephemeral = @disk_size + @memory + stemcell_size
-      cluster, datastore = @placer.place(@memory, ephemeral, disks)
-
-      name = "vm-#{@cpi.generate_unique_name}"
-      @logger.info("Creating vm: #{name} on #{cluster.mob} stored in #{datastore.mob}")
+      persistent_disk_cids ||= []
+      persistent_disks = persistent_disk_cids.map { |cid| @disk_provider.find(cid) }
 
-      replicated_stemcell_vm = @cpi.replicate_stemcell(cluster, datastore, stemcell_cid)
-      replicated_stemcell_properties = @cloud_searcher.get_properties(replicated_stemcell_vm, VimSdk::Vim::VirtualMachine,
-                                                             ['config.hardware.device', 'snapshot'],
-                                                             ensure_all: true)
-
-      devices = replicated_stemcell_properties['config.hardware.device']
+      # need to include swap and linked clone log
+      ephemeral_disk_size_in_mb = @disk_size_in_mb + @memory + stemcell_size
+      cluster = @placer.pick_cluster_for_vm(@memory, ephemeral_disk_size_in_mb, persistent_disks)
+      datastore = @placer.pick_ephemeral_datastore(cluster, ephemeral_disk_size_in_mb)
+
+      vm_cid = "vm-#{SecureRandom.uuid}"
+      @logger.info("Creating vm: #{vm_cid} on #{cluster.mob} stored in #{datastore.mob}")
+
+      replicated_stemcell_vm_mob = @cpi.replicate_stemcell(cluster, datastore, stemcell_cid)
+      replicated_stemcell_properties = @cloud_searcher.get_properties(replicated_stemcell_vm_mob, VimSdk::Vim::VirtualMachine,
+        ['snapshot'],
+        ensure_all: true)
+      replicated_stemcell_vm = Resources::VM.new(stemcell_cid, replicated_stemcell_vm_mob, @client, @logger)
       snapshot = replicated_stemcell_properties['snapshot']
 
       config = VimSdk::Vim::Vm::ConfigSpec.new(memory_mb: @memory, num_cpus: @cpu)
       config.device_change = []
 
-      system_disk = devices.find { |device| device.kind_of?(VimSdk::Vim::Vm::Device::VirtualDisk) }
-      pci_controller = devices.find { |device| device.kind_of?(VimSdk::Vim::Vm::Device::VirtualPCIController) }
-
-      ephemeral_disk = VSphereCloud::EphemeralDisk.new(@disk_size, name, datastore)
-      ephemeral_disk_config = ephemeral_disk.create_spec(system_disk.controller_key)
+      ephemeral_disk = VSphereCloud::EphemeralDisk.new(@disk_size_in_mb, vm_cid, datastore)
+      ephemeral_disk_config = ephemeral_disk.create_spec(replicated_stemcell_vm.system_disk.controller_key)
       config.device_change << ephemeral_disk_config
 
       dvs_index = {}
       networks.each_value do |network|
         v_network_name = network['cloud_properties']['name']
         network_mob = @client.find_by_inventory_path([cluster.datacenter.name, 'network', v_network_name])
-        nic_config = @cpi.create_nic_config_spec(v_network_name, network_mob, pci_controller.key, dvs_index)
+        nic_config = @cpi.create_nic_config_spec(v_network_name, network_mob, replicated_stemcell_vm.pci_controller.key, dvs_index)
         config.device_change << nic_config
       end
 
-      nics = devices.select { |device| device.kind_of?(VimSdk::Vim::Vm::Device::VirtualEthernetCard) }
-      nics.each do |nic|
+      replicated_stemcell_vm.nics.each do |nic|
         nic_config = @cpi.create_delete_device_spec(nic)
         config.device_change << nic_config
       end
 
-      @cpi.fix_device_unit_numbers(devices, config.device_change)
+      replicated_stemcell_vm.fix_device_unit_numbers(config.device_change)
 
-      @logger.info("Cloning vm: #{replicated_stemcell_vm} to #{name}")
+      @logger.info("Cloning vm: #{replicated_stemcell_vm} to #{vm_cid}")
 
-      task = @cpi.clone_vm(replicated_stemcell_vm,
-                      name,
-                      cluster.datacenter.vm_folder.mob,
-                      cluster.resource_pool.mob,
-                      datastore: datastore.mob, linked: true, snapshot: snapshot.current_snapshot, config: config)
-      vm = @client.wait_for_task(task)
+      task = @cpi.clone_vm(replicated_stemcell_vm.mob,
+        vm_cid,
+        cluster.datacenter.vm_folder.mob,
+        cluster.resource_pool.mob,
+        datastore: datastore.mob, linked: true, snapshot: snapshot.current_snapshot, config: config)
+      created_vm_mob = @client.wait_for_task(task)
+      created_vm = Resources::VM.new(vm_cid, created_vm_mob, @client, @logger)
 
       begin
-        vm_properties = @cloud_searcher.get_properties(vm, VimSdk::Vim::VirtualMachine, ['config.hardware.device'], ensure_all: true)
-        devices = vm_properties['config.hardware.device']
-
-        network_env = @cpi.generate_network_env(devices, networks, dvs_index)
-        disk_env = @cpi.generate_disk_env(system_disk, ephemeral_disk_config.device)
-        env = @cpi.generate_agent_env(name, vm, agent_id, network_env, disk_env)
+        network_env = @cpi.generate_network_env(created_vm.devices, networks, dvs_index)
+        disk_env = @cpi.generate_disk_env(created_vm.system_disk, ephemeral_disk_config.device)
+        env = @cpi.generate_agent_env(created_vm.cid, created_vm.mob, agent_id, network_env, disk_env)
         env['env'] = environment
         @logger.info("Setting VM env: #{env.pretty_inspect}")
 
         location = @cpi.get_vm_location(
-          vm,
+          created_vm.mob,
           datacenter: cluster.datacenter.name,
           datastore: datastore.name,
-          vm: name
+          vm: created_vm.cid
         )
 
-        @agent_env.set_env(vm, location, env)
+        @agent_env.set_env(created_vm.mob, location, env)
 
-        @logger.info("Powering on VM: #{vm} (#{name})")
-        @client.power_on_vm(cluster.datacenter.mob, vm)
+        @logger.info("Powering on VM: #{created_vm} (#{created_vm.cid})")
+        created_vm.power_on
 
-        create_drs_rules(vm, cluster)
+        create_drs_rules(created_vm.mob, cluster)
       rescue => e
         @logger.info("#{e} - #{e.backtrace.join("\n")}")
-        @cpi.delete_vm(name)
+        created_vm.delete if created_vm
         raise e
       end
-      name
+
+      vm_cid
     end
 
     def create_drs_rules(vm, cluster)

data/lib/cloud/vsphere/vm_creator_builder.rb

@@ -2,7 +2,7 @@ require 'cloud/vsphere/vm_creator'
 
 module VSphereCloud
   class VmCreatorBuilder
-    def build(resources, cloud_properties, client, cloud_searcher, logger, cpi, agent_env, file_provider)
+    def build(resources, cloud_properties, client, cloud_searcher, logger, cpi, agent_env, file_provider, disk_provider)
       VmCreator.new(
         cloud_properties.fetch('ram'),
         cloud_properties.fetch('disk'),
@@ -14,6 +14,7 @@ module VSphereCloud
         cpi,
         agent_env,
         file_provider,
+        disk_provider
       )
     end
   end

data/lib/cloud/vsphere/vm_provider.rb

@@ -0,0 +1,16 @@
+module VSphereCloud
+  class VMProvider
+    def initialize(datacenter, client, logger)
+      @datacenter = datacenter
+      @client = client
+      @logger = logger
+    end
+
+    def find(vm_cid)
+      vm_mob = @client.find_by_inventory_path(@datacenter.vm_path(vm_cid))
+      raise Bosh::Clouds::VMNotFound, "VM `#{vm_cid}' not found" if vm_mob.nil?
+
+      Resources::VM.new(vm_cid, vm_mob, @client, @logger)
+    end
+  end
+end

data/lib/cloud/vsphere.rb

@@ -18,7 +18,7 @@ module Bosh
                      :create_disk, :has_disk?, :delete_disk,
                      :attach_disk, :detach_disk,
                      :snapshot_disk, :delete_snapshot,
-                     :current_vm_id, :get_disks, :ping
+                     :current_vm_id, :get_disks, :ping, :disk_provider
 
       def initialize(options)
         @delegate = VSphereCloud::Cloud.new(options)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2865.0
+  version: 1.2881.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2865.0
+        version: 1.2881.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2865.0
+        version: 1.2881.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2865.0
+        version: 1.2881.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2865.0
+        version: 1.2881.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -53,106 +53,162 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: sequel
+  name: builder
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.43.0
+        version: 3.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.43.0
+        version: 3.1.4
 - !ruby/object:Gem::Dependency
-  name: pg
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 1.5.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.1
+        version: 1.5.10
 - !ruby/object:Gem::Dependency
-  name: mysql2
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 0.3.11
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
-  name: builder
+  name: mono_logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.4
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
-  type: :runtime
+        version: 0.7.1
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.10
+        version: 0.7.1
 - !ruby/object:Gem::Dependency
-  name: httpclient
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
-  type: :runtime
+        version: '10.0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: timecop
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-instafail
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |-
   BOSH VSphere CPI
-  14ebaf
+  756fc2
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -162,8 +218,6 @@ extra_rdoc_files: []
 files:
 - bin/vsphere_cpi
 - bin/vsphere_cpi_console
-- db/migrations/20120123235022_initial.rb
-- db/migrations/20121204174707_add_uuid_to_disks.rb
 - lib/cloud/vsphere.rb
 - lib/cloud/vsphere/agent_env.rb
 - lib/cloud/vsphere/client.rb
@@ -171,6 +225,7 @@ files:
 - lib/cloud/vsphere/cloud_searcher.rb
 - lib/cloud/vsphere/cluster_config.rb
 - lib/cloud/vsphere/config.rb
+- lib/cloud/vsphere/disk_provider.rb
 - lib/cloud/vsphere/drs_rules/drs_lock.rb
 - lib/cloud/vsphere/drs_rules/drs_rule.rb
 - lib/cloud/vsphere/drs_rules/vm_attribute_manager.rb
@@ -178,24 +233,25 @@ files:
 - lib/cloud/vsphere/fixed_cluster_placer.rb
 - lib/cloud/vsphere/lease_obtainer.rb
 - lib/cloud/vsphere/lease_updater.rb
-- lib/cloud/vsphere/models/disk.rb
 - lib/cloud/vsphere/path_finder.rb
 - lib/cloud/vsphere/resources.rb
 - lib/cloud/vsphere/resources/cluster.rb
 - lib/cloud/vsphere/resources/datacenter.rb
 - lib/cloud/vsphere/resources/datastore.rb
+- lib/cloud/vsphere/resources/disk.rb
 - lib/cloud/vsphere/resources/disk/disk_config.rb
 - lib/cloud/vsphere/resources/disk/ephemeral_disk.rb
-- lib/cloud/vsphere/resources/disk/persistent_disk.rb
 - lib/cloud/vsphere/resources/folder.rb
 - lib/cloud/vsphere/resources/resource_pool.rb
 - lib/cloud/vsphere/resources/scorer.rb
 - lib/cloud/vsphere/resources/util.rb
+- lib/cloud/vsphere/resources/vm.rb
 - lib/cloud/vsphere/retry_block.rb
 - lib/cloud/vsphere/soap_stub.rb
 - lib/cloud/vsphere/version.rb
 - lib/cloud/vsphere/vm_creator.rb
 - lib/cloud/vsphere/vm_creator_builder.rb
+- lib/cloud/vsphere/vm_provider.rb
 - lib/ruby_vim_sdk.rb
 - lib/ruby_vim_sdk/base_type.rb
 - lib/ruby_vim_sdk/const.rb

data/db/migrations/20120123235022_initial.rb

@@ -1,24 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-Sequel.migration do
-  # there is a bug in sequel where create_table? on postgres causes the transaction to abort with:
-  # PG::Error: ERROR:  current transaction is aborted, commands ignored until end of transaction block
-  # to work around this until it is fixed, transactions are disabled, which is fine as it is an atomic operation
-  no_transaction
-
-  up do
-    # This used to be included in the director migrations, so we should not fail (hence create_table?) if this table
-    # already exists to allow old installations to keep working with the new migrations.
-    create_table? :vsphere_disk do
-      primary_key :id
-      String :path, :null => true
-      String :datacenter, :null => true
-      String :datastore, :null => true
-      Integer :size, :null => false
-    end
-  end
-
-  down do
-    drop_table :vsphere_disk
-  end
-end

data/db/migrations/20121204174707_add_uuid_to_disks.rb

@@ -1,14 +0,0 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
-Sequel.migration do
-  up do
-    add_column :vsphere_disk, :uuid, String
-    self[:vsphere_disk].update(:uuid => :id)
-    add_index :vsphere_disk, :uuid, :unique => true
-  end
-
-  down do
-    drop_index :vsphere_disk, :uuid, :unique => true
-    drop_column :vsphere_disk, :uuid
-  end
-end

data/lib/cloud/vsphere/models/disk.rb

@@ -1,11 +0,0 @@
-# provides validates_*
-Sequel::Model.plugin :validation_helpers
-
-module VSphereCloud::Models
-  class Disk < Sequel::Model(Bosh::Clouds::Config.db[:vsphere_disk])
-    def validate
-      validates_presence :size
-      validates_integer :size
-    end
-  end
-end

data/lib/cloud/vsphere/resources/disk/persistent_disk.rb

@@ -1,110 +0,0 @@
-require 'cloud/vsphere/resources/disk/disk_config'
-
-module VSphereCloud
-  class PersistentDisk
-    def initialize(disk_cid, cloud_searcher, resources, client, logger)
-      @model = Models::Disk.first(uuid: disk_cid)
-      raise "Disk not found: #{disk_cid}" if @model.nil?
-
-      @disk_size = @model.size.to_i
-
-      @cloud_searcher = cloud_searcher
-      @resources = resources
-      @client = client
-      @logger = logger
-    end
-
-    def create_spec(datacenter_name, host_info, controller_key, copy_disks)
-      need_to_create_disk = !disk_exists?
-
-      destination_datacenter = @resources.datacenters[datacenter_name]
-
-      if disk_exists?
-        if disk_in_correct_datacenter?(destination_datacenter.name, host_info)
-          @logger.info("Disk already in the right datastore #{destination_datacenter.name} #{@model.datastore}")
-
-          persistent_datastore = @resources.persistent_datastore(@model.datacenter, host_info['cluster'], @model.datastore)
-        else
-          @logger.info("Disk needs to move from #{@model.datacenter} to #{destination_datacenter.name}")
-
-          persistent_datastore = find_datastore(destination_datacenter, host_info)
-          move_disk(persistent_datastore, destination_datacenter, copy_disks)
-          update(persistent_datastore, destination_datacenter)
-        end
-      else
-        @logger.info('Need to create disk')
-
-        persistent_datastore = find_datastore(destination_datacenter, host_info)
-        create_parent_folder(persistent_datastore.name, destination_datacenter)
-        update(persistent_datastore, destination_datacenter)
-      end
-
-      DiskConfig.new(persistent_datastore, filename, controller_key, @disk_size).
-        spec(independent: true, create: need_to_create_disk)
-    end
-
-    private
-
-    def filename
-      "#{@model.path}.vmdk"
-    end
-
-    def datastore_disk_path(datastore_name, datacenter)
-      "[#{datastore_name}] #{datacenter.disk_path}/#{@model.uuid}"
-    end
-
-    def disk_exists?
-      !!@model.path
-    end
-
-    def disk_in_correct_datacenter?(destination_datacenter_name, host_info)
-      (@model.datacenter == destination_datacenter_name &&
-        @resources.validate_persistent_datastore(destination_datacenter_name, @model.datastore) &&
-        host_info['datastores'].include?(@model.datastore))
-    end
-
-    def find_datastore(datacenter, host_info)
-      datastore = @resources.place_persistent_datastore(datacenter.name, host_info['cluster'], @disk_size)
-
-      if datastore.nil?
-        raise Bosh::Clouds::NoDiskSpace.new(true), "Not enough persistent space on cluster #{host_info['cluster']}, #{@disk_size}"
-      end
-
-      # Sanity check, verify that the vm's host can access this datastore
-      unless host_info['datastores'].include?(datastore.name)
-        raise "Datastore not accessible to host, #{datastore.name}, #{host_info['datastores']}"
-      end
-
-      datastore
-    end
-
-    def update(new_datastore, new_datacenter)
-      # Need to create disk
-      @model.datacenter = new_datacenter.name
-      @model.datastore = new_datastore.name
-      @model.path = datastore_disk_path(new_datastore.name, new_datacenter)
-      @model.save
-    end
-
-    def move_disk(destination_datastore, destination_datacenter, copy_disks)
-      source_datacenter = @client.find_by_inventory_path(@model.datacenter)
-      destination_path = datastore_disk_path(destination_datastore.name, destination_datacenter)
-      @logger.info("Moving #{@model.path} to #{destination_path}")
-
-      create_parent_folder(destination_datastore.name, destination_datacenter)
-
-      if copy_disks
-        @client.copy_disk(source_datacenter, @model.path, destination_datacenter, destination_path)
-        @logger.info('Copied disk successfully')
-      else
-        @client.move_disk(source_datacenter, @model.path, destination_datacenter, destination_path)
-        @logger.info('Moved disk successfully')
-      end
-    end
-
-    def create_parent_folder(datastore_name, datacenter)
-      destination_folder = File.dirname(datastore_disk_path(datastore_name, datacenter))
-      @client.create_datastore_folder(destination_folder, datacenter.mob)
-    end
-  end
-end