Remove now redundant function to copy exported VM files

pull/6393/head
DanHam 8 years ago
parent 3fc2defb6d
commit dc46848f89
No known key found for this signature in database
GPG Key ID: 58E79AEDD6AA987E

@ -96,8 +96,6 @@ type Driver interface {
CompactDisks(string) error
CopyExportedVirtualMachine(string, string, string, string) error
RestartVirtualMachine(string) error
CreateDvdDrive(string, string, uint) (uint, uint, error)

@ -190,13 +190,6 @@ type DriverMock struct {
CompactDisks_Path string
CompactDisks_Err error
CopyExportedVirtualMachine_Called bool
CopyExportedVirtualMachine_ExpPath string
CopyExportedVirtualMachine_OutputPath string
CopyExportedVirtualMachine_VhdDir string
CopyExportedVirtualMachine_VmDir string
CopyExportedVirtualMachine_Err error
RestartVirtualMachine_Called bool
RestartVirtualMachine_VmName string
RestartVirtualMachine_Err error
@ -494,15 +487,6 @@ func (d *DriverMock) CompactDisks(path string) error {
return d.CompactDisks_Err
}
func (d *DriverMock) CopyExportedVirtualMachine(expPath string, outputPath string, vhdDir string, vmDir string) error {
d.CopyExportedVirtualMachine_Called = true
d.CopyExportedVirtualMachine_ExpPath = expPath
d.CopyExportedVirtualMachine_OutputPath = outputPath
d.CopyExportedVirtualMachine_VhdDir = vhdDir
d.CopyExportedVirtualMachine_VmDir = vmDir
return d.CopyExportedVirtualMachine_Err
}
func (d *DriverMock) RestartVirtualMachine(vmName string) error {
d.RestartVirtualMachine_Called = true
d.RestartVirtualMachine_VmName = vmName

@ -223,10 +223,6 @@ func (d *HypervPS4Driver) CompactDisks(path string) error {
return hyperv.CompactDisks(path)
}
func (d *HypervPS4Driver) CopyExportedVirtualMachine(expPath string, outputPath string, vhdDir string, vmDir string) error {
return hyperv.CopyExportedVirtualMachine(expPath, outputPath, vhdDir, vmDir)
}
func (d *HypervPS4Driver) RestartVirtualMachine(vmName string) error {
return hyperv.RestartVirtualMachine(vmName)
}

@ -678,20 +678,6 @@ Get-ChildItem "$srcPath" -Filter *.vhd* | %{
return err
}
func CopyExportedVirtualMachine(expPath string, outputPath string, vhdDir string, vmDir string) error {
var script = `
param([string]$srcPath, [string]$dstPath, [string]$vhdDirName, [string]$vmDir)
Move-Item -Path (Join-Path (Get-Item $srcPath).FullName "*.*") -Destination $dstPath
Move-Item -Path (Join-Path (Get-Item $srcPath).FullName $vhdDirName) -Destination $dstPath
Move-Item -Path (Join-Path (Get-Item $srcPath).FullName $vmDir) -Destination $dstPath
`
var ps powershell.PowerShellCmd
err := ps.Run(script, expPath, outputPath, vhdDir, vmDir)
return err
}
func CreateVirtualSwitch(switchName string, switchType string) (bool, error) {
var script = `

Loading…
Cancel
Save