Release 3.5.0.

* Support older version of psutil (RHEL7 and RHEL6)

The psutil python module is a true mess, they changed the API twice. The function arguments, as well as the objects that are returned.
The documentation does not make it clear which version supports what so the safest implementation is this waterfall approach.

A better approach would be to inspect the returned information, rather than trust a version, but that would not be any more efficient.
In the end it is better to have something that at least works out-of-the-box on all platforms than something that requires custom updates to system packages before it works as expected. Especially for something as basic as `pids`.

* A little bit more concise

* Apply suggestions from code review

* Add changelog fragment.

Co-authored-by: Felix Fontein <felix@fontein.de>
(cherry picked from commit b5d6457611)

Co-authored-by: Dag Wieers <dag@wieers.com>

.azure-pipelines/azure-pipelines.yml

@@ -24,15 +24,14 @@ schedules:
     always: true
     branches:
       include:
+        - stable-2
         - stable-3
-        - stable-4
   - cron: 0 11 * * 0
     displayName: Weekly (old stable branches)
     always: true
     branches:
       include:
         - stable-1
-        - stable-2
 
 variables:
   - name: checkoutPath
@@ -69,19 +68,6 @@ stages:
             - test: 3
             - test: 4
             - test: extra
-  - stage: Sanity_2_12
-    displayName: Sanity 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Test {0}
-          testFormat: 2.12/sanity/{0}
-          targets:
-            - test: 1
-            - test: 2
-            - test: 3
-            - test: 4
   - stage: Sanity_2_11
     displayName: Sanity 2.11
     dependsOn: []
@@ -130,22 +116,6 @@ stages:
         parameters:
           nameFormat: Python {0}
           testFormat: devel/units/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.5
-            - test: 3.6
-            - test: 3.7
-            - test: 3.8
-            - test: 3.9
-            - test: '3.10'
-  - stage: Units_2_12
-    displayName: Units 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.12/units/{0}/1
           targets:
             - test: 2.6
             - test: 2.7
@@ -153,6 +123,7 @@ stages:
             - test: 3.6
             - test: 3.7
             - test: 3.8
+            - test: 3.9
             - test: '3.10'
   - stage: Units_2_11
     displayName: Units 2.11
@@ -179,8 +150,13 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.10/units/{0}/1
           targets:
+            - test: 2.6
             - test: 2.7
+            - test: 3.5
             - test: 3.6
+            - test: 3.7
+            - test: 3.8
+            - test: 3.9
   - stage: Units_2_9
     displayName: Units 2.9
     dependsOn: []
@@ -210,8 +186,8 @@ stages:
               test: macos/11.1
             - name: RHEL 7.9
               test: rhel/7.9
-            - name: RHEL 8.5
-              test: rhel/8.5
+            - name: RHEL 8.4
+              test: rhel/8.4
             - name: FreeBSD 12.2
               test: freebsd/12.2
             - name: FreeBSD 13.0
@@ -220,23 +196,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Remote_2_12
-    displayName: Remote 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/{0}
-          targets:
-            - name: macOS 11.1
-              test: macos/11.1
-            - name: RHEL 8.4
-              test: rhel/8.4
-            - name: FreeBSD 13.0
-              test: freebsd/13.0
-          groups:
-            - 1
-            - 2
   - stage: Remote_2_11
     displayName: Remote 2.11
     dependsOn: []
@@ -245,6 +204,8 @@ stages:
         parameters:
           testFormat: 2.11/{0}
           targets:
+            - name: macOS 11.1
+              test: macos/11.1
             - name: RHEL 7.9
               test: rhel/7.9
             - name: RHEL 8.3
@@ -266,6 +227,14 @@ stages:
               test: osx/10.11
             - name: macOS 10.15
               test: macos/10.15
+            - name: macOS 11.1
+              test: macos/11.1
+            - name: RHEL 7.8
+              test: rhel/7.8
+            - name: RHEL 8.2
+              test: rhel/8.2
+            - name: FreeBSD 12.1
+              test: freebsd/12.1
           groups:
             - 1
             - 2
@@ -279,8 +248,6 @@ stages:
           targets:
             - name: RHEL 8.2
               test: rhel/8.2
-            - name: RHEL 7.8
-              test: rhel/7.8
             - name: FreeBSD 12.0
               test: freebsd/12.0
           groups:
@@ -296,12 +263,16 @@ stages:
         parameters:
           testFormat: devel/linux/{0}
           targets:
+            - name: CentOS 6
+              test: centos6
             - name: CentOS 7
               test: centos7
+            - name: CentOS 8
+              test: centos8
+            - name: Fedora 33
+              test: fedora33
             - name: Fedora 34
               test: fedora34
-            - name: Fedora 35
-              test: fedora35
             - name: openSUSE 15 py2
               test: opensuse15py2
             - name: openSUSE 15 py3
@@ -314,28 +285,6 @@ stages:
             - 1
             - 2
             - 3
-  - stage: Docker_2_12
-    displayName: Docker 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          testFormat: 2.12/linux/{0}
-          targets:
-            - name: CentOS 6
-              test: centos6
-            - name: CentOS 8
-              test: centos8
-            - name: Fedora 34
-              test: fedora34
-            - name: openSUSE 15 py3
-              test: opensuse15
-            - name: Ubuntu 20.04
-              test: ubuntu2004
-          groups:
-            - 1
-            - 2
-            - 3
   - stage: Docker_2_11
     displayName: Docker 2.11
     dependsOn: []
@@ -344,12 +293,14 @@ stages:
         parameters:
           testFormat: 2.11/linux/{0}
           targets:
-            - name: CentOS 7
-              test: centos7
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 33
               test: fedora33
-            - name: openSUSE 15 py2
-              test: opensuse15py2
+            - name: openSUSE 15 py3
+              test: opensuse15
+            - name: Ubuntu 20.04
+              test: ubuntu2004
           groups:
             - 2
             - 3
@@ -361,8 +312,12 @@ stages:
         parameters:
           testFormat: 2.10/linux/{0}
           targets:
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 32
               test: fedora32
+            - name: openSUSE 15 py3
+              test: opensuse15
             - name: Ubuntu 16.04
               test: ubuntu1604
           groups:
@@ -376,6 +331,8 @@ stages:
         parameters:
           testFormat: 2.9/linux/{0}
           targets:
+            - name: CentOS 8
+              test: centos8
             - name: Fedora 31
               test: fedora31
             - name: openSUSE 15 py3
@@ -393,17 +350,6 @@ stages:
         parameters:
           nameFormat: Python {0}
           testFormat: devel/cloud/{0}/1
-          targets:
-            - test: 2.7
-            - test: 3.9
-  - stage: Cloud_2_12
-    displayName: Cloud 2.12
-    dependsOn: []
-    jobs:
-      - template: templates/matrix.yml
-        parameters:
-          nameFormat: Python {0}
-          testFormat: 2.12/cloud/{0}/1
           targets:
             - test: 3.8
   - stage: Cloud_2_11
@@ -415,6 +361,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.11/cloud/{0}/1
           targets:
+            - test: 2.7
             - test: 3.6
   - stage: Cloud_2_10
     displayName: Cloud 2.10
@@ -425,7 +372,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.10/cloud/{0}/1
           targets:
-            - test: 3.5
+            - test: 3.6
   - stage: Cloud_2_9
     displayName: Cloud 2.9
     dependsOn: []
@@ -435,7 +382,7 @@ stages:
           nameFormat: Python {0}
           testFormat: 2.9/cloud/{0}/1
           targets:
-            - test: 2.7
+            - test: 3.6
   - stage: Summary
     condition: succeededOrFailed()
     dependsOn:
@@ -443,26 +390,21 @@ stages:
       - Sanity_2_9
       - Sanity_2_10
       - Sanity_2_11
-      - Sanity_2_12
       - Units_devel
       - Units_2_9
       - Units_2_10
       - Units_2_11
-      - Units_2_12
       - Remote_devel
       - Remote_2_9
       - Remote_2_10
       - Remote_2_11
-      - Remote_2_12
       - Docker_devel
       - Docker_2_9
       - Docker_2_10
       - Docker_2_11
-      - Docker_2_12
       - Cloud_devel
       - Cloud_2_9
       - Cloud_2_10
       - Cloud_2_11
-      - Cloud_2_12
     jobs:
       - template: templates/coverage.yml

.azure-pipelines/scripts/aggregate-coverage.sh

@@ -11,7 +11,7 @@ mkdir "${agent_temp_directory}/coverage/"
 
 options=(--venv --venv-system-site-packages --color -v)
 
-ansible-test coverage combine --group-by command --export "${agent_temp_directory}/coverage/" "${options[@]}"
+ansible-test coverage combine --export "${agent_temp_directory}/coverage/" "${options[@]}"
 
 if ansible-test coverage analyze targets generate --help >/dev/null 2>&1; then
     # Only analyze coverage if the installed version of ansible-test supports it.

.azure-pipelines/scripts/publish-codecov.py

@@ -1,101 +0,0 @@
-#!/usr/bin/env python
-"""
-Upload code coverage reports to codecov.io.
-Multiple coverage files from multiple languages are accepted and aggregated after upload.
-Python coverage, as well as PowerShell and Python stubs can all be uploaded.
-"""
-
-import argparse
-import dataclasses
-import pathlib
-import shutil
-import subprocess
-import tempfile
-import typing as t
-import urllib.request
-
-
-@dataclasses.dataclass(frozen=True)
-class CoverageFile:
-    name: str
-    path: pathlib.Path
-    flags: t.List[str]
-
-
-@dataclasses.dataclass(frozen=True)
-class Args:
-    dry_run: bool
-    path: pathlib.Path
-
-
-def parse_args() -> Args:
-    parser = argparse.ArgumentParser()
-    parser.add_argument('-n', '--dry-run', action='store_true')
-    parser.add_argument('path', type=pathlib.Path)
-
-    args = parser.parse_args()
-
-    # Store arguments in a typed dataclass
-    fields = dataclasses.fields(Args)
-    kwargs = {field.name: getattr(args, field.name) for field in fields}
-
-    return Args(**kwargs)
-
-
-def process_files(directory: pathlib.Path) -> t.Tuple[CoverageFile, ...]:
-    processed = []
-    for file in directory.joinpath('reports').glob('coverage*.xml'):
-        name = file.stem.replace('coverage=', '')
-
-        # Get flags from name
-        flags = name.replace('-powershell', '').split('=')  # Drop '-powershell' suffix
-        flags = [flag if not flag.startswith('stub') else flag.split('-')[0] for flag in flags]  # Remove "-01" from stub files
-
-        processed.append(CoverageFile(name, file, flags))
-
-    return tuple(processed)
-
-
-def upload_files(codecov_bin: pathlib.Path, files: t.Tuple[CoverageFile, ...], dry_run: bool = False) -> None:
-    for file in files:
-        cmd = [
-            str(codecov_bin),
-            '--name', file.name,
-            '--file', str(file.path),
-        ]
-        for flag in file.flags:
-            cmd.extend(['--flags', flag])
-
-        if dry_run:
-            print(f'DRY-RUN: Would run command: {cmd}')
-            continue
-
-        subprocess.run(cmd, check=True)
-
-
-def download_file(url: str, dest: pathlib.Path, flags: int, dry_run: bool = False) -> None:
-    if dry_run:
-        print(f'DRY-RUN: Would download {url} to {dest} and set mode to {flags:o}')
-        return
-
-    with urllib.request.urlopen(url) as resp:
-        with dest.open('w+b') as f:
-            # Read data in chunks rather than all at once
-            shutil.copyfileobj(resp, f, 64 * 1024)
-
-    dest.chmod(flags)
-
-
-def main():
-    args = parse_args()
-    url = 'https://ansible-ci-files.s3.amazonaws.com/codecov/linux/codecov'
-    with tempfile.TemporaryDirectory(prefix='codecov-') as tmpdir:
-        codecov_bin = pathlib.Path(tmpdir) / 'codecov'
-        download_file(url, codecov_bin, 0o755, args.dry_run)
-
-        files = process_files(args.path)
-        upload_files(codecov_bin, files, args.dry_run)
-
-
-if __name__ == '__main__':
-    main()

.azure-pipelines/scripts/publish-codecov.sh

@@ -0,0 +1,27 @@
+#!/usr/bin/env bash
+# Upload code coverage reports to codecov.io.
+# Multiple coverage files from multiple languages are accepted and aggregated after upload.
+# Python coverage, as well as PowerShell and Python stubs can all be uploaded.
+
+set -o pipefail -eu
+
+output_path="$1"
+
+curl --silent --show-error https://ansible-ci-files.s3.us-east-1.amazonaws.com/codecov/codecov.sh > codecov.sh
+
+for file in "${output_path}"/reports/coverage*.xml; do
+    name="${file}"
+    name="${name##*/}"  # remove path
+    name="${name##coverage=}"  # remove 'coverage=' prefix if present
+    name="${name%.xml}"  # remove '.xml' suffix
+
+    bash codecov.sh \
+        -f "${file}" \
+        -n "${name}" \
+        -X coveragepy \
+        -X gcov \
+        -X fix \
+        -X search \
+        -X xcode \
+        || echo "Failed to upload code coverage report to codecov.io: ${file}"
+done

.azure-pipelines/scripts/report-coverage.sh

@@ -12,4 +12,4 @@ if ! ansible-test --help >/dev/null 2>&1; then
     pip install https://github.com/ansible/ansible/archive/devel.tar.gz --disable-pip-version-check
 fi
 
-ansible-test coverage xml --group-by command --stub --venv --venv-system-site-packages --color -v
+ansible-test coverage xml --stub --venv --venv-system-site-packages --color -v

.azure-pipelines/templates/coverage.yml

@@ -33,7 +33,7 @@ jobs:
           summaryFileLocation: "$(outputPath)/reports/$(pipelinesCoverage).xml"
         displayName: Publish to Azure Pipelines
         condition: gt(variables.coverageFileCount, 0)
-      - bash: .azure-pipelines/scripts/publish-codecov.py "$(outputPath)"
+      - bash: .azure-pipelines/scripts/publish-codecov.sh "$(outputPath)"
         displayName: Publish to codecov.io
         condition: gt(variables.coverageFileCount, 0)
         continueOnError: true

.github/BOTMETA.yml

@@ -1,8 +1,7 @@
-notifications: true
 automerge: true
 files:
   plugins/:
-    supershipit: quidame
+    supershipit: quidame Ajpantuso
   changelogs/: {}
   changelogs/fragments/:
     support: community
@@ -49,9 +48,6 @@ files:
     maintainers: dagwieers
   $callbacks/diy.py:
     maintainers: theque5t
-  $callbacks/elastic.py:
-    maintainers: v1v
-    keywords: apm observability
   $callbacks/hipchat.py: {}
   $callbacks/jabber.py: {}
   $callbacks/loganalytics.py:
@@ -66,9 +62,6 @@ files:
   $callbacks/nrdp.py:
     maintainers: rverchere
   $callbacks/null.py: {}
-  $callbacks/opentelemetry.py:
-    maintainers: v1v
-    keywords: opentelemetry observability
   $callbacks/say.py:
     notify: chris-short
     maintainers: $team_macos
@@ -138,8 +131,6 @@ files:
   $filters/random_mac.py: {}
   $filters/time.py:
     maintainers: resmo
-  $filters/unicode_normalize.py:
-    maintainers: Ajpantuso
   $filters/version_sort.py:
     maintainers: ericzolf
   $inventories/:
@@ -156,17 +147,9 @@ files:
     maintainers: conloos
   $inventories/nmap.py: {}
   $inventories/online.py:
-    maintainers: remyleone
-  $inventories/opennebula.py:
-    maintainers: feldsam
-    labels: cloud opennebula
-    keywords: opennebula dynamic inventory script
+    maintainers: sieben
   $inventories/proxmox.py:
     maintainers: $team_virt ilijamt
-  $inventories/xen_orchestra.py:
-    maintainers: shinuza
-  $inventories/icinga2.py:
-    maintainers: bongoeadgc6
   $inventories/scaleway.py:
     maintainers: $team_scaleway
     labels: cloud scaleway
@@ -177,8 +160,6 @@ files:
     labels: lookups
   $lookups/cartesian.py: {}
   $lookups/chef_databag.py: {}
-  $lookups/collection_version.py:
-    maintainers: felixfontein
   $lookups/consul_kv.py: {}
   $lookups/credstash.py: {}
   $lookups/cyberarkpassword.py:
@@ -192,7 +173,7 @@ files:
   $lookups/dnstxt.py:
     maintainers: jpmens
   $lookups/dsv.py:
-    maintainers: amigus endlesstrax
+    maintainers: amigus
   $lookups/etcd3.py:
     maintainers: eric-belhomme
   $lookups/etcd.py:
@@ -209,6 +190,9 @@ files:
   $lookups/manifold.py:
     maintainers: galanoff
     labels: manifold
+  $lookups/nios:
+    maintainers: $team_networking sganesh-infoblox
+    labels: infoblox networking
   $lookups/onepass:
     maintainers: samdoran
     labels: onepassword
@@ -221,15 +205,11 @@ files:
     maintainers: Akasurde
   $lookups/random_string.py:
     maintainers: Akasurde
-  $lookups/random_words.py:
-    maintainers: konstruktoid
   $lookups/redis.py:
     maintainers: $team_ansible_core jpmens
-  $lookups/revbitspss.py:
-    maintainers: RevBits
   $lookups/shelvefile.py: {}
   $lookups/tss.py:
-    maintainers: amigus endlesstrax
+    maintainers: amigus
   $module_utils/:
     labels: module_utils
   $module_utils/gitlab.py:
@@ -258,6 +238,9 @@ files:
   $module_utils/module_helper.py:
     maintainers: russoz
     labels: module_helper
+  $module_utils/net_tools/nios/api.py:
+    maintainers: $team_networking sganesh-infoblox
+    labels: infoblox networking
   $module_utils/oracle/oci_utils.py:
     maintainers: $team_oracle
     labels: cloud
@@ -341,7 +324,7 @@ files:
   $modules/cloud/oneandone/:
     maintainers: aajdinov edevenport
   $modules/cloud/online/:
-    maintainers: remyleone
+    maintainers: sieben
   $modules/cloud/opennebula/:
     maintainers: $team_opennebula
   $modules/cloud/opennebula/one_host.py:
@@ -411,11 +394,11 @@ files:
   $modules/cloud/scaleway/scaleway_ip_info.py:
     maintainers: Spredzy
   $modules/cloud/scaleway/scaleway_organization_info.py:
-    maintainers: Spredzy
+    maintainers: sieben Spredzy
   $modules/cloud/scaleway/scaleway_security_group.py:
     maintainers: DenBeke
   $modules/cloud/scaleway/scaleway_security_group_info.py:
-    maintainers: Spredzy
+    maintainers: sieben Spredzy
   $modules/cloud/scaleway/scaleway_security_group_rule.py:
     maintainers: DenBeke
   $modules/cloud/scaleway/scaleway_server_info.py:
@@ -475,20 +458,11 @@ files:
     maintainers: slok
   $modules/database/misc/redis_info.py:
     maintainers: levonet
-  $modules/database/misc/redis_data_info.py:
-    maintainers: paginabianca
-  $modules/database/misc/redis_data.py:
-    maintainers: paginabianca
-  $modules/database/misc/redis_data_incr.py:
-    maintainers: paginabianca
   $modules/database/misc/riak.py:
     maintainers: drewkerrigan jsmartin
   $modules/database/mssql/mssql_db.py:
     maintainers: vedit Jmainguy kenichi-ogawa-1988
     labels: mssql_db
-  $modules/database/mssql/mssql_script.py:
-    maintainers: kbudde
-    labels: mssql_script
   $modules/database/saphana/hana_query.py:
     maintainers: rainerleber
   $modules/database/vertica/:
@@ -532,14 +506,10 @@ files:
     maintainers: Gaetan2907
   $modules/identity/keycloak/keycloak_group.py:
     maintainers: adamgoossens
-  $modules/identity/keycloak/keycloak_identity_provider.py:
-    maintainers: laurpaum
   $modules/identity/keycloak/keycloak_realm.py:
     maintainers: kris2kris
   $modules/identity/keycloak/keycloak_role.py:
     maintainers: laurpaum
-  $modules/identity/keycloak/keycloak_user_federation.py:
-    maintainers: laurpaum
   $modules/identity/onepassword_info.py:
     maintainers: Rylon
   $modules/identity/opendj/opendj_backendprop.py:
@@ -619,8 +589,6 @@ files:
     labels: cloudflare_dns
   $modules/net_tools/dnsimple.py:
     maintainers: drcapulet
-  $modules/net_tools/dnsimple_info.py:
-    maintainers: edhilgendorf
   $modules/net_tools/dnsmadeeasy.py:
     maintainers: briceburg
   $modules/net_tools/gandi_livedns.py:
@@ -656,6 +624,31 @@ files:
     maintainers: amasolov nerzhul
   $modules/net_tools/pritunl/:
     maintainers: Lowess
+  $modules/net_tools/nios/:
+    maintainers: $team_networking
+    labels: infoblox networking
+  $modules/net_tools/nios/nios_a_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_aaaa_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_cname_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_fixed_address.py:
+    maintainers: sjaiswal
+  $modules/net_tools/nios/nios_member.py:
+    maintainers: krisvasudevan
+  $modules/net_tools/nios/nios_mx_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_naptr_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_nsgroup.py:
+    maintainers: ebirn sjaiswal
+  $modules/net_tools/nios/nios_ptr_record.py:
+    maintainers: clementtrebuchet
+  $modules/net_tools/nios/nios_srv_record.py:
+    maintainers: brampling
+  $modules/net_tools/nios/nios_txt_record.py:
+    maintainers: coreywan
   $modules/net_tools/nmcli.py:
     maintainers: alcamie101
   $modules/net_tools/snmp_facts.py:
@@ -745,8 +738,6 @@ files:
     ignore: jle64
   $modules/packaging/language/pip_package_info.py:
     maintainers: bcoca matburt maxamillion
-  $modules/packaging/language/pipx.py:
-    maintainers: russoz
   $modules/packaging/language/yarn.py:
     maintainers: chrishoffman verkaufer
   $modules/packaging/os/apk.py:
@@ -759,8 +750,6 @@ files:
     maintainers: evgkrsk
   $modules/packaging/os/copr.py:
     maintainers: schlupov
-  $modules/packaging/os/dnf_versionlock.py:
-    maintainers: moreda
   $modules/packaging/os/flatpak.py:
     maintainers: $team_flatpak
   $modules/packaging/os/flatpak_remote.py:
@@ -857,9 +846,6 @@ files:
   $modules/packaging/os/snap.py:
     maintainers: angristan vcarceler
     labels: snap
-  $modules/packaging/os/snap_alias.py:
-    maintainers: russoz
-    labels: snap
   $modules/packaging/os/sorcery.py:
     maintainers: vaygr
   $modules/packaging/os/svr4pkg.py:
@@ -953,8 +939,6 @@ files:
     maintainers: SamyCoenen
   $modules/source_control/gitlab/gitlab_user.py:
     maintainers: LennertMertens stgrace
-  $modules/source_control/gitlab/gitlab_branch.py:
-    maintainers: paytroff
   $modules/source_control/hg.py:
     maintainers: yeukhon
   $modules/storage/emc/emc_vnx_sg_member.py:
@@ -1117,13 +1101,11 @@ files:
   $modules/web_infrastructure/apache2_mod_proxy.py:
     maintainers: oboukili
   $modules/web_infrastructure/apache2_module.py:
-    maintainers: berendt n0trax
-    ignore: robinro
+    maintainers: berendt n0trax robinro
   $modules/web_infrastructure/deploy_helper.py:
     maintainers: ramondelafuente
   $modules/web_infrastructure/django_manage.py:
-    maintainers: russoz
-    ignore: scottanderson42 tastychutney
+    maintainers: scottanderson42 russoz tastychutney
     labels: django_manage
   $modules/web_infrastructure/ejabberd_user.py:
     maintainers: privateip
@@ -1154,10 +1136,6 @@ files:
     maintainers: nerzhul
   $modules/web_infrastructure/rundeck_project.py:
     maintainers: nerzhul
-  $modules/web_infrastructure/rundeck_job_run.py:
-    maintainers: phsmith
-  $modules/web_infrastructure/rundeck_job_executions_info.py:
-    maintainers: phsmith
   $modules/web_infrastructure/sophos_utm/:
     maintainers: $team_e_spirit
     keywords: sophos utm
@@ -1179,8 +1157,6 @@ files:
     maintainers: inetfuture mattupstate
   $modules/web_infrastructure/taiga_issue.py:
     maintainers: lekum
-  $tests/a_module.py:
-    maintainers: felixfontein
 #########################
   tests/:
     labels: tests
@@ -1207,7 +1183,6 @@ macros:
   module_utils: plugins/module_utils
   modules: plugins/modules
   terminals: plugins/terminal
-  tests: plugins/test
   team_ansible_core:
   team_aix: MorrisA bcoca d-little flynn1973 gforster kairoaraujo marvin-sinister mator molekuul ramooncamacho wtcross
   team_bsd: JoergFiedler MacLemon bcoca dch jasperla mekanix opoplawski overhacked tuxillo
@@ -1215,7 +1190,7 @@ macros:
   team_cyberark_conjur: jvanderhoof ryanprior
   team_e_spirit: MatrixCrawler getjack
   team_flatpak: JayKayy oolongbrothers
-  team_gitlab: Lunik Shaps dj-wasabi marwatk waheedi zanssa scodeman metanovii sh0shin
+  team_gitlab: Lunik Shaps dj-wasabi marwatk waheedi zanssa scodeman metanovii
   team_hpux: bcoca davx8342
   team_huawei: QijunPan TommyLike edisonxiang freesky-edward hwDCN niuzhenguo xuxiaowei0512 yanzhangi zengchen1024 zhongjun2
   team_ipa: Akasurde Nosmoht fxfitz justchris1
@@ -1228,9 +1203,9 @@ macros:
   team_opennebula: ilicmilan meerkampdvv rsmontero xorel nilsding
   team_oracle: manojmeda mross22 nalsaber
   team_purestorage: bannaych dnix101 genegr lionmax opslounge raekins sdodsley sile16
-  team_redfish: mraineri tomasg2012 xmadsen renxulei rajeevkallur bhavya06
+  team_redfish: mraineri tomasg2012 xmadsen renxulei
   team_rhn: FlossWare alikins barnabycourt vritant
-  team_scaleway: remyleone abarbare
+  team_scaleway: QuentinBrosse abarbare jerome-quere kindermoumoute remyleone sieben
   team_solaris: bcoca fishman jasperla jpdasma mator scathatheworm troy2914 xen0l
   team_suse: commel dcermak evrardjp lrupp toabctl AnderEnder alxgu andytom sealor
   team_virt: joshainglis karmab tleguern Thulium-Drake Ajpantuso

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -62,20 +62,6 @@ body:
   validations:
     required: true
 
-- type: textarea
-  attributes:
-    label: Community.general Version
-    description: >-
-      Paste verbatim output from "ansible-galaxy collection list community.general"
-      between tripple backticks.
-    value: |
-      ```console (paste below)
-      $ ansible-galaxy collection list community.general
-
-      ```
-  validations:
-    required: true
-
 - type: textarea
   attributes:
     label: Configuration

.github/ISSUE_TEMPLATE/documentation_report.yml

@@ -62,20 +62,6 @@ body:
   validations:
     required: false
 
-- type: textarea
-  attributes:
-    label: Community.general Version
-    description: >-
-      Paste verbatim output from "ansible-galaxy collection list community.general"
-      between tripple backticks.
-    value: |
-      ```console (paste below)
-      $ ansible-galaxy collection list community.general
-
-      ```
-  validations:
-    required: true
-
 - type: textarea
   attributes:
     label: Configuration

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -21,7 +21,7 @@ body:
     placeholder: >-
       I am trying to do X with the collection from the main branch on GitHub and
       I think that implementing a feature Y would be very helpful for me and
-      every other user of community.general because of Z.
+      every other user of ansible-core because of Z.
   validations:
     required: true
 

.github/dependabot.yml

@@ -1,6 +0,0 @@
-version: 2
-updates:
-  - package-ecosystem: "github-actions"
-    directory: "/"
-    interval:
-      schedule: "weekly"

CONTRIBUTING.md

@@ -26,7 +26,6 @@ Also, consider taking up a valuable, reviewed, but abandoned pull request which
 * Do not squash your commits and force-push to your branch if not needed. Reviews of your pull request are much easier with individual commits to comprehend the pull request history. All commits of your pull request branch will be squashed into one commit by GitHub upon merge.
 * Do not add merge commits to your PR. The bot will complain and you will have to rebase ([instructions for rebasing](https://docs.ansible.com/ansible/latest/dev_guide/developing_rebasing.html)) to remove them before your PR can be merged. To avoid that git automatically does merges during pulls, you can configure it to do rebases instead by running `git config pull.rebase true` inside the respository checkout.
 * Make sure your PR includes a [changelog fragment](https://docs.ansible.com/ansible/devel/community/development_process.html#changelogs-how-to). (You must not include a fragment for new modules or new plugins, except for test and filter plugins. Also you shouldn't include one for docs-only changes. If you're not sure, simply don't include one, we'll tell you whether one is needed or not :) )
-* Avoid reformatting unrelated parts of the codebase in your PR. These types of changes will likely be requested for reversion, create additional work for reviewers, and may cause approval to be delayed.
 
 You can also read [our Quick-start development guide](https://github.com/ansible/community-docs/blob/main/create_pr_quick_start_guide.rst).
 
@@ -43,12 +42,7 @@ Creating new modules and plugins requires a bit more work than other Pull Reques
 1. Please make sure that your new module or plugin is of interest to a larger audience. Very specialized modules or plugins that
    can only be used by very few people should better be added to more specialized collections.
 
-2. Please do not add more than one plugin/module in one PR, especially if it is the first plugin/module you are contributing.
-   That makes it easier for reviewers, and increases the chance that your PR will get merged. If you plan to contribute a group
-   of plugins/modules (say, more than a module and a corresponding ``_info`` module), please mention that in the first PR. In
-   such cases, you also have to think whether it is better to publish the group of plugins/modules in a new collection.
-
-3. When creating a new module or plugin, please make sure that you follow various guidelines:
+2. When creating a new module or plugin, please make sure that you follow various guidelines:
 
    - Follow [development conventions](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_best_practices.html);
    - Follow [documentation standards](https://docs.ansible.com/ansible/devel/dev_guide/developing_modules_documenting.html) and
@@ -58,7 +52,7 @@ Creating new modules and plugins requires a bit more work than other Pull Reques
    - Make sure that new plugins and modules have tests (unit tests, integration tests, or both); it is preferable to have some tests
      which run in CI.
 
-4. For modules and action plugins, make sure to create your module/plugin in the correct subdirectory, and create a symbolic link
+3. For modules and action plugins, make sure to create your module/plugin in the correct subdirectory, and create a symbolic link
    from `plugins/modules/` respectively `plugins/action/` to the actual module/plugin code. (Other plugin types should not use
    subdirectories.)
 
@@ -66,7 +60,7 @@ Creating new modules and plugins requires a bit more work than other Pull Reques
      (`DOCUMENTATION`, `EXAMPLES` and `RETURN`). The module must have the same name and directory path in `plugins/modules/`
      than the action plugin has in `plugins/action/`.
 
-5. Make sure to add a BOTMETA entry for your new module/plugin in `.github/BOTMETA.yml`. Search for other plugins/modules in the
+4. Make sure to add a BOTMETA entry for your new module/plugin in `.github/BOTMETA.yml`. Search for other plugins/modules in the
    same directory to see how entries could look. You should list all authors either as `maintainers` or under `ignore`. People
    listed as `maintainers` will be pinged for new issues and PRs that modify the module/plugin or its tests.
 

README.md

@@ -1,6 +1,6 @@
 # Community General Collection
 
-[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-4)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
+[![Build Status](https://dev.azure.com/ansible/community.general/_apis/build/status/CI?branchName=stable-3)](https://dev.azure.com/ansible/community.general/_build?definitionId=31)
 [![Codecov](https://img.shields.io/codecov/c/github/ansible-collections/community.general)](https://codecov.io/gh/ansible-collections/community.general)
 
 This repository contains the `community.general` Ansible Collection. The collection is a part of the Ansible package and includes many modules and plugins supported by Ansible community which are not part of more specialized community collections.
@@ -17,7 +17,7 @@ If you encounter abusive behavior violating the [Ansible Code of Conduct](https:
 
 ## Tested with Ansible
 
-Tested with the current Ansible 2.9, ansible-base 2.10, ansible-core 2.11, ansible-core 2.12 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
+Tested with the current Ansible 2.9, ansible-base 2.10 and ansible-core 2.11 releases and the current development version of ansible-core. Ansible versions before 2.9.10 are not supported.
 
 ## External requirements
 
@@ -64,33 +64,19 @@ We are actively accepting new contributors.
 
 All types of contributions are very welcome.
 
-You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/stable-4/CONTRIBUTING.md)!
+You don't know how to start? Refer to our [contribution guide](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md)!
 
-The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/stable-4/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.
+The current maintainers are listed in the [commit-rights.md](https://github.com/ansible-collections/community.general/blob/main/commit-rights.md#people) file. If you have questions or need help, feel free to mention them in the proposals.
 
 You can find more information in the [developer guide for collections](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#contributing-to-collections), and in the [Ansible Community Guide](https://docs.ansible.com/ansible/latest/community/index.html).
 
-Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/stable-4/CONTRIBUTING.md).
+Also for some notes specific to this collection see [our CONTRIBUTING documentation](https://github.com/ansible-collections/community.general/blob/main/CONTRIBUTING.md).
 
 ### Running tests
 
 See [here](https://docs.ansible.com/ansible/devel/dev_guide/developing_collections.html#testing-collections).
 
-## Collection maintenance
-
-To learn how to maintain / become a maintainer of this collection, refer to:
-
-* [Committer guidelines](https://github.com/ansible-collections/community.general/blob/stable-4/commit-rights.md).
-* [Maintainer guidelines](https://github.com/ansible/community-docs/blob/main/maintaining.rst).
-
-It is necessary for maintainers of this collection to be subscribed to:
-
-* The collection itself (the `Watch` button → `All Activity` in the upper right corner of the repository's homepage).
-* The "Changes Impacting Collection Contributors and Maintainers" [issue](https://github.com/ansible-collections/overview/issues/45).
-
-They also should be subscribed to Ansible's [The Bullhorn newsletter](https://docs.ansible.com/ansible/devel/community/communication.html#the-bullhorn).
-
-## Communication
+### Communication
 
 We announce important development changes and releases through Ansible's [The Bullhorn newsletter](https://eepurl.com/gZmiEP). If you are a collection developer, be sure you are subscribed.
 
@@ -100,21 +86,26 @@ We take part in the global quarterly [Ansible Contributor Summit](https://github
 
 For more information about communities, meetings and agendas see [Community Wiki](https://github.com/ansible/community/wiki/Community).
 
-For more information about communication, refer to Ansible's the [Communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
+For more information about communication, refer to the [Ansible communication guide](https://docs.ansible.com/ansible/devel/community/communication.html).
 
-## Publishing New Version
+### Publishing New Version
 
-See the [Releasing guidelines](https://github.com/ansible/community-docs/blob/main/releasing_collections.rst) to learn how to release this collection.
+Basic instructions without release branches:
+
+1. Create `changelogs/fragments/<version>.yml` with `release_summary:` section (which must be a string, not a list).
+2. Run `antsibull-changelog release --collection-flatmap yes`
+3. Make sure `CHANGELOG.rst` and `changelogs/changelog.yaml` are added to git, and the deleted fragments have been removed.
+4. Tag the commit with `<version>`. Push changes and tag to the main repository.
 
 ## Release notes
 
-See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-4/CHANGELOG.rst).
+See the [changelog](https://github.com/ansible-collections/community.general/blob/stable-3/CHANGELOG.rst).
 
 ## Roadmap
 
-In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
+See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning and deprecation.
 
-See [this issue](https://github.com/ansible-collections/community.general/issues/582) for information on releasing, versioning, and deprecation.
+In general, we plan to release a major version every six months, and minor versions every two months. Major versions can contain breaking changes, while minor versions only contain new features and bugfixes.
 
 ## More information
 

commit-rights.md

@@ -69,6 +69,5 @@ Individuals who have been asked to become a part of this group have generally be
 | ------------------- | -------------------- | ------------------ | -------------------- |
 | Alexei Znamensky    | russoz               | russoz             |                      |
 | Andrew Klychkov     | andersson007         | andersson007_      |                      |
-| Andrew Pantuso      | Ajpantuso            | ajpantuso          |                      |
 | Felix Fontein       | felixfontein         | felixfontein       |                      |
 | John R Barker       | gundalow             | gundalow           |                      |

docs/docsite/extra-docs.yml

@@ -3,4 +3,3 @@ sections:
   - title: Guides
     toctree:
       - filter_guide
-      - test_guide

docs/docsite/rst/filter_guide.rst

@@ -751,34 +751,3 @@ To extract ports from all clusters with name containing 'server1':
         server_name_query: "domain.server[?contains(name,'server1')].port"
 
 .. note:: while using ``starts_with`` and ``contains``, you have to use `` to_json | from_json `` filter for correct parsing of data structure.
-
-Working with Unicode
----------------------
-
-`Unicode <https://unicode.org/main.html>`_ makes it possible to produce two strings which may be visually equivalent, but are comprised of distinctly different characters/character sequences. To address this ``Unicode`` defines `normalization forms <https://unicode.org/reports/tr15/>`_ which avoid these distinctions by choosing a unique character sequence for a given visual representation.
-
-You can use the ``community.general.unicode_normalize`` filter to normalize ``Unicode`` strings within your playbooks.
-
-.. code-block:: yaml+jinja
-
-    - name: Compare Unicode representations
-      debug:
-        msg: "{{ with_combining_character | community.general.unicode_normalize == without_combining_character }}"
-      vars:
-        with_combining_character: "{{ 'Mayagu\u0308ez' }}"
-        without_combining_character: Mayagüez
-
-This produces:
-
-.. code-block:: ansible-output
-
-    TASK [Compare Unicode representations] ********************************************************
-    ok: [localhost] => {
-        "msg": true
-    }
-
-The ``community.general.unicode_normalize`` filter accepts a keyword argument to select the ``Unicode`` form used to normalize the input string.
-
-:form: One of ``'NFC'`` (default), ``'NFD'``, ``'NFKC'``, or ``'NFKD'``. See the `Unicode reference <https://unicode.org/reports/tr15/>`_ for more information.
-
-.. versionadded:: 3.7.0

docs/docsite/rst/test_guide.rst

@@ -1,28 +0,0 @@
-.. _ansible_collections.community.general.docsite.test_guide:
-
-community.general Test (Plugin) Guide
-=====================================
-
-The :ref:`community.general collection <plugins_in_community.general>` offers currently one test plugin.
-
-.. contents:: Topics
-
-Feature Tests
--------------
-
-The ``a_module`` test allows to check whether a given string refers to an existing module or action plugin. This can be useful in roles, which can use this to ensure that required modules are present ahead of time.
-
-.. code-block:: yaml+jinja
-
-    - name: Make sure that community.aws.route53 is available
-      assert:
-        that:
-          - >
-            'community.aws.route53' is community.general.a_module
-
-    - name: Make sure that community.general.does_not_exist is not a module or action plugin
-      assert:
-        that:
-          - "'community.general.does_not_exist' is not community.general.a_module"
-
-.. versionadded:: 4.0.0

galaxy.yml

@@ -1,6 +1,6 @@
 namespace: community
 name: general
-version: 4.2.0
+version: 3.5.0
 readme: README.md
 authors:
   - Ansible (https://github.com/ansible)

meta/runtime.yml

@@ -12,11 +12,20 @@ plugin_routing:
     hashi_vault:
       redirect: community.hashi_vault.hashi_vault
     nios:
-      redirect: infoblox.nios_modules.nios_lookup
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios lookup plugin has been deprecated.
+          Please use infoblox.nios_modules.nios_lookup instead.
     nios_next_ip:
-      redirect: infoblox.nios_modules.nios_next_ip
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_next_ip lookup plugin has been deprecated.
+          Please use infoblox.nios_modules.nios_next_ip instead.
     nios_next_network:
-      redirect: infoblox.nios_modules.nios_next_network
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_next_network lookup plugin has been
+          deprecated. Please use infoblox.nios_modules.nios_next_network instead.
   modules:
     ali_instance_facts:
       tombstone:
@@ -257,37 +266,85 @@ plugin_routing:
         removal_version: 3.0.0
         warning_text: Use community.general.nginx_status_info instead.
     nios_a_record:
-      redirect: infoblox.nios_modules.nios_a_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_a_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_a_record instead.
     nios_aaaa_record:
-      redirect: infoblox.nios_modules.nios_aaaa_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_aaaa_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_aaaa_record instead.
     nios_cname_record:
-      redirect: infoblox.nios_modules.nios_cname_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_cname_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_cname_record instead.
     nios_dns_view:
-      redirect: infoblox.nios_modules.nios_dns_view
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_dns_view module has been deprecated.
+          Please use infoblox.nios_modules.nios_dns_view instead.
     nios_fixed_address:
-      redirect: infoblox.nios_modules.nios_fixed_address
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_fixed_address module has been deprecated.
+          Please use infoblox.nios_modules.nios_fixed_address instead.
     nios_host_record:
-      redirect: infoblox.nios_modules.nios_host_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_host_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_host_record instead.
     nios_member:
-      redirect: infoblox.nios_modules.nios_member
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_member module has been deprecated.
+          Please use infoblox.nios_modules.nios_member instead.
     nios_mx_record:
-      redirect: infoblox.nios_modules.nios_mx_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_mx_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_mx_record instead.
     nios_naptr_record:
-      redirect: infoblox.nios_modules.nios_naptr_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_naptr_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_naptr_record instead.
     nios_network:
-      redirect: infoblox.nios_modules.nios_network
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_network module has been deprecated.
+          Please use infoblox.nios_modules.nios_network instead.
     nios_network_view:
-      redirect: infoblox.nios_modules.nios_network_view
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_network_view module has been deprecated.
+          Please use infoblox.nios_modules.nios_network_view instead.
     nios_nsgroup:
-      redirect: infoblox.nios_modules.nios_nsgroup
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_nsgroup module has been deprecated.
+          Please use infoblox.nios_modules.nios_nsgroup instead.
     nios_ptr_record:
-      redirect: infoblox.nios_modules.nios_ptr_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_ptr_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_ptr_record instead.
     nios_srv_record:
-      redirect: infoblox.nios_modules.nios_srv_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_srv_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_srv_record instead.
     nios_txt_record:
-      redirect: infoblox.nios_modules.nios_txt_record
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_txt_record module has been deprecated.
+          Please use infoblox.nios_modules.nios_txt_record instead.
     nios_zone:
-      redirect: infoblox.nios_modules.nios_zone
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios_zone module has been deprecated.
+          Please use infoblox.nios_modules.nios_zone instead.
     ome_device_info:
       redirect: dellemc.openmanage.ome_device_info
     one_image_facts:
@@ -571,7 +628,10 @@ plugin_routing:
     kubevirt_vm_options:
       redirect: community.kubevirt.kubevirt_vm_options
     nios:
-      redirect: infoblox.nios_modules.nios
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.nios document fragment has been deprecated.
+          Please use infoblox.nios_modules.nios instead.
     postgresql:
       redirect: community.postgresql.postgresql
   module_utils:
@@ -590,7 +650,10 @@ plugin_routing:
     kubevirt:
       redirect: community.kubevirt.kubevirt
     net_tools.nios.api:
-      redirect: infoblox.nios_modules.api
+      deprecation:
+        removal_version: 5.0.0
+        warning_text: The community.general.net_tools.nios.api module_utils has been
+          deprecated. Please use infoblox.nios_modules.api instead.
     postgresql:
       redirect: community.postgresql.postgresql
     remote_management.dellemc.dellemc_idrac:

plugins/cache/memcached.py

@@ -154,12 +154,12 @@ class CacheModuleKeys(MutableSet):
     def __len__(self):
         return len(self._keyset)
 
-    def add(self, value):
-        self._keyset[value] = time.time()
+    def add(self, key):
+        self._keyset[key] = time.time()
         self._cache.set(self.PREFIX, self._keyset)
 
-    def discard(self, value):
-        del self._keyset[value]
+    def discard(self, key):
+        del self._keyset[key]
         self._cache.set(self.PREFIX, self._keyset)
 
     def remove_by_timerange(self, s_min, s_max):

plugins/callback/counter_enabled.py

@@ -45,8 +45,6 @@ class CallbackModule(CallbackBase):
     _task_total = 0
     _host_counter = 1
     _host_total = 0
-    _current_batch_total = 0
-    _previous_batch_total = 0
 
     def __init__(self):
         super(CallbackModule, self).__init__()
@@ -78,11 +76,8 @@ class CallbackModule(CallbackBase):
         self._display.banner(msg)
         self._play = play
 
-        self._previous_batch_total = self._current_batch_total
-        self._current_batch_total = self._previous_batch_total + len(self._all_vars()['vars']['ansible_play_batch'])
         self._host_total = len(self._all_vars()['vars']['ansible_play_hosts_all'])
         self._task_total = len(self._play.get_tasks()[0])
-        self._task_counter = 1
 
     def v2_playbook_on_stats(self, stats):
         self._display.banner("PLAY RECAP")
@@ -150,7 +145,7 @@ class CallbackModule(CallbackBase):
             path = task.get_path()
             if path:
                 self._display.display("task path: %s" % path, color=C.COLOR_DEBUG)
-        self._host_counter = self._previous_batch_total
+        self._host_counter = 0
         self._task_counter += 1
 
     def v2_runner_on_ok(self, result):

plugins/callback/elastic.py

@@ -1,423 +0,0 @@
-# (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    author: Victor Martinez (@v1v)  <VictorMartinezRubio@gmail.com>
-    name: elastic
-    type: notification
-    short_description: Create distributed traces for each Ansible task in Elastic APM
-    version_added: 3.8.0
-    description:
-      - This callback creates distributed traces for each Ansible task in Elastic APM.
-      - You can configure the plugin with environment variables.
-      - See U(https://www.elastic.co/guide/en/apm/agent/python/current/configuration.html).
-    options:
-      hide_task_arguments:
-        default: false
-        type: bool
-        description:
-          - Hide the arguments for a task.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_HIDE_TASK_ARGUMENTS
-      apm_service_name:
-        default: ansible
-        type: str
-        description:
-          - The service name resource attribute.
-        env:
-          - name: ELASTIC_APM_SERVICE_NAME
-      apm_server_url:
-        type: str
-        description:
-          - Use the APM server and its environment variables.
-        env:
-          - name: ELASTIC_APM_SERVER_URL
-      apm_secret_token:
-        type: str
-        description:
-          - Use the APM server token
-        env:
-          - name: ELASTIC_APM_SECRET_TOKEN
-      apm_api_key:
-        type: str
-        description:
-          - Use the APM API key
-        env:
-          - name: ELASTIC_APM_API_KEY
-      apm_verify_server_cert:
-        default: true
-        type: bool
-        description:
-          - Verifies the SSL certificate if an HTTPS connection.
-        env:
-          - name: ELASTIC_APM_VERIFY_SERVER_CERT
-      traceparent:
-        type: str
-        description:
-          - The L(W3C Trace Context header traceparent,https://www.w3.org/TR/trace-context-1/#traceparent-header).
-        env:
-          - name: TRACEPARENT
-    requirements:
-      - elastic-apm (Python library)
-'''
-
-
-EXAMPLES = '''
-examples: |
-  Enable the plugin in ansible.cfg:
-    [defaults]
-    callbacks_enabled = community.general.elastic
-
-  Set the environment variable:
-    export ELASTIC_APM_SERVER_URL=<your APM server URL)>
-    export ELASTIC_APM_SERVICE_NAME=your_service_name
-    export ELASTIC_APM_API_KEY=your_APM_API_KEY
-'''
-
-import getpass
-import socket
-import time
-import uuid
-
-from collections import OrderedDict
-from os.path import basename
-
-from ansible.errors import AnsibleError, AnsibleRuntimeError
-from ansible.module_utils.six import raise_from
-from ansible.plugins.callback import CallbackBase
-
-try:
-    from elasticapm import Client, capture_span, trace_parent_from_string, instrument, label
-except ImportError as imp_exc:
-    ELASTIC_LIBRARY_IMPORT_ERROR = imp_exc
-else:
-    ELASTIC_LIBRARY_IMPORT_ERROR = None
-
-
-class TaskData:
-    """
-    Data about an individual task.
-    """
-
-    def __init__(self, uuid, name, path, play, action, args):
-        self.uuid = uuid
-        self.name = name
-        self.path = path
-        self.play = play
-        self.host_data = OrderedDict()
-        self.start = time.time()
-        self.action = action
-        self.args = args
-
-    def add_host(self, host):
-        if host.uuid in self.host_data:
-            if host.status == 'included':
-                # concatenate task include output from multiple items
-                host.result = '%s\n%s' % (self.host_data[host.uuid].result, host.result)
-            else:
-                return
-
-        self.host_data[host.uuid] = host
-
-
-class HostData:
-    """
-    Data about an individual host.
-    """
-
-    def __init__(self, uuid, name, status, result):
-        self.uuid = uuid
-        self.name = name
-        self.status = status
-        self.result = result
-        self.finish = time.time()
-
-
-class ElasticSource(object):
-    def __init__(self, display):
-        self.ansible_playbook = ""
-        self.ansible_version = None
-        self.session = str(uuid.uuid4())
-        self.host = socket.gethostname()
-        try:
-            self.ip_address = socket.gethostbyname(socket.gethostname())
-        except Exception as e:
-            self.ip_address = None
-        self.user = getpass.getuser()
-
-        self._display = display
-
-    def start_task(self, tasks_data, hide_task_arguments, play_name, task):
-        """ record the start of a task for one or more hosts """
-
-        uuid = task._uuid
-
-        if uuid in tasks_data:
-            return
-
-        name = task.get_name().strip()
-        path = task.get_path()
-        action = task.action
-        args = None
-
-        if not task.no_log and not hide_task_arguments:
-            args = ', '.join(('%s=%s' % a for a in task.args.items()))
-
-        tasks_data[uuid] = TaskData(uuid, name, path, play_name, action, args)
-
-    def finish_task(self, tasks_data, status, result):
-        """ record the results of a task for a single host """
-
-        task_uuid = result._task._uuid
-
-        if hasattr(result, '_host') and result._host is not None:
-            host_uuid = result._host._uuid
-            host_name = result._host.name
-        else:
-            host_uuid = 'include'
-            host_name = 'include'
-
-        task = tasks_data[task_uuid]
-
-        if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
-            self.ansible_version = result._task_fields['args'].get('_ansible_version')
-
-        task.add_host(HostData(host_uuid, host_name, status, result))
-
-    def generate_distributed_traces(self, tasks_data, status, end_time, traceparent, apm_service_name,
-                                    apm_server_url, apm_verify_server_cert, apm_secret_token, apm_api_key):
-        """ generate distributed traces from the collected TaskData and HostData """
-
-        tasks = []
-        parent_start_time = None
-        for task_uuid, task in tasks_data.items():
-            if parent_start_time is None:
-                parent_start_time = task.start
-            tasks.append(task)
-
-        apm_cli = self.init_apm_client(apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key)
-        if apm_cli:
-            instrument()  # Only call this once, as early as possible.
-            if traceparent:
-                parent = trace_parent_from_string(traceparent)
-                apm_cli.begin_transaction("Session", trace_parent=parent, start=parent_start_time)
-            else:
-                apm_cli.begin_transaction("Session", start=parent_start_time)
-            # Populate trace metadata attributes
-            if self.ansible_version is not None:
-                label(ansible_version=self.ansible_version)
-            label(ansible_session=self.session, ansible_host_name=self.host, ansible_host_user=self.user)
-            if self.ip_address is not None:
-                label(ansible_host_ip=self.ip_address)
-
-            for task_data in tasks:
-                for host_uuid, host_data in task_data.host_data.items():
-                    self.create_span_data(apm_cli, task_data, host_data)
-
-            apm_cli.end_transaction(name=__name__, result=status, duration=end_time - parent_start_time)
-
-    def create_span_data(self, apm_cli, task_data, host_data):
-        """ create the span with the given TaskData and HostData """
-
-        name = '[%s] %s: %s' % (host_data.name, task_data.play, task_data.name)
-
-        message = "success"
-        status = "success"
-        enriched_error_message = None
-        if host_data.status == 'included':
-            rc = 0
-        else:
-            res = host_data.result._result
-            rc = res.get('rc', 0)
-            if host_data.status == 'failed':
-                message = self.get_error_message(res)
-                enriched_error_message = self.enrich_error_message(res)
-                status = "failure"
-            elif host_data.status == 'skipped':
-                if 'skip_reason' in res:
-                    message = res['skip_reason']
-                else:
-                    message = 'skipped'
-                status = "unknown"
-
-        with capture_span(task_data.name,
-                          start=task_data.start,
-                          span_type="ansible.task.run",
-                          duration=host_data.finish - task_data.start,
-                          labels={"ansible.task.args": task_data.args,
-                                  "ansible.task.message": message,
-                                  "ansible.task.module": task_data.action,
-                                  "ansible.task.name": name,
-                                  "ansible.task.result": rc,
-                                  "ansible.task.host.name": host_data.name,
-                                  "ansible.task.host.status": host_data.status}) as span:
-            span.outcome = status
-            if 'failure' in status:
-                exception = AnsibleRuntimeError(message="{0}: {1} failed with error message {2}".format(task_data.action, name, enriched_error_message))
-                apm_cli.capture_exception(exc_info=(type(exception), exception, exception.__traceback__), handled=True)
-
-    def init_apm_client(self, apm_server_url, apm_service_name, apm_verify_server_cert, apm_secret_token, apm_api_key):
-        if apm_server_url:
-            return Client(service_name=apm_service_name,
-                          server_url=apm_server_url,
-                          verify_server_cert=False,
-                          secret_token=apm_secret_token,
-                          api_key=apm_api_key,
-                          use_elastic_traceparent_header=True,
-                          debug=True)
-
-    @staticmethod
-    def get_error_message(result):
-        if result.get('exception') is not None:
-            return ElasticSource._last_line(result['exception'])
-        return result.get('msg', 'failed')
-
-    @staticmethod
-    def _last_line(text):
-        lines = text.strip().split('\n')
-        return lines[-1]
-
-    @staticmethod
-    def enrich_error_message(result):
-        message = result.get('msg', 'failed')
-        exception = result.get('exception')
-        stderr = result.get('stderr')
-        return ('message: "{0}"\nexception: "{1}"\nstderr: "{2}"').format(message, exception, stderr)
-
-
-class CallbackModule(CallbackBase):
-    """
-    This callback creates distributed traces with Elastic APM.
-    """
-
-    CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
-    CALLBACK_NAME = 'community.general.elastic'
-    CALLBACK_NEEDS_ENABLED = True
-
-    def __init__(self, display=None):
-        super(CallbackModule, self).__init__(display=display)
-        self.hide_task_arguments = None
-        self.apm_service_name = None
-        self.ansible_playbook = None
-        self.traceparent = False
-        self.play_name = None
-        self.tasks_data = None
-        self.errors = 0
-        self.disabled = False
-
-        if ELASTIC_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('The `elastic-apm` must be installed to use this plugin'),
-                ELASTIC_LIBRARY_IMPORT_ERROR)
-
-        self.tasks_data = OrderedDict()
-
-        self.elastic = ElasticSource(display=self._display)
-
-    def set_options(self, task_keys=None, var_options=None, direct=None):
-        super(CallbackModule, self).set_options(task_keys=task_keys,
-                                                var_options=var_options,
-                                                direct=direct)
-
-        self.hide_task_arguments = self.get_option('hide_task_arguments')
-
-        self.apm_service_name = self.get_option('apm_service_name')
-        if not self.apm_service_name:
-            self.apm_service_name = 'ansible'
-
-        self.apm_server_url = self.get_option('apm_server_url')
-        self.apm_secret_token = self.get_option('apm_secret_token')
-        self.apm_api_key = self.get_option('apm_api_key')
-        self.apm_verify_server_cert = self.get_option('apm_verify_server_cert')
-        self.traceparent = self.get_option('traceparent')
-
-    def v2_playbook_on_start(self, playbook):
-        self.ansible_playbook = basename(playbook._file_name)
-
-    def v2_playbook_on_play_start(self, play):
-        self.play_name = play.get_name()
-
-    def v2_runner_on_no_hosts(self, task):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_task_start(self, task, is_conditional):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_cleanup_task_start(self, task):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_handler_task_start(self, task):
-        self.elastic.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_runner_on_failed(self, result, ignore_errors=False):
-        self.errors += 1
-        self.elastic.finish_task(
-            self.tasks_data,
-            'failed',
-            result
-        )
-
-    def v2_runner_on_ok(self, result):
-        self.elastic.finish_task(
-            self.tasks_data,
-            'ok',
-            result
-        )
-
-    def v2_runner_on_skipped(self, result):
-        self.elastic.finish_task(
-            self.tasks_data,
-            'skipped',
-            result
-        )
-
-    def v2_playbook_on_include(self, included_file):
-        self.elastic.finish_task(
-            self.tasks_data,
-            'included',
-            included_file
-        )
-
-    def v2_playbook_on_stats(self, stats):
-        if self.errors == 0:
-            status = "success"
-        else:
-            status = "failure"
-        self.elastic.generate_distributed_traces(
-            self.tasks_data,
-            status,
-            time.time(),
-            self.traceparent,
-            self.apm_service_name,
-            self.apm_server_url,
-            self.apm_verify_server_cert,
-            self.apm_secret_token,
-            self.apm_api_key
-        )
-
-    def v2_runner_on_async_failed(self, result, **kwargs):
-        self.errors += 1

plugins/callback/logdna.py

@@ -78,7 +78,7 @@ def get_mac():
 
 # Getting hostname of system:
 def get_hostname():
-    return str(socket.gethostname()).split('.local', 1)[0]
+    return str(socket.gethostname()).split('.local')[0]
 
 
 # Getting IP of system:

plugins/callback/logstash.py

@@ -94,7 +94,6 @@ ansible.cfg: |
 
 import os
 import json
-from ansible import context
 import socket
 import uuid
 import logging
@@ -153,11 +152,11 @@ class CallbackModule(CallbackBase):
                 self.base_data['ansible_pre_command_output'] = os.popen(
                     self.ls_pre_command).read()
 
-            if context.CLIARGS is not None:
-                self.base_data['ansible_checkmode'] = context.CLIARGS.get('check')
-                self.base_data['ansible_tags'] = context.CLIARGS.get('tags')
-                self.base_data['ansible_skip_tags'] = context.CLIARGS.get('skip_tags')
-                self.base_data['inventory'] = context.CLIARGS.get('inventory')
+            if self._options is not None:
+                self.base_data['ansible_checkmode'] = self._options.check
+                self.base_data['ansible_tags'] = self._options.tags
+                self.base_data['ansible_skip_tags'] = self._options.skip_tags
+                self.base_data['inventory'] = self._options.inventory
 
     def set_options(self, task_keys=None, var_options=None, direct=None):
         super(CallbackModule, self).set_options(task_keys=task_keys, var_options=var_options, direct=direct)

plugins/callback/nrdp.py

@@ -70,7 +70,6 @@ import os
 import json
 
 from ansible.module_utils.six.moves.urllib.parse import urlencode
-from ansible.module_utils.common.text.converters import to_bytes
 from ansible.module_utils.urls import open_url
 from ansible.plugins.callback import CallbackBase
 
@@ -144,7 +143,7 @@ class CallbackModule(CallbackBase):
         body = {
             'cmd': 'submitcheck',
             'token': self.token,
-            'XMLDATA': to_bytes(xmldata)
+            'XMLDATA': bytes(xmldata)
         }
 
         try:

plugins/callback/opentelemetry.py

@@ -1,515 +0,0 @@
-# -*- coding: utf-8 -*-
-# (C) 2021, Victor Martinez <VictorMartinezRubio@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    author: Victor Martinez (@v1v)  <VictorMartinezRubio@gmail.com>
-    name: opentelemetry
-    type: notification
-    short_description: Create distributed traces with OpenTelemetry
-    version_added: 3.7.0
-    description:
-      - This callback creates distributed traces for each Ansible task with OpenTelemetry.
-      - You can configure the OpenTelemetry exporter and SDK with environment variables.
-      - See U(https://opentelemetry-python.readthedocs.io/en/latest/exporter/otlp/otlp.html).
-      - See U(https://opentelemetry-python.readthedocs.io/en/latest/sdk/environment_variables.html#opentelemetry-sdk-environment-variables).
-    options:
-      hide_task_arguments:
-        default: false
-        type: bool
-        description:
-          - Hide the arguments for a task.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_HIDE_TASK_ARGUMENTS
-      enable_from_environment:
-        type: str
-        description:
-          - Whether to enable this callback only if the given environment variable exists and it is set to C(true).
-          - This is handy when you use Configuration as Code and want to send distributed traces
-            if running in the CI rather when running Ansible locally.
-          - For such, it evaluates the given I(enable_from_environment) value as environment variable
-            and if set to true this plugin will be enabled.
-        env:
-          - name: ANSIBLE_OPENTELEMETRY_ENABLE_FROM_ENVIRONMENT
-        version_added: 3.8.0
-      otel_service_name:
-        default: ansible
-        type: str
-        description:
-          - The service name resource attribute.
-        env:
-          - name: OTEL_SERVICE_NAME
-      traceparent:
-        default: None
-        type: str
-        description:
-          - The L(W3C Trace Context header traceparent,https://www.w3.org/TR/trace-context-1/#traceparent-header).
-        env:
-          - name: TRACEPARENT
-    requirements:
-      - opentelemetry-api (Python library)
-      - opentelemetry-exporter-otlp (Python library)
-      - opentelemetry-sdk (Python library)
-'''
-
-
-EXAMPLES = '''
-examples: |
-  Enable the plugin in ansible.cfg:
-    [defaults]
-    callbacks_enabled = community.general.opentelemetry
-
-  Set the environment variable:
-    export OTEL_EXPORTER_OTLP_ENDPOINT=<your endpoint (OTLP/HTTP)>
-    export OTEL_EXPORTER_OTLP_HEADERS="authorization=Bearer your_otel_token"
-    export OTEL_SERVICE_NAME=your_service_name
-'''
-
-import getpass
-import os
-import socket
-import sys
-import time
-import uuid
-
-from collections import OrderedDict
-from os.path import basename
-
-from ansible.errors import AnsibleError
-from ansible.module_utils.six import raise_from
-from ansible.module_utils.six.moves.urllib.parse import urlparse
-from ansible.plugins.callback import CallbackBase
-
-try:
-    from opentelemetry import trace
-    from opentelemetry.trace import SpanKind
-    from opentelemetry.exporter.otlp.proto.grpc.trace_exporter import OTLPSpanExporter
-    from opentelemetry.sdk.resources import SERVICE_NAME, Resource
-    from opentelemetry.trace.status import Status, StatusCode
-    from opentelemetry.trace.propagation.tracecontext import TraceContextTextMapPropagator
-    from opentelemetry.sdk.trace import TracerProvider
-    from opentelemetry.sdk.trace.export import (
-        BatchSpanProcessor
-    )
-    from opentelemetry.util._time import _time_ns
-except ImportError as imp_exc:
-    OTEL_LIBRARY_IMPORT_ERROR = imp_exc
-else:
-    OTEL_LIBRARY_IMPORT_ERROR = None
-
-
-class TaskData:
-    """
-    Data about an individual task.
-    """
-
-    def __init__(self, uuid, name, path, play, action, args):
-        self.uuid = uuid
-        self.name = name
-        self.path = path
-        self.play = play
-        self.host_data = OrderedDict()
-        if sys.version_info >= (3, 7):
-            self.start = time.time_ns()
-        else:
-            self.start = _time_ns()
-        self.action = action
-        self.args = args
-
-    def add_host(self, host):
-        if host.uuid in self.host_data:
-            if host.status == 'included':
-                # concatenate task include output from multiple items
-                host.result = '%s\n%s' % (self.host_data[host.uuid].result, host.result)
-            else:
-                return
-
-        self.host_data[host.uuid] = host
-
-
-class HostData:
-    """
-    Data about an individual host.
-    """
-
-    def __init__(self, uuid, name, status, result):
-        self.uuid = uuid
-        self.name = name
-        self.status = status
-        self.result = result
-        if sys.version_info >= (3, 7):
-            self.finish = time.time_ns()
-        else:
-            self.finish = _time_ns()
-
-
-class OpenTelemetrySource(object):
-    def __init__(self, display):
-        self.ansible_playbook = ""
-        self.ansible_version = None
-        self.session = str(uuid.uuid4())
-        self.host = socket.gethostname()
-        try:
-            self.ip_address = socket.gethostbyname(socket.gethostname())
-        except Exception as e:
-            self.ip_address = None
-        self.user = getpass.getuser()
-
-        self._display = display
-
-    def traceparent_context(self, traceparent):
-        carrier = dict()
-        carrier['traceparent'] = traceparent
-        return TraceContextTextMapPropagator().extract(carrier=carrier)
-
-    def start_task(self, tasks_data, hide_task_arguments, play_name, task):
-        """ record the start of a task for one or more hosts """
-
-        uuid = task._uuid
-
-        if uuid in tasks_data:
-            return
-
-        name = task.get_name().strip()
-        path = task.get_path()
-        action = task.action
-        args = None
-
-        if not task.no_log and not hide_task_arguments:
-            args = task.args
-
-        tasks_data[uuid] = TaskData(uuid, name, path, play_name, action, args)
-
-    def finish_task(self, tasks_data, status, result):
-        """ record the results of a task for a single host """
-
-        task_uuid = result._task._uuid
-
-        if hasattr(result, '_host') and result._host is not None:
-            host_uuid = result._host._uuid
-            host_name = result._host.name
-        else:
-            host_uuid = 'include'
-            host_name = 'include'
-
-        task = tasks_data[task_uuid]
-
-        if self.ansible_version is None and result._task_fields['args'].get('_ansible_version'):
-            self.ansible_version = result._task_fields['args'].get('_ansible_version')
-
-        task.add_host(HostData(host_uuid, host_name, status, result))
-
-    def generate_distributed_traces(self, otel_service_name, ansible_playbook, tasks_data, status, traceparent):
-        """ generate distributed traces from the collected TaskData and HostData """
-
-        tasks = []
-        parent_start_time = None
-        for task_uuid, task in tasks_data.items():
-            if parent_start_time is None:
-                parent_start_time = task.start
-            tasks.append(task)
-
-        trace.set_tracer_provider(
-            TracerProvider(
-                resource=Resource.create({SERVICE_NAME: otel_service_name})
-            )
-        )
-
-        processor = BatchSpanProcessor(OTLPSpanExporter())
-
-        trace.get_tracer_provider().add_span_processor(processor)
-
-        tracer = trace.get_tracer(__name__)
-
-        with tracer.start_as_current_span(ansible_playbook, context=self.traceparent_context(traceparent),
-                                          start_time=parent_start_time, kind=SpanKind.SERVER) as parent:
-            parent.set_status(status)
-            # Populate trace metadata attributes
-            if self.ansible_version is not None:
-                parent.set_attribute("ansible.version", self.ansible_version)
-            parent.set_attribute("ansible.session", self.session)
-            parent.set_attribute("ansible.host.name", self.host)
-            if self.ip_address is not None:
-                parent.set_attribute("ansible.host.ip", self.ip_address)
-            parent.set_attribute("ansible.host.user", self.user)
-            for task in tasks:
-                for host_uuid, host_data in task.host_data.items():
-                    with tracer.start_as_current_span(task.name, start_time=task.start, end_on_exit=False) as span:
-                        self.update_span_data(task, host_data, span)
-
-    def update_span_data(self, task_data, host_data, span):
-        """ update the span with the given TaskData and HostData """
-
-        name = '[%s] %s: %s' % (host_data.name, task_data.play, task_data.name)
-
-        message = 'success'
-        res = {}
-        rc = 0
-        status = Status(status_code=StatusCode.OK)
-        if host_data.status != 'included':
-            # Support loops
-            if 'results' in host_data.result._result:
-                if host_data.status == 'failed':
-                    message = self.get_error_message_from_results(host_data.result._result['results'], task_data.action)
-                    enriched_error_message = self.enrich_error_message_from_results(host_data.result._result['results'], task_data.action)
-            else:
-                res = host_data.result._result
-                rc = res.get('rc', 0)
-                message = self.get_error_message(res)
-                enriched_error_message = self.enrich_error_message(res)
-
-            if host_data.status == 'failed':
-                status = Status(status_code=StatusCode.ERROR, description=message)
-                # Record an exception with the task message
-                span.record_exception(BaseException(enriched_error_message))
-            elif host_data.status == 'skipped':
-                message = res['skip_reason'] if 'skip_reason' in res else 'skipped'
-                status = Status(status_code=StatusCode.UNSET)
-            elif host_data.status == 'ignored':
-                status = Status(status_code=StatusCode.UNSET)
-
-        span.set_status(status)
-        if isinstance(task_data.args, dict) and "gather_facts" not in task_data.action:
-            names = tuple(self.transform_ansible_unicode_to_str(k) for k in task_data.args.keys())
-            values = tuple(self.transform_ansible_unicode_to_str(k) for k in task_data.args.values())
-            self.set_span_attribute(span, ("ansible.task.args.name"), names)
-            self.set_span_attribute(span, ("ansible.task.args.value"), values)
-        self.set_span_attribute(span, "ansible.task.module", task_data.action)
-        self.set_span_attribute(span, "ansible.task.message", message)
-        self.set_span_attribute(span, "ansible.task.name", name)
-        self.set_span_attribute(span, "ansible.task.result", rc)
-        self.set_span_attribute(span, "ansible.task.host.name", host_data.name)
-        self.set_span_attribute(span, "ansible.task.host.status", host_data.status)
-        # This will allow to enrich the service map
-        self.add_attributes_for_service_map_if_possible(span, task_data)
-        span.end(end_time=host_data.finish)
-
-    def set_span_attribute(self, span, attributeName, attributeValue):
-        """ update the span attribute with the given attribute and value if not None """
-
-        if span is None and self._display is not None:
-            self._display.warning('span object is None. Please double check if that is expected.')
-        else:
-            if attributeValue is not None:
-                span.set_attribute(attributeName, attributeValue)
-
-    def add_attributes_for_service_map_if_possible(self, span, task_data):
-        """Update the span attributes with the service that the task interacted with, if possible."""
-
-        redacted_url = self.parse_and_redact_url_if_possible(task_data.args)
-        if redacted_url:
-            self.set_span_attribute(span, "http.url", redacted_url.geturl())
-
-    @staticmethod
-    def parse_and_redact_url_if_possible(args):
-        """Parse and redact the url, if possible."""
-
-        try:
-            parsed_url = urlparse(OpenTelemetrySource.url_from_args(args))
-        except ValueError:
-            return None
-
-        if OpenTelemetrySource.is_valid_url(parsed_url):
-            return OpenTelemetrySource.redact_user_password(parsed_url)
-        return None
-
-    @staticmethod
-    def url_from_args(args):
-        # the order matters
-        url_args = ("url", "api_url", "baseurl", "repo", "server_url", "chart_repo_url")
-        for arg in url_args:
-            if args.get(arg):
-                return args.get(arg)
-        return ""
-
-    @staticmethod
-    def redact_user_password(url):
-        return url._replace(netloc=url.hostname) if url.password else url
-
-    @staticmethod
-    def is_valid_url(url):
-        if all([url.scheme, url.netloc, url.hostname]):
-            return "{{" not in url.hostname
-        return False
-
-    @staticmethod
-    def transform_ansible_unicode_to_str(value):
-        parsed_url = urlparse(str(value))
-        if OpenTelemetrySource.is_valid_url(parsed_url):
-            return OpenTelemetrySource.redact_user_password(parsed_url).geturl()
-        return str(value)
-
-    @staticmethod
-    def get_error_message(result):
-        if result.get('exception') is not None:
-            return OpenTelemetrySource._last_line(result['exception'])
-        return result.get('msg', 'failed')
-
-    @staticmethod
-    def get_error_message_from_results(results, action):
-        for result in results:
-            if result.get('failed', False):
-                return ('{0}({1}) - {2}').format(action, result.get('item', 'none'), OpenTelemetrySource.get_error_message(result))
-
-    @staticmethod
-    def _last_line(text):
-        lines = text.strip().split('\n')
-        return lines[-1]
-
-    @staticmethod
-    def enrich_error_message(result):
-        message = result.get('msg', 'failed')
-        exception = result.get('exception')
-        stderr = result.get('stderr')
-        return ('message: "{0}"\nexception: "{1}"\nstderr: "{2}"').format(message, exception, stderr)
-
-    @staticmethod
-    def enrich_error_message_from_results(results, action):
-        message = ""
-        for result in results:
-            if result.get('failed', False):
-                message = ('{0}({1}) - {2}\n{3}').format(action, result.get('item', 'none'), OpenTelemetrySource.enrich_error_message(result), message)
-        return message
-
-
-class CallbackModule(CallbackBase):
-    """
-    This callback creates distributed traces.
-    """
-
-    CALLBACK_VERSION = 2.0
-    CALLBACK_TYPE = 'notification'
-    CALLBACK_NAME = 'community.general.opentelemetry'
-    CALLBACK_NEEDS_ENABLED = True
-
-    def __init__(self, display=None):
-        super(CallbackModule, self).__init__(display=display)
-        self.hide_task_arguments = None
-        self.otel_service_name = None
-        self.ansible_playbook = None
-        self.play_name = None
-        self.tasks_data = None
-        self.errors = 0
-        self.disabled = False
-        self.traceparent = False
-
-        if OTEL_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('The `opentelemetry-api`, `opentelemetry-exporter-otlp` or `opentelemetry-sdk` must be installed to use this plugin'),
-                OTEL_LIBRARY_IMPORT_ERROR)
-
-        self.tasks_data = OrderedDict()
-
-        self.opentelemetry = OpenTelemetrySource(display=self._display)
-
-    def set_options(self, task_keys=None, var_options=None, direct=None):
-        super(CallbackModule, self).set_options(task_keys=task_keys,
-                                                var_options=var_options,
-                                                direct=direct)
-
-        environment_variable = self.get_option('enable_from_environment')
-        if environment_variable is not None and os.environ.get(environment_variable, 'false').lower() != 'true':
-            self.disabled = True
-            self._display.warning("The `enable_from_environment` option has been set and {0} is not enabled. "
-                                  "Disabling the `opentelemetry` callback plugin.".format(environment_variable))
-
-        self.hide_task_arguments = self.get_option('hide_task_arguments')
-
-        self.otel_service_name = self.get_option('otel_service_name')
-
-        if not self.otel_service_name:
-            self.otel_service_name = 'ansible'
-
-        # See https://github.com/open-telemetry/opentelemetry-specification/issues/740
-        self.traceparent = self.get_option('traceparent')
-
-    def v2_playbook_on_start(self, playbook):
-        self.ansible_playbook = basename(playbook._file_name)
-
-    def v2_playbook_on_play_start(self, play):
-        self.play_name = play.get_name()
-
-    def v2_runner_on_no_hosts(self, task):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_task_start(self, task, is_conditional):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_cleanup_task_start(self, task):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_playbook_on_handler_task_start(self, task):
-        self.opentelemetry.start_task(
-            self.tasks_data,
-            self.hide_task_arguments,
-            self.play_name,
-            task
-        )
-
-    def v2_runner_on_failed(self, result, ignore_errors=False):
-        if ignore_errors:
-            status = 'ignored'
-        else:
-            status = 'failed'
-            self.errors += 1
-
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            status,
-            result
-        )
-
-    def v2_runner_on_ok(self, result):
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'ok',
-            result
-        )
-
-    def v2_runner_on_skipped(self, result):
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'skipped',
-            result
-        )
-
-    def v2_playbook_on_include(self, included_file):
-        self.opentelemetry.finish_task(
-            self.tasks_data,
-            'included',
-            included_file
-        )
-
-    def v2_playbook_on_stats(self, stats):
-        if self.errors == 0:
-            status = Status(status_code=StatusCode.OK)
-        else:
-            status = Status(status_code=StatusCode.ERROR)
-        self.opentelemetry.generate_distributed_traces(
-            self.otel_service_name,
-            self.ansible_playbook,
-            self.tasks_data,
-            status,
-            self.traceparent
-        )
-
-    def v2_runner_on_async_failed(self, result, **kwargs):
-        self.errors += 1

plugins/callback/yaml.py

@@ -42,29 +42,28 @@ def should_use_block(value):
     return False
 
 
-class MyDumper(AnsibleDumper):
-    def represent_scalar(self, tag, value, style=None):
-        """Uses block style for multi-line strings"""
-        if style is None:
-            if should_use_block(value):
-                style = '|'
-                # we care more about readable than accuracy, so...
-                # ...no trailing space
-                value = value.rstrip()
-                # ...and non-printable characters
-                value = ''.join(x for x in value if x in string.printable or ord(x) >= 0xA0)
-                # ...tabs prevent blocks from expanding
-                value = value.expandtabs()
-                # ...and odd bits of whitespace
-                value = re.sub(r'[\x0b\x0c\r]', '', value)
-                # ...as does trailing space
-                value = re.sub(r' +\n', '\n', value)
-            else:
-                style = self.default_style
-        node = yaml.representer.ScalarNode(tag, value, style=style)
-        if self.alias_key is not None:
-            self.represented_objects[self.alias_key] = node
-        return node
+def my_represent_scalar(self, tag, value, style=None):
+    """Uses block style for multi-line strings"""
+    if style is None:
+        if should_use_block(value):
+            style = '|'
+            # we care more about readable than accuracy, so...
+            # ...no trailing space
+            value = value.rstrip()
+            # ...and non-printable characters
+            value = ''.join(x for x in value if x in string.printable or ord(x) >= 0xA0)
+            # ...tabs prevent blocks from expanding
+            value = value.expandtabs()
+            # ...and odd bits of whitespace
+            value = re.sub(r'[\x0b\x0c\r]', '', value)
+            # ...as does trailing space
+            value = re.sub(r' +\n', '\n', value)
+        else:
+            style = self.default_style
+    node = yaml.representer.ScalarNode(tag, value, style=style)
+    if self.alias_key is not None:
+        self.represented_objects[self.alias_key] = node
+    return node
 
 
 class CallbackModule(Default):
@@ -80,6 +79,7 @@ class CallbackModule(Default):
 
     def __init__(self):
         super(CallbackModule, self).__init__()
+        yaml.representer.BaseRepresenter.represent_scalar = my_represent_scalar
 
     def _dump_results(self, result, indent=None, sort_keys=True, keep_invocation=False):
         if result.get('_ansible_no_log', False):
@@ -121,7 +121,7 @@ class CallbackModule(Default):
 
         if abridged_result:
             dumped += '\n'
-            dumped += to_text(yaml.dump(abridged_result, allow_unicode=True, width=1000, Dumper=MyDumper, default_flow_style=False))
+            dumped += to_text(yaml.dump(abridged_result, allow_unicode=True, width=1000, Dumper=AnsibleDumper, default_flow_style=False))
 
         # indent by a couple of spaces
         dumped = '\n  '.join(dumped.split('\n')).rstrip()

plugins/connection/lxd.py

@@ -89,9 +89,9 @@ class Connection(ConnectionBase):
             local_cmd.extend(["--project", self.get_option("project")])
         local_cmd.extend([
             "exec",
-            "%s:%s" % (self.get_option("remote"), self.get_option("remote_addr")),
+            "%s:%s" % (self.get_option("remote"), self._host),
             "--",
-            self.get_option("executable"), "-c", cmd
+            self._play_context.executable, "-c", cmd
         ])
 
         local_cmd = [to_bytes(i, errors='surrogate_or_strict') for i in local_cmd]
@@ -126,7 +126,7 @@ class Connection(ConnectionBase):
         local_cmd.extend([
             "file", "push",
             in_path,
-            "%s:%s/%s" % (self.get_option("remote"), self.get_option("remote_addr"), out_path)
+            "%s:%s/%s" % (self.get_option("remote"), self._host, out_path)
         ])
 
         local_cmd = [to_bytes(i, errors='surrogate_or_strict') for i in local_cmd]
@@ -145,7 +145,7 @@ class Connection(ConnectionBase):
             local_cmd.extend(["--project", self.get_option("project")])
         local_cmd.extend([
             "file", "pull",
-            "%s:%s/%s" % (self.get_option("remote"), self.get_option("remote_addr"), in_path),
+            "%s:%s/%s" % (self.get_option("remote"), self._host, in_path),
             out_path
         ])
 

plugins/connection/saltstack.py

@@ -51,7 +51,7 @@ class Connection(ConnectionBase):
         self._connected = True
         return self
 
-    def exec_command(self, cmd, in_data=None, sudoable=False):
+    def exec_command(self, cmd, sudoable=False, in_data=None):
         """ run a command on the remote minion """
         super(Connection, self).exec_command(cmd, in_data=in_data, sudoable=sudoable)
 

plugins/doc_fragments/_netapp.py

@@ -0,0 +1,138 @@
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2018, Sumit Kumar <sumit4@netapp.com>, chris Archibald <carchi@netapp.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
+class ModuleDocFragment(object):
+
+    DOCUMENTATION = r'''
+options:
+  - See respective platform section for more details
+requirements:
+  - See respective platform section for more details
+notes:
+  - Ansible modules are available for the following NetApp Storage Platforms: E-Series, ONTAP, SolidFire
+'''
+
+    # Documentation fragment for ONTAP (na_cdot)
+    ONTAP = r'''
+options:
+  hostname:
+      required: true
+      description:
+      - The hostname or IP address of the ONTAP instance.
+  username:
+      required: true
+      description:
+      - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
+        For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+      aliases: ['user']
+  password:
+      required: true
+      description:
+      - Password for the specified user.
+      aliases: ['pass']
+requirements:
+  - A physical or virtual clustered Data ONTAP system. The modules were developed with Clustered Data ONTAP 8.3
+  - Ansible 2.2
+  - netapp-lib (2015.9.25). Install using 'pip install netapp-lib'
+
+notes:
+  - The modules prefixed with na\\_cdot are built to support the ONTAP storage platform.
+
+'''
+
+    # Documentation fragment for SolidFire
+    SOLIDFIRE = r'''
+options:
+  hostname:
+      required: true
+      description:
+      - The hostname or IP address of the SolidFire cluster.
+  username:
+      required: true
+      description:
+      - Please ensure that the user has the adequate permissions. For more information, please read the official documentation
+        U(https://mysupport.netapp.com/documentation/docweb/index.html?productID=62636&language=en-US).
+      aliases: ['user']
+  password:
+      required: true
+      description:
+      - Password for the specified user.
+      aliases: ['pass']
+
+requirements:
+  - The modules were developed with SolidFire 10.1
+  - solidfire-sdk-python (1.1.0.92) or greater. Install using 'pip install solidfire-sdk-python'
+
+notes:
+  - The modules prefixed with na\\_elementsw are built to support the SolidFire storage platform.
+
+'''
+
+    # Documentation fragment for ONTAP (na_ontap)
+    NA_ONTAP = r'''
+options:
+  hostname:
+      description:
+      - The hostname or IP address of the ONTAP instance.
+      type: str
+      required: true
+  username:
+      description:
+      - This can be a Cluster-scoped or SVM-scoped account, depending on whether a Cluster-level or SVM-level API is required.
+        For more information, please read the documentation U(https://mysupport.netapp.com/NOW/download/software/nmsdk/9.4/).
+      type: str
+      required: true
+      aliases: [ user ]
+  password:
+      description:
+      - Password for the specified user.
+      type: str
+      required: true
+      aliases: [ pass ]
+  https:
+      description:
+      - Enable and disable https
+      type: bool
+      default: no
+  validate_certs:
+      description:
+      - If set to C(no), the SSL certificates will not be validated.
+      - This should only set to C(False) used on personally controlled sites using self-signed certificates.
+      type: bool
+      default: yes
+  http_port:
+      description:
+      - Override the default port (80 or 443) with this port
+      type: int
+  ontapi:
+      description:
+      - The ontap api version to use
+      type: int
+  use_rest:
+      description:
+      - REST API if supported by the target system for all the resources and attributes the module requires. Otherwise will revert to ZAPI.
+      - Always -- will always use the REST API
+      - Never -- will always use the ZAPI
+      - Auto -- will try to use the REST Api
+      default: Auto
+      choices: ['Never', 'Always', 'Auto']
+      type: str
+
+
+requirements:
+  - A physical or virtual clustered Data ONTAP system. The modules support Data ONTAP 9.1 and onward
+  - Ansible 2.6
+  - Python2 netapp-lib (2017.10.30) or later. Install using 'pip install netapp-lib'
+  - Python3 netapp-lib (2018.11.13) or later. Install using 'pip install netapp-lib'
+  - To enable http on the cluster you must run the following commands 'set -privilege advanced;' 'system services web modify -http-enabled true;'
+
+notes:
+  - The modules prefixed with na\\_ontap are built to support the ONTAP storage platform.
+
+'''

plugins/doc_fragments/bitbucket.py

@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2019, Evgeniy Krysanov <evgeniy.krysanov@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-
-    # Standard documentation fragment
-    DOCUMENTATION = r'''
-options:
-  client_id:
-    description:
-      - The OAuth consumer key.
-      - If not set the environment variable C(BITBUCKET_CLIENT_ID) will be used.
-    type: str
-  client_secret:
-    description:
-      - The OAuth consumer secret.
-      - If not set the environment variable C(BITBUCKET_CLIENT_SECRET) will be used.
-    type: str
-  user:
-    description:
-      - The username.
-      - If not set the environment variable C(BITBUCKET_USERNAME) will be used.
-    type: str
-    version_added: 4.0.0
-  password:
-    description:
-      - The App password.
-      - If not set the environment variable C(BITBUCKET_PASSWORD) will be used.
-    type: str
-    version_added: 4.0.0
-notes:
-  - Bitbucket OAuth consumer key and secret can be obtained from Bitbucket profile -> Settings -> Access Management -> OAuth.
-  - Bitbucket App password can be created from Bitbucket profile -> Personal Settings -> App passwords.
-  - If both OAuth and Basic Auth credentials are passed, OAuth credentials take precedence.
-'''

plugins/doc_fragments/gitlab.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-
-    # Standard files documentation fragment
-    DOCUMENTATION = r'''
-requirements:
-  - requests (Python library U(https://pypi.org/project/requests/))
-
-options:
-  api_token:
-    description:
-      - GitLab access token with API permissions.
-    type: str
-  api_oauth_token:
-    description:
-      - GitLab OAuth token for logging in.
-    type: str
-    version_added: 4.2.0
-  api_job_token:
-    description:
-      - GitLab CI job token for logging in.
-    type: str
-    version_added: 4.2.0
-'''

plugins/doc_fragments/nios.py

@@ -0,0 +1,103 @@
+# -*- coding: utf-8 -*-
+
+# Copyright: (c) 2015, Peter Sprygada <psprygada@ansible.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
+class ModuleDocFragment(object):
+
+    # Standard files documentation fragment
+    DOCUMENTATION = r'''
+options:
+  provider:
+    description:
+      - A dict object containing connection details.
+    type: dict
+    suboptions:
+      host:
+        description:
+          - Specifies the DNS host name or address for connecting to the remote
+            instance of NIOS WAPI over REST
+          - Value can also be specified using C(INFOBLOX_HOST) environment
+            variable.
+        type: str
+      username:
+        description:
+          - Configures the username to use to authenticate the connection to
+            the remote instance of NIOS.
+          - Value can also be specified using C(INFOBLOX_USERNAME) environment
+            variable.
+        type: str
+      password:
+        description:
+          - Specifies the password to use to authenticate the connection to
+            the remote instance of NIOS.
+          - Value can also be specified using C(INFOBLOX_PASSWORD) environment
+            variable.
+        type: str
+      validate_certs:
+        description:
+          - Boolean value to enable or disable verifying SSL certificates
+          - Value can also be specified using C(INFOBLOX_SSL_VERIFY) environment
+            variable.
+        type: bool
+        default: no
+        aliases: [ ssl_verify ]
+      http_request_timeout:
+        description:
+          - The amount of time before to wait before receiving a response
+          - Value can also be specified using C(INFOBLOX_HTTP_REQUEST_TIMEOUT) environment
+            variable.
+        type: int
+        default: 10
+      max_retries:
+        description:
+          - Configures the number of attempted retries before the connection
+            is declared usable
+          - Value can also be specified using C(INFOBLOX_MAX_RETRIES) environment
+            variable.
+        type: int
+        default: 3
+      wapi_version:
+        description:
+          - Specifies the version of WAPI to use
+          - Value can also be specified using C(INFOBLOX_WAP_VERSION) environment
+            variable.
+          - Until ansible 2.8 the default WAPI was 1.4
+        type: str
+        default: '2.1'
+      max_results:
+        description:
+          - Specifies the maximum number of objects to be returned,
+            if set to a negative number the appliance will return an error when the
+            number of returned objects would exceed the setting.
+          - Value can also be specified using C(INFOBLOX_MAX_RESULTS) environment
+            variable.
+        type: int
+        default: 1000
+      http_pool_connections:
+        description:
+          - Number of pools to be used by the C(infoblox_client.Connector) object.
+          - This is passed as-is to the underlying C(requests.adapters.HTTPAdapter) class.
+        type: int
+        default: 10
+      http_pool_maxsize:
+        description:
+          - Maximum number of connections per pool to be used by the C(infoblox_client.Connector) object.
+          - This is passed as-is to the underlying C(requests.adapters.HTTPAdapter) class.
+        type: int
+        default: 10
+      silent_ssl_warnings:
+        description:
+          - Disable C(urllib3) SSL warnings in the C(infoblox_client.Connector) object.
+          - This is passed as-is to the underlying C(requests.adapters.HTTPAdapter) class.
+        type: bool
+        default: true
+notes:
+  - "This module must be run locally, which can be achieved by specifying C(connection: local)."
+  - Please read the :ref:`nios_guide` for more detailed information on how to use Infoblox with Ansible.
+
+'''

plugins/doc_fragments/redis.py

@@ -1,57 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Andreas Botzner <andreas at botzner dot com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-    # Common parameters for Redis modules
-    DOCUMENTATION = r'''
-options:
-  login_host:
-    description:
-      - Specify the target host running the database.
-    default: localhost
-    type: str
-  login_port:
-    description:
-      - Specify the port to connect to.
-    default: 6379
-    type: int
-  login_user:
-    description:
-      - Specify the user to authenticate with.
-      - Requires L(redis,https://pypi.org/project/redis) >= 3.4.0.
-    type: str
-  login_password:
-    description:
-      - Specify the password to authenticate with.
-      - Usually not used when target is localhost.
-    type: str
-  tls:
-    description:
-      - Specify whether or not to use TLS for the connection.
-    type: bool
-    default: true
-  validate_certs:
-    description:
-      - Specify whether or not to validate TLS certificates.
-      - This should only be turned off for personally controlled sites or with
-        C(localhost) as target.
-    type: bool
-    default: true
-  ca_certs:
-    description:
-      - Path to root certificates file. If not set and I(tls) is
-        set to C(true), certifi ca-certificates will be used.
-    type: str
-requirements: [ "redis", "certifi" ]
-
-notes:
-  - Requires the C(redis) Python package on the remote host. You can
-    install it with pip (C(pip install redis)) or with a package manager.
-    Information on the library can be found at U(https://github.com/andymccurdy/redis-py).
-'''

plugins/doc_fragments/rundeck.py

@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Phillipe Smith <phsmithcc@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-
-class ModuleDocFragment(object):
-
-    # Standard files documentation fragment
-    DOCUMENTATION = r'''
-options:
-  url:
-    type: str
-    description:
-      - Rundeck instance URL.
-    required: true
-  api_version:
-    type: int
-    description:
-      - Rundeck API version to be used.
-      - API version must be at least 14.
-    default: 39
-  api_token:
-    type: str
-    description:
-      - Rundeck User API Token.
-    required: true
-'''

plugins/filter/unicode_normalize.py

@@ -1,40 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Andrew Pantuso (@ajpantuso) <ajpantuso@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-from unicodedata import normalize
-
-from ansible.errors import AnsibleFilterError, AnsibleFilterTypeError
-from ansible.module_utils.six import text_type
-
-
-def unicode_normalize(data, form='NFC'):
-    """Applies normalization to 'unicode' strings.
-
-    Args:
-        data: A unicode string piped into the Jinja filter
-        form: One of ('NFC', 'NFD', 'NFKC', 'NFKD').
-              See https://docs.python.org/3/library/unicodedata.html#unicodedata.normalize for more information.
-
-    Returns:
-        A normalized unicode string of the specified 'form'.
-    """
-
-    if not isinstance(data, text_type):
-        raise AnsibleFilterTypeError("%s is not a valid input type" % type(data))
-
-    if form not in ('NFC', 'NFD', 'NFKC', 'NFKD'):
-        raise AnsibleFilterError("%s is not a valid form" % form)
-
-    return normalize(form, data)
-
-
-class FilterModule(object):
-    def filters(self):
-        return {
-            'unicode_normalize': unicode_normalize,
-        }

plugins/inventory/icinga2.py

@@ -1,259 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021, Cliff Hults <cliff.hlts@gmail.com>
-# Copyright (c) 2021 Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    name: icinga2
-    short_description: Icinga2 inventory source
-    version_added: 3.7.0
-    author:
-        - Cliff Hults (@BongoEADGC6) <cliff.hults@gmail.com>
-    description:
-        - Get inventory hosts from the Icinga2 API.
-        - "Uses a configuration file as an inventory source, it must end in
-          C(.icinga2.yml) or C(.icinga2.yaml)."
-    options:
-      plugin:
-        description: Name of the plugin.
-        required: true
-        type: string
-        choices: ['community.general.icinga2']
-      url:
-        description: Root URL of Icinga2 API.
-        type: string
-        required: true
-      user:
-        description: Username to query the API.
-        type: string
-        required: true
-      password:
-        description: Password to query the API.
-        type: string
-        required: true
-      host_filter:
-        description:
-          - An Icinga2 API valid host filter. Leave blank for no filtering
-        type: string
-        required: false
-      validate_certs:
-        description: Enables or disables SSL certificate verification.
-        type: boolean
-        default: true
-      inventory_attr:
-        description:
-          - Allows the override of the inventory name based on different attributes.
-          - This allows for changing the way limits are used.
-          - The current default, C(address), is sometimes not unique or present. We recommend to use C(name) instead.
-        type: string
-        default: address
-        choices: ['name', 'display_name', 'address']
-        version_added: 4.2.0
-'''
-
-EXAMPLES = r'''
-# my.icinga2.yml
-plugin: community.general.icinga2
-url: http://localhost:5665
-user: ansible
-password: secure
-host_filter: \"linux-servers\" in host.groups
-validate_certs: false
-inventory_attr: name
-'''
-
-import json
-
-from ansible.errors import AnsibleParserError
-from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
-from ansible.module_utils.urls import open_url
-from ansible.module_utils.six.moves.urllib.error import HTTPError
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable):
-    ''' Host inventory parser for ansible using Icinga2 as source. '''
-
-    NAME = 'community.general.icinga2'
-
-    def __init__(self):
-
-        super(InventoryModule, self).__init__()
-
-        # from config
-        self.icinga2_url = None
-        self.icinga2_user = None
-        self.icinga2_password = None
-        self.ssl_verify = None
-        self.host_filter = None
-        self.inventory_attr = None
-
-        self.cache_key = None
-        self.use_cache = None
-
-    def verify_file(self, path):
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(('icinga2.yaml', 'icinga2.yml')):
-                valid = True
-            else:
-                self.display.vvv('Skipping due to inventory source not ending in "icinga2.yaml" nor "icinga2.yml"')
-        return valid
-
-    def _api_connect(self):
-        self.headers = {
-            'User-Agent': "ansible-icinga2-inv",
-            'Accept': "application/json",
-        }
-        api_status_url = self.icinga2_url + "/status"
-        request_args = {
-            'headers': self.headers,
-            'url_username': self.icinga2_user,
-            'url_password': self.icinga2_password,
-            'validate_certs': self.ssl_verify
-        }
-        open_url(api_status_url, **request_args)
-
-    def _post_request(self, request_url, data=None):
-        self.display.vvv("Requested URL: %s" % request_url)
-        request_args = {
-            'headers': self.headers,
-            'url_username': self.icinga2_user,
-            'url_password': self.icinga2_password,
-            'validate_certs': self.ssl_verify
-        }
-        if data is not None:
-            request_args['data'] = json.dumps(data)
-        self.display.vvv("Request Args: %s" % request_args)
-        try:
-            response = open_url(request_url, **request_args)
-        except HTTPError as e:
-            try:
-                error_body = json.loads(e.read().decode())
-                self.display.vvv("Error returned: {0}".format(error_body))
-            except Exception:
-                error_body = {"status": None}
-            if e.code == 404 and error_body.get('status') == "No objects found.":
-                raise AnsibleParserError("Host filter returned no data. Please confirm your host_filter value is valid")
-            raise AnsibleParserError("Unexpected data returned: {0} -- {1}".format(e, error_body))
-
-        response_body = response.read()
-        json_data = json.loads(response_body.decode('utf-8'))
-        self.display.vvv("Returned Data: %s" % json.dumps(json_data, indent=4, sort_keys=True))
-        if 200 <= response.status <= 299:
-            return json_data
-        if response.status == 404 and json_data['status'] == "No objects found.":
-            raise AnsibleParserError(
-                "API returned no data -- Response: %s - %s"
-                % (response.status, json_data['status']))
-        if response.status == 401:
-            raise AnsibleParserError(
-                "API was unable to complete query -- Response: %s - %s"
-                % (response.status, json_data['status']))
-        if response.status == 500:
-            raise AnsibleParserError(
-                "API Response - %s - %s"
-                % (json_data['status'], json_data['errors']))
-        raise AnsibleParserError(
-            "Unexpected data returned - %s - %s"
-            % (json_data['status'], json_data['errors']))
-
-    def _query_hosts(self, hosts=None, attrs=None, joins=None, host_filter=None):
-        query_hosts_url = "{0}/objects/hosts".format(self.icinga2_url)
-        self.headers['X-HTTP-Method-Override'] = 'GET'
-        data_dict = dict()
-        if hosts:
-            data_dict['hosts'] = hosts
-        if attrs is not None:
-            data_dict['attrs'] = attrs
-        if joins is not None:
-            data_dict['joins'] = joins
-        if host_filter is not None:
-            data_dict['filter'] = host_filter.replace("\\\"", "\"")
-            self.display.vvv(host_filter)
-        host_dict = self._post_request(query_hosts_url, data_dict)
-        return host_dict['results']
-
-    def get_inventory_from_icinga(self):
-        """Query for all hosts """
-        self.display.vvv("Querying Icinga2 for inventory")
-        query_args = {
-            "attrs": ["address", "display_name", "state_type", "state", "groups"],
-        }
-        if self.host_filter is not None:
-            query_args['host_filter'] = self.host_filter
-        # Icinga2 API Call
-        results_json = self._query_hosts(**query_args)
-        # Manipulate returned API data to Ansible inventory spec
-        ansible_inv = self._convert_inv(results_json)
-        return ansible_inv
-
-    def _populate(self):
-        groups = self._to_json(self.get_inventory_from_icinga())
-        return groups
-
-    def _to_json(self, in_dict):
-        """Convert dictionary to JSON"""
-        return json.dumps(in_dict, sort_keys=True, indent=2)
-
-    def _convert_inv(self, json_data):
-        """Convert Icinga2 API data to JSON format for Ansible"""
-        groups_dict = {"_meta": {"hostvars": {}}}
-        for entry in json_data:
-            host_attrs = entry['attrs']
-            if self.inventory_attr == "name":
-                host_name = entry.get('name')
-            if self.inventory_attr == "address":
-                # When looking for address for inventory, if missing fallback to object name
-                if host_attrs.get('address', '') != '':
-                    host_name = host_attrs.get('address')
-                else:
-                    host_name = entry.get('name')
-            if self.inventory_attr == "display_name":
-                host_name = host_attrs.get('display_name')
-            if host_attrs['state'] == 0:
-                host_attrs['state'] = 'on'
-            else:
-                host_attrs['state'] = 'off'
-            host_groups = host_attrs.get('groups')
-            self.inventory.add_host(host_name)
-            for group in host_groups:
-                if group not in self.inventory.groups.keys():
-                    self.inventory.add_group(group)
-                self.inventory.add_child(group, host_name)
-            # If the address attribute is populated, override ansible_host with the value
-            if host_attrs.get('address') != '':
-                self.inventory.set_variable(host_name, 'ansible_host', host_attrs.get('address'))
-            self.inventory.set_variable(host_name, 'hostname', entry.get('name'))
-            self.inventory.set_variable(host_name, 'display_name', host_attrs.get('display_name'))
-            self.inventory.set_variable(host_name, 'state',
-                                        host_attrs['state'])
-            self.inventory.set_variable(host_name, 'state_type',
-                                        host_attrs['state_type'])
-        return groups_dict
-
-    def parse(self, inventory, loader, path, cache=True):
-
-        super(InventoryModule, self).parse(inventory, loader, path)
-
-        # read config from file, this sets 'options'
-        self._read_config_data(path)
-
-        # Store the options from the YAML file
-        self.icinga2_url = self.get_option('url').rstrip('/') + '/v1'
-        self.icinga2_user = self.get_option('user')
-        self.icinga2_password = self.get_option('password')
-        self.ssl_verify = self.get_option('validate_certs')
-        self.host_filter = self.get_option('host_filter')
-        self.inventory_attr = self.get_option('inventory_attr')
-        # Not currently enabled
-        # self.cache_key = self.get_cache_key(path)
-        # self.use_cache = cache and self.get_option('cache')
-
-        # Test connection to API
-        self._api_connect()
-
-        # Call our internal helper to populate the dynamic inventory
-        self._populate()

plugins/inventory/linode.py

@@ -23,17 +23,9 @@ DOCUMENTATION = r'''
         - constructed
     options:
         plugin:
-            description: Marks this as an instance of the 'linode' plugin.
+            description: marks this as an instance of the 'linode' plugin
             required: true
             choices: ['linode', 'community.general.linode']
-        ip_style:
-            description: Populate hostvars with all information available from the Linode APIv4.
-            type: string
-            default: plain
-            choices:
-                - plain
-                - api
-            version_added: 3.6.0
         access_token:
             description: The Linode account personal access token.
             required: true
@@ -86,18 +78,7 @@ groups:
   webservers: "'web' in (tags|list)"
   mailservers: "'mail' in (tags|list)"
 compose:
-  # By default, Ansible tries to connect to the label of the instance.
-  # Since that might not be a valid name to connect to, you can
-  # replace it with the first IPv4 address of the linode as follows:
-  ansible_ssh_host: ipv4[0]
   ansible_port: 2222
-
-# Example where control traffic limited to internal network
-plugin: community.general.linode
-access_token: foobar
-ip_style: api
-compose:
-  ansible_host: "ipv4 | community.general.json_query('[?public==`false`].address') | first"
 '''
 
 import os
@@ -185,44 +166,14 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
 
     def _add_hostvars_for_instances(self):
         """Add hostvars for instances in the dynamic inventory."""
-        ip_style = self.get_option('ip_style')
         for instance in self.instances:
             hostvars = instance._raw_json
             for hostvar_key in hostvars:
-                if ip_style == 'api' and hostvar_key in ['ipv4', 'ipv6']:
-                    continue
                 self.inventory.set_variable(
                     instance.label,
                     hostvar_key,
                     hostvars[hostvar_key]
                 )
-            if ip_style == 'api':
-                ips = instance.ips.ipv4.public + instance.ips.ipv4.private
-                ips += [instance.ips.ipv6.slaac, instance.ips.ipv6.link_local]
-                ips += instance.ips.ipv6.pools
-
-                for ip_type in set(ip.type for ip in ips):
-                    self.inventory.set_variable(
-                        instance.label,
-                        ip_type,
-                        self._ip_data([ip for ip in ips if ip.type == ip_type])
-                    )
-
-    def _ip_data(self, ip_list):
-        data = []
-        for ip in list(ip_list):
-            data.append(
-                {
-                    'address': ip.address,
-                    'subnet_mask': ip.subnet_mask,
-                    'gateway': ip.gateway,
-                    'public': ip.public,
-                    'prefix': ip.prefix,
-                    'rdns': ip.rdns,
-                    'type': ip.type
-                }
-            )
-        return data
 
     def _validate_option(self, name, desired_type, option_value):
         """Validate user specified configuration data against types."""

plugins/inventory/lxd.py

@@ -13,9 +13,6 @@ DOCUMENTATION = r'''
         - Uses a YAML configuration file that ends with 'lxd.(yml|yaml)'.
     version_added: "3.0.0"
     author: "Frank Dornheim (@conloos)"
-    requirements:
-        - ipaddress
-        - lxd >= 4.0
     options:
         plugin:
             description: Token that ensures this is a source file for the 'lxd' plugin.
@@ -50,38 +47,26 @@ DOCUMENTATION = r'''
             - If I(trust_password) is set, this module send a request for authentication before sending any requests.
             type: str
         state:
-            description: Filter the instance according to the current status.
+            description: Filter the container according to the current status.
             type: str
             default: none
             choices: [ 'STOPPED', 'STARTING', 'RUNNING', 'none' ]
-        type_filter:
+        prefered_container_network_interface:
             description:
-            - Filter the instances by type C(virtual-machine), C(container) or C(both).
-            - The first version of the inventory only supported containers.
-            type: str
-            default: container
-            choices: [ 'virtual-machine', 'container', 'both' ]
-            version_added: 4.2.0
-        prefered_instance_network_interface:
-            description:
-            - If an instance has multiple network interfaces, select which one is the prefered as pattern.
+            - If a container has multiple network interfaces, select which one is the prefered as pattern.
             - Combined with the first number that can be found e.g. 'eth' + 0.
-            - The option has been renamed from I(prefered_container_network_interface) to I(prefered_instance_network_interface) in community.general 3.8.0.
-              The old name still works as an alias.
             type: str
             default: eth
-            aliases:
-              - prefered_container_network_interface
-        prefered_instance_network_family:
+        prefered_container_network_family:
             description:
-            - If an instance has multiple network interfaces, which one is the prefered by family.
+            - If a container has multiple network interfaces, which one is the prefered by family.
             - Specify C(inet) for IPv4 and C(inet6) for IPv6.
             type: str
             default: inet
             choices: [ 'inet', 'inet6' ]
         groupby:
             description:
-            - Create groups by the following keywords C(location), C(network_range), C(os), C(pattern), C(profile), C(release), C(type), C(vlanid).
+            - Create groups by the following keywords C(location), C(pattern), C(network_range), C(os), C(release), C(profile), C(vlanid).
             - See example for syntax.
             type: dict
 '''
@@ -96,49 +81,38 @@ plugin: community.general.lxd
 url: unix:/var/snap/lxd/common/lxd/unix.socket
 state: RUNNING
 
-# simple lxd.yml including virtual machines and containers
-plugin: community.general.lxd
-url: unix:/var/snap/lxd/common/lxd/unix.socket
-type_filter: both
-
 # grouping lxd.yml
 groupby:
-  locationBerlin:
-    type: location
-    attribute: Berlin
-  netRangeIPv4:
-    type: network_range
-    attribute: 10.98.143.0/24
-  netRangeIPv6:
-    type: network_range
-    attribute: fd42:bd00:7b11:2167:216:3eff::/24
-  osUbuntu:
-    type: os
-    attribute: ubuntu
   testpattern:
     type: pattern
     attribute: test
-  profileDefault:
-    type: profile
-    attribute: default
-  profileX11:
-    type: profile
-    attribute: x11
+  vlan666:
+    type: vlanid
+    attribute: 666
+  locationBerlin:
+    type: location
+    attribute: Berlin
+  osUbuntu:
+    type: os
+    attribute: ubuntu
   releaseFocal:
     type: release
     attribute: focal
   releaseBionic:
     type: release
     attribute: bionic
-  typeVM:
-    type: type
-    attribute: virtual-machine
-  typeContainer:
-    type: type
-    attribute: container
-  vlan666:
-    type: vlanid
-    attribute: 666
+  profileDefault:
+    type: profile
+    attribute: default
+  profileX11:
+    type: profile
+    attribute: x11
+  netRangeIPv4:
+    type: network_range
+    attribute: 10.98.143.0/24
+  netRangeIPv6:
+    type: network_range
+    attribute: fd42:bd00:7b11:2167:216:3eff::/24
 '''
 
 import binascii
@@ -150,17 +124,10 @@ import socket
 from ansible.plugins.inventory import BaseInventoryPlugin
 from ansible.module_utils.common.text.converters import to_native, to_text
 from ansible.module_utils.common.dict_transformations import dict_merge
-from ansible.module_utils.six import raise_from
 from ansible.errors import AnsibleError, AnsibleParserError
+from ansible_collections.community.general.plugins.module_utils.compat import ipaddress
 from ansible_collections.community.general.plugins.module_utils.lxd import LXDClient, LXDClientException
 
-try:
-    import ipaddress
-except ImportError as exc:
-    IPADDRESS_IMPORT_ERROR = exc
-else:
-    IPADDRESS_IMPORT_ERROR = None
-
 
 class InventoryModule(BaseInventoryPlugin):
     DEBUG = 4
@@ -307,10 +274,10 @@ class InventoryModule(BaseInventoryPlugin):
         network_configs = self.socket.do('GET', '/1.0/networks')
         return [m.split('/')[3] for m in network_configs['metadata']]
 
-    def _get_instances(self):
-        """Get instancenames
+    def _get_containers(self):
+        """Get Containernames
 
-        Returns all instancenames
+        Returns all containernames
 
         Args:
             None
@@ -319,27 +286,25 @@ class InventoryModule(BaseInventoryPlugin):
         Raises:
             None
         Returns:
-            list(names): names of all instances"""
-        # e.g. {
-        #        "metadata": [
-        #          "/1.0/instances/foo",
-        #          "/1.0/instances/bar"
-        #        ],
-        #        "status": "Success",
-        #        "status_code": 200,
-        #        "type": "sync"
-        #      }
-        instances = self.socket.do('GET', '/1.0/instances')
-        return [m.split('/')[3] for m in instances['metadata']]
+            list(names): names of all containers"""
+        # e.g. {'type': 'sync',
+        #       'status': 'Success',
+        #       'status_code': 200,
+        #       'operation': '',
+        #       'error_code': 0,
+        #       'error': '',
+        #       'metadata': ['/1.0/containers/udemy-ansible-ubuntu-2004']}
+        containers = self.socket.do('GET', '/1.0/containers')
+        return [m.split('/')[3] for m in containers['metadata']]
 
     def _get_config(self, branch, name):
-        """Get inventory of instance
+        """Get inventory of container
 
-        Get config of instance
+        Get config of container
 
         Args:
             str(branch): Name oft the API-Branch
-            str(name): Name of instance
+            str(name): Name of Container
         Kwargs:
             None
         Source:
@@ -347,7 +312,7 @@ class InventoryModule(BaseInventoryPlugin):
         Raises:
             None
         Returns:
-            dict(config): Config of the instance"""
+            dict(config): Config of the container"""
         config = {}
         if isinstance(branch, (tuple, list)):
             config[name] = {branch[1]: self.socket.do('GET', '/1.0/{0}/{1}/{2}'.format(to_native(branch[0]), to_native(name), to_native(branch[1])))}
@@ -355,13 +320,13 @@ class InventoryModule(BaseInventoryPlugin):
             config[name] = {branch: self.socket.do('GET', '/1.0/{0}/{1}'.format(to_native(branch), to_native(name)))}
         return config
 
-    def get_instance_data(self, names):
-        """Create Inventory of the instance
+    def get_container_data(self, names):
+        """Create Inventory of the container
 
-        Iterate through the different branches of the instances and collect Informations.
+        Iterate through the different branches of the containers and collect Informations.
 
         Args:
-            list(names): List of instance names
+            list(names): List of container names
         Kwargs:
             None
         Raises:
@@ -370,20 +335,20 @@ class InventoryModule(BaseInventoryPlugin):
             None"""
         # tuple(('instances','metadata/templates')) to get section in branch
         # e.g. /1.0/instances/<name>/metadata/templates
-        branches = ['instances', ('instances', 'state')]
-        instance_config = {}
+        branches = ['containers', ('instances', 'state')]
+        container_config = {}
         for branch in branches:
             for name in names:
-                instance_config['instances'] = self._get_config(branch, name)
-                self.data = dict_merge(instance_config, self.data)
+                container_config['containers'] = self._get_config(branch, name)
+                self.data = dict_merge(container_config, self.data)
 
     def get_network_data(self, names):
-        """Create Inventory of the instance
+        """Create Inventory of the container
 
-        Iterate through the different branches of the instances and collect Informations.
+        Iterate through the different branches of the containers and collect Informations.
 
         Args:
-            list(names): List of instance names
+            list(names): List of container names
         Kwargs:
             None
         Raises:
@@ -402,26 +367,26 @@ class InventoryModule(BaseInventoryPlugin):
                     network_config['networks'] = {name: None}
                 self.data = dict_merge(network_config, self.data)
 
-    def extract_network_information_from_instance_config(self, instance_name):
+    def extract_network_information_from_container_config(self, container_name):
         """Returns the network interface configuration
 
-        Returns the network ipv4 and ipv6 config of the instance without local-link
+        Returns the network ipv4 and ipv6 config of the container without local-link
 
         Args:
-            str(instance_name): Name oft he instance
+            str(container_name): Name oft he container
         Kwargs:
             None
         Raises:
             None
         Returns:
             dict(network_configuration): network config"""
-        instance_network_interfaces = self._get_data_entry('instances/{0}/state/metadata/network'.format(instance_name))
+        container_network_interfaces = self._get_data_entry('containers/{0}/state/metadata/network'.format(container_name))
         network_configuration = None
-        if instance_network_interfaces:
+        if container_network_interfaces:
             network_configuration = {}
-            gen_interface_names = [interface_name for interface_name in instance_network_interfaces if interface_name != 'lo']
+            gen_interface_names = [interface_name for interface_name in container_network_interfaces if interface_name != 'lo']
             for interface_name in gen_interface_names:
-                gen_address = [address for address in instance_network_interfaces[interface_name]['addresses'] if address.get('scope') != 'link']
+                gen_address = [address for address in container_network_interfaces[interface_name]['addresses'] if address.get('scope') != 'link']
                 network_configuration[interface_name] = []
                 for address in gen_address:
                     address_set = {}
@@ -432,24 +397,24 @@ class InventoryModule(BaseInventoryPlugin):
                     network_configuration[interface_name].append(address_set)
         return network_configuration
 
-    def get_prefered_instance_network_interface(self, instance_name):
-        """Helper to get the prefered interface of thr instance
+    def get_prefered_container_network_interface(self, container_name):
+        """Helper to get the prefered interface of thr container
 
-        Helper to get the prefered interface provide by neme pattern from 'prefered_instance_network_interface'.
+        Helper to get the prefered interface provide by neme pattern from 'prefered_container_network_interface'.
 
         Args:
-            str(containe_name): name of instance
+            str(containe_name): name of container
         Kwargs:
             None
         Raises:
             None
         Returns:
             str(prefered_interface): None or interface name"""
-        instance_network_interfaces = self._get_data_entry('inventory/{0}/network_interfaces'.format(instance_name))
+        container_network_interfaces = self._get_data_entry('inventory/{0}/network_interfaces'.format(container_name))
         prefered_interface = None  # init
-        if instance_network_interfaces:  # instance have network interfaces
+        if container_network_interfaces:  # container have network interfaces
             # generator if interfaces which start with the desired pattern
-            net_generator = [interface for interface in instance_network_interfaces if interface.startswith(self.prefered_instance_network_interface)]
+            net_generator = [interface for interface in container_network_interfaces if interface.startswith(self.prefered_container_network_interface)]
             selected_interfaces = []  # init
             for interface in net_generator:
                 selected_interfaces.append(interface)
@@ -457,13 +422,13 @@ class InventoryModule(BaseInventoryPlugin):
                 prefered_interface = sorted(selected_interfaces)[0]
         return prefered_interface
 
-    def get_instance_vlans(self, instance_name):
-        """Get VLAN(s) from instance
+    def get_container_vlans(self, container_name):
+        """Get VLAN(s) from container
 
-        Helper to get the VLAN_ID from the instance
+        Helper to get the VLAN_ID from the container
 
         Args:
-            str(containe_name): name of instance
+            str(containe_name): name of container
         Kwargs:
             None
         Raises:
@@ -476,13 +441,13 @@ class InventoryModule(BaseInventoryPlugin):
             if self._get_data_entry('state/metadata/vlan/vid', data=self.data['networks'].get(network)):
                 network_vlans[network] = self._get_data_entry('state/metadata/vlan/vid', data=self.data['networks'].get(network))
 
-        # get networkdevices of instance and return
+        # get networkdevices of container and return
         # e.g.
         # "eth0":{ "name":"eth0",
         #          "network":"lxdbr0",
         #          "type":"nic"},
         vlan_ids = {}
-        devices = self._get_data_entry('instances/{0}/instances/metadata/expanded_devices'.format(to_native(instance_name)))
+        devices = self._get_data_entry('containers/{0}/containers/metadata/expanded_devices'.format(to_native(container_name)))
         for device in devices:
             if 'network' in devices[device]:
                 if devices[device]['network'] in network_vlans:
@@ -518,14 +483,14 @@ class InventoryModule(BaseInventoryPlugin):
         except KeyError:
             return None
 
-    def _set_data_entry(self, instance_name, key, value, path=None):
+    def _set_data_entry(self, container_name, key, value, path=None):
         """Helper to save data
 
         Helper to save the data in self.data
         Detect if data is allready in branch and use dict_merge() to prevent that branch is overwritten.
 
         Args:
-            str(instance_name): name of instance
+            str(container_name): name of container
             str(key): same as dict
             *(value): same as dict
         Kwargs:
@@ -536,24 +501,24 @@ class InventoryModule(BaseInventoryPlugin):
             None"""
         if not path:
             path = self.data['inventory']
-        if instance_name not in path:
-            path[instance_name] = {}
+        if container_name not in path:
+            path[container_name] = {}
 
         try:
-            if isinstance(value, dict) and key in path[instance_name]:
-                path[instance_name] = dict_merge(value, path[instance_name][key])
+            if isinstance(value, dict) and key in path[container_name]:
+                path[container_name] = dict_merge(value, path[container_name][key])
             else:
-                path[instance_name][key] = value
+                path[container_name][key] = value
         except KeyError as err:
             raise AnsibleParserError("Unable to store Informations: {0}".format(to_native(err)))
 
-    def extract_information_from_instance_configs(self):
+    def extract_information_from_container_configs(self):
         """Process configuration information
 
         Preparation of the data
 
         Args:
-            dict(configs): instance configurations
+            dict(configs): Container configurations
         Kwargs:
             None
         Raises:
@@ -564,35 +529,33 @@ class InventoryModule(BaseInventoryPlugin):
         if 'inventory' not in self.data:
             self.data['inventory'] = {}
 
-        for instance_name in self.data['instances']:
-            self._set_data_entry(instance_name, 'os', self._get_data_entry(
-                'instances/{0}/instances/metadata/config/image.os'.format(instance_name)))
-            self._set_data_entry(instance_name, 'release', self._get_data_entry(
-                'instances/{0}/instances/metadata/config/image.release'.format(instance_name)))
-            self._set_data_entry(instance_name, 'version', self._get_data_entry(
-                'instances/{0}/instances/metadata/config/image.version'.format(instance_name)))
-            self._set_data_entry(instance_name, 'profile', self._get_data_entry(
-                'instances/{0}/instances/metadata/profiles'.format(instance_name)))
-            self._set_data_entry(instance_name, 'location', self._get_data_entry(
-                'instances/{0}/instances/metadata/location'.format(instance_name)))
-            self._set_data_entry(instance_name, 'state', self._get_data_entry(
-                'instances/{0}/instances/metadata/config/volatile.last_state.power'.format(instance_name)))
-            self._set_data_entry(instance_name, 'type', self._get_data_entry(
-                'instances/{0}/instances/metadata/type'.format(instance_name)))
-            self._set_data_entry(instance_name, 'network_interfaces', self.extract_network_information_from_instance_config(instance_name))
-            self._set_data_entry(instance_name, 'preferred_interface', self.get_prefered_instance_network_interface(instance_name))
-            self._set_data_entry(instance_name, 'vlan_ids', self.get_instance_vlans(instance_name))
+        for container_name in self.data['containers']:
+            self._set_data_entry(container_name, 'os', self._get_data_entry(
+                'containers/{0}/containers/metadata/config/image.os'.format(container_name)))
+            self._set_data_entry(container_name, 'release', self._get_data_entry(
+                'containers/{0}/containers/metadata/config/image.release'.format(container_name)))
+            self._set_data_entry(container_name, 'version', self._get_data_entry(
+                'containers/{0}/containers/metadata/config/image.version'.format(container_name)))
+            self._set_data_entry(container_name, 'profile', self._get_data_entry(
+                'containers/{0}/containers/metadata/profiles'.format(container_name)))
+            self._set_data_entry(container_name, 'location', self._get_data_entry(
+                'containers/{0}/containers/metadata/location'.format(container_name)))
+            self._set_data_entry(container_name, 'state', self._get_data_entry(
+                'containers/{0}/containers/metadata/config/volatile.last_state.power'.format(container_name)))
+            self._set_data_entry(container_name, 'network_interfaces', self.extract_network_information_from_container_config(container_name))
+            self._set_data_entry(container_name, 'preferred_interface', self.get_prefered_container_network_interface(container_name))
+            self._set_data_entry(container_name, 'vlan_ids', self.get_container_vlans(container_name))
 
-    def build_inventory_network(self, instance_name):
-        """Add the network interfaces of the instance to the inventory
+    def build_inventory_network(self, container_name):
+        """Add the network interfaces of the container to the inventory
 
         Logic:
-            - if the instance have no interface -> 'ansible_connection: local'
-            - get preferred_interface & prefered_instance_network_family -> 'ansible_connection: ssh' & 'ansible_host: <IP>'
-            - first Interface from: network_interfaces prefered_instance_network_family -> 'ansible_connection: ssh' & 'ansible_host: <IP>'
+            - if the container have no interface -> 'ansible_connection: local'
+            - get preferred_interface & prefered_container_network_family -> 'ansible_connection: ssh' & 'ansible_host: <IP>'
+            - first Interface from: network_interfaces prefered_container_network_family -> 'ansible_connection: ssh' & 'ansible_host: <IP>'
 
         Args:
-            str(instance_name): name of instance
+            str(container_name): name of container
         Kwargs:
             None
         Raises:
@@ -600,45 +563,45 @@ class InventoryModule(BaseInventoryPlugin):
         Returns:
             None"""
 
-        def interface_selection(instance_name):
-            """Select instance Interface for inventory
+        def interface_selection(container_name):
+            """Select container Interface for inventory
 
             Logic:
-                - get preferred_interface & prefered_instance_network_family -> str(IP)
-                - first Interface from: network_interfaces prefered_instance_network_family -> str(IP)
+                - get preferred_interface & prefered_container_network_family -> str(IP)
+                - first Interface from: network_interfaces prefered_container_network_family -> str(IP)
 
             Args:
-                str(instance_name): name of instance
+                str(container_name): name of container
             Kwargs:
                 None
             Raises:
                 None
             Returns:
                 dict(interface_name: ip)"""
-            prefered_interface = self._get_data_entry('inventory/{0}/preferred_interface'.format(instance_name))  # name or None
-            prefered_instance_network_family = self.prefered_instance_network_family
+            prefered_interface = self._get_data_entry('inventory/{0}/preferred_interface'.format(container_name))  # name or None
+            prefered_container_network_family = self.prefered_container_network_family
 
             ip_address = ''
             if prefered_interface:
-                interface = self._get_data_entry('inventory/{0}/network_interfaces/{1}'.format(instance_name, prefered_interface))
+                interface = self._get_data_entry('inventory/{0}/network_interfaces/{1}'.format(container_name, prefered_interface))
                 for config in interface:
-                    if config['family'] == prefered_instance_network_family:
+                    if config['family'] == prefered_container_network_family:
                         ip_address = config['address']
                         break
             else:
-                interfaces = self._get_data_entry('inventory/{0}/network_interfaces'.format(instance_name))
-                for interface in interfaces.values():
-                    for config in interface:
-                        if config['family'] == prefered_instance_network_family:
-                            ip_address = config['address']
-                            break
+                interface = self._get_data_entry('inventory/{0}/network_interfaces'.format(container_name))
+                for config in interface:
+                    if config['family'] == prefered_container_network_family:
+                        ip_address = config['address']
+                        break
             return ip_address
 
-        if self._get_data_entry('inventory/{0}/network_interfaces'.format(instance_name)):  # instance have network interfaces
-            self.inventory.set_variable(instance_name, 'ansible_connection', 'ssh')
-            self.inventory.set_variable(instance_name, 'ansible_host', interface_selection(instance_name))
+        if self._get_data_entry('inventory/{0}/network_interfaces'.format(container_name)):  # container have network interfaces
+            if self._get_data_entry('inventory/{0}/preferred_interface'.format(container_name)):  # container have a preferred interface
+                self.inventory.set_variable(container_name, 'ansible_connection', 'ssh')
+                self.inventory.set_variable(container_name, 'ansible_host', interface_selection(container_name))
         else:
-            self.inventory.set_variable(instance_name, 'ansible_connection', 'local')
+            self.inventory.set_variable(container_name, 'ansible_connection', 'local')
 
     def build_inventory_hosts(self):
         """Build host-part dynamic inventory
@@ -654,33 +617,29 @@ class InventoryModule(BaseInventoryPlugin):
             None
         Returns:
             None"""
-        for instance_name in self.data['inventory']:
-            instance_state = str(self._get_data_entry('inventory/{0}/state'.format(instance_name)) or "STOPPED").lower()
-
-            # Only consider instances that match the "state" filter, if self.state is not None
+        for container_name in self.data['inventory']:
+            # Only consider containers that match the "state" filter, if self.state is not None
             if self.filter:
-                if self.filter.lower() != instance_state:
+                if self.filter.lower() != self._get_data_entry('inventory/{0}/state'.format(container_name)).lower():
                     continue
-            # add instance
-            self.inventory.add_host(instance_name)
+            # add container
+            self.inventory.add_host(container_name)
             # add network informations
-            self.build_inventory_network(instance_name)
+            self.build_inventory_network(container_name)
             # add os
-            self.inventory.set_variable(instance_name, 'ansible_lxd_os', self._get_data_entry('inventory/{0}/os'.format(instance_name)).lower())
+            self.inventory.set_variable(container_name, 'ansible_lxd_os', self._get_data_entry('inventory/{0}/os'.format(container_name)).lower())
             # add release
-            self.inventory.set_variable(instance_name, 'ansible_lxd_release', self._get_data_entry('inventory/{0}/release'.format(instance_name)).lower())
+            self.inventory.set_variable(container_name, 'ansible_lxd_release', self._get_data_entry('inventory/{0}/release'.format(container_name)).lower())
             # add profile
-            self.inventory.set_variable(instance_name, 'ansible_lxd_profile', self._get_data_entry('inventory/{0}/profile'.format(instance_name)))
+            self.inventory.set_variable(container_name, 'ansible_lxd_profile', self._get_data_entry('inventory/{0}/profile'.format(container_name)))
             # add state
-            self.inventory.set_variable(instance_name, 'ansible_lxd_state', instance_state)
-            # add type
-            self.inventory.set_variable(instance_name, 'ansible_lxd_type', self._get_data_entry('inventory/{0}/type'.format(instance_name)))
+            self.inventory.set_variable(container_name, 'ansible_lxd_state', self._get_data_entry('inventory/{0}/state'.format(container_name)).lower())
             # add location information
-            if self._get_data_entry('inventory/{0}/location'.format(instance_name)) != "none":  # wrong type by lxd 'none' != 'None'
-                self.inventory.set_variable(instance_name, 'ansible_lxd_location', self._get_data_entry('inventory/{0}/location'.format(instance_name)))
+            if self._get_data_entry('inventory/{0}/location'.format(container_name)) != "none":  # wrong type by lxd 'none' != 'None'
+                self.inventory.set_variable(container_name, 'ansible_lxd_location', self._get_data_entry('inventory/{0}/location'.format(container_name)))
             # add VLAN_ID information
-            if self._get_data_entry('inventory/{0}/vlan_ids'.format(instance_name)):
-                self.inventory.set_variable(instance_name, 'ansible_lxd_vlan_ids', self._get_data_entry('inventory/{0}/vlan_ids'.format(instance_name)))
+            if self._get_data_entry('inventory/{0}/vlan_ids'.format(container_name)):
+                self.inventory.set_variable(container_name, 'ansible_lxd_vlan_ids', self._get_data_entry('inventory/{0}/vlan_ids'.format(container_name)))
 
     def build_inventory_groups_location(self, group_name):
         """create group by attribute: location
@@ -697,9 +656,9 @@ class InventoryModule(BaseInventoryPlugin):
         if group_name not in self.inventory.groups:
             self.inventory.add_group(group_name)
 
-        for instance_name in self.inventory.hosts:
-            if 'ansible_lxd_location' in self.inventory.get_host(instance_name).get_vars():
-                self.inventory.add_child(group_name, instance_name)
+        for container_name in self.inventory.hosts:
+            if 'ansible_lxd_location' in self.inventory.get_host(container_name).get_vars():
+                self.inventory.add_child(group_name, container_name)
 
     def build_inventory_groups_pattern(self, group_name):
         """create group by name pattern
@@ -718,10 +677,10 @@ class InventoryModule(BaseInventoryPlugin):
 
         regex_pattern = self.groupby[group_name].get('attribute')
 
-        for instance_name in self.inventory.hosts:
-            result = re.search(regex_pattern, instance_name)
+        for container_name in self.inventory.hosts:
+            result = re.search(regex_pattern, container_name)
             if result:
-                self.inventory.add_child(group_name, instance_name)
+                self.inventory.add_child(group_name, container_name)
 
     def build_inventory_groups_network_range(self, group_name):
         """check if IP is in network-class
@@ -744,14 +703,14 @@ class InventoryModule(BaseInventoryPlugin):
             raise AnsibleParserError(
                 'Error while parsing network range {0}: {1}'.format(self.groupby[group_name].get('attribute'), to_native(err)))
 
-        for instance_name in self.inventory.hosts:
-            if self.data['inventory'][instance_name].get('network_interfaces') is not None:
-                for interface in self.data['inventory'][instance_name].get('network_interfaces'):
-                    for interface_family in self.data['inventory'][instance_name].get('network_interfaces')[interface]:
+        for container_name in self.inventory.hosts:
+            if self.data['inventory'][container_name].get('network_interfaces') is not None:
+                for interface in self.data['inventory'][container_name].get('network_interfaces'):
+                    for interface_family in self.data['inventory'][container_name].get('network_interfaces')[interface]:
                         try:
                             address = ipaddress.ip_address(to_text(interface_family['address']))
                             if address.version == network.version and address in network:
-                                self.inventory.add_child(group_name, instance_name)
+                                self.inventory.add_child(group_name, container_name)
                         except ValueError:
                             # Ignore invalid IP addresses returned by lxd
                             pass
@@ -762,7 +721,7 @@ class InventoryModule(BaseInventoryPlugin):
         Args:
             str(group_name): Group name
         Kwargs:
-            None
+            Noneself.data['inventory'][container_name][interface]
         Raises:
             None
         Returns:
@@ -771,12 +730,12 @@ class InventoryModule(BaseInventoryPlugin):
         if group_name not in self.inventory.groups:
             self.inventory.add_group(group_name)
 
-        gen_instances = [
-            instance_name for instance_name in self.inventory.hosts
-            if 'ansible_lxd_os' in self.inventory.get_host(instance_name).get_vars()]
-        for instance_name in gen_instances:
-            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_os'):
-                self.inventory.add_child(group_name, instance_name)
+        gen_containers = [
+            container_name for container_name in self.inventory.hosts
+            if 'ansible_lxd_os' in self.inventory.get_host(container_name).get_vars()]
+        for container_name in gen_containers:
+            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(container_name).get_vars().get('ansible_lxd_os'):
+                self.inventory.add_child(group_name, container_name)
 
     def build_inventory_groups_release(self, group_name):
         """create group by attribute: release
@@ -793,12 +752,12 @@ class InventoryModule(BaseInventoryPlugin):
         if group_name not in self.inventory.groups:
             self.inventory.add_group(group_name)
 
-        gen_instances = [
-            instance_name for instance_name in self.inventory.hosts
-            if 'ansible_lxd_release' in self.inventory.get_host(instance_name).get_vars()]
-        for instance_name in gen_instances:
-            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_release'):
-                self.inventory.add_child(group_name, instance_name)
+        gen_containers = [
+            container_name for container_name in self.inventory.hosts
+            if 'ansible_lxd_release' in self.inventory.get_host(container_name).get_vars()]
+        for container_name in gen_containers:
+            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(container_name).get_vars().get('ansible_lxd_release'):
+                self.inventory.add_child(group_name, container_name)
 
     def build_inventory_groups_profile(self, group_name):
         """create group by attribute: profile
@@ -815,12 +774,12 @@ class InventoryModule(BaseInventoryPlugin):
         if group_name not in self.inventory.groups:
             self.inventory.add_group(group_name)
 
-        gen_instances = [
-            instance_name for instance_name in self.inventory.hosts.keys()
-            if 'ansible_lxd_profile' in self.inventory.get_host(instance_name).get_vars().keys()]
-        for instance_name in gen_instances:
-            if self.groupby[group_name].get('attribute').lower() in self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_profile'):
-                self.inventory.add_child(group_name, instance_name)
+        gen_containers = [
+            container_name for container_name in self.inventory.hosts.keys()
+            if 'ansible_lxd_profile' in self.inventory.get_host(container_name).get_vars().keys()]
+        for container_name in gen_containers:
+            if self.groupby[group_name].get('attribute').lower() in self.inventory.get_host(container_name).get_vars().get('ansible_lxd_profile'):
+                self.inventory.add_child(group_name, container_name)
 
     def build_inventory_groups_vlanid(self, group_name):
         """create group by attribute: vlanid
@@ -837,34 +796,12 @@ class InventoryModule(BaseInventoryPlugin):
         if group_name not in self.inventory.groups:
             self.inventory.add_group(group_name)
 
-        gen_instances = [
-            instance_name for instance_name in self.inventory.hosts.keys()
-            if 'ansible_lxd_vlan_ids' in self.inventory.get_host(instance_name).get_vars().keys()]
-        for instance_name in gen_instances:
-            if self.groupby[group_name].get('attribute') in self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_vlan_ids').values():
-                self.inventory.add_child(group_name, instance_name)
-
-    def build_inventory_groups_type(self, group_name):
-        """create group by attribute: type
-
-        Args:
-            str(group_name): Group name
-        Kwargs:
-            None
-        Raises:
-            None
-        Returns:
-            None"""
-        # maybe we just want to expand one group
-        if group_name not in self.inventory.groups:
-            self.inventory.add_group(group_name)
-
-        gen_instances = [
-            instance_name for instance_name in self.inventory.hosts
-            if 'ansible_lxd_type' in self.inventory.get_host(instance_name).get_vars()]
-        for instance_name in gen_instances:
-            if self.groupby[group_name].get('attribute').lower() == self.inventory.get_host(instance_name).get_vars().get('ansible_lxd_type'):
-                self.inventory.add_child(group_name, instance_name)
+        gen_containers = [
+            container_name for container_name in self.inventory.hosts.keys()
+            if 'ansible_lxd_vlan_ids' in self.inventory.get_host(container_name).get_vars().keys()]
+        for container_name in gen_containers:
+            if self.groupby[group_name].get('attribute') in self.inventory.get_host(container_name).get_vars().get('ansible_lxd_vlan_ids').values():
+                self.inventory.add_child(group_name, container_name)
 
     def build_inventory_groups(self):
         """Build group-part dynamic inventory
@@ -893,7 +830,6 @@ class InventoryModule(BaseInventoryPlugin):
                 * 'release'
                 * 'profile'
                 * 'vlanid'
-                * 'type'
 
             Args:
                 str(group_name): Group name
@@ -919,8 +855,6 @@ class InventoryModule(BaseInventoryPlugin):
                 self.build_inventory_groups_profile(group_name)
             elif self.groupby[group_name].get('type') == 'vlanid':
                 self.build_inventory_groups_vlanid(group_name)
-            elif self.groupby[group_name].get('type') == 'type':
-                self.build_inventory_groups_type(group_name)
             else:
                 raise AnsibleParserError('Unknown group type: {0}'.format(to_native(group_name)))
 
@@ -947,30 +881,10 @@ class InventoryModule(BaseInventoryPlugin):
         self.build_inventory_hosts()
         self.build_inventory_groups()
 
-    def cleandata(self):
-        """Clean the dynamic inventory
-
-        The first version of the inventory only supported container.
-        This will change in the future.
-        The following function cleans up the data and remove the all items with the wrong type.
-
-        Args:
-            None
-        Kwargs:
-            None
-        Raises:
-            None
-        Returns:
-            None"""
-        iter_keys = list(self.data['instances'].keys())
-        for instance_name in iter_keys:
-            if self._get_data_entry('instances/{0}/instances/metadata/type'.format(instance_name)) != self.type_filter:
-                del self.data['instances'][instance_name]
-
     def _populate(self):
         """Return the hosts and groups
 
-        Returns the processed instance configurations from the lxd import
+        Returns the processed container configurations from the lxd import
 
         Args:
             None
@@ -983,16 +897,10 @@ class InventoryModule(BaseInventoryPlugin):
 
         if len(self.data) == 0:  # If no data is injected by unittests open socket
             self.socket = self._connect_to_socket()
-            self.get_instance_data(self._get_instances())
+            self.get_container_data(self._get_containers())
             self.get_network_data(self._get_networks())
 
-        # The first version of the inventory only supported containers.
-        # This will change in the future.
-        # The following function cleans up the data.
-        if self.type_filter != 'both':
-            self.cleandata()
-
-        self.extract_information_from_instance_configs()
+        self.extract_information_from_container_configs()
 
         # self.display.vvv(self.save_json_data([os.path.abspath(__file__)]))
 
@@ -1016,10 +924,6 @@ class InventoryModule(BaseInventoryPlugin):
             AnsibleParserError
         Returns:
             None"""
-        if IPADDRESS_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('another_library must be installed to use this plugin'),
-                IPADDRESS_IMPORT_ERROR)
 
         super(InventoryModule, self).parse(inventory, loader, path, cache=False)
         # Read the inventory YAML file
@@ -1031,9 +935,8 @@ class InventoryModule(BaseInventoryPlugin):
             self.data = {}  # store for inventory-data
             self.groupby = self.get_option('groupby')
             self.plugin = self.get_option('plugin')
-            self.prefered_instance_network_family = self.get_option('prefered_instance_network_family')
-            self.prefered_instance_network_interface = self.get_option('prefered_instance_network_interface')
-            self.type_filter = self.get_option('type_filter')
+            self.prefered_container_network_family = self.get_option('prefered_container_network_family')
+            self.prefered_container_network_interface = self.get_option('prefered_container_network_interface')
             if self.get_option('state').lower() == 'none':  # none in config is str()
                 self.filter = None
             else:

plugins/inventory/online.py

@@ -8,7 +8,7 @@ __metaclass__ = type
 DOCUMENTATION = r'''
     name: online
     author:
-      - Remy Leone (@remyleone)
+      - Remy Leone (@sieben)
     short_description: Scaleway (previously Online SAS or Online.net) inventory source
     description:
         - Get inventory hosts from Scaleway (previously Online SAS or Online.net).
@@ -235,7 +235,7 @@ class InventoryModule(BaseInventoryPlugin):
 
         self.headers = {
             'Authorization': "Bearer %s" % token,
-            'User-Agent': "ansible %s Python %s" % (ansible_version, python_version.split(' ', 1)[0]),
+            'User-Agent': "ansible %s Python %s" % (ansible_version, python_version.split(' ')[0]),
             'Content-type': 'application/json'
         }
 

plugins/inventory/opennebula.py

@@ -1,239 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2020, FELDSAM s.r.o. - FeldHost™ <support@feldhost.cz>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-
-__metaclass__ = type
-
-DOCUMENTATION = r'''
-    name: opennebula
-    author:
-        - Kristian Feldsam (@feldsam)
-    short_description: OpenNebula inventory source
-    version_added: "3.8.0"
-    extends_documentation_fragment:
-        - constructed
-    description:
-        - Get inventory hosts from OpenNebula cloud.
-        - Uses an YAML configuration file ending with either I(opennebula.yml) or I(opennebula.yaml)
-          to set parameter values.
-        - Uses I(api_authfile), C(~/.one/one_auth), or C(ONE_AUTH) pointing to a OpenNebula credentials file.
-    options:
-        plugin:
-            description: Token that ensures this is a source file for the 'opennebula' plugin.
-            type: string
-            required: true
-            choices: [ community.general.opennebula ]
-        api_url:
-            description:
-              - URL of the OpenNebula RPC server.
-              - It is recommended to use HTTPS so that the username/password are not
-                transferred over the network unencrypted.
-              - If not set then the value of the C(ONE_URL) environment variable is used.
-            env:
-              - name: ONE_URL
-            required: True
-            type: string
-        api_username:
-            description:
-              - Name of the user to login into the OpenNebula RPC server. If not set
-                then the value of the C(ONE_USERNAME) environment variable is used.
-            env:
-              - name: ONE_USERNAME
-            type: string
-        api_password:
-            description:
-              - Password or a token of the user to login into OpenNebula RPC server.
-              - If not set, the value of the C(ONE_PASSWORD) environment variable is used.
-            env:
-              - name: ONE_PASSWORD
-            required: False
-            type: string
-        api_authfile:
-            description:
-              - If both I(api_username) or I(api_password) are not set, then it will try
-                authenticate with ONE auth file. Default path is C(~/.one/one_auth).
-              - Set environment variable C(ONE_AUTH) to override this path.
-            env:
-              - name: ONE_AUTH
-            required: False
-            type: string
-        hostname:
-            description: Field to match the hostname. Note C(v4_first_ip) corresponds to the first IPv4 found on VM.
-            type: string
-            default: v4_first_ip
-            choices:
-                - v4_first_ip
-                - v6_first_ip
-                - name
-        filter_by_label:
-            description: Only return servers filtered by this label.
-            type: string
-        group_by_labels:
-            description: Create host groups by vm labels
-            type: bool
-            default: True
-'''
-
-EXAMPLES = r'''
-# inventory_opennebula.yml file in YAML format
-# Example command line: ansible-inventory --list -i inventory_opennebula.yml
-
-# Pass a label filter to the API
-plugin: community.general.opennebula
-api_url: https://opennebula:2633/RPC2
-filter_by_label: Cache
-'''
-
-try:
-    import pyone
-
-    HAS_PYONE = True
-except ImportError:
-    HAS_PYONE = False
-
-from ansible.errors import AnsibleError
-from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
-from ansible.module_utils._text import to_native
-
-from collections import namedtuple
-import os
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable):
-    NAME = 'community.general.opennebula'
-
-    def verify_file(self, path):
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(('opennebula.yaml', 'opennebula.yml')):
-                valid = True
-        return valid
-
-    def _get_connection_info(self):
-        url = self.get_option('api_url')
-        username = self.get_option('api_username')
-        password = self.get_option('api_password')
-        authfile = self.get_option('api_authfile')
-
-        if not username and not password:
-            if authfile is None:
-                authfile = os.path.join(os.environ.get("HOME"), ".one", "one_auth")
-            try:
-                with open(authfile, "r") as fp:
-                    authstring = fp.read().rstrip()
-                username, password = authstring.split(":")
-            except (OSError, IOError):
-                raise AnsibleError("Could not find or read ONE_AUTH file at '{e}'".format(e=authfile))
-            except Exception:
-                raise AnsibleError("Error occurs when reading ONE_AUTH file at '{e}'".format(e=authfile))
-
-        auth_params = namedtuple('auth', ('url', 'username', 'password'))
-
-        return auth_params(url=url, username=username, password=password)
-
-    def _get_vm_ipv4(self, vm):
-        nic = vm.TEMPLATE.get('NIC')
-
-        if isinstance(nic, dict):
-            nic = [nic]
-
-        for net in nic:
-            return net['IP']
-
-        return False
-
-    def _get_vm_ipv6(self, vm):
-        nic = vm.TEMPLATE.get('NIC')
-
-        if isinstance(nic, dict):
-            nic = [nic]
-
-        for net in nic:
-            if net.get('IP6_GLOBAL'):
-                return net['IP6_GLOBAL']
-
-        return False
-
-    def _get_vm_pool(self):
-        auth = self._get_connection_info()
-
-        if not (auth.username and auth.password):
-            raise AnsibleError('API Credentials missing. Check OpenNebula inventory file.')
-        else:
-            one_client = pyone.OneServer(auth.url, session=auth.username + ':' + auth.password)
-
-        # get hosts (VMs)
-        try:
-            vm_pool = one_client.vmpool.infoextended(-2, -1, -1, 3)
-        except Exception as e:
-            raise AnsibleError("Something happened during XML-RPC call: {e}".format(e=to_native(e)))
-
-        return vm_pool
-
-    def _retrieve_servers(self, label_filter=None):
-        vm_pool = self._get_vm_pool()
-
-        result = []
-
-        # iterate over hosts
-        for vm in vm_pool.VM:
-            server = vm.USER_TEMPLATE
-
-            labels = []
-            if vm.USER_TEMPLATE.get('LABELS'):
-                labels = [s for s in vm.USER_TEMPLATE.get('LABELS') if s == ',' or s == '-' or s.isalnum() or s.isspace()]
-                labels = ''.join(labels)
-                labels = labels.replace(' ', '_')
-                labels = labels.replace('-', '_')
-                labels = labels.split(',')
-
-            # filter by label
-            if label_filter is not None:
-                if label_filter not in labels:
-                    continue
-
-            server['name'] = vm.NAME
-            server['LABELS'] = labels
-            server['v4_first_ip'] = self._get_vm_ipv4(vm)
-            server['v6_first_ip'] = self._get_vm_ipv6(vm)
-
-            result.append(server)
-
-        return result
-
-    def _populate(self):
-        hostname_preference = self.get_option('hostname')
-        group_by_labels = self.get_option('group_by_labels')
-
-        # Add a top group 'one'
-        self.inventory.add_group(group='all')
-
-        filter_by_label = self.get_option('filter_by_label')
-        for server in self._retrieve_servers(filter_by_label):
-            # check for labels
-            if group_by_labels and server['LABELS']:
-                for label in server['LABELS']:
-                    self.inventory.add_group(group=label)
-                    self.inventory.add_host(host=server['name'], group=label)
-
-            self.inventory.add_host(host=server['name'], group='all')
-
-            for attribute, value in server.items():
-                self.inventory.set_variable(server['name'], attribute, value)
-
-            if hostname_preference != 'name':
-                self.inventory.set_variable(server['name'], 'ansible_host', server[hostname_preference])
-
-            if server.get('SSH_PORT'):
-                self.inventory.set_variable(server['name'], 'ansible_port', server['SSH_PORT'])
-
-    def parse(self, inventory, loader, path, cache=True):
-        if not HAS_PYONE:
-            raise AnsibleError('OpenNebula Inventory plugin requires pyone to work!')
-
-        super(InventoryModule, self).parse(inventory, loader, path)
-        self._read_config_data(path=path)
-
-        self._populate()

plugins/inventory/proxmox.py

@@ -88,24 +88,13 @@ DOCUMENTATION = '''
 '''
 
 EXAMPLES = '''
-# Minimal example which will not gather additional facts for QEMU/LXC guests
-# By not specifying a URL the plugin will attempt to connect to the controller host on port 8006
 # my.proxmox.yml
 plugin: community.general.proxmox
+url: http://localhost:8006
 user: ansible@pve
 password: secure
-
-# More complete example demonstrating the use of 'want_facts' and the constructed options
-# Note that using facts returned by 'want_facts' in constructed options requires 'want_facts=true'
-# my.proxmox.yml
-plugin: community.general.proxmox
-url: http://pve.domain.com:8006
-user: ansible@pve
-password: secure
-validate_certs: false
-want_facts: true
+validate_certs: no
 keyed_groups:
-    # proxmox_tags_parsed is an example of a fact only returned when 'want_facts=true'
   - key: proxmox_tags_parsed
     separator: ""
     prefix: group

plugins/inventory/scaleway.py

@@ -9,12 +9,10 @@ __metaclass__ = type
 DOCUMENTATION = r'''
     name: scaleway
     author:
-      - Remy Leone (@remyleone)
+      - Remy Leone (@sieben)
     short_description: Scaleway inventory source
     description:
         - Get inventory hosts from Scaleway.
-    requirements:
-        - PyYAML
     options:
         plugin:
             description: Token that ensures this is a source file for the 'scaleway' plugin.
@@ -32,10 +30,9 @@ DOCUMENTATION = r'''
             description: Filter results on a specific tag.
             type: list
         oauth_token:
+            required: True
             description:
             - Scaleway OAuth token.
-            - If not explicitly defined or in environment variables, it will try to lookup in the scaleway-cli configuration file
-              (C($SCW_CONFIG_PATH), C($XDG_CONFIG_HOME/scw/config.yaml), or C(~/.config/scw/config.yaml)).
             - More details on L(how to generate token, https://www.scaleway.com/en/docs/generate-api-keys/).
             env:
                 # in order of precedence
@@ -98,22 +95,13 @@ variables:
   ansible_user: "'admin'"
 '''
 
-import os
 import json
 
-try:
-    import yaml
-except ImportError as exc:
-    YAML_IMPORT_ERROR = exc
-else:
-    YAML_IMPORT_ERROR = None
-
 from ansible.errors import AnsibleError
 from ansible.plugins.inventory import BaseInventoryPlugin, Constructable
 from ansible_collections.community.general.plugins.module_utils.scaleway import SCALEWAY_LOCATION, parse_pagination_link
 from ansible.module_utils.urls import open_url
 from ansible.module_utils.common.text.converters import to_native, to_text
-from ansible.module_utils.six import raise_from
 
 import ansible.module_utils.six.moves.urllib.parse as urllib_parse
 
@@ -290,38 +278,13 @@ class InventoryModule(BaseInventoryPlugin, Constructable):
                 # Composed variables
                 self._set_composite_vars(self.get_option('variables'), host_infos, hostname, strict=False)
 
-    def get_oauth_token(self):
-        oauth_token = self.get_option('oauth_token')
-
-        if 'SCW_CONFIG_PATH' in os.environ:
-            scw_config_path = os.getenv('SCW_CONFIG_PATH')
-        elif 'XDG_CONFIG_HOME' in os.environ:
-            scw_config_path = os.path.join(os.getenv('XDG_CONFIG_HOME'), 'scw', 'config.yaml')
-        else:
-            scw_config_path = os.path.join(os.path.expanduser('~'), '.config', 'scw', 'config.yaml')
-
-        if not oauth_token and os.path.exists(scw_config_path):
-            with open(scw_config_path) as fh:
-                scw_config = yaml.safe_load(fh)
-                active_profile = scw_config.get('active_profile', 'default')
-                if active_profile == 'default':
-                    oauth_token = scw_config.get('secret_key')
-                else:
-                    oauth_token = scw_config['profiles'][active_profile].get('secret_key')
-
-        return oauth_token
-
     def parse(self, inventory, loader, path, cache=True):
-        if YAML_IMPORT_ERROR:
-            raise_from(AnsibleError('PyYAML is probably missing'), YAML_IMPORT_ERROR)
         super(InventoryModule, self).parse(inventory, loader, path)
         self._read_config_data(path=path)
 
         config_zones = self.get_option("regions")
         tags = self.get_option("tags")
-        token = self.get_oauth_token()
-        if not token:
-            raise AnsibleError("'oauth_token' value is null, you must configure it either in inventory, envvars or scaleway-cli config.")
+        token = self.get_option("oauth_token")
         hostname_preference = self.get_option("hostnames")
 
         for zone in self._get_zones(config_zones):

plugins/inventory/xen_orchestra.py

@@ -1,328 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2021 Ansible Project
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = '''
-    name: xen_orchestra
-    short_description: Xen Orchestra inventory source
-    version_added: 4.1.0
-    author:
-        - Dom Del Nano (@ddelnano) <ddelnano@gmail.com>
-        - Samori Gorse (@shinuza) <samorigorse@gmail.com>
-    requirements:
-        - websocket-client >= 1.0.0
-    description:
-        - Get inventory hosts from a Xen Orchestra deployment.
-        - 'Uses a configuration file as an inventory source, it must end in C(.xen_orchestra.yml) or C(.xen_orchestra.yaml).'
-    extends_documentation_fragment:
-        - constructed
-        - inventory_cache
-    options:
-        plugin:
-            description: The name of this plugin, it should always be set to C(community.general.xen_orchestra) for this plugin to recognize it as its own.
-            required: yes
-            choices: ['community.general.xen_orchestra']
-            type: str
-        api_host:
-            description:
-                - API host to XOA API.
-                - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_HOST) will be used instead.
-            type: str
-            env:
-                - name: ANSIBLE_XO_HOST
-        user:
-            description:
-                - Xen Orchestra user.
-                - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_USER) will be used instead.
-            required: yes
-            type: str
-            env:
-                - name: ANSIBLE_XO_USER
-        password:
-            description:
-                - Xen Orchestra password.
-                - If the value is not specified in the inventory configuration, the value of environment variable C(ANSIBLE_XO_PASSWORD) will be used instead.
-            required: yes
-            type: str
-            env:
-                - name: ANSIBLE_XO_PASSWORD
-        validate_certs:
-            description: Verify TLS certificate if using HTTPS.
-            type: boolean
-            default: true
-        use_ssl:
-            description: Use wss when connecting to the Xen Orchestra API
-            type: boolean
-            default: true
-'''
-
-
-EXAMPLES = '''
-# file must be named xen_orchestra.yaml or xen_orchestra.yml
-simple_config_file:
-    plugin: community.general.xen_orchestra
-    api_host: 192.168.1.255
-    user: xo
-    password: xo_pwd
-    validate_certs: true
-    use_ssl: true
-    groups:
-        kube_nodes: "'kube_node' in tags"
-    compose:
-        ansible_port: 2222
-
-'''
-
-import json
-import ssl
-
-from distutils.version import LooseVersion
-
-from ansible.errors import AnsibleError
-from ansible.plugins.inventory import BaseInventoryPlugin, Constructable, Cacheable
-
-# 3rd party imports
-try:
-    HAS_WEBSOCKET = True
-    import websocket
-    from websocket import create_connection
-
-    if LooseVersion(websocket.__version__) <= LooseVersion('1.0.0'):
-        raise ImportError
-except ImportError as e:
-    HAS_WEBSOCKET = False
-
-
-HALTED = 'Halted'
-PAUSED = 'Paused'
-RUNNING = 'Running'
-SUSPENDED = 'Suspended'
-POWER_STATES = [RUNNING, HALTED, SUSPENDED, PAUSED]
-HOST_GROUP = 'xo_hosts'
-POOL_GROUP = 'xo_pools'
-
-
-def clean_group_name(label):
-    return label.lower().replace(' ', '-').replace('-', '_')
-
-
-class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
-    ''' Host inventory parser for ansible using XenOrchestra as source. '''
-
-    NAME = 'community.general.xen_orchestra'
-
-    def __init__(self):
-
-        super(InventoryModule, self).__init__()
-
-        # from config
-        self.counter = -1
-        self.session = None
-        self.cache_key = None
-        self.use_cache = None
-
-    @property
-    def pointer(self):
-        self.counter += 1
-        return self.counter
-
-    def create_connection(self, xoa_api_host):
-        validate_certs = self.get_option('validate_certs')
-        use_ssl = self.get_option('use_ssl')
-        proto = 'wss' if use_ssl else 'ws'
-
-        sslopt = None if validate_certs else {'cert_reqs': ssl.CERT_NONE}
-        self.conn = create_connection(
-            '{0}://{1}/api/'.format(proto, xoa_api_host), sslopt=sslopt)
-
-    def login(self, user, password):
-        payload = {'id': self.pointer, 'jsonrpc': '2.0', 'method': 'session.signIn', 'params': {
-            'username': user, 'password': password}}
-        self.conn.send(json.dumps(payload))
-        result = json.loads(self.conn.recv())
-
-        if 'error' in result:
-            raise AnsibleError(
-                'Could not connect: {0}'.format(result['error']))
-
-    def get_object(self, name):
-        payload = {'id': self.pointer, 'jsonrpc': '2.0',
-                   'method': 'xo.getAllObjects', 'params': {'filter': {'type': name}}}
-        self.conn.send(json.dumps(payload))
-        answer = json.loads(self.conn.recv())
-
-        if 'error' in answer:
-            raise AnsibleError(
-                'Could not request: {0}'.format(answer['error']))
-
-        return answer['result']
-
-    def _get_objects(self):
-        self.create_connection(self.xoa_api_host)
-        self.login(self.xoa_user, self.xoa_password)
-
-        return {
-            'vms': self.get_object('VM'),
-            'pools': self.get_object('pool'),
-            'hosts': self.get_object('host'),
-        }
-
-    def _apply_constructable(self, name, variables):
-        strict = self.get_option('strict')
-        self._add_host_to_composed_groups(self.get_option('groups'), variables, name, strict=strict)
-        self._add_host_to_keyed_groups(self.get_option('keyed_groups'), variables, name, strict=strict)
-        self._set_composite_vars(self.get_option('compose'), variables, name, strict=strict)
-
-    def _add_vms(self, vms, hosts, pools):
-        for uuid, vm in vms.items():
-            group = 'with_ip'
-            ip = vm.get('mainIpAddress')
-            entry_name = uuid
-            power_state = vm['power_state'].lower()
-            pool_name = self._pool_group_name_for_uuid(pools, vm['$poolId'])
-            host_name = self._host_group_name_for_uuid(hosts, vm['$container'])
-
-            self.inventory.add_host(entry_name)
-
-            # Grouping by power state
-            self.inventory.add_child(power_state, entry_name)
-
-            # Grouping by host
-            if host_name:
-                self.inventory.add_child(host_name, entry_name)
-
-            # Grouping by pool
-            if pool_name:
-                self.inventory.add_child(pool_name, entry_name)
-
-            # Grouping VMs with an IP together
-            if ip is None:
-                group = 'without_ip'
-            self.inventory.add_group(group)
-            self.inventory.add_child(group, entry_name)
-
-            # Adding meta
-            self.inventory.set_variable(entry_name, 'uuid', uuid)
-            self.inventory.set_variable(entry_name, 'ip', ip)
-            self.inventory.set_variable(entry_name, 'ansible_host', ip)
-            self.inventory.set_variable(entry_name, 'power_state', power_state)
-            self.inventory.set_variable(
-                entry_name, 'name_label', vm['name_label'])
-            self.inventory.set_variable(entry_name, 'type', vm['type'])
-            self.inventory.set_variable(
-                entry_name, 'cpus', vm['CPUs']['number'])
-            self.inventory.set_variable(entry_name, 'tags', vm['tags'])
-            self.inventory.set_variable(
-                entry_name, 'memory', vm['memory']['size'])
-            self.inventory.set_variable(
-                entry_name, 'has_ip', group == 'with_ip')
-            self.inventory.set_variable(
-                entry_name, 'is_managed', vm.get('managementAgentDetected', False))
-            self.inventory.set_variable(
-                entry_name, 'os_version', vm['os_version'])
-
-            self._apply_constructable(entry_name, self.inventory.get_host(entry_name).get_vars())
-
-    def _add_hosts(self, hosts, pools):
-        for host in hosts.values():
-            entry_name = host['uuid']
-            group_name = 'xo_host_{0}'.format(
-                clean_group_name(host['name_label']))
-            pool_name = self._pool_group_name_for_uuid(pools, host['$poolId'])
-
-            self.inventory.add_group(group_name)
-            self.inventory.add_host(entry_name)
-            self.inventory.add_child(HOST_GROUP, entry_name)
-            self.inventory.add_child(pool_name, entry_name)
-
-            self.inventory.set_variable(entry_name, 'enabled', host['enabled'])
-            self.inventory.set_variable(
-                entry_name, 'hostname', host['hostname'])
-            self.inventory.set_variable(entry_name, 'memory', host['memory'])
-            self.inventory.set_variable(entry_name, 'address', host['address'])
-            self.inventory.set_variable(entry_name, 'cpus', host['cpus'])
-            self.inventory.set_variable(entry_name, 'type', 'host')
-            self.inventory.set_variable(entry_name, 'tags', host['tags'])
-            self.inventory.set_variable(entry_name, 'version', host['version'])
-            self.inventory.set_variable(
-                entry_name, 'power_state', host['power_state'].lower())
-            self.inventory.set_variable(
-                entry_name, 'product_brand', host['productBrand'])
-
-        for pool in pools.values():
-            group_name = 'xo_pool_{0}'.format(
-                clean_group_name(pool['name_label']))
-
-            self.inventory.add_group(group_name)
-
-    def _add_pools(self, pools):
-        for pool in pools.values():
-            group_name = 'xo_pool_{0}'.format(
-                clean_group_name(pool['name_label']))
-
-            self.inventory.add_group(group_name)
-
-    # TODO: Refactor
-    def _pool_group_name_for_uuid(self, pools, pool_uuid):
-        for pool in pools:
-            if pool == pool_uuid:
-                return 'xo_pool_{0}'.format(
-                    clean_group_name(pools[pool_uuid]['name_label']))
-
-    # TODO: Refactor
-    def _host_group_name_for_uuid(self, hosts, host_uuid):
-        for host in hosts:
-            if host == host_uuid:
-                return 'xo_host_{0}'.format(
-                    clean_group_name(hosts[host_uuid]['name_label']
-                                     ))
-
-    def _populate(self, objects):
-        # Prepare general groups
-        self.inventory.add_group(HOST_GROUP)
-        self.inventory.add_group(POOL_GROUP)
-        for group in POWER_STATES:
-            self.inventory.add_group(group.lower())
-
-        self._add_pools(objects['pools'])
-        self._add_hosts(objects['hosts'], objects['pools'])
-        self._add_vms(objects['vms'], objects['hosts'], objects['pools'])
-
-    def verify_file(self, path):
-
-        valid = False
-        if super(InventoryModule, self).verify_file(path):
-            if path.endswith(('xen_orchestra.yaml', 'xen_orchestra.yml')):
-                valid = True
-            else:
-                self.display.vvv(
-                    'Skipping due to inventory source not ending in "xen_orchestra.yaml" nor "xen_orchestra.yml"')
-        return valid
-
-    def parse(self, inventory, loader, path, cache=True):
-        if not HAS_WEBSOCKET:
-            raise AnsibleError('This plugin requires websocket-client 1.0.0 or higher: '
-                               'https://github.com/websocket-client/websocket-client.')
-
-        super(InventoryModule, self).parse(inventory, loader, path)
-
-        # read config from file, this sets 'options'
-        self._read_config_data(path)
-        self.inventory = inventory
-
-        self.protocol = 'wss'
-        self.xoa_api_host = self.get_option('api_host')
-        self.xoa_user = self.get_option('user')
-        self.xoa_password = self.get_option('password')
-        self.cache_key = self.get_cache_key(path)
-        self.use_cache = cache and self.get_option('cache')
-
-        self.validate_certs = self.get_option('validate_certs')
-        if not self.get_option('use_ssl'):
-            self.protocol = 'ws'
-
-        objects = self._get_objects()
-        self._populate(objects)

plugins/lookup/collection_version.py

@@ -1,138 +0,0 @@
-# (c) 2021, Felix Fontein <felix@fontein.de>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import (absolute_import, division, print_function)
-__metaclass__ = type
-
-DOCUMENTATION = """
-name: collection_version
-author: Felix Fontein (@felixfontein)
-version_added: "4.0.0"
-short_description: Retrieves the version of an installed collection
-description:
-  - This lookup allows to query the version of an installed collection, and to determine whether a
-    collection is installed at all.
-  - By default it returns C(none) for non-existing collections and C(*) for collections without a
-    version number. The latter should only happen in development environments, or when installing
-    a collection from git which has no version in its C(galaxy.yml). This behavior can be adjusted
-    by providing other values with I(result_not_found) and I(result_no_version).
-options:
-  _terms:
-    description:
-      - The collections to look for.
-      - For example C(community.general).
-    type: list
-    elements: str
-    required: true
-  result_not_found:
-    description:
-      - The value to return when the collection could not be found.
-      - By default, C(none) is returned.
-    type: string
-    default: ~
-  result_no_version:
-    description:
-      - The value to return when the collection has no version number.
-      - This can happen for collections installed from git which do not have a version number
-        in C(galaxy.yml).
-      - By default, C(*) is returned.
-    type: string
-    default: '*'
-"""
-
-EXAMPLES = """
-- name: Check version of community.general
-  ansible.builtin.debug:
-    msg: "community.general version {{ lookup('community.general.collection_version', 'community.general') }}"
-"""
-
-RETURN = """
-  _raw:
-    description:
-      - The version number of the collections listed as input.
-      - If a collection can not be found, it will return the value provided in I(result_not_found).
-        By default, this is C(none).
-      - If a collection can be found, but the version not identified, it will return the value provided in
-        I(result_no_version). By default, this is C(*). This can happen for collections installed
-        from git which do not have a version number in C(galaxy.yml).
-    type: list
-    elements: str
-"""
-
-import json
-import os
-import re
-
-import yaml
-
-from ansible.errors import AnsibleLookupError
-from ansible.module_utils.compat.importlib import import_module
-from ansible.plugins.lookup import LookupBase
-
-
-FQCN_RE = re.compile(r'^[A-Za-z0-9_]+\.[A-Za-z0-9_]+$')
-
-
-def load_collection_meta_manifest(manifest_path):
-    with open(manifest_path, 'rb') as f:
-        meta = json.load(f)
-    return {
-        'version': meta['collection_info']['version'],
-    }
-
-
-def load_collection_meta_galaxy(galaxy_path, no_version='*'):
-    with open(galaxy_path, 'rb') as f:
-        meta = yaml.safe_load(f)
-    return {
-        'version': meta.get('version') or no_version,
-    }
-
-
-def load_collection_meta(collection_pkg, no_version='*'):
-    path = os.path.dirname(collection_pkg.__file__)
-
-    # Try to load MANIFEST.json
-    manifest_path = os.path.join(path, 'MANIFEST.json')
-    if os.path.exists(manifest_path):
-        return load_collection_meta_manifest(manifest_path)
-
-    # Try to load galaxy.y(a)ml
-    galaxy_path = os.path.join(path, 'galaxy.yml')
-    galaxy_alt_path = os.path.join(path, 'galaxy.yaml')
-    # galaxy.yaml was only supported in ansible-base 2.10 and ansible-core 2.11. Support was removed
-    # in https://github.com/ansible/ansible/commit/595413d11346b6f26bb3d9df2d8e05f2747508a3 for
-    # ansible-core 2.12.
-    for path in (galaxy_path, galaxy_alt_path):
-        if os.path.exists(path):
-            return load_collection_meta_galaxy(path, no_version=no_version)
-
-    return {}
-
-
-class LookupModule(LookupBase):
-    def run(self, terms, variables=None, **kwargs):
-        result = []
-        self.set_options(var_options=variables, direct=kwargs)
-        not_found = self.get_option('result_not_found')
-        no_version = self.get_option('result_no_version')
-
-        for term in terms:
-            if not FQCN_RE.match(term):
-                raise AnsibleLookupError('"{term}" is not a FQCN'.format(term=term))
-
-            try:
-                collection_pkg = import_module('ansible_collections.{fqcn}'.format(fqcn=term))
-            except ImportError:
-                # Collection not found
-                result.append(not_found)
-                continue
-
-            try:
-                data = load_collection_meta(collection_pkg, no_version=no_version)
-            except Exception as exc:
-                raise AnsibleLookupError('Error while loading metadata for {fqcn}: {error}'.format(fqcn=term, error=exc))
-
-            result.append(data.get('version', no_version))
-
-        return result

plugins/lookup/dig.py

@@ -35,11 +35,6 @@ DOCUMENTATION = '''
       flat:
         description: If 0 each record is returned as a dictionary, otherwise a string
         default: 1
-      retry_servfail:
-        description: Retry a nameserver if it returns SERVFAIL.
-        default: false
-        type: bool
-        version_added: 3.6.0
     notes:
       - ALL is not a record per-se, merely the listed fields are available for any record results you retrieve in the form of a dictionary.
       - While the 'dig' lookup plugin supports anything which dnspython supports out of the box, only a subset can be converted into a dictionary.
@@ -78,10 +73,6 @@ EXAMPLES = """
 - ansible.builtin.debug:
     msg: "XMPP service for gmail.com. is available at {{ item.target }} on port {{ item.port }}"
   with_items: "{{ lookup('community.general.dig', '_xmpp-server._tcp.gmail.com./SRV', 'flat=0', wantlist=True) }}"
-
-- name: Retry nameservers that return SERVFAIL
-  ansible.builtin.debug:
-    msg: "{{ lookup('community.general.dig', 'example.org./A', 'retry_servfail=True') }}"
 """
 
 RETURN = """
@@ -309,8 +300,6 @@ class LookupModule(LookupBase):
                         rdclass = dns.rdataclass.from_text(arg)
                     except Exception as e:
                         raise AnsibleError("dns lookup illegal CLASS: %s" % to_native(e))
-                elif opt == 'retry_servfail':
-                    myres.retry_servfail = bool(arg)
 
                 continue
 

plugins/lookup/etcd3.py

@@ -93,7 +93,7 @@ DOCUMENTATION = '''
       environment variable and keep I(endpoints), I(host), and I(port) unused.
     seealso:
     - module: community.general.etcd3
-    - ref: ansible_collections.community.general.etcd_lookup
+    - ref: etcd_lookup
       description: The etcd v2 lookup.
 
     requirements:

plugins/lookup/nios.py

@@ -0,0 +1,126 @@
+# -*- coding: utf-8 -*-
+#
+#  Copyright 2018 Red Hat | Ansible
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+DOCUMENTATION = '''
+---
+author: Unknown (!UNKNOWN)
+name: nios
+short_description: Query Infoblox NIOS objects
+deprecated:
+    why: Please install the infoblox.nios_modules collection and use the corresponding lookup from it.
+    alternative: infoblox.nios_modules.nios_lookup
+    removed_in: 5.0.0
+description:
+  - Uses the Infoblox WAPI API to fetch NIOS specified objects.  This lookup
+    supports adding additional keywords to filter the return data and specify
+    the desired set of returned fields.
+requirements:
+  - infoblox-client
+extends_documentation_fragment:
+- community.general.nios
+
+options:
+    _terms:
+      description: The name of the object to return from NIOS
+      required: True
+    return_fields:
+      description: The list of field names to return for the specified object.
+    filter:
+      description: a dict object that is used to filter the return objects
+    extattrs:
+      description: a dict object that is used to filter on extattrs
+'''
+
+EXAMPLES = """
+- name: fetch all networkview objects
+  ansible.builtin.set_fact:
+    networkviews: "{{ lookup('community.general.nios', 'networkview',
+                         provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+
+- name: fetch the default dns view
+  ansible.builtin.set_fact:
+    dns_views: "{{ lookup('community.general.nios', 'view', filter={'name': 'default'},
+                      provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+
+# all of the examples below use credentials that are  set using env variables
+# export INFOBLOX_HOST=nios01
+# export INFOBLOX_USERNAME=admin
+# export INFOBLOX_PASSWORD=admin
+
+- name: fetch all host records and include extended attributes
+  ansible.builtin.set_fact:
+    host_records: "{{ lookup('community.general.nios', 'record:host', return_fields=['extattrs', 'name', 'view', 'comment']}) }}"
+
+
+- name: use env variables to pass credentials
+  ansible.builtin.set_fact:
+    networkviews: "{{ lookup('community.general.nios', 'networkview') }}"
+
+- name: get a host record
+  ansible.builtin.set_fact:
+    host: "{{ lookup('community.general.nios', 'record:host', filter={'name': 'hostname.ansible.com'}) }}"
+
+- name: get the authoritative zone from a non default dns view
+  ansible.builtin.set_fact:
+    host: "{{ lookup('community.general.nios', 'zone_auth', filter={'fqdn': 'ansible.com', 'view': 'ansible-dns'}) }}"
+"""
+
+RETURN = """
+obj_type:
+  description:
+    - The object type specified in the terms argument
+  type: dictionary
+  contains:
+    obj_field:
+      description:
+        - One or more obj_type fields as specified by return_fields argument or
+          the default set of fields as per the object type
+"""
+
+from ansible.plugins.lookup import LookupBase
+from ansible_collections.community.general.plugins.module_utils.net_tools.nios.api import WapiLookup
+from ansible_collections.community.general.plugins.module_utils.net_tools.nios.api import normalize_extattrs, flatten_extattrs
+from ansible.errors import AnsibleError
+
+
+class LookupModule(LookupBase):
+
+    def run(self, terms, variables=None, **kwargs):
+        try:
+            obj_type = terms[0]
+        except IndexError:
+            raise AnsibleError('the object_type must be specified')
+
+        return_fields = kwargs.pop('return_fields', None)
+        filter_data = kwargs.pop('filter', {})
+        extattrs = normalize_extattrs(kwargs.pop('extattrs', {}))
+        provider = kwargs.pop('provider', {})
+        wapi = WapiLookup(provider)
+        res = wapi.get_object(obj_type, filter_data, return_fields=return_fields, extattrs=extattrs)
+        if res is not None:
+            for obj in res:
+                if 'extattrs' in obj:
+                    obj['extattrs'] = flatten_extattrs(obj['extattrs'])
+        else:
+            res = []
+        return res

plugins/lookup/nios_next_ip.py

@@ -0,0 +1,105 @@
+# -*- coding: utf-8 -*-
+#
+#  Copyright 2018 Red Hat | Ansible
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+DOCUMENTATION = '''
+---
+author: Unknown (!UNKNOWN)
+name: nios_next_ip
+short_description: Return the next available IP address for a network
+deprecated:
+    why: Please install the infoblox.nios_modules collection and use the corresponding lookup from it.
+    alternative: infoblox.nios_modules.nios_next_ip
+    removed_in: 5.0.0
+description:
+  - Uses the Infoblox WAPI API to return the next available IP addresses
+    for a given network CIDR
+requirements:
+  - infoblox-client
+extends_documentation_fragment:
+- community.general.nios
+
+options:
+    _terms:
+      description: The CIDR network to retrieve the next addresses from
+      required: True
+    num:
+      description: The number of IP addresses to return
+      required: false
+      default: 1
+    exclude:
+      description: List of IP's that need to be excluded from returned IP addresses
+      required: false
+'''
+
+EXAMPLES = """
+- name: return next available IP address for network 192.168.10.0/24
+  ansible.builtin.set_fact:
+    ipaddr: "{{ lookup('community.general.nios_next_ip', '192.168.10.0/24', provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+
+- name: return the next 3 available IP addresses for network 192.168.10.0/24
+  ansible.builtin.set_fact:
+    ipaddr: "{{ lookup('community.general.nios_next_ip', '192.168.10.0/24', num=3, provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+
+- name: return the next 3 available IP addresses for network 192.168.10.0/24 excluding ip addresses - ['192.168.10.1', '192.168.10.2']
+  ansible.builtin.set_fact:
+    ipaddr: "{{ lookup('community.general.nios_next_ip', '192.168.10.0/24', num=3, exclude=['192.168.10.1', '192.168.10.2'],
+                provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+"""
+
+RETURN = """
+_list:
+  description:
+    - The list of next IP addresses available
+  type: list
+"""
+
+from ansible.plugins.lookup import LookupBase
+from ansible_collections.community.general.plugins.module_utils.net_tools.nios.api import WapiLookup
+from ansible.module_utils.common.text.converters import to_text
+from ansible.errors import AnsibleError
+
+
+class LookupModule(LookupBase):
+
+    def run(self, terms, variables=None, **kwargs):
+        try:
+            network = terms[0]
+        except IndexError:
+            raise AnsibleError('missing argument in the form of A.B.C.D/E')
+
+        provider = kwargs.pop('provider', {})
+        wapi = WapiLookup(provider)
+
+        network_obj = wapi.get_object('network', {'network': network})
+        if network_obj is None:
+            raise AnsibleError('unable to find network object %s' % network)
+
+        num = kwargs.get('num', 1)
+        exclude_ip = kwargs.get('exclude', [])
+
+        try:
+            ref = network_obj[0]['_ref']
+            avail_ips = wapi.call_func('next_available_ip', ref, {'num': num, 'exclude': exclude_ip})
+            return [avail_ips['ips']]
+        except Exception as exc:
+            raise AnsibleError(to_text(exc))

plugins/lookup/nios_next_network.py

@@ -0,0 +1,118 @@
+# -*- coding: utf-8 -*-
+#
+# Copyright 2018 Red Hat | Ansible
+#
+# This file is part of Ansible
+#
+# Ansible is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Ansible is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Ansible.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+DOCUMENTATION = '''
+---
+author: Unknown (!UNKNOWN)
+name: nios_next_network
+short_description: Return the next available network range for a network-container
+deprecated:
+    why: Please install the infoblox.nios_modules collection and use the corresponding lookup from it.
+    alternative: infoblox.nios_modules.nios_next_network
+    removed_in: 5.0.0
+description:
+  - Uses the Infoblox WAPI API to return the next available network addresses for
+    a given network CIDR
+requirements:
+  - infoblox_client
+extends_documentation_fragment:
+- community.general.nios
+
+options:
+    _terms:
+      description: The CIDR network to retrieve the next network from next available network within the specified
+                   container.
+      required: True
+    cidr:
+      description:
+        - The CIDR of the network to retrieve the next network from next available network within the
+          specified container. Also, Requested CIDR must be specified and greater than the parent CIDR.
+      required: True
+      default: 24
+    num:
+      description: The number of network addresses to return from network-container
+      required: false
+      default: 1
+    exclude:
+      description: Network addresses returned from network-container excluding list of user's input network range
+      required: false
+      default: ''
+'''
+
+EXAMPLES = """
+- name: return next available network for network-container 192.168.10.0/24
+  ansible.builtin.set_fact:
+    networkaddr: "{{ lookup('community.general.nios_next_network', '192.168.10.0/24', cidr=25,
+                        provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+
+- name: return the next 2 available network addresses for network-container 192.168.10.0/24
+  ansible.builtin.set_fact:
+    networkaddr: "{{ lookup('community.general.nios_next_network', '192.168.10.0/24', cidr=25, num=2,
+                        provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+
+- name: return the available network addresses for network-container 192.168.10.0/24 excluding network range '192.168.10.0/25'
+  ansible.builtin.set_fact:
+    networkaddr: "{{ lookup('community.general.nios_next_network', '192.168.10.0/24', cidr=25, exclude=['192.168.10.0/25'],
+                        provider={'host': 'nios01', 'username': 'admin', 'password': 'password'}) }}"
+"""
+
+RETURN = """
+_list:
+  description:
+    - The list of next network addresses available
+  type: list
+"""
+
+from ansible.plugins.lookup import LookupBase
+from ansible_collections.community.general.plugins.module_utils.net_tools.nios.api import WapiLookup
+from ansible.module_utils.common.text.converters import to_text
+from ansible.errors import AnsibleError
+
+
+class LookupModule(LookupBase):
+
+    def run(self, terms, variables=None, **kwargs):
+        try:
+            network = terms[0]
+        except IndexError:
+            raise AnsibleError('missing network argument in the form of A.B.C.D/E')
+        try:
+            cidr = kwargs.get('cidr', 24)
+        except IndexError:
+            raise AnsibleError('missing CIDR argument in the form of xx')
+
+        provider = kwargs.pop('provider', {})
+        wapi = WapiLookup(provider)
+        network_obj = wapi.get_object('networkcontainer', {'network': network})
+
+        if network_obj is None:
+            raise AnsibleError('unable to find network-container object %s' % network)
+        num = kwargs.get('num', 1)
+        exclude_ip = kwargs.get('exclude', [])
+
+        try:
+            ref = network_obj[0]['_ref']
+            avail_nets = wapi.call_func('next_available_network', ref, {'cidr': cidr, 'num': num, 'exclude': exclude_ip})
+            return [avail_nets['networks']]
+        except Exception as exc:
+            raise AnsibleError(to_text(exc))

plugins/lookup/random_words.py

@@ -1,119 +0,0 @@
-# -*- coding: utf-8 -*-
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-"""The community.general.random_words Ansible lookup plugin."""
-
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-DOCUMENTATION = r"""
-    name: random_words
-    author:
-      - Thomas Sjögren (@konstruktoid)
-    short_description: Return a number of random words
-    version_added: "4.0.0"
-    requirements:
-      - xkcdpass U(https://github.com/redacted/XKCD-password-generator)
-    description:
-      - Returns a number of random words. The output can for example be used for
-        passwords.
-      - See U(https://xkcd.com/936/) for background.
-    options:
-      numwords:
-        description:
-          - The number of words.
-        default: 6
-        type: int
-      min_length:
-        description:
-          - Minimum length of words to make password.
-        default: 5
-        type: int
-      max_length:
-        description:
-          - Maximum length of words to make password.
-        default: 9
-        type: int
-      delimiter:
-        description:
-          - The delimiter character between words.
-        default: " "
-        type: str
-      case:
-        description:
-          - The method for setting the case of each word in the passphrase.
-        choices: ["alternating", "upper", "lower", "random", "capitalize"]
-        default: "lower"
-        type: str
-"""
-
-EXAMPLES = r"""
-- name: Generate password with default settings
-  ansible.builtin.debug:
-    var: lookup('community.general.random_words')
-  # Example result: 'traitor gigabyte cesarean unless aspect clear'
-
-- name: Generate password with six, five character, words
-  ansible.builtin.debug:
-    var: lookup('community.general.random_words', min_length=5, max_length=5)
-  # Example result: 'brink banjo getup staff trump comfy'
-
-- name: Generate password with three capitalized words and the '-' delimiter
-  ansible.builtin.debug:
-    var: lookup('community.general.random_words', numwords=3, delimiter='-', case='capitalize')
-  # Example result: 'Overlabor-Faucet-Coastline'
-
-- name: Generate password with three words without any delimiter
-  ansible.builtin.debug:
-    var: lookup('community.general.random_words', numwords=3, delimiter='')
-  # Example result: 'deskworkmonopolystriking'
-  # https://www.ncsc.gov.uk/blog-post/the-logic-behind-three-random-words
-"""
-
-RETURN = r"""
-  _raw:
-    description: A single-element list containing random words.
-    type: list
-    elements: str
-"""
-
-from ansible.errors import AnsibleLookupError
-from ansible.plugins.lookup import LookupBase
-
-try:
-    from xkcdpass import xkcd_password as xp
-
-    HAS_XKCDPASS = True
-except ImportError:
-    HAS_XKCDPASS = False
-
-
-class LookupModule(LookupBase):
-    """The random_words Ansible lookup class."""
-
-    def run(self, terms, variables=None, **kwargs):
-
-        if not HAS_XKCDPASS:
-            raise AnsibleLookupError(
-                "Python xkcdpass library is required. "
-                'Please install using "pip install xkcdpass"'
-            )
-
-        self.set_options(var_options=variables, direct=kwargs)
-        method = self.get_option("case")
-        delimiter = self.get_option("delimiter")
-        max_length = self.get_option("max_length")
-        min_length = self.get_option("min_length")
-        numwords = self.get_option("numwords")
-
-        words = xp.locate_wordfile()
-        wordlist = xp.generate_wordlist(
-            max_length=max_length, min_length=min_length, wordfile=words
-        )
-
-        values = xp.generate_xkcdpassword(
-            wordlist, case=method, delimiter=delimiter, numwords=numwords
-        )
-
-        return [values]

plugins/lookup/revbitspss.py

@@ -1,107 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright: (c) 2021, RevBits <info@revbits.com>
-# GNU General Public License v3.0+ (see COPYING or
-# https://www.gnu.org/licenses/gpl-3.0.txt)
-from __future__ import absolute_import, division, print_function
-
-__metaclass__ = type
-
-DOCUMENTATION = r"""
-name: revbitspss
-author: RevBits (@RevBits) <info@revbits.com>
-short_description: Get secrets from RevBits PAM server
-version_added: 4.1.0
-description:
-    - Uses the revbits_ansible Python SDK to get Secrets from RevBits PAM
-      Server using API key authentication with the REST API.
-requirements:
-    - revbits_ansible - U(https://pypi.org/project/revbits_ansible/)
-options:
-    _terms:
-        description:
-            - This will be an array of keys for secrets which you want to fetch from RevBits PAM.
-        required: true
-        type: list
-        elements: string
-    base_url:
-        description:
-            - This will be the base URL of the server, for example C(https://server-url-here).
-        required: true
-        type: string
-    api_key:
-        description:
-            - This will be the API key for authentication. You can get it from the RevBits PAM secret manager module.
-        required: true
-        type: string
-"""
-
-RETURN = r"""
-_list:
-    description:
-        - The JSON responses which you can access with defined keys.
-        - If you are fetching secrets named as UUID, PASSWORD it will gives you the dict of all secrets.
-    type: list
-    elements: dict
-"""
-
-EXAMPLES = r"""
-- hosts: localhost
-  vars:
-      secret: >-
-        {{
-            lookup(
-                'community.general.revbitspss',
-                'UUIDPAM', 'DB_PASS',
-                base_url='https://server-url-here',
-                api_key='API_KEY_GOES_HERE'
-            )
-        }}
-  tasks:
-      - ansible.builtin.debug:
-          msg: >
-            UUIDPAM is {{ (secret['UUIDPAM']) }} and DB_PASS is {{ (secret['DB_PASS']) }}
-"""
-
-from ansible.plugins.lookup import LookupBase
-from ansible.utils.display import Display
-from ansible.errors import AnsibleError
-from ansible.module_utils.six import raise_from
-
-try:
-    from pam.revbits_ansible.server import SecretServer
-except ImportError as imp_exc:
-    ANOTHER_LIBRARY_IMPORT_ERROR = imp_exc
-else:
-    ANOTHER_LIBRARY_IMPORT_ERROR = None
-
-
-display = Display()
-
-
-class LookupModule(LookupBase):
-
-    @staticmethod
-    def Client(server_parameters):
-        return SecretServer(**server_parameters)
-
-    def run(self, terms, variables, **kwargs):
-        if ANOTHER_LIBRARY_IMPORT_ERROR:
-            raise_from(
-                AnsibleError('revbits_ansible must be installed to use this plugin'),
-                ANOTHER_LIBRARY_IMPORT_ERROR
-            )
-        self.set_options(var_options=variables, direct=kwargs)
-        secret_server = LookupModule.Client(
-            {
-                "base_url": self.get_option('base_url'),
-                "api_key": self.get_option('api_key'),
-            }
-        )
-        result = []
-        for term in terms:
-            try:
-                display.vvv(u"Secret Server lookup of Secret with ID %s" % term)
-                result.append({term: secret_server.get_pam_secret(term)})
-            except Exception as error:
-                raise AnsibleError("Secret Server lookup failure: %s" % error.message)
-        return result

plugins/lookup/tss.py

@@ -36,39 +36,15 @@ options:
         ini:
             - section: tss_lookup
               key: username
+        required: true
     password:
-        description:
-            - The password associated with the supplied username.
-            - Required when I(token) is not provided.
+        description: The password associated with the supplied username.
         env:
             - name: TSS_PASSWORD
         ini:
             - section: tss_lookup
               key: password
-    domain:
-        default: ""
-        description:
-          - The domain with which to request the OAuth2 Access Grant.
-          - Optional when I(token) is not provided.
-          - Requires C(python-tss-sdk) version 1.0.0 or greater.
-        env:
-            - name: TSS_DOMAIN
-        ini:
-            - section: tss_lookup
-              key: domain
-        required: false
-        version_added: 3.6.0
-    token:
-        description:
-          - Existing token for Thycotic authorizer.
-          - If provided, I(username) and I(password) are not needed.
-          - Requires C(python-tss-sdk) version 1.0.0 or greater.
-        env:
-            - name: TSS_TOKEN
-        ini:
-            - section: tss_lookup
-              key: token
-        version_added: 3.7.0
+        required: true
     api_path_uri:
         default: /api/v1
         description: The path to append to the base URL to form a valid REST
@@ -95,6 +71,18 @@ _list:
 """
 
 EXAMPLES = r"""
+- hosts: localhost
+  vars:
+      secret: "{{ lookup('community.general.tss', 1) }}"
+  tasks:
+      - ansible.builtin.debug:
+          msg: >
+            the password is {{
+              (secret['items']
+                | items2dict(key_name='slug',
+                             value_name='itemValue'))['password']
+            }}
+
 - hosts: localhost
   vars:
       secret: >-
@@ -116,169 +104,79 @@ EXAMPLES = r"""
                              value_name='itemValue'))['password']
             }}
 
-- hosts: localhost
-  vars:
-      secret: >-
-        {{
-            lookup(
-                'community.general.tss',
-                102,
-                base_url='https://secretserver.domain.com/SecretServer/',
-                username='user.name',
-                password='password',
-                domain='domain'
-            )
-        }}
-  tasks:
-      - ansible.builtin.debug:
-          msg: >
-            the password is {{
-              (secret['items']
-                | items2dict(key_name='slug',
-                             value_name='itemValue'))['password']
-            }}
-
 - hosts: localhost
   vars:
       secret_password: >-
-        {{
-            ((lookup(
-                'community.general.tss',
-                102,
-                base_url='https://secretserver.domain.com/SecretServer/',
-                token='thycotic_access_token',
-            )  | from_json).get('items') | items2dict(key_name='slug', value_name='itemValue'))['password']
-        }}
+        {{ ((lookup('community.general.tss', 1) | from_json).get('items') | items2dict(key_name='slug', value_name='itemValue'))['password'] }}"
   tasks:
       - ansible.builtin.debug:
           msg: the password is {{ secret_password }}
 """
-
-import abc
-
+from distutils.version import LooseVersion
 from ansible.errors import AnsibleError, AnsibleOptionsError
-from ansible.module_utils import six
-from ansible.plugins.lookup import LookupBase
+
+sdk_is_missing = False
+
+try:
+    from thycotic import __version__ as sdk_version
+    from thycotic.secrets.server import (
+        SecretServer,
+        SecretServerError,
+        PasswordGrantAuthorizer,
+    )
+except ImportError:
+    sdk_is_missing = True
+
 from ansible.utils.display import Display
-
-try:
-    from thycotic.secrets.server import SecretServer, SecretServerError
-
-    HAS_TSS_SDK = True
-except ImportError:
-    SecretServer = None
-    SecretServerError = None
-    HAS_TSS_SDK = False
-
-try:
-    from thycotic.secrets.server import PasswordGrantAuthorizer, DomainPasswordGrantAuthorizer, AccessTokenAuthorizer
-
-    HAS_TSS_AUTHORIZER = True
-except ImportError:
-    PasswordGrantAuthorizer = None
-    DomainPasswordGrantAuthorizer = None
-    AccessTokenAuthorizer = None
-    HAS_TSS_AUTHORIZER = False
+from ansible.plugins.lookup import LookupBase
 
 
 display = Display()
 
 
-@six.add_metaclass(abc.ABCMeta)
-class TSSClient(object):
-    def __init__(self):
-        self._client = None
-
+class LookupModule(LookupBase):
     @staticmethod
-    def from_params(**server_parameters):
-        if HAS_TSS_AUTHORIZER:
-            return TSSClientV1(**server_parameters)
+    def Client(server_parameters):
+
+        if LooseVersion(sdk_version) < LooseVersion('1.0.0'):
+            return SecretServer(**server_parameters)
         else:
-            return TSSClientV0(**server_parameters)
-
-    def get_secret(self, term):
-        display.debug("tss_lookup term: %s" % term)
-
-        secret_id = self._term_to_secret_id(term)
-        display.vvv(u"Secret Server lookup of Secret with ID %d" % secret_id)
-
-        return self._client.get_secret_json(secret_id)
-
-    @staticmethod
-    def _term_to_secret_id(term):
-        try:
-            return int(term)
-        except ValueError:
-            raise AnsibleOptionsError("Secret ID must be an integer")
-
-
-class TSSClientV0(TSSClient):
-    def __init__(self, **server_parameters):
-        super(TSSClientV0, self).__init__()
-
-        if server_parameters.get("domain"):
-            raise AnsibleError("The 'domain' option requires 'python-tss-sdk' version 1.0.0 or greater")
-
-        self._client = SecretServer(
-            server_parameters["base_url"],
-            server_parameters["username"],
-            server_parameters["password"],
-            server_parameters["api_path_uri"],
-            server_parameters["token_path_uri"],
-        )
-
-
-class TSSClientV1(TSSClient):
-    def __init__(self, **server_parameters):
-        super(TSSClientV1, self).__init__()
-
-        authorizer = self._get_authorizer(**server_parameters)
-        self._client = SecretServer(
-            server_parameters["base_url"], authorizer, server_parameters["api_path_uri"]
-        )
-
-    @staticmethod
-    def _get_authorizer(**server_parameters):
-        if server_parameters.get("token"):
-            return AccessTokenAuthorizer(
-                server_parameters["token"],
-            )
-
-        if server_parameters.get("domain"):
-            return DomainPasswordGrantAuthorizer(
+            authorizer = PasswordGrantAuthorizer(
                 server_parameters["base_url"],
                 server_parameters["username"],
-                server_parameters["domain"],
                 server_parameters["password"],
                 server_parameters["token_path_uri"],
             )
 
-        return PasswordGrantAuthorizer(
-            server_parameters["base_url"],
-            server_parameters["username"],
-            server_parameters["password"],
-            server_parameters["token_path_uri"],
-        )
+            return SecretServer(
+                server_parameters["base_url"], authorizer, server_parameters["api_path_uri"]
+            )
 
-
-class LookupModule(LookupBase):
     def run(self, terms, variables, **kwargs):
-        if not HAS_TSS_SDK:
+        if sdk_is_missing:
             raise AnsibleError("python-tss-sdk must be installed to use this plugin")
 
         self.set_options(var_options=variables, direct=kwargs)
 
-        tss = TSSClient.from_params(
-            base_url=self.get_option("base_url"),
-            username=self.get_option("username"),
-            password=self.get_option("password"),
-            domain=self.get_option("domain"),
-            token=self.get_option("token"),
-            api_path_uri=self.get_option("api_path_uri"),
-            token_path_uri=self.get_option("token_path_uri"),
+        secret_server = LookupModule.Client(
+            {
+                "base_url": self.get_option("base_url"),
+                "username": self.get_option("username"),
+                "password": self.get_option("password"),
+                "api_path_uri": self.get_option("api_path_uri"),
+                "token_path_uri": self.get_option("token_path_uri"),
+            }
         )
+        result = []
 
-        try:
-            return [tss.get_secret(term) for term in terms]
-        except SecretServerError as error:
-            raise AnsibleError("Secret Server lookup failure: %s" % error.message)
+        for term in terms:
+            display.debug("tss_lookup term: %s" % term)
+            try:
+                id = int(term)
+                display.vvv(u"Secret Server lookup of Secret with ID %d" % id)
+                result.append(secret_server.get_secret_json(id))
+            except ValueError:
+                raise AnsibleOptionsError("Secret ID must be an integer")
+            except SecretServerError as error:
+                raise AnsibleError("Secret Server lookup failure: %s" % error.message)
+        return result

plugins/module_utils/_netapp.py

@@ -0,0 +1,748 @@
+# -*- coding: utf-8 -*-
+# This code is part of Ansible, but is an independent component.
+# This particular file snippet, and this file snippet only, is BSD licensed.
+# Modules you write using this snippet, which is embedded dynamically by Ansible
+# still belong to the author of the module, and may assign their own license
+# to the complete work.
+#
+# Copyright (c) 2017, Sumit Kumar <sumit4@netapp.com>
+# Copyright (c) 2017, Michael Price <michael.price@netapp.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification,
+# are permitted provided that the following conditions are met:
+#
+#    * Redistributions of source code must retain the above copyright
+#      notice, this list of conditions and the following disclaimer.
+#    * Redistributions in binary form must reproduce the above copyright notice,
+#      this list of conditions and the following disclaimer in the documentation
+#      and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE
+# USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+import json
+import os
+import random
+import mimetypes
+
+from pprint import pformat
+from ansible.module_utils import six
+from ansible.module_utils.basic import AnsibleModule, missing_required_lib
+from ansible.module_utils.six.moves.urllib.error import HTTPError, URLError
+from ansible.module_utils.urls import open_url
+from ansible.module_utils.api import basic_auth_argument_spec
+from ansible.module_utils.common.text.converters import to_native
+
+try:
+    from ansible.module_utils.ansible_release import __version__ as ansible_version
+except ImportError:
+    ansible_version = 'unknown'
+
+try:
+    from netapp_lib.api.zapi import zapi
+    HAS_NETAPP_LIB = True
+except ImportError:
+    HAS_NETAPP_LIB = False
+
+try:
+    import requests
+    HAS_REQUESTS = True
+except ImportError:
+    HAS_REQUESTS = False
+
+import ssl
+try:
+    from urlparse import urlparse, urlunparse
+except ImportError:
+    from urllib.parse import urlparse, urlunparse
+
+
+HAS_SF_SDK = False
+SF_BYTE_MAP = dict(
+    # Management GUI displays 1024 ** 3 as 1.1 GB, thus use 1000.
+    bytes=1,
+    b=1,
+    kb=1000,
+    mb=1000 ** 2,
+    gb=1000 ** 3,
+    tb=1000 ** 4,
+    pb=1000 ** 5,
+    eb=1000 ** 6,
+    zb=1000 ** 7,
+    yb=1000 ** 8
+)
+
+POW2_BYTE_MAP = dict(
+    # Here, 1 kb = 1024
+    bytes=1,
+    b=1,
+    kb=1024,
+    mb=1024 ** 2,
+    gb=1024 ** 3,
+    tb=1024 ** 4,
+    pb=1024 ** 5,
+    eb=1024 ** 6,
+    zb=1024 ** 7,
+    yb=1024 ** 8
+)
+
+try:
+    from solidfire.factory import ElementFactory
+    from solidfire.custom.models import TimeIntervalFrequency
+    from solidfire.models import Schedule, ScheduleInfo
+
+    HAS_SF_SDK = True
+except Exception:
+    HAS_SF_SDK = False
+
+
+def has_netapp_lib():
+    return HAS_NETAPP_LIB
+
+
+def has_sf_sdk():
+    return HAS_SF_SDK
+
+
+def na_ontap_host_argument_spec():
+
+    return dict(
+        hostname=dict(required=True, type='str'),
+        username=dict(required=True, type='str', aliases=['user']),
+        password=dict(required=True, type='str', aliases=['pass'], no_log=True),
+        https=dict(required=False, type='bool', default=False),
+        validate_certs=dict(required=False, type='bool', default=True),
+        http_port=dict(required=False, type='int'),
+        ontapi=dict(required=False, type='int'),
+        use_rest=dict(required=False, type='str', default='Auto', choices=['Never', 'Always', 'Auto'])
+    )
+
+
+def ontap_sf_host_argument_spec():
+
+    return dict(
+        hostname=dict(required=True, type='str'),
+        username=dict(required=True, type='str', aliases=['user']),
+        password=dict(required=True, type='str', aliases=['pass'], no_log=True)
+    )
+
+
+def aws_cvs_host_argument_spec():
+
+    return dict(
+        api_url=dict(required=True, type='str'),
+        validate_certs=dict(required=False, type='bool', default=True),
+        api_key=dict(required=True, type='str', no_log=True),
+        secret_key=dict(required=True, type='str', no_log=True)
+    )
+
+
+def create_sf_connection(module, port=None):
+    hostname = module.params['hostname']
+    username = module.params['username']
+    password = module.params['password']
+
+    if HAS_SF_SDK and hostname and username and password:
+        try:
+            return_val = ElementFactory.create(hostname, username, password, port=port)
+            return return_val
+        except Exception:
+            raise Exception("Unable to create SF connection")
+    else:
+        module.fail_json(msg="the python SolidFire SDK module is required")
+
+
+def setup_na_ontap_zapi(module, vserver=None):
+    hostname = module.params['hostname']
+    username = module.params['username']
+    password = module.params['password']
+    https = module.params['https']
+    validate_certs = module.params['validate_certs']
+    port = module.params['http_port']
+    version = module.params['ontapi']
+
+    if HAS_NETAPP_LIB:
+        # set up zapi
+        server = zapi.NaServer(hostname)
+        server.set_username(username)
+        server.set_password(password)
+        if vserver:
+            server.set_vserver(vserver)
+        if version:
+            minor = version
+        else:
+            minor = 110
+        server.set_api_version(major=1, minor=minor)
+        # default is HTTP
+        if https:
+            if port is None:
+                port = 443
+            transport_type = 'HTTPS'
+            # HACK to bypass certificate verification
+            if validate_certs is False:
+                if not os.environ.get('PYTHONHTTPSVERIFY', '') and getattr(ssl, '_create_unverified_context', None):
+                    ssl._create_default_https_context = ssl._create_unverified_context
+        else:
+            if port is None:
+                port = 80
+            transport_type = 'HTTP'
+        server.set_transport_type(transport_type)
+        server.set_port(port)
+        server.set_server_type('FILER')
+        return server
+    else:
+        module.fail_json(msg="the python NetApp-Lib module is required")
+
+
+def setup_ontap_zapi(module, vserver=None):
+    hostname = module.params['hostname']
+    username = module.params['username']
+    password = module.params['password']
+
+    if HAS_NETAPP_LIB:
+        # set up zapi
+        server = zapi.NaServer(hostname)
+        server.set_username(username)
+        server.set_password(password)
+        if vserver:
+            server.set_vserver(vserver)
+        # Todo : Replace hard-coded values with configurable parameters.
+        server.set_api_version(major=1, minor=110)
+        server.set_port(80)
+        server.set_server_type('FILER')
+        server.set_transport_type('HTTP')
+        return server
+    else:
+        module.fail_json(msg="the python NetApp-Lib module is required")
+
+
+def eseries_host_argument_spec():
+    """Retrieve a base argument specification common to all NetApp E-Series modules"""
+    argument_spec = basic_auth_argument_spec()
+    argument_spec.update(dict(
+        api_username=dict(type='str', required=True),
+        api_password=dict(type='str', required=True, no_log=True),
+        api_url=dict(type='str', required=True),
+        ssid=dict(type='str', required=False, default='1'),
+        validate_certs=dict(type='bool', required=False, default=True)
+    ))
+    return argument_spec
+
+
+class NetAppESeriesModule(object):
+    """Base class for all NetApp E-Series modules.
+
+    Provides a set of common methods for NetApp E-Series modules, including version checking, mode (proxy, embedded)
+    verification, http requests, secure http redirection for embedded web services, and logging setup.
+
+    Be sure to add the following lines in the module's documentation section:
+    extends_documentation_fragment:
+        - netapp.eseries
+
+    :param dict(dict) ansible_options: dictionary of ansible option definitions
+    :param str web_services_version: minimally required web services rest api version (default value: "02.00.0000.0000")
+    :param bool supports_check_mode: whether the module will support the check_mode capabilities (default=False)
+    :param list(list) mutually_exclusive: list containing list(s) of mutually exclusive options (optional)
+    :param list(list) required_if: list containing list(s) containing the option, the option value, and then
+    a list of required options. (optional)
+    :param list(list) required_one_of: list containing list(s) of options for which at least one is required. (optional)
+    :param list(list) required_together: list containing list(s) of options that are required together. (optional)
+    :param bool log_requests: controls whether to log each request (default: True)
+    """
+    DEFAULT_TIMEOUT = 60
+    DEFAULT_SECURE_PORT = "8443"
+    DEFAULT_REST_API_PATH = "devmgr/v2/"
+    DEFAULT_REST_API_ABOUT_PATH = "devmgr/utils/about"
+    DEFAULT_HEADERS = {"Content-Type": "application/json", "Accept": "application/json",
+                       "netapp-client-type": "Ansible-%s" % ansible_version}
+    HTTP_AGENT = "Ansible / %s" % ansible_version
+    SIZE_UNIT_MAP = dict(bytes=1, b=1, kb=1024, mb=1024**2, gb=1024**3, tb=1024**4,
+                         pb=1024**5, eb=1024**6, zb=1024**7, yb=1024**8)
+
+    def __init__(self, ansible_options, web_services_version=None, supports_check_mode=False,
+                 mutually_exclusive=None, required_if=None, required_one_of=None, required_together=None,
+                 log_requests=True):
+        argument_spec = eseries_host_argument_spec()
+        argument_spec.update(ansible_options)
+
+        self.module = AnsibleModule(argument_spec=argument_spec, supports_check_mode=supports_check_mode,
+                                    mutually_exclusive=mutually_exclusive, required_if=required_if,
+                                    required_one_of=required_one_of, required_together=required_together)
+
+        args = self.module.params
+        self.web_services_version = web_services_version if web_services_version else "02.00.0000.0000"
+        self.ssid = args["ssid"]
+        self.url = args["api_url"]
+        self.log_requests = log_requests
+        self.creds = dict(url_username=args["api_username"],
+                          url_password=args["api_password"],
+                          validate_certs=args["validate_certs"])
+
+        if not self.url.endswith("/"):
+            self.url += "/"
+
+        self.is_embedded_mode = None
+        self.is_web_services_valid_cache = None
+
+    def _check_web_services_version(self):
+        """Verify proxy or embedded web services meets minimum version required for module.
+
+        The minimum required web services version is evaluated against version supplied through the web services rest
+        api. AnsibleFailJson exception will be raised when the minimum is not met or exceeded.
+
+        This helper function will update the supplied api url if secure http is not used for embedded web services
+
+        :raise AnsibleFailJson: raised when the contacted api service does not meet the minimum required version.
+        """
+        if not self.is_web_services_valid_cache:
+
+            url_parts = urlparse(self.url)
+            if not url_parts.scheme or not url_parts.netloc:
+                self.module.fail_json(msg="Failed to provide valid API URL. Example: https://192.168.1.100:8443/devmgr/v2. URL [%s]." % self.url)
+
+            if url_parts.scheme not in ["http", "https"]:
+                self.module.fail_json(msg="Protocol must be http or https. URL [%s]." % self.url)
+
+            self.url = "%s://%s/" % (url_parts.scheme, url_parts.netloc)
+            about_url = self.url + self.DEFAULT_REST_API_ABOUT_PATH
+            rc, data = request(about_url, timeout=self.DEFAULT_TIMEOUT, headers=self.DEFAULT_HEADERS, ignore_errors=True, **self.creds)
+
+            if rc != 200:
+                self.module.warn("Failed to retrieve web services about information! Retrying with secure ports. Array Id [%s]." % self.ssid)
+                self.url = "https://%s:8443/" % url_parts.netloc.split(":")[0]
+                about_url = self.url + self.DEFAULT_REST_API_ABOUT_PATH
+                try:
+                    rc, data = request(about_url, timeout=self.DEFAULT_TIMEOUT, headers=self.DEFAULT_HEADERS, **self.creds)
+                except Exception as error:
+                    self.module.fail_json(msg="Failed to retrieve the webservices about information! Array Id [%s]. Error [%s]."
+                                              % (self.ssid, to_native(error)))
+
+            major, minor, other, revision = data["version"].split(".")
+            minimum_major, minimum_minor, other, minimum_revision = self.web_services_version.split(".")
+
+            if not (major > minimum_major or
+                    (major == minimum_major and minor > minimum_minor) or
+                    (major == minimum_major and minor == minimum_minor and revision >= minimum_revision)):
+                self.module.fail_json(msg="Web services version does not meet minimum version required. Current version: [%s]."
+                                          " Version required: [%s]." % (data["version"], self.web_services_version))
+
+            self.module.log("Web services rest api version met the minimum required version.")
+            self.is_web_services_valid_cache = True
+
+    def is_embedded(self):
+        """Determine whether web services server is the embedded web services.
+
+        If web services about endpoint fails based on an URLError then the request will be attempted again using
+        secure http.
+
+        :raise AnsibleFailJson: raised when web services about endpoint failed to be contacted.
+        :return bool: whether contacted web services is running from storage array (embedded) or from a proxy.
+        """
+        self._check_web_services_version()
+
+        if self.is_embedded_mode is None:
+            about_url = self.url + self.DEFAULT_REST_API_ABOUT_PATH
+            try:
+                rc, data = request(about_url, timeout=self.DEFAULT_TIMEOUT, headers=self.DEFAULT_HEADERS, **self.creds)
+                self.is_embedded_mode = not data["runningAsProxy"]
+            except Exception as error:
+                self.module.fail_json(msg="Failed to retrieve the webservices about information! Array Id [%s]. Error [%s]."
+                                          % (self.ssid, to_native(error)))
+
+        return self.is_embedded_mode
+
+    def request(self, path, data=None, method='GET', headers=None, ignore_errors=False):
+        """Issue an HTTP request to a url, retrieving an optional JSON response.
+
+        :param str path: web services rest api endpoint path (Example: storage-systems/1/graph). Note that when the
+        full url path is specified then that will be used without supplying the protocol, hostname, port and rest path.
+        :param data: data required for the request (data may be json or any python structured data)
+        :param str method: request method such as GET, POST, DELETE.
+        :param dict headers: dictionary containing request headers.
+        :param bool ignore_errors: forces the request to ignore any raised exceptions.
+        """
+        self._check_web_services_version()
+
+        if headers is None:
+            headers = self.DEFAULT_HEADERS
+
+        if not isinstance(data, str) and headers["Content-Type"] == "application/json":
+            data = json.dumps(data)
+
+        if path.startswith("/"):
+            path = path[1:]
+        request_url = self.url + self.DEFAULT_REST_API_PATH + path
+
+        if self.log_requests or True:
+            self.module.log(pformat(dict(url=request_url, data=data, method=method)))
+
+        return request(url=request_url, data=data, method=method, headers=headers, use_proxy=True, force=False, last_mod_time=None,
+                       timeout=self.DEFAULT_TIMEOUT, http_agent=self.HTTP_AGENT, force_basic_auth=True, ignore_errors=ignore_errors, **self.creds)
+
+
+def create_multipart_formdata(files, fields=None, send_8kb=False):
+    """Create the data for a multipart/form request.
+
+    :param list(list) files: list of lists each containing (name, filename, path).
+    :param list(list) fields: list of lists each containing (key, value).
+    :param bool send_8kb: only sends the first 8kb of the files (default: False).
+    """
+    boundary = "---------------------------" + "".join([str(random.randint(0, 9)) for x in range(27)])
+    data_parts = list()
+    data = None
+
+    if six.PY2:  # Generate payload for Python 2
+        newline = "\r\n"
+        if fields is not None:
+            for key, value in fields:
+                data_parts.extend(["--%s" % boundary,
+                                   'Content-Disposition: form-data; name="%s"' % key,
+                                   "",
+                                   value])
+
+        for name, filename, path in files:
+            with open(path, "rb") as fh:
+                value = fh.read(8192) if send_8kb else fh.read()
+
+                data_parts.extend(["--%s" % boundary,
+                                   'Content-Disposition: form-data; name="%s"; filename="%s"' % (name, filename),
+                                   "Content-Type: %s" % (mimetypes.guess_type(path)[0] or "application/octet-stream"),
+                                   "",
+                                   value])
+        data_parts.extend(["--%s--" % boundary, ""])
+        data = newline.join(data_parts)
+
+    else:
+        newline = six.b("\r\n")
+        if fields is not None:
+            for key, value in fields:
+                data_parts.extend([six.b("--%s" % boundary),
+                                   six.b('Content-Disposition: form-data; name="%s"' % key),
+                                   six.b(""),
+                                   six.b(value)])
+
+        for name, filename, path in files:
+            with open(path, "rb") as fh:
+                value = fh.read(8192) if send_8kb else fh.read()
+
+                data_parts.extend([six.b("--%s" % boundary),
+                                   six.b('Content-Disposition: form-data; name="%s"; filename="%s"' % (name, filename)),
+                                   six.b("Content-Type: %s" % (mimetypes.guess_type(path)[0] or "application/octet-stream")),
+                                   six.b(""),
+                                   value])
+        data_parts.extend([six.b("--%s--" % boundary), b""])
+        data = newline.join(data_parts)
+
+    headers = {
+        "Content-Type": "multipart/form-data; boundary=%s" % boundary,
+        "Content-Length": str(len(data))}
+
+    return headers, data
+
+
+def request(url, data=None, headers=None, method='GET', use_proxy=True,
+            force=False, last_mod_time=None, timeout=10, validate_certs=True,
+            url_username=None, url_password=None, http_agent=None, force_basic_auth=True, ignore_errors=False):
+    """Issue an HTTP request to a url, retrieving an optional JSON response."""
+
+    if headers is None:
+        headers = {"Content-Type": "application/json", "Accept": "application/json"}
+    headers.update({"netapp-client-type": "Ansible-%s" % ansible_version})
+
+    if not http_agent:
+        http_agent = "Ansible / %s" % ansible_version
+
+    try:
+        r = open_url(url=url, data=data, headers=headers, method=method, use_proxy=use_proxy,
+                     force=force, last_mod_time=last_mod_time, timeout=timeout, validate_certs=validate_certs,
+                     url_username=url_username, url_password=url_password, http_agent=http_agent,
+                     force_basic_auth=force_basic_auth)
+    except HTTPError as err:
+        r = err.fp
+
+    try:
+        raw_data = r.read()
+        if raw_data:
+            data = json.loads(raw_data)
+        else:
+            raw_data = None
+    except Exception:
+        if ignore_errors:
+            pass
+        else:
+            raise Exception(raw_data)
+
+    resp_code = r.getcode()
+
+    if resp_code >= 400 and not ignore_errors:
+        raise Exception(resp_code, data)
+    else:
+        return resp_code, data
+
+
+def ems_log_event(source, server, name="Ansible", id="12345", version=ansible_version,
+                  category="Information", event="setup", autosupport="false"):
+    ems_log = zapi.NaElement('ems-autosupport-log')
+    # Host name invoking the API.
+    ems_log.add_new_child("computer-name", name)
+    # ID of event. A user defined event-id, range [0..2^32-2].
+    ems_log.add_new_child("event-id", id)
+    # Name of the application invoking the API.
+    ems_log.add_new_child("event-source", source)
+    # Version of application invoking the API.
+    ems_log.add_new_child("app-version", version)
+    # Application defined category of the event.
+    ems_log.add_new_child("category", category)
+    # Description of event to log. An application defined message to log.
+    ems_log.add_new_child("event-description", event)
+    ems_log.add_new_child("log-level", "6")
+    ems_log.add_new_child("auto-support", autosupport)
+    server.invoke_successfully(ems_log, True)
+
+
+def get_cserver_zapi(server):
+    vserver_info = zapi.NaElement('vserver-get-iter')
+    query_details = zapi.NaElement.create_node_with_children('vserver-info', **{'vserver-type': 'admin'})
+    query = zapi.NaElement('query')
+    query.add_child_elem(query_details)
+    vserver_info.add_child_elem(query)
+    result = server.invoke_successfully(vserver_info,
+                                        enable_tunneling=False)
+    attribute_list = result.get_child_by_name('attributes-list')
+    vserver_list = attribute_list.get_child_by_name('vserver-info')
+    return vserver_list.get_child_content('vserver-name')
+
+
+def get_cserver(connection, is_rest=False):
+    if not is_rest:
+        return get_cserver_zapi(connection)
+
+    params = {'fields': 'type'}
+    api = "private/cli/vserver"
+    json, error = connection.get(api, params)
+    if json is None or error is not None:
+        # exit if there is an error or no data
+        return None
+    vservers = json.get('records')
+    if vservers is not None:
+        for vserver in vservers:
+            if vserver['type'] == 'admin':     # cluster admin
+                return vserver['vserver']
+        if len(vservers) == 1:                  # assume vserver admin
+            return vservers[0]['vserver']
+
+    return None
+
+
+class OntapRestAPI(object):
+    def __init__(self, module, timeout=60):
+        self.module = module
+        self.username = self.module.params['username']
+        self.password = self.module.params['password']
+        self.hostname = self.module.params['hostname']
+        self.use_rest = self.module.params['use_rest']
+        self.verify = self.module.params['validate_certs']
+        self.timeout = timeout
+        self.url = 'https://' + self.hostname + '/api/'
+        self.errors = list()
+        self.debug_logs = list()
+        self.check_required_library()
+
+    def check_required_library(self):
+        if not HAS_REQUESTS:
+            self.module.fail_json(msg=missing_required_lib('requests'))
+
+    def send_request(self, method, api, params, json=None, return_status_code=False):
+        ''' send http request and process reponse, including error conditions '''
+        url = self.url + api
+        status_code = None
+        content = None
+        json_dict = None
+        json_error = None
+        error_details = None
+
+        def get_json(response):
+            ''' extract json, and error message if present '''
+            try:
+                json = response.json()
+            except ValueError:
+                return None, None
+            error = json.get('error')
+            return json, error
+
+        try:
+            response = requests.request(method, url, verify=self.verify, auth=(self.username, self.password), params=params, timeout=self.timeout, json=json)
+            content = response.content  # for debug purposes
+            status_code = response.status_code
+            # If the response was successful, no Exception will be raised
+            response.raise_for_status()
+            json_dict, json_error = get_json(response)
+        except requests.exceptions.HTTPError as err:
+            __, json_error = get_json(response)
+            if json_error is None:
+                self.log_error(status_code, 'HTTP error: %s' % err)
+                error_details = str(err)
+            # If an error was reported in the json payload, it is handled below
+        except requests.exceptions.ConnectionError as err:
+            self.log_error(status_code, 'Connection error: %s' % err)
+            error_details = str(err)
+        except Exception as err:
+            self.log_error(status_code, 'Other error: %s' % err)
+            error_details = str(err)
+        if json_error is not None:
+            self.log_error(status_code, 'Endpoint error: %d: %s' % (status_code, json_error))
+            error_details = json_error
+        self.log_debug(status_code, content)
+        if return_status_code:
+            return status_code, error_details
+        return json_dict, error_details
+
+    def get(self, api, params):
+        method = 'GET'
+        return self.send_request(method, api, params)
+
+    def post(self, api, data, params=None):
+        method = 'POST'
+        return self.send_request(method, api, params, json=data)
+
+    def patch(self, api, data, params=None):
+        method = 'PATCH'
+        return self.send_request(method, api, params, json=data)
+
+    def delete(self, api, data, params=None):
+        method = 'DELETE'
+        return self.send_request(method, api, params, json=data)
+
+    def _is_rest(self, used_unsupported_rest_properties=None):
+        if self.use_rest == "Always":
+            if used_unsupported_rest_properties:
+                error = "REST API currently does not support '%s'" % \
+                        ', '.join(used_unsupported_rest_properties)
+                return True, error
+            else:
+                return True, None
+        if self.use_rest == 'Never' or used_unsupported_rest_properties:
+            # force ZAPI if requested or if some parameter requires it
+            return False, None
+        method = 'HEAD'
+        api = 'cluster/software'
+        status_code, __ = self.send_request(method, api, params=None, return_status_code=True)
+        if status_code == 200:
+            return True, None
+        return False, None
+
+    def is_rest(self, used_unsupported_rest_properties=None):
+        ''' only return error if there is a reason to '''
+        use_rest, error = self._is_rest(used_unsupported_rest_properties)
+        if used_unsupported_rest_properties is None:
+            return use_rest
+        return use_rest, error
+
+    def log_error(self, status_code, message):
+        self.errors.append(message)
+        self.debug_logs.append((status_code, message))
+
+    def log_debug(self, status_code, content):
+        self.debug_logs.append((status_code, content))
+
+
+class AwsCvsRestAPI(object):
+    def __init__(self, module, timeout=60):
+        self.module = module
+        self.api_key = self.module.params['api_key']
+        self.secret_key = self.module.params['secret_key']
+        self.api_url = self.module.params['api_url']
+        self.verify = self.module.params['validate_certs']
+        self.timeout = timeout
+        self.url = 'https://' + self.api_url + '/v1/'
+        self.check_required_library()
+
+    def check_required_library(self):
+        if not HAS_REQUESTS:
+            self.module.fail_json(msg=missing_required_lib('requests'))
+
+    def send_request(self, method, api, params, json=None):
+        ''' send http request and process reponse, including error conditions '''
+        url = self.url + api
+        status_code = None
+        content = None
+        json_dict = None
+        json_error = None
+        error_details = None
+        headers = {
+            'Content-type': "application/json",
+            'api-key': self.api_key,
+            'secret-key': self.secret_key,
+            'Cache-Control': "no-cache",
+        }
+
+        def get_json(response):
+            ''' extract json, and error message if present '''
+            try:
+                json = response.json()
+
+            except ValueError:
+                return None, None
+            success_code = [200, 201, 202]
+            if response.status_code not in success_code:
+                error = json.get('message')
+            else:
+                error = None
+            return json, error
+        try:
+            response = requests.request(method, url, headers=headers, timeout=self.timeout, json=json)
+            status_code = response.status_code
+            # If the response was successful, no Exception will be raised
+            json_dict, json_error = get_json(response)
+        except requests.exceptions.HTTPError as err:
+            __, json_error = get_json(response)
+            if json_error is None:
+                error_details = str(err)
+        except requests.exceptions.ConnectionError as err:
+            error_details = str(err)
+        except Exception as err:
+            error_details = str(err)
+        if json_error is not None:
+            error_details = json_error
+
+        return json_dict, error_details
+
+    # If an error was reported in the json payload, it is handled below
+    def get(self, api, params=None):
+        method = 'GET'
+        return self.send_request(method, api, params)
+
+    def post(self, api, data, params=None):
+        method = 'POST'
+        return self.send_request(method, api, params, json=data)
+
+    def patch(self, api, data, params=None):
+        method = 'PATCH'
+        return self.send_request(method, api, params, json=data)
+
+    def put(self, api, data, params=None):
+        method = 'PUT'
+        return self.send_request(method, api, params, json=data)
+
+    def delete(self, api, data, params=None):
+        method = 'DELETE'
+        return self.send_request(method, api, params, json=data)
+
+    def get_state(self, jobId):
+        """ Method to get the state of the job """
+        method = 'GET'
+        response, status_code = self.get('Jobs/%s' % jobId)
+        while str(response['state']) not in 'done':
+            response, status_code = self.get('Jobs/%s' % jobId)
+        return 'done'

plugins/module_utils/gitlab.py

@@ -7,41 +7,54 @@
 from __future__ import (absolute_import, division, print_function)
 __metaclass__ = type
 
+import json
 from distutils.version import StrictVersion
 
 from ansible.module_utils.basic import missing_required_lib
+from ansible.module_utils.urls import fetch_url
 from ansible.module_utils.common.text.converters import to_native
 
 try:
     from urllib import quote_plus  # Python 2.X
-    from urlparse import urljoin
 except ImportError:
-    from urllib.parse import quote_plus, urljoin  # Python 3+
+    from urllib.parse import quote_plus  # Python 3+
 
 import traceback
 
 GITLAB_IMP_ERR = None
 try:
     import gitlab
-    import requests
     HAS_GITLAB_PACKAGE = True
 except Exception:
     GITLAB_IMP_ERR = traceback.format_exc()
     HAS_GITLAB_PACKAGE = False
 
 
-def auth_argument_spec(spec=None):
-    arg_spec = (dict(
-        api_token=dict(type='str', no_log=True),
-        api_oauth_token=dict(type='str', no_log=True),
-        api_job_token=dict(type='str', no_log=True),
-    ))
-    if spec:
-        arg_spec.update(spec)
-    return arg_spec
+def request(module, api_url, project, path, access_token, private_token, rawdata='', method='GET'):
+    url = "%s/v4/projects/%s%s" % (api_url, quote_plus(project), path)
+    headers = {}
+    if access_token:
+        headers['Authorization'] = "Bearer %s" % access_token
+    else:
+        headers['Private-Token'] = private_token
+
+    headers['Accept'] = "application/json"
+    headers['Content-Type'] = "application/json"
+
+    response, info = fetch_url(module=module, url=url, headers=headers, data=rawdata, method=method)
+    status = info['status']
+    content = ""
+    if response:
+        content = response.read()
+    if status == 204:
+        return True, content
+    elif status == 200 or status == 201:
+        return True, json.loads(content)
+    else:
+        return False, str(status) + ": " + content
 
 
-def find_project(gitlab_instance, identifier):
+def findProject(gitlab_instance, identifier):
     try:
         project = gitlab_instance.projects.get(identifier)
     except Exception as e:
@@ -54,7 +67,7 @@ def find_project(gitlab_instance, identifier):
     return project
 
 
-def find_group(gitlab_instance, identifier):
+def findGroup(gitlab_instance, identifier):
     try:
         project = gitlab_instance.groups.get(identifier)
     except Exception as e:
@@ -63,14 +76,12 @@ def find_group(gitlab_instance, identifier):
     return project
 
 
-def gitlab_authentication(module):
+def gitlabAuthentication(module):
     gitlab_url = module.params['api_url']
     validate_certs = module.params['validate_certs']
     gitlab_user = module.params['api_username']
     gitlab_password = module.params['api_password']
     gitlab_token = module.params['api_token']
-    gitlab_oauth_token = module.params['api_oauth_token']
-    gitlab_job_token = module.params['api_job_token']
 
     if not HAS_GITLAB_PACKAGE:
         module.fail_json(msg=missing_required_lib("python-gitlab"), exception=GITLAB_IMP_ERR)
@@ -83,16 +94,7 @@ def gitlab_authentication(module):
             gitlab_instance = gitlab.Gitlab(url=gitlab_url, ssl_verify=validate_certs, email=gitlab_user, password=gitlab_password,
                                             private_token=gitlab_token, api_version=4)
         else:
-            # We can create an oauth_token using a username and password
-            # https://docs.gitlab.com/ee/api/oauth2.html#authorization-code-flow
-            if gitlab_user:
-                data = {'grant_type': 'password', 'username': gitlab_user, 'password': gitlab_password}
-                resp = requests.post(urljoin(gitlab_url, "oauth/token"), data=data, verify=validate_certs)
-                resp_data = resp.json()
-                gitlab_oauth_token = resp_data["access_token"]
-
-            gitlab_instance = gitlab.Gitlab(url=gitlab_url, ssl_verify=validate_certs, private_token=gitlab_token,
-                                            oauth_token=gitlab_oauth_token, job_token=gitlab_job_token, api_version=4)
+            gitlab_instance = gitlab.Gitlab(url=gitlab_url, ssl_verify=validate_certs, private_token=gitlab_token, api_version=4)
 
         gitlab_instance.auth()
     except (gitlab.exceptions.GitlabAuthenticationError, gitlab.exceptions.GitlabGetError) as e:

plugins/module_utils/identity/keycloak/keycloak.py

@@ -78,14 +78,6 @@ URL_AUTHENTICATION_EXECUTION_RAISE_PRIORITY = "{url}/admin/realms/{realm}/authen
 URL_AUTHENTICATION_EXECUTION_LOWER_PRIORITY = "{url}/admin/realms/{realm}/authentication/executions/{id}/lower-priority"
 URL_AUTHENTICATION_CONFIG = "{url}/admin/realms/{realm}/authentication/config/{id}"
 
-URL_IDENTITY_PROVIDERS = "{url}/admin/realms/{realm}/identity-provider/instances"
-URL_IDENTITY_PROVIDER = "{url}/admin/realms/{realm}/identity-provider/instances/{alias}"
-URL_IDENTITY_PROVIDER_MAPPERS = "{url}/admin/realms/{realm}/identity-provider/instances/{alias}/mappers"
-URL_IDENTITY_PROVIDER_MAPPER = "{url}/admin/realms/{realm}/identity-provider/instances/{alias}/mappers/{id}"
-
-URL_COMPONENTS = "{url}/admin/realms/{realm}/components"
-URL_COMPONENT = "{url}/admin/realms/{realm}/components/{id}"
-
 
 def keycloak_argument_spec():
     """
@@ -1031,7 +1023,7 @@ class KeycloakAPI(object):
         :param name: Name of the role to fetch.
         :param realm: Realm in which the role resides; default 'master'.
         """
-        role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(name))
+        role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=name)
         try:
             return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders,
                                                  validate_certs=self.validate_certs).read()))
@@ -1065,7 +1057,7 @@ class KeycloakAPI(object):
         :param rolerep: A RoleRepresentation of the updated role.
         :return HTTPResponse object on success
         """
-        role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(rolerep['name']))
+        role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=rolerep['name'])
         try:
             return open_url(role_url, method='PUT', headers=self.restheaders,
                             data=json.dumps(rolerep), validate_certs=self.validate_certs)
@@ -1079,7 +1071,7 @@ class KeycloakAPI(object):
         :param name: The name of the role.
         :param realm: The realm in which this role resides, default "master".
         """
-        role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=quote(name))
+        role_url = URL_REALM_ROLE.format(url=self.baseurl, realm=realm, name=name)
         try:
             return open_url(role_url, method='DELETE', headers=self.restheaders,
                             validate_certs=self.validate_certs)
@@ -1122,7 +1114,7 @@ class KeycloakAPI(object):
         if cid is None:
             self.module.fail_json(msg='Could not find client %s in realm %s'
                                       % (clientid, realm))
-        role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(name))
+        role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=name)
         try:
             return json.loads(to_native(open_url(role_url, method="GET", headers=self.restheaders,
                                                  validate_certs=self.validate_certs).read()))
@@ -1168,7 +1160,7 @@ class KeycloakAPI(object):
         if cid is None:
             self.module.fail_json(msg='Could not find client %s in realm %s'
                                       % (clientid, realm))
-        role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(rolerep['name']))
+        role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=rolerep['name'])
         try:
             return open_url(role_url, method='PUT', headers=self.restheaders,
                             data=json.dumps(rolerep), validate_certs=self.validate_certs)
@@ -1187,7 +1179,7 @@ class KeycloakAPI(object):
         if cid is None:
             self.module.fail_json(msg='Could not find client %s in realm %s'
                                       % (clientid, realm))
-        role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=quote(name))
+        role_url = URL_CLIENT_ROLE.format(url=self.baseurl, realm=realm, id=cid, name=name)
         try:
             return open_url(role_url, method='DELETE', headers=self.restheaders,
                             validate_certs=self.validate_certs)
@@ -1445,252 +1437,3 @@ class KeycloakAPI(object):
         except Exception as e:
             self.module.fail_json(msg='Could not get executions for authentication flow %s in realm %s: %s'
                                   % (config["alias"], realm, str(e)))
-
-    def get_identity_providers(self, realm='master'):
-        """ Fetch representations for identity providers in a realm
-        :param realm: realm to be queried
-        :return: list of representations for identity providers
-        """
-        idps_url = URL_IDENTITY_PROVIDERS.format(url=self.baseurl, realm=realm)
-        try:
-            return json.loads(to_native(open_url(idps_url, method='GET', headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except ValueError as e:
-            self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of identity providers for realm %s: %s'
-                                      % (realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not obtain list of identity providers for realm %s: %s'
-                                      % (realm, str(e)))
-
-    def get_identity_provider(self, alias, realm='master'):
-        """ Fetch identity provider representation from a realm using the idp's alias.
-        If the identity provider does not exist, None is returned.
-        :param alias: Alias of the identity provider to fetch.
-        :param realm: Realm in which the identity provider resides; default 'master'.
-        """
-        idp_url = URL_IDENTITY_PROVIDER.format(url=self.baseurl, realm=realm, alias=alias)
-        try:
-            return json.loads(to_native(open_url(idp_url, method="GET", headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except HTTPError as e:
-            if e.code == 404:
-                return None
-            else:
-                self.module.fail_json(msg='Could not fetch identity provider %s in realm %s: %s'
-                                          % (alias, realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not fetch identity provider %s in realm %s: %s'
-                                      % (alias, realm, str(e)))
-
-    def create_identity_provider(self, idprep, realm='master'):
-        """ Create an identity provider.
-        :param idprep: Identity provider representation of the idp to be created.
-        :param realm: Realm in which this identity provider resides, default "master".
-        :return: HTTPResponse object on success
-        """
-        idps_url = URL_IDENTITY_PROVIDERS.format(url=self.baseurl, realm=realm)
-        try:
-            return open_url(idps_url, method='POST', headers=self.restheaders,
-                            data=json.dumps(idprep), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not create identity provider %s in realm %s: %s'
-                                      % (idprep['alias'], realm, str(e)))
-
-    def update_identity_provider(self, idprep, realm='master'):
-        """ Update an existing identity provider.
-        :param idprep: Identity provider representation of the idp to be updated.
-        :param realm: Realm in which this identity provider resides, default "master".
-        :return HTTPResponse object on success
-        """
-        idp_url = URL_IDENTITY_PROVIDER.format(url=self.baseurl, realm=realm, alias=idprep['alias'])
-        try:
-            return open_url(idp_url, method='PUT', headers=self.restheaders,
-                            data=json.dumps(idprep), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not update identity provider %s in realm %s: %s'
-                                      % (idprep['alias'], realm, str(e)))
-
-    def delete_identity_provider(self, alias, realm='master'):
-        """ Delete an identity provider.
-        :param alias: Alias of the identity provider.
-        :param realm: Realm in which this identity provider resides, default "master".
-        """
-        idp_url = URL_IDENTITY_PROVIDER.format(url=self.baseurl, realm=realm, alias=alias)
-        try:
-            return open_url(idp_url, method='DELETE', headers=self.restheaders,
-                            validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Unable to delete identity provider %s in realm %s: %s'
-                                      % (alias, realm, str(e)))
-
-    def get_identity_provider_mappers(self, alias, realm='master'):
-        """ Fetch representations for identity provider mappers
-        :param alias: Alias of the identity provider.
-        :param realm: realm to be queried
-        :return: list of representations for identity provider mappers
-        """
-        mappers_url = URL_IDENTITY_PROVIDER_MAPPERS.format(url=self.baseurl, realm=realm, alias=alias)
-        try:
-            return json.loads(to_native(open_url(mappers_url, method='GET', headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except ValueError as e:
-            self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of identity provider mappers for idp %s in realm %s: %s'
-                                      % (alias, realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not obtain list of identity provider mappers for idp %s in realm %s: %s'
-                                      % (alias, realm, str(e)))
-
-    def get_identity_provider_mapper(self, mid, alias, realm='master'):
-        """ Fetch identity provider representation from a realm using the idp's alias.
-        If the identity provider does not exist, None is returned.
-        :param mid: Unique ID of the mapper to fetch.
-        :param alias: Alias of the identity provider.
-        :param realm: Realm in which the identity provider resides; default 'master'.
-        """
-        mapper_url = URL_IDENTITY_PROVIDER_MAPPER.format(url=self.baseurl, realm=realm, alias=alias, id=mid)
-        try:
-            return json.loads(to_native(open_url(mapper_url, method="GET", headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except HTTPError as e:
-            if e.code == 404:
-                return None
-            else:
-                self.module.fail_json(msg='Could not fetch mapper %s for identity provider %s in realm %s: %s'
-                                          % (mid, alias, realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not fetch mapper %s for identity provider %s in realm %s: %s'
-                                      % (mid, alias, realm, str(e)))
-
-    def create_identity_provider_mapper(self, mapper, alias, realm='master'):
-        """ Create an identity provider mapper.
-        :param mapper: IdentityProviderMapperRepresentation of the mapper to be created.
-        :param alias: Alias of the identity provider.
-        :param realm: Realm in which this identity provider resides, default "master".
-        :return: HTTPResponse object on success
-        """
-        mappers_url = URL_IDENTITY_PROVIDER_MAPPERS.format(url=self.baseurl, realm=realm, alias=alias)
-        try:
-            return open_url(mappers_url, method='POST', headers=self.restheaders,
-                            data=json.dumps(mapper), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not create identity provider mapper %s for idp %s in realm %s: %s'
-                                      % (mapper['name'], alias, realm, str(e)))
-
-    def update_identity_provider_mapper(self, mapper, alias, realm='master'):
-        """ Update an existing identity provider.
-        :param mapper: IdentityProviderMapperRepresentation of the mapper to be updated.
-        :param alias: Alias of the identity provider.
-        :param realm: Realm in which this identity provider resides, default "master".
-        :return HTTPResponse object on success
-        """
-        mapper_url = URL_IDENTITY_PROVIDER_MAPPER.format(url=self.baseurl, realm=realm, alias=alias, id=mapper['id'])
-        try:
-            return open_url(mapper_url, method='PUT', headers=self.restheaders,
-                            data=json.dumps(mapper), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not update mapper %s for identity provider %s in realm %s: %s'
-                                      % (mapper['id'], alias, realm, str(e)))
-
-    def delete_identity_provider_mapper(self, mid, alias, realm='master'):
-        """ Delete an identity provider.
-        :param mid: Unique ID of the mapper to delete.
-        :param alias: Alias of the identity provider.
-        :param realm: Realm in which this identity provider resides, default "master".
-        """
-        mapper_url = URL_IDENTITY_PROVIDER_MAPPER.format(url=self.baseurl, realm=realm, alias=alias, id=mid)
-        try:
-            return open_url(mapper_url, method='DELETE', headers=self.restheaders,
-                            validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Unable to delete mapper %s for identity provider %s in realm %s: %s'
-                                      % (mid, alias, realm, str(e)))
-
-    def get_components(self, filter=None, realm='master'):
-        """ Fetch representations for components in a realm
-        :param realm: realm to be queried
-        :param filter: search filter
-        :return: list of representations for components
-        """
-        comps_url = URL_COMPONENTS.format(url=self.baseurl, realm=realm)
-        if filter is not None:
-            comps_url += '?%s' % filter
-
-        try:
-            return json.loads(to_native(open_url(comps_url, method='GET', headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except ValueError as e:
-            self.module.fail_json(msg='API returned incorrect JSON when trying to obtain list of components for realm %s: %s'
-                                      % (realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not obtain list of components for realm %s: %s'
-                                      % (realm, str(e)))
-
-    def get_component(self, cid, realm='master'):
-        """ Fetch component representation from a realm using its cid.
-        If the component does not exist, None is returned.
-        :param cid: Unique ID of the component to fetch.
-        :param realm: Realm in which the component resides; default 'master'.
-        """
-        comp_url = URL_COMPONENT.format(url=self.baseurl, realm=realm, id=cid)
-        try:
-            return json.loads(to_native(open_url(comp_url, method="GET", headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except HTTPError as e:
-            if e.code == 404:
-                return None
-            else:
-                self.module.fail_json(msg='Could not fetch component %s in realm %s: %s'
-                                          % (cid, realm, str(e)))
-        except Exception as e:
-            self.module.fail_json(msg='Could not fetch component %s in realm %s: %s'
-                                      % (cid, realm, str(e)))
-
-    def create_component(self, comprep, realm='master'):
-        """ Create an component.
-        :param comprep: Component representation of the component to be created.
-        :param realm: Realm in which this component resides, default "master".
-        :return: Component representation of the created component
-        """
-        comps_url = URL_COMPONENTS.format(url=self.baseurl, realm=realm)
-        try:
-            resp = open_url(comps_url, method='POST', headers=self.restheaders,
-                            data=json.dumps(comprep), validate_certs=self.validate_certs)
-            comp_url = resp.getheader('Location')
-            if comp_url is None:
-                self.module.fail_json(msg='Could not create component in realm %s: %s'
-                                          % (realm, 'unexpected response'))
-            return json.loads(to_native(open_url(comp_url, method="GET", headers=self.restheaders,
-                                                 validate_certs=self.validate_certs).read()))
-        except Exception as e:
-            self.module.fail_json(msg='Could not create component in realm %s: %s'
-                                      % (realm, str(e)))
-
-    def update_component(self, comprep, realm='master'):
-        """ Update an existing component.
-        :param comprep: Component representation of the component to be updated.
-        :param realm: Realm in which this component resides, default "master".
-        :return HTTPResponse object on success
-        """
-        cid = comprep.get('id')
-        if cid is None:
-            self.module.fail_json(msg='Cannot update component without id')
-        comp_url = URL_COMPONENT.format(url=self.baseurl, realm=realm, id=cid)
-        try:
-            return open_url(comp_url, method='PUT', headers=self.restheaders,
-                            data=json.dumps(comprep), validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Could not update component %s in realm %s: %s'
-                                      % (cid, realm, str(e)))
-
-    def delete_component(self, cid, realm='master'):
-        """ Delete an component.
-        :param cid: Unique ID of the component.
-        :param realm: Realm in which this component resides, default "master".
-        """
-        comp_url = URL_COMPONENT.format(url=self.baseurl, realm=realm, id=cid)
-        try:
-            return open_url(comp_url, method='DELETE', headers=self.restheaders,
-                            validate_certs=self.validate_certs)
-        except Exception as e:
-            self.module.fail_json(msg='Unable to delete component %s in realm %s: %s'
-                                      % (cid, realm, str(e)))

plugins/module_utils/ilo_redfish_utils.py

@@ -1,232 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright (c) 2021-2022 Hewlett Packard Enterprise, Inc. All rights reserved.
-# GNU General Public License v3.0+ (see LICENSE or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-from ansible_collections.community.general.plugins.module_utils.redfish_utils import RedfishUtils
-
-
-class iLORedfishUtils(RedfishUtils):
-
-    def get_ilo_sessions(self):
-        result = {}
-        # listing all users has always been slower than other operations, why?
-        session_list = []
-        sessions_results = []
-        # Get these entries, but does not fail if not found
-        properties = ['Description', 'Id', 'Name', 'UserName']
-
-        # Changed self.sessions_uri to Hardcoded string.
-        response = self.get_request(
-            self.root_uri + self.service_root + "SessionService/Sessions/")
-        if not response['ret']:
-            return response
-        result['ret'] = True
-        data = response['data']
-
-        if 'Oem' in data:
-            if data["Oem"]["Hpe"]["Links"]["MySession"]["@odata.id"]:
-                current_session = data["Oem"]["Hpe"]["Links"]["MySession"]["@odata.id"]
-
-        for sessions in data[u'Members']:
-            # session_list[] are URIs
-            session_list.append(sessions[u'@odata.id'])
-        # for each session, get details
-        for uri in session_list:
-            session = {}
-            if uri != current_session:
-                response = self.get_request(self.root_uri + uri)
-                if not response['ret']:
-                    return response
-                data = response['data']
-                for property in properties:
-                    if property in data:
-                        session[property] = data[property]
-                sessions_results.append(session)
-        result["msg"] = sessions_results
-        result["ret"] = True
-        return result
-
-    def set_ntp_server(self, mgr_attributes):
-        result = {}
-        setkey = mgr_attributes['mgr_attr_name']
-
-        nic_info = self.get_manager_ethernet_uri()
-        ethuri = nic_info["nic_addr"]
-
-        response = self.get_request(self.root_uri + ethuri)
-        if not response['ret']:
-            return response
-        result['ret'] = True
-        data = response['data']
-        payload = {"DHCPv4": {
-            "UseNTPServers": ""
-        }}
-
-        if data["DHCPv4"]["UseNTPServers"]:
-            payload["DHCPv4"]["UseNTPServers"] = False
-            res_dhv4 = self.patch_request(self.root_uri + ethuri, payload)
-            if not res_dhv4['ret']:
-                return res_dhv4
-
-        payload = {"DHCPv6": {
-            "UseNTPServers": ""
-        }}
-
-        if data["DHCPv6"]["UseNTPServers"]:
-            payload["DHCPv6"]["UseNTPServers"] = False
-            res_dhv6 = self.patch_request(self.root_uri + ethuri, payload)
-            if not res_dhv6['ret']:
-                return res_dhv6
-
-        datetime_uri = self.manager_uri + "DateTime"
-
-        response = self.get_request(self.root_uri + datetime_uri)
-        if not response['ret']:
-            return response
-
-        data = response['data']
-
-        ntp_list = data[setkey]
-        if(len(ntp_list) == 2):
-            ntp_list.pop(0)
-
-        ntp_list.append(mgr_attributes['mgr_attr_value'])
-
-        payload = {setkey: ntp_list}
-
-        response1 = self.patch_request(self.root_uri + datetime_uri, payload)
-        if not response1['ret']:
-            return response1
-
-        return {'ret': True, 'changed': True, 'msg': "Modified %s" % mgr_attributes['mgr_attr_name']}
-
-    def set_time_zone(self, attr):
-        key = attr['mgr_attr_name']
-
-        uri = self.manager_uri + "DateTime/"
-        response = self.get_request(self.root_uri + uri)
-        if not response['ret']:
-            return response
-
-        data = response["data"]
-
-        if key not in data:
-            return {'ret': False, 'changed': False, 'msg': "Key %s not found" % key}
-
-        timezones = data["TimeZoneList"]
-        index = ""
-        for tz in timezones:
-            if attr['mgr_attr_value'] in tz["Name"]:
-                index = tz["Index"]
-                break
-
-        payload = {key: {"Index": index}}
-        response = self.patch_request(self.root_uri + uri, payload)
-        if not response['ret']:
-            return response
-
-        return {'ret': True, 'changed': True, 'msg': "Modified %s" % attr['mgr_attr_name']}
-
-    def set_dns_server(self, attr):
-        key = attr['mgr_attr_name']
-        nic_info = self.get_manager_ethernet_uri()
-        uri = nic_info["nic_addr"]
-
-        response = self.get_request(self.root_uri + uri)
-        if not response['ret']:
-            return response
-
-        data = response['data']
-
-        dns_list = data["Oem"]["Hpe"]["IPv4"][key]
-
-        if len(dns_list) == 3:
-            dns_list.pop(0)
-
-        dns_list.append(attr['mgr_attr_value'])
-
-        payload = {
-            "Oem": {
-                "Hpe": {
-                    "IPv4": {
-                        key: dns_list
-                    }
-                }
-            }
-        }
-
-        response = self.patch_request(self.root_uri + uri, payload)
-        if not response['ret']:
-            return response
-
-        return {'ret': True, 'changed': True, 'msg': "Modified %s" % attr['mgr_attr_name']}
-
-    def set_domain_name(self, attr):
-        key = attr['mgr_attr_name']
-
-        nic_info = self.get_manager_ethernet_uri()
-        ethuri = nic_info["nic_addr"]
-
-        response = self.get_request(self.root_uri + ethuri)
-        if not response['ret']:
-            return response
-
-        data = response['data']
-
-        payload = {"DHCPv4": {
-            "UseDomainName": ""
-        }}
-
-        if data["DHCPv4"]["UseDomainName"]:
-            payload["DHCPv4"]["UseDomainName"] = False
-            res_dhv4 = self.patch_request(self.root_uri + ethuri, payload)
-            if not res_dhv4['ret']:
-                return res_dhv4
-
-        payload = {"DHCPv6": {
-            "UseDomainName": ""
-        }}
-
-        if data["DHCPv6"]["UseDomainName"]:
-            payload["DHCPv6"]["UseDomainName"] = False
-            res_dhv6 = self.patch_request(self.root_uri + ethuri, payload)
-            if not res_dhv6['ret']:
-                return res_dhv6
-
-        domain_name = attr['mgr_attr_value']
-
-        payload = {"Oem": {
-            "Hpe": {
-                key: domain_name
-            }
-        }}
-
-        response = self.patch_request(self.root_uri + ethuri, payload)
-        if not response['ret']:
-            return response
-        return {'ret': True, 'changed': True, 'msg': "Modified %s" % attr['mgr_attr_name']}
-
-    def set_wins_registration(self, mgrattr):
-        Key = mgrattr['mgr_attr_name']
-
-        nic_info = self.get_manager_ethernet_uri()
-        ethuri = nic_info["nic_addr"]
-
-        payload = {
-            "Oem": {
-                "Hpe": {
-                    "IPv4": {
-                        Key: False
-                    }
-                }
-            }
-        }
-
-        response = self.patch_request(self.root_uri + ethuri, payload)
-        if not response['ret']:
-            return response
-        return {'ret': True, 'changed': True, 'msg': "Modified %s" % mgrattr['mgr_attr_name']}

plugins/module_utils/ipa.py

@@ -31,7 +31,6 @@ def _env_then_dns_fallback(*args, **kwargs):
         result = env_fallback(*args, **kwargs)
         if result == '':
             raise AnsibleFallbackNotFound
-        return result
     except AnsibleFallbackNotFound:
         # If no host was given, we try to guess it from IPA.
         # The ipa-ca entry is a standard entry that IPA will have set for
@@ -179,10 +178,10 @@ class IPAClient(object):
                 result.append(key)
         return result
 
-    def modify_if_diff(self, name, ipa_list, module_list, add_method, remove_method, item=None, append=None):
+    def modify_if_diff(self, name, ipa_list, module_list, add_method, remove_method, item=None):
         changed = False
         diff = list(set(ipa_list) - set(module_list))
-        if append is not True and len(diff) > 0:
+        if len(diff) > 0:
             changed = True
             if not self.module.check_mode:
                 if item:

plugins/module_utils/mh/base.py

@@ -63,7 +63,3 @@ class ModuleHelperBase(object):
         if 'failed' not in output:
             output['failed'] = False
         self.module.exit_json(changed=self.has_changed(), **output)
-
-    @classmethod
-    def execute(cls, module=None):
-        cls(module).run()

plugins/module_utils/mh/deco.py

@@ -52,36 +52,3 @@ def module_fails_on_exception(func):
             self.module.fail_json(msg=msg, exception=traceback.format_exc(),
                                   output=self.output, vars=self.vars.output(), **self.output)
     return wrapper
-
-
-def check_mode_skip(func):
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        if not self.module.check_mode:
-            return func(self, *args, **kwargs)
-    return wrapper
-
-
-def check_mode_skip_returns(callable=None, value=None):
-
-    def deco(func):
-        if callable is not None:
-            @wraps(func)
-            def wrapper_callable(self, *args, **kwargs):
-                if self.module.check_mode:
-                    return callable(self, *args, **kwargs)
-                return func(self, *args, **kwargs)
-            return wrapper_callable
-
-        if value is not None:
-            @wraps(func)
-            def wrapper_value(self, *args, **kwargs):
-                if self.module.check_mode:
-                    return value
-                return func(self, *args, **kwargs)
-            return wrapper_value
-
-    if callable is None and value is None:
-        return check_mode_skip
-
-    return deco

plugins/module_utils/mh/mixins/cmd.py

@@ -16,7 +16,6 @@ class ArgFormat(object):
     BOOLEAN = 0
     PRINTF = 1
     FORMAT = 2
-    BOOLEAN_NOT = 3
 
     @staticmethod
     def stars_deco(num):
@@ -51,14 +50,12 @@ class ArgFormat(object):
 
         _fmts = {
             ArgFormat.BOOLEAN: lambda _fmt, v: ([_fmt] if bool(v) else []),
-            ArgFormat.BOOLEAN_NOT: lambda _fmt, v: ([] if bool(v) else [_fmt]),
             ArgFormat.PRINTF: printf_fmt,
             ArgFormat.FORMAT: lambda _fmt, v: [_fmt.format(v)],
         }
 
         self.name = name
         self.stars = stars
-        self.style = style
 
         if fmt is None:
             fmt = "{0}"
@@ -79,7 +76,7 @@ class ArgFormat(object):
             self.arg_format = (self.stars_deco(stars))(self.arg_format)
 
     def to_text(self, value):
-        if value is None and self.style != ArgFormat.BOOLEAN_NOT:
+        if value is None:
             return []
         func = self.arg_format
         return [str(p) for p in func(value)]
@@ -141,7 +138,11 @@ class CmdMixin(object):
                     fmt = find_format(param)
                     value = extra_params[param]
                 else:
-                    raise self.ModuleHelperException('Cannot determine value for parameter: {0}'.format(param))
+                    self.module.deprecate("Cannot determine value for parameter: {0}. "
+                                          "From version 4.0.0 onwards this will generate an exception".format(param),
+                                          version="4.0.0", collection_name="community.general")
+                    continue
+
             else:
                 raise self.ModuleHelperException("run_command parameter must be either a str or a dict: {0}".format(param))
             cmd_args = add_arg_formatted_param(cmd_args, fmt, value)
@@ -158,9 +159,8 @@ class CmdMixin(object):
                     publish_rc=True,
                     publish_out=True,
                     publish_err=True,
-                    publish_cmd=True,
                     *args, **kwargs):
-        cmd_args = self._calculate_args(extra_params, params)
+        self.vars.cmd_args = self._calculate_args(extra_params, params)
         options = dict(self.run_command_fixed_options)
         options['check_rc'] = options.get('check_rc', self.check_rc)
         options.update(kwargs)
@@ -172,15 +172,13 @@ class CmdMixin(object):
             })
             self.update_output(force_lang=self.force_lang)
             options['environ_update'] = env_update
-        rc, out, err = self.module.run_command(cmd_args, *args, **options)
+        rc, out, err = self.module.run_command(self.vars.cmd_args, *args, **options)
         if publish_rc:
             self.update_output(rc=rc)
         if publish_out:
             self.update_output(stdout=out)
         if publish_err:
             self.update_output(stderr=err)
-        if publish_cmd:
-            self.update_output(cmd_args=cmd_args)
         if process_output is None:
             _process = self.process_command_output
         else:

plugins/module_utils/mh/mixins/deprecate_attrs.py

@@ -1,61 +0,0 @@
-# -*- coding: utf-8 -*-
-# (c) 2020, Alexei Znamensky <russoz@gmail.com>
-# Copyright: (c) 2020, Ansible Project
-# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-from ansible.module_utils.basic import AnsibleModule
-
-
-class DeprecateAttrsMixin(object):
-
-    def _deprecate_setup(self, attr, target, module):
-        if target is None:
-            target = self
-        if not hasattr(target, attr):
-            raise ValueError("Target {0} has no attribute {1}".format(target, attr))
-        if module is None:
-            if isinstance(target, AnsibleModule):
-                module = target
-            elif hasattr(target, "module") and isinstance(target.module, AnsibleModule):
-                module = target.module
-            else:
-                raise ValueError("Failed to automatically discover the AnsibleModule instance. Pass 'module' parameter explicitly.")
-
-        # setup internal state dicts
-        value_attr = "__deprecated_attr_value"
-        trigger_attr = "__deprecated_attr_trigger"
-        if not hasattr(target, value_attr):
-            setattr(target, value_attr, {})
-        if not hasattr(target, trigger_attr):
-            setattr(target, trigger_attr, {})
-        value_dict = getattr(target, value_attr)
-        trigger_dict = getattr(target, trigger_attr)
-        return target, module, value_dict, trigger_dict
-
-    def _deprecate_attr(self, attr, msg, version=None, date=None, collection_name=None, target=None, value=None, module=None):
-        target, module, value_dict, trigger_dict = self._deprecate_setup(attr, target, module)
-
-        value_dict[attr] = getattr(target, attr, value)
-        trigger_dict[attr] = False
-
-        def _trigger():
-            if not trigger_dict[attr]:
-                module.deprecate(msg, version=version, date=date, collection_name=collection_name)
-                trigger_dict[attr] = True
-
-        def _getter(_self):
-            _trigger()
-            return value_dict[attr]
-
-        def _setter(_self, new_value):
-            _trigger()
-            value_dict[attr] = new_value
-
-        # override attribute
-        prop = property(_getter)
-        setattr(target, attr, prop)
-        setattr(target, "_{0}_setter".format(attr), prop.setter(_setter))

plugins/module_utils/mh/module_helper.py

@@ -13,10 +13,9 @@ from ansible_collections.community.general.plugins.module_utils.mh.mixins.cmd im
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.state import StateMixin
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.deps import DependencyMixin
 from ansible_collections.community.general.plugins.module_utils.mh.mixins.vars import VarsMixin, VarDict as _VD
-from ansible_collections.community.general.plugins.module_utils.mh.mixins.deprecate_attrs import DeprecateAttrsMixin
 
 
-class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelperBase):
+class ModuleHelper(VarsMixin, DependencyMixin, ModuleHelperBase):
     _output_conflict_list = ('msg', 'exception', 'output', 'vars', 'changed')
     facts_name = None
     output_params = ()
@@ -37,15 +36,6 @@ class ModuleHelper(DeprecateAttrsMixin, VarsMixin, DependencyMixin, ModuleHelper
                 fact=name in self.facts_params,
             )
 
-        self._deprecate_attr(
-            attr="VarDict",
-            msg="ModuleHelper.VarDict attribute is deprecated, use VarDict from "
-                "the ansible_collections.community.general.plugins.module_utils.mh.mixins.vars module instead",
-            version="6.0.0",
-            collection_name="community.general",
-            target=ModuleHelper,
-            module=self.module)
-
     def update_output(self, **kwargs):
         self.update_vars(meta={"output": True}, **kwargs)
 

plugins/module_utils/net_tools/nios/api.py

@@ -0,0 +1,598 @@
+# -*- coding: utf-8 -*-
+# This code is part of Ansible, but is an independent component.
+# This particular file snippet, and this file snippet only, is BSD licensed.
+# Modules you write using this snippet, which is embedded dynamically by Ansible
+# still belong to the author of the module, and may assign their own license
+# to the complete work.
+#
+# (c) 2018 Red Hat Inc.
+#
+# Simplified BSD License (see licenses/simplified_bsd.txt or https://opensource.org/licenses/BSD-2-Clause)
+
+from __future__ import (absolute_import, division, print_function)
+__metaclass__ = type
+
+
+import os
+from functools import partial
+from ansible.module_utils.common.text.converters import to_native
+from ansible.module_utils.six import iteritems
+from ansible.module_utils.common.text.converters import to_text
+from ansible.module_utils.basic import env_fallback
+from ansible.module_utils.common.validation import check_type_dict
+
+try:
+    from infoblox_client.connector import Connector
+    from infoblox_client.exceptions import InfobloxException
+    HAS_INFOBLOX_CLIENT = True
+except ImportError:
+    HAS_INFOBLOX_CLIENT = False
+
+# defining nios constants
+NIOS_DNS_VIEW = 'view'
+NIOS_NETWORK_VIEW = 'networkview'
+NIOS_HOST_RECORD = 'record:host'
+NIOS_IPV4_NETWORK = 'network'
+NIOS_IPV6_NETWORK = 'ipv6network'
+NIOS_ZONE = 'zone_auth'
+NIOS_PTR_RECORD = 'record:ptr'
+NIOS_A_RECORD = 'record:a'
+NIOS_AAAA_RECORD = 'record:aaaa'
+NIOS_CNAME_RECORD = 'record:cname'
+NIOS_MX_RECORD = 'record:mx'
+NIOS_SRV_RECORD = 'record:srv'
+NIOS_NAPTR_RECORD = 'record:naptr'
+NIOS_TXT_RECORD = 'record:txt'
+NIOS_NSGROUP = 'nsgroup'
+NIOS_IPV4_FIXED_ADDRESS = 'fixedaddress'
+NIOS_IPV6_FIXED_ADDRESS = 'ipv6fixedaddress'
+NIOS_NEXT_AVAILABLE_IP = 'func:nextavailableip'
+NIOS_IPV4_NETWORK_CONTAINER = 'networkcontainer'
+NIOS_IPV6_NETWORK_CONTAINER = 'ipv6networkcontainer'
+NIOS_MEMBER = 'member'
+
+NIOS_PROVIDER_SPEC = {
+    'host': dict(fallback=(env_fallback, ['INFOBLOX_HOST'])),
+    'username': dict(fallback=(env_fallback, ['INFOBLOX_USERNAME'])),
+    'password': dict(fallback=(env_fallback, ['INFOBLOX_PASSWORD']), no_log=True),
+    'validate_certs': dict(type='bool', default=False, fallback=(env_fallback, ['INFOBLOX_SSL_VERIFY']), aliases=['ssl_verify']),
+    'silent_ssl_warnings': dict(type='bool', default=True),
+    'http_request_timeout': dict(type='int', default=10, fallback=(env_fallback, ['INFOBLOX_HTTP_REQUEST_TIMEOUT'])),
+    'http_pool_connections': dict(type='int', default=10),
+    'http_pool_maxsize': dict(type='int', default=10),
+    'max_retries': dict(type='int', default=3, fallback=(env_fallback, ['INFOBLOX_MAX_RETRIES'])),
+    'wapi_version': dict(default='2.1', fallback=(env_fallback, ['INFOBLOX_WAP_VERSION'])),
+    'max_results': dict(type='int', default=1000, fallback=(env_fallback, ['INFOBLOX_MAX_RETRIES']))
+}
+
+
+def get_connector(*args, **kwargs):
+    ''' Returns an instance of infoblox_client.connector.Connector
+    :params args: positional arguments are silently ignored
+    :params kwargs: dict that is passed to Connector init
+    :returns: Connector
+    '''
+    if not HAS_INFOBLOX_CLIENT:
+        raise Exception('infoblox-client is required but does not appear '
+                        'to be installed.  It can be installed using the '
+                        'command `pip install infoblox-client`')
+
+    if not set(kwargs.keys()).issubset(list(NIOS_PROVIDER_SPEC.keys()) + ['ssl_verify']):
+        raise Exception('invalid or unsupported keyword argument for connector')
+    for key, value in iteritems(NIOS_PROVIDER_SPEC):
+        if key not in kwargs:
+            # apply default values from NIOS_PROVIDER_SPEC since we cannot just
+            # assume the provider values are coming from AnsibleModule
+            if 'default' in value:
+                kwargs[key] = value['default']
+
+            # override any values with env variables unless they were
+            # explicitly set
+            env = ('INFOBLOX_%s' % key).upper()
+            if env in os.environ:
+                kwargs[key] = os.environ.get(env)
+
+    if 'validate_certs' in kwargs.keys():
+        kwargs['ssl_verify'] = kwargs['validate_certs']
+        kwargs.pop('validate_certs', None)
+
+    return Connector(kwargs)
+
+
+def normalize_extattrs(value):
+    ''' Normalize extattrs field to expected format
+    The module accepts extattrs as key/value pairs.  This method will
+    transform the key/value pairs into a structure suitable for
+    sending across WAPI in the format of:
+        extattrs: {
+            key: {
+                value: <value>
+            }
+        }
+    '''
+    return dict([(k, {'value': v}) for k, v in iteritems(value)])
+
+
+def flatten_extattrs(value):
+    ''' Flatten the key/value struct for extattrs
+    WAPI returns extattrs field as a dict in form of:
+        extattrs: {
+            key: {
+                value: <value>
+            }
+        }
+    This method will flatten the structure to:
+        extattrs: {
+            key: value
+        }
+    '''
+    return dict([(k, v['value']) for k, v in iteritems(value)])
+
+
+def member_normalize(member_spec):
+    ''' Transforms the member module arguments into a valid WAPI struct
+    This function will transform the arguments into a structure that
+    is a valid WAPI structure in the format of:
+        {
+            key: <value>,
+        }
+    It will remove any arguments that are set to None since WAPI will error on
+    that condition.
+    The remainder of the value validation is performed by WAPI
+    Some parameters in ib_spec are passed as a list in order to pass the validation for elements.
+    In this function, they are converted to dictionary.
+    '''
+    member_elements = ['vip_setting', 'ipv6_setting', 'lan2_port_setting', 'mgmt_port_setting',
+                       'pre_provisioning', 'network_setting', 'v6_network_setting',
+                       'ha_port_setting', 'lan_port_setting', 'lan2_physical_setting',
+                       'lan_ha_port_setting', 'mgmt_network_setting', 'v6_mgmt_network_setting']
+    for key in list(member_spec.keys()):
+        if key in member_elements and member_spec[key] is not None:
+            member_spec[key] = member_spec[key][0]
+        if isinstance(member_spec[key], dict):
+            member_spec[key] = member_normalize(member_spec[key])
+        elif isinstance(member_spec[key], list):
+            for x in member_spec[key]:
+                if isinstance(x, dict):
+                    x = member_normalize(x)
+        elif member_spec[key] is None:
+            del member_spec[key]
+    return member_spec
+
+
+def normalize_ib_spec(ib_spec):
+    result = {}
+    for arg in ib_spec:
+        result[arg] = dict([(k, v)
+                            for k, v in iteritems(ib_spec[arg])
+                            if k not in ('ib_req', 'transform', 'update')])
+    return result
+
+
+class WapiBase(object):
+    ''' Base class for implementing Infoblox WAPI API '''
+    provider_spec = {'provider': dict(type='dict', options=NIOS_PROVIDER_SPEC)}
+
+    def __init__(self, provider):
+        self.connector = get_connector(**provider)
+
+    def __getattr__(self, name):
+        try:
+            return self.__dict__[name]
+        except KeyError:
+            if name.startswith('_'):
+                raise AttributeError("'%s' object has no attribute '%s'" % (self.__class__.__name__, name))
+            return partial(self._invoke_method, name)
+
+    def _invoke_method(self, name, *args, **kwargs):
+        try:
+            method = getattr(self.connector, name)
+            return method(*args, **kwargs)
+        except InfobloxException as exc:
+            if hasattr(self, 'handle_exception'):
+                self.handle_exception(name, exc)
+            else:
+                raise
+
+
+class WapiLookup(WapiBase):
+    ''' Implements WapiBase for lookup plugins '''
+    def handle_exception(self, method_name, exc):
+        if ('text' in exc.response):
+            raise Exception(exc.response['text'])
+        else:
+            raise Exception(exc)
+
+
+class WapiInventory(WapiBase):
+    ''' Implements WapiBase for dynamic inventory script '''
+    pass
+
+
+class WapiModule(WapiBase):
+    ''' Implements WapiBase for executing a NIOS module '''
+    def __init__(self, module):
+        self.module = module
+        provider = module.params['provider']
+        try:
+            super(WapiModule, self).__init__(provider)
+        except Exception as exc:
+            self.module.fail_json(msg=to_text(exc))
+
+    def handle_exception(self, method_name, exc):
+        ''' Handles any exceptions raised
+        This method will be called if an InfobloxException is raised for
+        any call to the instance of Connector and also, in case of generic
+        exception. This method will then gracefully fail the module.
+        :args exc: instance of InfobloxException
+        '''
+        if ('text' in exc.response):
+            self.module.fail_json(
+                msg=exc.response['text'],
+                type=exc.response['Error'].split(':')[0],
+                code=exc.response.get('code'),
+                operation=method_name
+            )
+        else:
+            self.module.fail_json(msg=to_native(exc))
+
+    def run(self, ib_obj_type, ib_spec):
+        ''' Runs the module and performans configuration tasks
+        :args ib_obj_type: the WAPI object type to operate against
+        :args ib_spec: the specification for the WAPI object as a dict
+        :returns: a results dict
+        '''
+
+        update = new_name = None
+        state = self.module.params['state']
+        if state not in ('present', 'absent'):
+            self.module.fail_json(msg='state must be one of `present`, `absent`, got `%s`' % state)
+
+        result = {'changed': False}
+
+        obj_filter = dict([(k, self.module.params[k]) for k, v in iteritems(ib_spec) if v.get('ib_req')])
+
+        # get object reference
+        ib_obj_ref, update, new_name = self.get_object_ref(self.module, ib_obj_type, obj_filter, ib_spec)
+        proposed_object = {}
+        for key, value in iteritems(ib_spec):
+            if self.module.params[key] is not None:
+                if 'transform' in value:
+                    proposed_object[key] = value['transform'](self.module)
+                else:
+                    proposed_object[key] = self.module.params[key]
+
+        # If configure_by_dns is set to False and view is 'default', then delete the default dns
+        if not proposed_object.get('configure_for_dns') and proposed_object.get('view') == 'default'\
+                and ib_obj_type == NIOS_HOST_RECORD:
+            del proposed_object['view']
+
+        if ib_obj_ref:
+            if len(ib_obj_ref) > 1:
+                for each in ib_obj_ref:
+                    # To check for existing A_record with same name with input A_record by IP
+                    if each.get('ipv4addr') and each.get('ipv4addr') == proposed_object.get('ipv4addr'):
+                        current_object = each
+                    # To check for existing Host_record with same name with input Host_record by IP
+                    elif each.get('ipv4addrs')[0].get('ipv4addr') and each.get('ipv4addrs')[0].get('ipv4addr')\
+                            == proposed_object.get('ipv4addrs')[0].get('ipv4addr'):
+                        current_object = each
+                    # Else set the current_object with input value
+                    else:
+                        current_object = obj_filter
+                        ref = None
+            else:
+                current_object = ib_obj_ref[0]
+            if 'extattrs' in current_object:
+                current_object['extattrs'] = flatten_extattrs(current_object['extattrs'])
+            if current_object.get('_ref'):
+                ref = current_object.pop('_ref')
+        else:
+            current_object = obj_filter
+            ref = None
+        # checks if the object type is member to normalize the attributes being passed
+        if (ib_obj_type == NIOS_MEMBER):
+            proposed_object = member_normalize(proposed_object)
+
+        # checks if the name's field has been updated
+        if update and new_name:
+            proposed_object['name'] = new_name
+
+        check_remove = []
+        if (ib_obj_type == NIOS_HOST_RECORD):
+            # this check is for idempotency, as if the same ip address shall be passed
+            # add param will be removed, and same exists true for remove case as well.
+            if 'ipv4addrs' in [current_object and proposed_object]:
+                for each in current_object['ipv4addrs']:
+                    if each['ipv4addr'] == proposed_object['ipv4addrs'][0]['ipv4addr']:
+                        if 'add' in proposed_object['ipv4addrs'][0]:
+                            del proposed_object['ipv4addrs'][0]['add']
+                            break
+                    check_remove += each.values()
+                if proposed_object['ipv4addrs'][0]['ipv4addr'] not in check_remove:
+                    if 'remove' in proposed_object['ipv4addrs'][0]:
+                        del proposed_object['ipv4addrs'][0]['remove']
+
+        res = None
+        modified = not self.compare_objects(current_object, proposed_object)
+        if 'extattrs' in proposed_object:
+            proposed_object['extattrs'] = normalize_extattrs(proposed_object['extattrs'])
+
+        # Checks if nios_next_ip param is passed in ipv4addrs/ipv4addr args
+        proposed_object = self.check_if_nios_next_ip_exists(proposed_object)
+
+        if state == 'present':
+            if ref is None:
+                if not self.module.check_mode:
+                    self.create_object(ib_obj_type, proposed_object)
+                result['changed'] = True
+            # Check if NIOS_MEMBER and the flag to call function create_token is set
+            elif (ib_obj_type == NIOS_MEMBER) and (proposed_object['create_token']):
+                proposed_object = None
+                # the function creates a token that can be used by a pre-provisioned member to join the grid
+                result['api_results'] = self.call_func('create_token', ref, proposed_object)
+                result['changed'] = True
+            elif modified:
+                if 'ipv4addrs' in proposed_object:
+                    if ('add' not in proposed_object['ipv4addrs'][0]) and ('remove' not in proposed_object['ipv4addrs'][0]):
+                        self.check_if_recordname_exists(obj_filter, ib_obj_ref, ib_obj_type, current_object, proposed_object)
+
+                if (ib_obj_type in (NIOS_HOST_RECORD, NIOS_NETWORK_VIEW, NIOS_DNS_VIEW)):
+                    run_update = True
+                    proposed_object = self.on_update(proposed_object, ib_spec)
+                    if 'ipv4addrs' in proposed_object:
+                        if ('add' or 'remove') in proposed_object['ipv4addrs'][0]:
+                            run_update, proposed_object = self.check_if_add_remove_ip_arg_exists(proposed_object)
+                            if run_update:
+                                res = self.update_object(ref, proposed_object)
+                                result['changed'] = True
+                            else:
+                                res = ref
+                if (ib_obj_type in (NIOS_A_RECORD, NIOS_AAAA_RECORD, NIOS_PTR_RECORD, NIOS_SRV_RECORD)):
+                    # popping 'view' key as update of 'view' is not supported with respect to a:record/aaaa:record/srv:record/ptr:record
+                    proposed_object = self.on_update(proposed_object, ib_spec)
+                    del proposed_object['view']
+                    if not self.module.check_mode:
+                        res = self.update_object(ref, proposed_object)
+                    result['changed'] = True
+                elif 'network_view' in proposed_object:
+                    proposed_object.pop('network_view')
+                    result['changed'] = True
+                if not self.module.check_mode and res is None:
+                    proposed_object = self.on_update(proposed_object, ib_spec)
+                    self.update_object(ref, proposed_object)
+                    result['changed'] = True
+
+        elif state == 'absent':
+            if ref is not None:
+                if 'ipv4addrs' in proposed_object:
+                    if 'remove' in proposed_object['ipv4addrs'][0]:
+                        self.check_if_add_remove_ip_arg_exists(proposed_object)
+                        self.update_object(ref, proposed_object)
+                        result['changed'] = True
+                elif not self.module.check_mode:
+                    self.delete_object(ref)
+                    result['changed'] = True
+
+        return result
+
+    def check_if_recordname_exists(self, obj_filter, ib_obj_ref, ib_obj_type, current_object, proposed_object):
+        ''' Send POST request if host record input name and retrieved ref name is same,
+            but input IP and retrieved IP is different'''
+
+        if 'name' in (obj_filter and ib_obj_ref[0]) and ib_obj_type == NIOS_HOST_RECORD:
+            obj_host_name = obj_filter['name']
+            ref_host_name = ib_obj_ref[0]['name']
+            if 'ipv4addrs' in (current_object and proposed_object):
+                current_ip_addr = current_object['ipv4addrs'][0]['ipv4addr']
+                proposed_ip_addr = proposed_object['ipv4addrs'][0]['ipv4addr']
+            elif 'ipv6addrs' in (current_object and proposed_object):
+                current_ip_addr = current_object['ipv6addrs'][0]['ipv6addr']
+                proposed_ip_addr = proposed_object['ipv6addrs'][0]['ipv6addr']
+
+            if obj_host_name == ref_host_name and current_ip_addr != proposed_ip_addr:
+                self.create_object(ib_obj_type, proposed_object)
+
+    def check_if_nios_next_ip_exists(self, proposed_object):
+        ''' Check if nios_next_ip argument is passed in ipaddr while creating
+            host record, if yes then format proposed object ipv4addrs and pass
+            func:nextavailableip and ipaddr range to create hostrecord with next
+             available ip in one call to avoid any race condition '''
+
+        if 'ipv4addrs' in proposed_object:
+            if 'nios_next_ip' in proposed_object['ipv4addrs'][0]['ipv4addr']:
+                ip_range = check_type_dict(proposed_object['ipv4addrs'][0]['ipv4addr'])['nios_next_ip']
+                proposed_object['ipv4addrs'][0]['ipv4addr'] = NIOS_NEXT_AVAILABLE_IP + ':' + ip_range
+        elif 'ipv4addr' in proposed_object:
+            if 'nios_next_ip' in proposed_object['ipv4addr']:
+                ip_range = check_type_dict(proposed_object['ipv4addr'])['nios_next_ip']
+                proposed_object['ipv4addr'] = NIOS_NEXT_AVAILABLE_IP + ':' + ip_range
+
+        return proposed_object
+
+    def check_if_add_remove_ip_arg_exists(self, proposed_object):
+        '''
+            This function shall check if add/remove param is set to true and
+            is passed in the args, then we will update the proposed dictionary
+            to add/remove IP to existing host_record, if the user passes false
+            param with the argument nothing shall be done.
+            :returns: True if param is changed based on add/remove, and also the
+            changed proposed_object.
+        '''
+        update = False
+        if 'add' in proposed_object['ipv4addrs'][0]:
+            if proposed_object['ipv4addrs'][0]['add']:
+                proposed_object['ipv4addrs+'] = proposed_object['ipv4addrs']
+                del proposed_object['ipv4addrs']
+                del proposed_object['ipv4addrs+'][0]['add']
+                update = True
+            else:
+                del proposed_object['ipv4addrs'][0]['add']
+        elif 'remove' in proposed_object['ipv4addrs'][0]:
+            if proposed_object['ipv4addrs'][0]['remove']:
+                proposed_object['ipv4addrs-'] = proposed_object['ipv4addrs']
+                del proposed_object['ipv4addrs']
+                del proposed_object['ipv4addrs-'][0]['remove']
+                update = True
+            else:
+                del proposed_object['ipv4addrs'][0]['remove']
+        return update, proposed_object
+
+    def issubset(self, item, objects):
+        ''' Checks if item is a subset of objects
+        :args item: the subset item to validate
+        :args objects: superset list of objects to validate against
+        :returns: True if item is a subset of one entry in objects otherwise
+            this method will return None
+        '''
+        for obj in objects:
+            if isinstance(item, dict):
+                if all(entry in obj.items() for entry in item.items()):
+                    return True
+            else:
+                if item in obj:
+                    return True
+
+    def compare_objects(self, current_object, proposed_object):
+        for key, proposed_item in iteritems(proposed_object):
+            current_item = current_object.get(key)
+
+            # if proposed has a key that current doesn't then the objects are
+            # not equal and False will be immediately returned
+            if current_item is None:
+                return False
+
+            elif isinstance(proposed_item, list):
+                if key == 'aliases':
+                    if set(current_item) != set(proposed_item):
+                        return False
+                for subitem in proposed_item:
+                    if not self.issubset(subitem, current_item):
+                        return False
+
+            elif isinstance(proposed_item, dict):
+                return self.compare_objects(current_item, proposed_item)
+
+            else:
+                if current_item != proposed_item:
+                    return False
+
+        return True
+
+    def get_object_ref(self, module, ib_obj_type, obj_filter, ib_spec):
+        ''' this function gets the reference object of pre-existing nios objects '''
+
+        update = False
+        old_name = new_name = None
+        if ('name' in obj_filter):
+            # gets and returns the current object based on name/old_name passed
+            try:
+                name_obj = check_type_dict(obj_filter['name'])
+                old_name = name_obj['old_name']
+                new_name = name_obj['new_name']
+            except TypeError:
+                name = obj_filter['name']
+
+            if old_name and new_name:
+                if (ib_obj_type == NIOS_HOST_RECORD):
+                    test_obj_filter = dict([('name', old_name), ('view', obj_filter['view'])])
+                elif (ib_obj_type in (NIOS_AAAA_RECORD, NIOS_A_RECORD)):
+                    test_obj_filter = obj_filter
+                else:
+                    test_obj_filter = dict([('name', old_name)])
+                # get the object reference
+                ib_obj = self.get_object(ib_obj_type, test_obj_filter, return_fields=list(ib_spec.keys()))
+                if ib_obj:
+                    obj_filter['name'] = new_name
+                else:
+                    test_obj_filter['name'] = new_name
+                    ib_obj = self.get_object(ib_obj_type, test_obj_filter, return_fields=list(ib_spec.keys()))
+                update = True
+                return ib_obj, update, new_name
+            if (ib_obj_type == NIOS_HOST_RECORD):
+                # to check only by name if dns bypassing is set
+                if not obj_filter['configure_for_dns']:
+                    test_obj_filter = dict([('name', name)])
+                else:
+                    test_obj_filter = dict([('name', name), ('view', obj_filter['view'])])
+            elif (ib_obj_type == NIOS_IPV4_FIXED_ADDRESS or ib_obj_type == NIOS_IPV6_FIXED_ADDRESS and 'mac' in obj_filter):
+                test_obj_filter = dict([['mac', obj_filter['mac']]])
+            elif (ib_obj_type == NIOS_A_RECORD):
+                # resolves issue where a_record with uppercase name was returning null and was failing
+                test_obj_filter = obj_filter
+                test_obj_filter['name'] = test_obj_filter['name'].lower()
+                # resolves issue where multiple a_records with same name and different IP address
+                try:
+                    ipaddr_obj = check_type_dict(obj_filter['ipv4addr'])
+                    ipaddr = ipaddr_obj['old_ipv4addr']
+                except TypeError:
+                    ipaddr = obj_filter['ipv4addr']
+                test_obj_filter['ipv4addr'] = ipaddr
+            elif (ib_obj_type == NIOS_TXT_RECORD):
+                # resolves issue where multiple txt_records with same name and different text
+                test_obj_filter = obj_filter
+                try:
+                    text_obj = check_type_dict(obj_filter['text'])
+                    txt = text_obj['old_text']
+                except TypeError:
+                    txt = obj_filter['text']
+                test_obj_filter['text'] = txt
+            # check if test_obj_filter is empty copy passed obj_filter
+            else:
+                test_obj_filter = obj_filter
+            ib_obj = self.get_object(ib_obj_type, test_obj_filter.copy(), return_fields=list(ib_spec.keys()))
+        elif (ib_obj_type == NIOS_A_RECORD):
+            # resolves issue where multiple a_records with same name and different IP address
+            test_obj_filter = obj_filter
+            try:
+                ipaddr_obj = check_type_dict(obj_filter['ipv4addr'])
+                ipaddr = ipaddr_obj['old_ipv4addr']
+            except TypeError:
+                ipaddr = obj_filter['ipv4addr']
+            test_obj_filter['ipv4addr'] = ipaddr
+            ib_obj = self.get_object(ib_obj_type, test_obj_filter.copy(), return_fields=list(ib_spec.keys()))
+        elif (ib_obj_type == NIOS_TXT_RECORD):
+            # resolves issue where multiple txt_records with same name and different text
+            test_obj_filter = obj_filter
+            try:
+                text_obj = check_type_dict(obj_filter['text'])
+                txt = text_obj['old_text']
+            except TypeError:
+                txt = obj_filter['text']
+            test_obj_filter['text'] = txt
+            ib_obj = self.get_object(ib_obj_type, test_obj_filter.copy(), return_fields=list(ib_spec.keys()))
+        elif (ib_obj_type == NIOS_ZONE):
+            # del key 'restart_if_needed' as nios_zone get_object fails with the key present
+            temp = ib_spec['restart_if_needed']
+            del ib_spec['restart_if_needed']
+            ib_obj = self.get_object(ib_obj_type, obj_filter.copy(), return_fields=list(ib_spec.keys()))
+            # reinstate restart_if_needed if ib_obj is none, meaning there's no existing nios_zone ref
+            if not ib_obj:
+                ib_spec['restart_if_needed'] = temp
+        elif (ib_obj_type == NIOS_MEMBER):
+            # del key 'create_token' as nios_member get_object fails with the key present
+            temp = ib_spec['create_token']
+            del ib_spec['create_token']
+            ib_obj = self.get_object(ib_obj_type, obj_filter.copy(), return_fields=list(ib_spec.keys()))
+            if temp:
+                # reinstate 'create_token' key
+                ib_spec['create_token'] = temp
+        else:
+            ib_obj = self.get_object(ib_obj_type, obj_filter.copy(), return_fields=list(ib_spec.keys()))
+        return ib_obj, update, new_name
+
+    def on_update(self, proposed_object, ib_spec):
+        ''' Event called before the update is sent to the API endpoing
+        This method will allow the final proposed object to be changed
+        and/or keys filtered before it is sent to the API endpoint to
+        be processed.
+        :args proposed_object: A dict item that will be encoded and sent
+            the API endpoint with the updated data structure
+        :returns: updated object to be sent to API endpoint
+        '''
+        keys = set()
+        for key, value in iteritems(proposed_object):
+            update = ib_spec[key].get('update', True)
+            if not update:
+                keys.add(key)
+        return dict([(k, v) for k, v in iteritems(proposed_object) if k not in keys])

plugins/module_utils/online.py

@@ -101,7 +101,7 @@ class Online(object):
 
     @staticmethod
     def get_user_agent_string(module):
-        return "ansible %s Python %s" % (module.ansible_version, sys.version.split(' ', 1)[0])
+        return "ansible %s Python %s" % (module.ansible_version, sys.version.split(' ')[0])
 
     def get(self, path, data=None, headers=None):
         return self.send('GET', path, data, headers)

plugins/module_utils/proxmox.py

@@ -54,17 +54,6 @@ def proxmox_to_ansible_bool(value):
     return True if value == 1 else False
 
 
-def ansible_to_proxmox_bool(value):
-    '''Convert Ansible representation of a boolean to be proxmox-friendly'''
-    if value is None:
-        return None
-
-    if not isinstance(value, bool):
-        raise ValueError("%s must be of type bool not %s" % (value, type(value)))
-
-    return 1 if value else 0
-
-
 class ProxmoxAnsible(object):
     """Base class for Proxmox modules"""
     def __init__(self, module):

plugins/module_utils/redfish_utils.py

@@ -29,7 +29,7 @@ FAIL_MSG = 'Issuing a data modification command without specifying the '\
 class RedfishUtils(object):
 
     def __init__(self, creds, root_uri, timeout, module, resource_id=None,
-                 data_modification=False, strip_etag_quotes=False):
+                 data_modification=False):
         self.root_uri = root_uri
         self.creds = creds
         self.timeout = timeout
@@ -37,7 +37,6 @@ class RedfishUtils(object):
         self.service_root = '/redfish/v1/'
         self.resource_id = resource_id
         self.data_modification = data_modification
-        self.strip_etag_quotes = strip_etag_quotes
         self._init_session()
 
     def _auth_params(self, headers):
@@ -122,8 +121,6 @@ class RedfishUtils(object):
             if not etag:
                 etag = r['data'].get('@odata.etag')
             if etag:
-                if self.strip_etag_quotes:
-                    etag = etag.strip('"')
                 req_headers['If-Match'] = etag
         username, password, basic_auth = self._auth_params(req_headers)
         try:
@@ -979,8 +976,6 @@ class RedfishUtils(object):
             payload['Password'] = user.get('account_password')
         if user.get('account_roleid'):
             payload['RoleId'] = user.get('account_roleid')
-        if user.get('account_id'):
-            payload['Id'] = user.get('account_id')
 
         response = self.post_request(self.root_uri + self.accounts_uri, payload)
         if not response['ret']:
@@ -1605,6 +1600,9 @@ class RedfishUtils(object):
         cur_boot_next = boot.get('BootNext')
         cur_override_mode = boot.get('BootSourceOverrideMode')
 
+        if not boot_override_mode:
+            boot_override_mode = cur_override_mode
+
         if override_enabled == 'Disabled':
             payload = {
                 'Boot': {
@@ -1640,18 +1638,16 @@ class RedfishUtils(object):
                 }
             }
         else:
-            if (cur_enabled == override_enabled and target == bootdevice and
-                    (cur_override_mode == boot_override_mode or not boot_override_mode)):
+            if cur_enabled == override_enabled and target == bootdevice and cur_override_mode == boot_override_mode:
                 # If properties are already set, no changes needed
                 return {'ret': True, 'changed': False}
             payload = {
                 'Boot': {
                     'BootSourceOverrideEnabled': override_enabled,
+                    'BootSourceOverrideMode': boot_override_mode,
                     'BootSourceOverrideTarget': bootdevice
                 }
             }
-            if boot_override_mode:
-                payload['Boot']['BootSourceOverrideMode'] = boot_override_mode
 
         response = self.patch_request(self.root_uri + self.systems_uri, payload)
         if response['ret'] is False:
@@ -1834,16 +1830,12 @@ class RedfishUtils(object):
                 result['ret'] = True
                 data = response['data']
 
-                # Checking if fans are present
-                if u'Fans' in data:
-                    for device in data[u'Fans']:
-                        fan = {}
-                        for property in properties:
-                            if property in device:
-                                fan[property] = device[property]
-                        fan_results.append(fan)
-                else:
-                    return {'ret': False, 'msg': "No Fans present"}
+                for device in data[u'Fans']:
+                    fan = {}
+                    for property in properties:
+                        if property in device:
+                            fan[property] = device[property]
+                    fan_results.append(fan)
         result["entries"] = fan_results
         return result
 
@@ -1895,7 +1887,7 @@ class RedfishUtils(object):
                       'LowerThresholdCritical', 'LowerThresholdFatal',
                       'LowerThresholdNonCritical', 'MaxReadingRangeTemp',
                       'MinReadingRangeTemp', 'ReadingCelsius', 'RelatedItem',
-                      'SensorNumber', 'Status']
+                      'SensorNumber']
 
         # Go through list
         for chassis_uri in self.chassis_uris:
@@ -2033,28 +2025,15 @@ class RedfishUtils(object):
     def get_multi_memory_inventory(self):
         return self.aggregate_systems(self.get_memory_inventory)
 
-    def get_nic(self, resource_uri):
-        result = {}
-        properties = ['Name', 'Id', 'Description', 'FQDN', 'IPv4Addresses', 'IPv6Addresses',
-                      'NameServers', 'MACAddress', 'PermanentMACAddress',
-                      'SpeedMbps', 'MTUSize', 'AutoNeg', 'Status']
-        response = self.get_request(self.root_uri + resource_uri)
-        if response['ret'] is False:
-            return response
-        result['ret'] = True
-        data = response['data']
-        nic = {}
-        for property in properties:
-            if property in data:
-                nic[property] = data[property]
-        result['entries'] = nic
-        return(result)
-
     def get_nic_inventory(self, resource_uri):
         result = {}
         nic_list = []
         nic_results = []
         key = "EthernetInterfaces"
+        # Get these entries, but does not fail if not found
+        properties = ['Name', 'Id', 'Description', 'FQDN', 'IPv4Addresses', 'IPv6Addresses',
+                      'NameServers', 'MACAddress', 'PermanentMACAddress',
+                      'SpeedMbps', 'MTUSize', 'AutoNeg', 'Status']
 
         response = self.get_request(self.root_uri + resource_uri)
         if response['ret'] is False:
@@ -2078,9 +2057,18 @@ class RedfishUtils(object):
             nic_list.append(nic[u'@odata.id'])
 
         for n in nic_list:
-            nic = self.get_nic(n)
-            if nic['ret']:
-                nic_results.append(nic['entries'])
+            nic = {}
+            uri = self.root_uri + n
+            response = self.get_request(uri)
+            if response['ret'] is False:
+                return response
+            data = response['data']
+
+            for property in properties:
+                if property in data:
+                    nic[property] = data[property]
+
+            nic_results.append(nic)
         result["entries"] = nic_results
         return result
 
@@ -2705,14 +2693,39 @@ class RedfishUtils(object):
         return self.aggregate_managers(self.get_manager_health_report)
 
     def set_manager_nic(self, nic_addr, nic_config):
-        # Get the manager ethernet interface uri
-        nic_info = self.get_manager_ethernet_uri(nic_addr)
+        # Get EthernetInterface collection
+        response = self.get_request(self.root_uri + self.manager_uri)
+        if response['ret'] is False:
+            return response
+        data = response['data']
+        if 'EthernetInterfaces' not in data:
+            return {'ret': False, 'msg': "EthernetInterfaces resource not found"}
+        ethernetinterfaces_uri = data["EthernetInterfaces"]["@odata.id"]
+        response = self.get_request(self.root_uri + ethernetinterfaces_uri)
+        if response['ret'] is False:
+            return response
+        data = response['data']
+        uris = [a.get('@odata.id') for a in data.get('Members', []) if
+                a.get('@odata.id')]
 
-        if nic_info.get('nic_addr') is None:
-            return nic_info
-        else:
-            target_ethernet_uri = nic_info['nic_addr']
-            target_ethernet_current_setting = nic_info['ethernet_setting']
+        # Find target EthernetInterface
+        target_ethernet_uri = None
+        target_ethernet_current_setting = None
+        if nic_addr == 'null':
+            # Find root_uri matched EthernetInterface when nic_addr is not specified
+            nic_addr = (self.root_uri).split('/')[-1]
+            nic_addr = nic_addr.split(':')[0]  # split port if existing
+        for uri in uris:
+            response = self.get_request(self.root_uri + uri)
+            if response['ret'] is False:
+                return response
+            data = response['data']
+            if '"' + nic_addr.lower() + '"' in str(data).lower() or "'" + nic_addr.lower() + "'" in str(data).lower():
+                target_ethernet_uri = uri
+                target_ethernet_current_setting = data
+                break
+        if target_ethernet_uri is None:
+            return {'ret': False, 'msg': "No matched EthernetInterface found under Manager"}
 
         # Convert input to payload and check validity
         payload = {}
@@ -2744,9 +2757,7 @@ class RedfishUtils(object):
             if isinstance(set_value, dict):
                 for subprop in payload[property].keys():
                     if subprop not in target_ethernet_current_setting[property]:
-                        # Not configured already; need to apply the request
-                        need_change = True
-                        break
+                        return {'ret': False, 'msg': "Sub-property %s in nic_config is invalid" % subprop}
                     sub_set_value = payload[property][subprop]
                     sub_cur_value = target_ethernet_current_setting[property][subprop]
                     if sub_set_value != sub_cur_value:
@@ -2760,9 +2771,7 @@ class RedfishUtils(object):
                 for i in range(len(set_value)):
                     for subprop in payload[property][i].keys():
                         if subprop not in target_ethernet_current_setting[property][i]:
-                            # Not configured already; need to apply the request
-                            need_change = True
-                            break
+                            return {'ret': False, 'msg': "Sub-property %s in nic_config is invalid" % subprop}
                         sub_set_value = payload[property][i][subprop]
                         sub_cur_value = target_ethernet_current_setting[property][i][subprop]
                         if sub_set_value != sub_cur_value:
@@ -2775,208 +2784,3 @@ class RedfishUtils(object):
         if response['ret'] is False:
             return response
         return {'ret': True, 'changed': True, 'msg': "Modified Manager NIC"}
-
-    # A helper function to get the EthernetInterface URI
-    def get_manager_ethernet_uri(self, nic_addr='null'):
-        # Get EthernetInterface collection
-        response = self.get_request(self.root_uri + self.manager_uri)
-        if not response['ret']:
-            return response
-        data = response['data']
-        if 'EthernetInterfaces' not in data:
-            return {'ret': False, 'msg': "EthernetInterfaces resource not found"}
-        ethernetinterfaces_uri = data["EthernetInterfaces"]["@odata.id"]
-        response = self.get_request(self.root_uri + ethernetinterfaces_uri)
-        if not response['ret']:
-            return response
-        data = response['data']
-        uris = [a.get('@odata.id') for a in data.get('Members', []) if
-                a.get('@odata.id')]
-
-        # Find target EthernetInterface
-        target_ethernet_uri = None
-        target_ethernet_current_setting = None
-        if nic_addr == 'null':
-            # Find root_uri matched EthernetInterface when nic_addr is not specified
-            nic_addr = (self.root_uri).split('/')[-1]
-            nic_addr = nic_addr.split(':')[0]  # split port if existing
-        for uri in uris:
-            response = self.get_request(self.root_uri + uri)
-            if not response['ret']:
-                return response
-            data = response['data']
-            data_string = json.dumps(data)
-            if nic_addr.lower() in data_string.lower():
-                target_ethernet_uri = uri
-                target_ethernet_current_setting = data
-                break
-
-        nic_info = {}
-        nic_info['nic_addr'] = target_ethernet_uri
-        nic_info['ethernet_setting'] = target_ethernet_current_setting
-
-        if target_ethernet_uri is None:
-            return {}
-        else:
-            return nic_info
-
-    def set_hostinterface_attributes(self, hostinterface_config, hostinterface_id=None):
-        response = self.get_request(self.root_uri + self.manager_uri)
-        if response['ret'] is False:
-            return response
-        data = response['data']
-        if 'HostInterfaces' not in data:
-            return {'ret': False, 'msg': "HostInterfaces resource not found"}
-
-        hostinterfaces_uri = data["HostInterfaces"]["@odata.id"]
-        response = self.get_request(self.root_uri + hostinterfaces_uri)
-        if response['ret'] is False:
-            return response
-        data = response['data']
-        uris = [a.get('@odata.id') for a in data.get('Members', []) if a.get('@odata.id')]
-        # Capture list of URIs that match a specified HostInterface resource ID
-        if hostinterface_id:
-            matching_hostinterface_uris = [uri for uri in uris if hostinterface_id in uri.split('/')[-1]]
-
-        if hostinterface_id and matching_hostinterface_uris:
-            hostinterface_uri = list.pop(matching_hostinterface_uris)
-        elif hostinterface_id and not matching_hostinterface_uris:
-            return {'ret': False, 'msg': "HostInterface ID %s not present." % hostinterface_id}
-        elif len(uris) == 1:
-            hostinterface_uri = list.pop(uris)
-        else:
-            return {'ret': False, 'msg': "HostInterface ID not defined and multiple interfaces detected."}
-
-        response = self.get_request(self.root_uri + hostinterface_uri)
-        if response['ret'] is False:
-            return response
-        current_hostinterface_config = response['data']
-        payload = {}
-        for property in hostinterface_config.keys():
-            value = hostinterface_config[property]
-            if property not in current_hostinterface_config:
-                return {'ret': False, 'msg': "Property %s in hostinterface_config is invalid" % property}
-            if isinstance(value, dict):
-                if isinstance(current_hostinterface_config[property], dict):
-                    payload[property] = value
-                elif isinstance(current_hostinterface_config[property], list):
-                    payload[property] = list()
-                    payload[property].append(value)
-                else:
-                    return {'ret': False, 'msg': "Value of property %s in hostinterface_config is invalid" % property}
-            else:
-                payload[property] = value
-
-        need_change = False
-        for property in payload.keys():
-            set_value = payload[property]
-            cur_value = current_hostinterface_config[property]
-            if not isinstance(set_value, dict) and not isinstance(set_value, list):
-                if set_value != cur_value:
-                    need_change = True
-            if isinstance(set_value, dict):
-                for subprop in payload[property].keys():
-                    if subprop not in current_hostinterface_config[property]:
-                        need_change = True
-                        break
-                    sub_set_value = payload[property][subprop]
-                    sub_cur_value = current_hostinterface_config[property][subprop]
-                    if sub_set_value != sub_cur_value:
-                        need_change = True
-            if isinstance(set_value, list):
-                if len(set_value) != len(cur_value):
-                    need_change = True
-                    continue
-                for i in range(len(set_value)):
-                    for subprop in payload[property][i].keys():
-                        if subprop not in current_hostinterface_config[property][i]:
-                            need_change = True
-                            break
-                        sub_set_value = payload[property][i][subprop]
-                        sub_cur_value = current_hostinterface_config[property][i][subprop]
-                        if sub_set_value != sub_cur_value:
-                            need_change = True
-        if not need_change:
-            return {'ret': True, 'changed': False, 'msg': "Host Interface already configured"}
-
-        response = self.patch_request(self.root_uri + hostinterface_uri, payload)
-        if response['ret'] is False:
-            return response
-        return {'ret': True, 'changed': True, 'msg': "Modified Host Interface"}
-
-    def get_hostinterfaces(self):
-        result = {}
-        hostinterface_results = []
-        properties = ['Id', 'Name', 'Description', 'HostInterfaceType', 'Status',
-                      'InterfaceEnabled', 'ExternallyAccessible', 'AuthenticationModes',
-                      'AuthNoneRoleId', 'CredentialBootstrapping']
-        manager_uri_list = self.manager_uris
-        for manager_uri in manager_uri_list:
-            response = self.get_request(self.root_uri + manager_uri)
-            if response['ret'] is False:
-                return response
-
-            result['ret'] = True
-            data = response['data']
-
-            if 'HostInterfaces' in data:
-                hostinterfaces_uri = data[u'HostInterfaces'][u'@odata.id']
-            else:
-                continue
-
-            response = self.get_request(self.root_uri + hostinterfaces_uri)
-            data = response['data']
-
-            if 'Members' in data:
-                for hostinterface in data['Members']:
-                    hostinterface_uri = hostinterface['@odata.id']
-                    hostinterface_response = self.get_request(self.root_uri + hostinterface_uri)
-                    # dictionary for capturing individual HostInterface properties
-                    hostinterface_data_temp = {}
-                    if hostinterface_response['ret'] is False:
-                        return hostinterface_response
-                    hostinterface_data = hostinterface_response['data']
-                    for property in properties:
-                        if property in hostinterface_data:
-                            if hostinterface_data[property] is not None:
-                                hostinterface_data_temp[property] = hostinterface_data[property]
-                    # Check for the presence of a ManagerEthernetInterface
-                    # object, a link to a _single_ EthernetInterface that the
-                    # BMC uses to communicate with the host.
-                    if 'ManagerEthernetInterface' in hostinterface_data:
-                        interface_uri = hostinterface_data['ManagerEthernetInterface']['@odata.id']
-                        interface_response = self.get_nic(interface_uri)
-                        if interface_response['ret'] is False:
-                            return interface_response
-                        hostinterface_data_temp['ManagerEthernetInterface'] = interface_response['entries']
-
-                    # Check for the presence of a HostEthernetInterfaces
-                    # object, a link to a _collection_ of EthernetInterfaces
-                    # that the host uses to communicate with the BMC.
-                    if 'HostEthernetInterfaces' in hostinterface_data:
-                        interfaces_uri = hostinterface_data['HostEthernetInterfaces']['@odata.id']
-                        interfaces_response = self.get_request(self.root_uri + interfaces_uri)
-                        if interfaces_response['ret'] is False:
-                            return interfaces_response
-                        interfaces_data = interfaces_response['data']
-                        if 'Members' in interfaces_data:
-                            for interface in interfaces_data['Members']:
-                                interface_uri = interface['@odata.id']
-                                interface_response = self.get_nic(interface_uri)
-                                if interface_response['ret'] is False:
-                                    return interface_response
-                                # Check if this is the first
-                                # HostEthernetInterfaces item and create empty
-                                # list if so.
-                                if 'HostEthernetInterfaces' not in hostinterface_data_temp:
-                                    hostinterface_data_temp['HostEthernetInterfaces'] = []
-
-                                hostinterface_data_temp['HostEthernetInterfaces'].append(interface_response['entries'])
-
-                    hostinterface_results.append(hostinterface_data_temp)
-            else:
-                continue
-        result["entries"] = hostinterface_results
-        if not result["entries"]:
-            return {'ret': False, 'msg': "No HostInterface objects found"}
-        return result

plugins/module_utils/redis.py

@@ -1,93 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Copyright: (c) 2021, Andreas Botzner <andreas at botzner dot com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-
-from ansible.module_utils.basic import missing_required_lib
-__metaclass__ = type
-
-import traceback
-
-REDIS_IMP_ERR = None
-try:
-    from redis import Redis
-    from redis import __version__ as redis_version
-    HAS_REDIS_PACKAGE = True
-except ImportError:
-    REDIS_IMP_ERR = traceback.format_exc()
-    HAS_REDIS_PACKAGE = False
-
-try:
-    import certifi
-    HAS_CERTIFI_PACKAGE = True
-except ImportError:
-    CERTIFI_IMPORT_ERROR = traceback.format_exc()
-    HAS_CERTIFI_PACKAGE = False
-
-
-def fail_imports(module):
-    errors = []
-    traceback = []
-    if not HAS_REDIS_PACKAGE:
-        errors.append(missing_required_lib('redis'))
-        traceback.append(REDIS_IMP_ERR)
-    if not HAS_CERTIFI_PACKAGE:
-        errors.append(missing_required_lib('certifi'))
-        traceback.append(CERTIFI_IMPORT_ERROR)
-    if errors:
-        module.fail_json(errors=errors, traceback='\n'.join(traceback))
-
-
-def redis_auth_argument_spec():
-    return dict(
-        login_host=dict(type='str',
-                        default='localhost',),
-        login_user=dict(type='str'),
-        login_password=dict(type='str',
-                            no_log=True
-                            ),
-        login_port=dict(type='int', default=6379),
-        tls=dict(type='bool',
-                 default=True),
-        validate_certs=dict(type='bool',
-                            default=True
-                            ),
-        ca_certs=dict(type='str')
-    )
-
-
-class RedisAnsible(object):
-    '''Base class for Redis module'''
-
-    def __init__(self, module):
-        self.module = module
-        self.connection = self._connect()
-
-    def _connect(self):
-        login_host = self.module.params['login_host']
-        login_user = self.module.params['login_user']
-        login_password = self.module.params['login_password']
-        login_port = self.module.params['login_port']
-        tls = self.module.params['tls']
-        validate_certs = 'required' if self.module.params['validate_certs'] else None
-        ca_certs = self.module.params['ca_certs']
-        if tls and ca_certs is None:
-            ca_certs = str(certifi.where())
-        if tuple(map(int, redis_version.split('.'))) < (3, 4, 0) and login_user is not None:
-            self.module.fail_json(
-                msg='The option `username` in only supported with redis >= 3.4.0.')
-        params = {'host': login_host,
-                  'port': login_port,
-                  'password': login_password,
-                  'ssl_ca_certs': ca_certs,
-                  'ssl_cert_reqs': validate_certs,
-                  'ssl': tls}
-        if login_user is not None:
-            params['username'] = login_user
-        try:
-            return Redis(**params)
-        except Exception as e:
-            self.module.fail_json(msg='{0}'.format(str(e)))
-        return None

plugins/module_utils/rundeck.py

@@ -1,94 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Phillipe Smith <phsmithcc@gmail.com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-import json
-
-from ansible.module_utils.urls import fetch_url, url_argument_spec
-from ansible.module_utils.common.text.converters import to_native
-
-
-def api_argument_spec():
-    '''
-    Creates an argument spec that can be used with any module
-    that will be requesting content via Rundeck API
-    '''
-    api_argument_spec = url_argument_spec()
-    api_argument_spec.update(dict(
-        url=dict(required=True, type="str"),
-        api_version=dict(type="int", default=39),
-        api_token=dict(required=True, type="str", no_log=True)
-    ))
-
-    return api_argument_spec
-
-
-def api_request(module, endpoint, data=None, method="GET"):
-    """Manages Rundeck API requests via HTTP(S)
-
-    :arg module:   The AnsibleModule (used to get url, api_version, api_token, etc).
-    :arg endpoint: The API endpoint to be used.
-    :kwarg data:   The data to be sent (in case of POST/PUT).
-    :kwarg method: "POST", "PUT", etc.
-
-    :returns: A tuple of (**response**, **info**). Use ``response.read()`` to read the data.
-        The **info** contains the 'status' and other meta data. When a HttpError (status >= 400)
-        occurred then ``info['body']`` contains the error response data::
-
-    Example::
-
-        data={...}
-        resp, info = fetch_url(module,
-                               "http://rundeck.example.org",
-                               data=module.jsonify(data),
-                               method="POST")
-        status_code = info["status"]
-        body = resp.read()
-        if status_code >= 400 :
-            body = info['body']
-    """
-
-    response, info = fetch_url(
-        module=module,
-        url="%s/api/%s/%s" % (
-            module.params["url"],
-            module.params["api_version"],
-            endpoint
-        ),
-        data=json.dumps(data),
-        method=method,
-        headers={
-            "Content-Type": "application/json",
-            "Accept": "application/json",
-            "X-Rundeck-Auth-Token": module.params["api_token"]
-        }
-    )
-
-    if info["status"] == 403:
-        module.fail_json(msg="Token authorization failed",
-                         execution_info=json.loads(info["body"]))
-    if info["status"] == 409:
-        module.fail_json(msg="Job executions limit reached",
-                         execution_info=json.loads(info["body"]))
-    elif info["status"] >= 500:
-        module.fail_json(msg="Rundeck API error",
-                         execution_info=json.loads(info["body"]))
-
-    try:
-        content = response.read()
-        json_response = json.loads(content)
-        return json_response, info
-    except AttributeError as error:
-        module.fail_json(msg="Rundeck API request error",
-                         exception=to_native(error),
-                         execution_info=info)
-    except ValueError as error:
-        module.fail_json(
-            msg="No valid JSON response",
-            exception=to_native(error),
-            execution_info=content
-        )

plugins/module_utils/scaleway.py

@@ -142,7 +142,7 @@ class Scaleway(object):
 
     @staticmethod
     def get_user_agent_string(module):
-        return "ansible %s Python %s" % (module.ansible_version, sys.version.split(' ', 1)[0])
+        return "ansible %s Python %s" % (module.ansible_version, sys.version.split(' ')[0])
 
     def get(self, path, data=None, headers=None, params=None):
         return self.send(method='GET', path=path, data=data, headers=headers, params=params)

plugins/module_utils/source_control/bitbucket.py

@@ -15,6 +15,13 @@ from ansible.module_utils.urls import fetch_url, basic_auth_header
 class BitbucketHelper:
     BITBUCKET_API_URL = 'https://api.bitbucket.org'
 
+    error_messages = {
+        'required_client_id': '`client_id` must be specified as a parameter or '
+                              'BITBUCKET_CLIENT_ID environment variable',
+        'required_client_secret': '`client_secret` must be specified as a parameter or '
+                                  'BITBUCKET_CLIENT_SECRET environment variable',
+    }
+
     def __init__(self, module):
         self.module = module
         self.access_token = None
@@ -22,40 +29,35 @@ class BitbucketHelper:
     @staticmethod
     def bitbucket_argument_spec():
         return dict(
-            client_id=dict(type='str', fallback=(env_fallback, ['BITBUCKET_CLIENT_ID'])),
+            client_id=dict(type='str', no_log=True, fallback=(env_fallback, ['BITBUCKET_CLIENT_ID'])),
             client_secret=dict(type='str', no_log=True, fallback=(env_fallback, ['BITBUCKET_CLIENT_SECRET'])),
-            # TODO:
-            # - Rename user to username once current usage of username is removed
-            # - Alias user to username and deprecate it
-            user=dict(type='str', fallback=(env_fallback, ['BITBUCKET_USERNAME'])),
-            password=dict(type='str', no_log=True, fallback=(env_fallback, ['BITBUCKET_PASSWORD'])),
         )
 
-    @staticmethod
-    def bitbucket_required_one_of():
-        return [['client_id', 'client_secret', 'user', 'password']]
+    def check_arguments(self):
+        if self.module.params['client_id'] is None:
+            self.module.fail_json(msg=self.error_messages['required_client_id'])
 
-    @staticmethod
-    def bitbucket_required_together():
-        return [['client_id', 'client_secret'], ['user', 'password']]
+        if self.module.params['client_secret'] is None:
+            self.module.fail_json(msg=self.error_messages['required_client_secret'])
 
     def fetch_access_token(self):
-        if self.module.params['client_id'] and self.module.params['client_secret']:
-            headers = {
-                'Authorization': basic_auth_header(self.module.params['client_id'], self.module.params['client_secret']),
-            }
+        self.check_arguments()
 
-            info, content = self.request(
-                api_url='https://bitbucket.org/site/oauth2/access_token',
-                method='POST',
-                data='grant_type=client_credentials',
-                headers=headers,
-            )
+        headers = {
+            'Authorization': basic_auth_header(self.module.params['client_id'], self.module.params['client_secret'])
+        }
 
-            if info['status'] == 200:
-                self.access_token = content['access_token']
-            else:
-                self.module.fail_json(msg='Failed to retrieve access token: {0}'.format(info))
+        info, content = self.request(
+            api_url='https://bitbucket.org/site/oauth2/access_token',
+            method='POST',
+            data='grant_type=client_credentials',
+            headers=headers,
+        )
+
+        if info['status'] == 200:
+            self.access_token = content['access_token']
+        else:
+            self.module.fail_json(msg='Failed to retrieve access token: {0}'.format(info))
 
     def request(self, api_url, method, data=None, headers=None):
         headers = headers or {}
@@ -64,10 +66,6 @@ class BitbucketHelper:
             headers.update({
                 'Authorization': 'Bearer {0}'.format(self.access_token),
             })
-        elif self.module.params['user'] and self.module.params['password']:
-            headers.update({
-                'Authorization': basic_auth_header(self.module.params['user'], self.module.params['password']),
-            })
 
         if isinstance(data, dict):
             data = self.module.jsonify(data)

plugins/modules/cloud/lxc/lxc_container.py

@@ -422,7 +422,6 @@ import shutil
 import subprocess
 import tempfile
 import time
-import shlex
 
 try:
     import lxc
@@ -662,8 +661,9 @@ class LxcContainerManagement(object):
         """
 
         for key, value in variables_dict.items():
-            build_command.append(str(key))
-            build_command.append(str(value))
+            build_command.append(
+                '%s %s' % (key, value)
+            )
         return build_command
 
     def _get_vars(self, variables):
@@ -686,6 +686,24 @@ class LxcContainerManagement(object):
                 return_dict[v] = _var
         return return_dict
 
+    def _run_command(self, build_command, unsafe_shell=False):
+        """Return information from running an Ansible Command.
+
+        This will squash the build command list into a string and then
+        execute the command via Ansible. The output is returned to the method.
+        This output is returned as `return_code`, `stdout`, `stderr`.
+
+        :param build_command: Used for the command and all options.
+        :type build_command: ``list``
+        :param unsafe_shell: Enable or Disable unsafe sell commands.
+        :type unsafe_shell: ``bol``
+        """
+
+        return self.module.run_command(
+            ' '.join(build_command),
+            use_unsafe_shell=unsafe_shell
+        )
+
     def _config(self):
         """Configure an LXC container.
 
@@ -792,7 +810,7 @@ class LxcContainerManagement(object):
         elif self.module.params.get('backing_store') == 'overlayfs':
             build_command.append('--snapshot')
 
-        rc, return_data, err = self.module.run_command(build_command)
+        rc, return_data, err = self._run_command(build_command)
         if rc != 0:
             message = "Failed executing %s." % os.path.basename(clone_cmd)
             self.failure(
@@ -825,7 +843,7 @@ class LxcContainerManagement(object):
 
         build_command = [
             self.module.get_bin_path('lxc-create', True),
-            '--name', self.container_name,
+            '--name %s' % self.container_name,
             '--quiet'
         ]
 
@@ -851,12 +869,10 @@ class LxcContainerManagement(object):
                 log_path = os.getenv('HOME')
 
             build_command.extend([
-                '--logfile',
-                os.path.join(
+                '--logfile %s' % os.path.join(
                     log_path, 'lxc-%s.log' % self.container_name
                 ),
-                '--logpriority',
-                self.module.params.get(
+                '--logpriority %s' % self.module.params.get(
                     'container_log_level'
                 ).upper()
             ])
@@ -864,10 +880,9 @@ class LxcContainerManagement(object):
         # Add the template commands to the end of the command if there are any
         template_options = self.module.params.get('template_options', None)
         if template_options:
-            build_command.append('--')
-            build_command += shlex.split(template_options)
+            build_command.append('-- %s' % template_options)
 
-        rc, return_data, err = self.module.run_command(build_command)
+        rc, return_data, err = self._run_command(build_command)
         if rc != 0:
             message = "Failed executing lxc-create."
             self.failure(
@@ -1171,7 +1186,7 @@ class LxcContainerManagement(object):
             self.module.get_bin_path('lxc-config', True),
             "lxc.bdev.lvm.vg"
         ]
-        rc, vg, err = self.module.run_command(build_command)
+        rc, vg, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1189,7 +1204,7 @@ class LxcContainerManagement(object):
         build_command = [
             self.module.get_bin_path('lvs', True)
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1216,7 +1231,7 @@ class LxcContainerManagement(object):
             '--units',
             'g'
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1247,7 +1262,7 @@ class LxcContainerManagement(object):
             '--units',
             'g'
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1296,7 +1311,7 @@ class LxcContainerManagement(object):
             os.path.join(vg, source_lv),
             "-L%sg" % snapshot_size_gb
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1321,7 +1336,7 @@ class LxcContainerManagement(object):
             "/dev/%s/%s" % (vg, lv_name),
             mount_point,
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1365,8 +1380,9 @@ class LxcContainerManagement(object):
             '.'
         ]
 
-        rc, stdout, err = self.module.run_command(
-            build_command
+        rc, stdout, err = self._run_command(
+            build_command=build_command,
+            unsafe_shell=True
         )
 
         os.umask(old_umask)
@@ -1394,7 +1410,7 @@ class LxcContainerManagement(object):
             "-f",
             "%s/%s" % (vg, lv_name),
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1426,10 +1442,11 @@ class LxcContainerManagement(object):
                 self.module.get_bin_path('rsync', True),
                 '-aHAX',
                 fs_path,
-                temp_dir,
+                temp_dir
             ]
-            rc, stdout, err = self.module.run_command(
+            rc, stdout, err = self._run_command(
                 build_command,
+                unsafe_shell=True
             )
             if rc != 0:
                 self.failure(
@@ -1450,7 +1467,7 @@ class LxcContainerManagement(object):
             self.module.get_bin_path('umount', True),
             mount_point,
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,
@@ -1472,12 +1489,12 @@ class LxcContainerManagement(object):
 
         build_command = [
             self.module.get_bin_path('mount', True),
-            '-t', 'overlayfs',
-            '-o', 'lowerdir=%s,upperdir=%s' % (lowerdir, upperdir),
+            '-t overlayfs',
+            '-o lowerdir=%s,upperdir=%s' % (lowerdir, upperdir),
             'overlayfs',
             mount_point,
         ]
-        rc, stdout, err = self.module.run_command(build_command)
+        rc, stdout, err = self._run_command(build_command)
         if rc != 0:
             self.failure(
                 err=err,

plugins/modules/cloud/lxd/lxd_container.py

@@ -11,70 +11,64 @@ __metaclass__ = type
 DOCUMENTATION = '''
 ---
 module: lxd_container
-short_description: Manage LXD instances
+short_description: Manage LXD Containers
 description:
-  - Management of LXD containers and virtual machines.
+  - Management of LXD containers
 author: "Hiroaki Nakamura (@hnakamur)"
 options:
     name:
         description:
-          - Name of an instance.
+          - Name of a container.
         type: str
         required: true
     architecture:
         description:
-          - 'The architecture for the instance (for example C(x86_64) or C(i686)).
-            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1).'
+          - The architecture for the container (e.g. "x86_64" or "i686").
+            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1)
         type: str
         required: false
     config:
         description:
-          - 'The config for the instance (for example C({"limits.cpu": "2"})).
-            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1).'
-          - If the instance already exists and its "config" values in metadata
-            obtained from the LXD API U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#instances-containers-and-virtual-machines)
-            are different, this module tries to apply the configurations.
-          - The keys starting with C(volatile.) are ignored for this comparison when I(ignore_volatile_options=true).
+          - 'The config for the container (e.g. {"limits.cpu": "2"}).
+            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1)'
+          - If the container already exists and its "config" value in metadata
+            obtained from
+            GET /1.0/containers/<name>
+            U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#10containersname)
+            are different, they this module tries to apply the configurations.
+          - The key starts with 'volatile.' are ignored for this comparison.
+          - Not all config values are supported to apply the existing container.
+            Maybe you need to delete and recreate a container.
         type: dict
         required: false
-    ignore_volatile_options:
-        description:
-          - If set to C(true), options starting with C(volatile.) are ignored. As a result,
-            they are reapplied for each execution.
-          - This default behavior can be changed by setting this option to C(false).
-          - The current default value C(true) is deprecated since community.general 4.0.0,
-            and will change to C(false) in community.general 6.0.0.
-        type: bool
-        required: false
-        version_added: 3.7.0
     profiles:
         description:
-          - Profile to be used by the instance.
+          - Profile to be used by the container
         type: list
         elements: str
     devices:
         description:
-          - 'The devices for the instance
-            (for example C({ "rootfs": { "path": "/dev/kvm", "type": "unix-char" }})).
-            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1).'
+          - 'The devices for the container
+            (e.g. { "rootfs": { "path": "/dev/kvm", "type": "unix-char" }).
+            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1)'
         type: dict
         required: false
     ephemeral:
         description:
-          - Whether or not the instance is ephemeral (for example C(true) or C(false)).
-            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1).
+          - Whether or not the container is ephemeral (e.g. true or false).
+            See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1)
         required: false
         type: bool
     source:
         description:
-          - 'The source for the instance
+          - 'The source for the container
             (e.g. { "type": "image",
                     "mode": "pull",
                     "server": "https://images.linuxcontainers.org",
                     "protocol": "lxd",
                     "alias": "ubuntu/xenial/amd64" }).'
           - 'See U(https://github.com/lxc/lxd/blob/master/doc/rest-api.md#post-1) for complete API documentation.'
-          - 'Note that C(protocol) accepts two choices: C(lxd) or C(simplestreams).'
+          - 'Note that C(protocol) accepts two choices: C(lxd) or C(simplestreams)'
         required: false
         type: dict
     state:
@@ -85,49 +79,39 @@ options:
           - absent
           - frozen
         description:
-          - Define the state of an instance.
+          - Define the state of a container.
         required: false
         default: started
         type: str
     target:
         description:
-          - For cluster deployments. Will attempt to create an instance on a target node.
-            If the instance exists elsewhere in a cluster, then it will not be replaced or moved.
+          - For cluster deployments. Will attempt to create a container on a target node.
+            If container exists elsewhere in a cluster, then container will not be replaced or moved.
             The name should respond to same name of the node you see in C(lxc cluster list).
         type: str
         required: false
         version_added: 1.0.0
     timeout:
         description:
-          - A timeout for changing the state of the instance.
+          - A timeout for changing the state of the container.
           - This is also used as a timeout for waiting until IPv4 addresses
-            are set to the all network interfaces in the instance after
+            are set to the all network interfaces in the container after
             starting or restarting.
         required: false
         default: 30
         type: int
-    type:
-        description:
-          - Instance type can be either C(virtual-machine) or C(container).
-        required: false
-        default: container
-        choices:
-          - container
-          - virtual-machine
-        type: str
-        version_added: 4.1.0
     wait_for_ipv4_addresses:
         description:
           - If this is true, the C(lxd_container) waits until IPv4 addresses
-            are set to the all network interfaces in the instance after
+            are set to the all network interfaces in the container after
             starting or restarting.
         required: false
         default: false
         type: bool
     force_stop:
         description:
-          - If this is true, the C(lxd_container) forces to stop the instance
-            when it stops or restarts the instance.
+          - If this is true, the C(lxd_container) forces to stop the container
+            when it stops or restarts the container.
         required: false
         default: false
         type: bool
@@ -160,27 +144,27 @@ options:
     trust_password:
         description:
           - The client trusted password.
-          - 'You need to set this password on the LXD server before
-            running this module using the following command:
-            C(lxc config set core.trust_password <some random password>).
-            See U(https://www.stgraber.org/2016/04/18/lxd-api-direct-interaction/).'
+          - You need to set this password on the LXD server before
+            running this module using the following command.
+            lxc config set core.trust_password <some random password>
+            See U(https://www.stgraber.org/2016/04/18/lxd-api-direct-interaction/)
           - If trust_password is set, this module send a request for
             authentication before sending any requests.
         required: false
         type: str
 notes:
-  - Instances can be a container or a virtual machine, both of them must have unique name. If you attempt to create an instance
+  - Containers must have a unique name. If you attempt to create a container
     with a name that already existed in the users namespace the module will
     simply return as "unchanged".
-  - There are two ways to run commands inside a container or virtual machine, using the command
+  - There are two ways to run commands in containers, using the command
     module or using the ansible lxd connection plugin bundled in Ansible >=
-    2.1, the later requires python to be installed in the instance which can
+    2.1, the later requires python to be installed in the container which can
     be done with the command module.
-  - You can copy a file from the host to the instance
+  - You can copy a file from the host to the container
     with the Ansible M(ansible.builtin.copy) and M(ansible.builtin.template) module and the `lxd` connection plugin.
     See the example below.
-  - You can copy a file in the created instance to the localhost
-    with `command=lxc file pull instance_name/dir/filename filename`.
+  - You can copy a file in the created container to the localhost
+    with `command=lxc file pull container_name/dir/filename filename`.
     See the first example below.
 '''
 
@@ -192,7 +176,6 @@ EXAMPLES = '''
     - name: Create a started container
       community.general.lxd_container:
         name: mycontainer
-        ignore_volatile_options: true
         state: started
         source:
           type: image
@@ -226,7 +209,6 @@ EXAMPLES = '''
     - name: Create a started container
       community.general.lxd_container:
         name: mycontainer
-        ignore_volatile_options: true
         state: started
         source:
           type: image
@@ -249,7 +231,6 @@ EXAMPLES = '''
       community.general.lxd_container:
         name: mycontainer
         state: absent
-        type: container
 
 # An example for restarting a container
 - hosts: localhost
@@ -259,7 +240,6 @@ EXAMPLES = '''
       community.general.lxd_container:
         name: mycontainer
         state: restarted
-        type: container
 
 # An example for restarting a container using https to connect to the LXD server
 - hosts: localhost
@@ -299,7 +279,6 @@ EXAMPLES = '''
     - name: Create LXD container
       community.general.lxd_container:
         name: new-container-1
-        ignore_volatile_options: true
         state: started
         source:
           type: image
@@ -310,43 +289,22 @@ EXAMPLES = '''
     - name: Create container on another node
       community.general.lxd_container:
         name: new-container-2
-        ignore_volatile_options: true
         state: started
         source:
           type: image
           mode: pull
           alias: ubuntu/xenial/amd64
         target: node02
-
-# An example for creating a virtual machine
-- hosts: localhost
-  connection: local
-  tasks:
-    - name: Create container on another node
-      community.general.lxd_container:
-        name: new-vm-1
-        type: virtual-machine
-        state: started
-        ignore_volatile_options: true
-        wait_for_ipv4_addresses: true
-        profiles: ["default"]
-        source:
-          protocol: simplestreams
-          type: image
-          mode: pull
-          server: https://images.linuxcontainers.org
-          alias: debian/11
-        timeout: 600
 '''
 
 RETURN = '''
 addresses:
-  description: Mapping from the network device name to a list of IPv4 addresses in the instance.
+  description: Mapping from the network device name to a list of IPv4 addresses in the container
   returned: when state is started or restarted
   type: dict
   sample: {"eth0": ["10.155.92.191"]}
 old_state:
-  description: The old state of the instance.
+  description: The old state of the container
   returned: when state is started or restarted
   type: str
   sample: "stopped"
@@ -356,7 +314,7 @@ logs:
   type: list
   sample: "(too long to be placed here)"
 actions:
-  description: List of actions performed for the instance.
+  description: List of actions performed for the container.
   returned: success
   type: list
   sample: '["create", "start"]'
@@ -415,15 +373,6 @@ class LXDContainerManagement(object):
         self.addresses = None
         self.target = self.module.params['target']
 
-        self.type = self.module.params['type']
-
-        # LXD Rest API provides additional endpoints for creating containers and virtual-machines.
-        self.api_endpoint = None
-        if self.type == 'container':
-            self.api_endpoint = '/1.0/containers'
-        elif self.type == 'virtual-machine':
-            self.api_endpoint = '/1.0/virtual-machines'
-
         self.key_file = self.module.params.get('client_key')
         if self.key_file is None:
             self.key_file = '{0}/.config/lxc/client.key'.format(os.environ['HOME'])
@@ -459,20 +408,20 @@ class LXDContainerManagement(object):
             if param_val is not None:
                 self.config[attr] = param_val
 
-    def _get_instance_json(self):
+    def _get_container_json(self):
         return self.client.do(
-            'GET', '{0}/{1}'.format(self.api_endpoint, self.name),
+            'GET', '/1.0/containers/{0}'.format(self.name),
             ok_error_codes=[404]
         )
 
-    def _get_instance_state_json(self):
+    def _get_container_state_json(self):
         return self.client.do(
-            'GET', '{0}/{1}/state'.format(self.api_endpoint, self.name),
+            'GET', '/1.0/containers/{0}/state'.format(self.name),
             ok_error_codes=[404]
         )
 
     @staticmethod
-    def _instance_json_to_module_state(resp_json):
+    def _container_json_to_module_state(resp_json):
         if resp_json['type'] == 'error':
             return 'absent'
         return ANSIBLE_LXD_STATES[resp_json['metadata']['status']]
@@ -481,45 +430,45 @@ class LXDContainerManagement(object):
         body_json = {'action': action, 'timeout': self.timeout}
         if force_stop:
             body_json['force'] = True
-        return self.client.do('PUT', '{0}/{1}/state'.format(self.api_endpoint, self.name), body_json=body_json)
+        return self.client.do('PUT', '/1.0/containers/{0}/state'.format(self.name), body_json=body_json)
 
-    def _create_instance(self):
+    def _create_container(self):
         config = self.config.copy()
         config['name'] = self.name
         if self.target:
-            self.client.do('POST', '{0}?{1}'.format(self.api_endpoint, urlencode(dict(target=self.target))), config)
+            self.client.do('POST', '/1.0/containers?' + urlencode(dict(target=self.target)), config)
         else:
-            self.client.do('POST', self.api_endpoint, config)
+            self.client.do('POST', '/1.0/containers', config)
         self.actions.append('create')
 
-    def _start_instance(self):
+    def _start_container(self):
         self._change_state('start')
         self.actions.append('start')
 
-    def _stop_instance(self):
+    def _stop_container(self):
         self._change_state('stop', self.force_stop)
         self.actions.append('stop')
 
-    def _restart_instance(self):
+    def _restart_container(self):
         self._change_state('restart', self.force_stop)
         self.actions.append('restart')
 
-    def _delete_instance(self):
-        self.client.do('DELETE', '{0}/{1}'.format(self.api_endpoint, self.name))
+    def _delete_container(self):
+        self.client.do('DELETE', '/1.0/containers/{0}'.format(self.name))
         self.actions.append('delete')
 
-    def _freeze_instance(self):
+    def _freeze_container(self):
         self._change_state('freeze')
         self.actions.append('freeze')
 
-    def _unfreeze_instance(self):
+    def _unfreeze_container(self):
         self._change_state('unfreeze')
         self.actions.append('unfreez')
 
-    def _instance_ipv4_addresses(self, ignore_devices=None):
+    def _container_ipv4_addresses(self, ignore_devices=None):
         ignore_devices = ['lo'] if ignore_devices is None else ignore_devices
 
-        resp_json = self._get_instance_state_json()
+        resp_json = self._get_container_state_json()
         network = resp_json['metadata']['network'] or {}
         network = dict((k, v) for k, v in network.items() if k not in ignore_devices) or {}
         addresses = dict((k, [a['address'] for a in v['addresses'] if a['family'] == 'inet']) for k, v in network.items()) or {}
@@ -534,7 +483,7 @@ class LXDContainerManagement(object):
             due = datetime.datetime.now() + datetime.timedelta(seconds=self.timeout)
             while datetime.datetime.now() < due:
                 time.sleep(1)
-                addresses = self._instance_ipv4_addresses()
+                addresses = self._container_ipv4_addresses()
                 if self._has_all_ipv4_addresses(addresses):
                     self.addresses = addresses
                     return
@@ -544,80 +493,72 @@ class LXDContainerManagement(object):
 
     def _started(self):
         if self.old_state == 'absent':
-            self._create_instance()
-            self._start_instance()
+            self._create_container()
+            self._start_container()
         else:
             if self.old_state == 'frozen':
-                self._unfreeze_instance()
+                self._unfreeze_container()
             elif self.old_state == 'stopped':
-                self._start_instance()
-            if self._needs_to_apply_instance_configs():
-                self._apply_instance_configs()
+                self._start_container()
+            if self._needs_to_apply_container_configs():
+                self._apply_container_configs()
         if self.wait_for_ipv4_addresses:
             self._get_addresses()
 
     def _stopped(self):
         if self.old_state == 'absent':
-            self._create_instance()
+            self._create_container()
         else:
             if self.old_state == 'stopped':
-                if self._needs_to_apply_instance_configs():
-                    self._start_instance()
-                    self._apply_instance_configs()
-                    self._stop_instance()
+                if self._needs_to_apply_container_configs():
+                    self._start_container()
+                    self._apply_container_configs()
+                    self._stop_container()
             else:
                 if self.old_state == 'frozen':
-                    self._unfreeze_instance()
-                if self._needs_to_apply_instance_configs():
-                    self._apply_instance_configs()
-                self._stop_instance()
+                    self._unfreeze_container()
+                if self._needs_to_apply_container_configs():
+                    self._apply_container_configs()
+                self._stop_container()
 
     def _restarted(self):
         if self.old_state == 'absent':
-            self._create_instance()
-            self._start_instance()
+            self._create_container()
+            self._start_container()
         else:
             if self.old_state == 'frozen':
-                self._unfreeze_instance()
-            if self._needs_to_apply_instance_configs():
-                self._apply_instance_configs()
-            self._restart_instance()
+                self._unfreeze_container()
+            if self._needs_to_apply_container_configs():
+                self._apply_container_configs()
+            self._restart_container()
         if self.wait_for_ipv4_addresses:
             self._get_addresses()
 
     def _destroyed(self):
         if self.old_state != 'absent':
             if self.old_state == 'frozen':
-                self._unfreeze_instance()
+                self._unfreeze_container()
             if self.old_state != 'stopped':
-                self._stop_instance()
-            self._delete_instance()
+                self._stop_container()
+            self._delete_container()
 
     def _frozen(self):
         if self.old_state == 'absent':
-            self._create_instance()
-            self._start_instance()
-            self._freeze_instance()
+            self._create_container()
+            self._start_container()
+            self._freeze_container()
         else:
             if self.old_state == 'stopped':
-                self._start_instance()
-            if self._needs_to_apply_instance_configs():
-                self._apply_instance_configs()
-            self._freeze_instance()
+                self._start_container()
+            if self._needs_to_apply_container_configs():
+                self._apply_container_configs()
+            self._freeze_container()
 
-    def _needs_to_change_instance_config(self, key):
+    def _needs_to_change_container_config(self, key):
         if key not in self.config:
             return False
-        if key == 'config' and self.ignore_volatile_options:  # the old behavior is to ignore configurations by keyword "volatile"
-            old_configs = dict((k, v) for k, v in self.old_instance_json['metadata'][key].items() if not k.startswith('volatile.'))
-            for k, v in self.config['config'].items():
-                if k not in old_configs:
-                    return True
-                if old_configs[k] != v:
-                    return True
-            return False
-        elif key == 'config':  # next default behavior
-            old_configs = dict((k, v) for k, v in self.old_instance_json['metadata'][key].items())
+        if key == 'config':
+            old_configs = dict((k, v) for k, v in self.old_container_json['metadata'][key].items() if not k.startswith('volatile.'))
             for k, v in self.config['config'].items():
                 if k not in old_configs:
                     return True
@@ -625,41 +566,39 @@ class LXDContainerManagement(object):
                     return True
             return False
         else:
-            old_configs = self.old_instance_json['metadata'][key]
+            old_configs = self.old_container_json['metadata'][key]
             return self.config[key] != old_configs
 
-    def _needs_to_apply_instance_configs(self):
+    def _needs_to_apply_container_configs(self):
         return (
-            self._needs_to_change_instance_config('architecture') or
-            self._needs_to_change_instance_config('config') or
-            self._needs_to_change_instance_config('ephemeral') or
-            self._needs_to_change_instance_config('devices') or
-            self._needs_to_change_instance_config('profiles')
+            self._needs_to_change_container_config('architecture') or
+            self._needs_to_change_container_config('config') or
+            self._needs_to_change_container_config('ephemeral') or
+            self._needs_to_change_container_config('devices') or
+            self._needs_to_change_container_config('profiles')
         )
 
-    def _apply_instance_configs(self):
-        old_metadata = self.old_instance_json['metadata']
+    def _apply_container_configs(self):
+        old_metadata = self.old_container_json['metadata']
         body_json = {
             'architecture': old_metadata['architecture'],
             'config': old_metadata['config'],
             'devices': old_metadata['devices'],
             'profiles': old_metadata['profiles']
         }
-
-        if self._needs_to_change_instance_config('architecture'):
+        if self._needs_to_change_container_config('architecture'):
             body_json['architecture'] = self.config['architecture']
-        if self._needs_to_change_instance_config('config'):
+        if self._needs_to_change_container_config('config'):
             for k, v in self.config['config'].items():
                 body_json['config'][k] = v
-        if self._needs_to_change_instance_config('ephemeral'):
+        if self._needs_to_change_container_config('ephemeral'):
             body_json['ephemeral'] = self.config['ephemeral']
-        if self._needs_to_change_instance_config('devices'):
+        if self._needs_to_change_container_config('devices'):
             body_json['devices'] = self.config['devices']
-        if self._needs_to_change_instance_config('profiles'):
+        if self._needs_to_change_container_config('profiles'):
             body_json['profiles'] = self.config['profiles']
-
-        self.client.do('PUT', '{0}/{1}'.format(self.api_endpoint, self.name), body_json=body_json)
-        self.actions.append('apply_instance_configs')
+        self.client.do('PUT', '/1.0/containers/{0}'.format(self.name), body_json=body_json)
+        self.actions.append('apply_container_configs')
 
     def run(self):
         """Run the main method."""
@@ -667,10 +606,9 @@ class LXDContainerManagement(object):
         try:
             if self.trust_password is not None:
                 self.client.authenticate(self.trust_password)
-            self.ignore_volatile_options = self.module.params.get('ignore_volatile_options')
 
-            self.old_instance_json = self._get_instance_json()
-            self.old_state = self._instance_json_to_module_state(self.old_instance_json)
+            self.old_container_json = self._get_container_json()
+            self.old_state = self._container_json_to_module_state(self.old_container_json)
             action = getattr(self, LXD_ANSIBLE_STATES[self.state])
             action()
 
@@ -713,9 +651,6 @@ def main():
             config=dict(
                 type='dict',
             ),
-            ignore_volatile_options=dict(
-                type='bool',
-            ),
             devices=dict(
                 type='dict',
             ),
@@ -740,11 +675,6 @@ def main():
                 type='int',
                 default=30
             ),
-            type=dict(
-                type='str',
-                default='container',
-                choices=['container', 'virtual-machine'],
-            ),
             wait_for_ipv4_addresses=dict(
                 type='bool',
                 default=False
@@ -774,16 +704,6 @@ def main():
         supports_check_mode=False,
     )
 
-    if module.params['ignore_volatile_options'] is None:
-        module.params['ignore_volatile_options'] = True
-        module.deprecate(
-            'If the keyword "volatile" is used in a playbook in the config'
-            'section, a "changed" message will appear with every run, even without a change'
-            'to the playbook.'
-            'This will change in the future. Please test your scripts'
-            'by "ignore_volatile_options: false". To keep the old behavior, set that option explicitly to "true"',
-            version='6.0.0', collection_name='community.general')
-
     lxd_manage = LXDContainerManagement(module=module)
     lxd_manage.run()
 

plugins/modules/cloud/misc/proxmox.py

@@ -13,7 +13,7 @@ short_description: management of instances in Proxmox VE cluster
 description:
   - allows you to create/delete/stop instances in Proxmox VE cluster
   - Starting in Ansible 2.1, it automatically detects containerization type (lxc for PVE 4, openvz for older)
-  - Since community.general 4.0.0 on, there are no more default values, see I(proxmox_default_behavior).
+  - From community.general 4.0.0 on, there will be no default values, see I(proxmox_default_behavior).
 options:
   password:
     description:
@@ -32,35 +32,38 @@ options:
     type: str
   disk:
     description:
-      - This option was previously described as "hard disk size in GB for instance" however several formats describing
-        a lxc mount are permitted.
-      - Older versions of Proxmox will accept a numeric value for size using the I(storage) parameter to automatically
-        choose which storage to allocate from, however new versions enforce the C(<STORAGE>:<SIZE>) syntax.
-      - "Additional options are available by using some combination of the following key-value pairs as a
-        comma-delimited list C([volume=]<volume> [,acl=<1|0>] [,mountoptions=<opt[;opt...]>] [,quota=<1|0>]
-        [,replicate=<1|0>] [,ro=<1|0>] [,shared=<1|0>] [,size=<DiskSize>])."
-      - See U(https://pve.proxmox.com/wiki/Linux_Container) for a full description.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(3).
+      - hard disk size in GB for instance
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(3). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: str
   cores:
     description:
       - Specify number of cores per socket.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(1).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(1). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   cpus:
     description:
       - numbers of allocated cpus for instance
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(1).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(1). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   memory:
     description:
       - memory size in MB for instance
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(512).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(512). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   swap:
     description:
       - swap memory size in MB for instance
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(0).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(0). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   netif:
     description:
@@ -84,7 +87,9 @@ options:
   onboot:
     description:
       - specifies whether a VM will be started during system bootup
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(no).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   storage:
     description:
@@ -94,7 +99,9 @@ options:
   cpuunits:
     description:
       - CPU weight for a VM
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(1000).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(1000). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   nameserver:
     description:
@@ -154,15 +161,16 @@ options:
     version_added: '0.2.0'
   proxmox_default_behavior:
     description:
-      - As of community.general 4.0.0, various options no longer have default values.
-        These default values caused problems when users expected different behavior from Proxmox
-        by default or filled options which caused problems when set.
-      - The value C(compatibility) (default before community.general 4.0.0) will ensure that the default values
-        are used when the values are not explicitly specified by the user. The new default is C(no_defaults),
-        which makes sure these options have no defaults.
+      - Various module options used to have default values. This cause problems when
+        user expects different behavior from proxmox by default or fill options which cause
+        problems when they have been set.
+      - The default value is C(compatibility), which will ensure that the default values
+        are used when the values are not explicitly specified by the user.
+      - From community.general 4.0.0 on, the default value will switch to C(no_defaults). To avoid
+        deprecation warnings, please set I(proxmox_default_behavior) to an explicit
+        value.
       - This affects the I(disk), I(cores), I(cpus), I(memory), I(onboot), I(swap), I(cpuunits) options.
     type: str
-    default: no_defaults
     choices:
       - compatibility
       - no_defaults
@@ -359,10 +367,6 @@ except ImportError:
 from ansible.module_utils.basic import AnsibleModule, env_fallback
 from ansible.module_utils.common.text.converters import to_native
 
-from ansible_collections.community.general.plugins.module_utils.proxmox import (
-    ansible_to_proxmox_bool
-)
-
 
 VZ_TYPE = None
 
@@ -518,7 +522,7 @@ def main():
             unprivileged=dict(type='bool', default=False),
             description=dict(type='str'),
             hookscript=dict(type='str'),
-            proxmox_default_behavior=dict(type='str', default='no_defaults', choices=['compatibility', 'no_defaults']),
+            proxmox_default_behavior=dict(type='str', choices=['compatibility', 'no_defaults']),
         ),
         required_if=[('state', 'present', ['node', 'hostname', 'ostemplate'])],
         required_together=[('api_token_id', 'api_token_secret')],
@@ -547,6 +551,13 @@ def main():
         template_store = module.params['ostemplate'].split(":")[0]
     timeout = module.params['timeout']
 
+    if module.params['proxmox_default_behavior'] is None:
+        module.params['proxmox_default_behavior'] = 'compatibility'
+        module.deprecate(
+            'The proxmox_default_behavior option will change its default value from "compatibility" to '
+            '"no_defaults" in community.general 4.0.0. To remove this warning, please specify an explicit value for it now',
+            version='4.0.0', collection_name='community.general'
+        )
     if module.params['proxmox_default_behavior'] == 'compatibility':
         old_default_values = dict(
             disk="3",
@@ -609,14 +620,14 @@ def main():
                             netif=module.params['netif'],
                             mounts=module.params['mounts'],
                             ip_address=module.params['ip_address'],
-                            onboot=ansible_to_proxmox_bool(module.params['onboot']),
+                            onboot=int(module.params['onboot']),
                             cpuunits=module.params['cpuunits'],
                             nameserver=module.params['nameserver'],
                             searchdomain=module.params['searchdomain'],
-                            force=ansible_to_proxmox_bool(module.params['force']),
+                            force=int(module.params['force']),
                             pubkey=module.params['pubkey'],
                             features=",".join(module.params['features']) if module.params['features'] is not None else None,
-                            unprivileged=ansible_to_proxmox_bool(module.params['unprivileged']),
+                            unprivileged=int(module.params['unprivileged']),
                             description=module.params['description'],
                             hookscript=module.params['hookscript'])
 

plugins/modules/cloud/misc/proxmox_group_info.py

@@ -131,7 +131,7 @@ def main():
     group = module.params['group']
 
     if group:
-        groups = [proxmox.get_group(groupid=group)]
+        groups = [proxmox.get_group(group=group)]
     else:
         groups = proxmox.get_groups()
     result['proxmox_groups'] = [group.group for group in groups]

plugins/modules/cloud/misc/proxmox_kvm.py

@@ -13,13 +13,15 @@ module: proxmox_kvm
 short_description: Management of Qemu(KVM) Virtual Machines in Proxmox VE cluster.
 description:
   - Allows you to create/delete/stop Qemu(KVM) Virtual Machines in Proxmox VE cluster.
-  - Since community.general 4.0.0 on, there are no more default values, see I(proxmox_default_behavior).
+  - From community.general 4.0.0 on, there will be no default values, see I(proxmox_default_behavior).
 author: "Abdoul Bah (@helldorado) <bahabdoul at gmail.com>"
 options:
   acpi:
     description:
       - Specify if ACPI should be enabled/disabled.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(yes).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(yes). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   agent:
     description:
@@ -29,19 +31,24 @@ options:
     description:
       - Pass arbitrary arguments to kvm.
       - This option is for experts only!
-      - If I(proxmox_default_behavior) is set to C(compatiblity), this option has a default of
-        C(-serial unix:/var/run/qemu-server/<vmid>.serial,server,nowait).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(-serial unix:/var/run/qemu-server/<vmid>.serial,server,nowait).
+        Note that the default value of I(proxmox_default_behavior) changes in community.general 4.0.0.
     type: str
   autostart:
     description:
       - Specify if the VM should be automatically restarted after crash (currently ignored in PVE API).
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(no).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   balloon:
     description:
       - Specify the amount of RAM for the VM in MB.
       - Using zero disables the balloon driver.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(0).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(0). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   bios:
     description:
@@ -52,7 +59,9 @@ options:
     description:
       - Specify the boot order -> boot on floppy C(a), hard disk C(c), CD-ROM C(d), or network C(n).
       - You can combine to set order.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(cnd).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(cnd). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: str
   bootdisk:
     description:
@@ -88,12 +97,16 @@ options:
   cores:
     description:
       - Specify number of cores per socket.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(1).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(1). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   cpu:
     description:
       - Specify emulated CPU type.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(kvm64).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(kvm64). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: str
   cpulimit:
     description:
@@ -104,7 +117,9 @@ options:
     description:
       - Specify CPU weight for a VM.
       - You can disable fair-scheduler configuration by setting this to 0
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(1000).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(1000). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   delete:
     description:
@@ -124,15 +139,19 @@ options:
     description:
       - Allow to force stop VM.
       - Can be used with states C(stopped), C(restarted) and C(absent).
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(no).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   format:
     description:
       - Target drive's backing file's data format.
       - Used only with clone
       - Use I(format=unspecified) and I(full=false) for a linked clone.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(qcow2).
-        If I(proxmox_default_behavior) is set to C(no_defaults), not specifying this option is equivalent to setting it to C(unspecified).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(qcow2). If I(proxmox_default_behavior) is set to C(no_defaults),
+        not specifying this option is equivalent to setting it to C(unspecified).
+        Note that the default value of I(proxmox_default_behavior) changes in community.general 4.0.0.
     type: str
     choices: [ "cloop", "cow", "qcow", "qcow2", "qed", "raw", "vmdk", "unspecified" ]
   freeze:
@@ -197,7 +216,9 @@ options:
   kvm:
     description:
       - Enable/disable KVM hardware virtualization.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(yes).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(yes). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   localtime:
     description:
@@ -217,7 +238,9 @@ options:
   memory:
     description:
       - Memory size in MB for instance.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(512).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(512). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   migrate_downtime:
     description:
@@ -273,13 +296,17 @@ options:
   onboot:
     description:
       - Specifies whether a VM will be started during system bootup.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(yes).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(yes). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   ostype:
     description:
       - Specifies guest operating system. This is used to enable special optimization/features for specific operating systems.
       - The l26 is Linux 2.6/3.X Kernel.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(l26).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(l26). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: str
     choices: ['other', 'wxp', 'w2k', 'w2k3', 'w2k8', 'wvista', 'win7', 'win8', 'win10', 'l24', 'l26', 'solaris']
   parallel:
@@ -360,7 +387,9 @@ options:
   sockets:
     description:
       - Sets the number of CPU sockets. (1 - N).
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(1).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(1). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: int
   sshkeys:
     description:
@@ -392,7 +421,9 @@ options:
   tablet:
     description:
       - Enables/disables the USB tablet device.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(no).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   tags:
     description:
@@ -414,7 +445,9 @@ options:
   template:
     description:
       - Enables/disables the template.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(no).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(no). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: bool
   timeout:
     description:
@@ -436,7 +469,9 @@ options:
   vga:
     description:
       - Select VGA type. If you want to use high resolution modes (>= 1280x1024x16) then you should use option 'std' or 'vmware'.
-      - This option has no default unless I(proxmox_default_behavior) is set to C(compatiblity); then the default is C(std).
+      - If I(proxmox_default_behavior) is set to C(compatiblity) (the default value), this
+        option has a default of C(std). Note that the default value of I(proxmox_default_behavior)
+        changes in community.general 4.0.0.
     type: str
     choices: ['std', 'cirrus', 'vmware', 'qxl', 'serial0', 'serial1', 'serial2', 'serial3', 'qxl2', 'qxl3', 'qxl4']
   virtio:
@@ -454,17 +489,18 @@ options:
     type: str
   proxmox_default_behavior:
     description:
-     - As of community.general 4.0.0, various options no longer have default values.
-        These default values caused problems when users expected different behavior from Proxmox
-        by default or filled options which caused problems when set.
-      - The value C(compatibility) (default before community.general 4.0.0) will ensure that the default values
-        are used when the values are not explicitly specified by the user. The new default is C(no_defaults),
-        which makes sure these options have no defaults.
+      - Various module options used to have default values. This cause problems when
+        user expects different behavior from proxmox by default or fill options which cause
+        problems when they have been set.
+      - The default value is C(compatibility), which will ensure that the default values
+        are used when the values are not explicitly specified by the user.
+      - From community.general 4.0.0 on, the default value will switch to C(no_defaults). To avoid
+        deprecation warnings, please set I(proxmox_default_behavior) to an explicit
+        value.
       - This affects the I(acpi), I(autostart), I(balloon), I(boot), I(cores), I(cpu),
         I(cpuunits), I(force), I(format), I(kvm), I(memory), I(onboot), I(ostype), I(sockets),
         I(tablet), I(template), I(vga), options.
     type: str
-    default: no_defaults
     choices:
       - compatibility
       - no_defaults
@@ -1055,7 +1091,7 @@ def main():
             virtio=dict(type='dict'),
             vmid=dict(type='int'),
             watchdog=dict(),
-            proxmox_default_behavior=dict(type='str', default='no_defaults', choices=['compatibility', 'no_defaults']),
+            proxmox_default_behavior=dict(type='str', choices=['compatibility', 'no_defaults']),
         ),
         mutually_exclusive=[('delete', 'revert'), ('delete', 'update'), ('revert', 'update'), ('clone', 'update'), ('clone', 'delete'), ('clone', 'revert')],
         required_together=[('api_token_id', 'api_token_secret')],
@@ -1086,6 +1122,13 @@ def main():
     vmid = module.params['vmid']
     validate_certs = module.params['validate_certs']
 
+    if module.params['proxmox_default_behavior'] is None:
+        module.params['proxmox_default_behavior'] = 'compatibility'
+        module.deprecate(
+            'The proxmox_default_behavior option will change its default value from "compatibility" to '
+            '"no_defaults" in community.general 4.0.0. To remove this warning, please specify an explicit value for it now',
+            version='4.0.0', collection_name='community.general'
+        )
     if module.params['proxmox_default_behavior'] == 'compatibility':
         old_default_values = dict(
             acpi=True,
@@ -1158,9 +1201,8 @@ def main():
             module.fail_json(vmid=vmid, msg='VM with vmid = %s does not exist in cluster' % vmid)
 
         # Ensure the choosen VM name doesn't already exist when cloning
-        existing_vmid = get_vmid(proxmox, name)
-        if existing_vmid:
-            module.exit_json(changed=False, vmid=existing_vmid[0], msg="VM with name <%s> already exists" % name)
+        if get_vmid(proxmox, name):
+            module.exit_json(changed=False, vmid=vmid, msg="VM with name <%s> already exists" % name)
 
         # Ensure the choosen VM id doesn't already exist when cloning
         if get_vm(proxmox, newid):

plugins/modules/cloud/misc/proxmox_tasks_info.py

@@ -1,186 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# Copyright: (c) 2021, Andreas Botzner (@paginabianca) <andreas at botzner dot com>
-# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
-
-from __future__ import absolute_import, division, print_function
-__metaclass__ = type
-
-
-DOCUMENTATION = r'''
----
-module: proxmox_tasks_info
-short_description: Retrieve information about one or more Proxmox VE tasks
-version_added: 3.8.0
-description:
-  - Retrieve information about one or more Proxmox VE tasks.
-author: 'Andreas Botzner (@paginabianca) <andreas at botzner dot com>'
-options:
-  node:
-    description:
-      - Node where to get tasks.
-    required: true
-    type: str
-  task:
-    description:
-      - Return specific task.
-    aliases: ['upid', 'name']
-    type: str
-extends_documentation_fragment:
-    - community.general.proxmox.documentation
-'''
-
-
-EXAMPLES = '''
-- name: List tasks on node01
-  community.general.proxmox_task_info:
-    api_host: proxmoxhost
-    api_user: root@pam
-    api_password: '{{ password | default(omit) }}'
-    api_token_id: '{{ token_id | default(omit) }}'
-    api_token_secret: '{{ token_secret | default(omit) }}'
-    node: node01
-  register: result
-
-- name: Retrieve information about specific tasks on node01
-  community.general.proxmox_task_info:
-    api_host: proxmoxhost
-    api_user: root@pam
-    api_password: '{{ password | default(omit) }}'
-    api_token_id: '{{ token_id | default(omit) }}'
-    api_token_secret: '{{ token_secret | default(omit) }}'
-    task: 'UPID:node01:00003263:16167ACE:621EE230:srvreload:networking:root@pam:'
-    node: node01
-  register: proxmox_tasks
-'''
-
-
-RETURN = '''
-proxmox_tasks:
-    description: List of tasks.
-    returned: on success
-    type: list
-    elements: dict
-    contains:
-      id:
-        description: ID of the task.
-        returned: on success
-        type: str
-      node:
-        description: Node name.
-        returned: on success
-        type: str
-      pid:
-        description: PID of the task.
-        returned: on success
-        type: int
-      pstart:
-        description: pastart of the task.
-        returned: on success
-        type: int
-      starttime:
-        description: Starting time of the task.
-        returned: on success
-        type: int
-      type:
-        description: Type of the task.
-        returned: on success
-        type: str
-      upid:
-        description: UPID of the task.
-        returned: on success
-        type: str
-      user:
-        description: User that owns the task.
-        returned: on success
-        type: str
-      endtime:
-        description: Endtime of the task.
-        returned: on success, can be absent
-        type: int
-      status:
-        description: Status of the task.
-        returned: on success, can be absent
-        type: str
-      failed:
-        description: If the task failed.
-        returned: when status is defined
-        type: bool
-msg:
-    description: Short message.
-    returned: on failure
-    type: str
-    sample: 'Task: UPID:xyz:xyz does not exist on node: proxmoxnode'
-'''
-
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible_collections.community.general.plugins.module_utils.proxmox import (
-    proxmox_auth_argument_spec, ProxmoxAnsible, HAS_PROXMOXER, PROXMOXER_IMP_ERR)
-
-
-class ProxmoxTaskInfoAnsible(ProxmoxAnsible):
-    def get_task(self, upid, node):
-        tasks = self.get_tasks(node)
-        for task in tasks:
-            if task.info['upid'] == upid:
-                return [task]
-
-    def get_tasks(self, node):
-        tasks = self.proxmox_api.nodes(node).tasks.get()
-        return [ProxmoxTask(task) for task in tasks]
-
-
-class ProxmoxTask:
-    def __init__(self, task):
-        self.info = dict()
-        for k, v in task.items():
-            if k == 'status' and isinstance(v, str):
-                self.info[k] = v
-                if v != 'OK':
-                    self.info['failed'] = True
-            else:
-                self.info[k] = v
-
-
-def proxmox_task_info_argument_spec():
-    return dict(
-        task=dict(type='str', aliases=['upid', 'name'], required=False),
-        node=dict(type='str', required=True),
-    )
-
-
-def main():
-    module_args = proxmox_auth_argument_spec()
-    task_info_args = proxmox_task_info_argument_spec()
-    module_args.update(task_info_args)
-
-    module = AnsibleModule(
-        argument_spec=module_args,
-        required_together=[('api_token_id', 'api_token_secret'),
-                           ('api_user', 'api_password')],
-        required_one_of=[('api_password', 'api_token_id')],
-        supports_check_mode=True)
-    result = dict(changed=False)
-
-    if not HAS_PROXMOXER:
-        module.fail_json(msg=missing_required_lib(
-            'proxmoxer'), exception=PROXMOXER_IMP_ERR)
-    proxmox = ProxmoxTaskInfoAnsible(module)
-    upid = module.params['task']
-    node = module.params['node']
-    if upid:
-        tasks = proxmox.get_task(upid=upid, node=node)
-    else:
-        tasks = proxmox.get_tasks(node=node)
-    if tasks is not None:
-        result['proxmox_tasks'] = [task.info for task in tasks]
-        module.exit_json(**result)
-    else:
-        result['msg'] = 'Task: {0} does not exist on node: {1}.'.format(
-            upid, node)
-        module.fail_json(**result)
-
-
-if __name__ == '__main__':
-    main()

plugins/modules/cloud/misc/terraform.py

@@ -137,11 +137,6 @@ options:
     type: bool
     default: false
     version_added: '3.3.0'
-  parallelism:
-    description:
-      - Restrict concurrent operations when Terraform applies the plan.
-    type: int
-    version_added: '3.8.0'
 notes:
    - To just run a `terraform plan`, use check mode.
 requirements: [ "terraform" ]
@@ -319,25 +314,11 @@ def remove_workspace(bin_path, project_path, workspace):
     _workspace_cmd(bin_path, project_path, 'delete', workspace)
 
 
-def build_plan(command, project_path, variables_args, state_file, targets, state, apply_args, plan_path=None):
+def build_plan(command, project_path, variables_args, state_file, targets, state, plan_path=None):
     if plan_path is None:
         f, plan_path = tempfile.mkstemp(suffix='.tfplan')
 
-    local_command = command.copy()
-
-    plan_command = [command[0], 'plan']
-
-    if state == "planned":
-        for c in local_command[1:]:
-            plan_command.append(c)
-
-    if state == "present":
-        for a in apply_args:
-            local_command.remove(a)
-        for c in local_command[1:]:
-            plan_command.append(c)
-
-    plan_command.extend(['-input=false', '-no-color', '-detailed-exitcode', '-out', plan_path])
+    plan_command = [command[0], 'plan', '-input=false', '-no-color', '-detailed-exitcode', '-out', plan_path]
 
     for t in targets:
         plan_command.extend(['-target', t])
@@ -382,7 +363,6 @@ def main():
             init_reconfigure=dict(type='bool', default=False),
             overwrite_init=dict(type='bool', default=True),
             check_destroy=dict(type='bool', default=False),
-            parallelism=dict(type='int'),
         ),
         required_if=[('state', 'planned', ['plan_file'])],
         supports_check_mode=True,
@@ -435,9 +415,6 @@ def main():
     elif state == 'absent':
         command.extend(DESTROY_ARGS)
 
-    if state == 'present' and module.params.get('parallelism') is not None:
-        command.append('-parallelism=%d' % module.params.get('parallelism'))
-
     variables_args = []
     for k, v in variables.items():
         variables_args.extend([
@@ -475,7 +452,7 @@ def main():
             module.fail_json(msg='Could not find plan_file "{0}", check the path and try again.'.format(plan_file))
     else:
         plan_file, needs_application, out, err, command = build_plan(command, project_path, variables_args, state_file,
-                                                                     module.params.get('targets'), state, APPLY_ARGS, plan_file)
+                                                                     module.params.get('targets'), state, plan_file)
         if state == 'present' and check_destroy and '- destroy' in out:
             module.fail_json(msg="Aborting command because it would destroy some resources. "
                                  "Consider switching the 'check_destroy' to false to suppress this error")

plugins/modules/cloud/online/online_server_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the servers.
   - U(https://www.online.net/en/dedicated-server)
 author:
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 extends_documentation_fragment:
 - community.general.online
 

plugins/modules/cloud/online/online_user_info.py

@@ -12,7 +12,7 @@ short_description: Gather information about Online user.
 description:
   - Gather information about the user.
 author:
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 extends_documentation_fragment:
 - community.general.online
 '''

plugins/modules/cloud/opennebula/one_image.py

@@ -306,7 +306,7 @@ def rename_image(module, client, image, new_name):
 
     tmp_image = get_image_by_name(module, client, new_name)
     if tmp_image:
-        module.fail_json(msg="Name '" + new_name + "' is already taken by IMAGE with id=" + str(tmp_image.ID))
+        module.fail_json(msg="Name '" + new_name + "' is already taken by IMAGE with id=" + str(tmp_image.id))
 
     if not module.check_mode:
         client.image.rename(image.ID, new_name)

plugins/modules/cloud/opennebula/one_template.py

@@ -213,8 +213,8 @@ class TemplateModule(OpenNebulaModule):
     def get_template_by_id(self, template_id):
         return self.get_template(lambda template: (template.ID == template_id))
 
-    def get_template_by_name(self, name):
-        return self.get_template(lambda template: (template.NAME == name))
+    def get_template_by_name(self, template_name):
+        return self.get_template(lambda template: (template.NAME == template_name))
 
     def get_template_instance(self, requested_id, requested_name):
         if requested_id:

plugins/modules/cloud/packet/packet_device.py

@@ -509,10 +509,11 @@ def wait_for_devices_active(module, packet_conn, watched_devices):
 def wait_for_public_IPv(module, packet_conn, created_devices):
 
     def has_public_ip(addr_list, ip_v):
-        return any(a['public'] and a['address_family'] == ip_v and a['address'] for a in addr_list)
+        return any([a['public'] and a['address_family'] == ip_v and
+                    a['address'] for a in addr_list])
 
     def all_have_public_ip(ds, ip_v):
-        return all(has_public_ip(d.ip_addresses, ip_v) for d in ds)
+        return all([has_public_ip(d.ip_addresses, ip_v) for d in ds])
 
     address_family = module.params.get('wait_for_public_IPv')
 

plugins/modules/cloud/packet/packet_sshkey.py

@@ -168,7 +168,7 @@ def get_sshkey_selector(module):
             return k.key == select_dict['key']
         else:
             # if key string not specified, all the fields must match
-            return all(select_dict[f] == getattr(k, f) for f in select_dict)
+            return all([select_dict[f] == getattr(k, f) for f in select_dict])
     return selector
 
 

plugins/modules/cloud/scaleway/scaleway_compute.py

@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 ---
 module: scaleway_compute
 short_description: Scaleway compute management module
-author: Remy Leone (@remyleone)
+author: Remy Leone (@sieben)
 description:
     - "This module manages compute instances on Scaleway."
 extends_documentation_fragment:

plugins/modules/cloud/scaleway/scaleway_image_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the Scaleway images available.
 author:
   - "Yanis Guenane (@Spredzy)"
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 extends_documentation_fragment:
 - community.general.scaleway
 

plugins/modules/cloud/scaleway/scaleway_ip.py

@@ -13,7 +13,7 @@ DOCUMENTATION = '''
 ---
 module: scaleway_ip
 short_description: Scaleway IP management module
-author: Remy Leone (@remyleone)
+author: Remy Leone (@sieben)
 description:
     - This module manages IP on Scaleway account
       U(https://developer.scaleway.com)

plugins/modules/cloud/scaleway/scaleway_ip_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the Scaleway ips available.
 author:
   - "Yanis Guenane (@Spredzy)"
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 extends_documentation_fragment:
 - community.general.scaleway
 

plugins/modules/cloud/scaleway/scaleway_lb.py

@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 ---
 module: scaleway_lb
 short_description: Scaleway load-balancer management module
-author: Remy Leone (@remyleone)
+author: Remy Leone (@sieben)
 description:
     - "This module manages load-balancers on Scaleway."
 extends_documentation_fragment:

plugins/modules/cloud/scaleway/scaleway_organization_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the Scaleway organizations available.
 author:
   - "Yanis Guenane (@Spredzy)"
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 options:
   api_url:
     description:

plugins/modules/cloud/scaleway/scaleway_security_group_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the Scaleway security groups available.
 author:
   - "Yanis Guenane (@Spredzy)"
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 options:
   region:
     type: str

plugins/modules/cloud/scaleway/scaleway_security_group_rule.py

@@ -18,12 +18,11 @@ module: scaleway_security_group_rule
 short_description: Scaleway Security Group Rule management module
 author: Antoine Barbare (@abarbare)
 description:
-  - This module manages Security Group Rule on Scaleway account
-    U(https://developer.scaleway.com)
+    - This module manages Security Group Rule on Scaleway account
+      U(https://developer.scaleway.com)
 extends_documentation_fragment:
-  - community.general.scaleway
-requirements:
-  - ipaddress
+- community.general.scaleway
+
 
 options:
   state:
@@ -131,19 +130,10 @@ data:
     }
 '''
 
-import traceback
-
 from ansible_collections.community.general.plugins.module_utils.scaleway import SCALEWAY_LOCATION, scaleway_argument_spec, Scaleway, payload_from_object
+from ansible_collections.community.general.plugins.module_utils.compat.ipaddress import ip_network
 from ansible.module_utils.common.text.converters import to_text
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-
-try:
-    from ipaddress import ip_network
-except ImportError:
-    IPADDRESS_IMP_ERR = traceback.format_exc()
-    HAS_IPADDRESS = False
-else:
-    HAS_IPADDRESS = True
+from ansible.module_utils.basic import AnsibleModule
 
 
 def get_sgr_from_api(security_group_rules, security_group_rule):
@@ -266,8 +256,6 @@ def main():
         argument_spec=argument_spec,
         supports_check_mode=True,
     )
-    if not HAS_IPADDRESS:
-        module.fail_json(msg=missing_required_lib('ipaddress'), exception=IPADDRESS_IMP_ERR)
 
     core(module)
 

plugins/modules/cloud/scaleway/scaleway_server_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the Scaleway servers available.
 author:
   - "Yanis Guenane (@Spredzy)"
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 extends_documentation_fragment:
 - community.general.scaleway
 

plugins/modules/cloud/scaleway/scaleway_snapshot_info.py

@@ -15,7 +15,7 @@ description:
   - Gather information about the Scaleway snapshot available.
 author:
   - "Yanis Guenane (@Spredzy)"
-  - "Remy Leone (@remyleone)"
+  - "Remy Leone (@sieben)"
 extends_documentation_fragment:
 - community.general.scaleway
 

plugins/modules/cloud/scaleway/scaleway_sshkey.py

@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 ---
 module: scaleway_sshkey
 short_description: Scaleway SSH keys management module
-author: Remy Leone (@remyleone)
+author: Remy Leone (@sieben)
 description:
     - This module manages SSH keys on Scaleway account
       U(https://developer.scaleway.com)

plugins/modules/cloud/scaleway/scaleway_user_data.py

@@ -16,7 +16,7 @@ DOCUMENTATION = '''
 ---
 module: scaleway_user_data
 short_description: Scaleway user_data management module
-author: Remy Leone (@remyleone)
+author: Remy Leone (@sieben)
 description:
     - "This module manages user_data on compute instances on Scaleway."
     - "It can be used to configure cloud-init for instance"