vagrant-parallels 1.2.2 → 1.3.0

data/test/unit/driver/pd_8_test.rb

@@ -4,201 +4,10 @@ describe VagrantPlugins::Parallels::Driver::PD_8 do
   include_context "parallels"
   let(:parallels_version) { "8" }
 
-  let(:vm_name) {'VM_Name'}
-
-  let(:tpl_uuid) {'1234-some-template-uuid-5678'}
-  let(:tpl_name) {'Some_Template_Name'}
-
-  let(:tools_state) {'installed'}
-  let(:tools_version) {'8.0.18615.123456'}
-
-  let(:hostonly_iface) {'vnic10'}
-
-  let(:vnic_options) do {
-    name:       'vagrant_vnic6',
-    adapter_ip: '11.11.11.11',
-    netmask:    '255.255.252.0',
-    dhcp:       {
-      ip:    '11.11.11.11',
-      lower: '11.11.8.1',
-      upper: '11.11.11.254'
-    }
-  } end
-
   subject { VagrantPlugins::Parallels::Driver::Meta.new(uuid) }
 
   it_behaves_like "parallels desktop driver"
 
-  before do
-    # Returns short info about all registered VMs
-    # `prlctl list --all --json`
-    subprocess.stub(:execute).
-      with("prlctl", "list", "--all", "--json", kind_of(Hash)) do
-        out = <<-eos
-INFO[
-  {
-    "uuid": "#{uuid}",
-    "status": "stopped",
-    "name": "#{vm_name}"
-  }
-]
-        eos
-        subprocess_result(stdout: out)
-    end
-
-    # Returns short info about all registered templates
-    # `prlctl list --all --json --template`
-    subprocess.stub(:execute).
-      with("prlctl", "list", "--all", "--json", "--template", kind_of(Hash)) do
-        out = <<-eos
-INFO[
-  {
-    "uuid": "1234-some-template-uuid-5678",
-    "name": "Some_Template_Name"
-  }
-]
-        eos
-        subprocess_result(stdout: out)
-    end
-
-
-    # Returns detailed info about specified VM or all registered VMs
-    # `prlctl list <vm_uuid> --info --json`
-    # `prlctl list --all --info --json`
-    subprocess.stub(:execute).
-      with("prlctl", "list", kind_of(String), "--info", "--json",
-           kind_of(Hash)) do
-        out = <<-eos
-INFO[
-  {
-    "ID": "#{uuid}",
-    "Name": "#{vm_name}",
-    "State": "stopped",
-    "Home": "/path/to/#{vm_name}.pvm/",
-    "GuestTools": {
-      "state": "#{tools_state}",
-      "version": "#{tools_version}"
-    },
-    "Hardware": {
-      "cpu": {
-        "cpus": 1
-      },
-      "memory": {
-        "size": "512Mb"
-      },
-      "hdd0": {
-        "enabled": true,
-        "image": "/path/to/disk1.hdd"
-      },
-      "net0": {
-        "enabled": true,
-        "type": "shared",
-        "mac": "001C42B4B074",
-        "card": "e1000",
-        "dhcp": "yes"
-      },
-      "net1": {
-        "enabled": true,
-        "type": "bridged",
-        "iface": "vnic2",
-        "mac": "001C42EC0068",
-        "card": "e1000",
-        "ips": "33.33.33.5/255.255.255.0 "
-      }
-    },
-    "Host Shared Folders": {
-      "enabled": true,
-      "shared_folder_1": {
-        "enabled": true,
-        "path": "/path/to/shared/folder/1"
-      },
-      "shared_folder_2": {
-        "enabled": true,
-        "path": "/path/to/shared/folder/2"
-      }
-    }
-  }
-]
-        eos
-        subprocess_result(stdout: out)
-    end
-
-    # Returns detailed info about specified template or all registered templates
-    # `prlctl list <tpl_uuid> --info --json --template`
-    # `prlctl list --all --info --json --template`
-    subprocess.stub(:execute).
-      with("prlctl", "list", kind_of(String), "--info", "--json", "--template",
-           kind_of(Hash)) do
-      out = <<-eos
-INFO[
-  {
-    "ID": "#{tpl_uuid}",
-    "Name": "#{tpl_name}",
-    "State": "stopped",
-    "Home": "/path/to/#{tpl_name}.pvm/",
-    "GuestTools": {
-      "state": "#{tools_state}",
-      "version": "#{tools_version}"
-    },
-    "Hardware": {
-      "cpu": {
-        "cpus": 1
-      },
-      "memory": {
-        "size": "512Mb"
-      },
-      "hdd0": {
-        "enabled": true,
-        "image": "/path/to/harddisk.hdd"
-      },
-      "net0": {
-        "enabled": true,
-        "type": "shared",
-        "mac": "001C42F6E500",
-        "card": "e1000",
-        "dhcp": "yes"
-      },
-      "net1": {
-        "enabled": true,
-        "type": "bridged",
-        "iface": "vnic4",
-        "mac": "001C42AB0071",
-        "card": "e1000",
-        "ips": "33.33.33.10/255.255.255.0 "
-      }
-    }
-  }
-]
-      eos
-      subprocess_result(stdout: out)
-    end
-
-    # Returns detailed info about virtual network interface
-    # `prlsrvctl net info <net_name>, '--json', retryable: true)
-    subprocess.stub(:execute).
-      with("prlsrvctl", "net", "info", kind_of(String), "--json",
-           kind_of(Hash)) do
-      out = <<-eos
-{
-  "Network ID": "#{vnic_options[:name]}",
-  "Type": "host-only",
-  "Bound To": "#{hostonly_iface}",
-  "Parallels adapter": {
-    "IP address": "#{vnic_options[:adapter_ip]}",
-    "Subnet mask": "#{vnic_options[:netmask]}"
-  },
-  "DHCPv4 server": {
-    "Server address": "#{vnic_options[:dhcp][:ip] || "10.37.132.1"}",
-    "IP scope start address": "#{vnic_options[:dhcp][:lower] || "10.37.132.1"}",
-    "IP scope end address": "#{vnic_options[:dhcp][:upper] || "10.37.132.254"}"
-  }
-}
-      eos
-      subprocess_result(stdout: out)
-    end
-
-  end
-
   describe "ssh_ip" do
     let(:content) {'10.200.0.99="1394547632,1800,001c420000ff,01001c420000ff"'}
 

data/test/unit/driver/pd_9_test.rb

@@ -2,203 +2,11 @@ require_relative "../base"
 
 describe VagrantPlugins::Parallels::Driver::PD_9 do
   include_context "parallels"
-  let(:parallels_version) { "9" }
-
-  let(:vm_name) {'VM_Name'}
-
-  let(:tpl_uuid) {'1234-some-template-uuid-5678'}
-  let(:tpl_name) {'Some_Template_Name'}
-
-  let(:tools_state) {'installed'}
-  let(:tools_version) {'9.0.23062.123456'}
-
-  let(:hostonly_iface) {'vnic10'}
-
-  let(:vnic_options) do {
-    name:       'vagrant_vnic6',
-    adapter_ip: '11.11.11.11',
-    netmask:    '255.255.252.0',
-    dhcp:       {
-      ip:    '11.11.11.11',
-      lower: '11.11.8.1',
-      upper: '11.11.11.254'
-    }
-  } end
 
   subject { VagrantPlugins::Parallels::Driver::Meta.new(uuid) }
 
   it_behaves_like "parallels desktop driver"
 
-  before do
-    # Returns short info about all registered VMs
-    # `prlctl list --all --json`
-    subprocess.stub(:execute).
-      with("prlctl", "list", "--all", "--json", kind_of(Hash)) do
-        out = <<-eos
-[
-  {
-    "uuid": "#{uuid}",
-    "status": "stopped",
-    "name": "#{vm_name}"
-  }
-]
-        eos
-        subprocess_result(stdout: out)
-    end
-
-    # Returns short info about all registered templates
-    # `prlctl list --all --json --template`
-    subprocess.stub(:execute).
-      with("prlctl", "list", "--all", "--json", "--template", kind_of(Hash)) do
-        out = <<-eos
-[
-  {
-    "uuid": "1234-some-template-uuid-5678",
-    "name": "Some_Template_Name"
-  }
-]
-        eos
-        subprocess_result(stdout: out)
-    end
-
-
-    # Returns detailed info about specified VM or all registered VMs
-    # `prlctl list <vm_uuid> --info --json`
-    # `prlctl list --all --info --json`
-    subprocess.stub(:execute).
-      with("prlctl", "list", kind_of(String), "--info", "--json",
-           kind_of(Hash)) do
-        out = <<-eos
-[
-  {
-    "ID": "#{uuid}",
-    "Name": "#{vm_name}",
-    "State": "stopped",
-    "Home": "/path/to/#{vm_name}.pvm/",
-    "GuestTools": {
-      "state": "#{tools_state}",
-      "version": "#{tools_version}"
-    },
-    "Hardware": {
-      "cpu": {
-        "cpus": 1
-      },
-      "memory": {
-        "size": "512Mb"
-      },
-      "hdd0": {
-        "enabled": true,
-        "image": "/path/to/disk1.hdd"
-      },
-      "net0": {
-        "enabled": true,
-        "type": "shared",
-        "mac": "001C42B4B074",
-        "card": "e1000",
-        "dhcp": "yes"
-      },
-      "net1": {
-        "enabled": true,
-        "type": "bridged",
-        "iface": "vnic2",
-        "mac": "001C42EC0068",
-        "card": "e1000",
-        "ips": "33.33.33.5/255.255.255.0 "
-      }
-    },
-    "Host Shared Folders": {
-      "enabled": true,
-      "shared_folder_1": {
-        "enabled": true,
-        "path": "/path/to/shared/folder/1"
-      },
-      "shared_folder_2": {
-        "enabled": true,
-        "path": "/path/to/shared/folder/2"
-      }
-    }
-  }
-]
-        eos
-        subprocess_result(stdout: out)
-    end
-
-    # Returns detailed info about specified template or all registered templates
-    # `prlctl list <tpl_uuid> --info --json --template`
-    # `prlctl list --all --info --json --template`
-    subprocess.stub(:execute).
-      with("prlctl", "list", kind_of(String), "--info", "--json", "--template",
-           kind_of(Hash)) do
-      out = <<-eos
-[
-  {
-    "ID": "#{tpl_uuid}",
-    "Name": "#{tpl_name}",
-    "State": "stopped",
-    "Home": "/path/to/#{tpl_name}.pvm/",
-    "GuestTools": {
-      "state": "#{tools_state}",
-      "version": "#{tools_version}"
-    },
-    "Hardware": {
-      "cpu": {
-        "cpus": 1
-      },
-      "memory": {
-        "size": "512Mb"
-      },
-      "hdd0": {
-        "enabled": true,
-        "image": "/path/to/harddisk.hdd"
-      },
-      "net0": {
-        "enabled": true,
-        "type": "shared",
-        "mac": "001C42F6E500",
-        "card": "e1000",
-        "dhcp": "yes"
-      },
-      "net1": {
-        "enabled": true,
-        "type": "bridged",
-        "iface": "vnic4",
-        "mac": "001C42AB0071",
-        "card": "e1000",
-        "ips": "33.33.33.10/255.255.255.0 "
-      }
-    }
-  }
-]
-      eos
-      subprocess_result(stdout: out)
-    end
-
-    # Returns detailed info about virtual network interface
-    # `prlsrvctl net info <net_name>, '--json', retryable: true)
-    subprocess.stub(:execute).
-      with("prlsrvctl", "net", "info", kind_of(String), "--json",
-           kind_of(Hash)) do
-      out = <<-eos
-{
-  "Network ID": "#{vnic_options[:name]}",
-  "Type": "host-only",
-  "Bound To": "#{hostonly_iface}",
-  "Parallels adapter": {
-    "IP address": "#{vnic_options[:adapter_ip]}",
-    "Subnet mask": "#{vnic_options[:netmask]}"
-  },
-  "DHCPv4 server": {
-    "Server address": "#{vnic_options[:dhcp][:ip] || "10.37.132.1"}",
-    "IP scope start address": "#{vnic_options[:dhcp][:lower] || "10.37.132.1"}",
-    "IP scope end address": "#{vnic_options[:dhcp][:upper] || "10.37.132.254"}"
-  }
-}
-      eos
-      subprocess_result(stdout: out)
-    end
-
-  end
-
   describe "set_power_consumption_mode" do
     it "turns 'longer-battery-life' on" do
       subprocess.should_receive(:execute).

data/test/unit/support/shared/parallels_context.rb

@@ -1,31 +1,225 @@
-shared_context "parallels" do
+shared_context 'parallels' do
   let(:parallels_context) { true                                     }
-  let(:uuid)              { "1234-here-is-uuid-5678"                 }
-  let(:parallels_version) { "9"                                      }
-  let(:subprocess)        { double("Vagrant::Util::Subprocess")      }
-  let(:driver)            { subject.instance_variable_get("@driver") }
+  let(:uuid)              { '1234-here-is-uuid-5678' }
+  let(:parallels_version) { '9' }
+  let(:subprocess)        { double('Vagrant::Util::Subprocess')      }
+  let(:driver)            { subject.instance_variable_get('@driver') }
+
+  let(:vm_name) {'VM_Name'}
+  let(:tpl_uuid) {'1234-some-template-uuid-5678'}
+  let(:tpl_name) {'Some_Template_Name'}
+  let(:tools_state) {'installed'}
+  let(:tools_version) {'8.0.18615.123456'}
+  let(:hostonly_iface) {'vnic10'}
+
+  let(:vnic_options) do {
+    name:       'vagrant_vnic6',
+    adapter_ip: '11.11.11.11',
+    netmask:    '255.255.252.0',
+    dhcp:       {
+      ip:    '11.11.11.11',
+      lower: '11.11.8.1',
+      upper: '11.11.11.254'
+    }
+  } end
 
   # this is a helper that returns a duck type suitable from a system command
   # execution; allows setting exit_code, stdout, and stderr in stubs.
   def subprocess_result(options={})
-    defaults = {exit_code: 0, stdout: "", stderr: ""}
-    double("subprocess_result", defaults.merge(options))
+    defaults = {exit_code: 0, stdout: '', stderr: ''}
+    double('subprocess_result', defaults.merge(options))
   end
 
   before do
     # we don't want unit tests to ever run commands on the system; so we wire
     # in a double to ensure any unexpected messages raise exceptions
-    stub_const("Vagrant::Util::Subprocess", subprocess)
+    stub_const('Vagrant::Util::Subprocess', subprocess)
 
     # drivers will blow up on instantiation if they cannot determine the
     # Parallels Desktop version, so wire this stub in automatically
     subprocess.stub(:execute).
-      with("prlctl", "--version", an_instance_of(Hash)).
+      with('prlctl', '--version', an_instance_of(Hash)).
       and_return(subprocess_result(stdout: "prlctl version #{parallels_version}.0.98765"))
 
     # drivers also call vm_exists? during init;
     subprocess.stub(:execute).
-      with("prlctl", "list", uuid, kind_of(Hash)).
+      with('prlctl', 'list', uuid, kind_of(Hash)).
       and_return(subprocess_result(exit_code: 0))
+
+    # Returns detailed info about specified VM or all registered VMs
+    # `prlctl list <vm_uuid> --info --no-header --json`
+    # `prlctl list --all --info --no-header --json`
+    subprocess.stub(:execute).
+      with('prlctl', 'list', kind_of(String), '--info', '--no-header', '--json',
+           kind_of(Hash)) do
+      out = <<-eos
+[
+  {
+    "ID": "#{uuid}",
+    "Name": "#{vm_name}",
+    "State": "stopped",
+    "Home": "/path/to/#{vm_name}.pvm/",
+    "GuestTools": {
+      "state": "#{tools_state}",
+      "version": "#{tools_version}"
+    },
+    "Hardware": {
+      "cpu": {
+        "cpus": 1
+      },
+      "memory": {
+        "size": "512Mb"
+      },
+      "hdd0": {
+        "enabled": true,
+        "image": "/path/to/disk1.hdd"
+      },
+      "net0": {
+        "enabled": true,
+        "type": "shared",
+        "mac": "001C42B4B074",
+        "card": "e1000",
+        "dhcp": "yes"
+      },
+      "net1": {
+        "enabled": true,
+        "type": "bridged",
+        "iface": "vnic2",
+        "mac": "001C42EC0068",
+        "card": "e1000",
+        "ips": "33.33.33.5/255.255.255.0 "
+      }
+    },
+    "Host Shared Folders": {
+      "enabled": true,
+      "shared_folder_1": {
+        "enabled": true,
+        "path": "/path/to/shared/folder/1"
+      },
+      "shared_folder_2": {
+        "enabled": true,
+        "path": "/path/to/shared/folder/2"
+      }
+    }
+  }
+]
+      eos
+      subprocess_result(stdout: out)
+    end
+
+    # Returns detailed info about specified template or all registered templates
+    # `prlctl list <tpl_uuid> --info --json --no-header --template`
+    # `prlctl list --all --info --no-header --json --template`
+    subprocess.stub(:execute).
+      with('prlctl', 'list', kind_of(String), '--info', '--no-header', '--json',
+           '--template', kind_of(Hash)) do
+      out = <<-eos
+[
+  {
+    "ID": "#{tpl_uuid}",
+    "Name": "#{tpl_name}",
+    "State": "stopped",
+    "Home": "/path/to/#{tpl_name}.pvm/",
+    "GuestTools": {
+      "state": "#{tools_state}",
+      "version": "#{tools_version}"
+    },
+    "Hardware": {
+      "cpu": {
+        "cpus": 1
+      },
+      "memory": {
+        "size": "512Mb"
+      },
+      "hdd0": {
+        "enabled": true,
+        "image": "/path/to/harddisk.hdd"
+      },
+      "net0": {
+        "enabled": true,
+        "type": "shared",
+        "mac": "001C42F6E500",
+        "card": "e1000",
+        "dhcp": "yes"
+      },
+      "net1": {
+        "enabled": true,
+        "type": "bridged",
+        "iface": "vnic4",
+        "mac": "001C42AB0071",
+        "card": "e1000",
+        "ips": "33.33.33.10/255.255.255.0 "
+      }
+    }
+  }
+]
+      eos
+      subprocess_result(stdout: out)
+    end
+
+    # Returns detailed info about virtual network interface
+    # `prlsrvctl net info <net_name>, '--json'`
+    subprocess.stub(:execute).
+      with('prlsrvctl', 'net', 'info', kind_of(String), '--json',
+           kind_of(Hash)) do
+      out = <<-eos
+{
+  "Network ID": "#{vnic_options[:name]}",
+  "Type": "host-only",
+  "Bound To": "#{hostonly_iface}",
+  "Parallels adapter": {
+    "IP address": "#{vnic_options[:adapter_ip]}",
+    "Subnet mask": "#{vnic_options[:netmask]}"
+  },
+  "DHCPv4 server": {
+    "Server address": "#{vnic_options[:dhcp][:ip] || '10.37.132.1'}",
+    "IP scope start address": "#{vnic_options[:dhcp][:lower] || '10.37.132.1'}",
+    "IP scope end address": "#{vnic_options[:dhcp][:upper] || '10.37.132.254'}"
+  }
+}
+      eos
+      subprocess_result(stdout: out)
+    end
+
+    # Returns values of 'name' and 'uuid' options for all registered VMs
+    # `prlctl list --all --no-header --json -o name,uuid`
+    subprocess.stub(:execute).
+      with('prlctl', 'list', '--all', '--no-header', '--json', '-o', 'name,uuid',
+           kind_of(Hash)) do
+      out = <<-eos
+[
+	{
+		"name": "#{vm_name}",
+		"uuid": "#{uuid}"
+	}
+]
+      eos
+      subprocess_result(stdout: out)
+    end
+
+    # Returns values of 'name' and 'uuid' options for all registered templates
+    # `prlctl list --all --no-header --json -o name,uuid --template`
+    subprocess.stub(:execute).
+      with('prlctl', 'list', '--all', '--no-header', '--json', '-o', 'name,uuid',
+           '--template', kind_of(Hash)) do
+      out = <<-eos
+[
+	{
+		"name": "#{tpl_name}",
+		"uuid": "#{tpl_uuid}"
+	}
+]
+      eos
+      subprocess_result(stdout: out)
+    end
+
+    # Returns value of 'mac' options for the specified VM
+    # `prlctl list --all --no-header -o mac`
+    subprocess.stub(:execute).
+      with('prlctl', 'list', kind_of(String), '--no-header', '-o', 'mac',
+           kind_of(Hash)) do
+      subprocess_result(stdout: "001C42B4B074\n")
+    end
+
   end
 end