Skip to content

Commit 2712c53

Browse files
authored
Deprecate vcenter_folder (#2340)
SUMMARY Deprecate community.vmware.vcenter_folder in favor of vmware.folder. ISSUE TYPE Feature Pull Request COMPONENT NAME vcenter_folder ADDITIONAL INFORMATION ansible-collections/vmware.vmware#104
1 parent 9011b8e commit 2712c53

File tree

8 files changed

+52
-32
lines changed

8 files changed

+52
-32
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
deprecated_features:
2+
- vcenter_folder - the module has been deprecated and will be removed in community.vmware 7.0.0
3+
(https://github.com/ansible-collections/community.vmware/pull/2340).

meta/runtime.yml

+4
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,10 @@ plugin_routing:
190190
removal_version: 7.0.0
191191
warning_text: Use vmware.vmware.vms instead.
192192
modules:
193+
vcenter_folder:
194+
deprecation:
195+
removal_version: 7.0.0
196+
warning_text: Use vmware.vmware.folder instead.
193197
vmware_cluster:
194198
deprecation:
195199
removal_version: 6.0.0

plugins/modules/vcenter_folder.py

+4
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
DOCUMENTATION = r'''
1313
---
1414
module: vcenter_folder
15+
deprecated:
16+
removed_in: 7.0.0
17+
why: This module has been moved to the L(new vmware.vmware collection,https://forum.ansible.com/t/5880)
18+
alternative: Use M(vmware.vmware.folder) instead.
1519
short_description: Manage folders on given datacenter
1620
description:
1721
- This module can be used to create, delete, move and rename folder on then given datacenter.

tests/integration/targets/prepare_vmware_tests/tasks/setup_datacenter.yml

+6-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,12 @@
44
state: present
55

66
- name: Create a VM folder on given Datacenter
7-
vcenter_folder:
7+
vmware.vmware.folder:
8+
hostname: '{{ vcenter_hostname }}'
9+
username: '{{ vcenter_username }}'
10+
password: '{{ vcenter_password }}'
811
datacenter: '{{ dc1 }}'
9-
folder_name: '{{ f0 }}'
12+
relative_path: '{{ f0 }}'
1013
folder_type: vm
1114
state: present
15+
validate_certs: false

tests/integration/targets/vmware_datastore_cluster/tasks/main.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -72,12 +72,12 @@
7272
- not enable_sdrs_again.changed
7373

7474
- name: Create a datastore folder on given Datacenter
75-
vcenter_folder:
75+
vmware.vmware.folder:
7676
hostname: '{{ vcenter_hostname }}'
7777
username: '{{ vcenter_username }}'
7878
password: '{{ vcenter_password }}'
7979
datacenter: '{{ dc1 }}'
80-
folder_name: 'my_datastore_folder'
80+
relative_path: 'my_datastore_folder'
8181
folder_type: datastore
8282
state: present
8383
validate_certs: false
@@ -89,7 +89,7 @@
8989
username: '{{ vcenter_username }}'
9090
password: '{{ vcenter_password }}'
9191
validate_certs: false
92-
folder: "{{ my_datastore_folder.result.path }}"
92+
folder: '/{{ dc1 }}/datastore/my_datastore_folder'
9393
datastore_cluster_name: DSC2
9494
state: present
9595
register: add_dsc_folder_check
@@ -136,12 +136,12 @@
136136
- DSC2
137137

138138
- name: Delete the datastore folder
139-
vcenter_folder:
139+
vmware.vmware.folder:
140140
hostname: '{{ vcenter_hostname }}'
141141
username: '{{ vcenter_username }}'
142142
password: '{{ vcenter_password }}'
143143
datacenter: '{{ dc1 }}'
144-
folder_name: 'my_datastore_folder'
144+
relative_path: 'my_datastore_folder'
145145
folder_type: datastore
146146
state: absent
147147
validate_certs: false

tests/integration/targets/vmware_dvswitch/tasks/main.yml

+3-5
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,23 @@
3232
- dvs_result_0001.changed
3333

3434
- name: Create a network folder on given Datacenter
35-
vcenter_folder:
35+
vmware.vmware.folder:
3636
hostname: '{{ vcenter_hostname }}'
3737
username: '{{ vcenter_username }}'
3838
password: '{{ vcenter_password }}'
3939
datacenter: '{{ dc1 }}'
40-
folder_name: network_folder
40+
relative_path: network_folder
4141
folder_type: network
4242
state: present
4343
validate_certs: false
44-
register:
45-
network_folder_result
4644

4745
- name: Add distributed vSwitch using folder
4846
vmware_dvswitch:
4947
validate_certs: false
5048
hostname: "{{ vcenter_hostname }}"
5149
username: "{{ vcenter_username }}"
5250
password: "{{ vcenter_password }}"
53-
folder: "{{ network_folder_result.result.path }}"
51+
folder: "/{{ dc1 }}/network/network_folder"
5452
state: present
5553
switch_name: dvswitch_0002
5654
mtu: 9000

tests/integration/targets/vmware_folder_info/tasks/main.yml

+21-13
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,33 @@
66
name: prepare_vmware_tests
77

88
- name: create example toplevel folder
9-
vcenter_folder:
10-
<<: &vcenter_folder_data
11-
hostname: "{{ vcenter_hostname }}"
12-
username: "{{ vcenter_username }}"
13-
password: "{{ vcenter_password }}"
14-
datacenter: "{{ dc1 | basename }}"
15-
validate_certs: false
16-
folder_name: "toplevel"
9+
vmware.vmware.folder:
10+
hostname: "{{ vcenter_hostname }}"
11+
username: "{{ vcenter_username }}"
12+
password: "{{ vcenter_password }}"
13+
datacenter: "{{ dc1 | basename }}"
14+
folder_type: vm
15+
validate_certs: false
16+
relative_path: "toplevel"
1717

1818
- name: create an example child folder
19-
vcenter_folder:
20-
<<: *vcenter_folder_data
21-
folder_name: "child_folder"
22-
parent_folder: "toplevel"
19+
vmware.vmware.folder:
20+
hostname: "{{ vcenter_hostname }}"
21+
username: "{{ vcenter_username }}"
22+
password: "{{ vcenter_password }}"
23+
datacenter: "{{ dc1 | basename }}"
24+
folder_type: vm
25+
validate_certs: false
26+
relative_path: "toplevel/child_folder"
2327

2428
# Testcase 0001: Get details about folders
2529
- name: get info about folders
2630
vmware_folder_info:
27-
<<: *vcenter_folder_data
31+
hostname: "{{ vcenter_hostname }}"
32+
username: "{{ vcenter_username }}"
33+
password: "{{ vcenter_password }}"
34+
datacenter: "{{ dc1 | basename }}"
35+
validate_certs: false
2836
register: folder_info_0001
2937

3038
- debug: var=folder_info_0001

tests/integration/targets/vmware_guest_move/tasks/main.yml

+6-7
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,15 @@
99
setup_virtualmachines: true
1010

1111
- name: Create a VM folder on given Datacenter
12-
vcenter_folder:
12+
vmware.vmware.folder:
1313
hostname: '{{ vcenter_hostname }}'
1414
username: '{{ vcenter_username }}'
1515
password: '{{ vcenter_password }}'
1616
datacenter: '{{ dc1 }}'
17-
folder_name: 'f1'
17+
relative_path: 'f1'
1818
folder_type: vm
1919
state: present
2020
validate_certs: false
21-
register: dest_folder
2221

2322
# Testcase 0001: Move vm and get changed status
2423
- name: Move VM (Changed)
@@ -30,7 +29,7 @@
3029
datacenter: '{{ dc1 }}'
3130
name: '{{ virtual_machines[0].name }}'
3231
# Depends-On: https://github.com/ansible/ansible/pull/55237
33-
dest_folder: '{{ dest_folder.result.path }}'
32+
dest_folder: '/{{ dc1 }}/vm/f1'
3433
register: vm_info_0001
3534

3635

@@ -44,7 +43,7 @@
4443
password: '{{ vcenter_password }}'
4544
datacenter: '{{ dc1 }}'
4645
name: '{{ virtual_machines[0].name }}'
47-
dest_folder: '{{ dest_folder.result.path }}'
46+
dest_folder: '/{{ dc1 }}/vm/f1'
4847
register: vm_info_0002
4948

5049
- debug:
@@ -70,12 +69,12 @@
7069
- vm_move_0003.changed
7170

7271
- name: Delete the f1 VM folder
73-
vcenter_folder:
72+
vmware.vmware.folder:
7473
hostname: '{{ vcenter_hostname }}'
7574
username: '{{ vcenter_username }}'
7675
password: '{{ vcenter_password }}'
7776
datacenter: '{{ dc1 }}'
78-
folder_name: 'f1'
77+
relative_path: 'f1'
7978
folder_type: vm
8079
state: absent
8180
validate_certs: false

0 commit comments

Comments
 (0)