vagrant-subutai 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f1ffa3b3284d337a4a95e72bc6d4646018dd918
-  data.tar.gz: 56d9b489baaba74456e6dc4805f9862aaf31e93d
+  metadata.gz: 0fb87f283d63e40502762bcc7c5f51cc8b10d7d9
+  data.tar.gz: 9fd407a7c78bcca77980fd11384f06ac1dedbff6
 SHA512:
-  metadata.gz: a30ba866838451e1b6d5a6c5542a2d1cf9f549ca512ee1bb4591cd1455d8c887a2d9bb12de1681f79d5c45af75f66196ce15b73786c7aa179703f309e434c6af
-  data.tar.gz: 6c4720a5f36afabdca01cf0db9fdd32a110de9f8ad019f304ac063b759226bc2aee7e03b3f6f92c3c44fa353a642678956bcbac874065f18222d3af719a0cb45
+  metadata.gz: cb30136c96d640b7a9d4ac660b4ad836c2cfa660437e3fdee12bca47f4ee024da35d081de70ebcbc95ccfb56a97445bfff26e5739964f571284102dff749984c
+  data.tar.gz: 365aa19f7d517c4ac6e1cfee3096ce409a9b13b8fd18a06097ed4b9f8d2e6dd097871813f56ed8d94a0eaabb81ecb09a611038737954090ed7a1ba7e6211f746

data/CHANGELOG.md

@@ -52,9 +52,15 @@ BUG FIXES:
 FEATURES:
   - User configuration new keys added (LIBVIRT_USER, LIBVIRT_HOST, LIBVIRT_PORT, LIBVIRT_MACVTAP, LIBVIRT_NO_BRIDGE)   
  
-## 7.0.0. (May 9, 2018) 
+## 7.0.0 (May 9, 2018) 
 
 FEATURES:
   - Support Vmware desktop and Parallels hypervisor    
   - Auto registration PeerOs to Bazaar
-  - User configuration new keys added (BAZAAR_NO_AUTO)
+  - User configuration new keys added (BAZAAR_NO_AUTO)
+  
+## 7.0.1 (May 21, 2018)
+
+FEATURES:
+  - Support HyperV hypervisor
+  - Improved validation (user configuration)

data/lib/vagrant-subutai/create_disk.rb

@@ -0,0 +1,61 @@
+require_relative '../vagrant-subutai'
+
+
+module VagrantSubutai
+  class CreateDisk < 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
+      has_grow, grow_by = SubutaiDisk.has_grow
+      file_disk = SubutaiDisk.file_path(grow_by, "hyper_v")
+
+      unless File.exist?(file_disk)
+        Put.warn "Disk size is growing by #{grow_by} gb."
+        if has_grow
+          if SubutaiDisk.hyperv_create_disk(grow_by, file_disk)
+            SubutaiDisk.save_conf(grow_by)
+          end
+        end
+      end
+    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
+    end
+  end
+end

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

@@ -0,0 +1,18 @@
+param (
+    [string]$VmId = $(throw "-VmId is required."),
+    [string]$DiskPath = $(throw "-DiskPath is required."),
+    [Int32]$DiskSize = $(throw "-DiskSize is required.")
+)
+
+try {
+    $vm = Get-VM -Id $VmId -ErrorAction "stop"
+
+    # create new disk
+    # converting GB to Byte
+    NEW-VHD -Dynamic $DiskPath -SizeBytes $($DiskSize*1073741824)
+    # attach new disk to VM
+    ADD-VMHardDiskDrive -vmname $vm.Name -path $DiskPath -ControllerType SCSI
+}
+catch {
+    Write-Error-Message "Failed to create disk or attach to VM "
+}

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

@@ -0,0 +1,17 @@
+Try {
+  $adapters = Get-NetAdapter -Physical | where status -eq 'up'
+
+  foreach ($adapter in $adapters) {
+    $switch = Hyper-V\Get-VMSwitch -SwitchType External -ErrorAction SilentlyContinue | where { $_.NetAdapterInterfaceDescription -eq $adapter.InterfaceDescription }
+    if ($switch -eq $null) {
+      $switch = Hyper-V\New-VMSwitch -Name 'vagrant-subutai' -ErrorAction SilentlyContinue -NetAdapterName $adapter.Name -AllowManagementOS $TRUE -Notes 'Parent OS, VMs, WiFi'
+    }
+
+    if ($switch -ne $null) {
+      break
+    }
+  }
+}
+Catch {
+
+}

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

@@ -6,6 +6,8 @@ require 'json'
 
 require_relative 'subutai_net'
 require_relative 'subutai_hooks'
+require_relative 'subutai_validation'
+require_relative '../../../lib/vagrant-subutai/util/powershell'
 
 # Vagrant Driven Subutai Configuration
 # noinspection RubyTooManyMethodsInspection
@@ -114,6 +116,11 @@ module SubutaiConfig
     @cmd == 'up'
   end
 
+  def self.reload?
+    raise 'SubutaiConfig.cmd not set' if @cmd.nil?
+    @cmd == 'reload'
+  end
+
   def self.delete?
     raise 'SubutaiConfig.cmd not set' if @cmd.nil?
     @cmd == 'destroy'
@@ -262,23 +269,8 @@ module SubutaiConfig
       raise "Invalid key in YAML file: '#{key}'" \
           unless USER_PARAMETERS.include?(key.to_sym)
 
-      if key.to_sym == :SUBUTAI_ENV
-        set_env(key.to_sym, temp[key].to_sym)
-      elsif key.to_sym == :SUBUTAI_SCOPE
-        set_scope(key.to_sym, temp[key].to_sym)
-      elsif key.to_sym == :SUBUTAI_ENV_TYPE
-        set_env_type(key.to_sym, temp[key].to_sym)
-      elsif !temp[key].nil?
-        # TODO add double checks type
-
-        if temp[key] == 'true'
-          temp[key] = true
-        elsif temp[key] == 'false'
-          temp[key] = false
-        end
-
-        @config.store(key.to_sym, temp[key])
-      end
+      SubutaiValidation.validate(key.to_sym, temp[key])
+      @config.store(key.to_sym, temp[key]) unless temp[key].nil?
     end
   end
 
@@ -299,7 +291,7 @@ module SubutaiConfig
   def self.do_network(provider)
     # set the next available console port if provisioning a peer in nat mode
     put(:_CONSOLE_PORT, find_port(get(:DESIRED_CONSOLE_PORT)), true) \
-      if boolean?(:SUBUTAI_PEER) && get(:_CONSOLE_PORT).nil? && (write? || delete?)
+      if boolean?(:SUBUTAI_PEER) && get(:_CONSOLE_PORT).nil? && (write? || delete? || read?)
 
     # set the SSH port if we are using bridged mode
     put(:_SSH_PORT, find_port(get(:DESIRED_SSH_PORT)), true) \
@@ -309,6 +301,23 @@ module SubutaiConfig
       if @bridged && get(:_BASE_MAC).nil? && write?
 
     put(:_BRIDGED, @bridged, true) if write?
+
+    generate_switch if provider == :hyper_v && write?
+  end
+
+  # Generates Virtual Switch for Hyper-V
+  def self.generate_switch
+    unless VagrantSubutai::Util::Powershell.execute(File.join(File.expand_path(File.dirname(__FILE__)), 'script/create_virtual_switch.ps1'))
+      Put.error("Failed to create virtual switch")
+    end
+  end
+
+  def self.machine_id(provider)
+    case provider
+    when :hyper_v
+      id = PARENT_DIR+'/machines/default/hyperv/id'
+      File.read(id) if File.exist?(id)
+    end
   end
 
   # Loads the generated and user configuration from YAML files

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

@@ -1,4 +1,5 @@
 require_relative 'subutai_config'
+require_relative '../../../lib/vagrant-subutai/util/powershell'
 
 # For managing VM disks
 module SubutaiDisk
@@ -6,7 +7,9 @@ module SubutaiDisk
   DISK_FORMAT = "vdi".freeze
   DISK_FORMAT_VIRTUALBOX = "vdi".freeze
   DISK_FORMAT_VMWARE = "vmdk".freeze
+  DISK_FORMAT_HYPERV = "vhdx".freeze
   PROVIDER_VMWARE = "vmware".freeze
+  PROVIDER_HYPERV = "hyper_v".freeze
 
   # Checks disk size for adding new VM disks
   def self.has_grow
@@ -56,6 +59,17 @@ module SubutaiDisk
     end
   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')
+    id = SubutaiConfig.machine_id(:hyper_v)
+
+    if id.nil?
+      Put.error("Not found machine id")
+    else
+      VagrantSubutai::Util::Powershell.execute(script, "-VmId", id, "-DiskPath", file_disk, "-DiskSize", "#{vmware_size(grow_by)}")
+    end
+  end
+
   # Save disk size and port to generated.yml
   def self.save_conf(grow_by)
     SubutaiConfig.put(:_DISK_PORT, port, true)
@@ -98,8 +112,11 @@ module SubutaiDisk
     disk_port = port
     disk_format = DISK_FORMAT
 
-    if provider == PROVIDER_VMWARE
+    case provider
+    when PROVIDER_VMWARE
       disk_format = DISK_FORMAT_VMWARE
+    when PROVIDER_HYPERV
+      disk_format = DISK_FORMAT_HYPERV
     end
 
     # get disk path from conf file

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

@@ -34,7 +34,7 @@ PROVIDER_MAC_PREFIXES = {
     :vmware_fusion    => '______',
     :vmware           => '005056',
     :parallels        => '001c42',
-    :hyper_v          => '______'
+    :hyper_v          => '0003ff'
 }
 
 os = nil
@@ -125,15 +125,12 @@ def random_mac_addr(provider)
       PROVIDER_MAC_PREFIXES[:libvirt] + 3.times.map { '%02x' % rand(0..255) }.join
     when :vmware_fusion
        PROVIDER_MAC_PREFIXES[:vmware] + 3.times.map { '%02x' % rand(0..255) }.join
-      #raise "Unsupported provider #{provider}"
     when :vmware
       PROVIDER_MAC_PREFIXES[:vmware] + 3.times.map { '%02x' % rand(0..255) }.join
-      #raise "Unsupported provider #{provider}"
     when :parallels
       PROVIDER_MAC_PREFIXES[:parallels] + 3.times.map { '%02x' % rand(0..255) }.join
-      #raise "Unsupported provider #{provider}"
     when :hyper_v
-      # PROVIDER_MAC_PREFIXES[:hyper_v] + 3.times.map { '%02x' % rand(0..255) }.join
+      PROVIDER_MAC_PREFIXES[:hyper_v] + 3.times.map { '%02x' % rand(0..255) }.join
     else
       raise "Unsupported provider #{provider}"
   end

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

@@ -0,0 +1,83 @@
+require 'uri'
+require_relative 'subutai_config'
+
+module SubutaiValidation
+
+  USER_CONF_PARAMS_TYPE = {
+    "DESIRED_CONSOLE_PORT": :int,
+    "DESIRED_SSH_PORT":     :int,
+    "ALLOW_INSECURE":       :bool,
+    "SUBUTAI_ENV":          :enum,
+    "SUBUTAI_CPU":          :int,
+    "SUBUTAI_RAM":          :int,
+    "SUBUTAI_PEER":         :bool,
+    "SUBUTAI_DESKTOP":      :bool,
+    "SUBUTAI_MAN_TMPL":     :path,
+    "APT_PROXY_URL":        :url,
+    "PROVISION":            :bool,
+    "BRIDGE":               :string,
+    "AUTHORIZED_KEYS":      :path,
+    "PASSWORD_OVERRIDE":    :string,
+    "DISK_SIZE":            :int,
+    "SUBUTAI_ENV_TYPE":     :enum,
+    "SUBUTAI_NAME":         :string,
+    "SUBUTAI_SCOPE":        :enum,
+    "SUBUTAI_USERNAME":     :string,
+    "SUBUTAI_PASSWORD":     :string,
+    "USER_VARIABLES":       :json_object,
+    "BAZAAR_EMAIL":         :string,
+    "BAZAAR_PASSWORD":      :string,
+    "SUBUTAI_DISK_PATH":    :path,
+    "LIBVIRT_USER":         :string,
+    "LIBVIRT_HOST":         :string,
+    "LIBVIRT_PORT":         :int,
+    "LIBVIRT_MACVTAP":      :bool,
+    "LIBVIRT_NO_BRIDGE":    :bool,
+    "BAZAAR_NO_AUTO":       :bool
+  }.freeze
+
+  def self.validate(key, value)
+    case USER_CONF_PARAMS_TYPE[key]
+      when :enum
+        if key == :SUBUTAI_ENV
+          SubutaiConfig.set_env(key, value.to_sym)
+        elsif key == :SUBUTAI_SCOPE
+          SubutaiConfig.set_scope(key, value.to_sym)
+        elsif key == :SUBUTAI_ENV_TYPE
+          SubutaiConfig.set_env_type(key, value.to_sym)
+        end
+      when :int
+        raise "Invalid #{key} type of #{value}: use int type " unless value.is_a?(Integer)
+      when :path
+        raise "Invalid #{key} path of #{value}: use valid path " unless File.exist?(value)
+      when :string
+        raise "Invalid #{key} type of #{value}: use string type " unless value.is_a?(String)
+      when :bool
+        raise "Invalid #{key} type of #{value}: use bool type " unless bool?(value)
+      when :url
+        raise "Invalid #{key} url of #{value}: use valid url " unless host =~ URI::regexp
+      when :json_object
+        raise "Invalid #{key} json of #{value}: use json object " unless is_json?(value)
+    end
+  end
+
+  def self.bool?(value)
+    if value == 'true' || value == true
+      true
+    elsif value == 'false' || value == false
+      true
+    else
+      false
+    end
+  end
+
+  def self.is_json?(json)
+    begin
+      JSON.parse(json)
+    rescue
+      false
+    end
+
+    true
+  end
+end

data/lib/vagrant-subutai/plugin.rb

@@ -22,6 +22,11 @@ module VagrantSubutai
                Registration
             end
 
+            provisioner "create_disk" do
+              require_relative "create_disk"
+              CreateDisk
+            end
+
             config 'subutai_console' do
                require_relative 'config'
                Config

data/lib/vagrant-subutai/util/powershell.rb

@@ -0,0 +1,35 @@
+
+module VagrantSubutai
+  module Util
+    class Powershell
+      def self.execute(path, *args)
+        command = [
+            "powershell.exe",
+            "-NoLogo",
+            "-NoProfile",
+            "-NonInteractive",
+            "-ExecutionPolicy", "Bypass",
+            "&('#{path}')",
+            *args
+        ].flatten
+
+        system(*command)
+      end
+
+      def self.cmd_execute(command)
+        c = [
+            executable,
+            "-NoLogo",
+            "-NoProfile",
+            "-NonInteractive",
+            "-ExecutionPolicy", "Bypass",
+            "-Command",
+            command
+        ].flatten.compact
+
+        system(*c)
+      end
+    end
+  end
+end
+

data/lib/vagrant-subutai/version.rb

@@ -1,3 +1,3 @@
 module VagrantSubutai
-  VERSION = '7.0.0'
+  VERSION = '7.0.1'
 end

data/lib/vagrant-subutai.rb

@@ -17,6 +17,7 @@ require 'vagrant-subutai/packer/subutai_config'
 require 'vagrant-subutai/packer/subutai_hooks'
 require 'vagrant-subutai/packer/subutai_net'
 require 'vagrant-subutai/packer/subutai_disk'
+require 'vagrant-subutai/packer/subutai_validation'
 
 require 'vagrant-subutai/rest/bazaar'
 require 'vagrant-subutai/rest/gorjun'
@@ -24,6 +25,7 @@ require 'vagrant-subutai/rest/subutai_console'
 
 require 'vagrant-subutai/command'
 require 'vagrant-subutai/config'
+require 'vagrant-subutai/create_disk'
 require 'vagrant-subutai/plugin'
 require 'vagrant-subutai/provisioner'
 require 'vagrant-subutai/put'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-subutai
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - Subutai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-09 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,16 +58,20 @@ files:
 - lib/vagrant-subutai/command.rb
 - lib/vagrant-subutai/config.rb
 - lib/vagrant-subutai/configs/configs.rb
+- lib/vagrant-subutai/create_disk.rb
 - lib/vagrant-subutai/models/ansible.rb
 - lib/vagrant-subutai/models/console/container.rb
 - lib/vagrant-subutai/models/console/environment.rb
 - lib/vagrant-subutai/models/container.rb
 - lib/vagrant-subutai/models/domain.rb
 - lib/vagrant-subutai/models/environment.rb
+- lib/vagrant-subutai/packer/script/create_disk_and_attach.ps1
+- lib/vagrant-subutai/packer/script/create_virtual_switch.ps1
 - lib/vagrant-subutai/packer/subutai_config.rb
 - lib/vagrant-subutai/packer/subutai_disk.rb
 - lib/vagrant-subutai/packer/subutai_hooks.rb
 - lib/vagrant-subutai/packer/subutai_net.rb
+- lib/vagrant-subutai/packer/subutai_validation.rb
 - lib/vagrant-subutai/plugin.rb
 - lib/vagrant-subutai/provisioner.rb
 - lib/vagrant-subutai/put.rb
@@ -76,6 +80,7 @@ files:
 - lib/vagrant-subutai/rest/gorjun.rb
 - lib/vagrant-subutai/rest/subutai_console.rb
 - lib/vagrant-subutai/subutai_commands.rb
+- lib/vagrant-subutai/util/powershell.rb
 - lib/vagrant-subutai/version.rb
 - lib/vagrant_init.rb
 - test/.rubocop.yml