vagrant-vminfo 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c194b9b479d86cccae9feefe259f49c159c90e8
-  data.tar.gz: a1b02c6989c7e0be5e7fb251367978f5bfe1badb
+  metadata.gz: 3960cb4c45ffc61d4ef3c245fe2e542194b1918a
+  data.tar.gz: 1c2a06995dcd130043204caef0e7f8c8dc73e9ab
 SHA512:
-  metadata.gz: 251f6d132de0aa47d507b3b1caa6a8cd5a23f0538e15537952ae4c7f28b28fbe859b927dac62a84e3b6e7aff3b0b4841b22bf3ac4d7235aca26021baa38ad857
-  data.tar.gz: 10206ab67fced12985a97a2d2fb423eafe920194ab90e3fa3f90deff4e0505da9aab89ffa818b68f2e7efb1515f6a43071985ef4f707d2220691ff94d4fc3682
+  metadata.gz: 8d47741cb4586a6a7a484dce17ac421db1c1da5894cc5e322ab843b5c7ad6eb87003eb822ce7b542018ec5b3fdd097b71981ebc93aaac1122de1ce5756344127
+  data.tar.gz: 3ea642275c86306cc72809e444736f54aa043eae6f4e7b067049bf581cc7b473e3a312e2ec406b01deb10f2aa47a94972039b77661fa1afeecac046fac3828d8

data/lib/vagrant-vminfo/plugin.rb

@@ -28,6 +28,100 @@ module VagrantVminfo
   class InfoCommand < Vagrant.plugin(2, :command)
     include VagrantPlugins::CommandUp::StartMixins
 
+    def get_vm_info(vm)
+        # Get some provider specific details for vm
+        provider = vm.provider_name.id2name
+        if provider == 'virtualbox'
+            return get_vm_info_virtualbox(vm)
+        elsif provider == 'vmware_workstation'
+            return get_vm_info_vmware_workstation(vm)
+        end
+    end
+
+    def get_vm_info_virtualbox(vm)
+        # Get VM info by virtualbox provider
+        # All we need is network interfaces details
+
+        networks = []
+        begin
+            nic_count = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/Count")[/Value: (\d)/, 1]
+        rescue Exception => e
+            @logger.warn(e.message)
+            nic_count = 0
+        else
+            nic_count = Integer(nic_count)
+        end
+        # Check nic_count is not defined in case of VBox Guest Additions not install, or some other issue
+        if nic_count > 0
+            (0..(nic_count-1)).each do |i|
+                nic_ip = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/V4/IP")[/Value: (.*)/, 1]
+                nic_mac = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/MAC")[/Value: (.*)/, 1]
+                nic_broadcast = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/V4/Broadcast")[/Value: (.*)/, 1]
+                nic_netmask = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/V4/Netmask")[/Value: (.*)/, 1]
+                # Get the number of this network device based on the mac address
+                # TODO: probably just should just get a hash of all of this info somehow, my ruby foo is weak
+                nic_number = vm.provider.driver.execute("showvminfo", vm.id, "--machinereadable")[/\w*(\d)=\"#{nic_mac}\"/, 1]
+                nic_type = vm.provider.driver.execute("showvminfo", vm.id, "--machinereadable")[/nic#{nic_number}=\"(.*)\"/, 1]
+                networks << {'ip' => nic_ip,
+                             'mac' => nic_mac,
+                             'netmask' => nic_netmask,
+                             'broadcast' => nic_broadcast,
+                             'type' => nic_type}
+            end
+        end
+        return {"networks" => networks}
+    end
+
+    def get_vm_info_vmware_workstation(vm)
+        # Get VM info by virtualbox provider
+        # We can get some network interfaces details and current IP address
+
+        # Collect details for all the network interfaces
+        nics = {}
+        vm.provider.driver.send(:read_vmx_data).each do |key, val|
+            key1, key2 = key.split('.')
+            m = /^ethernet\d+$/.match(key1)
+            if m
+                if !nics.include?(m[0])
+                    nics[m[0]] = {}
+                end
+                nics[m[0]][key2] = val
+            end
+        end
+
+        # Check and normalize collected network information
+        networks = []
+        nics.values.each do |nic|
+            nic_type = nic['connectiontype']
+            nic_addresstype = nic['addresstype']
+            nic_mac = nic_addresstype == 'generated' ? nic['generatedaddress'] : nic['address']
+            #TODO: For now I don't know simple way to retrieve these details
+            #nic_ip = nil
+            #nic_netmask = nil
+            #nic_broadcast = nil
+
+            networks << {#'ip' => nic_ip,
+                         'mac' => nic_mac,
+                         #'netmask' => nic_netmask,
+                         #'broadcast' => nic_broadcast,
+                         'type' => nic_type}
+        end
+
+        # We can try to get IP address for VM but can not assign it to any network interface
+        ip = nil
+        begin
+            resp =  vm.provider.driver.send(:vmrun, *['getGuestIPAddress', vm.id])
+        rescue Exception => e
+            @logger.warn(e.message)
+        else
+            m = /(?<ip>\d{1,3}\.\d{1,3}.\d{1,3}\.\d{1,3})/.match(resp.stdout)
+            ip = (resp.exit_code == 0 and m) ? m['ip'] : nil
+        end
+
+        return {'ip' => ip,
+                'networks' => networks }
+    end
+
     def execute
         # Not sure if this is the only way to do this?  How else would I get argv?
         argv = parse_options(OptionParser.new)
@@ -36,35 +130,14 @@ module VagrantVminfo
 
         with_target_vms(argv) do |vm|
             info["name"] = vm.name.id2name
-            info["id"] = vm.id
-            info["provider"] = vm.provider_name.id2name
-            info["networks"] = []
-
-            @nic_count = Integer(vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/Count")[/Value: (\d)/, 1])
-            (0..(@nic_count-1)).each do |i|
-                nic = {}
-
-                @nic_ip = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/V4/IP")[/Value: (.*)/, 1]
-                @nic_mac = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/MAC")[/Value: (.*)/, 1]
-                @nic_broadcast = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/V4/Broadcast")[/Value: (.*)/, 1]
-                @nic_netmask = vm.provider.driver.execute("guestproperty", "get", vm.id, "/VirtualBox/GuestInfo/Net/#{i}/V4/Netmask")[/Value: (.*)/, 1]
-
-                # Get the number of this network device based on the mac address
-                # TODO: probably just should just get a hash of all of this info somehow, my ruby foo is weak
-                @nic_number = vm.provider.driver.execute("showvminfo", vm.id, "--machinereadable")[/\w*(\d)=\"#{@nic_mac}\"/, 1]
-                @nic_type = vm.provider.driver.execute("showvminfo", vm.id, "--machinereadable")[/nic#{@nic_number}=\"(.*)\"/, 1]
-                
-                nic['ip'] = @nic_ip
-                nic['mac'] = @nic_mac
-                nic['netmask'] = @nic_netmask
-                nic['broadcast'] = @nic_broadcast
-                nic['type'] = @nic_type
-
-                # Append to the networks array
-                info["networks"] << nic
+            info["status"] = vm.state.id.id2name
+            # Check if vm is running - try to get some provider specific details
+            if vm.state.id == :running
+                info["id"] = vm.id
+                info["provider"] = vm.provider_name.id2name
+                info.merge!(get_vm_info(vm))
             end
         end
-        
         puts info.to_yaml
     end
   end

data/lib/vagrant-vminfo/version.rb

@@ -1,3 +1,3 @@
 module VagrantVminfo
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-vminfo
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Lin Salisbury
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-12 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -73,14 +73,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - Gemfile
+- vagrant-vminfo.gemspec
 - LICENSE
-- README.md
-- Rakefile
-- lib/vagrant-vminfo/plugin.rb
 - lib/vagrant-vminfo/version.rb
+- lib/vagrant-vminfo/plugin.rb
 - lib/vagrant-vminfo.rb
-- vagrant-vminfo.gemspec
+- README.md
 - .gitignore
 homepage: https://github.com/d3vz3r0/vagrant-vminfo
 licenses: []
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Gets detailed information about the VM, including network interfaes