File tree 3 files changed +6
-3
lines changed
3 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -33,8 +33,8 @@ def call(env)
33
33
spec [ :customization ] = get_customization_spec ( machine , customization_info ) unless customization_info . nil?
34
34
35
35
env [ :ui ] . info I18n . t ( 'vsphere.creating_cloned_vm' )
36
- env [ :ui ] . info " -- #{ config . clone_from_vm ? "Source" : "Template" } VM: #{ config . template_name } "
37
- env [ :ui ] . info " -- Name: #{ name } "
36
+ env [ :ui ] . info " -- #{ config . clone_from_vm ? "Source" : "Template" } VM: #{ template . pretty_path } "
37
+ env [ :ui ] . info " -- Target VM: #{ vm_base_folder . pretty_path } / #{ name } "
38
38
39
39
new_vm = template . CloneVM_Task ( :folder => vm_base_folder , :name => name , :spec => spec ) . wait_for_completion
40
40
rescue Errors ::VSphereError => e
Original file line number Diff line number Diff line change 17
17
end
18
18
19
19
it 'should create a CloneVM task with custom folder when given vm base path' do
20
- custom_base_folder = double ( CUSTOM_VM_FOLDER )
20
+ custom_base_folder = double ( CUSTOM_VM_FOLDER ,
21
+ :pretty_path => "#{ @data_center . pretty_path } /#{ CUSTOM_VM_FOLDER } " )
21
22
@machine . provider_config . stub ( :vm_base_path ) . and_return ( CUSTOM_VM_FOLDER )
22
23
@data_center . vmFolder . stub ( :traverse ) . with ( CUSTOM_VM_FOLDER , RbVmomi ::VIM ::Folder ) . and_return ( custom_base_folder )
23
24
call
Original file line number Diff line number Diff line change @@ -77,10 +77,12 @@ def call
77
77
78
78
@data_center = double ( 'data_center' ,
79
79
:vmFolder => vm_folder ,
80
+ :pretty_path => "data_center/#{ vm_folder } " ,
80
81
:find_compute_resource => double ( 'compute resource' , :resourcePool => double ( 'pools' , :find => { } ) ) )
81
82
82
83
@template = double ( 'template_vm' ,
83
84
:parent => @data_center ,
85
+ :pretty_path => "#{ @data_center . pretty_path } /template_vm" ,
84
86
:CloneVM_Task => double ( 'result' ,
85
87
:wait_for_completion => double ( 'new_vm' , :config => double ( 'config' , :uuid => NEW_UUID ) ) ) )
86
88
You can’t perform that action at this time.
0 commit comments