Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 26 additions & 26 deletions docs/modules/networkpool.rst
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ Parameters


aggregation_mode (optional, str, None)
OneFS supports the following :literal:`NIC` aggregation modes.
OneFS supports the following \ :literal:`NIC`\ aggregation modes.



Expand All @@ -173,9 +173,9 @@ Parameters
verify_ssl (True, bool, None)
boolean variable to specify whether to validate SSL certificate or not.

:literal:`true` - indicates that the SSL certificate should be verified.
\ :literal:`true`\ - indicates that the SSL certificate should be verified.

:literal:`false` - indicates that the SSL certificate should not be verified.
\ :literal:`false`\ - indicates that the SSL certificate should not be verified.


api_user (True, str, None)
Expand All @@ -193,9 +193,9 @@ Notes
-----

.. note::
- The :emphasis:`check\_mode` is supported.
- The :emphasis:`diff` is supported.
- Removal of :emphasis:`sc\_dns\_zone\_aliases` is not supported.
- The \ :emphasis:`check\_mode`\ is supported.
- The \ :emphasis:`diff`\ is supported.
- Removal of \ :emphasis:`sc\_dns\_zone\_aliases`\ is not supported.
- The modules present in this collection named as 'dellemc.powerscale' are built to support the Dell PowerScale storage platform.


Expand All @@ -213,17 +213,17 @@ Examples
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
additional_pool_params:
ranges:
- low: "10.230.**.***"
high: "10.230.**.***"
range_state: "add"
ifaces:
- iface: "ext-1"
lnn: 1
iface_state: "add"
ranges:
- low: "10.230.**.***"
high: "10.230.**.***"
range_state: "add"
ifaces:
- iface: "ext-1"
lnn: 1
iface_state: "add"
sc_params:
sc_dns_zone: "10.230.**.***"
sc_connect_policy: "throughput"
Expand All @@ -239,7 +239,7 @@ Examples
prefix_len: 21
subnet: "10.**.**.**"
route_state: "add"
pool: "Test_Pool_2"
pool_name: "Test_Pool_2"
access_zone: "system"
state: "present"

Expand All @@ -249,9 +249,9 @@ Examples
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
pool: "Test_Pool_2"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
pool_name: "Test_Pool_2"
state: "present"

- name: Modify Network Pool
Expand All @@ -260,9 +260,9 @@ Examples
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
pool: "Test_Pool_2"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
pool_name: "Test_Pool_2"
additional_pool_params:
ranges:
- low: "10.230.**.***"
Expand Down Expand Up @@ -301,9 +301,9 @@ Examples
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
pool: "Test_Pool_2"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
pool_name: "Test_Pool_2"
state: "absent"

- name: Rename a network Pool
Expand Down
42 changes: 21 additions & 21 deletions plugins/modules/networkpool.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/usr/bin/python
# Copyright: (c) 2021-2024, Dell Technologies
# Copyright: (c) 2021-2025, Dell Technologies

# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)

Expand Down Expand Up @@ -197,17 +197,17 @@
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
additional_pool_params:
ranges:
- low: "10.230.**.***"
high: "10.230.**.***"
range_state: "add"
ifaces:
- iface: "ext-1"
lnn: 1
iface_state: "add"
ranges:
- low: "10.230.**.***"
high: "10.230.**.***"
range_state: "add"
ifaces:
- iface: "ext-1"
lnn: 1
iface_state: "add"
sc_params:
sc_dns_zone: "10.230.**.***"
sc_connect_policy: "throughput"
Expand All @@ -223,7 +223,7 @@
prefix_len: 21
subnet: "10.**.**.**"
route_state: "add"
pool: "Test_Pool_2"
pool_name: "Test_Pool_2"
access_zone: "system"
state: "present"

Expand All @@ -233,9 +233,9 @@
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
pool: "Test_Pool_2"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
pool_name: "Test_Pool_2"
state: "present"

- name: Modify Network Pool
Expand All @@ -244,9 +244,9 @@
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
pool: "Test_Pool_2"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
pool_name: "Test_Pool_2"
additional_pool_params:
ranges:
- low: "10.230.**.***"
Expand Down Expand Up @@ -285,9 +285,9 @@
api_user: "{{api_user}}"
api_password: "{{api_password}}"
verify_ssl: "{{verify_ssl}}"
groupnet: "groupnet0"
subnet: "subnet0"
pool: "Test_Pool_2"
groupnet_name: "groupnet0"
subnet_name: "subnet0"
pool_name: "Test_Pool_2"
state: "absent"

- name: Rename a network Pool
Expand Down
2 changes: 1 addition & 1 deletion plugins/modules/user_mapping_rule.py
Original file line number Diff line number Diff line change
Expand Up @@ -761,7 +761,7 @@ def handle(self, user_mapping_rule_object, user_mapping_rule_params):
error_message = "apply_order should be greater than 0."
LOG.error(error_message)
user_mapping_rule_object.module.fail_json(msg=error_message)
if user_mapping_rule_params['apply_order'] is not None and user_mapping_rule_params['state'] == 'present':
if 'apply_order' in user_mapping_rule_params and user_mapping_rule_params['apply_order'] is not None and user_mapping_rule_params['state'] == 'present':
user_mapping_rule_details = user_mapping_rule_object.get_rule_details(
user_mapping_rule_params['apply_order'], user_mapping_rule_params['access_zone'])
user_mapping_rule_object.result['user_mapping_rule_details'] = user_mapping_rule_details
Expand Down