Commit c74b3758 authored by Mitchell Hashimoto's avatar Mitchell Hashimoto

builder/vmware-iso: ESX5Driver impl OutputDir [GH-773]

parent 07cc1cd9
...@@ -4,6 +4,7 @@ BUG FIXES: ...@@ -4,6 +4,7 @@ BUG FIXES:
* core: If a stream ID loops around, don't let it use stream ID 0 [GH-767] * core: If a stream ID loops around, don't let it use stream ID 0 [GH-767]
* builders/virtualbox-ovf: `shutdown_timeout` config works. [GH-772] * builders/virtualbox-ovf: `shutdown_timeout` config works. [GH-772]
* builders/vmware-iso: Remote driver works properly again. [GH-773]
## 0.5.0 (12/30/2013) ## 0.5.0 (12/30/2013)
......
...@@ -214,6 +214,10 @@ func (d *ESX5Driver) SSHAddress(state multistep.StateBag) (string, error) { ...@@ -214,6 +214,10 @@ func (d *ESX5Driver) SSHAddress(state multistep.StateBag) (string, error) {
return address, nil return address, nil
} }
//-------------------------------------------------------------------
// OutputDir implementation
//-------------------------------------------------------------------
func (d *ESX5Driver) DirExists() (bool, error) { func (d *ESX5Driver) DirExists() (bool, error) {
err := d.sh("test", "-e", d.outputDir) err := d.sh("test", "-e", d.outputDir)
return err == nil, nil return err == nil, nil
...@@ -258,6 +262,10 @@ func (d *ESX5Driver) SetOutputDir(path string) { ...@@ -258,6 +262,10 @@ func (d *ESX5Driver) SetOutputDir(path string) {
d.outputDir = d.datastorePath(path) d.outputDir = d.datastorePath(path)
} }
func (d *ESX5Driver) String() string {
return d.outputDir
}
func (d *ESX5Driver) datastorePath(path string) string { func (d *ESX5Driver) datastorePath(path string) string {
return filepath.Join("/vmfs/volumes", d.Datastore, path) return filepath.Join("/vmfs/volumes", d.Datastore, path)
} }
......
...@@ -9,6 +9,10 @@ func TestESX5Driver_implDriver(t *testing.T) { ...@@ -9,6 +9,10 @@ func TestESX5Driver_implDriver(t *testing.T) {
var _ vmwcommon.Driver = new(ESX5Driver) var _ vmwcommon.Driver = new(ESX5Driver)
} }
func TestESX5Driver_implOutputDir(t *testing.T) {
var _ vmwcommon.OutputDir = new(ESX5Driver)
}
func TestESX5Driver_implRemoteDriver(t *testing.T) { func TestESX5Driver_implRemoteDriver(t *testing.T) {
var _ RemoteDriver = new(ESX5Driver) var _ RemoteDriver = new(ESX5Driver)
} }
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment