vagrant-veertu 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3bb7fba0711390479da3fb382a57199a529185f
-  data.tar.gz: 9957d516b85e7ecf0484c955598e271fe38c8bee
+  metadata.gz: 8749b3e460a27d0e11ca0b1d5e378a8d92a543da
+  data.tar.gz: a96b68cd601d190dd36639971536ccb2f8703ed6
 SHA512:
-  metadata.gz: f7e8873e36590077513aa5765d065d149fc53ee3939662bd7e767ab40b367da3efcdcdbfa509dbfc6d9c1a94b848e3d5186e50573171fd02ab83f6794a99add8
-  data.tar.gz: 5f7e18a06bf5ec55785b1b5ba6399a8f8b86237d338c21e0029a1c5d893909211236110aae825cfa8c2d800b70c7b4fb47608fe8daf25f3236ba71c9579ea938
+  metadata.gz: d8834be9d93f6d929e3bb5643efbe5ab09ca4aa7046aea0c8f8d23c810534b5e4c2323316566ecf6fd30733370a6512ce393acaa014c28a8a3d77d14dc694848
+  data.tar.gz: faabce040dd0064b1dba7f11ee4cb7ac5eac664cef8b1a13988f091a483b8d5e561848718c23006c20925c210c474f71bfac55504c4d87946f2afa67f8cd4cfa

data/Gemfile

@@ -1,7 +1,7 @@
 source "https://rubygems.org"
 
 group :development do
-  gem "vagrant", git: "https://github.com/mitchellh/vagrant.git"
+  gem "vagrant", :git => "https://github.com/mitchellh/vagrant.git", :tag => 'v1.8.6' 
 end
 
 group :plugins do

data/lib/vagrant-veertu/action/network.rb

@@ -115,7 +115,7 @@ module VagrantPlugins
               ))
             end
 
-            #env[:machine].provider.driver.enable_adapters(adapters)
+            env[:machine].provider.driver.enable_adapters(adapters)
           end
 
           # Continue the middleware chain.

data/lib/vagrant-veertu/driver/base.rb

@@ -23,15 +23,26 @@ module VagrantPlugins
 
           # This flag is used to keep track of interrupted state (SIGINT)
           @interrupted = false
-
+          default_paths = ["/Applications/Veertu.app/Contents/SharedSupport/VeertuManage", 
+                           "/Applications/Veertu Desktop.app/Contents/SharedSupport/VeertuManage"]
           ini_file = File.expand_path("~/.veertu_config")
           if File.exist?(ini_file) then
               file = IniFile.load(ini_file)
               @veertumanage_path = file['VAGRANT']['manage_path']
+          else
+              default_paths.each do |veertu_path|
+                if File.exist?(veertu_path)
+                  @veertumanage_path = veertu_path
+                  break
+                end
+              end
           end
-          @veertumanage_path ||= "/Applications/Veertu.app/Contents/SharedSupport/VeertuManage"
-
           @logger.info("VeertuManage path: #{@veertumanage_path}")
+          if !@veertumanage_path
+            raise Errors::VeertuManageNotFoundError
+          end
+
+          
         end
 
         # Clears the forwarded ports that have been set on the virtual machine.

data/lib/vagrant-veertu/driver/version_5_0.rb

@@ -42,7 +42,7 @@ module VagrantPlugins
           ports.each do |options|
             name = options[:name]
             protocol = options[:protocol] || "tcp"
-            host_ip = options[:hostip] || "0"
+            host_ip = options[:hostip] || "127.0.0.1"
             host_port = options[:hostport]
             guest_ip = options[:guestip] || ""
             guest_port = options[:guestport]
@@ -154,7 +154,7 @@ module VagrantPlugins
         end
 
         def read_network_interfaces
-          return { '0' => {:type => :nat}}
+          return { '0' => {:type => :nat}, '1' => {:type => :bridged}}
         end
 
         def read_state
@@ -262,7 +262,7 @@ module VagrantPlugins
 
         def read_mac_address
           vm_describe = get_vm_describe(@uuid)
-          network_cards = vm_describe["network cards"]
+          network_cards = vm_describe['hardware']["network cards"]
           if not network_cards
             return nil
           end
@@ -274,8 +274,60 @@ module VagrantPlugins
           puts network_card
           return network_card['mac address']
         end
+        
+        def enable_adapters(adapters)
+          vm_describe = get_vm_describe(@uuid)
+          puts vm_describe
+          network_cards = vm_describe['hardware']["network cards"]
+          if network_cards.is_a?(Hash)
+            network_cards = [network_cards]
+          end
+          if network_cards.nil?
+            network_cards = []
+          end
+          
+          puts adapters
+          network_cards.each do |net_card| # set our net cards to be desired type by config 
+            adapter = adapters.pop()
+            set_card(net_card['card index'], adapter[:type])
+          end
+          adapters.each do |adapter| # in case there are more adapters - add them
+            add_card(adapter[:type])
+          end
+        end
         protected
         
+        def has_adapter?(network_cards, type)
+          type_str = type_symbol_to_veertu_str(type)
+          network_cards.each do |network_card|
+            if network_card['connection'] == type_str
+              return network_card['card index']
+            end
+          end
+          return nil
+        end
+        
+        def add_card(type)
+          type_str = type_symbol_to_veertu_str(type)
+          response = execute('modify', @uuid, 'add', 'network_card', '--type', type_str)
+          @logger.info(response)
+        end
+        
+        def set_card(index, type)
+          type_str = type_symbol_to_veertu_str(type)
+          response = execute('modify', @uuid, 'set', '--network', index, '--network-type', type_str)
+          @logger.info(response)
+        end
+         
+        def type_symbol_to_veertu_str(type) 
+          if type == :nat
+            return 'host'
+          elsif type == :bridged
+            return 'shared'
+          end
+          return 'disconnected'
+        end
+        
         def get_vm_list()
           vms_json = execute("--machine-readable", "list", retryable: true)
           vms = JSON.parse(vms_json)

data/lib/vagrant-veertu/provider.rb

@@ -8,9 +8,7 @@ module VagrantPlugins
       def self.installed?
         Driver::Meta.new
         true
-      rescue Vagrant::Errors::VeertuInvalidVersion
-        return false
-      rescue Vagrant::Errors::VeertuNotDetected
+      rescue Errors::VeertuManageNotFoundError
         return false
       end
 
@@ -19,10 +17,7 @@ module VagrantPlugins
         # version and all that, which checks for Veertu being present
         Driver::Meta.new
         true
-      rescue Vagrant::Errors::VeertuInvalidVersion
-        raise if raise_error
-        return false
-      rescue Vagrant::Errors::VeertuNotDetected
+      rescue Errors::VeertuManageNotFoundError
         raise if raise_error
         return false
       end

data/lib/vagrant-veertu/version.rb

@@ -1,5 +1,5 @@
 module Vagrant
   module Veertu
-    VERSION = "0.0.15"
+    VERSION = "0.0.17"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-veertu
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Veertu Labs
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-05 00:00:00.000000000 Z
+date: 2016-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: inifile