vagrant-subutai 7.0.2 → 7.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aabe7e7c68d3d359655354727293c7ef9816158b
-  data.tar.gz: 8b2e4361bda3faf126bf695e0ee38c0785033af5
+  metadata.gz: adb3b9b979548fbd83ff2eb4ec71ab69e1cf154f
+  data.tar.gz: d913fd3476e3c84745d4d30ba48b1f62c6e3316b
 SHA512:
-  metadata.gz: a0249deec3ac761adaf330ddfbdd71ddd2f5719636b5976a01d78699bfa8caf9618acef484ac4396ac029ea887c10a2f20a1ff2d801e5d20903549c240390d01
-  data.tar.gz: 4245cc02705bf6e94f0b7458abc2962472429983b15258a444254b77a31254d0fdb2b565785ae8cdaac8bd493b1a68990a5a3d54f565563602d649d2bab80862
+  metadata.gz: 1b80d1dfeddbdef2b7a2d16042843776bfa536b8c17ad4cd18de0280d9691f0ed426c6d797706679f7c333a39cd6eff1d33dd9a0b438aec632724d6aa2327554
+  data.tar.gz: 243f5a694326265475f05cec03a84382d03ff64e5d33b559671c22d5744052631c255188f0bac5b0f2c72ac8de9bc66ac8f860ebb875fbbbeaf4caf0962d990f

data/.gitignore

@@ -19,4 +19,5 @@ mkmf.log
 pkg
 Gemfile.lock
 build.sh
-.vscode/
+.vscode/
+.vagrant/

data/CHANGELOG.md

@@ -68,4 +68,10 @@ FEATURES:
 ## 7.0.2 (May 22, 2018)
 
 BUG FIXES:
-  - Fixed validation url   
+  - Fixed validation url   
+  
+## 7.0.3 (May 30, 2018)
+  
+BUG FIXES:
+  - [hyperv, vmware_desktop] fixed delete virtual disk file after destroy VM
+  - user configuration validation  

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2016 Subutai Social
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/lib/vagrant-subutai.rb

@@ -23,6 +23,7 @@ require 'vagrant-subutai/rest/bazaar'
 require 'vagrant-subutai/rest/gorjun'
 require 'vagrant-subutai/rest/subutai_console'
 
+require 'vagrant-subutai/cleanup'
 require 'vagrant-subutai/command'
 require 'vagrant-subutai/config'
 require 'vagrant-subutai/create_disk'

data/lib/vagrant-subutai/cleanup.rb

@@ -0,0 +1,79 @@
+require_relative '../vagrant-subutai'
+
+
+module VagrantSubutai
+  class Cleanup < Vagrant.plugin(2, :provisioner)
+    attr_reader :machine
+    attr_reader :config
+
+    # Initializes the provisioner with the machine that it will be
+    # provisioning along with the provisioner configuration (if there
+    # is any).
+    #
+    # The provisioner should _not_ do anything at this point except
+    # initialize internal state.
+    #
+    # @param [Machine] machine The machine that this will be provisioning.
+    # @param [Object] config Provisioner configuration, if one was set.
+    def initialize(machine, config)
+      @machine = machine
+      @config  = config
+    end
+
+    # Called with the root configuration of the machine so the provisioner
+    # can add some configuration on top of the machine.
+    #
+    # During this step, and this step only, the provisioner should modify
+    # the root machine configuration to add any additional features it
+    # may need. Examples include sharing folders, networking, and so on.
+    # This step is guaranteed to be called before any of those steps are
+    # done so the provisioner may do that.
+    #
+    # No return value is expected.
+    def configure(root_config)
+    end
+
+    # This is the method called when the actual provisioning should be
+    # done. The communicator is guaranteed to be ready at this point,
+    # and any shared folders or networks are already setup.
+    #
+    # No return value is expected.
+    def provision
+    end
+
+    # This is the method called when destroying a machine that allows
+    # for any state related to the machine created by the provisioner
+    # to be cleaned up.
+    def cleanup
+      case SubutaiConfig.provider
+        when :hyper_v
+          SubutaiDisk.hyperv_remove_disk
+      end
+
+      # cleanup virtual disks
+      disks = SubutaiConfig.get(:_DISK_PATHES)
+      unless disks.nil?
+        disks.keys.each do |key|
+           if File.exist?(disks[key])
+             begin
+               File.delete(disks[key])
+               puts " ==> Deleted file: #{disks[key]}"
+             rescue Errno::EACCES
+               puts " ==> (Permission denied) Failed delete file: #{disks[key]}"
+             end
+           end
+        end
+      end
+
+      # cleanup generated files
+      if File.exist?(SubutaiConfig::GENERATED_FILE)
+        begin
+          File.delete SubutaiConfig::GENERATED_FILE
+          puts " ==> Deleted file: #{SubutaiConfig::GENERATED_FILE}"
+        rescue Errno::EACCES
+          puts " ==> (Permission denied) Failed delete file: #{SubutaiConfig::GENERATED_FILE}"
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-subutai/create_disk.rb

@@ -46,6 +46,7 @@ module VagrantSubutai
         Put.warn "Disk size is growing by #{grow_by} gb."
         if has_grow
           if SubutaiDisk.hyperv_create_disk(grow_by, file_disk)
+            SubutaiDisk.save_path(SubutaiDisk.port, file_disk)
             SubutaiDisk.save_conf(grow_by)
           end
         end

data/lib/vagrant-subutai/packer/script/remove_virtual_disk.ps1

@@ -0,0 +1,12 @@
+param (
+    [string]$VmId = $(throw "-VmId is required.")
+)
+
+try {
+    $vm = Get-VM -Id $VmId -ErrorAction "stop"
+    Get-VMHardDiskDrive -VMName $vm.Name -ControllerType SCSI | Remove-VMHardDiskDrive
+    Stop-VM -Name $vm.Name -TurnOff
+}
+catch {
+    Write-Error-Message "Failed to remove virtual disk "
+}

data/lib/vagrant-subutai/packer/subutai_config.rb

@@ -67,6 +67,7 @@ module SubutaiConfig
     _ALT_MANAGEMENT_MD5_LAST
     _DISK_SIZE
     _DISK_PORT
+    _DISK_PATHES
   ].freeze
 
   # Used for testing
@@ -75,6 +76,9 @@ module SubutaiConfig
   # Vagrant command currently being executed, must not be nil
   @cmd = nil
 
+  # Vagrant provider name
+  @provider = nil
+
   # Hash of generated/calculated settings preserved through commands
   @generated = {}
 
@@ -168,6 +172,10 @@ module SubutaiConfig
     @cmd
   end
 
+  def self.provider
+    @provider
+  end
+
   def self.config
     @config
   end
@@ -193,6 +201,11 @@ module SubutaiConfig
   def self.url_of_cdn
     @url_of_cdn
   end
+
+  def self.url_of_cdn=(cdn_url)
+    @url_of_cdn = cdn_url
+  end
+
   def self.override_conf_file(filepath)
     @conf_file_override = filepath
   end
@@ -269,7 +282,7 @@ module SubutaiConfig
       raise "Invalid key in YAML file: '#{key}'" \
           unless USER_PARAMETERS.include?(key.to_sym)
 
-      SubutaiValidation.validate(key.to_sym, temp[key])
+      SubutaiValidation.validate(key.to_sym, temp[key]) unless delete?
       @config.store(key.to_sym, temp[key]) unless temp[key].nil?
     end
   end
@@ -324,10 +337,11 @@ module SubutaiConfig
   def self.load_config(cmd, provider)
     raise 'SubutaiConfig.cmd not set' if cmd.nil?
     @cmd = cmd
+    @provider = provider
 
     # Load YAML based user and local configuration if they exist
     load_config_file(USER_CONF_FILE) if File.exist?(USER_CONF_FILE)
-    load_config_file(CONF_FILE) if File.exist?(CONF_FILE)
+    load_config_file(conf_file) if File.exist?(conf_file)
     load_generated
 
     # Load overrides from the environment, and generated configurations
@@ -340,14 +354,14 @@ module SubutaiConfig
 
   def self.reset
     @cmd = nil
+    @provider = nil
     @config = @defaults.clone
     @generated = {}
     @conf_file_override = nil
   end
 
-  # Destroys the generated file if vagrant destroy is used
+
   def self.cleanup
-    cleanup! if delete?
   end
 
   def self.cleanup!
@@ -411,13 +425,17 @@ module SubutaiConfig
             response[0]['id']
           when Net::HTTPNotFound
             Put.error "#{response.body} template name #{name}, owner #{owner}"
+          "" # send empty id. DON'T REMOVE
         end
       rescue Errno::ECONNREFUSED
         Put.error "cdn.subutai.io:8338 connection refused"
+        "" # send empty id. DON'T REMOVE
       rescue Errno::EHOSTUNREACH
         Put.error "cdn.subutai.io:8338 unreachable"
+        "" # send empty id. DON'T REMOVE
       rescue => e
         Put.error e
+        "" # send empty id. DON'T REMOVE
       end
     else
       ""  # send empty id. DON'T REMOVE

data/lib/vagrant-subutai/packer/subutai_disk.rb

@@ -5,11 +5,18 @@ require_relative '../../../lib/vagrant-subutai/util/powershell'
 module SubutaiDisk
   DISK_NAME = "SubutaiDisk".freeze
   DISK_FORMAT = "vdi".freeze
+
   DISK_FORMAT_VIRTUALBOX = "vdi".freeze
   DISK_FORMAT_VMWARE = "vmdk".freeze
   DISK_FORMAT_HYPERV = "vhdx".freeze
+  DISK_FORMAT_LIBVIRT = "qcow2".freeze
+
   PROVIDER_VMWARE = "vmware".freeze
   PROVIDER_HYPERV = "hyper_v".freeze
+  PROVIDER_LIBVIRT = "libvirt".freeze
+
+  SCRIPT_HYPERV_DISK_CREATE_PATH = 'script/create_disk_and_attach.ps1'.freeze
+  SCRIPT_HYPERV_DISK_REMOVE_PATH = 'script/remove_virtual_disk.ps1'.freeze
 
   # Checks disk size for adding new VM disks
   def self.has_grow
@@ -24,6 +31,21 @@ module SubutaiDisk
     end
   end
 
+  # Save disk pathes. We saves for cleanup while destroying peer
+  def self.save_path(port, file_path)
+    if SubutaiConfig.get(:_DISK_PATHES).nil?
+      hash = {}
+      hash[port] = file_path
+      SubutaiConfig.put(:_DISK_PATHES, hash, true)
+      true
+    else
+      hash = SubutaiConfig.get(:_DISK_PATHES)
+      hash[port] = file_path
+      SubutaiConfig.put(:_DISK_PATHES, hash, true)
+      true
+    end
+  end
+
   # Gives disk port
   def self.port
     port = SubutaiConfig.get(:_DISK_PORT)
@@ -60,16 +82,29 @@ module SubutaiDisk
   end
 
   def self.hyperv_create_disk(grow_by, file_disk)
-    script = File.join(File.expand_path(File.dirname(__FILE__)), 'script/create_disk_and_attach.ps1')
+    script = File.join(File.expand_path(File.dirname(__FILE__)), SCRIPT_HYPERV_DISK_CREATE_PATH)
     id = SubutaiConfig.machine_id(:hyper_v)
 
     if id.nil?
-      Put.error("Not found machine id")
+      Put.error(" => [FAILED] Disk Creation. Not found machine id")
+      false
     else
       VagrantSubutai::Util::Powershell.execute(script, "-VmId", id, "-DiskPath", file_disk, "-DiskSize", "#{vmware_size(grow_by)}")
     end
   end
 
+  def self.hyperv_remove_disk
+    script = File.join(File.expand_path(File.dirname(__FILE__)), SCRIPT_HYPERV_DISK_REMOVE_PATH)
+    id = SubutaiConfig.machine_id(:hyper_v)
+
+    if id.nil?
+      Put.error(" => [FAILED] Remove virtual disk. Not found machine id")
+      false
+    else
+      VagrantSubutai::Util::Powershell.execute(script, "-VmId", id)
+    end
+  end
+
   # Save disk size and port to generated.yml
   def self.save_conf(grow_by)
     SubutaiConfig.put(:_DISK_PORT, port, true)
@@ -77,8 +112,10 @@ module SubutaiDisk
     generated_disk = SubutaiConfig.get(:_DISK_SIZE)
     if generated_disk.nil?
       SubutaiConfig.put(:_DISK_SIZE, grow_by, true) # we set all size of virtual disks to _DISK_SIZE in unit gb
+      true
     else
       SubutaiConfig.put(:_DISK_SIZE, grow_by + generated_disk.to_i, true) # we set all size of virtual disks to _DISK_SIZE in unit gb
+      true
     end
   end
 
@@ -92,19 +129,7 @@ module SubutaiDisk
     if SubutaiConfig.get(:SUBUTAI_DISK_PATH).nil?
       "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
     else
-      # Check is directory exist
-      if File.directory?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-        # check permission
-        if File.writable?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-          File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}")
-        else
-          Put.warn "No write permission: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
-          "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
-        end
-      else
-        Put.warn "Invalid path: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
-        "./#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}"
-      end
+      File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{DISK_FORMAT}")
     end
   end
 
@@ -117,39 +142,15 @@ module SubutaiDisk
       disk_format = DISK_FORMAT_VMWARE
     when PROVIDER_HYPERV
       disk_format = DISK_FORMAT_HYPERV
+    when PROVIDER_LIBVIRT
+      disk_format = DISK_FORMAT_LIBVIRT
     end
 
     # get disk path from conf file
     if SubutaiConfig.get(:SUBUTAI_DISK_PATH).nil?
-      File.join(Dir.pwd, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{disk_format}")
-    else
-      # Check is directory exist
-      if File.directory?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-        # check permission
-        if File.writable?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-          File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{disk_format}")
-        else
-          Put.warn "No write permission: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
-          File.join(Dir.pwd, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{disk_format}")
-        end
-      else
-        Put.warn "Invalid path: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
-        File.join(Dir.pwd, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{disk_format}")
-      end
-    end
-  end
-
-  def self.path
-    if File.directory?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-      # check permission
-      if File.writable?(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-        File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s)
-      else
-        Put.warn "No write permission: #{SubutaiConfig.get(:SUBUTAI_DISK_PATH)}"
-        nil
-      end
+      File.expand_path "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{disk_format}"
     else
-      nil
+      File.join(SubutaiConfig.get(:SUBUTAI_DISK_PATH).to_s, "#{DISK_NAME}-#{disk_port.to_i}-#{grow_by}.#{disk_format}")
     end
   end
 end