From 947552019460422723f8588832528c5a75fb1b99 Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 20 Apr 2022 07:49:40 +0300 Subject: [PATCH 01/10] add mac_addresses parameter --- .../modules/net_tools/pritunl/pritunl_user.py | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 7ea4f18a44d..4f7a9e68ee0 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -82,20 +82,30 @@ default: null description: - Enable/Disable Gravatar usage for the user I(user_name). + + user_mac_addresses: + type: list + elements: str + required: false + default: null + description: + - Allowed MAC Addresses for the user I(user_name). """ EXAMPLES = """ - name: Create the user Foo with email address foo@bar.com in MyOrg community.general.pritunl_user: state: present - name: MyOrg + organization: MyOrg user_name: Foo user_email: foo@bar.com + user_mac_addresses: + - "00:00:00:00:00:99" - name: Disable the user Foo but keep it in Pritunl community.general.pritunl_user: state: present - name: MyOrg + organization: MyOrg user_name: Foo user_email: foo@bar.com user_disabled: yes @@ -103,7 +113,7 @@ - name: Make sure the user Foo is not part of MyOrg anymore community.general.pritunl_user: state: absent - name: MyOrg + organization: MyOrg user_name: Foo """ @@ -153,7 +163,7 @@ post_pritunl_user, pritunl_argument_spec, ) - +record_ids=dict(type='list', elements='str'), def add_or_update_pritunl_user(module): result = {} @@ -167,6 +177,7 @@ def add_or_update_pritunl_user(module): "groups": module.params.get("user_groups"), "disabled": module.params.get("user_disabled"), "gravatar": module.params.get("user_gravatar"), + "mac_addresses": module.params.get("user_mac_addresses"), "type": module.params.get("user_type"), } @@ -323,6 +334,7 @@ def main(): user_groups=dict(required=False, type="list", elements="str", default=None), user_disabled=dict(required=False, type="bool", default=None), user_gravatar=dict(required=False, type="bool", default=None), + user_mac_addresses=dict(required=False, type="list", elements="str", default=None), ) ), From 6b7fcdf1d47b911f56b5d345bddb548eb85c8b85 Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 20 Apr 2022 07:57:41 +0300 Subject: [PATCH 02/10] add changelog --- .../fragments/4535-pritunl-add-mac_addresses-parameter.yml | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml diff --git a/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml b/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml new file mode 100644 index 00000000000..529b0e7f379 --- /dev/null +++ b/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml @@ -0,0 +1,3 @@ +--- +minor_changes: + - pritunl_user - add ``mac_addresses`` parameter From 4865e69894399a752695ab79319c1ea48e9b5eca Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 20 Apr 2022 08:00:19 +0300 Subject: [PATCH 03/10] remove debug line --- plugins/modules/net_tools/pritunl/pritunl_user.py | 1 - 1 file changed, 1 deletion(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 4f7a9e68ee0..aec66df0cac 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -163,7 +163,6 @@ post_pritunl_user, pritunl_argument_spec, ) -record_ids=dict(type='list', elements='str'), def add_or_update_pritunl_user(module): result = {} From 12ba6b029ecbe002c7e01c87fc726551d9515e6b Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 20 Apr 2022 08:12:21 +0300 Subject: [PATCH 04/10] add second blank line --- plugins/modules/net_tools/pritunl/pritunl_user.py | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index aec66df0cac..93b7a1180a4 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -164,6 +164,7 @@ pritunl_argument_spec, ) + def add_or_update_pritunl_user(module): result = {} From 24668aef29e787d222b2815d8ef4f1fa7646cc45 Mon Sep 17 00:00:00 2001 From: vadim Date: Wed, 27 Apr 2022 18:18:14 +0100 Subject: [PATCH 05/10] add mac_addresses comparision --- plugins/modules/net_tools/pritunl/pritunl_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 93b7a1180a4..27fe78b06ea 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -216,7 +216,7 @@ def add_or_update_pritunl_user(module): user_params[key] = users[0][key] # 'groups' is a list comparison - if key == "groups": + if key == "groups" or key == "mac_addresses": if set(users[0][key]) != set(user_params[key]): user_params_changed = True From 564f77763608fb1c8d4e28365c7d6071bd6bf9f0 Mon Sep 17 00:00:00 2001 From: vvatlin Date: Wed, 20 Apr 2022 11:39:43 +0300 Subject: [PATCH 06/10] Update changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml Co-authored-by: Felix Fontein --- .../fragments/4535-pritunl-add-mac_addresses-parameter.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml b/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml index 529b0e7f379..8a0626865d6 100644 --- a/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml +++ b/changelogs/fragments/4535-pritunl-add-mac_addresses-parameter.yml @@ -1,3 +1,3 @@ --- minor_changes: - - pritunl_user - add ``mac_addresses`` parameter + - pritunl_user - add ``mac_addresses`` parameter (https://github.com/ansible-collections/community.general/pull/4535). From 852a9da229dee1b0180001ff4c4f4afeb71af8a9 Mon Sep 17 00:00:00 2001 From: vvatlin Date: Wed, 20 Apr 2022 11:39:50 +0300 Subject: [PATCH 07/10] Update plugins/modules/net_tools/pritunl/pritunl_user.py Co-authored-by: Felix Fontein --- plugins/modules/net_tools/pritunl/pritunl_user.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 27fe78b06ea..702d9576a81 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -86,8 +86,6 @@ user_mac_addresses: type: list elements: str - required: false - default: null description: - Allowed MAC Addresses for the user I(user_name). """ From 190dc05ad9b46f927049f2ddfcb2347827f014c1 Mon Sep 17 00:00:00 2001 From: vvatlin Date: Wed, 20 Apr 2022 11:39:56 +0300 Subject: [PATCH 08/10] Update plugins/modules/net_tools/pritunl/pritunl_user.py Co-authored-by: Felix Fontein --- plugins/modules/net_tools/pritunl/pritunl_user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 702d9576a81..830d72f4048 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -87,7 +87,8 @@ type: list elements: str description: - - Allowed MAC Addresses for the user I(user_name). + - Allowed MAC addresses for the user I(user_name). + version_added: 4.8.0 """ EXAMPLES = """ From 56362a2cdf34abc52fb164aaeb4815c1648f5dda Mon Sep 17 00:00:00 2001 From: vvatlin Date: Wed, 27 Apr 2022 18:39:34 +0100 Subject: [PATCH 09/10] Update plugins/modules/net_tools/pritunl/pritunl_user.py Co-authored-by: Felix Fontein --- plugins/modules/net_tools/pritunl/pritunl_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 830d72f4048..194eb784b4d 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -88,7 +88,7 @@ elements: str description: - Allowed MAC addresses for the user I(user_name). - version_added: 4.8.0 + version_added: 5.0.0 """ EXAMPLES = """ From ffa2c9e5f67d96b73720e8134a6fe5815a14cd71 Mon Sep 17 00:00:00 2001 From: vvatlin Date: Thu, 28 Apr 2022 12:10:39 +0100 Subject: [PATCH 10/10] Update plugins/modules/net_tools/pritunl/pritunl_user.py Co-authored-by: Felix Fontein --- plugins/modules/net_tools/pritunl/pritunl_user.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/modules/net_tools/pritunl/pritunl_user.py b/plugins/modules/net_tools/pritunl/pritunl_user.py index 194eb784b4d..0beb9720b61 100644 --- a/plugins/modules/net_tools/pritunl/pritunl_user.py +++ b/plugins/modules/net_tools/pritunl/pritunl_user.py @@ -214,7 +214,7 @@ def add_or_update_pritunl_user(module): if user_params[key] is None: user_params[key] = users[0][key] - # 'groups' is a list comparison + # 'groups' and 'mac_addresses' are list comparison if key == "groups" or key == "mac_addresses": if set(users[0][key]) != set(user_params[key]): user_params_changed = True