Release 1.7.1 version

Change-Id: I958ba6890a54c59e0ccdb9249d959c745acfb8e9
Merge "Remove new SDK job from stable/1.0.0 CI" into stable/1.0.0
2026-03-27 05:53:02 +00:00 · 2022-03-09 20:17:52 +01:00 · 2022-03-09 17:45:08 +00:00 · 2022-03-09 17:45:07 +00:00 · 2022-03-09 18:54:28 +02:00 · 2022-03-09 14:06:29 +00:00
128 changed files with 8948 additions and 3280 deletions
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -3,25 +3,84 @@
 - job:
    name: ansible-collections-openstack-functional-devstack
    parent: openstacksdk-functional-devstack
+    branches: ^(stable/1.0.0|master).*$
+    post-run: ci/playbooks/postlog.yaml
    description: |
      Run openstack collections functional tests against a master devstack
      using master of openstacksdk with latest ansible release
    required-projects:
      - openstack/ansible-collections-openstack
      - openstack/designate
+    irrelevant-files: &ignore_files
+      - changelogs/.*
+      - galaxy.*
+      - COPYING
+      - docs/.*
+      - .*\.md
+      - .*\.rst
+      - tools/run-ansible-sanity.sh
+      - tests/sanity/.*
+      - contrib/.*
+      - .zuul.yaml
    vars:
      zuul_work_dir: src/opendev.org/openstack/ansible-collections-openstack
      tox_envlist: ansible
-      tox_install_siblings: true
+      tox_install_siblings: false
      fetch_subunit: false
      devstack_plugins:
        designate: https://opendev.org/openstack/designate
      devstack_services:
        designate: true
+        neutron-dns: true
+      zuul_copy_output:
+        '{{ devstack_log_dir }}/test_output.log': 'logs'
+      extensions_to_txt:
+        log: true
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-octavia
+    parent: ansible-collections-openstack-functional-devstack
+    branches: ^(stable/1.0.0|master).*$
+    override-checkout: master
+    description: |
+      Run openstack collections functional tests against a master devstack
+      with Octavia plugin enabled, using releases of openstacksdk and latest
+      ansible release. Run it only on Load Balancer changes.
+    pre-run: ci/playbooks/get_amphora_tarball.yaml
+    required-projects:
+      - openstack/octavia
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+    files:
+      - ^ci/roles/loadbalancer/.*$
+      - ^plugins/modules/lb_health_monitor.py
+      - ^plugins/modules/lb_listener.py
+      - ^plugins/modules/lb_member.py
+      - ^plugins/modules/lb_pool.py
+      - ^plugins/modules/loadbalancer.py
+    vars:
+      configure_swap_size: 8192
+      tox_envlist: ansible
+      devstack_plugins:
+        designate: https://opendev.org/openstack/designate
+        octavia: https://opendev.org/openstack/octavia
+      devstack_services:
+        designate: true
+        neutron-dns: true
+        octavia: true
+        o-api: true
+        o-cw: true
+        o-hk: true
+        o-hm: true
+      devstack_localrc:
+        OCTAVIA_AMP_IMAGE_FILE: "/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
+        OCTAVIA_AMP_IMAGE_SIZE: 3
+        OCTAVIA_AMP_IMAGE_NAME: "test-only-amphora-x64-haproxy-ubuntu-bionic"

 - job:
    name: ansible-collections-openstack-functional-devstack-releases
    parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
    description: |
      Run openstack collections functional tests against a master devstack
      using releases of openstacksdk and latest ansible release
@@ -33,6 +92,7 @@
 - job:
    name: ansible-collections-openstack-functional-devstack-ansible-2.9
    parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
    description: |
      Run openstack collections functional tests against a master devstack
      using master of openstacksdk and stable 2.9 branch of ansible
@@ -43,20 +103,35 @@
      tox_envlist: ansible-2.9

 - job:
-    name: ansible-collections-openstack-functional-devstack-ansible-2.10
+    name: ansible-collections-openstack-functional-devstack-ansible-2.11
    parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
    description: |
      Run openstack collections functional tests against a master devstack
-      using master of openstacksdk and stable 2.10 branch of ansible
+      using master of openstacksdk and stable 2.12 branch of ansible
    required-projects:
      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
+        override-checkout: stable-2.11
+    vars:
+      tox_envlist: ansible
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-ansible-2.12
+    parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
+    description: |
+      Run openstack collections functional tests against a master devstack
+      using master of openstacksdk and stable 2.12 branch of ansible
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
    vars:
      tox_envlist: ansible

 - job:
    name: ansible-collections-openstack-functional-devstack-ansible-devel
    parent: ansible-collections-openstack-functional-devstack
+    override-checkout: master
    description: |
      Run openstack collections functional tests against a master devstack
      using master of openstacksdk and devel branch of ansible
@@ -65,152 +140,123 @@
      - name: github.com/ansible/ansible
        override-checkout: devel
    vars:
-      tox_envlist: ansible-2.11
-
-# Pip installation job
- job:
-    name: ansible-collections-openstack-functional-devstack-ansible-pip
-    parent: ansible-collections-openstack-functional-devstack
-    description: |
-      Run openstack collections functional tests against a master devstack
-      using master of openstacksdk with latest ansible release.
-      Ansible collection is built using PIP.
-    vars:
-      tox_envlist: ansible-pip
+      tox_envlist: ansible-2.12

 # Stable branches tests
+
 - job:
-    name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.10
+    name: ansible-collections-openstack-functional-devstack-xena-ansible-2.12
+    parent: ansible-collections-openstack-functional-devstack-ansible-devel
+    description: |
+      Run openstack collections functional tests against a xena devstack
+      using xena brach of openstacksdk and stable 2.12 branch of ansible
+    voting: true
+    override-checkout: stable/xena
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+      - name: openstack/openstacksdk
+        override-checkout: stable/xena
+    vars:
+      tox_envlist: ansible
+      tox_install_siblings: true
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
+    parent: ansible-collections-openstack-functional-devstack-ansible-devel
+    description: |
+      Run openstack collections functional tests against a wallaby devstack
+      using wallaby brach of openstacksdk and stable 2.12 branch of ansible
+    voting: true
+    override-checkout: stable/wallaby
+    required-projects:
+      - name: github.com/ansible/ansible
+        override-checkout: stable-2.12
+      - name: openstack/openstacksdk
+        override-checkout: stable/wallaby
+    vars:
+      tox_envlist: ansible
+      tox_install_siblings: true
+
+- job:
+    name: ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
    parent: ansible-collections-openstack-functional-devstack-ansible-devel
    description: |
      Run openstack collections functional tests against a victoria devstack
-      using victoria brach of openstacksdk and stable 2.10 branch of ansible
+      using victoria brach of openstacksdk and stable 2.12 branch of ansible
    voting: true
    override-checkout: stable/victoria
    required-projects:
      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
+        override-checkout: stable-2.12
      - name: openstack/openstacksdk
        override-checkout: stable/victoria
    vars:
      tox_envlist: ansible
+      tox_install_siblings: true


 - job:
-    name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10
+    name: ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
    parent: ansible-collections-openstack-functional-devstack-ansible-devel
    description: |
      Run openstack collections functional tests against a ussuri devstack
-      using ussuri brach of openstacksdk and stable 2.10 branch of ansible
+      using ussuri brach of openstacksdk and stable 2.11 branch of ansible
    voting: true
    override-checkout: stable/ussuri
    required-projects:
      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
+        override-checkout: stable-2.11
      - name: openstack/openstacksdk
        override-checkout: stable/ussuri
      - name: openstack/os-client-config
        override-checkout: stable/ussuri
    vars:
      tox_envlist: ansible
+      tox_install_siblings: true

 - job:
-    name: ansible-collections-openstack-functional-devstack-train-ansible-2.10
+    name: ansible-collections-openstack-functional-devstack-train-ansible-2.11
    parent: ansible-collections-openstack-functional-devstack-ansible-devel
    description: |
      Run openstack collections functional tests against a train devstack
-      using train brach of openstacksdk and stable 2.10 branch of ansible
-    voting: false
+      using train brach of openstacksdk and stable 2.11 branch of ansible
+    voting: true
    override-checkout: stable/train
    required-projects:
      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
+        override-checkout: stable-2.11
      - name: openstack/openstacksdk
        override-checkout: stable/train
      - name: openstack/os-client-config
        override-checkout: stable/train
    vars:
      tox_envlist: ansible
+      tox_install_siblings: true

 - job:
-    name: ansible-collections-openstack-functional-devstack-stein-ansible-2.10
-    parent: ansible-collections-openstack-functional-devstack-ansible-devel
-    description: |
-      Run openstack collections functional tests against a stein devstack
-      using stein brach of openstacksdk and stable 2.10 branch of ansible
-    voting: true
-    override-checkout: stable/stein
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
-      - name: openstack/openstacksdk
-        override-checkout: stable/stein
-      - name: openstack/os-client-config
-        override-checkout: stable/stein
-    vars:
-      tox_envlist: ansible
-
- job:
-    name: ansible-collections-openstack-functional-devstack-rocky-ansible-2.10
-    parent: ansible-collections-openstack-functional-devstack-ansible-devel
-    description: |
-      Run openstack collections functional tests against a rocky devstack
-      using rocky brach of openstacksdk and stable 2.10 branch of ansible
-    voting: true
-    override-checkout: stable/rocky
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
-      - name: openstack/openstacksdk
-        override-checkout: stable/rocky
-      - name: openstack/os-client-config
-        override-checkout: stable/rocky
-      - name: openstack/shade
-        override-checkout: stable/rocky
-
-    vars:
-      tox_envlist: ansible
-
- job:
-    name: ansible-collections-openstack-functional-devstack-queens-ansible-2.10
+    name: ansible-collections-openstack-functional-devstack-queens-ansible-2.11
    parent: ansible-collections-openstack-functional-devstack-ansible-devel
    description: |
      Run openstack collections functional tests against a queens devstack
-      using master branch of openstacksdk and stable 2.10 branch of ansible
+      using master branch of openstacksdk and stable 2.11 branch of ansible
    voting: true
    override-checkout: stable/queens
    required-projects:
      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
+        override-checkout: stable-2.11
      - name: openstack/openstacksdk
        # Run queens with highest possible py2 version of SDK
        override-checkout: stable/train
    vars:
      tox_envlist: ansible
-
- job:
-    name: ansible-collections-openstack-functional-devstack-queens-ansible-devel
-    parent: ansible-collections-openstack-functional-devstack-ansible-devel
-    description: |
-      Run openstack collections functional tests against a queens devstack
-      using master branch of openstacksdk and devel branch of ansible
-    voting: false
-    override-checkout: stable/queens
-    required-projects:
-      - name: github.com/ansible/ansible
-        override-checkout: devel
-      - name: openstack/openstacksdk
-        # Run queens with highest possible py2 version of SDK
-        override-checkout: stable/train
-    vars:
-      tox_envlist: ansible-2.11
-
+      tox_install_siblings: true

 # Linters
 - job:
    name: openstack-tox-linters-ansible-devel
    parent: openstack-tox-linters
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
    description: |
      Run openstack collections linter tests using the devel branch of ansible
    # non-voting because we can't prevent ansible devel from breaking us
@@ -219,18 +265,24 @@
      - name: github.com/ansible/ansible
        override-checkout: devel
    vars:
-      tox_envlist: linters-2.11
+      tox_envlist: linters-2.12
+      python_version: 3.8
+      bindep_profile: test py38

 - job:
-    name: openstack-tox-linters-ansible-2.10
+    name: openstack-tox-linters-ansible-2.12
    parent: openstack-tox-linters
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
    description: |
-      Run openstack collections linter tests using the 2.10 branch of ansible
+      Run openstack collections linter tests using the 2.12 branch of ansible
    voting: true
    required-projects:
      - name: github.com/ansible/ansible
-        override-checkout: stable-2.10
+        override-checkout: stable-2.12
+    vars:
+      tox_envlist: linters-2.12
+      python_version: 3.8
+      bindep_profile: test py38

 - job:
    name: openstack-tox-linters-ansible-2.9
@@ -258,61 +310,131 @@
    required-projects:
      - openstack/ansible-collections-openstack

+# TripleO jobs
+- job:
+    name: tripleo-ci-centos-8-standalone-osa
+    parent: tripleo-ci-base-standalone-centos-8
+    vars:
+      featureset: '052'
+      consumer_job: false
+      build_container_images: true
+    irrelevant-files: &irr_files
+      - .*molecule.*
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^docs/.*$
+      - ^contrib/.*$
+      - ^changelogs/.*$
+      - ^meta/.*$
+      - ^tests/.*$
+      - ^tools/.*$
+      - ^requirements.*$
+      - ^test-requirements.*$
+      - ^setup.*$
+      - tox.ini
+    # Run only on files used in TripleO
+    files: &ooo_files
+      - ^plugins/modules/catalog_service.*$
+      - ^plugins/modules/endpoint.*$
+      - ^plugins/modules/identity_domain.*$
+      - ^plugins/modules/identity_domain_info.*$
+      - ^plugins/modules/identity_role.*$
+      - ^plugins/modules/identity_user.*$
+      - ^plugins/modules/keypair.*$
+      - ^plugins/modules/project.*$
+      - ^plugins/modules/role_assignment.*$
+      - ^plugins/modules/stack.*$
+      - ^plugins/module_utils/openstack.*$
+
+- job:
+    name: tripleo-ci-centos-9-standalone-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    nodeset: single-centos-9-node
+    branches: ^(stable/1.0.0|master).*$
+    override-checkout: master
+    vars:
+      containers_base_image: quay.io/centos/centos:stream9
+      consumer_job: false
+      build_container_images: true
+      branch_override: master
+    files: *ooo_files
+    irrelevant-files: *irr_files
+
+- job:
+    name: tripleo-ci-centos-8-standalone-train-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    override-checkout: stable/train
+    vars:
+      branch_override: stable/train
+
+- job:
+    name: tripleo-ci-centos-8-standalone-wallaby-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    override-checkout: stable/wallaby
+    vars:
+      branch_override: stable/wallaby
+
+- job:
+    name: tripleo-ci-centos-9-standalone-wallaby-osa
+    parent: tripleo-ci-centos-9-standalone-osa
+    branches: ^(stable/1.0.0|master).*$
+    override-checkout: stable/wallaby
+    vars:
+      branch_override: stable/wallaby
+
+- job:
+    name: ansible-collections-openstack-release
+    parent: base
+    run: ci/publish/publish_collection.yml
+    secrets:
+      - ansible_galaxy_info
+
+- secret:
+    name: ansible_galaxy_info
+    data:
+      url: https://galaxy.ansible.com
+      token: !encrypted/pkcs1-oaep
+        - lZFzfoCbuwqV1k6qRfl/VS7E+knUW7+zpg7BptrenK4n0g7UY0HtdVkYq0pV0Tj/LbhzG
+          jHD0mehcV1iS6B7ORKg4criJkdDfEx09BD8z8yv0EleiIMmhlrCoMcY593OZMBtVbGi0D
+          CwQtNO98QIsfZogChfLfvRNiBmUV98mEb/p6p3EtGx8J7qcAsqfWxc/CzB8GCleLAHHHT
+          FuikMM03ZnV0ew7E+TPkHbzzPhBZOqS5HYF0HtgttHwIXdfIWp/XdTuEEk7uRRgYZ2Iao
+          ifWRzoKaOQmhM++e1ydCqw9D4y9dZEFNMQLwSqcrvtb8cNwT1kl7SCFqYNE2lbutj4ne6
+          PTBQRsKegMB4Y3ena14fNF6tCynvJLPhF/cjPH2Jhs+B19XQhWkL3TgiOY02W24YHwRcP
+          +LdkM8inAvyVi3DEbEqdjBPO9OFJcBOKPlCdkGvuwdNCuEpEwctWs0gV3voflG2CDKzmJ
+          wu9JJOAWnq/0l1WpuDqWreKeQ/BUGZC2Gb4xRAqofulgvhs4WuYoEccjH4EJFIZ90S1EP
+          R/ZLadqZaEhmjwGM5sMWbBbjT23XsRgg0Tzt9m8DENYMuYDqkMdRbt2jYZa+32p4hyxVe
+          Y6H/pqYq5b9uOzumnShaK4WlmkQyXcNPkoSlMC1h4OGvqX/WUixpI38jyMA5Tc=
+
 - project:
    check:
      jobs:
        - tox-pep8
        - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.10
+        - openstack-tox-linters-ansible-2.12
        - openstack-tox-linters-ansible-2.9
        - ansible-collections-openstack-functional-devstack:
            dependencies: &deps_unit_lint
              - tox-pep8
              - openstack-tox-linters-ansible-2.9
-              - openstack-tox-linters-ansible-2.10
-            irrelevant-files: &ignore_files
-              - changelogs/.*
-              - COPYING
-              - docs/.*
-              - .*\.md
-              - .*\.rst
-              - tools/run-ansible-sanity.sh
-              - tests/sanity/.*
-              - contrib/.*
+              - openstack-tox-linters-ansible-2.12

        - ansible-collections-openstack-functional-devstack-releases:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
        - ansible-collections-openstack-functional-devstack-ansible-2.9:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-ansible-2.10:
+        - ansible-collections-openstack-functional-devstack-ansible-2.12:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
        - ansible-collections-openstack-functional-devstack-ansible-devel:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-ansible-pip:
+        - ansible-collections-openstack-functional-devstack-xena-ansible-2.12:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.10:
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10:
+        - ansible-collections-openstack-functional-devstack-train-ansible-2.11:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-train-ansible-2.10:
+            voting: false
+        - ansible-collections-openstack-functional-devstack-octavia:
            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-stein-ansible-2.10:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files
-        - ansible-collections-openstack-functional-devstack-queens-ansible-2.10:
-            dependencies: *deps_unit_lint
-            irrelevant-files: *ignore_files

        - bifrost-collections-src:
            voting: false
@@ -323,40 +445,66 @@
            dependencies: *deps_unit_lint
            irrelevant-files: *ignore_files

+        - tripleo-ci-centos-8-standalone-wallaby-osa:
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-8-standalone-train-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-9-standalone-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-9-standalone-wallaby-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
    gate:
      jobs:
        - tox-pep8
-        - openstack-tox-linters-ansible-2.10
+        - openstack-tox-linters-ansible-2.12
        - openstack-tox-linters-ansible-2.9
        - ansible-collections-openstack-functional-devstack
        - ansible-collections-openstack-functional-devstack-releases
        - ansible-collections-openstack-functional-devstack-ansible-2.9
-        - ansible-collections-openstack-functional-devstack-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-ansible-pip
-        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10
-        # - ansible-collections-openstack-functional-devstack-train-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-stein-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-queens-ansible-2.10
+        - ansible-collections-openstack-functional-devstack-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-xena-ansible-2.12
+        # - ansible-collections-openstack-functional-devstack-train-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-octavia
+        - tripleo-ci-centos-8-standalone-wallaby-osa

    periodic:
      jobs:
        - openstack-tox-linters-ansible-devel
-        - openstack-tox-linters-ansible-2.10
+        - openstack-tox-linters-ansible-2.12
        - openstack-tox-linters-ansible-2.9
        - ansible-collections-openstack-functional-devstack
        - ansible-collections-openstack-functional-devstack-releases
        - ansible-collections-openstack-functional-devstack-ansible-2.9
-        - ansible-collections-openstack-functional-devstack-ansible-2.10
+        - ansible-collections-openstack-functional-devstack-ansible-2.12
        - ansible-collections-openstack-functional-devstack-ansible-devel
-        - ansible-collections-openstack-functional-devstack-ansible-pip
-        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-train-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-stein-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-rocky-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-queens-ansible-2.10
-        - ansible-collections-openstack-functional-devstack-queens-ansible-devel
+        - ansible-collections-openstack-functional-devstack-xena-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-wallaby-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-train-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
        - bifrost-collections-src
        - bifrost-keystone-collections-src
+        - ansible-collections-openstack-functional-devstack-octavia
+        - tripleo-ci-centos-9-standalone-wallaby-osa
+        - tripleo-ci-centos-9-standalone-osa
+        - tripleo-ci-centos-8-standalone-train-osa
+        - tripleo-ci-centos-8-standalone-wallaby-osa
+
+    experimental:
+      jobs:
+        - ansible-collections-openstack-functional-devstack-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-victoria-ansible-2.12
+        - ansible-collections-openstack-functional-devstack-ussuri-ansible-2.11
+        - ansible-collections-openstack-functional-devstack-queens-ansible-2.11
+
+    tag:
+      jobs:
+        - ansible-collections-openstack-release
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -5,6 +5,270 @@ Openstack Cloud Ansilbe modules Release Notes
 .. contents:: Topics


+v1.7.1
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Minor Changes
+-------------
+
+- lb_member - Add monitor_[address,port] parameter
+
+Bugfixes
+--------
+
+- openstack_inventory - Fix documentation
+- quota - Fix description of volumes_types parameter
+
+v1.7.0
+======
+
+Release Summary
+---------------
+
+New modules for Ironic and bugfixes
+
+Minor Changes
+-------------
+
+- openstack_inventory - Adds use_name variable
+- port - Add dns_[name,domain] to the port module
+- project - Remove project properties tests and support
+
+Bugfixes
+--------
+
+- identity_user_info - Fix identity user lookup with a domain
+- keystone_domain - Move identity domain to use proxy layer
+
+New Modules
+-----------
+
+- openstack.cloud.baremetal_node_info - Retrieve information about Bare Metal nodes from OpenStack an object.
+- openstack.cloud.baremetal_port - Create, Update, Remove ironic ports from OpenStack
+- openstack.cloud.baremetal_port_info - Retrieve information about Bare Metal ports from OpenStack an object.
+
+v1.6.0
+======
+
+Release Summary
+---------------
+
+New modules for RBAC and Nova services
+
+Minor Changes
+-------------
+
+- quota - Adds metadata_items parameter
+
+New Modules
+-----------
+
+- openstack.cloud.compute_service_info - Retrieve information about one or more OpenStack compute services
+- openstack.cloud.neutron_rbac_policies_info - Fetch Neutron policies.
+- openstack.cloud.neutron_rbac_policy - Create or delete a Neutron policy to apply a RBAC rule against an object.
+
+v1.5.3
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Bugfixes
+--------
+
+- Don't require allowed_address_pairs for port
+- server_volume - check specified server is found
+
+v1.5.2
+======
+
+Release Summary
+---------------
+
+Bugfixes
+
+Minor Changes
+-------------
+
+- Add documentation links to README.md
+- Don't run functional jobs on galaxy.yml change
+- Move CI to use Ansible 2.12 version as main
+
+Bugfixes
+--------
+
+- Add client and member listener timeouts for persistence (Ex. SSH)
+- Added missing warn() used in cloud.openstack.quota
+- Fix issue with same host and group names
+- Flavor properties are not deleted on changes and id will stay
+
+v1.5.1
+======
+
+Release Summary
+---------------
+
+Bugfixes for networking modules
+
+Minor Changes
+-------------
+
+- Changed minversion in tox to 3.18.0
+- Update IRC server in README
+
+Bugfixes
+--------
+
+- Add mandatory requires_ansible version to metadata
+- Add protocol listener octavia
+- Add support check mode for all info modules
+- Allow to attach multiple floating ips to a server
+- Only add or remove router interfaces when needed
+- Wait for pool to be active and online
+
+v1.5.0
+======
+
+Release Summary
+---------------
+
+New modules for DNS and FIPs and bugfixes.
+
+Minor Changes
+-------------
+
+- Add bindep.txt for ansible-builder
+- Add check_mode attribute to OpenstackModule
+- Migrating image module from AnsibleModule to OpenStackModule
+- Switch KeystoneFederationProtocolInfo module to OpenStackModule
+- Switch ProjectAccess module to OpenStackModule
+- Switch Quota module to OpenStackModule
+- Switch Recordset module to OpenStackModule
+- Switch ServerGroup module to OpenStackModule
+- Switch ServerMetadata module to OpenStackModule
+- Switch Snapshot module to OpenStackModule
+- Switch Stack module to OpenStackModule
+- Switch auth module to OpenStackModule
+- Switch catalog_service module to OpenStackModule
+- Switch coe_cluster module to OpenStackModule
+- Switch coe_cluster_template module to OpenStackModule
+- Switch endpoint module to OpenStackModule
+- Switch federation_idp module to OpenStackModule
+- Switch federation_idp_info module to OpenStackModule
+- Switch federation_mapping module to OpenStackModule
+- Switch federation_mapping_info module to OpenStackModule
+- Switch federation_protocol module to OpenStackModule
+- Switch flavor module to OpenStackModule
+- Switch flavor_info module to OpenStackModule
+- Switch floating_ip module to OpenStackModule
+- Switch group_assignment module to OpenStackModule
+- Switch hostaggregate module to OpenStackModule
+- Switch identity_domain module to OpenStackModule
+- Switch identity_domain_info module to OpenStackModule
+- Switch identity_group module to OpenStackModule
+- Switch identity_group_info module to OpenStackModule
+- Switch identity_role module to OpenStackModule
+- Switch identity_user module to OpenStackModule
+- Switch lb_listener module to OpenStackModule
+- Switch lb_member module to OpenStackModule
+- Switch lb_pool module to OpenStackModule
+- Switch object module to OpenStackModule
+- Switch port module to OpenStackModule
+- Switch port_info module to OpenStackModule
+- Switch project and project_info module to OpenStackModule
+- Switch role_assignment module to OpenStackModule
+- Switch user_info module to OpenStackModule
+- image - Add support to setting image tags
+
+Bugfixes
+--------
+
+- Update checks for validate_certs in openstack_cloud_from_module
+- compute_flavor - Fix the idempotent of compute_flavor module
+- host_aggregate - Fix host_aggregate to tolerate aggregate.hosts being None
+- inventory/openstack - Fix inventory plugin on Ansible 2.11
+- port - fix update on empty list of allowed address pairs
+- setup.cfg Replace dashes with underscores
+- subnet - Only apply necessary changes to subnets
+- volume - Fail if referenced source image for a new volume does not exist
+
+New Modules
+-----------
+
+- openstack.cloud.address_scope - Create or delete address scopes from OpenStack
+- openstack.cloud.dns_zone_info - Getting information about dns zones
+- openstack.cloud.floating_ip_info - Get information about floating ips
+
+v1.4.0
+======
+
+Release Summary
+---------------
+
+New object_container module and bugfixes.
+
+Bugfixes
+--------
+
+- Add Octavia job for testing Load Balancer
+- Add binding profile to port module
+- Add execution environment metadata
+- Fix CI for latest ansible-test with no_log
+- Fix issues with newest ansible-test 2.11
+- Prepare for Ansible 2.11 tests
+- add option to exclude legacy groups
+- security_group_rule add support ipv6-icmp
+
+New Modules
+-----------
+
+- openstack.cloud.object_container - Manage Swift container
+
+v1.3.0
+======
+
+Release Summary
+---------------
+
+New modules and bugfixes.
+
+Minor Changes
+-------------
+
+- Fix some typos in readme
+- Guidelines Fix links and formatting
+- baremetal_node - Add support for new features
+- baremetal_node - ironic deprecate sub-options of driver_info
+- baremetal_node - ironic stop putting meaningless values to properties
+- image_info - Migrating image_info module from AnsibleModule to OpenStackModule
+- recordset -  Update recordset docu
+- server - Allow description field to be set with os_server
+- server_action - Added shelve and unshelve as new server actions
+
+Bugfixes
+--------
+
+- port - Fixed check for None in os_port
+- project - Fix setting custom property on os_project
+- security_group_rule - Remove protocols choice in security rules
+- volume_info - Fix volume_info result for SDK < 0.19
+
+New Modules
+-----------
+
+- openstack.cloud.identity_role_info - Retrieve information about Openstack Identity roles.
+- openstack.cloud.keypair_info - Retrieve information about Openstack key pairs.
+- openstack.cloud.security_group_info - Retrieve information about Openstack Security Groups.
+- openstack.cloud.security_group_rule_info - Retrieve information about Openstack Security Group rules.
+- openstack.cloud.stack_info - Retrieve information about Openstack Heat stacks.
+
 v1.2.1
 ======

--- a/README.md
+++ b/README.md
@@ -11,7 +11,7 @@ The collection includes the Openstack modules and plugins supported by Openstack

 ### Installing dependencies

-For using Openstack Cloud collection firstly need to install `ansible` and `openstacksdk` Python modules on Ansible controller.
+For using the Openstack Cloud collection firstly you need to install `ansible` and `openstacksdk` Python modules on your Ansible controller.
 For example with pip:

 ```bash
@@ -19,8 +19,8 @@ pip install ansible openstacksdk
 ```

 OpenStackSDK has to be available to Ansible and to the Python interpreter on the host, where Ansible executes the module (target host).
-Please note, that under some circumstances Ansible might invoke not standard Python interpreter on the target host.
-Using Python verison 3 is highly recommended for OpenstackSDK and strongly required from OpenstackSDK version 0.39.0.
+Please note, that under some circumstances Ansible might invoke a non-standard Python interpreter on the target host.
+Using Python version 3 is highly recommended for OpenstackSDK and strongly required from OpenstackSDK version 0.39.0.

 ---

@@ -39,7 +39,7 @@ Before using the Openstack Cloud collection, you need to install the collection

 `ansible-galaxy collection install openstack.cloud`

-You can also include it in a `requirements.yml` file and install it via `ansible-galaxy collection install -r requirements.yml` using the format:
+You can also include it in a `requirements.yml` file and install it through `ansible-galaxy collection install -r requirements.yml` using the format:

 ```yaml
 collections:
@@ -48,7 +48,7 @@ collections:

 ### Playbooks

-To use a module from Openstack Cloud collection, please reference the full namespace, collection name, and modules name that you want to use:
+To use a module from the Openstack Cloud collection, please reference the full namespace, collection name, and module name that you want to use:

 ```yaml
 ---
@@ -66,7 +66,7 @@ To use a module from Openstack Cloud collection, please reference the full names
        volume_size: 75
 ```

-Or you can add full namepsace and collecton name in the `collections` element:
+Or you can add the full namespace and collection name in the `collections` element:

 ```yaml
 ---
@@ -83,6 +83,14 @@ Or you can add full namepsace and collecton name in the `collections` element:
        device: /dev/vdb
 ```

+### Usage
+
+See the collection docs at Ansible site:
+
+* [openstack.cloud collection docs (version released in Ansible package)](https://docs.ansible.com/ansible/latest/collections/openstack/cloud/index.html)
+
+* [openstack.cloud collection docs (devel version)](https://docs.ansible.com/ansible/devel/collections/openstack/cloud/index.html)
+
 ## Contributing

 For information on contributing, please see [CONTRIBUTING](https://opendev.org/openstack/ansible-collections-openstack/src/branch/master/CONTRIBUTING.rst)
@@ -114,7 +122,7 @@ TBD
 ## Communication

 We have a dedicated Interest Group for Openstack Ansible modules.
-You can find other people interested in this in `#openstack-ansible-sig` on Freenode IRC.
+You can find other people interested in this in `#openstack-ansible-sig` on [OFTC IRC](https://www.oftc.net/).

 ## License

--- a/bindep.txt
+++ b/bindep.txt
@@ -0,0 +1,7 @@
+# This is a cross-platform list tracking distribution packages needed by tests;
+# see https://docs.openstack.org/infra/bindep/ for additional information.
+
+gcc [compile platform:centos-8 platform:rhel-8]
+python38-cryptography [platform:centos-8 platform:rhel-8]
+python38-devel [compile platform:centos-8 platform:rhel-8]
+python38-requests [platform:centos-8 platform:rhel-8]
--- a/changelogs/changelog.yaml
+++ b/changelogs/changelog.yaml
@@ -1,111 +1,315 @@
+ancestor: null
 releases:
-  1.2.1:
-    release_date: '2021-01-03'
-    changes:
-      release_summary: Porting modules to new OpenstackModule class and fixes.
-      minor_changes:
-        - dns_zone, recordset - Enable update for recordset and add tests for dns and recordset module
-        - loadbalancer - Refactor loadbalancer module
-        - openstack - OpenStackModule Support defining a minimum version of the SDK
-        - ironic - Refactor ironic authentication into a new module_utils module
-        - endpoint - Do not fail when endpoint state is absent
-        - subnet - Fix subnets update and idempotency
-        - volume_info - Fix volume_info arguments for SDK 0.19
-        - routers_info - Added deprecated_names for router_info module
-        - security_group_rule - Refactor TCP/UDP port check
-        - openstack - Fix docs-args mismatch in modules
-        - security_group.py - Migrating security_group from AnsibleModule to OpenStackModule
-        - router - Migrating routers from AnsibleModule to OpenStackModule
-        - server_volume - Migrating server_volume from AnsibleModule to OpenStackModule
-        - dns_zone - Migrating dns_zone from AnsibleModule to OpenStackModule
-        - network - Migrating network from AnsibleModule to OpenStackModule
-        - routers_info - Migrating routers_info from AnsibleModule to OpenStackModule
-        - networks_info - Migrating networks_info from AnsibleModule to OpenStackModule
-        - subnets_info - Migrating subnets_info from AnsibleModule to OpenStackModule
-        - server.py - Improve "server" module with OpenstackModule class
-        - volume.py - Migrating volume from AnsibleModule to OpenStackModule
-        - subnet - Migrating subnet module from AnsibleModule to OpenStackModule
-        - openstack - Add galaxy.yml to support install from git
-  1.2.0:
-    release_date: '2020-10-13'
-    changes:
-      release_summary: New volume backup modules.
-      minor_changes:
-        - lb_health_monitor - Make it possible to create a health monitor to a pool
-    modules:
-      - name: volume_snapshot_info module
-        description: Retrieve information about Openstack volume snapshots.
-        namespace: ''
-      - name: volume_backup_info module
-        description: Retrieve information about Openstack volume backups.
-        namespace: ''
-      - name: volume_backup module
-        description: Add/Delete Openstack volumes backup.
-        namespace: ''
-  1.1.0:
-    release_date: '2020-08-17'
-    changes:
-      release_summary: Starting redesign modules and bugfixes.
-      minor_changes:
-        - A basic module subclass was introduced and a few modules moved to inherit from it.
-        - Added pip installation option for collection.
-        - Added template for generation of artibtrary module.
-        - Add more useful information from exception
-        - inventory_openstack - Add openstack logger and Ansible display utility
-        - loadbalancer - Add support for setting the Flavor when creating a load balancer
-        - baremetal modules - Do not require ironic_url if cloud or auth.endpoint is provided
-      bugfixes:
-        - security_group_rule - Don't pass tenant_id for remote group
-        - Fix non existing attribuites in SDK exception
-    modules:
-      - name: volume_info
-        description: Retrieve information about Openstack volumes.
-        namespace: ''
-  1.0.1:
-    release_date: '2020-05-22'
-    changes:
-      release_summary: Bugfix for server_info
-      bugfixes:
-        - server_info - Fix broken server_info module and add tests
  1.0.0:
-    release_date: '2020-05-19'
    changes:
-      release_summary: Initial release of collection.
-      minor_changes:
-        - Renaming all modules and removing "os" prefix from names.
-        - server_action - pass imageRef to rebuild
-        - subnet - Updated allocation pool checks
-        - project - Add properties for os_project
-        - config - Update os_client_config to use openstacksdk
-        - host_aggregate - Add support for not 'purging' missing hosts
-        - baremetal_node_action - Support json type for the ironic_node config_drive parameter
      bugfixes:
-        - federation_mapping - Fixup some minor nits found in followup reviews
-        - coe_cluster - Retrive id/uuid correctly
-        - baremetal_node - Correct parameter name
-        - network - Bump minimum openstacksdk version when using os_network/dns_domain
-        - inventory_openstack - Fix constructed compose
-        - role_assignment - Fix os_user_role for groups in multidomain context
-        - role_assignment - Fix os_user_role issue to grant a role in a domain
+      - baremetal_node - Correct parameter name
+      - coe_cluster - Retrive id/uuid correctly
+      - federation_mapping - Fixup some minor nits found in followup reviews
+      - inventory_openstack - Fix constructed compose
+      - network - Bump minimum openstacksdk version when using os_network/dns_domain
+      - role_assignment - Fix os_user_role for groups in multidomain context
+      - role_assignment - Fix os_user_role issue to grant a role in a domain
+      minor_changes:
+      - Renaming all modules and removing "os" prefix from names.
+      - baremetal_node_action - Support json type for the ironic_node config_drive
+        parameter
+      - config - Update os_client_config to use openstacksdk
+      - host_aggregate - Add support for not 'purging' missing hosts
+      - project - Add properties for os_project
+      - server_action - pass imageRef to rebuild
+      - subnet - Updated allocation pool checks
+      release_summary: Initial release of collection.
    modules:
-      - name: keystone_federation_protocol_info
-        description: Add support for getting information about Keystone federation Protocols
-        namespace: ''
-      - name: keystone_federation_protocol
-        description: Add support for Keystone federation Protocols
-        namespace: ''
-      - name: federation_idp_info
-        description: Add support for fetching the information about federation IDPs
-        namespace: ''
-      - name: federation_idp
-        description: Add support for Keystone Identity Providers
-        namespace: ''
-      - name: federation_mapping_info
-        description: Add support for fetching the information about Keystone mappings
-        namespace: ''
-      - name: federation_mapping
-        description: Add support for Keystone mappings
-        namespace: ''
-      - name: routers_info
-        description: Retrieve information about one or more OpenStack routers.
-        namespace: ''
+    - description: Add support for Keystone Identity Providers
+      name: federation_idp
+      namespace: ''
+    - description: Add support for fetching the information about federation IDPs
+      name: federation_idp_info
+      namespace: ''
+    - description: Add support for Keystone mappings
+      name: federation_mapping
+      namespace: ''
+    - description: Add support for fetching the information about Keystone mappings
+      name: federation_mapping_info
+      namespace: ''
+    - description: Add support for Keystone federation Protocols
+      name: keystone_federation_protocol
+      namespace: ''
+    - description: Add support for getting information about Keystone federation Protocols
+      name: keystone_federation_protocol_info
+      namespace: ''
+    - description: Retrieve information about one or more OpenStack routers.
+      name: routers_info
+      namespace: ''
+    release_date: '2020-05-19'
+  1.0.1:
+    changes:
+      bugfixes:
+      - server_info - Fix broken server_info module and add tests
+      release_summary: Bugfix for server_info
+    release_date: '2020-05-22'
+  1.1.0:
+    changes:
+      bugfixes:
+      - Fix non existing attribuites in SDK exception
+      - security_group_rule - Don't pass tenant_id for remote group
+      minor_changes:
+      - A basic module subclass was introduced and a few modules moved to inherit
+        from it.
+      - Add more useful information from exception
+      - Added pip installation option for collection.
+      - Added template for generation of artibtrary module.
+      - baremetal modules - Do not require ironic_url if cloud or auth.endpoint is
+        provided
+      - inventory_openstack - Add openstack logger and Ansible display utility
+      - loadbalancer - Add support for setting the Flavor when creating a load balancer
+      release_summary: Starting redesign modules and bugfixes.
+    modules:
+    - description: Retrieve information about Openstack volumes.
+      name: volume_info
+      namespace: ''
+    release_date: '2020-08-17'
+  1.2.0:
+    changes:
+      minor_changes:
+      - lb_health_monitor - Make it possible to create a health monitor to a pool
+      release_summary: New volume backup modules.
+    modules:
+    - description: Add/Delete Openstack volumes backup.
+      name: volume_backup module
+      namespace: ''
+    - description: Retrieve information about Openstack volume backups.
+      name: volume_backup_info module
+      namespace: ''
+    - description: Retrieve information about Openstack volume snapshots.
+      name: volume_snapshot_info module
+      namespace: ''
+    release_date: '2020-10-13'
+  1.2.1:
+    changes:
+      minor_changes:
+      - dns_zone - Migrating dns_zone from AnsibleModule to OpenStackModule
+      - dns_zone, recordset - Enable update for recordset and add tests for dns and
+        recordset module
+      - endpoint - Do not fail when endpoint state is absent
+      - ironic - Refactor ironic authentication into a new module_utils module
+      - loadbalancer - Refactor loadbalancer module
+      - network - Migrating network from AnsibleModule to OpenStackModule
+      - networks_info - Migrating networks_info from AnsibleModule to OpenStackModule
+      - openstack - Add galaxy.yml to support install from git
+      - openstack - Fix docs-args mismatch in modules
+      - openstack - OpenStackModule Support defining a minimum version of the SDK
+      - router - Migrating routers from AnsibleModule to OpenStackModule
+      - routers_info - Added deprecated_names for router_info module
+      - routers_info - Migrating routers_info from AnsibleModule to OpenStackModule
+      - security_group.py - Migrating security_group from AnsibleModule to OpenStackModule
+      - security_group_rule - Refactor TCP/UDP port check
+      - server.py - Improve "server" module with OpenstackModule class
+      - server_volume - Migrating server_volume from AnsibleModule to OpenStackModule
+      - subnet - Fix subnets update and idempotency
+      - subnet - Migrating subnet module from AnsibleModule to OpenStackModule
+      - subnets_info - Migrating subnets_info from AnsibleModule to OpenStackModule
+      - volume.py - Migrating volume from AnsibleModule to OpenStackModule
+      - volume_info - Fix volume_info arguments for SDK 0.19
+      release_summary: Porting modules to new OpenstackModule class and fixes.
+    release_date: '2021-01-03'
+  1.3.0:
+    changes:
+      bugfixes:
+      - port - Fixed check for None in os_port
+      - project - Fix setting custom property on os_project
+      - security_group_rule - Remove protocols choice in security rules
+      - volume_info - Fix volume_info result for SDK < 0.19
+      minor_changes:
+      - Fix some typos in readme
+      - Guidelines Fix links and formatting
+      - baremetal_node - Add support for new features
+      - baremetal_node - ironic deprecate sub-options of driver_info
+      - baremetal_node - ironic stop putting meaningless values to properties
+      - image_info - Migrating image_info module from AnsibleModule to OpenStackModule
+      - recordset -  Update recordset docu
+      - server - Allow description field to be set with os_server
+      - server_action - Added shelve and unshelve as new server actions
+      release_summary: New modules and bugfixes.
+    modules:
+    - description: Retrieve information about Openstack Identity roles.
+      name: identity_role_info
+      namespace: ''
+    - description: Retrieve information about Openstack key pairs.
+      name: keypair_info
+      namespace: ''
+    - description: Retrieve information about Openstack Security Groups.
+      name: security_group_info
+      namespace: ''
+    - description: Retrieve information about Openstack Security Group rules.
+      name: security_group_rule_info
+      namespace: ''
+    - description: Retrieve information about Openstack Heat stacks.
+      name: stack_info
+      namespace: ''
+    release_date: '2021-02-16'
+  1.4.0:
+    changes:
+      bugfixes:
+      - Add Octavia job for testing Load Balancer
+      - Add binding profile to port module
+      - Add execution environment metadata
+      - Fix CI for latest ansible-test with no_log
+      - Fix issues with newest ansible-test 2.11
+      - Prepare for Ansible 2.11 tests
+      - add option to exclude legacy groups
+      - security_group_rule add support ipv6-icmp
+      release_summary: New object_container module and bugfixes.
+    modules:
+    - description: Manage Swift container
+      name: object_container
+      namespace: ''
+    release_date: '2021-04-08'
+  1.5.0:
+    changes:
+      bugfixes:
+      - Update checks for validate_certs in openstack_cloud_from_module
+      - compute_flavor - Fix the idempotent of compute_flavor module
+      - host_aggregate - Fix host_aggregate to tolerate aggregate.hosts being None
+      - inventory/openstack - Fix inventory plugin on Ansible 2.11
+      - port - fix update on empty list of allowed address pairs
+      - setup.cfg Replace dashes with underscores
+      - subnet - Only apply necessary changes to subnets
+      - volume - Fail if referenced source image for a new volume does not exist
+      minor_changes:
+      - Add bindep.txt for ansible-builder
+      - Add check_mode attribute to OpenstackModule
+      - Migrating image module from AnsibleModule to OpenStackModule
+      - Switch KeystoneFederationProtocolInfo module to OpenStackModule
+      - Switch ProjectAccess module to OpenStackModule
+      - Switch Quota module to OpenStackModule
+      - Switch Recordset module to OpenStackModule
+      - Switch ServerGroup module to OpenStackModule
+      - Switch ServerMetadata module to OpenStackModule
+      - Switch Snapshot module to OpenStackModule
+      - Switch Stack module to OpenStackModule
+      - Switch auth module to OpenStackModule
+      - Switch catalog_service module to OpenStackModule
+      - Switch coe_cluster module to OpenStackModule
+      - Switch coe_cluster_template module to OpenStackModule
+      - Switch endpoint module to OpenStackModule
+      - Switch federation_idp module to OpenStackModule
+      - Switch federation_idp_info module to OpenStackModule
+      - Switch federation_mapping module to OpenStackModule
+      - Switch federation_mapping_info module to OpenStackModule
+      - Switch federation_protocol module to OpenStackModule
+      - Switch flavor module to OpenStackModule
+      - Switch flavor_info module to OpenStackModule
+      - Switch floating_ip module to OpenStackModule
+      - Switch group_assignment module to OpenStackModule
+      - Switch hostaggregate module to OpenStackModule
+      - Switch identity_domain module to OpenStackModule
+      - Switch identity_domain_info module to OpenStackModule
+      - Switch identity_group module to OpenStackModule
+      - Switch identity_group_info module to OpenStackModule
+      - Switch identity_role module to OpenStackModule
+      - Switch identity_user module to OpenStackModule
+      - Switch lb_listener module to OpenStackModule
+      - Switch lb_member module to OpenStackModule
+      - Switch lb_pool module to OpenStackModule
+      - Switch object module to OpenStackModule
+      - Switch port module to OpenStackModule
+      - Switch port_info module to OpenStackModule
+      - Switch project and project_info module to OpenStackModule
+      - Switch role_assignment module to OpenStackModule
+      - Switch user_info module to OpenStackModule
+      - image - Add support to setting image tags
+      release_summary: New modules for DNS and FIPs and bugfixes.
+    modules:
+    - description: Create or delete address scopes from OpenStack
+      name: address_scope
+      namespace: ''
+    - description: Getting information about dns zones
+      name: dns_zone_info
+      namespace: ''
+    - description: Get information about floating ips
+      name: floating_ip_info
+      namespace: ''
+    release_date: '2021-06-23'
+  1.5.1:
+    changes:
+      bugfixes:
+      - Add mandatory requires_ansible version to metadata
+      - Add protocol listener octavia
+      - Add support check mode for all info modules
+      - Allow to attach multiple floating ips to a server
+      - Only add or remove router interfaces when needed
+      - Wait for pool to be active and online
+      minor_changes:
+      - Changed minversion in tox to 3.18.0
+      - Update IRC server in README
+      release_summary: Bugfixes for networking modules
+    release_date: '2021-09-02'
+  1.5.2:
+    changes:
+      bugfixes:
+      - Add client and member listener timeouts for persistence (Ex. SSH)
+      - Added missing warn() used in cloud.openstack.quota
+      - Fix issue with same host and group names
+      - Flavor properties are not deleted on changes and id will stay
+      minor_changes:
+      - Add documentation links to README.md
+      - Don't run functional jobs on galaxy.yml change
+      - Move CI to use Ansible 2.12 version as main
+      release_summary: Bugfixes
+    release_date: '2021-11-09'
+  1.5.3:
+    changes:
+      bugfixes:
+      - Don't require allowed_address_pairs for port
+      - server_volume - check specified server is found
+      release_summary: Bugfixes
+    release_date: '2021-11-11'
+  1.6.0:
+    changes:
+      minor_changes:
+      - quota - Adds metadata_items parameter
+      release_summary: New modules for RBAC and Nova services
+    modules:
+    - description: Retrieve information about one or more OpenStack compute services
+      name: compute_service_info
+      namespace: ''
+    - description: Fetch Neutron policies.
+      name: neutron_rbac_policies_info
+      namespace: ''
+    - description: Create or delete a Neutron policy to apply a RBAC rule against
+        an object.
+      name: neutron_rbac_policy
+      namespace: ''
+    release_date: '2022-01-13'
+  1.7.0:
+    changes:
+      bugfixes:
+      - identity_user_info - Fix identity user lookup with a domain
+      - keystone_domain - Move identity domain to use proxy layer
+      minor_changes:
+      - openstack_inventory - Adds use_name variable
+      - port - Add dns_[name,domain] to the port module
+      - project - Remove project properties tests and support
+      release_summary: New modules for Ironic and bugfixes
+    modules:
+    - description: Retrieve information about Bare Metal nodes from OpenStack an object.
+      name: baremetal_node_info
+      namespace: ''
+    - description: Create, Update, Remove ironic ports from OpenStack
+      name: baremetal_port
+      namespace: ''
+    - description: Retrieve information about Bare Metal ports from OpenStack an object.
+      name: baremetal_port_info
+      namespace: ''
+    release_date: '2022-02-15'
+  1.7.1:
+    changes:
+      bugfixes:
+      - openstack_inventory - Fix documentation
+      - quota - Fix description of volumes_types parameter
+      minor_changes:
+      - lb_member - Add monitor_[address,port] parameter
+      release_summary: Bugfixes
+    release_date: '2022-03-08'
--- a/ci/playbooks/get_amphora_tarball.yaml
+++ b/ci/playbooks/get_amphora_tarball.yaml
@@ -0,0 +1,6 @@
+- hosts: all
+  tasks:
+    - name: Download amphora tarball
+      get_url:
+        url: "https://tarballs.openstack.org/octavia/test-images/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
+        dest: /tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2
--- a/ci/playbooks/postlog.yaml
+++ b/ci/playbooks/postlog.yaml
@@ -0,0 +1,8 @@
+- hosts: all
+  tasks:
+    - zuul_return:
+        data:
+          zuul:
+            artifacts:
+              - name: Test log
+                url: controller/logs/test_output_log.txt
--- a/ci/publish/publish_collection.yml
+++ b/ci/publish/publish_collection.yml
@@ -0,0 +1,75 @@
+---
+- hosts: all
+  vars:
+    collection_path: "{{ ansible_user_dir }}/{{ zuul.projects['opendev.org/openstack/ansible-collections-openstack'].src_dir }}"
+    build_collection_path: /tmp/collection_built/
+    ansible_galaxy_path: "~/.local/bin/ansible-galaxy"
+
+  tasks:
+
+    - name: Include role for pip
+      include_role:
+        name: ensure-pip
+
+    - name: Install ansible
+      pip:
+        name: ansible-core<2.12
+
+    - name: Discover tag version
+      set_fact:
+        version_tag: "{{ zuul.tag|default('no_version', true) }}"
+
+    - name: Fail if no tag version found
+      fail:
+        msg: "No tag was found in Zuul vars!"
+      when: version_tag == 'no_version'
+
+    - name: Create a directory for collection
+      file:
+        state: "{{ item }}"
+        path: "{{ build_collection_path }}"
+      loop:
+        - absent
+        - directory
+
+    - name: Set galaxy.yml for right version from tag
+      lineinfile:
+        path: '{{ collection_path }}/galaxy.yml'
+        regexp: '^version:.*'
+        line: 'version: {{ version_tag }}'
+
+    - name: Build collection
+      command: "{{ ansible_galaxy_path }} collection build --output-path {{ build_collection_path }} --force"
+      args:
+        chdir: "{{ collection_path }}"
+
+    - name: Publish content to Ansible Galaxy
+      block:
+        - name: Create ansible.cfg configuration file tempfile
+          tempfile:
+            state: file
+            suffix: .cfg
+          register: _ansiblecfg_tmp
+
+        - name: Create ansible.cfg configuration file
+          copy:
+            dest: "{{ _ansiblecfg_tmp.path }}"
+            mode: 0600
+            content: |
+              [galaxy]
+              server_list = release_galaxy
+
+              [galaxy_server.release_galaxy]
+              url = {{ ansible_galaxy_info.url }}
+              token = {{ ansible_galaxy_info.token }}
+
+        - name: Publish collection to Ansible Galaxy / Automation Hub
+          environment:
+            ANSIBLE_CONFIG: "{{ _ansiblecfg_tmp.path }}"
+          shell: >-
+            {{ ansible_galaxy_path }} collection publish -vvv
+            {{ build_collection_path }}/openstack-cloud-{{ version_tag }}.tar.gz
+
+      always:
+        - name: Shred ansible-galaxy credentials
+          command: "shred {{ _ansiblecfg_tmp.path }}"
--- a/ci/roles/address_scope/defaults/main.yml
+++ b/ci/roles/address_scope/defaults/main.yml
@@ -0,0 +1 @@
+address_scope_name: "adrdess_scope"
--- a/ci/roles/address_scope/tasks/main.yml
+++ b/ci/roles/address_scope/tasks/main.yml
@@ -0,0 +1,40 @@
+---
+- name: Create address_scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    shared: False
+    ip_version: "4"
+  register: create_address_scope
+
+- name: Verify address scope
+  assert:
+    that:
+      - create_address_scope is successful
+      - create_address_scope is changed
+      - create_address_scope.address_scope.name == address_scope_name
+      - create_address_scope.address_scope.is_shared ==  False
+      - create_address_scope.address_scope.ip_version == 4
+
+- name: Update address scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    shared: True
+    ip_version: "4"
+  register: update_address_scope
+
+- name: Verify updated IPv4 address scope
+  assert:
+    that:
+      - update_address_scope is successful
+      - update_address_scope is changed
+      - update_address_scope.address_scope.name == address_scope_name
+      - update_address_scope.address_scope.is_shared ==  True
+      - update_address_scope.address_scope.ip_version == 4
+
+- name: Delete created address scope
+  openstack.cloud.address_scope:
+    cloud: "{{ cloud }}"
+    name: "{{ address_scope_name }}"
+    state: absent
--- a/ci/roles/dns_zone_info/tasks/main.yml
+++ b/ci/roles/dns_zone_info/tasks/main.yml
@@ -0,0 +1,41 @@
+---
+- name: Set random prefix
+  set_fact:
+    prefix: "{{ 99999999 | random | to_uuid | hash('md5') }}"
+
+- name: Create dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ (prefix + '.test.zone.') }}"
+    email: test@example.net
+
+- name: Getting info about dns zones
+  openstack.cloud.dns_zone_info:
+    cloud: "{{ cloud }}"
+  register: zones
+
+- name: assert result
+  assert:
+    that:
+      - zones is success
+      - zones is not changed
+      - zones | length > 0
+
+- name: Getting info about created zone
+  openstack.cloud.dns_zone_info:
+    cloud: "{{ cloud }}"
+    name: "{{ (prefix + '.test.zone.') }}"
+  register: zone
+
+- name: assert result
+  assert:
+    that:
+      - zone is success
+      - zone is not changed
+      - zone.zones | length == 1
+
+- name: Drop created dns zone
+  openstack.cloud.dns_zone:
+    cloud: "{{ cloud }}"
+    name: "{{ (prefix + '.test.zone.') }}"
+    state: absent
--- a/ci/roles/floating_ip/tasks/main.yml
+++ b/ci/roles/floating_ip/tasks/main.yml
@@ -0,0 +1,466 @@
+---
+# Prepare environment
+- name: Gather information about public network
+  openstack.cloud.networks_info:
+    cloud: "{{ cloud }}"
+    name: public
+  register: public_network
+
+- name: Assert that public network exists
+  assert:
+    that: public_network.openstack_networks|length == 1
+
+- name: Create external network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_external
+     external: true
+
+- name: Create external subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: ansible_external
+     name: ansible_external_subnet
+     cidr: 10.6.6.0/24
+
+- name: Create external port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_external_port1
+     network: ansible_external
+     fixed_ips:
+       - ip_address: 10.6.6.50
+
+- name: Create external port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_external_port2
+     network: ansible_external
+     fixed_ips:
+       - ip_address: 10.6.6.51
+
+- name: Create internal network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal
+     external: false
+
+- name: Create internal subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: ansible_internal
+     name: ansible_internal_subnet
+     cidr: 10.7.7.0/24
+
+- name: Create internal port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal_port1
+     network: ansible_internal
+     fixed_ips:
+       - ip_address: 10.7.7.100
+
+- name: Create internal port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal_port2
+     network: ansible_internal
+     fixed_ips:
+       - ip_address: 10.7.7.101
+
+- name: Create internal port 3
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_internal_port3
+     network: ansible_internal
+     fixed_ips:
+       - ip_address: 10.7.7.102
+
+- name: Create router 1
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_router1
+     network: ansible_external
+     external_fixed_ips:
+        - subnet: ansible_external_subnet
+          ip: 10.6.6.10
+     interfaces:
+         - net: ansible_internal
+           subnet: ansible_internal_subnet
+           portip: 10.7.7.1
+
+# Router 2 is required for the simplest, first test that assigns a new floating IP to server
+# from first available external network or nova pool which is DevStack's public network
+- name: Create router 2
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_router2
+     network: public
+     interfaces:
+         - net: ansible_internal
+           subnet: ansible_internal_subnet
+           portip: 10.7.7.10
+
+- name: Get all floating ips
+  openstack.cloud.floating_ip_info:
+     cloud: "{{ cloud }}"
+  register: fips
+
+- name: Check if public network has any floating ips
+  set_fact:
+     public_network_had_fips: "{{ fips.floating_ips|
+                                  selectattr('floating_network_id', '==', public_network.openstack_networks.0.id)|
+                                  list|length > 0 }}"
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Create a floating ip on public network (required for simplest, first floating ip test)
+  command: openstack --os-cloud={{ cloud }} floating ip create public
+  when: not public_network_had_fips
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Create floating ip 1 on external network
+  command: >
+    openstack --os-cloud={{ cloud }} floating ip create
+        --subnet ansible_external_subnet
+        --floating-ip-address 10.6.6.150
+        ansible_external
+  when: fips.floating_ips|length == 0 or
+        "10.6.6.150" not in fips.floating_ips|map(attribute="floating_ip_address")|list
+
+- name: Create server with one nic
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_server1
+     image: "{{ image }}"
+     flavor: m1.tiny
+     nics:
+         # one nic only else simple, first floating ip test does not work
+         - port-name: ansible_internal_port1
+     auto_ip: false
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server1
+  register: info
+
+- name: Assert one internal port and no floating ips on server 1
+  # If this assertion fails because server has an public ipv4 address (public_v4) then make sure
+  # that no floating ip on public network is associated with "10.7.7.100" before running this role
+  assert:
+    that:
+      - info.openstack_servers|length == 1
+      - info.openstack_servers.0.public_v4|length == 0
+      - info.openstack_servers.0.public_v6|length == 0
+      - info.openstack_servers.0.addresses.ansible_internal|length == 1
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|sort|list == ["10.7.7.100"]
+
+- name: Create server with two nics
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_server2
+     image: "{{ image }}"
+     flavor: m1.tiny
+     nics:
+         - port-name: ansible_internal_port2
+         - port-name: ansible_internal_port3
+     auto_ip: false
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+
+- name: Assert two internal ports and no floating ips on server 2
+  assert:
+    that:
+      - info.openstack_servers|length == 1
+      - info.openstack_servers.0.public_v4|length == 0
+      - info.openstack_servers.0.public_v6|length == 0
+      - info.openstack_servers.0.addresses.ansible_internal|length == 2
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|sort|list ==
+        ["10.7.7.101", "10.7.7.102"]
+
+# Tests
+- name: Assign new floating IP to server from first available external network or nova pool
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: present
+     server: ansible_server1
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server1
+  register: info
+
+- name: Assert one internal port and one floating ip on server 1
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 2
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="OS-EXT-IPS:type")|sort|list ==
+        ["fixed", "floating"]
+
+- name: Detach floating IP from server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: absent
+     server: ansible_server1
+     network: public
+     floating_ip_address: "{{ (info.openstack_servers.0.addresses.ansible_internal|
+                               selectattr('OS-EXT-IPS:type', '==', 'floating')|map(attribute='addr')|list)[0] }}"
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server1
+  register: info
+  # When detaching a floating ip from an instance there might be a delay until openstack.cloud.server_info
+  # does not list it any more in info.openstack_servers.0.addresses.ansible_internal, so retry if necessary.
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 1
+
+- name: Assert one internal port on server 1
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 1
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|list == ["10.7.7.100"]
+
+- name: Assign floating IP to server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: present
+     reuse: yes
+     server: ansible_server2
+     network: public
+     fixed_address: 10.7.7.101
+     wait: true
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+
+- name: Assert two internal ports and one floating ip on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 3
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="OS-EXT-IPS:type")|sort|list ==
+        ["fixed", "fixed", "floating"]
+
+- name: Assign a second, specific floating IP to server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: present
+     reuse: yes
+     server: ansible_server2
+     network: ansible_external
+     fixed_address: 10.7.7.102
+     floating_ip_address: "10.6.6.150"
+
+# We cannot wait for second floating ip to be attached because OpenStackSDK checks only for first floating ip
+# Ref.: https://github.com/openstack/openstacksdk/blob/e0372b72af8c5f471fc17e53434d7a814ca958bd/openstack/cloud/_floating_ip.py#L733
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+  # retry because we cannot wait for second floating ip
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 4
+
+- name: Assert two internal ports and two floating ips on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 4
+      - ("10.6.6.150" in info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|sort|list)
+
+- name: Detach second floating IP from server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: absent
+     server: ansible_server2
+     network: ansible_external
+     floating_ip_address: "10.6.6.150"
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+  # When detaching a floating ip from an instance there might be a delay until openstack.cloud.server_info
+  # does not list it any more in info.openstack_servers.0.addresses.ansible_internal, so retry if necessary.
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 3
+
+- name: Assert two internal ports and one floating ip on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 3
+
+- name: Detach remaining floating IP from server
+  openstack.cloud.floating_ip:
+     cloud: "{{ cloud }}"
+     state: absent
+     server: ansible_server2
+     network: public
+     floating_ip_address: "{{ (info.openstack_servers.0.addresses.ansible_internal|
+                               selectattr('OS-EXT-IPS:type', '==', 'floating')|map(attribute='addr')|list)[0] }}"
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: ansible_server2
+  register: info
+  # When detaching a floating ip from an instance there might be a delay until openstack.cloud.server_info
+  # does not list it any more in info.openstack_servers.0.addresses.ansible_internal, so retry if necessary.
+  retries: 10
+  delay: 3
+  until: info.openstack_servers.0.addresses.ansible_internal|length == 2
+
+- name: Assert two internal ports on server 2
+  assert:
+    that:
+      - info.openstack_servers.0.addresses.ansible_internal|length == 2
+      - info.openstack_servers.0.addresses.ansible_internal|map(attribute="addr")|list == ["10.7.7.101", "10.7.7.102"]
+
+# Clean environment
+- name: Delete server with two nics
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_server2
+     wait: true
+
+- name: Delete server with one nic
+  openstack.cloud.server:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_server1
+     wait: true
+
+- name: Get all floating ips
+  openstack.cloud.floating_ip_info:
+     cloud: "{{ cloud }}"
+  register: fips
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Delete floating ip on public network if we created it
+  when: not public_network_had_fips
+  command: >
+    openstack --os-cloud={{ cloud }} floating ip delete
+        {{ fips.floating_ips|selectattr('floating_network_id', '==', public_network.openstack_networks.0.id)|
+           map(attribute="floating_ip_address")|list|join(' ') }}
+
+# TODO: Replace with appropriate Ansible module once available
+- name: Delete floating ip 1
+  command: openstack --os-cloud={{ cloud }} floating ip delete 10.6.6.150
+  when: fips.floating_ips|length > 0 and "10.6.6.150" in fips.floating_ips|map(attribute="floating_ip_address")|list
+
+- name: Get remaining floating ips on external network
+  openstack.cloud.floating_ip_info:
+     cloud: "{{ cloud }}"
+     floating_network: ansible_external
+  register: fips
+
+# TODO: Replace with appropriate Ansible module once available
+# The first, simple floating ip test might have allocated a floating ip on the external network.
+# This floating ip must be removed before external network can be deleted.
+- name: Delete remaining floating ips on external network
+  when: fips.floating_ips|length > 0
+  command: >
+    openstack --os-cloud={{ cloud }} floating ip delete
+        {{ fips.floating_ips|map(attribute="floating_ip_address")|list|join(' ') }}
+
+# Remove routers after floating ips have been detached and disassociated else removal fails with
+#  Error detaching interface from router ***: Client Error for url: ***,
+#  Router interface for subnet *** on router *** cannot be deleted, 
+#  as it is required by one or more floating IPs.
+
+- name: Delete router 2
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_router2
+
+- name: Delete router 1
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_router1
+
+- name: Delete internal port 3
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_port3
+
+- name: Delete internal port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_port2
+
+- name: Delete internal port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_port1
+
+- name: Delete internal subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal_subnet
+
+- name: Delete internal network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_internal
+
+- name: Delete external port 2
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external_port2
+
+- name: Delete external port 1
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external_port1
+
+- name: Delete external subnet
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external_subnet
+
+- name: Delete external network
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: ansible_external
--- a/ci/roles/floating_ip_info/tasks/main.yml
+++ b/ci/roles/floating_ip_info/tasks/main.yml
@@ -0,0 +1,11 @@
+---
+- name: Getting info about allocated ips
+  openstack.cloud.floating_ip_info:
+    cloud: "{{ cloud }}"
+  register: fips
+
+- name: assert result
+  assert:
+    that:
+      - fips is success
+      - fips is not changed
--- a/ci/roles/image/defaults/main.yml
+++ b/ci/roles/image/defaults/main.yml
@@ -1 +1,4 @@
 image_name: ansible_image
+image_tags:
+  - test
+  - ansible
--- a/ci/roles/image/tasks/main.yml
+++ b/ci/roles/image/tasks/main.yml
@@ -13,9 +13,20 @@
     name: "{{ image_name }}"
     filename: "{{ tmp_file.stdout }}"
     disk_format: raw
+     tags: "{{ image_tags }}"
  register: image

- debug: var=image
+- name: Get details of created image
+  openstack.cloud.image_info:
+    cloud: "{{ cloud }}"
+    image: "{{ image_name }}"
+  register: image_info_result
+
+- name: Verify image info
+  assert:
+    that:
+      - "image_info_result.openstack_image.name == image_name"
+      - "image_info_result.openstack_image.tags | sort == image_tags | sort"

 - name: Delete raw image (defaults)
  openstack.cloud.image:
@@ -40,8 +51,6 @@
        distro: ubuntu
  register: image

- debug: var=image
-
 - name: Delete raw image (complex)
  openstack.cloud.image:
     cloud: "{{ cloud }}"
@@ -52,3 +61,14 @@
  file:
     name: "{{ tmp_file.stdout }}"
     state: absent
+
+- name: Try to get details of deleted image
+  openstack.cloud.image_info:
+    cloud: "{{ cloud }}"
+    image: "{{ image_name }}"
+  register: deleted_image_info_result
+
+- name: Verify image is deleted
+  assert:
+    that:
+      - not deleted_image_info_result.openstack_image
--- a/ci/roles/keypair/tasks/main.yml
+++ b/ci/roles/keypair/tasks/main.yml
@@ -7,6 +7,17 @@
  register:
    keypair

+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs contains single element
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 1
+
 # This assert verifies that Ansible is capable serializing data returned by SDK
 - name: Ensure private key is returned
  assert:
@@ -19,6 +30,17 @@
      name: "{{ keypair_name }}"
      state: absent

+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs is empty
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 0
+
 - name: Generate test key file
  user:
      name: "{{ ansible_env.USER }}"
@@ -32,12 +54,34 @@
      state: present
      public_key_file: "{{ ansible_env.HOME }}/.ssh/shade_id_rsa.pub"

+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs contains single element
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 1
+
 - name: Delete keypair (file)
  openstack.cloud.keypair:
      cloud: "{{ cloud }}"
      name: "{{ keypair_name }}"
      state: absent

+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs is empty
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 0
+
 - name: Create keypair (key)
  openstack.cloud.keypair:
      cloud: "{{ cloud }}"
@@ -45,12 +89,34 @@
      state: present
      public_key: "{{ lookup('file', '~/.ssh/shade_id_rsa.pub') }}"

+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs contains single element
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 1
+
 - name: Delete keypair (key)
  openstack.cloud.keypair:
      cloud: "{{ cloud }}"
      name: "{{ keypair_name }}"
      state: absent

+- name: Get list of keypairs
+  openstack.cloud.keypair_info:
+    cloud: "{{ cloud }}"
+    name: "{{ keypair_name }}"
+  register: keypairs
+
+- name: Ensure that list of keypairs is empty
+  assert:
+    that:
+      - keypairs['openstack_keypairs']|length == 0
+
 - name: Delete test key pub file
  file:
      name: "{{ ansible_env.HOME }}/.ssh/shade_id_rsa.pub"
--- a/ci/roles/keystone_domain/tasks/main.yml
+++ b/ci/roles/keystone_domain/tasks/main.yml
@@ -1,19 +1,36 @@
 ---
 - name: Create keystone domain
  openstack.cloud.identity_domain:
-     cloud: "{{ cloud }}"
-     state: present
-     name: "{{ domain_name }}"
-     description: "test description"
+    cloud: "{{ cloud }}"
+    state: present
+    name: "{{ domain_name }}"
+    description: "test description"
+  register: os_domain
+
+- name: Test output
+  assert:
+    that:
+      - "'domain' in os_domain"
+      - os_domain.domain.name == "{{ domain_name }}"
+      - >-
+          ('enabled' in os_domain.domain.keys() and os_domain.domain['enabled']|bool) or
+          ('is_enabled' in os_domain.domain and os_domain.domain['is_enabled']|bool)
+      - os_domain.domain.description == "test description"

 - name: Update keystone domain
  openstack.cloud.identity_domain:
-     cloud: "{{ cloud }}"
-     name: "{{ domain_name }}"
-     description: "updated description"
+    cloud: "{{ cloud }}"
+    name: "{{ domain_name }}"
+    description: "updated description"
+  register: os_domain_updated
+
+- name: Test output
+  assert:
+    that:
+      - os_domain_updated.domain.description == "updated description"

 - name: Delete keystone domain
  openstack.cloud.identity_domain:
-     cloud: "{{ cloud }}"
-     state: absent
-     name: "{{ domain_name }}"
+    cloud: "{{ cloud }}"
+    state: absent
+    name: "{{ domain_name }}"
--- a/ci/roles/keystone_role/tasks/main.yml
+++ b/ci/roles/keystone_role/tasks/main.yml
@@ -5,6 +5,29 @@
     state: present
     name: "{{ role_name }}"

+- name: List keystone roles
+  openstack.cloud.identity_role_info:
+     cloud: "{{ cloud }}"
+  register: roles
+
+- name: Check roles
+  assert:
+    that:
+      - roles.openstack_roles | length > 0
+      - "'{{ role_name }}' in (roles.openstack_roles | map(attribute='name') | list)"
+
+- name: List keystone roles by name
+  openstack.cloud.identity_role_info:
+     cloud: "{{ cloud }}"
+     name: "{{ role_name}}"
+  register: roles1
+
+- name: Check roles
+  assert:
+    that:
+      - roles1.openstack_roles | length == 1
+      - roles1.openstack_roles[0]['name'] == role_name
+
 - name: Delete keystone role
  openstack.cloud.identity_role:
     cloud: "{{ cloud }}"
--- a/ci/roles/loadbalancer/defaults/main.yml
+++ b/ci/roles/loadbalancer/defaults/main.yml
@@ -0,0 +1,3 @@
+network_name: network_lb
+subnet_name: subnet_lb
+lb_name: test_lb
--- a/ci/roles/loadbalancer/tasks/main.yml
+++ b/ci/roles/loadbalancer/tasks/main.yml
@@ -0,0 +1,50 @@
+
+---
+- name: Create network {{ network_name }} for LB
+  openstack.cloud.network:
+    cloud: "{{ cloud }}"
+    name: "{{ network_name }}"
+    state: present
+
+- name: Create subnet {{ subnet_name }} on network {{ network_name }} for LB
+  openstack.cloud.subnet:
+    cloud: "{{ cloud }}"
+    network_name: "{{ network_name }}"
+    name: "{{ subnet_name }}"
+    state: present
+    enable_dhcp: true
+    dns_nameservers:
+      - 8.8.8.7
+      - 8.8.8.8
+    cidr: 192.168.0.0/24
+    gateway_ip: 192.168.0.1
+    allocation_pool_start: 192.168.0.2
+    allocation_pool_end: 192.168.0.254
+
+- name: Create loadbalancer - generic
+  openstack.cloud.loadbalancer:
+    cloud: "{{ cloud }}"
+    state: present
+    name: "{{ lb_name }}"
+    vip_subnet: "{{ subnet_name }}"
+    timeout: 450
+
+- name: Delete loadbalancer
+  openstack.cloud.loadbalancer:
+    cloud: "{{ cloud }}"
+    state: absent
+    name: "{{ lb_name }}"
+    timeout: 150
+
+- name: Delete subnet {{ subnet_name }} on network {{ network_name }}
+  openstack.cloud.subnet:
+    cloud: "{{ cloud }}"
+    network_name: "{{ network_name }}"
+    name: "{{ subnet_name }}"
+    state: absent
+
+- name: Delete network {{ network_name }} of LB
+  openstack.cloud.network:
+    cloud: "{{ cloud }}"
+    name: "{{ network_name }}"
+    state: absent
--- a/ci/roles/neutron_rbac/tasks/main.yml
+++ b/ci/roles/neutron_rbac/tasks/main.yml
@@ -0,0 +1,85 @@
+---
+# General run of tests
+# - Prepare projects/network objects
+# - Create rbac object
+# - Get rbac object info
+# - Verify RBAC object match
+# - Delete rbac object
+# - Get rbac object info
+# - Verify RBAC object deleted
+
+- name: Create source project
+  openstack.cloud.project:
+     cloud: "{{ cloud }}"
+     state: present
+     name: source_project
+     description: Source project for network RBAC test
+     domain_id: default
+     enabled: True
+  register: source_project
+
+- name: Create network - generic
+  openstack.cloud.network:
+     cloud: "{{ cloud }}"
+     name: "{{ network_name }}"
+     state: present
+     project: "{{ source_project.project.id }}"
+     shared: false
+     external: "{{ network_external }}"
+  register: network
+
+- name: Create target project
+  openstack.cloud.project:
+     cloud: "{{ cloud }}"
+     state: present
+     name: ansible_project
+     description: Target project for network RBAC test
+     domain_id: default
+     enabled: True
+  register: target_project
+
+- name: Create a new network RBAC policy
+  openstack.cloud.neutron_rbac_policy:
+    cloud: "{{ cloud }}"
+    object_id: "{{ network.network.id }}"
+    object_type: 'network'
+    action: 'access_as_shared'
+    target_project_id: "{{ target_project.project.id }}"
+    project_id: "{{ source_project.project.id }}"
+  register: rbac_policy
+
+- name: Get all rbac policies for {{ source_project.project.name }} - after creation
+  openstack.cloud.neutron_rbac_policies_info:
+    cloud: "{{ cloud }}"
+    project_id: "{{ source_project.project.id }}"
+  register: rbac_policies
+
+- name: Capture all existing policy IDs
+  set_fact:
+    rbac_policy_ids: "{{ rbac_policies.policies | map(attribute='id') | list }}"
+
+- name: Verify policy exists - after creation
+  assert:
+    that:
+      - rbac_policy.policy.id in rbac_policy_ids
+
+- name: Delete RBAC policy
+  openstack.cloud.neutron_rbac_policy:
+    cloud: "{{ cloud }}"
+    policy_id: "{{ rbac_policy.policy.id }}"
+    state: absent
+
+- name: Get all rbac policies for {{ source_project.project.name }} - after deletion
+  openstack.cloud.neutron_rbac_policies_info:
+    cloud: "{{ cloud }}"
+    project_id: "{{ source_project.project.id }}"
+  register: rbac_policies_remaining
+
+- name: Capture all remaining policy IDs
+  set_fact:
+    remaining_rbac_policy_ids: "{{ rbac_policies_remaining.policies | map(attribute='id') | list }}"
+
+- name: Verify policy does not exist - after deletion
+  assert:
+    that:
+      - not rbac_policy.policy.id in remaining_rbac_policy_ids
--- a/ci/roles/nova_services/tasks/main.yml
+++ b/ci/roles/nova_services/tasks/main.yml
@@ -0,0 +1,15 @@
+---
+
+- name: Get nova compute services info
+  openstack.cloud.compute_service_info:
+    cloud: "{{ cloud }}"
+    binary: "nova-compute"
+  register: result
+  failed_when: "result.openstack_compute_services | length <= 0"
+
+- name: Get nova conductor services info
+  openstack.cloud.compute_service_info:
+    cloud: "{{ cloud }}"
+    binary: "nova-conductor"
+  register: result
+  failed_when: "result.openstack_compute_services | length <= 0"
--- a/ci/roles/object_container/defaults/main.yml
+++ b/ci/roles/object_container/defaults/main.yml
@@ -0,0 +1 @@
+container_name: "test-container"
--- a/ci/roles/object_container/tasks/main.yml
+++ b/ci/roles/object_container/tasks/main.yml
@@ -0,0 +1,60 @@
+---
+- module_defaults:
+    openstack.cloud.object_container:
+      cloud: "{{ cloud }}"
+  block:
+    - name: Create an empty container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+      register: container
+
+    - name: Verify container was created
+      assert:
+        that:
+          - container is success
+          - container is changed
+          - container.container.name == container_name
+
+    - name: Set metadata for a container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        metadata: "Cache-Control='no-cache'"
+      register: set_meta
+
+    - name: Verify container metadata was set
+      assert:
+        that:
+          - set_meta is success
+          - set_meta is changed
+
+    - name: Delete some keys from container metadata
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        keys:
+            - Cache-Control
+      register: delete_meta
+
+    - name: Verify some keys from container metadata was deleted
+      assert:
+        that:
+          - delete_meta is success
+          - delete_meta is changed
+
+    - name: Delete container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        state: absent
+      register: deleted
+
+    - name: Verify container was deleted
+      assert:
+        that:
+          - deleted is success
+          - deleted is changed
+
+  always:
+    - name: Delete container
+      openstack.cloud.object_container:
+        container: "{{ container_name }}"
+        state: absent
+      ignore_errors: yes
--- a/ci/roles/orchestration/defaults/main.yaml
+++ b/ci/roles/orchestration/defaults/main.yaml
@@ -0,0 +1,2 @@
+---
+stack_name: "test-stack"
--- a/ci/roles/orchestration/files/hello-world.yaml
+++ b/ci/roles/orchestration/files/hello-world.yaml
@@ -0,0 +1,11 @@
+#
+# Minimal HOT template defining a single compute server.
+#
+heat_template_version: 2013-05-23
+
+description: >
+  Minimal HOT template for stack
+
+parameters:
+resources:
+outputs:
--- a/ci/roles/orchestration/tasks/main.yaml
+++ b/ci/roles/orchestration/tasks/main.yaml
@@ -0,0 +1,44 @@
+---
+- name: Create minimal stack
+  openstack.cloud.stack:
+    cloud: "{{ cloud }}"
+    # template is searched related to playbook location or as absolute path
+    template: "roles/orchestration/files/hello-world.yaml"
+    name: "{{ stack_name }}"
+
+- name: List stacks
+  openstack.cloud.stack_info:
+    cloud: "{{ cloud }}"
+  register: stacks
+
+- assert:
+    that:
+      - stacks['stacks']|length > 0
+
+- name: Get Single stack
+  openstack.cloud.stack_info:
+    cloud: "{{ cloud }}"
+    name: "{{ stack_name }}"
+  register: test_stack
+
+- assert:
+    that:
+      - test_stack is defined
+      - test_stack['stacks'][0]['name'] == stack_name
+
+- name: Delete stack
+  openstack.cloud.stack:
+    cloud: "{{ cloud }}"
+    name: "{{ stack_name }}"
+    state: absent
+
+- name: Get Single stack
+  openstack.cloud.stack_info:
+    cloud: "{{ cloud }}"
+    name: "{{ stack_name }}"
+  register: stacks
+
+- assert:
+    that:
+      - stacks is defined
+      - stacks['stacks']|length == 0
--- a/ci/roles/port/defaults/main.yml
+++ b/ci/roles/port/defaults/main.yml
@@ -4,3 +4,6 @@ subnet_name: ansible_port_subnet
 port_name: ansible_port
 secgroup_name: ansible_port_secgroup
 no_security_groups: True
+binding_profile:
+  "pci_slot": "0000:03:11.1"
+  "physical_network": "provider"
--- a/ci/roles/port/tasks/main.yml
+++ b/ci/roles/port/tasks/main.yml
@@ -60,6 +60,26 @@
     state: absent
     name: "{{ port_name }}"

+- name: Create port (with dns_name, dns_domain)
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ port_name }}"
+     network: "{{ network_name }}"
+     fixed_ips:
+       - ip_address: 10.5.5.69
+     dns_name: "dns-port-name"
+     dns_domain: "example.com."
+  register: port
+
+- debug: var=port
+
+- name: Delete port (with dns name,domain)
+  openstack.cloud.port:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: "{{ port_name }}"
+
 - name: Create port (with allowed_address_pairs and extra_dhcp_opts)
  openstack.cloud.port:
     cloud: "{{ cloud }}"
@@ -88,6 +108,30 @@
     state: absent
     name: "{{ secgroup_name }}"

+- name: Test port binding config (runs from train release sdk > 0.28)
+  block:
+    - name: Create port (with binding profile)
+      openstack.cloud.port:
+        cloud: "{{ cloud }}"
+        state: present
+        name: "{{ port_name }}"
+        network: "{{ network_name }}"
+        binding_profile: "{{ binding_profile }}"
+      register: port
+
+    - name: Assert binding:profile exists in created port
+      assert:
+        that: "port.port['binding_profile']"
+
+    - debug: var=port
+
+    - name: Delete port (with binding profile)
+      openstack.cloud.port:
+        cloud: "{{ cloud }}"
+        state: absent
+        name: "{{ port_name }}"
+  when: sdk_version is version(0.28, '>')
+
 - name: Delete subnet
  openstack.cloud.subnet:
     cloud: "{{ cloud }}"
--- a/ci/roles/project_properties/defaults/main.yml
+++ b/ci/roles/project_properties/defaults/main.yml
@@ -1,2 +0,0 @@
-dummy_value: 'test-value'
-dummy_value_updated: 'test-value-updated'
--- a/ci/roles/project_properties/tasks/main.yml
+++ b/ci/roles/project_properties/tasks/main.yml
@@ -1,142 +0,0 @@
---
- name: 'Create project with properties - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-     cloud: "{{ cloud }}"
-     state: present
-     name: ansible_project
-     description: dummy description
-     domain_id: default
-     enabled: True
-     properties:
-       dummy_key: '{{ dummy_value }}'
-  register: create_project_cm
- assert:
-    that:
-      - create_project_cm is successful
-      - create_project_cm is changed
-
- name: 'Create project with properties'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: dummy description
-    domain_id: default
-    enabled: True
-    properties:
-      dummy_key: '{{ dummy_value }}'
-  register: create_project
- assert:
-    that:
-    - create_project is successful
-    - create_project is changed
-    - '"project" in create_project'
-    - '"dummy_key" in create_project["project"]'
-    - create_project["project"].dummy_key == dummy_value
-
- name: 'Create project with properties (retry - no change) - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: dummy description
-    domain_id: default
-    enabled: True
-    properties:
-      dummy_key: '{{ dummy_value }}'
-  register: create_project_retry_cm
- assert:
-    that:
-      - create_project_retry_cm is successful
-      - create_project_retry_cm is not changed
-
- name: 'Create project with properties (retry - no change)'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: dummy description
-    domain_id: default
-    enabled: True
-    properties:
-      dummy_key: '{{ dummy_value }}'
-  register: create_project_retry
- assert:
-    that:
-    - create_project_retry is successful
-    - create_project_retry is not changed
-    - '"project" in create_project_retry'
-    - '"dummy_key" in create_project_retry["project"]'
-    - create_project_retry["project"].dummy_key == dummy_value
-
- name: 'Update project with properties - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-     cloud: "{{ cloud }}"
-     state: present
-     name: ansible_project
-     description: new description
-     properties:
-       dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project_cm
- assert:
-    that:
-      - updated_project_cm is successful
-      - updated_project_cm is changed
-
- name: 'Update project with properties'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: new description
-    properties:
-      dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project
- assert:
-    that:
-    - updated_project is successful
-    - updated_project is changed
-    - '"project" in updated_project'
-    - '"dummy_key" in updated_project["project"]'
-    - updated_project["project"].dummy_key == dummy_value_updated
-
- name: 'Update project with properties (retry - no change) - CHECK_MODE'
-  check_mode: yes
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: new description
-    properties:
-      dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project_retry_cm
- assert:
-    that:
-      - updated_project_retry_cm is successful
-      - updated_project_retry_cm is not changed
-
- name: 'Update project with properties (retry - no change)'
-  openstack.cloud.project:
-    cloud: "{{ cloud }}"
-    state: present
-    name: ansible_project
-    description: new description
-    properties:
-      dummy_key: '{{ dummy_value_updated }}'
-  register: updated_project_retry
- assert:
-    that:
-    - updated_project_retry is successful
-    - updated_project_retry is not changed
-    - '"project" in updated_project_retry'
-    - '"dummy_key" in updated_project_retry["project"]'
-    - updated_project_retry["project"].dummy_key == dummy_value_updated
-
- name: Delete project with properties
-  openstack.cloud.project:
-     cloud: "{{ cloud }}"
-     state: absent
-     name: ansible_project
--- a/ci/roles/router/tasks/main.yml
+++ b/ci/roles/router/tasks/main.yml
@@ -15,6 +15,30 @@
     name: shade_subnet1
     cidr: 10.7.7.0/24

+- name: Create subnet2
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: "{{ network_name }}"
+     name: shade_subnet2
+     cidr: 10.8.8.0/24
+
+- name: Create subnet3
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: "{{ network_name }}"
+     name: shade_subnet3
+     cidr: 10.9.9.0/24
+
+- name: Create subnet4
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: present
+     network_name: "{{ network_name }}"
+     name: shade_subnet4
+     cidr: 10.10.10.0/24
+
 - name: Create router
  openstack.cloud.router:
     cloud: "{{ cloud }}"
@@ -29,6 +53,19 @@
     interfaces:
         - shade_subnet1

+- name: Update router (add interface) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
 - name: Gather routers info
  openstack.cloud.routers_info:
     cloud: "{{ cloud }}"
@@ -43,6 +80,93 @@
      - "result.openstack_routers.0.name == router_name"
      - (result.openstack_routers.0.interfaces_info|length) == 1

+- name: Update router (change interfaces)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet2
+           portip: 10.8.8.1
+         - net: '{{ network_name }}'
+           subnet: shade_subnet3
+         - shade_subnet4
+
+- name: Update router (change interfaces) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet2
+           portip: 10.8.8.1
+         - net: '{{ network_name }}'
+           subnet: shade_subnet3
+         - shade_subnet4
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.interfaces_info|length) == 3
+      - result.openstack_routers.0.interfaces_info|map(attribute='ip_address')|sort|list ==
+        ['10.10.10.1', '10.8.8.1', '10.9.9.1']
+
+- name: Update router (remove interface)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet1
+           portip: 10.7.7.1
+
+- name: Update router (remove interface) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - net: '{{ network_name }}'
+           subnet: shade_subnet1
+           portip: 10.7.7.1
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.interfaces_info|length) == 1
+      - result.openstack_routers.0.interfaces_info.0.ip_address == '10.7.7.1'
+
 # Admin operation
 - name: Create external network
  openstack.cloud.network:
@@ -53,12 +177,12 @@
  when:
    - network_external

- name: Create subnet2
+- name: Create subnet5
  openstack.cloud.subnet:
     cloud: "{{ cloud }}"
     state: present
     network_name: "{{ external_network_name }}"
-     name: shade_subnet2
+     name: shade_subnet5
     cidr: 10.6.6.0/24
  when:
    - network_external
@@ -88,6 +212,142 @@
      - "result.openstack_routers.0.name == router_name"
      - (result.openstack_routers.0.interfaces_info|length) == 1

+- name: Update router (change external fixed ips)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.100
+  when:
+    - network_external
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.external_gateway_info.external_fixed_ips|length) == 1
+      - result.openstack_routers.0.external_gateway_info.external_fixed_ips.0.ip_address == "10.6.6.100"
+  when:
+    - network_external
+
+- name: Update router (add external fixed ips)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.100
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+
+- name: Update router (add external fixed ips) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.100
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.external_gateway_info.external_fixed_ips|length) == 2
+      - result.openstack_routers.0.external_gateway_info.external_fixed_ips|map(attribute='ip_address')|sort|list ==
+        ["10.6.6.100", "10.6.6.101"]
+  when:
+    - network_external
+
+- name: Update router (remove external fixed ips)
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+
+- name: Update router (remove external fixed ips) again
+  openstack.cloud.router:
+     cloud: "{{ cloud }}"
+     state: present
+     name: "{{ router_name }}"
+     interfaces:
+         - shade_subnet1
+     network: "{{ external_network_name }}"
+     external_fixed_ips:
+        - subnet: shade_subnet5
+          ip: 10.6.6.101
+  when:
+    - network_external
+  register: result
+
+- name: Assert idempotent module
+  assert:
+    that: result is not changed
+
+- name: Gather routers info
+  openstack.cloud.routers_info:
+     cloud: "{{ cloud }}"
+     name: "{{ router_name }}"
+     filters:
+       admin_state_up: true
+  register: result
+
+- name: Verify routers info
+  assert:
+    that:
+      - "result.openstack_routers.0.name == router_name"
+      - (result.openstack_routers.0.external_gateway_info.external_fixed_ips|length) == 1
+      - result.openstack_routers.0.external_gateway_info.external_fixed_ips.0.ip_address == "10.6.6.101"
+  when:
+    - network_external
+
 - name: Delete router
  openstack.cloud.router:
     cloud: "{{ cloud }}"
@@ -105,6 +365,24 @@
     cloud: "{{ cloud }}"
     state: absent
     name: shade_subnet2
+
+- name: Delete subnet3
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: shade_subnet3
+
+- name: Delete subnet4
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: shade_subnet4
+
+- name: Delete subnet5
+  openstack.cloud.subnet:
+     cloud: "{{ cloud }}"
+     state: absent
+     name: shade_subnet5
  when:
    - network_external

--- a/ci/roles/security_group/tasks/main.yml
+++ b/ci/roles/security_group/tasks/main.yml
@@ -101,6 +101,71 @@
     remote_ip_prefix: 0.0.0.0/0
     direction: egress

+- name: List all available rules of all security groups in a project
+  openstack.cloud.security_group_rule_info:
+     cloud: "{{ cloud }}"
+  when: sdk_version is version("0.32", '>=')
+  register: test_sec_rules
+
+- name: Check - List all available rules of all security groups in a project
+  assert:
+    that:
+      - test_sec_rules.security_group_rules | length > 0
+  when: sdk_version is version("0.32", '>=')
+
+- name: List all available rules of a specific security group
+  openstack.cloud.security_group_rule_info:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+  register: test_sec_rule1
+
+- name: Check - List all available rules of a specific security group
+  assert:
+    that:
+      - test_sec_rule1.security_group_rules | length > 0
+
+- name: List all available rules with filters
+  openstack.cloud.security_group_rule_info:
+     cloud: "{{ cloud }}"
+     security_group: "{{ secgroup_name }}"
+     protocol: tcp
+     port_range_min: 80
+     port_range_max: 80
+     remote_ip_prefix: 0.0.0.0/0
+  when: sdk_version is version("0.32", '>=')
+  register: test_sec_rule
+
+- name: Check - List all available rules with filters
+  assert:
+    that:
+      - test_sec_rule.security_group_rules | length == 1
+  when: sdk_version is version("0.32", '>=')
+
+- name: List all security groups of a project
+  openstack.cloud.security_group_info:
+     cloud: "{{ cloud }}"
+  register: test_sec_groups
+
+- name: Check - List all security groups of a project
+  assert:
+    that:
+      - test_sec_groups.security_groups | length > 0
+
+- name: Filter security group by name
+  openstack.cloud.security_group_info:
+     cloud: "{{ cloud }}"
+     name: "{{ secgroup_name }}"
+  register: test_sec_group
+
+- name: Check - List all security groups of a project
+  assert:
+    that:
+      - test_sec_group.security_groups | length  == 1
+      - test_sec_group.security_groups[0]['name'] == secgroup_name
+  # This fails on Stein only
+  when: sdk_version is version("0.36.5", '>=')
+
+
 - name: Delete empty ICMP rule
  openstack.cloud.security_group_rule:
     cloud: "{{ cloud }}"
--- a/ci/roles/server/tasks/server_actions.yml
+++ b/ci/roles/server/tasks/server_actions.yml
@@ -418,3 +418,103 @@
    that:
      - info19.openstack_servers.0.status in ('ACTIVE', 'REBUILD')
      - server is changed
+
+- name: Shelve server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: shelve
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info20
+
+- name: Ensure status for server is SHELVED or SHELVED_OFFLOADED
+  assert:
+    that:
+      - info20.openstack_servers.0.status in ['SHELVED', 'SHELVED_OFFLOADED']
+      - server is changed
+
+- name: Shelve offload server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: shelve_offload
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info21
+
+- name: Ensure status for server is SHELVED_OFFLOADED
+  # no change if server has been offloaded automatically after first shelve command
+  assert:
+    that:
+      - info21.openstack_servers.0.status == 'SHELVED_OFFLOADED'
+
+- name: Shelve offload server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: shelve_offload
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info22
+
+- name: Ensure status for server is SHELVED_OFFLOADED
+  assert:
+    that:
+      - info22.openstack_servers.0.status == 'SHELVED_OFFLOADED'
+      - server is not changed
+
+- name: Unshelve server
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unshelve
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info23
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info23.openstack_servers.0.status == 'ACTIVE'
+      - server is changed
+
+- name: Unshelve server again
+  openstack.cloud.server_action:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+    action: unshelve
+    wait: true
+  register: server
+
+- name: Get info about server
+  openstack.cloud.server_info:
+    cloud: "{{ cloud }}"
+    server: "{{ server_name }}"
+  register: info24
+
+- name: Ensure status for server is ACTIVE
+  assert:
+    that:
+      - info24.openstack_servers.0.status == 'ACTIVE'
+      - server is not changed
--- a/ci/roles/subnet/tasks/subnet-allocation.yml
+++ b/ci/roles/subnet/tasks/subnet-allocation.yml
@@ -37,6 +37,7 @@
    name: "{{ subnet_name }}"
    state: present
    cidr: 192.168.0.0/24
+    gateway_ip: 192.168.0.1
    allocation_pool_start: 192.168.0.2
    allocation_pool_end: 192.168.0.8

--- a/ci/roles/volume/tasks/main.yml
+++ b/ci/roles/volume/tasks/main.yml
@@ -21,7 +21,7 @@
    cloud: "{{ cloud }}"
    name: ansible_volume_snapshot
  register: snap_info
-  ignore_errors: sdk_version is version(0.49, '<')
+  ignore_errors: sdk_version is version('0.49', '<')

 - name: Create volume backup
  openstack.cloud.volume_backup:
@@ -30,14 +30,14 @@
    display_name: ansible_volume_backup
    volume: ansible_volume
  register: vol_backup
-  ignore_errors: sdk_version is version(0.49, '<')
+  ignore_errors: sdk_version is version('0.49', '<')

 - name: Get backup info
  openstack.cloud.volume_backup_info:
    cloud: "{{ cloud }}"
    name: ansible_volume_backup
  register: backup_info
-  ignore_errors: sdk_version is version(0.49, '<')
+  ignore_errors: sdk_version is version('0.49', '<')

 - debug: var=vol

@@ -68,4 +68,3 @@
     display_name: ansible_volume

 - include_tasks: volume_info.yml
-
--- a/ci/run-ansible-tests-collection.sh
+++ b/ci/run-ansible-tests-collection.sh
@@ -106,12 +106,34 @@ then
  exit 1
 fi

+# In case of Octavia enabled:
+_octavia_image_path="/tmp/test-only-amphora-x64-haproxy-ubuntu-bionic.qcow2"
+if systemctl list-units --full -all | grep -Fq "devstack@o-api.service" && \
+  test -f "$_octavia_image_path"
+then
+    # Upload apmhora image for Octavia to test load balancers
+    OCTAVIA_AMP_IMAGE_FILE=${OCTAVIA_AMP_IMAGE_FILE:-"$_octavia_image_path"}
+    OCTAVIA_AMP_IMAGE_NAME=${OCTAVIA_AMP_IMAGE_NAME:-"test-only-amphora-x64-haproxy-ubuntu-bionic"}
+    OCTAVIA_AMP_IMAGE_SIZE=${OCTAVIA_AMP_IMAGE_SIZE:-3}
+    openstack --os-cloud=${CLOUD} image create \
+        --container-format bare \
+        --disk-format qcow2 \
+        --private \
+        --file $OCTAVIA_AMP_IMAGE_FILE \
+        --project service $OCTAVIA_AMP_IMAGE_NAME
+    openstack --os-cloud=${CLOUD} image set --tag amphora $OCTAVIA_AMP_IMAGE_NAME
+    # End of Octavia preparement
+else
+    tag_opt="$tag_opt --skip-tags loadbalancer"
+fi
+
 # Discover openstackSDK version
 SDK_VER=$(python -c "import openstack; print(openstack.version.__version__)")
 pushd ci/
 # run tests
+set -o pipefail
 ANSIBLE_COLLECTIONS_PATHS=$TEST_COLLECTIONS_PATHS ansible-playbook \
    -vvv ./run-collection.yml \
    -e "sdk_version=${SDK_VER} cloud=${CLOUD} image=${IMAGE} ${ANSIBLE_VARS}" \
-    ${tag_opt}
+    ${tag_opt} 2>&1 | sudo tee /opt/stack/logs/test_output.log
 popd
--- a/ci/run-collection.yml
+++ b/ci/run-collection.yml
@@ -4,12 +4,18 @@
  gather_facts: true

  roles:
+    - { role: address_scope, tags: address_scope }
    - { role: auth, tags: auth }
    - { role: client_config, tags: client_config }
+    - { role: dns_zone_info, tags: dns_zone_info }
+    - role: object_container
+      tags: object_container
+      when: sdk_version is version(0.18, '>=')
    - { role: group, tags: group }
    - role: dns
      tags: dns
      when: sdk_version is version(0.28, '>=')
+    - { role: floating_ip_info, tags: floating_ip_info }
    - { role: image, tags: image }
    - { role: keypair, tags: keypair }
    - { role: keystone_domain, tags: keystone_domain }
@@ -24,13 +30,17 @@
      when: sdk_version is version(0.44, '>=')
    - { role: keystone_role, tags: keystone_role }
    - { role: network, tags: network }
+    - role: neutron_rbac
+      tags:
+        - rbac
+        - neutron_rbac
    - { role: nova_flavor, tags: nova_flavor }
+    - role: nova_services
+      tags: nova_services
+      when: sdk_version is version(0.44, '>=')
    - { role: object, tags: object }
    - { role: port, tags: port }
    - { role: project, tags: project }
-    - role: project_properties
-      tags: project_properties
-      when: sdk_version is version("0.45.01", '>')
    - { role: router, tags: router }
    - { role: security_group, tags: security_group }
    - { role: server, tags: server }
@@ -39,3 +49,9 @@
    - { role: user_group, tags: user_group }
    - { role: user_role, tags: user_role }
    - { role: volume, tags: volume }
+    - role: orchestration
+      tags: orchestrate
+      when: sdk_version is version("0.53.0", '>=')
+    - role: loadbalancer
+      tags: loadbalancer
+    - { role: floating_ip, tags: floating_ip }
--- a/docs/openstack_guidelines.rst
+++ b/docs/openstack_guidelines.rst
@@ -58,10 +58,10 @@ Libraries
  users as a primary audience, they are for intra-server communication.
 * All modules should be registered in ``meta/action_groups.yml`` for enabling the
  variables to be set in `group level
-  <https://docs.ansible.com/ansible/latest/user_guide/playbooks_module_defaults.html>`.
+  <https://docs.ansible.com/ansible/latest/user_guide/playbooks_module_defaults.html>`_.

 Testing
 -------

 * Integration testing is currently done in `OpenStack's CI system
-  <https://opendev.org/openstack/ansible-collections-openstack/src/branch/master/zuul.yaml>`
+  <https://opendev.org/openstack/ansible-collections-openstack/src/branch/master/.zuul.yaml>`_
--- a/galaxy.yml
+++ b/galaxy.yml
@@ -18,7 +18,7 @@ build_ignore:
  - ci
  - galaxy.yml.in
  - setup.cfg
-  - test-requirements.txt
+  - test-requirements*
  - tests
  - tools
  - tox.ini
@@ -29,8 +29,8 @@ build_ignore:
  - importer_result.json
  - .tox
  - .env
+  - .vscode
  - ansible_collections_openstack.egg-info
  - contrib
-  - changelogs/.plugin-cache.yaml
-  - changelogs/fragments
-version: 1.2.1
+  - changelogs
+version: 1.7.1
--- a/meta/runtime.yml
+++ b/meta/runtime.yml
@@ -1,5 +1,7 @@
+requires_ansible: ">=2.8"
 action_groups:
  openstack:
+    - address_scope
    - auth
    - baremetal_inspect
    - baremetal_inspect
@@ -7,6 +9,9 @@ action_groups:
    - baremetal_node
    - baremetal_node_action
    - baremetal_node_action
+    - baremetal_node_info
+    - baremetal_port_info
+    - baremetal_port
    - catalog_endpoint
    - catalog_service
    - catalog_service
@@ -17,10 +22,12 @@ action_groups:
    - compute_flavor
    - compute_flavor_info
    - compute_flavor_info
+    - compute_service_info
+    - compute_service_info
    - config
    - config
    - dns_zone
-    - dns_zone
+    - dns_zone_info
    - endpoint
    - endpoint
    - federation_idp
@@ -32,6 +39,7 @@ action_groups:
    - federation_mapping_info
    - federation_mapping_info
    - floating_ip
+    - floating_ip_info
    - group_assignment
    - group_assignment
    - host_aggregate
@@ -53,6 +61,7 @@ action_groups:
    - image
    - image_info
    - keypair
+    - keypair_info
    - keystone_federation_protocol
    - keystone_federation_protocol_info
    - lb_listener
@@ -65,6 +74,7 @@ action_groups:
    - network
    - networks_info
    - object
+    - object_container
    - port
    - port_info
    - project
@@ -77,7 +87,9 @@ action_groups:
    - router
    - routers_info
    - security_group
+    - security_group_info
    - security_group_rule
+    - security_group_rule_info
    - server
    - server_action
    - server_group
@@ -147,6 +159,7 @@ action_groups:
    - image
    - image_info
    - keypair
+    - keypair_info
    - keystone_federation_protocol
    - keystone_federation_protocol_info
    - lb_listener
@@ -159,6 +172,7 @@ action_groups:
    - network
    - networks_info
    - object
+    - object_container
    - port
    - port_info
    - project
@@ -171,7 +185,9 @@ action_groups:
    - router
    - routers_info
    - security_group
+    - security_group_info
    - security_group_rule
+    - security_group_rule_info
    - server
    - server_action
    - server_group
--- a/plugins/doc_fragments/openstack.py
+++ b/plugins/doc_fragments/openstack.py
@@ -61,7 +61,6 @@ options:
      - Whether or not SSL API requests should be verified.
      - Before Ansible 2.3 this defaulted to C(yes).
    type: bool
-    default: False
    aliases: [ verify ]
  ca_cert:
    description:
--- a/plugins/inventory/openstack.py
+++ b/plugins/inventory/openstack.py
@@ -9,7 +9,6 @@
 DOCUMENTATION = '''
 ---
 name: openstack
-plugin_type: inventory
 author: OpenStack Ansible SIG
 short_description: OpenStack inventory source
 requirements:
@@ -22,7 +21,7 @@ options:
    plugin:
        description: token that ensures this is a source file for the 'openstack' plugin.
        required: True
-        choices: ['openstack']
+        choices: ['openstack', 'openstack.cloud.openstack']
    show_all:
        description: toggles showing all vms vs only those with a working IP
        type: bool
@@ -42,6 +41,13 @@ options:
            - name
            - uuid
        default: "name"
+    use_names:
+        description: |
+            Use the host's 'name' instead of 'interface_ip' for the 'ansible_host' and
+            'ansible_ssh_host' facts. This might be desired when using jump or
+            bastion hosts and the name is the FQDN of the host.
+        type: bool
+        default: 'no'
    expand_hostvars:
        description: |
            Run extra commands on each host to fill in additional
@@ -98,6 +104,10 @@ options:
        description: Add hosts to group based on Jinja2 conditionals.
        type: dictionary
        default: {}
+    legacy_groups:
+        description: Automatically create groups from host variables.
+        type: bool
+        default: true

 extends_documentation_fragment:
 - inventory_cache
@@ -108,7 +118,7 @@ extends_documentation_fragment:
 EXAMPLES = '''
 # file must be named openstack.yaml or openstack.yml
 # Make the plugin behave like the default behavior of the old script
-plugin: openstack
+plugin: openstack.cloud.openstack
 expand_hostvars: yes
 fail_on_errors: yes
 all_projects: yes
@@ -155,7 +165,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
        msg = ''
        if not self._config_data:
            msg = 'File empty. this is not my config file'
-        elif 'plugin' in self._config_data and self._config_data['plugin'] != self.NAME:
+        elif 'plugin' in self._config_data and self._config_data['plugin'] not in (self.NAME, 'openstack'):
            msg = 'plugin config file, but not for us: %s' % self._config_data['plugin']
        elif 'plugin' not in self._config_data and 'clouds' not in self._config_data:
            msg = "it's not a plugin configuration nor a clouds.yaml file"
@@ -233,6 +243,7 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
            expand_hostvars = self._config_data.get('expand_hostvars', False)
            fail_on_errors = self._config_data.get('fail_on_errors', False)
            all_projects = self._config_data.get('all_projects', False)
+            self.use_names = self._config_data.get('use_names', False)

            source_data = []
            try:
@@ -307,7 +318,11 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):
        for group_name, group_hosts in groups.items():
            gname = self.inventory.add_group(group_name)
            for host in group_hosts:
-                self.inventory.add_child(gname, host)
+                if gname == host:
+                    display.vvvv("Same name for host %s and group %s" % (host, gname))
+                    self.inventory.add_host(host, gname)
+                else:
+                    self.inventory.add_child(gname, host)

    def _get_groups_from_server(self, server_vars, namegroup=True):
        groups = []
@@ -355,14 +370,25 @@ class InventoryModule(BaseInventoryPlugin, Constructable, Cacheable):

    def _append_hostvars(self, hostvars, groups, current_host,
                         server, namegroup=False):
-        hostvars[current_host] = dict(
-            ansible_ssh_host=server['interface_ip'],
-            ansible_host=server['interface_ip'],
-            openstack=server)
+        if not self.use_names:
+            hostvars[current_host] = dict(
+                ansible_ssh_host=server['interface_ip'],
+                ansible_host=server['interface_ip'],
+                openstack=server,
+            )
+
+        if self.use_names:
+            hostvars[current_host] = dict(
+                ansible_ssh_host=server['name'],
+                ansible_host=server['name'],
+                openstack=server,
+            )
+
        self.inventory.add_host(current_host)

-        for group in self._get_groups_from_server(server, namegroup=namegroup):
-            groups[group].append(current_host)
+        if self.get_option('legacy_groups'):
+            for group in self._get_groups_from_server(server, namegroup=namegroup):
+                groups[group].append(current_host)

    def verify_file(self, path):

--- a/plugins/module_utils/openstack.py
+++ b/plugins/module_utils/openstack.py
@@ -120,7 +120,7 @@ def openstack_full_argument_spec(**kwargs):
        auth=dict(default=None, type='dict', no_log=True),
        region_name=dict(default=None),
        availability_zone=dict(default=None),
-        validate_certs=dict(default=False, type='bool', aliases=['verify']),
+        validate_certs=dict(default=None, type='bool', aliases=['verify']),
        ca_cert=dict(default=None, aliases=['cacert']),
        client_cert=dict(default=None, aliases=['cert']),
        client_key=dict(default=None, no_log=True, aliases=['key']),
@@ -256,10 +256,12 @@ class OpenStackModule:
            **self.module_kwargs)
        self.params = self.ansible.params
        self.module_name = self.ansible._name
+        self.check_mode = self.ansible.check_mode
        self.sdk_version = None
        self.results = {'changed': False}
        self.exit = self.exit_json = self.ansible.exit_json
        self.fail = self.fail_json = self.ansible.fail_json
+        self.warn = self.ansible.warn
        self.sdk, self.conn = self.openstack_cloud_from_module()
        self.check_deprecated_names()

@@ -290,7 +292,7 @@ class OpenStackModule:
                "The '%s' module has been renamed to '%s' in openstack "
                "collection: openstack.cloud.%s" % (
                    self.module_name, new_module_name, new_module_name),
-                version='2.10')
+                version='2.0.0', collection_name='openstack.cloud')

    def openstack_cloud_from_module(self):
        """Sets up connection to cloud using provided options. Checks if all
--- a/plugins/modules/address_scope.py
+++ b/plugins/modules/address_scope.py
@@ -0,0 +1,201 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Uemit Seren <uemit.seren@gmail.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: address_scope
+short_description: Create or delete address scopes from OpenStack
+author: OpenStack Ansible SIG
+description:
+   - Create or Delete address scopes from OpenStack.
+options:
+   state:
+     description:
+        - Indicate desired state of the resource
+     choices: ['present', 'absent']
+     default: present
+     type: str
+   name:
+     description:
+        - Name to be give to the address scope
+     required: true
+     type: str
+   project:
+     description:
+        - Unique name or ID of the project.
+     type: str
+   ip_version:
+     description:
+        - The IP version of the subnet 4 or 6
+     default: 4
+     type: str
+     choices: ['4', '6']
+   shared:
+     description:
+        - Whether this address scope is shared or not.
+     type: bool
+     default: 'no'
+   extra_specs:
+     description:
+        - Dictionary with extra key/value pairs passed to the API
+     required: false
+     default: {}
+     type: dict
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Create an IPv4 address scope.
+- openstack.cloud.address_scope:
+    cloud: mycloud
+    state: present
+    name: my_adress_scope
+
+# Create a shared IPv6 address scope for a given project.
+- openstack.cloud.address_scope:
+    cloud: mycloud
+    state: present
+    ip_version: 6
+    name: ipv6_address_scope
+    project: myproj
+
+# Delete address scope.
+- openstack.cloud.address_scope:
+    cloud: mycloud
+    state: absent
+    name: my_adress_scope
+'''
+
+RETURN = '''
+address_scope:
+    description: Dictionary describing the address scope.
+    returned: On success when I(state) is 'present'
+    type: complex
+    contains:
+        id:
+            description: Address Scope ID.
+            type: str
+            sample: "474acfe5-be34-494c-b339-50f06aa143e4"
+        name:
+            description: Address Scope name.
+            type: str
+            sample: "my_address_scope"
+        tenant_id:
+            description: The tenant ID.
+            type: str
+            sample: "861174b82b43463c9edc5202aadc60ef"
+        ip_version:
+            description: The IP version of the subnet 4 or 6.
+            type: str
+            sample: "4"
+        is_shared:
+            description: Indicates whether this address scope is shared across all tenants.
+            type: bool
+            sample: false
+
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class AddressScopeModule(OpenStackModule):
+    argument_spec = dict(
+        state=dict(default='present', choices=['absent', 'present']),
+        name=dict(required=True),
+        shared=dict(default=False, type='bool'),
+        ip_version=dict(type='str', default='4', choices=['4', '6']),
+        project=dict(default=None),
+        extra_specs=dict(type='dict', default=dict())
+    )
+
+    def _needs_update(self, address_scope, filters=None):
+        """Decide if the given address_scope needs an update.
+        """
+        ip_version = int(self.params['ip_version'])
+        if address_scope['is_shared'] != self.params['shared']:
+            return True
+        if ip_version and address_scope['ip_version'] != ip_version:
+            self.fail_json(msg='Cannot update ip_version in existing address scope')
+        return False
+
+    def _system_state_change(self, address_scope, filters=None):
+        """Check if the system state would be changed."""
+        state = self.params['state']
+        if state == 'absent' and address_scope:
+            return True
+        if state == 'present':
+            if not address_scope:
+                return True
+            return self._needs_update(address_scope, filters)
+        return False
+
+    def run(self):
+
+        state = self.params['state']
+        name = self.params['name']
+        shared = self.params['shared']
+        ip_version = self.params['ip_version']
+        project = self.params['project']
+        extra_specs = self.params['extra_specs']
+
+        if project is not None:
+            proj = self.conn.get_project(project)
+            if proj is None:
+                self.fail(msg='Project %s could not be found' % project)
+            project_id = proj['id']
+        else:
+            project_id = self.conn.current_project_id
+
+        address_scope = self.conn.network.find_address_scope(name_or_id=name)
+        if self.ansible.check_mode:
+            self.exit_json(
+                changed=self._system_state_change(address_scope)
+            )
+
+        if state == 'present':
+            changed = False
+
+            if not address_scope:
+                kwargs = dict(
+                    name=name,
+                    ip_version=ip_version,
+                    is_shared=shared,
+                    tenant_id=project_id)
+                dup_args = set(kwargs.keys()) & set(extra_specs.keys())
+                if dup_args:
+                    raise ValueError('Duplicate key(s) {0} in extra_specs'
+                                     .format(list(dup_args)))
+                kwargs = dict(kwargs, **extra_specs)
+                address_scope = self.conn.network.create_address_scope(**kwargs)
+                changed = True
+            else:
+                if self._needs_update(address_scope):
+                    address_scope = self.conn.network.update_address_scope(address_scope['id'], is_shared=shared)
+                    changed = True
+                else:
+                    changed = False
+            self.exit_json(changed=changed, address_scope=address_scope, id=address_scope['id'])
+
+        elif state == 'absent':
+            if not address_scope:
+                self.exit(changed=False)
+            else:
+                self.conn.network.delete_address_scope(address_scope['id'])
+                self.exit_json(changed=True)
+
+
+def main():
+    module = AddressScopeModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/auth.py
+++ b/plugins/modules/auth.py
@@ -38,29 +38,24 @@ service_catalog:
    type: dict
 '''

-import traceback
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+
+class AuthModule(OpenStackModule):
+    argument_spec = dict()
+    module_kwargs = dict()
+
+    def run(self):
+        self.exit_json(
+            changed=False,
+            ansible_facts=dict(
+                auth_token=self.conn.auth_token,
+                service_catalog=self.conn.service_catalog))


 def main():
-
-    argument_spec = openstack_full_argument_spec()
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
-
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        module.exit_json(
-            changed=False,
-            ansible_facts=dict(
-                auth_token=cloud.auth_token,
-                service_catalog=cloud.service_catalog))
-    except Exception as e:
-        module.fail_json(msg=str(e), exception=traceback.format_exc())
+    module = AuthModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/baremetal_node.py
+++ b/plugins/modules/baremetal_node.py
@@ -43,29 +43,71 @@ options:
          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
          settings set to None.
      type: str
+    resource_class:
+      description:
+        - The specific resource type to which this node belongs.
+      type: str
+    bios_interface:
+      description:
+        - The bios interface for this node, e.g. "no-bios".
+      type: str
+    boot_interface:
+      description:
+        - The boot interface for this node, e.g. "pxe".
+      type: str
+    console_interface:
+      description:
+        - The console interface for this node, e.g. "no-console".
+      type: str
+    deploy_interface:
+      description:
+        - The deploy interface for this node, e.g. "iscsi".
+      type: str
+    inspect_interface:
+      description:
+        - The interface used for node inspection, e.g. "no-inspect".
+      type: str
+    management_interface:
+      description:
+        - The interface for out-of-band management of this node, e.g.
+          "ipmitool".
+      type: str
+    network_interface:
+      description:
+        - The network interface provider to use when describing
+          connections for this node.
+      type: str
+    power_interface:
+      description:
+        - The interface used to manage power actions on this node, e.g.
+          "ipmitool".
+      type: str
+    raid_interface:
+      description:
+        - Interface used for configuring raid on this node.
+      type: str
+    rescue_interface:
+      description:
+        - Interface used for node rescue, e.g. "no-rescue".
+      type: str
+    storage_interface:
+      description:
+        - Interface used for attaching and detaching volumes on this node, e.g.
+          "cinder".
+      type: str
+    vendor_interface:
+      description:
+        - Interface for all vendor-specific actions on this node, e.g.
+          "no-vendor".
+      type: str
    driver_info:
      description:
        - Information for this server's driver. Will vary based on which
          driver is in use. Any sub-field which is populated will be validated
-          during creation.
+          during creation. For compatibility reasons sub-fields `power`,
+          `deploy`, `management` and `console` are flattened.
      required: true
      type: dict
-      suboptions:
-        power:
-            description:
-                - Information necessary to turn this server on / off.
-                  This often includes such things as IPMI username, password, and IP address.
-            required: true
-        deploy:
-            description:
-                - Information necessary to deploy this server directly, without using Nova. THIS IS NOT RECOMMENDED.
-        console:
-            description:
-                - Information necessary to connect to this server's serial console.  Not all drivers support this.
-        management:
-            description:
-                - Information necessary to interact with this server's management interface. May be shared by power_info in some cases.
-            required: true
    nics:
      description:
        - 'A list of network interface cards, eg, " - mac: aa:bb:cc:aa:bb:cc"'
@@ -149,10 +191,9 @@ EXAMPLES = '''
      - mac: "aa:bb:cc:aa:bb:cc"
      - mac: "dd:ee:ff:dd:ee:ff"
    driver_info:
-      power:
-        ipmi_address: "1.2.3.4"
-        ipmi_username: "admin"
-        ipmi_password: "adminpass"
+      ipmi_address: "1.2.3.4"
+      ipmi_username: "admin"
+      ipmi_password: "adminpass"
    chassis_uuid: "00000000-0000-0000-0000-000000000001"

 '''
@@ -174,31 +215,35 @@ from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
 )


+_PROPERTIES = {
+    'cpu_arch': 'cpu_arch',
+    'cpus': 'cpus',
+    'ram': 'memory_mb',
+    'disk_size': 'local_gb',
+    'capabilities': 'capabilities',
+    'root_device': 'root_device',
+}
+
+
 def _parse_properties(module):
+    """Convert ansible properties into native ironic values.
+
+    Also filter out any properties that are not set.
+    """
    p = module.params['properties']
-    props = dict(
-        cpu_arch=p.get('cpu_arch') if p.get('cpu_arch') else 'x86_64',
-        cpus=p.get('cpus') if p.get('cpus') else 1,
-        memory_mb=p.get('ram') if p.get('ram') else 1,
-        local_gb=p.get('disk_size') if p.get('disk_size') else 1,
-        capabilities=p.get('capabilities') if p.get('capabilities') else '',
-        root_device=p.get('root_device') if p.get('root_device') else '',
-    )
-    return props
+    return {to_key: p[from_key] for (from_key, to_key) in _PROPERTIES.items()
+            if p.get(from_key) is not None}


 def _parse_driver_info(sdk, module):
-    p = module.params['driver_info']
-    info = p.get('power')
-    if not info:
-        raise sdk.exceptions.OpenStackCloudException(
-            "driver_info['power'] is required")
-    if p.get('console'):
-        info.update(p.get('console'))
-    if p.get('management'):
-        info.update(p.get('management'))
-    if p.get('deploy'):
-        info.update(p.get('deploy'))
+    info = module.params['driver_info'].copy()
+    for deprecated in ('power', 'console', 'management', 'deploy'):
+        if deprecated in info:
+            info.update(info.pop(deprecated))
+            module.deprecate("Suboption %s of the driver_info parameter of "
+                             "'openstack.cloud.baremetal_node' is deprecated"
+                             % deprecated, version='2.0.0',
+                             collection_name='openstack.cloud')
    return info


@@ -233,6 +278,19 @@ def main():
        uuid=dict(required=False),
        name=dict(required=False),
        driver=dict(required=False),
+        resource_class=dict(required=False),
+        bios_interface=dict(required=False),
+        boot_interface=dict(required=False),
+        console_interface=dict(required=False),
+        deploy_interface=dict(required=False),
+        inspect_interface=dict(required=False),
+        management_interface=dict(required=False),
+        network_interface=dict(required=False),
+        power_interface=dict(required=False),
+        raid_interface=dict(required=False),
+        rescue_interface=dict(required=False),
+        storage_interface=dict(required=False),
+        vendor_interface=dict(required=False),
        driver_info=dict(type='dict', required=True),
        nics=dict(type='list', required=True, elements="dict"),
        properties=dict(type='dict', default={}),
@@ -241,7 +299,10 @@ def main():
            required=False,
            type='bool',
            aliases=['skip_update_of_driver_password'],
-            deprecated_aliases=[dict(name='skip_update_of_driver_password', version='2.0.0')]
+            deprecated_aliases=[dict(
+                name='skip_update_of_driver_password',
+                version='2.0.0',
+                collection_name='openstack.cloud')]
        ),
        state=dict(required=False, default='present', choices=['present', 'absent'])
    )
@@ -269,6 +330,22 @@ def main():
                driver_info=driver_info,
                name=module.params['name'],
            )
+            optional_field_names = ('resource_class',
+                                    'bios_interface',
+                                    'boot_interface',
+                                    'console_interface',
+                                    'deploy_interface',
+                                    'inspect_interface',
+                                    'management_interface',
+                                    'network_interface',
+                                    'power_interface',
+                                    'raid_interface',
+                                    'rescue_interface',
+                                    'storage_interface',
+                                    'vendor_interface')
+            for i in optional_field_names:
+                if module.params[i]:
+                    kwargs[i] = module.params[i]

            if module.params['chassis_uuid']:
                kwargs['chassis_uuid'] = module.params['chassis_uuid']
--- a/plugins/modules/baremetal_node_info.py
+++ b/plugins/modules/baremetal_node_info.py
@@ -0,0 +1,555 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright (c) 2021 by Red Hat, Inc.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+
+DOCUMENTATION = '''
+module: baremetal_node_info
+short_description: Retrieve information about Bare Metal nodes from OpenStack
+author: OpenStack Ansible SIG
+description:
+    - Retrieve information about Bare Metal nodes from OpenStack.
+options:
+    node:
+      description:
+        - Name or globally unique identifier (UUID) to identify the host.
+      type: str
+    mac:
+      description:
+        - Unique mac address that is used to attempt to identify the host.
+      type: str
+    ironic_url:
+      description:
+        - If noauth mode is utilized, this is required to be set to the
+          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
+          settings set to None.
+      type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Gather information about all baremeal nodes
+- openstack.cloud.baremetal_node_info:
+    cloud: "devstack"
+  register: result
+- debug:
+    msg: "{{ result.baremetal_nodes }}"
+# Gather information about a baremeal node
+- openstack.cloud.baremetal_node_info:
+    cloud: "devstack"
+    node: "00000000-0000-0000-0000-000000000002"
+  register: result
+- debug:
+    msg: "{{ result.baremetal_nodes }}"
+'''
+
+RETURN = '''
+baremetal_nodes:
+    description: Bare Metal node list. A subset of the dictionary keys
+                 listed below may be returned, depending on your cloud
+                 provider.
+    returned: always, but can be null
+    type: complex
+    contains:
+        allocation_uuid:
+            description: The UUID of the allocation associated with the node.
+                         If not null, will be the same as instance_uuid (the
+                         opposite is not always true). Unlike instance_uuid,
+                         this field is read-only. Please use the Allocation API
+                         to remove allocations.
+            returned: success
+            type: str
+        automated_clean:
+            description: Indicates whether the node will perform automated
+                         clean or not.
+            returned: success
+            type: bool
+        bios_interface:
+            description: The bios interface to be used for this node.
+            returned: success
+            type: str
+        boot_interface:
+            description: The boot interface for a Node, e.g. "pxe".
+            returned: success
+            type: str
+        boot_mode:
+            description: The boot mode for a node, either "uefi" or "bios"
+            returned: success
+            type: str
+        chassis_uuid:
+            description: UUID of the chassis associated with this Node. May be
+                         empty or None.
+            returned: success
+            type: str
+        clean_step:
+            description: The current clean step.
+            returned: success
+            type: str
+        conductor:
+            description: The conductor currently servicing a node. This field
+                         is read-only.
+            returned: success
+            type: str
+        conductor_group:
+            description: The conductor group for a node. Case-insensitive
+                         string up to 255 characters, containing a-z, 0-9, _,
+                         -, and ..
+            returned: success
+            type: str
+        console_enabled:
+            description: Indicates whether console access is enabled or
+                         disabled on this node.
+            returned: success
+            type: bool
+        console_interface:
+            description: The console interface for a node, e.g. "no-console".
+            returned: success
+            type: str
+        created_at:
+            description: Bare Metal node created at timestamp.
+            returned: success
+            type: str
+        deploy_interface:
+            description: The deploy interface for a node, e.g. "direct".
+            returned: success
+            type: str
+        deploy_step:
+            description: The current deploy step.
+            returned: success
+            type: str
+        driver:
+            description: The name of the driver.
+            returned: success
+            type: str
+        driver_info:
+            description: All the metadata required by the driver to manage this
+                         Node. List of fields varies between drivers, and can
+                         be retrieved from the
+                         /v1/drivers/<DRIVER_NAME>/properties resource.
+            returned: success
+            type: dict
+        driver_internal_info:
+            description: Internal metadata set and stored by the Node's driver.
+            returned: success
+            type: dict
+        extra:
+            description: A set of one or more arbitrary metadata key and value
+                         pairs.
+            returned: success
+            type: dict
+        fault:
+            description: The fault indicates the active fault detected by
+                         ironic, typically the Node is in "maintenance mode".
+                         None means no fault has been detected by ironic.
+                         "power failure" indicates ironic failed to retrieve
+                         power state from this node. There are other possible
+                         types, e.g., "clean failure" and "rescue abort
+                         failure".
+            returned: success
+            type: str
+        id:
+            description: The UUID for the resource.
+            returned: success
+            type: str
+        inspect_interface:
+            description: The interface used for node inspection.
+            returned: success
+            type: str
+        instance_info:
+            description: Information used to customize the deployed image. May
+                         include root partition size, a base 64 encoded config
+                         drive, and other metadata. Note that this field is
+                         erased automatically when the instance is deleted
+                         (this is done by requesting the Node provision state
+                         be changed to DELETED).
+            returned: success
+            type: dict
+        instance_uuid:
+            description: UUID of the Nova instance associated with this Node.
+            returned: success
+            type: str
+        last_error:
+            description: Any error from the most recent (last) transaction that
+                         started but failed to finish.
+            returned: success
+            type: str
+        maintenance:
+            description: Whether or not this Node is currently in "maintenance
+                         mode". Setting a Node into maintenance mode removes it
+                         from the available resource pool and halts some
+                         internal automation. This can happen manually (eg, via
+                         an API request) or automatically when Ironic detects a
+                         hardware fault that prevents communication with the
+                         machine.
+            returned: success
+            type: bool
+        maintenance_reason:
+            description: User-settable description of the reason why this Node
+                         was placed into maintenance mode
+            returned: success
+            type: str
+        management_interface:
+            description: Interface for out-of-band node management.
+            returned: success
+            type: str
+        name:
+            description: Human-readable identifier for the Node resource. May
+                         be undefined. Certain words are reserved.
+            returned: success
+            type: str
+        network_interface:
+            description: Which Network Interface provider to use when plumbing
+                         the network connections for this Node.
+            returned: success
+            type: str
+        owner:
+            description: A string or UUID of the tenant who owns the object.
+            returned: success
+            type: str
+        portgroups:
+            description: List of ironic portgroups on this node.
+            returned: success
+            type: list
+            elements: dict
+            contains:
+              address:
+                description: Physical hardware address of this Portgroup,
+                             typically the hardware MAC address.
+                returned: success
+                type: str
+              created_at:
+                description: The UTC date and time when the resource was
+                             created, ISO 8601 format.
+                returned: success
+                type: str
+              extra:
+                description: A set of one or more arbitrary metadata key and
+                             value pairs.
+                returned: success
+                type: dict
+              id:
+                description: The UUID for the resource.
+                returned: success
+                type: str
+              internal_info:
+                description: Internal metadata set and stored by the Portgroup.
+                             This field is read-only.
+                returned: success
+                type: dict
+              is_standalone_ports_supported:
+                description: Indicates whether ports that are members of this
+                             portgroup can be used as stand-alone ports.
+                returned: success
+                type: bool
+              mode:
+                description: Mode of the port group. For possible values, refer
+                             to https://www.kernel.org/doc/Documentation/networking/bonding.txt.
+                             If not specified in a request to create a port
+                             group, it will be set to the value of the
+                             [DEFAULT]default_portgroup_mode configuration
+                             option. When set, can not be removed from the port
+                             group.
+                returned: success
+                type: str
+              name:
+                description: Human-readable identifier for the Portgroup
+                             resource. May be undefined.
+                returned: success
+                type: str
+              node_id:
+                description: UUID of the Node this resource belongs to.
+                returned: success
+                type: str
+              ports:
+                description: List of port UUID's of ports belonging to this
+                             portgroup.
+                returned: success
+                type: list
+              properties:
+                description: Key/value properties related to the port group's
+                             configuration.
+                returned: success
+                type: dict
+              updated_at:
+                description: The UTC date and time when the resource was
+                             updated, ISO 8601 format. May be "null".
+                returned: success
+                type: str
+        ports:
+            description: List of ironic ports on this node.
+            returned: success
+            type: list
+            elements: dict
+            contains:
+              address:
+                description: Physical hardware address of this network Port,
+                             typically the hardware MAC address.
+                returned: success
+                type: str
+              created_at:
+                description: The UTC date and time when the resource was
+                             created, ISO 8601 format.
+                returned: success
+                type: str
+              extra:
+                description: A set of one or more arbitrary metadata key and
+                             value pairs.
+                returned: success
+                type: dict
+              id:
+                description: The UUID for the resource.
+                returned: success
+                type: str
+              internal_info:
+                description: Internal metadata set and stored by the Port. This
+                             field is read-only.
+                returned: success
+                type: dict
+              local_link_connection:
+                description: The Port binding profile. If specified, must
+                             contain switch_id (only a MAC address or an
+                             OpenFlow based datapath_id of the switch are
+                             accepted in this field) and port_id (identifier of
+                             the physical port on the switch to which node's
+                             port is connected to) fields. switch_info is an
+                             optional string field to be used to store any
+                             vendor-specific information.
+                returned: success
+                type: dict
+              name:
+                description: The name of the resource.
+                returned: success
+                type: str
+              node_uuid:
+                description: UUID of the Node this resource belongs to.
+                returned: success
+                type: str
+              physical_network:
+                description: The name of the physical network to which a port
+                             is connected. May be empty.
+                returned: success
+                type: str
+              portgroup_uuid:
+                description: UUID of the Portgroup this resource belongs to.
+                returned: success
+                type: str
+              pxe_enabled:
+                description: Indicates whether PXE is enabled or disabled on
+                             the Port.
+                returned: success
+                type: str
+              updated_at:
+                description: The UTC date and time when the resource was
+                             updated, ISO 8601 format. May be "null".
+                returned: success
+                type: str
+              uuid:
+                description: The UUID for the resource.
+                returned: success
+                type: str
+        power_interface:
+            description: Interface used for performing power actions on the
+                         node, e.g. "ipmitool".
+            returned: success
+            type: str
+        power_state:
+            description: The current power state of this Node. Usually, "power
+                         on" or "power off", but may be "None" if Ironic is
+                         unable to determine the power state (eg, due to
+                         hardware failure).
+            returned: success
+            type: str
+        properties:
+            description: Physical characteristics of this Node. Populated by
+                         ironic-inspector during inspection. May be edited via
+                         the REST API at any time.
+            returned: success
+            type: dict
+        protected:
+            description: Whether the node is protected from undeploying,
+                         rebuilding and deletion.
+            returned: success
+            type: bool
+        protected_reason:
+            description: The reason the node is marked as protected.
+            returned: success
+            type: str
+        provision_state:
+            description: The current provisioning state of this Node.
+            returned: success
+            type: str
+        raid_config:
+            description: Represents the current RAID configuration of the node.
+                         Introduced with the cleaning feature.
+            returned: success
+            type: dict
+        raid_interface:
+            description: Interface used for configuring RAID on this node.
+            returned: success
+            type: str
+        rescue_interface:
+            description: The interface used for node rescue, e.g. "no-rescue".
+            returned: success
+            type: str
+        reservation:
+            description: The name of an Ironic Conductor host which is holding
+                         a lock on this node, if a lock is held. Usually
+                         "null", but this field can be useful for debugging.
+            returned: success
+            type: str
+        resource_class:
+            description: A string which can be used by external schedulers to
+                         identify this Node as a unit of a specific type of
+                         resource. For more details, see
+                         https://docs.openstack.org/ironic/latest/install/configure-nova-flavors.html
+            returned: success
+            type: str
+        retired:
+            description: Whether the node is retired and can hence no longer be
+                         provided, i.e. move from manageable to available, and
+                         will end up in manageable after cleaning (rather than
+                         available).
+            returned: success
+            type: bool
+        retired_reason:
+            description: The reason the node is marked as retired.
+            returned: success
+            type: str
+        secure_boot:
+            description: Indicates whether node is currently booted with
+                         secure_boot turned on.
+            returned: success
+            type: bool
+        storage_interface:
+            description: Interface used for attaching and detaching volumes on
+                         this node, e.g. "cinder".
+            returned: success
+            type: str
+        target_power_state:
+            description: If a power state transition has been requested, this
+                         field represents the requested (ie, "target") state,
+                         either "power on" or "power off".
+            returned: success
+            type: str
+        target_provision_state:
+            description: If a provisioning action has been requested, this
+                         field represents the requested (ie, "target") state.
+                         Note that a Node may go through several states during
+                         its transition to this target state. For instance,
+                         when requesting an instance be deployed to an
+                         AVAILABLE Node, the Node may go through the following
+                         state change progression, AVAILABLE -> DEPLOYING ->
+                         DEPLOYWAIT -> DEPLOYING -> ACTIVE
+            returned: success
+            type: str
+        target_raid_config:
+            description: Represents the requested RAID configuration of the
+                         node, which will be applied when the Node next
+                         transitions through the CLEANING state. Introduced
+                         with the cleaning feature.
+            returned: success
+            type: dict
+        traits:
+            description: List of traits for this node.
+            returned: success
+            type: list
+        updated_at:
+            description: Bare Metal node updated at timestamp.
+            returned: success
+            type: str
+        uuid:
+            description: The UUID for the resource.
+            returned: success
+            type: str
+        vendor_interface:
+            description: Interface for vendor-specific functionality on this
+                         node, e.g. "no-vendor".
+            returned: success
+            type: str
+'''
+
+
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
+    IronicModule,
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+
+def cleanup_node_properties(machine, cloud):
+    # states are links, not useful
+    machine.pop('states', None)
+
+    for port in machine.ports:
+        # links are not useful
+        port.pop('links', None)
+        # redundant, location is in on machine as well
+        port.pop('location', None)
+
+    for portgroup in machine.portgroups:
+        # links are not useful
+        portgroup.pop('links', None)
+        # redundant, location is in on machine as well
+        portgroup.pop('location', None)
+        # links to ports are not useful, replace with list of port uuid's
+        portgroup['ports'] = [x.id for x in list(
+            cloud.baremetal.ports(portgroup=portgroup['id']))]
+
+
+def get_ports_and_portgroups(cloud, machine):
+    machine.ports = cloud.list_nics_for_machine(machine.uuid)
+    machine.portgroups = [dict(x) for x in
+                          list(cloud.baremetal.port_groups(node=machine.uuid,
+                                                           details=True))]
+
+
+def main():
+    argument_spec = ironic_argument_spec(
+        node=dict(required=False),
+        mac=dict(required=False),
+    )
+    module_kwargs = openstack_module_kwargs()
+    module_kwargs['supports_check_mode'] = True
+
+    module = IronicModule(argument_spec, **module_kwargs)
+
+    machine = None
+    machines = list()
+
+    sdk, cloud = openstack_cloud_from_module(module)
+    try:
+        if module.params['node']:
+            machine = cloud.get_machine(module.params['node'])
+        elif module.params['mac']:
+            machine = cloud.get_machine_by_mac(module.params['mac'])
+
+        # Fail if node not found
+        if (module.params['node'] or module.params['mac']) and not machine:
+            module.fail_json(msg='The baremetal node was not found')
+
+        if machine:
+            machines.append(machine)
+        else:
+            machines = cloud.list_machines()
+
+        for machine in machines:
+            get_ports_and_portgroups(cloud, machine)
+            cleanup_node_properties(machine, cloud)
+
+        module.exit_json(changed=False, baremetal_nodes=machines)
+    except sdk.exceptions.OpenStackCloudException as e:
+        module.fail_json(msg=str(e))
+
+
+if __name__ == "__main__":
+    main()
--- a/plugins/modules/baremetal_port.py
+++ b/plugins/modules/baremetal_port.py
@@ -0,0 +1,373 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+# Copyright (c) 2021 by Red Hat, Inc.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+module: baremetal_port
+short_description: Create/Delete Bare Metal port Resources from OpenStack
+author: OpenStack Ansible SIG
+description:
+    - Create, Update and Remove ironic ports from OpenStack.
+options:
+    state:
+      description:
+        - Indicates desired state of the resource
+      choices: ['present', 'absent']
+      default: present
+      type: str
+    uuid:
+      description:
+        - globally unique identifier (UUID) to be given to the resource. Will
+          be auto-generated if not specified.
+      type: str
+    node:
+      description:
+        - UUID or Name of the Node this resource belongs to.
+      type: str
+    address:
+      description:
+        - Physical hardware address of this network Port, typically the
+          hardware MAC address.
+      type: str
+    portgroup:
+      description:
+        - UUID or Name of the Portgroup this resource belongs to.
+      type: str
+    local_link_connection:
+      description:
+        - The Port binding profile.
+      type: dict
+      suboptions:
+        switch_id:
+          description:
+            - A MAC address or an OpenFlow based datapath_id of the switch.
+          type: str
+        port_id:
+          description:
+            - Identifier of the physical port on the switch to which node's
+              port is connected to.
+          type: str
+        switch_info:
+          description:
+            - An optional string field to be used to store any vendor-specific
+              information.
+          type: str
+    is_pxe_enabled:
+      description:
+        - Whether PXE should be enabled or disabled on the Port.
+      type: bool
+    physical_network:
+      description:
+        - The name of the physical network to which a port is connected.
+      type: str
+    extra:
+      description:
+        - A set of one or more arbitrary metadata key and value pairs.
+      type: dict
+    ironic_url:
+      description:
+        - If noauth mode is utilized, this is required to be set to the
+          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
+          settings set to None.
+      type: str
+
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Create Bare Metal port
+- name: Create Bare Metal port
+  openstack.cloud.baremetal_port:
+    cloud: devstack
+    state: present
+    node: bm-0
+    address: fa:16:3e:aa:aa:aa
+    pxe_enabled: True
+    local_link_connection:
+      switch_id: 0a:1b:2c:3d:4e:5f
+      port_id: Ethernet3/1
+      switch_info: switch1
+    extra:
+      something: extra
+    physical_network: datacenter
+  register: result
+# Delete Bare Metal port
+- name: Delete Bare Metal port
+  openstack.cloud.baremetal_port:
+    cloud: devstack
+    state: absent
+    address: fa:16:3e:aa:aa:aa
+  register: result
+# Update Bare Metal port
+- name: Update Bare Metal port
+  openstack.cloud.baremetal_port:
+    cloud: devstack
+    state: present
+    uuid: 1a85ebca-22bf-42eb-ad9e-f640789b8098
+    pxe_enabled: False
+    local_link_connection:
+      switch_id: a0:b1:c2:d3:e4:f5
+      port_id: Ethernet4/12
+      switch_info: switch2
+'''
+
+RETURN = '''
+id:
+    description: Unique UUID of the port.
+    returned: always, but can be null
+    type: str
+result:
+    description: A short text describing the result.
+    returned: success
+    type: str
+changes:
+    description: Map showing from -> to values for properties that was changed
+                 after port update.
+    returned: success
+    type: dict
+port:
+    description: A port dictionary, subset of the dictionary keys listed below
+                 may be returned, depending on your cloud provider.
+    returned: success
+    type: complex
+    contains:
+        address:
+            description: Physical hardware address of this network Port,
+                         typically the hardware MAC address.
+            returned: success
+            type: str
+        created_at:
+            description: Bare Metal port created at timestamp.
+            returned: success
+            type: str
+        extra:
+            description: A set of one or more arbitrary metadata key and value
+                         pairs.
+            returned: success
+            type: dict
+        id:
+            description: The UUID for the Baremetal Port resource.
+            returned: success
+            type: str
+        internal_info:
+            description: Internal metadata set and stored by the Port. This
+                         field is read-only.
+            returned: success
+            type: dict
+        is_pxe_enabled:
+            description: Whether PXE is enabled or disabled on the Port.
+            returned: success
+            type: bool
+        local_link_connection:
+            description: The Port binding profile. If specified, must contain
+                         switch_id (only a MAC address or an OpenFlow based
+                         datapath_id of the switch are accepted in this field
+                         and port_id (identifier of the physical port on the
+                         switch to which node's port is connected to) fields.
+                         switch_info is an optional string field to be used to
+                         store any vendor-specific information.
+            returned: success
+            type: dict
+        location:
+            description: Cloud location of this resource (cloud, project,
+                         region, zone)
+            returned: success
+            type: dict
+        name:
+            description: Bare Metal port name.
+            returned: success
+            type: str
+        node_id:
+            description: UUID of the Bare Metal Node this resource belongs to.
+            returned: success
+            type: str
+        physical_network:
+            description: The name of the physical network to which a port is
+                         connected.
+            returned: success
+            type: str
+        port_group_id:
+            description: UUID  of the Portgroup this resource belongs to.
+            returned: success
+            type: str
+        updated_at:
+            description: Bare Metal port updated at timestamp.
+            returned: success
+            type: str
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
+    IronicModule,
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+_PROP_TO_ATTR_MAP = {
+    'pxe_enabled': 'is_pxe_enabled',
+    'address': 'address',
+    'extra': 'extra',
+    'local_link_connection': 'local_link_connection',
+    'physical_network': 'physical_network',
+    'node_uuid': 'node_id',
+    'portgroup_uuid': 'port_group_id',
+    'uuid': 'id',
+}
+
+
+def find_port(module, cloud):
+    port = None
+    if module.params['uuid']:
+        port = cloud.baremetal.find_port(module.params['uuid'])
+    elif module.params['address']:
+        ports = list(cloud.baremetal.ports(address=module.params['address'],
+                                           details=True))
+        if ports and len(ports) == 1:
+            port = ports[0]
+        elif len(ports) > 1:
+            module.fail_json(
+                msg="Multiple ports with address {address} found. A uuid must "
+                    "be defined in order to identify the correct port"
+                    .format(address=module.params['address']))
+
+    return port
+
+
+def add_port(module, cloud):
+    port = find_port(module, cloud)
+    if port:
+        update_port(module, cloud, port=port)
+
+    if not module.params['node'] or not module.params['address']:
+        module.fail_json(
+            msg="A Bare Metal node (name or uuid) and an address is required "
+                "to create a port")
+
+    machine = cloud.get_machine(module.params['node'])
+    if not machine:
+        module.fail_json(
+            msg="Bare Metal node {node} could not be found".format(
+                node=module.params['node']))
+
+    module.params['node_uuid'] = machine.id
+    props = {k: module.params[k] for k in _PROP_TO_ATTR_MAP.keys()
+             if k in module.params}
+    port = cloud.baremetal.create_port(**props)
+    port_dict = port.to_dict()
+    port_dict.pop('links', None)
+    module.exit_json(
+        changed=True,
+        result="Port successfully created",
+        changes=None,
+        port=port_dict,
+        id=port_dict['id'])
+
+
+def update_port(module, cloud, port=None):
+    if not port:
+        port = find_port(module, cloud)
+
+    if module.params['node']:
+        machine = cloud.get_machine(module.params['node'])
+        if machine:
+            module.params['node_uuid'] = machine.id
+
+    old_props = {k: port[v] for k, v in _PROP_TO_ATTR_MAP.items()}
+    new_props = {k: module.params[k] for k in _PROP_TO_ATTR_MAP.keys()
+                 if k in module.params and module.params[k] is not None}
+    prop_diff = {k: new_props[k] for k in _PROP_TO_ATTR_MAP.keys()
+                 if k in new_props and old_props[k] != new_props[k]}
+
+    if not prop_diff:
+        port_dict = port.to_dict()
+        port_dict.pop('links', None)
+        module.exit_json(
+            changed=False,
+            result="No port update required",
+            changes=None,
+            port=port_dict,
+            id=port_dict['id'])
+
+    port = cloud.baremetal.update_port(port.id, **prop_diff)
+    port_dict = port.to_dict()
+    port_dict.pop('links', None)
+    module.exit_json(
+        changed=True,
+        result="Port successfully updated",
+        changes={k: {'to': new_props[k], 'from': old_props[k]}
+                 for k in prop_diff},
+        port=port_dict,
+        id=port_dict['id'])
+
+
+def remove_port(module, cloud):
+    if not module.params['uuid'] and not module.params['address']:
+        module.fail_json(
+            msg="A uuid or an address value must be defined in order to "
+                "remove a port.")
+    if module.params['uuid']:
+        port = cloud.baremetal.delete_port(module.params['uuid'])
+        if not port:
+            module.exit_json(
+                changed=False,
+                result="Port not found",
+                changes=None,
+                id=module.params['uuid'])
+    else:
+        port = find_port(module, cloud)
+        if not port:
+            module.exit_json(
+                changed=False,
+                result="Port not found",
+                changes=None,
+                id=None)
+        port = cloud.baremetal.delete_port(port.id)
+
+    module.exit_json(
+        changed=True,
+        result="Port successfully removed",
+        changes=None,
+        id=port.id)
+
+
+def main():
+    argument_spec = ironic_argument_spec(
+        uuid=dict(required=False),
+        node=dict(required=False),
+        address=dict(required=False),
+        portgroup=dict(required=False),
+        local_link_connection=dict(required=False, type='dict'),
+        is_pxe_enabled=dict(required=False, type='bool'),
+        physical_network=dict(required=False),
+        extra=dict(required=False, type='dict'),
+        state=dict(required=False,
+                   default='present',
+                   choices=['present', 'absent'])
+    )
+
+    module_kwargs = openstack_module_kwargs()
+    module = IronicModule(argument_spec, **module_kwargs)
+
+    module.params['pxe_enabled'] = module.params.pop('is_pxe_enabled', None)
+
+    sdk, cloud = openstack_cloud_from_module(module)
+    try:
+        if module.params['state'] == 'present':
+            add_port(module, cloud)
+
+        if module.params['state'] == 'absent':
+            remove_port(module, cloud)
+
+    except sdk.exceptions.OpenStackCloudException as e:
+        module.fail_json(msg=str(e))
+
+
+if __name__ == "__main__":
+    main()
--- a/plugins/modules/baremetal_port_info.py
+++ b/plugins/modules/baremetal_port_info.py
@@ -0,0 +1,208 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+# Copyright (c) 2021 by Red Hat, Inc.
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+module: baremetal_port_info
+short_description: Retrieve information about Bare Metal ports from OpenStack
+author: OpenStack Ansible SIG
+description:
+    - Retrieve information about Bare Metal ports from OpenStack.
+options:
+    uuid:
+      description:
+        - Name or globally unique identifier (UUID) to identify the port.
+      type: str
+    address:
+      description:
+        - Physical hardware address of this network Port, typically the
+          hardware MAC address.
+      type: str
+    node:
+      description:
+        - Name or globally unique identifier (UUID) to identify a Baremetal
+          Node.
+      type: str
+    ironic_url:
+      description:
+        - If noauth mode is utilized, this is required to be set to the
+          endpoint URL for the Ironic API.  Use with "auth" and "auth_type"
+          settings set to None.
+      type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Gather information about all baremetal ports
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+  register: result
+# Gather information about a baremetal port by address
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+    address: fa:16:3e:aa:aa:aa
+  register: result
+# Gather information about a baremetal port by address
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+    uuid: a2b6bd99-77b9-43f0-9ddc-826568e68dec
+  register: result
+# Gather information about a baremetal ports associated with a baremetal node
+- openstack.cloud.baremetal_port_info:
+    cloud: devstack
+    node: bm-0
+  register: result
+'''
+
+RETURN = '''
+baremetal_ports:
+    description: Bare Metal port list. A subset of the dictionary keys
+                 listed below may be returned, depending on your cloud
+                 provider.
+    returned: always, but can be null
+    type: list
+    elements: dict
+    contains:
+        address:
+            description: Physical hardware address of this network Port,
+                         typically the hardware MAC address.
+            returned: success
+            type: str
+        created_at:
+            description: Bare Metal port created at timestamp.
+            returned: success
+            type: str
+        extra:
+            description: A set of one or more arbitrary metadata key and
+                         value pairs.
+            returned: success
+            type: dict
+        id:
+            description: The UUID for the Baremetal Port resource.
+            returned: success
+            type: str
+        internal_info:
+            description: Internal metadata set and stored by the Port. This
+                         field is read-only.
+            returned: success
+            type: dict
+        is_pxe_enabled:
+            description: Whether PXE is enabled or disabled on the Port.
+            returned: success
+            type: bool
+        local_link_connection:
+            description: The Port binding profile.
+            returned: success
+            type: dict
+            contains:
+              switch_id:
+                description: A MAC address or an OpenFlow based datapath_id of
+                             the switch.
+                type: str
+              port_id:
+                description: Identifier of the physical port on the switch to
+                             which node's port is connected to.
+                type: str
+              switch_info:
+                description: An optional string field to be used to store any
+                             vendor-specific information.
+                type: str
+        location:
+            description: Cloud location of this resource (cloud, project,
+                         region, zone)
+            returned: success
+            type: dict
+        name:
+            description: Bare Metal port name.
+            returned: success
+            type: str
+        node_id:
+            description: UUID of the Bare Metal Node this resource belongs to.
+            returned: success
+            type: str
+        physical_network:
+            description: The name of the physical network to which a port is
+                         connected.
+            returned: success
+            type: str
+        port_group_id:
+            description: UUID  of the Portgroup this resource belongs to.
+            returned: success
+            type: str
+        updated_at:
+            description: Bare Metal port updated at timestamp.
+            returned: success
+            type: str
+'''
+
+
+from ansible_collections.openstack.cloud.plugins.module_utils.ironic import (
+    IronicModule,
+    ironic_argument_spec,
+)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    openstack_module_kwargs,
+    openstack_cloud_from_module
+)
+
+
+def main():
+    argument_spec = ironic_argument_spec(
+        uuid=dict(required=False),
+        address=dict(required=False),
+        node=dict(required=False),
+    )
+    module_kwargs = openstack_module_kwargs()
+    module_kwargs['supports_check_mode'] = True
+    module = IronicModule(argument_spec, **module_kwargs)
+
+    ports = list()
+    sdk, cloud = openstack_cloud_from_module(module)
+    try:
+        if module.params['uuid']:
+            port = cloud.baremetal.find_port(module.params['uuid'])
+            if not port:
+                module.fail_json(
+                    msg='Baremetal port with uuid {uuid} was not found'
+                        .format(uuid=module.params['uuid']))
+            ports.append(port)
+
+        elif module.params['address']:
+            ports = list(
+                cloud.baremetal.ports(address=module.params['address'],
+                                      details=True))
+            if not ports:
+                module.fail_json(
+                    msg='Baremetal port with address {address} was not found'
+                        .format(address=module.params['address']))
+
+        elif module.params['node']:
+            machine = cloud.get_machine(module.params['node'])
+            if not machine:
+                module.fail_json(
+                    msg='Baremetal node {node} was not found'
+                        .format(node=module.params['node']))
+            ports = list(
+                cloud.baremetal.ports(node_uuid=machine.uuid, details=True))
+
+        else:
+            ports = list(cloud.baremetal.ports(details=True))
+
+        # Convert ports to dictionaries and cleanup properties
+        ports = [port.to_dict() for port in ports]
+        for port in ports:
+            # links are not useful
+            port.pop('links', None)
+
+        module.exit_json(changed=False, baremetal_ports=ports)
+    except sdk.exceptions.OpenStackCloudException as e:
+        module.fail_json(msg=str(e))
+
+
+if __name__ == "__main__":
+    main()
--- a/plugins/modules/catalog_service.py
+++ b/plugins/modules/catalog_service.py
@@ -94,36 +94,11 @@ id:
    sample: "3292f020780b4d5baf27ff7e1d224c44"
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _needs_update(module, service):
-    if service.enabled != module.params['enabled']:
-        return True
-    if service.description is not None and \
-       service.description != module.params['description']:
-        return True
-    return False
-
-
-def _system_state_change(module, service):
-    state = module.params['state']
-    if state == 'absent' and service:
-        return True
-
-    if state == 'present':
-        if service is None:
-            return True
-        return _needs_update(module, service)
-
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityCatalogServiceModule(OpenStackModule):
+    argument_spec = dict(
        description=dict(default=None),
        enabled=dict(default=True, type='bool'),
        name=dict(required=True),
@@ -131,58 +106,79 @@ def main():
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    description = module.params['description']
-    enabled = module.params['enabled']
-    name = module.params['name']
-    state = module.params['state']
-    service_type = module.params['service_type']
+    def _needs_update(self, service):
+        if service.enabled != self.params['enabled']:
+            return True
+        if service.description is not None and \
+           service.description != self.params['description']:
+            return True
+        return False

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        services = cloud.search_services(name_or_id=name,
-                                         filters=dict(type=service_type))
+    def _system_state_change(self, service):
+        state = self.params['state']
+        if state == 'absent' and service:
+            return True
+
+        if state == 'present':
+            if service is None:
+                return True
+            return self._needs_update(service)
+
+        return False
+
+    def run(self):
+        description = self.params['description']
+        enabled = self.params['enabled']
+        name = self.params['name']
+        state = self.params['state']
+        service_type = self.params['service_type']
+
+        services = self.conn.search_services(
+            name_or_id=name, filters=dict(type=service_type))

        if len(services) > 1:
-            module.fail_json(msg='Service name %s and type %s are not unique' %
-                             (name, service_type))
+            self.fail_json(
+                msg='Service name %s and type %s are not unique'
+                % (name, service_type))
        elif len(services) == 1:
            service = services[0]
        else:
            service = None

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, service))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(service))

        if state == 'present':
            if service is None:
-                service = cloud.create_service(name=name, description=description,
-                                               type=service_type, enabled=True)
+                service = self.conn.create_service(
+                    name=name, description=description, type=service_type, enabled=True)
                changed = True
            else:
-                if _needs_update(module, service):
-                    service = cloud.update_service(
+                if self._needs_update(service):
+                    service = self.conn.update_service(
                        service.id, name=name, type=service_type, enabled=enabled,
                        description=description)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed, service=service, id=service.id)
+            self.exit_json(changed=changed, service=service, id=service.id)

        elif state == 'absent':
            if service is None:
                changed = False
            else:
-                cloud.delete_service(service.id)
+                self.conn.delete_service(service.id)
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityCatalogServiceModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/coe_cluster.py
+++ b/plugins/modules/coe_cluster.py
@@ -206,31 +206,16 @@ EXAMPLES = '''
    node_count: 5
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _parse_labels(labels):
-    if isinstance(labels, str):
-        labels_dict = {}
-        for kv_str in labels.split(","):
-            k, v = kv_str.split("=")
-            labels_dict[k] = v
-        return labels_dict
-    if not labels:
-        return {}
-    return labels
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class CoeClusterModule(OpenStackModule):
+    argument_spec = dict(
        cluster_template_id=dict(required=True),
        discovery_url=dict(default=None),
        docker_volume_size=dict(type='int'),
        flavor_id=dict(default=None),
-        keypair=dict(default=None),
+        keypair=dict(default=None, no_log=False),
        labels=dict(default=None, type='raw'),
        master_count=dict(type='int', default=1),
        master_flavor_id=dict(default=None),
@@ -239,35 +224,46 @@ def main():
        state=dict(default='present', choices=['absent', 'present']),
        timeout=dict(type='int', default=60),
    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module_kwargs = dict()

-    params = module.params.copy()
+    def _parse_labels(self, labels):
+        if isinstance(labels, str):
+            labels_dict = {}
+            for kv_str in labels.split(","):
+                k, v = kv_str.split("=")
+                labels_dict[k] = v
+            return labels_dict
+        if not labels:
+            return {}
+        return labels

-    state = module.params['state']
-    name = module.params['name']
-    cluster_template_id = module.params['cluster_template_id']
+    def run(self):
+        params = self.params.copy()

-    kwargs = dict(
-        discovery_url=module.params['discovery_url'],
-        docker_volume_size=module.params['docker_volume_size'],
-        flavor_id=module.params['flavor_id'],
-        keypair=module.params['keypair'],
-        labels=_parse_labels(params['labels']),
-        master_count=module.params['master_count'],
-        master_flavor_id=module.params['master_flavor_id'],
-        node_count=module.params['node_count'],
-        create_timeout=module.params['timeout'],
-    )
+        state = self.params['state']
+        name = self.params['name']
+        cluster_template_id = self.params['cluster_template_id']
+
+        kwargs = dict(
+            discovery_url=self.params['discovery_url'],
+            docker_volume_size=self.params['docker_volume_size'],
+            flavor_id=self.params['flavor_id'],
+            keypair=self.params['keypair'],
+            labels=self._parse_labels(params['labels']),
+            master_count=self.params['master_count'],
+            master_flavor_id=self.params['master_flavor_id'],
+            node_count=self.params['node_count'],
+            create_timeout=self.params['timeout'],
+        )

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
        changed = False
-        cluster = cloud.get_coe_cluster(name_or_id=name, filters={'cluster_template_id': cluster_template_id})
+        cluster = self.conn.get_coe_cluster(
+            name_or_id=name, filters={'cluster_template_id': cluster_template_id})

        if state == 'present':
            if not cluster:
-                cluster = cloud.create_coe_cluster(name, cluster_template_id=cluster_template_id, **kwargs)
+                cluster = self.conn.create_coe_cluster(
+                    name, cluster_template_id=cluster_template_id, **kwargs)
                changed = True
            else:
                changed = False
@@ -278,15 +274,18 @@ def main():
            # therefore try `id` first then `uuid`.
            cluster_id = cluster.get('id', cluster.get('uuid'))
            cluster['id'] = cluster['uuid'] = cluster_id
-            module.exit_json(changed=changed, cluster=cluster, id=cluster_id)
+            self.exit_json(changed=changed, cluster=cluster, id=cluster_id)
        elif state == 'absent':
            if not cluster:
-                module.exit_json(changed=False)
+                self.exit_json(changed=False)
            else:
-                cloud.delete_coe_cluster(name)
-                module.exit_json(changed=True)
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+                self.conn.delete_coe_cluster(name)
+                self.exit_json(changed=True)
+
+
+def main():
+    module = CoeClusterModule()
+    module()


 if __name__ == "__main__":
--- a/plugins/modules/coe_cluster_template.py
+++ b/plugins/modules/coe_cluster_template.py
@@ -281,26 +281,11 @@ EXAMPLES = '''
    public: no
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _parse_labels(labels):
-    if isinstance(labels, str):
-        labels_dict = {}
-        for kv_str in labels.split(","):
-            k, v = kv_str.split("=")
-            labels_dict[k] = v
-        return labels_dict
-    if not labels:
-        return {}
-    return labels
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class CoeClusterTemplateModule(OpenStackModule):
+    argument_spec = dict(
        coe=dict(required=True, choices=['kubernetes', 'swarm', 'mesos']),
        dns_nameserver=dict(default='8.8.8.8'),
        docker_storage_driver=dict(choices=['devicemapper', 'overlay', 'overlay2']),
@@ -327,61 +312,76 @@ def main():
        tls_disabled=dict(type='bool', default=False),
        volume_driver=dict(choices=['cinder', 'rexray']),
    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module_kwargs = dict()

-    params = module.params.copy()
+    def _parse_labels(self, labels):
+        if isinstance(labels, str):
+            labels_dict = {}
+            for kv_str in labels.split(","):
+                k, v = kv_str.split("=")
+                labels_dict[k] = v
+            return labels_dict
+        if not labels:
+            return {}
+        return labels

-    state = module.params['state']
-    name = module.params['name']
-    coe = module.params['coe']
-    image_id = module.params['image_id']
+    def run(self):
+        params = self.params.copy()

-    kwargs = dict(
-        dns_nameserver=module.params['dns_nameserver'],
-        docker_storage_driver=module.params['docker_storage_driver'],
-        docker_volume_size=module.params['docker_volume_size'],
-        external_network_id=module.params['external_network_id'],
-        fixed_network=module.params['fixed_network'],
-        fixed_subnet=module.params['fixed_subnet'],
-        flavor_id=module.params['flavor_id'],
-        floating_ip_enabled=module.params['floating_ip_enabled'],
-        keypair_id=module.params['keypair_id'],
-        labels=_parse_labels(params['labels']),
-        http_proxy=module.params['http_proxy'],
-        https_proxy=module.params['https_proxy'],
-        master_lb_enabled=module.params['master_lb_enabled'],
-        master_flavor_id=module.params['master_flavor_id'],
-        network_driver=module.params['network_driver'],
-        no_proxy=module.params['no_proxy'],
-        public=module.params['public'],
-        registry_enabled=module.params['registry_enabled'],
-        server_type=module.params['server_type'],
-        tls_disabled=module.params['tls_disabled'],
-        volume_driver=module.params['volume_driver'],
-    )
+        state = self.params['state']
+        name = self.params['name']
+        coe = self.params['coe']
+        image_id = self.params['image_id']
+
+        kwargs = dict(
+            dns_nameserver=self.params['dns_nameserver'],
+            docker_storage_driver=self.params['docker_storage_driver'],
+            docker_volume_size=self.params['docker_volume_size'],
+            external_network_id=self.params['external_network_id'],
+            fixed_network=self.params['fixed_network'],
+            fixed_subnet=self.params['fixed_subnet'],
+            flavor_id=self.params['flavor_id'],
+            floating_ip_enabled=self.params['floating_ip_enabled'],
+            keypair_id=self.params['keypair_id'],
+            labels=self._parse_labels(params['labels']),
+            http_proxy=self.params['http_proxy'],
+            https_proxy=self.params['https_proxy'],
+            master_lb_enabled=self.params['master_lb_enabled'],
+            master_flavor_id=self.params['master_flavor_id'],
+            network_driver=self.params['network_driver'],
+            no_proxy=self.params['no_proxy'],
+            public=self.params['public'],
+            registry_enabled=self.params['registry_enabled'],
+            server_type=self.params['server_type'],
+            tls_disabled=self.params['tls_disabled'],
+            volume_driver=self.params['volume_driver'],
+        )

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
        changed = False
-        template = cloud.get_coe_cluster_template(name_or_id=name, filters={'coe': coe, 'image_id': image_id})
+        template = self.conn.get_coe_cluster_template(
+            name_or_id=name, filters={'coe': coe, 'image_id': image_id})

        if state == 'present':
            if not template:
-                template = cloud.create_coe_cluster_template(name, coe=coe, image_id=image_id, **kwargs)
+                template = self.conn.create_coe_cluster_template(
+                    name, coe=coe, image_id=image_id, **kwargs)
                changed = True
            else:
                changed = False

-            module.exit_json(changed=changed, cluster_template=template, id=template['uuid'])
+            self.exit_json(
+                changed=changed, cluster_template=template, id=template['uuid'])
        elif state == 'absent':
            if not template:
-                module.exit_json(changed=False)
+                self.exit_json(changed=False)
            else:
-                cloud.delete_coe_cluster_template(name)
-                module.exit_json(changed=True)
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+                self.conn.delete_coe_cluster_template(name)
+                self.exit_json(changed=True)
+
+
+def main():
+    module = CoeClusterTemplateModule()
+    module()


 if __name__ == "__main__":
--- a/plugins/modules/compute_flavor.py
+++ b/plugins/modules/compute_flavor.py
@@ -160,23 +160,11 @@ flavor:
                "aggregate_instance_extra_specs:pinned": false
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _system_state_change(module, flavor):
-    state = module.params['state']
-    if state == 'present' and not flavor:
-        return True
-    if state == 'absent' and flavor:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class ComputeFlavorModule(OpenStackModule):
+    argument_spec = dict(
        state=dict(required=False, default='present',
                   choices=['absent', 'present']),
        name=dict(required=True),
@@ -194,25 +182,30 @@ def main():
        extra_specs=dict(required=False, default=None, type='dict'),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
+    module_kwargs = dict(
        required_if=[
            ('state', 'present', ['ram', 'vcpus', 'disk'])
        ],
-        **module_kwargs)
+        supports_check_mode=True
+    )

-    state = module.params['state']
-    name = module.params['name']
-    extra_specs = module.params['extra_specs'] or {}
+    def _system_state_change(self, flavor):
+        state = self.params['state']
+        if state == 'present' and not flavor:
+            return True
+        if state == 'absent' and flavor:
+            return True
+        return False

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        flavor = cloud.get_flavor(name)
+    def run(self):
+        state = self.params['state']
+        name = self.params['name']
+        extra_specs = self.params['extra_specs'] or {}

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, flavor))
+        flavor = self.conn.get_flavor(name)
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(flavor))

        if state == 'present':
            old_extra_specs = {}
@@ -220,26 +213,32 @@ def main():

            if flavor:
                old_extra_specs = flavor['extra_specs']
-                for param_key in ['ram', 'vcpus', 'disk', 'ephemeral', 'swap', 'rxtx_factor', 'is_public']:
-                    if module.params[param_key] != flavor[param_key]:
+                if flavor['swap'] == "":
+                    flavor['swap'] = 0
+                for param_key in ['ram', 'vcpus', 'disk', 'ephemeral',
+                                  'swap', 'rxtx_factor', 'is_public']:
+                    if self.params[param_key] != flavor[param_key]:
                        require_update = True
                        break
-
+            flavorid = self.params['flavorid']
            if flavor and require_update:
-                cloud.delete_flavor(name)
+                self.conn.delete_flavor(name)
+                old_extra_specs = {}
+                if flavorid == 'auto':
+                    flavorid = flavor['id']
                flavor = None

            if not flavor:
-                flavor = cloud.create_flavor(
+                flavor = self.conn.create_flavor(
                    name=name,
-                    ram=module.params['ram'],
-                    vcpus=module.params['vcpus'],
-                    disk=module.params['disk'],
-                    flavorid=module.params['flavorid'],
-                    ephemeral=module.params['ephemeral'],
-                    swap=module.params['swap'],
-                    rxtx_factor=module.params['rxtx_factor'],
-                    is_public=module.params['is_public']
+                    ram=self.params['ram'],
+                    vcpus=self.params['vcpus'],
+                    disk=self.params['disk'],
+                    flavorid=flavorid,
+                    ephemeral=self.params['ephemeral'],
+                    swap=self.params['swap'],
+                    rxtx_factor=self.params['rxtx_factor'],
+                    is_public=self.params['is_public']
                )
                changed = True
            else:
@@ -249,25 +248,26 @@ def main():
            unset_keys = set(old_extra_specs.keys()) - set(extra_specs.keys())

            if unset_keys and not require_update:
-                cloud.unset_flavor_specs(flavor['id'], unset_keys)
+                self.conn.unset_flavor_specs(flavor['id'], unset_keys)

            if old_extra_specs != new_extra_specs:
-                cloud.set_flavor_specs(flavor['id'], extra_specs)
+                self.conn.set_flavor_specs(flavor['id'], extra_specs)

            changed = (changed or old_extra_specs != new_extra_specs)

-            module.exit_json(changed=changed,
-                             flavor=flavor,
-                             id=flavor['id'])
+            self.exit_json(
+                changed=changed, flavor=flavor, id=flavor['id'])

        elif state == 'absent':
            if flavor:
-                cloud.delete_flavor(name)
-                module.exit_json(changed=True)
-            module.exit_json(changed=False)
+                self.conn.delete_flavor(name)
+                self.exit_json(changed=True)
+            self.exit_json(changed=False)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = ComputeFlavorModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/compute_flavor_info.py
+++ b/plugins/modules/compute_flavor_info.py
@@ -158,70 +158,60 @@ openstack_flavors:
            sample: true
 '''

-
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
-    argument_spec = openstack_full_argument_spec(
+class ComputeFlavorInfoModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=False, default=None),
        ram=dict(required=False, default=None),
        vcpus=dict(required=False, default=None),
        limit=dict(required=False, default=None, type='int'),
        ephemeral=dict(required=False, default=None),
    )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
        mutually_exclusive=[
            ['name', 'ram'],
            ['name', 'vcpus'],
            ['name', 'ephemeral']
-        ]
+        ],
+        supports_check_mode=True
    )
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    is_old_facts = module._name == 'openstack.cloud.compute_flavor_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.compute_flavor_facts' module has been renamed to 'openstack.cloud.compute_flavor_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')

-    name = module.params['name']
-    vcpus = module.params['vcpus']
-    ram = module.params['ram']
-    ephemeral = module.params['ephemeral']
-    limit = module.params['limit']
+    deprecated_names = ('openstack.cloud.compute_flavor_facts')

-    filters = {}
-    if vcpus:
-        filters['vcpus'] = vcpus
-    if ram:
-        filters['ram'] = ram
-    if ephemeral:
-        filters['ephemeral'] = ephemeral
+    def run(self):
+        name = self.params['name']
+        vcpus = self.params['vcpus']
+        ram = self.params['ram']
+        ephemeral = self.params['ephemeral']
+        limit = self.params['limit']
+
+        filters = {}
+        if vcpus:
+            filters['vcpus'] = vcpus
+        if ram:
+            filters['ram'] = ram
+        if ephemeral:
+            filters['ephemeral'] = ephemeral

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
        if name:
-            flavors = cloud.search_flavors(filters={'name': name})
+            flavors = self.conn.search_flavors(filters={'name': name})

        else:
-            flavors = cloud.list_flavors()
+            flavors = self.conn.list_flavors()
            if filters:
-                flavors = cloud.range_search(flavors, filters)
+                flavors = self.conn.range_search(flavors, filters)

        if limit is not None:
            flavors = flavors[:limit]

-        if is_old_facts:
-            module.exit_json(changed=False,
-                             ansible_facts=dict(openstack_flavors=flavors))
-        else:
-            module.exit_json(changed=False,
-                             openstack_flavors=flavors)
+        self.exit_json(changed=False, openstack_flavors=flavors)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = ComputeFlavorInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/compute_service_info.py
+++ b/plugins/modules/compute_service_info.py
@@ -0,0 +1,111 @@
+#!/usr/bin/python
+# Copyright (c) 2016 Hewlett-Packard Enterprise Corporation
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: compute_service_info
+short_description: Retrieve information about one or more OpenStack compute services
+author: OpenStack Ansible SIG
+description:
+    - Retrieve information about nova compute services
+options:
+   binary:
+     description:
+        - Filter by service binary type
+     type: str
+   host:
+     description:
+        - Filter by service host
+     type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Gather information about compute services
+- openstack.cloud.compute_service_info:
+    cloud: awesomecloud
+    binary: "nova-compute"
+    host: "localhost"
+  register: result
+- openstack.cloud.compute_service_info:
+    cloud: awesomecloud
+  register: result
+- debug:
+    msg: "{{ result.openstack_compute_services }}"
+'''
+
+
+RETURN = '''
+openstack_compute_services:
+    description: has all the OpenStack information about compute services
+    returned: always, but can be null
+    type: complex
+    contains:
+        id:
+            description: Unique UUID.
+            returned: success
+            type: str
+        binary:
+            description: The binary name of the service.
+            returned: success
+            type: str
+        host:
+            description: The name of the host.
+            returned: success
+            type: str
+        zone:
+            description: The availability zone name.
+            returned: success
+            type: str
+        status:
+            description: The status of the service. One of enabled or disabled.
+            returned: success
+            type: str
+        state:
+            description: The state of the service. One of up or down.
+            returned: success
+            type: str
+        update:
+            description: The date and time when the resource was updated
+            returned: success
+            type: str
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class ComputeServiceInfoModule(OpenStackModule):
+    argument_spec = dict(
+        binary=dict(required=False, default=None),
+        host=dict(required=False, default=None),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+        binary = self.params['binary']
+        host = self.params['host']
+        filters = {}
+        if binary:
+            filters['binary'] = binary
+        if host:
+            filters['host'] = host
+        services = self.conn.compute.services(**filters)
+        services = list(services)
+        self.exit_json(changed=False, openstack_compute_services=services)
+
+
+def main():
+    module = ComputeServiceInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/container.py
+++ b/plugins/modules/container.py
@@ -0,0 +1 @@
+object_container.py
--- a/plugins/modules/dns_zone_info.py
+++ b/plugins/modules/dns_zone_info.py
@@ -0,0 +1,180 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Open Telekom Cloud, operated by T-Systems International GmbH
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+
+DOCUMENTATION = '''
+---
+module: dns_zone_info
+short_description: Getting information about dns zones
+author: OpenStack Ansible SIG
+description:
+    - Getting information about dns zones. Output can be filtered.
+options:
+   name:
+     description:
+        - Zone name.
+     type: str
+   type:
+     description:
+        - Zone type.
+     choices: [primary, secondary]
+     type: str
+   email:
+     description:
+        - Email of the zone owner (only applies if zone_type is primary).
+     type: str
+   description:
+     description:
+        - Zone description.
+     type: str
+   ttl:
+     description:
+        -  TTL (Time To Live) value in seconds.
+     type: int
+
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+# Create a zone named "example.net"
+- openstack.cloud.dns_zones:
+
+'''
+
+RETURN = '''
+zone:
+    description: Dictionary describing the zone.
+    returned: On success when I(state) is 'present'.
+    type: complex
+    contains:
+        action:
+            description: Current action in progress on the resource.
+            type: str
+            sample: "CREATE"
+        attributes:
+            description: Key:Value pairs of information about this zone, and the pool the user would like to place \
+                the zone in. This information can be used by the scheduler to place zones on the correct pool.
+            type: dict
+            sample: {"tier": "gold", "ha": "true"}
+        created_at:
+            description: Date / Time when resource was created.
+            type: str
+            sample: "2014-07-07T18:25:31.275934"
+        description:
+            description: Description for this zone.
+            type: str
+            sample: "This is an example zone."
+        email:
+            description: E-mail for the zone. Used in SOA records for the zone.
+            type: str
+            sample: "test@example.org"
+        id:
+            description: ID for the resource.
+            type: int
+            sample: "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"
+        links:
+            description: Links to the resource, and other related resources. When a response has been broken into\
+                pages, we will include a next link that should be followed to retrieve all results.
+            type: dict
+            sample:  {"self": "https://127.0.0.1:9001/v2/zones/a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"}
+        masters:
+            description: Mandatory for secondary zones. The servers to slave from to get DNS information.
+            type: list
+            sample: "[]"
+        name:
+            description: DNS Name for the zone.
+            type: str
+            sample: "test.test."
+        pool_id:
+            description: ID for the pool hosting this zone.
+            type: str
+            sample: "a86dba58-0043-4cc6-a1bb-69d5e86f3ca3"
+        project_id:
+            description: ID for the project that owns the resource.
+            type: str
+            sample: "4335d1f0-f793-11e2-b778-0800200c9a66"
+        serial:
+            description: Current serial number for the zone.
+            type: int
+            sample: 1404757531
+        status:
+            description: Status of the resource.
+            type: str
+            sample: "ACTIVE"
+        ttl:
+            description: TTL (Time to Live) for the zone.
+            type: int
+            sample: 7200
+        type:
+            description: Type of zone. PRIMARY is controlled by Designate, SECONDARY zones are slaved from another\
+                DNS Server. Defaults to PRIMARY
+            type: str
+            sample: "PRIMARY"
+        updated_at:
+            description: Date / Time when resource last updated.
+            type: str
+            sample: "2014-07-07T18:25:31.275934"
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class DnsZoneInfoModule(OpenStackModule):
+
+    argument_spec = dict(
+        name=dict(required=False, type='str'),
+        type=dict(required=False, choices=['primary', 'secondary'], type='str'),
+        email=dict(required=False, type='str'),
+        description=dict(required=False, type='str'),
+        ttl=dict(required=False, type='int')
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+
+        name = self.params['name']
+        type = self.params['type']
+        email = self.params['email']
+        description = self.params['description']
+        ttl = self.params['ttl']
+
+        kwargs = {}
+
+        if name:
+            kwargs['name'] = name
+        if type:
+            kwargs['type'] = type
+        if email:
+            kwargs['email'] = email
+        if description:
+            kwargs['description'] = description
+        if ttl:
+            kwargs['ttl'] = ttl
+
+        data = []
+
+        for raw in self.conn.dns.zones(**kwargs):
+            dt = raw.to_dict()
+            dt.pop('location')
+            data.append(dt)
+
+        self.exit_json(zones=data, changed=False)
+
+
+def main():
+    module = DnsZoneInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/endpoint.py
+++ b/plugins/modules/endpoint.py
@@ -103,35 +103,11 @@ endpoint:
            sample: True
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _needs_update(module, endpoint):
-    if endpoint.enabled != module.params['enabled']:
-        return True
-    if endpoint.url != module.params['url']:
-        return True
-    return False
-
-
-def _system_state_change(module, endpoint):
-    state = module.params['state']
-    if state == 'absent' and endpoint:
-        return True
-
-    if state == 'present':
-        if endpoint is None:
-            return True
-        return _needs_update(module, endpoint)
-
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityEndpointModule(OpenStackModule):
+    argument_spec = dict(
        service=dict(type='str', required=True),
        endpoint_interface=dict(type='str', required=True, choices=['admin', 'public', 'internal']),
        url=dict(type='str', required=True),
@@ -140,71 +116,89 @@ def main():
        state=dict(type='str', default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    service_name_or_id = module.params['service']
-    interface = module.params['endpoint_interface']
-    url = module.params['url']
-    region = module.params['region']
-    enabled = module.params['enabled']
-    state = module.params['state']
+    def _needs_update(self, endpoint):
+        if endpoint.enabled != self.params['enabled']:
+            return True
+        if endpoint.url != self.params['url']:
+            return True
+        return False

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
+    def _system_state_change(self, endpoint):
+        state = self.params['state']
+        if state == 'absent' and endpoint:
+            return True

-        service = cloud.get_service(service_name_or_id)
+        if state == 'present':
+            if endpoint is None:
+                return True
+            return self._needs_update(endpoint)
+
+        return False
+
+    def run(self):
+        service_name_or_id = self.params['service']
+        interface = self.params['endpoint_interface']
+        url = self.params['url']
+        region = self.params['region']
+        enabled = self.params['enabled']
+        state = self.params['state']
+
+        service = self.conn.get_service(service_name_or_id)
        if service is None and state == 'absent':
-            module.exit_json(changed=False)
+            self.exit_json(changed=False)

        elif service is None and state == 'present':
-            module.fail_json(msg='Service %s does not exist' % service_name_or_id)
+            self.fail_json(msg='Service %s does not exist' % service_name_or_id)

        filters = dict(service_id=service.id, interface=interface)
        if region is not None:
            filters['region'] = region
-        endpoints = cloud.search_endpoints(filters=filters)
+        endpoints = self.conn.search_endpoints(filters=filters)

        if len(endpoints) > 1:
-            module.fail_json(msg='Service %s, interface %s and region %s are '
-                                 'not unique' %
-                                 (service_name_or_id, interface, region))
+            self.fail_json(msg='Service %s, interface %s and region %s are '
+                           'not unique' %
+                           (service_name_or_id, interface, region))
        elif len(endpoints) == 1:
            endpoint = endpoints[0]
        else:
            endpoint = None

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, endpoint))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(endpoint))

        if state == 'present':
            if endpoint is None:
-                result = cloud.create_endpoint(service_name_or_id=service,
-                                               url=url, interface=interface,
-                                               region=region, enabled=enabled)
+                result = self.conn.create_endpoint(
+                    service_name_or_id=service, url=url, interface=interface,
+                    region=region, enabled=enabled)
                endpoint = result[0]
                changed = True
            else:
-                if _needs_update(module, endpoint):
-                    endpoint = cloud.update_endpoint(
+                if self._needs_update(endpoint):
+                    endpoint = self.conn.update_endpoint(
                        endpoint.id, url=url, enabled=enabled)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed, endpoint=endpoint)
+            self.exit_json(changed=changed, endpoint=endpoint)

        elif state == 'absent':
            if endpoint is None:
                changed = False
            else:
-                cloud.delete_endpoint(endpoint.id)
+                self.conn.delete_endpoint(endpoint.id)
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityEndpointModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/federation_idp.py
+++ b/plugins/modules/federation_idp.py
@@ -72,124 +72,11 @@ EXAMPLES = '''
 RETURN = '''
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def normalize_idp(idp):
-    """
-    Normalizes the IDP definitions so that the outputs are consistent with the
-    parameters
-
-    - "enabled" (parameter) == "is_enabled" (SDK)
-    - "name" (parameter) == "id" (SDK)
-    """
-    if idp is None:
-        return None
-
-    _idp = idp.to_dict()
-    _idp['enabled'] = idp['is_enabled']
-    _idp['name'] = idp['id']
-    return _idp
-
-
-def delete_identity_provider(module, sdk, cloud, idp):
-    """
-    Delete an existing Identity Provider
-
-    returns: the "Changed" state
-    """
-
-    if idp is None:
-        return False
-
-    if module.check_mode:
-        return True
-
-    try:
-        cloud.identity.delete_identity_provider(idp)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to delete identity provider: {0}'.format(str(ex)))
-    return True
-
-
-def create_identity_provider(module, sdk, cloud, name):
-    """
-    Create a new Identity Provider
-
-    returns: the "Changed" state and the new identity provider
-    """
-
-    if module.check_mode:
-        return True, None
-
-    description = module.params.get('description')
-    enabled = module.params.get('enabled')
-    domain_id = module.params.get('domain_id')
-    remote_ids = module.params.get('remote_ids')
-
-    if enabled is None:
-        enabled = True
-    if remote_ids is None:
-        remote_ids = []
-
-    attributes = {
-        'domain_id': domain_id,
-        'enabled': enabled,
-        'remote_ids': remote_ids,
-    }
-    if description is not None:
-        attributes['description'] = description
-
-    try:
-        idp = cloud.identity.create_identity_provider(id=name, **attributes)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to create identity provider: {0}'.format(str(ex)))
-    return (True, idp)
-
-
-def update_identity_provider(module, sdk, cloud, idp):
-    """
-    Update an existing Identity Provider
-
-    returns: the "Changed" state and the new identity provider
-    """
-
-    description = module.params.get('description')
-    enabled = module.params.get('enabled')
-    domain_id = module.params.get('domain_id')
-    remote_ids = module.params.get('remote_ids')
-
-    attributes = {}
-
-    if (description is not None) and (description != idp.description):
-        attributes['description'] = description
-    if (enabled is not None) and (enabled != idp.is_enabled):
-        attributes['enabled'] = enabled
-    if (domain_id is not None) and (domain_id != idp.domain_id):
-        attributes['domain_id'] = domain_id
-    if (remote_ids is not None) and (remote_ids != idp.remote_ids):
-        attributes['remote_ids'] = remote_ids
-
-    if not attributes:
-        return False, idp
-
-    if module.check_mode:
-        return True, None
-
-    try:
-        new_idp = cloud.identity.update_identity_provider(idp, **attributes)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to update identity provider: {0}'.format(str(ex)))
-    return (True, new_idp)
-
-
-def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityFederationIdpModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True, aliases=['id']),
        state=dict(default='present', choices=['absent', 'present']),
        description=dict(),
@@ -197,45 +84,136 @@ def main():
        enabled=dict(type='bool', aliases=['is_enabled']),
        remote_ids=dict(type='list', elements='str'),
    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
+    module_kwargs = dict(
        supports_check_mode=True,
-        **module_kwargs
    )

-    name = module.params.get('name')
-    state = module.params.get('state')
-    changed = False
+    def normalize_idp(self, idp):
+        """
+        Normalizes the IDP definitions so that the outputs are consistent with the
+        parameters

-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    try:
-        idp = cloud.identity.get_identity_provider(name)
-    except sdk.exceptions.ResourceNotFound:
-        idp = None
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to get identity provider: {0}'.format(str(ex)))
-
-    if state == 'absent':
-        if idp is not None:
-            changed = delete_identity_provider(module, sdk, cloud, idp)
-        module.exit_json(changed=changed)
-
-    # state == 'present'
-    else:
+        - "enabled" (parameter) == "is_enabled" (SDK)
+        - "name" (parameter) == "id" (SDK)
+        """
        if idp is None:
-            if module.params.get('domain_id') is None:
-                module.fail_json(msg='A domain_id must be passed when creating'
-                                 ' an identity provider')
-            (changed, idp) = create_identity_provider(module, sdk, cloud, name)
-            idp = normalize_idp(idp)
-            module.exit_json(changed=changed, identity_provider=idp)
+            return None

-        (changed, new_idp) = update_identity_provider(module, sdk, cloud, idp)
-        new_idp = normalize_idp(new_idp)
-        module.exit_json(changed=changed, identity_provider=new_idp)
+        _idp = idp.to_dict()
+        _idp['enabled'] = idp['is_enabled']
+        _idp['name'] = idp['id']
+        return _idp
+
+    def delete_identity_provider(self, idp):
+        """
+        Delete an existing Identity Provider
+
+        returns: the "Changed" state
+        """
+        if idp is None:
+            return False
+
+        if self.ansible.check_mode:
+            return True
+
+        self.conn.identity.delete_identity_provider(idp)
+        return True
+
+    def create_identity_provider(self, name):
+        """
+        Create a new Identity Provider
+
+        returns: the "Changed" state and the new identity provider
+        """
+
+        if self.ansible.check_mode:
+            return True, None
+
+        description = self.params.get('description')
+        enabled = self.params.get('enabled')
+        domain_id = self.params.get('domain_id')
+        remote_ids = self.params.get('remote_ids')
+
+        if enabled is None:
+            enabled = True
+        if remote_ids is None:
+            remote_ids = []
+
+        attributes = {
+            'domain_id': domain_id,
+            'enabled': enabled,
+            'remote_ids': remote_ids,
+        }
+        if description is not None:
+            attributes['description'] = description
+
+        idp = self.conn.identity.create_identity_provider(id=name, **attributes)
+        return (True, idp)
+
+    def update_identity_provider(self, idp):
+        """
+        Update an existing Identity Provider
+
+        returns: the "Changed" state and the new identity provider
+        """
+
+        description = self.params.get('description')
+        enabled = self.params.get('enabled')
+        domain_id = self.params.get('domain_id')
+        remote_ids = self.params.get('remote_ids')
+
+        attributes = {}
+
+        if (description is not None) and (description != idp.description):
+            attributes['description'] = description
+        if (enabled is not None) and (enabled != idp.is_enabled):
+            attributes['enabled'] = enabled
+        if (domain_id is not None) and (domain_id != idp.domain_id):
+            attributes['domain_id'] = domain_id
+        if (remote_ids is not None) and (remote_ids != idp.remote_ids):
+            attributes['remote_ids'] = remote_ids
+
+        if not attributes:
+            return False, idp
+
+        if self.ansible.check_mode:
+            return True, None
+
+        new_idp = self.conn.identity.update_identity_provider(idp, **attributes)
+        return (True, new_idp)
+
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+        state = self.params.get('state')
+        changed = False
+
+        idp = self.conn.identity.find_identity_provider(name)
+
+        if state == 'absent':
+            if idp is not None:
+                changed = self.delete_identity_provider(idp)
+            self.exit_json(changed=changed)
+
+        # state == 'present'
+        else:
+            if idp is None:
+                if self.params.get('domain_id') is None:
+                    self.fail_json(msg='A domain_id must be passed when creating'
+                                   ' an identity provider')
+                (changed, idp) = self.create_identity_provider(name)
+                idp = self.normalize_idp(idp)
+                self.exit_json(changed=changed, identity_provider=idp)
+
+            (changed, new_idp) = self.update_identity_provider(idp)
+            new_idp = self.normalize_idp(new_idp)
+            self.exit_json(changed=changed, identity_provider=new_idp)
+
+
+def main():
+    module = IdentityFederationIdpModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/federation_idp_info.py
+++ b/plugins/modules/federation_idp_info.py
@@ -39,62 +39,50 @@ EXAMPLES = '''
 RETURN = '''
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def normalize_idp(idp):
-    """
-    Normalizes the IDP definitions so that the outputs are consistent with the
-    parameters
+class IdentityFederationIdpInfoModule(OpenStackModule):
+    argument_spec = dict(
+        name=dict(aliases=['id']),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    - "enabled" (parameter) == "is_enabled" (SDK)
-    - "name" (parameter) == "id" (SDK)
-    """
-    if idp is None:
-        return
+    def normalize_idp(self, idp):
+        """
+        Normalizes the IDP definitions so that the outputs are consistent with the
+        parameters

-    _idp = idp.to_dict()
-    _idp['enabled'] = idp['is_enabled']
-    _idp['name'] = idp['id']
-    return _idp
+        - "enabled" (parameter) == "is_enabled" (SDK)
+        - "name" (parameter) == "id" (SDK)
+        """
+        if idp is None:
+            return
+
+        _idp = idp.to_dict()
+        _idp['enabled'] = idp['is_enabled']
+        _idp['name'] = idp['id']
+        return _idp
+
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+
+        if name:
+            idp = self.normalize_idp(self.conn.identity.get_identity_provider(name))
+            self.exit_json(changed=False, identity_providers=[idp])
+
+        else:
+            providers = list(map(self.normalize_idp, self.conn.identity.identity_providers()))
+            self.exit_json(changed=False, identity_providers=providers)


 def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
-        name=dict(aliases=['id']),
-    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
-    )
-
-    name = module.params.get('name')
-
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    if name:
-        try:
-            idp = normalize_idp(cloud.identity.get_identity_provider(name))
-        except sdk.exceptions.ResourceNotFound:
-            module.fail_json(msg='Failed to find identity provider')
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to get identity provider: {0}'.format(str(ex)))
-        module.exit_json(changed=False, identity_providers=[idp])
-
-    else:
-        try:
-            providers = list(map(normalize_idp, cloud.identity.identity_providers()))
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to list identity providers: {0}'.format(str(ex)))
-        module.exit_json(changed=False, identity_providers=providers)
+    module = IdentityFederationIdpInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/federation_mapping.py
+++ b/plugins/modules/federation_mapping.py
@@ -78,93 +78,11 @@ EXAMPLES = '''
 RETURN = '''
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def normalize_mapping(mapping):
-    """
-    Normalizes the mapping definitions so that the outputs are consistent with
-    the parameters
-
-    - "name" (parameter) == "id" (SDK)
-    """
-    if mapping is None:
-        return None
-
-    _mapping = mapping.to_dict()
-    _mapping['name'] = mapping['id']
-    return _mapping
-
-
-def create_mapping(module, sdk, cloud, name):
-    """
-    Attempt to create a Mapping
-
-    returns: A tuple containing the "Changed" state and the created mapping
-    """
-
-    if module.check_mode:
-        return (True, None)
-
-    rules = module.params.get('rules')
-
-    try:
-        mapping = cloud.identity.create_mapping(id=name, rules=rules)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to create mapping: {0}'.format(str(ex)))
-    return (True, mapping)
-
-
-def delete_mapping(module, sdk, cloud, mapping):
-    """
-    Attempt to delete a Mapping
-
-    returns: the "Changed" state
-    """
-    if mapping is None:
-        return False
-
-    if module.check_mode:
-        return True
-
-    try:
-        cloud.identity.delete_mapping(mapping)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to delete mapping: {0}'.format(str(ex)))
-    return True
-
-
-def update_mapping(module, sdk, cloud, mapping):
-    """
-    Attempt to delete a Mapping
-
-    returns: The "Changed" state and the the new mapping
-    """
-
-    current_rules = mapping.rules
-    new_rules = module.params.get('rules')
-
-    # Nothing to do
-    if current_rules == new_rules:
-        return (False, mapping)
-
-    if module.check_mode:
-        return (True, None)
-
-    try:
-        new_mapping = cloud.identity.update_mapping(mapping, rules=new_rules)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to update mapping: {0}'.format(str(ex)))
-    return (True, new_mapping)
-
-
-def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityFederationMappingModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True, aliases=['id']),
        state=dict(default='present', choices=['absent', 'present']),
        rules=dict(type='list', elements='dict', options=dict(
@@ -172,46 +90,107 @@ def main():
            remote=dict(required=True, type='list', elements='dict')
        )),
    )
-    module_kwargs = openstack_module_kwargs(
-        required_if=[('state', 'present', ['rules'])]
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
+    module_kwargs = dict(
+        required_if=[('state', 'present', ['rules'])],
+        supports_check_mode=True
    )

-    name = module.params.get('name')
-    state = module.params.get('state')
-    changed = False
-
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    try:
-        mapping = cloud.identity.get_mapping(name)
-    except sdk.exceptions.ResourceNotFound:
-        mapping = None
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to fetch mapping: {0}'.format(str(ex)))
-
-    if state == 'absent':
-        if mapping is not None:
-            changed = delete_mapping(module, sdk, cloud, mapping)
-        module.exit_json(changed=changed)
-
-    # state == 'present'
-    else:
-        if len(module.params.get('rules')) < 1:
-            module.fail_json(msg='At least one rule must be passed')
+    def normalize_mapping(self, mapping):
+        """
+        Normalizes the mapping definitions so that the outputs are consistent with
+        the parameters

+        - "name" (parameter) == "id" (SDK)
+        """
        if mapping is None:
-            (changed, mapping) = create_mapping(module, sdk, cloud, name)
-            mapping = normalize_mapping(mapping)
-            module.exit_json(changed=changed, mapping=mapping)
+            return None
+
+        _mapping = mapping.to_dict()
+        _mapping['name'] = mapping['id']
+        return _mapping
+
+    def create_mapping(self, name):
+        """
+        Attempt to create a Mapping
+
+        returns: A tuple containing the "Changed" state and the created mapping
+        """
+
+        if self.ansible.check_mode:
+            return (True, None)
+
+        rules = self.params.get('rules')
+
+        mapping = self.conn.identity.create_mapping(id=name, rules=rules)
+        return (True, mapping)
+
+    def delete_mapping(self, mapping):
+        """
+        Attempt to delete a Mapping
+
+        returns: the "Changed" state
+        """
+        if mapping is None:
+            return False
+
+        if self.ansible.check_mode:
+            return True
+
+        self.conn.identity.delete_mapping(mapping)
+        return True
+
+    def update_mapping(self, mapping):
+        """
+        Attempt to delete a Mapping
+
+        returns: The "Changed" state and the the new mapping
+        """
+
+        current_rules = mapping.rules
+        new_rules = self.params.get('rules')
+
+        # Nothing to do
+        if current_rules == new_rules:
+            return (False, mapping)
+
+        if self.ansible.check_mode:
+            return (True, None)
+
+        new_mapping = self.conn.identity.update_mapping(mapping, rules=new_rules)
+        return (True, new_mapping)
+
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+        state = self.params.get('state')
+        changed = False
+
+        mapping = self.conn.identity.find_mapping(name)
+
+        if state == 'absent':
+            if mapping is not None:
+                changed = self.delete_mapping(mapping)
+            self.exit_json(changed=changed)
+
+        # state == 'present'
        else:
-            (changed, new_mapping) = update_mapping(module, sdk, cloud, mapping)
-            new_mapping = normalize_mapping(new_mapping)
-            module.exit_json(mapping=new_mapping, changed=changed)
+            if len(self.params.get('rules')) < 1:
+                self.fail_json(msg='At least one rule must be passed')
+
+            if mapping is None:
+                (changed, mapping) = self.create_mapping(name)
+                mapping = self.normalize_mapping(mapping)
+                self.exit_json(changed=changed, mapping=mapping)
+            else:
+                (changed, new_mapping) = self.update_mapping(mapping)
+                new_mapping = self.normalize_mapping(new_mapping)
+                self.exit_json(mapping=new_mapping, changed=changed)
+
+
+def main():
+    module = IdentityFederationMappingModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/federation_mapping_info.py
+++ b/plugins/modules/federation_mapping_info.py
@@ -38,60 +38,50 @@ EXAMPLES = '''
 RETURN = '''
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def normalize_mapping(mapping):
-    """
-    Normalizes the mapping definitions so that the outputs are consistent with the
-    parameters
+class IdentityFederationMappingInfoModule(OpenStackModule):
+    argument_spec = dict(
+        name=dict(aliases=['id']),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    - "name" (parameter) == "id" (SDK)
-    """
-    if mapping is None:
-        return None
+    module_min_sdk_version = "0.44"

-    _mapping = mapping.to_dict()
-    _mapping['name'] = mapping['id']
-    return _mapping
+    def normalize_mapping(self, mapping):
+        """
+        Normalizes the mapping definitions so that the outputs are consistent with the
+        parameters
+
+        - "name" (parameter) == "id" (SDK)
+        """
+        if mapping is None:
+            return None
+
+        _mapping = mapping.to_dict()
+        _mapping['name'] = mapping['id']
+        return _mapping
+
+    def run(self):
+        """ Module entry point """
+        name = self.params.get('name')
+
+        if name:
+            mapping = self.normalize_mapping(
+                self.conn.identity.get_mapping(name))
+            self.exit_json(changed=False, mappings=[mapping])
+        else:
+            mappings = list(map(
+                self.normalize_mapping, self.conn.identity.mappings()))
+            self.exit_json(changed=False, mappings=mappings)


 def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
-        name=dict(aliases=['id']),
-    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
-    )
-
-    name = module.params.get('name')
-
-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    if name:
-        try:
-            mapping = normalize_mapping(cloud.identity.get_mapping(name))
-        except sdk.exceptions.ResourceNotFound:
-            module.fail_json(msg='Failed to find mapping')
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to get mapping: {0}'.format(str(ex)))
-        module.exit_json(changed=False, mappings=[mapping])
-
-    else:
-        try:
-            mappings = list(map(normalize_mapping, cloud.identity.mappings()))
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to list mappings: {0}'.format(str(ex)))
-        module.exit_json(changed=False, mappings=mappings)
+    module = IdentityFederationMappingInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/floating_ip.py
+++ b/plugins/modules/floating_ip.py
@@ -11,6 +11,7 @@ short_description: Add/Remove floating IP from an instance
 description:
   - Add or Remove a floating IP to an instance.
   - Returns the floating IP when attaching only if I(wait=true).
+   - When detaching a floating IP there might be a delay until an instance does not list the floating IP any more.
 options:
   server:
     description:
@@ -24,9 +25,9 @@ options:
     type: str
   floating_ip_address:
     description:
-        - A floating IP address to attach or to detach. Required only if I(state)
-          is absent. When I(state) is present can be used to specify a IP address
-          to attach.
+        - A floating IP address to attach or to detach. When I(state) is present
+          can be used to specify a IP address to attach. I(floating_ip_address)
+          requires I(network) to be set.
     type: str
   reuse:
     description:
@@ -49,7 +50,7 @@ options:
   wait:
     description:
        - When attaching a floating IP address, specify whether to wait for it to appear as attached.
-        - Must be set to C(yes) for the module to return the value of the floating IP.
+        - Must be set to C(yes) for the module to return the value of the floating IP when attaching.
     type: bool
     default: 'no'
   timeout:
@@ -118,23 +119,12 @@ EXAMPLES = '''
     server: cattle001
 '''

-from ansible.module_utils.basic import AnsibleModule, remove_values
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+import itertools


-def _get_floating_ip(cloud, floating_ip_address):
-    f_ips = cloud.search_floating_ips(
-        filters={'floating_ip_address': floating_ip_address})
-    if not f_ips:
-        return None
-
-    return f_ips[0]
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class NetworkingFloatingIPModule(OpenStackModule):
+    argument_spec = dict(
        server=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
        network=dict(required=False, default=None),
@@ -148,107 +138,169 @@ def main():
        purge=dict(required=False, type='bool', default=False),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module_kwargs = dict(
+        required_if=[
+            ['state', 'absent', ['floating_ip_address']]
+        ],
+        required_by=dict(
+            floating_ip_address=('network',)
+        )
+    )

-    server_name_or_id = module.params['server']
-    state = module.params['state']
-    network = module.params['network']
-    floating_ip_address = module.params['floating_ip_address']
-    reuse = module.params['reuse']
-    fixed_address = module.params['fixed_address']
-    nat_destination = module.params['nat_destination']
-    wait = module.params['wait']
-    timeout = module.params['timeout']
-    purge = module.params['purge']
+    def _get_floating_ip(self, floating_ip_address):
+        f_ips = self.conn.search_floating_ips(
+            filters={'floating_ip_address': floating_ip_address})

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
+        if not f_ips:
+            return None

-        server = cloud.get_server(server_name_or_id)
-        if server is None:
-            module.fail_json(
+        return f_ips[0]
+
+    def _list_floating_ips(self, server):
+        return itertools.chain.from_iterable([
+            (addr['addr'] for addr in server.addresses[net] if addr['OS-EXT-IPS:type'] == 'floating')
+            for net in server.addresses
+        ])
+
+    def _match_floating_ip(self, server,
+                           floating_ip_address,
+                           network_id,
+                           fixed_address,
+                           nat_destination):
+
+        if floating_ip_address:
+            return self._get_floating_ip(floating_ip_address)
+        elif not fixed_address and nat_destination:
+            nat_destination_name = self.conn.get_network(nat_destination)['name']
+            return next(
+                (self._get_floating_ip(addr['addr'])
+                 for addr in server.addresses.get(nat_destination_name, [])
+                 if addr['OS-EXT-IPS:type'] == 'floating'),
+                None)
+        else:
+            # not floating_ip_address and (fixed_address or not nat_destination)
+
+            # get any of the floating ips that matches fixed_address and/or network
+            f_ip_addrs = self._list_floating_ips(server)
+            f_ips = [f_ip for f_ip in self.conn.list_floating_ips() if f_ip['floating_ip_address'] in f_ip_addrs]
+            return next(
+                (f_ip for f_ip in f_ips
+                 if ((fixed_address and f_ip.fixed_ip_address == fixed_address) or not fixed_address)
+                 and ((network_id and f_ip.network == network_id) or not network_id)),
+                None)
+
+    def run(self):
+        server_name_or_id = self.params['server']
+        state = self.params['state']
+        network = self.params['network']
+        floating_ip_address = self.params['floating_ip_address']
+        reuse = self.params['reuse']
+        fixed_address = self.params['fixed_address']
+        nat_destination = self.params['nat_destination']
+        wait = self.params['wait']
+        timeout = self.params['timeout']
+        purge = self.params['purge']
+
+        server = self.conn.get_server(server_name_or_id)
+        if not server:
+            self.fail_json(
                msg="server {0} not found".format(server_name_or_id))

+        # Extract floating ips from server
+        f_ip_addrs = self._list_floating_ips(server)
+
+        # Get details about requested floating ip
+        f_ip = self._get_floating_ip(floating_ip_address) if floating_ip_address else None
+
+        if network:
+            network_id = self.conn.get_network(name_or_id=network)["id"]
+        else:
+            network_id = None
+
        if state == 'present':
-            # If f_ip already assigned to server, check that it matches
-            # requirements.
-            public_ip = cloud.get_server_public_ip(server)
-            f_ip = _get_floating_ip(cloud, public_ip) if public_ip else public_ip
-            if f_ip:
-                if network:
-                    network_id = cloud.get_network(name_or_id=network)["id"]
-                else:
-                    network_id = None
-                # check if we have floating ip on given nat_destination network
-                if nat_destination:
-                    nat_floating_addrs = [
-                        addr for addr in server.addresses.get(
-                            cloud.get_network(nat_destination)['name'], [])
-                        if addr['addr'] == public_ip
-                        and addr['OS-EXT-IPS:type'] == 'floating'
-                    ]
+            if floating_ip_address and f_ip and floating_ip_address in f_ip_addrs:
+                # Floating ip address has been assigned to server
+                self.exit_json(changed=False, floating_ip=f_ip)

-                    if len(nat_floating_addrs) == 0:
-                        module.fail_json(msg="server {server} already has a "
-                                             "floating-ip on a different "
-                                             "nat-destination than '{nat_destination}'"
-                                         .format(server=server_name_or_id,
-                                                 nat_destination=nat_destination))
+            if f_ip and f_ip['attached'] and floating_ip_address not in f_ip_addrs:
+                # Requested floating ip has been attached to different server
+                self.fail_json(msg="floating-ip {floating_ip_address} already has been attached to different server"
+                                   .format(floating_ip_address=floating_ip_address))

-                if all([fixed_address, f_ip.fixed_ip_address == fixed_address,
-                        network, f_ip.network != network_id]):
-                    # Current state definitely conflicts with requirements
-                    module.fail_json(msg="server {server} already has a "
-                                         "floating-ip on requested "
-                                         "interface but it doesn't match "
-                                         "requested network {network}: {fip}"
-                                     .format(server=server_name_or_id,
-                                             network=network,
-                                             fip=remove_values(f_ip,
-                                                               module.no_log_values)))
-                if not network or f_ip.network == network_id:
-                    # Requirements are met
-                    module.exit_json(changed=False, floating_ip=f_ip)
+            if not floating_ip_address:
+                # No specific floating ip requested, i.e. if any floating ip is already assigned to server,
+                # check that it matches requirements.

-                # Requirements are vague enough to ignore existing f_ip and try
-                # to create a new f_ip to the server.
+                if not fixed_address and nat_destination:
+                    # Check if we have any floating ip on the given nat_destination network
+                    nat_destination_name = self.conn.get_network(nat_destination)['name']
+                    for addr in server.addresses.get(nat_destination_name, []):
+                        if addr['OS-EXT-IPS:type'] == 'floating':
+                            # A floating ip address has been assigned to the requested nat_destination
+                            f_ip = self._get_floating_ip(addr['addr'])
+                            self.exit_json(changed=False, floating_ip=f_ip)
+                # else fixed_address or not nat_destination, hence an
+                # analysis of all floating ips of server is required
+                f_ips = [f_ip for f_ip in self.conn.list_floating_ips() if f_ip['floating_ip_address'] in f_ip_addrs]
+                for f_ip in f_ips:
+                    if network_id and f_ip.network != network_id:
+                        # requested network does not match network of floating ip
+                        continue

-            server = cloud.add_ips_to_server(
-                server=server, ips=floating_ip_address, ip_pool=network,
-                reuse=reuse, fixed_address=fixed_address, wait=wait,
+                    if not fixed_address and not nat_destination:
+                        # any floating ip will fullfil these requirements
+                        self.exit_json(changed=False, floating_ip=f_ip)
+
+                    if fixed_address and f_ip.fixed_ip_address == fixed_address:
+                        # a floating ip address has been assigned that points to the requested fixed_address
+                        self.exit_json(changed=False, floating_ip=f_ip)
+
+            if floating_ip_address and not f_ip:
+                # openstacksdk's create_ip requires floating_ip_address and floating_network_id to be set
+                self.conn.network.create_ip(floating_ip_address=floating_ip_address, floating_network_id=network_id)
+            # Else floating ip either does not exist or has not been attached yet
+
+            # Both floating_ip_address and network are mutually exclusive in add_ips_to_server, i.e.
+            # add_ips_to_server will ignore floating_ip_address if network is set
+            # Ref.: https://github.com/openstack/openstacksdk/blob/a6b0ece2821ea79330c4067100295f6bdcbe456e/openstack/cloud/_floating_ip.py#L987
+            server = self.conn.add_ips_to_server(
+                server=server,
+                ips=floating_ip_address,
+                ip_pool=network if not floating_ip_address else None,
+                reuse=reuse,
+                fixed_address=fixed_address,
+                wait=wait,
                timeout=timeout, nat_destination=nat_destination)
-            fip_address = cloud.get_server_public_ip(server)
-            # Update the floating IP status
-            f_ip = _get_floating_ip(cloud, fip_address)
-            module.exit_json(changed=True, floating_ip=f_ip)
+
+            # Update the floating ip status
+            f_ip = self._match_floating_ip(server, floating_ip_address, network_id, fixed_address, nat_destination)
+            self.exit_json(changed=True, floating_ip=f_ip)

        elif state == 'absent':
-            if floating_ip_address is None:
-                if not server_name_or_id:
-                    module.fail_json(msg="either server or floating_ip_address are required")
-                server = cloud.get_server(server_name_or_id)
-                floating_ip_address = cloud.get_server_public_ip(server)
-
-            f_ip = _get_floating_ip(cloud, floating_ip_address)
-
+            f_ip = self._match_floating_ip(server, floating_ip_address, network_id, fixed_address, nat_destination)
            if not f_ip:
                # Nothing to detach
-                module.exit_json(changed=False)
+                self.exit_json(changed=False)
            changed = False
-            if f_ip["fixed_ip_address"]:
-                cloud.detach_ip_from_server(
-                    server_id=server['id'], floating_ip_id=f_ip['id'])
-                # Update the floating IP status
-                f_ip = cloud.get_floating_ip(id=f_ip['id'])
-                changed = True
-            if purge:
-                cloud.delete_floating_ip(f_ip['id'])
-                module.exit_json(changed=True)
-            module.exit_json(changed=changed, floating_ip=f_ip)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+            if f_ip["fixed_ip_address"]:
+                self.conn.detach_ip_from_server(server_id=server['id'], floating_ip_id=f_ip['id'])
+                # OpenStackSDK sets {"port_id": None} to detach a floating ip from an instance,
+                # but there might be a delay until a server does not list it in addresses any more.
+
+                # Update the floating IP status
+                f_ip = self.conn.get_floating_ip(id=f_ip['id'])
+                changed = True
+
+            if purge:
+                self.conn.delete_floating_ip(f_ip['id'])
+                self.exit_json(changed=True)
+            self.exit_json(changed=changed, floating_ip=f_ip)
+
+
+def main():
+    module = NetworkingFloatingIPModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/floating_ip_info.py
+++ b/plugins/modules/floating_ip_info.py
@@ -0,0 +1,214 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Open Telekom Cloud, operated by T-Systems International GmbH
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: floating_ip_info
+short_description: Get information about floating ips
+author: OpenStack Ansible SIG
+description:
+  - Get a generator of floating ips.
+options:
+  description:
+    description:
+      - The description of a floating IP.
+    type: str
+  fixed_ip_address:
+    description:
+      - The fixed IP address associated with a floating IP address.
+    type: str
+  floating_ip_address:
+    description:
+      -  The IP address of a floating IP.
+    type: str
+  floating_network:
+    description:
+      - The name or id of the network associated with a floating IP.
+    type: str
+  port:
+    description:
+      - The name or id of the port to which a floating IP is associated.
+    type: str
+  project_id:
+    description:
+      - The ID of the project a floating IP is associated with.
+    type: str
+  router:
+    description:
+      - The name or id of an associated router.
+    type: str
+  status:
+    description:
+      - The status of a floating IP, which can be ``ACTIVE``or ``DOWN``.
+    choices: ['active', 'down']
+    type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+RETURN = '''
+floating_ips:
+  description: The floating ip objects list.
+  type: complex
+  returned: On Success.
+  contains:
+    created_at:
+      description: Timestamp at which the floating IP was assigned.
+      type: str
+    description:
+      description: The description of a floating IP.
+      type: str
+    dns_domain:
+      description: The DNS domain.
+      type: str
+    dns_name:
+      description: The DNS name.
+      type: str
+    fixed_ip_address:
+      description: The fixed IP address associated with a floating IP address.
+      type: str
+    floating_ip_address:
+      description: The IP address of a floating IP.
+      type: str
+    floating_network_id:
+      description: The id of the network associated with a floating IP.
+      type: str
+    id:
+      description: Id of the floating ip.
+      type: str
+    name:
+      description: Name of the floating ip.
+      type: str
+    port_details:
+      description: The details of the port that this floating IP associates \
+        with. Present if ``fip-port-details`` extension is loaded.
+      type: str
+    port_id:
+      description: The port ID floating ip associated with.
+      type: str
+    project_id:
+      description: The ID of the project this floating IP is associated with.
+      type: str
+    qos_policy_id:
+      description: The ID of the QoS policy attached to the floating IP.
+      type: str
+    revision_number:
+      description: Revision number.
+      type: str
+    router_id:
+      description: The id of the router floating ip associated with.
+      type: str
+    status:
+      description: The status of a floating IP, which can be ``ACTIVE``or ``DOWN``.\
+        Can be 'ACTIVE' and 'DOWN'.
+      type: str
+    subnet_id:
+      description: The id of the subnet the floating ip associated with.
+      type: str
+    tags:
+      description: List of tags.
+      type: str
+    updated_at:
+      description: Timestamp at which the floating IP was last updated.
+      type: str
+'''
+
+EXAMPLES = '''
+# Getting all floating ips
+- openstack.cloud.floating_ip_info:
+  register: fips
+
+# Getting fip by associated fixed IP address.
+- openstack.cloud.floating_ip_info:
+    fixed_ip_address: 192.168.10.8
+  register: fip
+
+# Getting fip by associated router.
+- openstack.cloud.floating_ip_info:
+    router: my-router
+  register: fip
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class FloatingIPInfoModule(OpenStackModule):
+    argument_spec = dict(
+        description=dict(required=False),
+        fixed_ip_address=dict(required=False),
+        floating_ip_address=dict(required=False),
+        floating_network=dict(required=False),
+        port=dict(required=False),
+        project_id=dict(required=False),
+        router=dict(required=False),
+        status=dict(required=False, choices=['active', 'down']),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+
+        description = self.params['description']
+        fixed_ip_address = self.params['fixed_ip_address']
+        floating_ip_address = self.params['floating_ip_address']
+        floating_network = self.params['floating_network']
+        port = self.params['port']
+        project_id = self.params['project_id']
+        router = self.params['router']
+        status = self.params['status']
+
+        data = []
+        query = {}
+        if description:
+            query['description'] = description
+        if fixed_ip_address:
+            query['fixed_ip_address'] = fixed_ip_address
+        if floating_ip_address:
+            query['floating_ip_address'] = floating_ip_address
+        if floating_network:
+            try:
+                query['floating_network_id'] = self.conn.network.find_network(name_or_id=floating_network,
+                                                                              ignore_missing=False).id
+            except self.sdk.exceptions.ResourceNotFound:
+                self.fail_json(msg="floating_network not found")
+        if port:
+            try:
+                query['port_id'] = self.conn.network.find_port(name_or_id=port, ignore_missing=False).id
+            except self.sdk.exceptions.ResourceNotFound:
+                self.fail_json(msg="port not found")
+        if project_id:
+            query['project_id'] = project_id
+        if router:
+            try:
+                query['router_id'] = self.conn.network.find_router(name_or_id=router, ignore_missing=False).id
+            except self.sdk.exceptions.ResourceNotFound:
+                self.fail_json(msg="router not found")
+        if status:
+            query['status'] = status.upper()
+
+        for raw in self.conn.network.ips(**query):
+            dt = raw.to_dict()
+            dt.pop('location')
+            data.append(dt)
+
+        self.exit_json(
+            changed=False,
+            floating_ips=data
+        )
+
+
+def main():
+    module = FloatingIPInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/group_assignment.py
+++ b/plugins/modules/group_assignment.py
@@ -42,58 +42,54 @@ EXAMPLES = '''
  group: demo
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _system_state_change(state, in_group):
-    if state == 'present' and not in_group:
-        return True
-    if state == 'absent' and in_group:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityGroupAssignment(OpenStackModule):
+    argument_spec = dict(
        user=dict(required=True),
        group=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    user = module.params['user']
-    group = module.params['group']
-    state = module.params['state']
+    def _system_state_change(self, state, in_group):
+        if state == 'present' and not in_group:
+            return True
+        if state == 'absent' and in_group:
+            return True
+        return False

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        in_group = cloud.is_user_in_group(user, group)
+    def run(self):
+        user = self.params['user']
+        group = self.params['group']
+        state = self.params['state']

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(state, in_group))
+        in_group = self.conn.is_user_in_group(user, group)
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(state, in_group))

        changed = False
        if state == 'present':
            if not in_group:
-                cloud.add_user_to_group(user, group)
+                self.conn.add_user_to_group(user, group)
                changed = True

        elif state == 'absent':
            if in_group:
-                cloud.remove_user_from_group(user, group)
+                self.conn.remove_user_from_group(user, group)
                changed = True

-        module.exit_json(changed=changed)
+        self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+
+def main():
+    module = IdentityGroupAssignment()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/host_aggregate.py
+++ b/plugins/modules/host_aggregate.py
@@ -77,69 +77,11 @@ RETURN = '''

 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _needs_update(module, aggregate):
-    new_metadata = (module.params['metadata'] or {})
-
-    if module.params['availability_zone'] is not None:
-        new_metadata['availability_zone'] = module.params['availability_zone']
-
-    if module.params['name'] != aggregate.name:
-        return True
-    if module.params['hosts'] is not None:
-        if module.params['purge_hosts']:
-            if set(module.params['hosts']) != set(aggregate.hosts):
-                return True
-        else:
-            intersection = set(module.params['hosts']).intersection(set(aggregate.hosts))
-            if set(module.params['hosts']) != intersection:
-                return True
-    if module.params['availability_zone'] is not None:
-        if module.params['availability_zone'] != aggregate.availability_zone:
-            return True
-    if module.params['metadata'] is not None:
-        if new_metadata != aggregate.metadata:
-            return True
-
-    return False
-
-
-def _system_state_change(module, aggregate):
-    state = module.params['state']
-    if state == 'absent' and aggregate:
-        return True
-
-    if state == 'present':
-        if aggregate is None:
-            return True
-        return _needs_update(module, aggregate)
-
-    return False
-
-
-def _update_hosts(cloud, aggregate, hosts, purge_hosts):
-    if hosts is None:
-        return
-
-    hosts_to_add = set(hosts) - set(aggregate.hosts)
-    for i in hosts_to_add:
-        cloud.add_host_to_aggregate(aggregate.id, i)
-
-    if not purge_hosts:
-        return
-
-    hosts_to_remove = set(aggregate.hosts) - set(hosts)
-    for i in hosts_to_remove:
-        cloud.remove_host_from_aggregate(aggregate.id, i)
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class ComputeHostAggregateModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        metadata=dict(required=False, default=None, type='dict'),
        availability_zone=dict(required=False, default=None),
@@ -148,24 +90,74 @@ def main():
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    name = module.params['name']
-    metadata = module.params['metadata']
-    availability_zone = module.params['availability_zone']
-    hosts = module.params['hosts']
-    purge_hosts = module.params['purge_hosts']
-    state = module.params['state']
+    def _needs_update(self, aggregate):
+        new_metadata = (self.params['metadata'] or {})

-    if metadata is not None:
-        metadata.pop('availability_zone', None)
+        if self.params['availability_zone'] is not None:
+            new_metadata['availability_zone'] = self.params['availability_zone']

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        aggregates = cloud.search_aggregates(name_or_id=name)
+        if self.params['name'] != aggregate.name:
+            return True
+        if self.params['hosts'] is not None:
+            if self.params['purge_hosts']:
+                if set(self.params['hosts']) != set(aggregate.hosts):
+                    return True
+            else:
+                intersection = set(self.params['hosts']).intersection(set(aggregate.hosts))
+                if set(self.params['hosts']) != intersection:
+                    return True
+        if self.params['availability_zone'] is not None:
+            if self.params['availability_zone'] != aggregate.availability_zone:
+                return True
+        if self.params['metadata'] is not None:
+            if new_metadata != aggregate.metadata:
+                return True
+
+        return False
+
+    def _system_state_change(self, aggregate):
+        state = self.params['state']
+        if state == 'absent' and aggregate:
+            return True
+
+        if state == 'present':
+            if aggregate is None:
+                return True
+            return self._needs_update(aggregate)
+
+        return False
+
+    def _update_hosts(self, aggregate, hosts, purge_hosts):
+        if hosts is None:
+            return
+
+        hosts_to_add = set(hosts) - set(aggregate.get("hosts", []))
+        for i in hosts_to_add:
+            self.conn.add_host_to_aggregate(aggregate.id, i)
+
+        if not purge_hosts:
+            return
+
+        hosts_to_remove = set(aggregate.get("hosts", [])) - set(hosts)
+        for i in hosts_to_remove:
+            self.conn.remove_host_from_aggregate(aggregate.id, i)
+
+    def run(self):
+        name = self.params['name']
+        metadata = self.params['metadata']
+        availability_zone = self.params['availability_zone']
+        hosts = self.params['hosts']
+        purge_hosts = self.params['purge_hosts']
+        state = self.params['state']
+
+        if metadata is not None:
+            metadata.pop('availability_zone', None)
+
+        aggregates = self.conn.search_aggregates(name_or_id=name)

        if len(aggregates) == 1:
            aggregate = aggregates[0]
@@ -174,45 +166,48 @@ def main():
        else:
            raise Exception("Should not happen")

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, aggregate))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(aggregate))

        if state == 'present':
            if aggregate is None:
-                aggregate = cloud.create_aggregate(name=name,
-                                                   availability_zone=availability_zone)
-                _update_hosts(cloud, aggregate, hosts, False)
+                aggregate = self.conn.create_aggregate(
+                    name=name, availability_zone=availability_zone)
+                self._update_hosts(aggregate, hosts, False)
                if metadata:
-                    cloud.set_aggregate_metadata(aggregate.id, metadata)
+                    self.conn.set_aggregate_metadata(aggregate.id, metadata)
                changed = True
            else:
-                if _needs_update(module, aggregate):
+                if self._needs_update(aggregate):
                    if availability_zone is not None:
-                        aggregate = cloud.update_aggregate(aggregate.id, name=name,
-                                                           availability_zone=availability_zone)
+                        aggregate = self.conn.update_aggregate(
+                            aggregate.id, name=name,
+                            availability_zone=availability_zone)
                    if metadata is not None:
                        metas = metadata
                        for i in (set(aggregate.metadata.keys()) - set(metadata.keys())):
                            if i != 'availability_zone':
                                metas[i] = None
-                        cloud.set_aggregate_metadata(aggregate.id, metas)
-                    _update_hosts(cloud, aggregate, hosts, purge_hosts)
+                        self.conn.set_aggregate_metadata(aggregate.id, metas)
+                    self._update_hosts(aggregate, hosts, purge_hosts)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

        elif state == 'absent':
            if aggregate is None:
                changed = False
            else:
-                _update_hosts(cloud, aggregate, [], True)
-                cloud.delete_aggregate(aggregate.id)
+                self._update_hosts(aggregate, [], True)
+                self.conn.delete_aggregate(aggregate.id)
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = ComputeHostAggregateModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_domain.py
+++ b/plugins/modules/identity_domain.py
@@ -85,92 +85,90 @@ id:
    sample: "474acfe5-be34-494c-b339-50f06aa143e4"
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _needs_update(module, domain):
-    if module.params['description'] is not None and \
-       domain.description != module.params['description']:
-        return True
-    if domain.enabled != module.params['enabled']:
-        return True
-    return False
-
-
-def _system_state_change(module, domain):
-    state = module.params['state']
-    if state == 'absent' and domain:
-        return True
-
-    if state == 'present':
-        if domain is None:
-            return True
-        return _needs_update(module, domain)
-
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityDomainModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        description=dict(default=None),
        enabled=dict(default=True, type='bool'),
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    name = module.params['name']
-    description = module.params['description']
-    enabled = module.params['enabled']
-    state = module.params['state']
+    def _needs_update(self, domain):
+        if self.params['description'] is not None and \
+           domain.description != self.params['description']:
+            return True
+        if domain.get(
+                "is_enabled", domain.get("enabled")) != self.params['enabled']:
+            return True
+        return False

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
+    def _system_state_change(self, domain):
+        state = self.params['state']
+        if state == 'absent' and domain:
+            return True

-        domains = cloud.search_domains(filters=dict(name=name))
+        if state == 'present':
+            if domain is None:
+                return True
+            return self._needs_update(domain)
+
+        return False
+
+    def run(self):
+        name = self.params['name']
+        description = self.params['description']
+        enabled = self.params['enabled']
+        state = self.params['state']
+
+        domains = list(self.conn.identity.domains(name=name))

        if len(domains) > 1:
-            module.fail_json(msg='Domain name %s is not unique' % name)
+            self.fail_json(msg='Domain name %s is not unique' % name)
        elif len(domains) == 1:
            domain = domains[0]
        else:
            domain = None

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, domain))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(domain))

        if state == 'present':
            if domain is None:
-                domain = cloud.create_domain(
+                domain = self.conn.create_domain(
                    name=name, description=description, enabled=enabled)
                changed = True
            else:
-                if _needs_update(module, domain):
-                    domain = cloud.update_domain(
+                if self._needs_update(domain):
+                    domain = self.conn.update_domain(
                        domain.id, name=name, description=description,
                        enabled=enabled)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed, domain=domain, id=domain.id)
+            if hasattr(domain, "to_dict"):
+                domain = domain.to_dict()
+                domain.pop("location")
+            self.exit_json(changed=changed, domain=domain, id=domain['id'])

        elif state == 'absent':
            if domain is None:
                changed = False
            else:
-                cloud.delete_domain(domain.id)
+                self.conn.delete_domain(domain.id)
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityDomainModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_domain_info.py
+++ b/plugins/modules/identity_domain_info.py
@@ -81,52 +81,43 @@ openstack_domains:
            type: bool
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityDomainInfoModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=False, default=None),
        filters=dict(required=False, type='dict', default=None),
    )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
        mutually_exclusive=[
            ['name', 'filters'],
-        ]
+        ],
+        supports_check_mode=True
    )
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    is_old_facts = module._name == 'openstack.cloud.identity_domain_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.identity_domain_facts' module has been renamed to 'openstack.cloud.identity_domain_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')

-    sdk, opcloud = openstack_cloud_from_module(module)
-    try:
-        name = module.params['name']
-        filters = module.params['filters']
+    deprecated_names = ('openstack.cloud.identity_domain_facts')
+
+    def run(self):
+        name = self.params['name']
+        filters = self.params['filters']

        if name:
            # Let's suppose user is passing domain ID
            try:
-                domains = opcloud.get_domain(name)
+                domains = self.conn.get_domain(name)
            except Exception:
-                domains = opcloud.search_domains(filters={'name': name})
+                domains = self.conn.search_domains(filters={'name': name})

        else:
-            domains = opcloud.search_domains(filters)
+            domains = self.conn.search_domains(filters)

-        if is_old_facts:
-            module.exit_json(changed=False, ansible_facts=dict(
-                openstack_domains=domains))
-        else:
-            module.exit_json(changed=False, openstack_domains=domains)
+        self.exit_json(changed=False, openstack_domains=domains)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityDomainInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_group.py
+++ b/plugins/modules/identity_group.py
@@ -86,75 +86,71 @@ group:
            sample: "default"
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _system_state_change(state, description, group):
-    if state == 'present' and not group:
-        return True
-    if state == 'present' and description is not None and group.description != description:
-        return True
-    if state == 'absent' and group:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityGroupModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        description=dict(required=False, default=None),
        domain_id=dict(required=False, default=None),
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    name = module.params.get('name')
-    description = module.params.get('description')
-    state = module.params.get('state')
+    def _system_state_change(self, state, description, group):
+        if state == 'present' and not group:
+            return True
+        if state == 'present' and description is not None and group.description != description:
+            return True
+        if state == 'absent' and group:
+            return True
+        return False

-    domain_id = module.params.pop('domain_id')
+    def run(self):
+        name = self.params.get('name')
+        description = self.params.get('description')
+        state = self.params.get('state')
+
+        domain_id = self.params.pop('domain_id')

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
        if domain_id:
-            group = cloud.get_group(name, filters={'domain_id': domain_id})
+            group = self.conn.get_group(name, filters={'domain_id': domain_id})
        else:
-            group = cloud.get_group(name)
+            group = self.conn.get_group(name)

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(state, description, group))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(state, description, group))

        if state == 'present':
            if group is None:
-                group = cloud.create_group(
+                group = self.conn.create_group(
                    name=name, description=description, domain=domain_id)
                changed = True
            else:
                if description is not None and group.description != description:
-                    group = cloud.update_group(
+                    group = self.conn.update_group(
                        group.id, description=description)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed, group=group)
+            self.exit_json(changed=changed, group=group)

        elif state == 'absent':
            if group is None:
                changed = False
            else:
-                cloud.delete_group(group.id)
+                self.conn.delete_group(group.id)
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityGroupModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_group_info.py
+++ b/plugins/modules/identity_group_info.py
@@ -110,48 +110,48 @@ openstack_groups:
            type: bool
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec, openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityGroupInfoModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=False, default=None),
        domain=dict(required=False, default=None),
        filters=dict(required=False, type='dict', default=None),
    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    module = AnsibleModule(argument_spec)
-
-    sdk, opcloud = openstack_cloud_from_module(module)
-    try:
-        name = module.params['name']
-        domain = module.params['domain']
-        filters = module.params['filters']
+    def run(self):
+        name = self.params['name']
+        domain = self.params['domain']
+        filters = self.params['filters']

        if domain:
            try:
                # We assume admin is passing domain id
-                dom = opcloud.get_domain(domain)['id']
+                dom = self.conn.get_domain(domain)['id']
                domain = dom
            except Exception:
                # If we fail, maybe admin is passing a domain name.
                # Note that domains have unique names, just like id.
-                dom = opcloud.search_domains(filters={'name': domain})
+                dom = self.conn.search_domains(filters={'name': domain})
                if dom:
                    domain = dom[0]['id']
                else:
-                    module.fail_json(msg='Domain name or ID does not exist')
+                    self.fail_json(msg='Domain name or ID does not exist')

            if not filters:
                filters = {}

-        groups = opcloud.search_groups(name, filters, domain_id=domain)
-        module.exit_json(changed=False, groups=groups)
+        groups = self.conn.search_groups(name, filters, domain_id=domain)
+        self.exit_json(changed=False, groups=groups)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityGroupInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_role.py
+++ b/plugins/modules/identity_role.py
@@ -59,58 +59,54 @@ role:
            sample: "demo"
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _system_state_change(state, role):
-    if state == 'present' and not role:
-        return True
-    if state == 'absent' and role:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityRoleModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    name = module.params.get('name')
-    state = module.params.get('state')
+    def _system_state_change(self, state, role):
+        if state == 'present' and not role:
+            return True
+        if state == 'absent' and role:
+            return True
+        return False

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        role = cloud.get_role(name)
+    def run(self):
+        name = self.params.get('name')
+        state = self.params.get('state')

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(state, role))
+        role = self.conn.get_role(name)
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(state, role))

        if state == 'present':
            if role is None:
-                role = cloud.create_role(name)
+                role = self.conn.create_role(name)
                changed = True
            else:
                changed = False
-            module.exit_json(changed=changed, role=role)
+            self.exit_json(changed=changed, role=role)
        elif state == 'absent':
            if role is None:
                changed = False
            else:
-                cloud.delete_role(name)
+                self.conn.delete_role(name)
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityRoleModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_role_info.py
+++ b/plugins/modules/identity_role_info.py
@@ -0,0 +1,103 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright (c) 2020, Sagi Shnaidman <sshnaidm@redhat.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: identity_role_info
+short_description: Retrive information about roles
+author: OpenStack Ansible SIG
+description:
+  - Get information about identity roles in Openstack
+options:
+  domain_id:
+    description:
+      - List roles in specified domain only
+    type: str
+    required: false
+  name:
+    description:
+      - List role speficied by name
+    type: str
+    required: false
+
+requirements:
+  - "python >= 3.6"
+  - "openstacksdk"
+
+extends_documentation_fragment:
+  - openstack.cloud.openstack
+'''
+
+RETURN = '''
+openstack_roles:
+  description: List of identity roles
+  returned: always
+  type: list
+  elements: dict
+  sample:
+  - domain_id: None
+    id: 19bf514fdda84f808ccee8463bd85c1a
+    location:
+      cloud: mycloud
+      project:
+        domain_id: None
+        domain_name: None
+        id: None
+        name: None
+      region_name: None
+      zone: None
+    name: member
+    properties:
+
+'''
+
+EXAMPLES = '''
+# Retrieve info about all roles
+- openstack.cloud.identity_role_info:
+    cloud: mycloud
+
+# Retrieve info about all roles in specific domain
+- openstack.cloud.identity_role_info:
+    cloud: mycloud
+    domain_id: some_domain_id
+
+# Retrieve info about role 'admin'
+- openstack.cloud.identity_role_info:
+    cloud: mycloud
+    name: admin
+
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class IdentityRoleInfoModule(OpenStackModule):
+
+    argument_spec = dict(
+        domain_id=dict(type='str', required=False),
+        name=dict(type='str', required=False),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True,
+    )
+
+    def run(self):
+        roles = self.conn.list_roles(domain_id=self.params['domain_id'])
+        # Dictionaries are supported from Train release
+        roles = [item if isinstance(item, dict) else item.to_dict() for item in roles]
+        # Filtering by name is supported from Wallaby release
+        if self.params['name']:
+            roles = [item for item in roles if self.params['name'] in (item['id'], item['name'])]
+        self.results.update({'openstack_roles': roles})
+
+
+def main():
+    module = IdentityRoleInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/identity_user.py
+++ b/plugins/modules/identity_user.py
@@ -131,54 +131,12 @@ user:
            type: str
            sample: "demouser"
 '''
-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _needs_update(params_dict, user):
-    for k in params_dict:
-        if k not in ('password', 'update_password') and user[k] != params_dict[k]:
-            return True
-
-    # We don't get password back in the user object, so assume any supplied
-    # password is a change.
-    if (
-        params_dict['password'] is not None
-        and params_dict['update_password'] == 'always'
-    ):
-        return True
-
-    return False
-
-
-def _get_domain_id(cloud, domain):
-    try:
-        # We assume admin is passing domain id
-        domain_id = cloud.get_domain(domain)['id']
-    except Exception:
-        # If we fail, maybe admin is passing a domain name.
-        # Note that domains have unique names, just like id.
-        try:
-            domain_id = cloud.search_domains(filters={'name': domain})[0]['id']
-        except Exception:
-            # Ok, let's hope the user is non-admin and passing a sane id
-            domain_id = domain
-
-    return domain_id
-
-
-def _get_default_project_id(cloud, default_project, domain_id, module):
-    project = cloud.get_project(default_project, domain_id=domain_id)
-    if not project:
-        module.fail_json(msg='Default project %s is not valid' % default_project)
-
-    return project['id']
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityUserModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        password=dict(required=False, default=None, no_log=True),
        email=dict(required=False, default=None),
@@ -190,47 +148,81 @@ def main():
        update_password=dict(default=None, choices=['always', 'on_create']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(
-        argument_spec,
-        **module_kwargs)
+    module_kwargs = dict()

-    name = module.params['name']
-    password = module.params.get('password')
-    email = module.params['email']
-    default_project = module.params['default_project']
-    domain = module.params['domain']
-    enabled = module.params['enabled']
-    state = module.params['state']
-    update_password = module.params['update_password']
-    description = module.params['description']
+    def _needs_update(self, params_dict, user):
+        for k in params_dict:
+            if k not in ('password', 'update_password') and user[k] != params_dict[k]:
+                return True
+
+        # We don't get password back in the user object, so assume any supplied
+        # password is a change.
+        if (
+            params_dict['password'] is not None
+            and params_dict['update_password'] == 'always'
+        ):
+            return True
+
+        return False
+
+    def _get_domain_id(self, domain):
+        try:
+            # We assume admin is passing domain id
+            domain_id = self.conn.get_domain(domain)['id']
+        except Exception:
+            # If we fail, maybe admin is passing a domain name.
+            # Note that domains have unique names, just like id.
+            try:
+                domain_id = self.conn.search_domains(filters={'name': domain})[0]['id']
+            except Exception:
+                # Ok, let's hope the user is non-admin and passing a sane id
+                domain_id = domain
+
+        return domain_id
+
+    def _get_default_project_id(self, default_project, domain_id):
+        project = self.conn.get_project(default_project, domain_id=domain_id)
+        if not project:
+            self.fail_json(msg='Default project %s is not valid' % default_project)
+
+        return project['id']
+
+    def run(self):
+        name = self.params['name']
+        password = self.params.get('password')
+        email = self.params['email']
+        default_project = self.params['default_project']
+        domain = self.params['domain']
+        enabled = self.params['enabled']
+        state = self.params['state']
+        update_password = self.params['update_password']
+        description = self.params['description']

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
        domain_id = None
        if domain:
-            domain_id = _get_domain_id(cloud, domain)
-            user = cloud.get_user(name, domain_id=domain_id)
+            domain_id = self._get_domain_id(domain)
+            user = self.conn.get_user(name, domain_id=domain_id)
        else:
-            user = cloud.get_user(name)
+            user = self.conn.get_user(name)

        if state == 'present':
            if update_password in ('always', 'on_create'):
                if not password:
                    msg = "update_password is %s but a password value is missing" % update_password
-                    module.fail_json(msg=msg)
+                    self.fail_json(msg=msg)
            default_project_id = None
            if default_project:
-                default_project_id = _get_default_project_id(cloud, default_project, domain_id, module)
+                default_project_id = self._get_default_project_id(
+                    default_project, domain_id)

            if user is None:
                if description is not None:
-                    user = cloud.create_user(
+                    user = self.conn.create_user(
                        name=name, password=password, email=email,
                        default_project=default_project_id, domain_id=domain_id,
                        enabled=enabled, description=description)
                else:
-                    user = cloud.create_user(
+                    user = self.conn.create_user(
                        name=name, password=password, email=email,
                        default_project=default_project_id, domain_id=domain_id,
                        enabled=enabled)
@@ -246,47 +238,49 @@ def main():
                if default_project_id is not None:
                    params_dict['default_project_id'] = default_project_id

-                if _needs_update(params_dict, user):
+                if self._needs_update(params_dict, user):
                    if update_password == 'always':
                        if description is not None:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                user['id'], password=password, email=email,
                                default_project=default_project_id,
                                domain_id=domain_id, enabled=enabled, description=description)
                        else:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                user['id'], password=password, email=email,
                                default_project=default_project_id,
                                domain_id=domain_id, enabled=enabled)
                    else:
                        if description is not None:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                user['id'], email=email,
                                default_project=default_project_id,
                                domain_id=domain_id, enabled=enabled, description=description)
                        else:
-                            user = cloud.update_user(
+                            user = self.conn.update_user(
                                user['id'], email=email,
                                default_project=default_project_id,
                                domain_id=domain_id, enabled=enabled)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed, user=user)
+            self.exit_json(changed=changed, user=user)

        elif state == 'absent':
            if user is None:
                changed = False
            else:
                if domain:
-                    cloud.delete_user(user['id'], domain_id=domain_id)
+                    self.conn.delete_user(user['id'], domain_id=domain_id)
                else:
-                    cloud.delete_user(user['id'])
+                    self.conn.delete_user(user['id'])
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+
+def main():
+    module = IdentityUserModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/identity_user_info.py
+++ b/plugins/modules/identity_user_info.py
@@ -107,61 +107,47 @@ openstack_users:
            type: str
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
-    openstack_full_argument_spec,
-    openstack_cloud_from_module,
-)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityUserInfoModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=False, default=None),
        domain=dict(required=False, default=None),
        filters=dict(required=False, type='dict', default=None),
    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    module = AnsibleModule(argument_spec)
-    is_old_facts = module._name == 'openstack.cloud.identity_user_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.identity_user_facts' module has been renamed to 'openstack.cloud.identity_user_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
+    deprecated_names = ('openstack.cloud.identity_user_facts')

-    sdk, opcloud = openstack_cloud_from_module(module)
-    try:
-        name = module.params['name']
-        domain = module.params['domain']
-        filters = module.params['filters']
+    def run(self):
+        name = self.params['name']
+        domain = self.params['domain']
+        filters = self.params['filters']

        if domain:
            try:
                # We assume admin is passing domain id
-                dom = opcloud.get_domain(domain)['id']
+                dom = self.conn.get_domain(domain)['id']
                domain = dom
            except Exception:
                # If we fail, maybe admin is passing a domain name.
                # Note that domains have unique names, just like id.
-                dom = opcloud.search_domains(filters={'name': domain})
+                dom = self.conn.search_domains(filters={'name': domain})
                if dom:
                    domain = dom[0]['id']
                else:
-                    module.fail_json(msg='Domain name or ID does not exist')
+                    self.fail_json(msg='Domain name or ID does not exist')

-            if not filters:
-                filters = {}
+        users = self.conn.search_users(name, filters, domain_id=domain)
+        self.exit_json(changed=False, openstack_users=users)

-            filters['domain_id'] = domain

-        users = opcloud.search_users(name, filters)
-        if is_old_facts:
-            module.exit_json(changed=False, ansible_facts=dict(
-                openstack_users=users))
-        else:
-            module.exit_json(changed=False, openstack_users=users)
-
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+def main():
+    module = IdentityUserInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/image.py
+++ b/plugins/modules/image.py
@@ -85,6 +85,12 @@ options:
     choices: [present, absent]
     default: present
     type: str
+   tags:
+     description:
+       - List of tags to be applied to the image
+     default: []
+     type: list
+     elements: str
   volume:
     description:
       - ID of a volume to create an image from.
@@ -115,6 +121,8 @@ EXAMPLES = '''
    filename: cirros-0.3.0-x86_64-disk.img
    kernel: cirros-vmlinuz
    ramdisk: cirros-initrd
+    tags:
+      - custom
    properties:
      cpu_arch: x86_64
      distro: ubuntu
@@ -147,95 +155,99 @@ EXAMPLES = '''
    name: myvol_image
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
+class ImageModule(OpenStackModule):

-    argument_spec = openstack_full_argument_spec(
-        name=dict(required=True),
-        id=dict(default=None),
-        checksum=dict(default=None),
-        disk_format=dict(default='qcow2', choices=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso', 'vhdx', 'ploop']),
+    deprecated_names = ('os_image', 'openstack.cloud.os_image')
+
+    argument_spec = dict(
+        name=dict(required=True, type='str'),
+        id=dict(type='str'),
+        checksum=dict(type='str'),
+        disk_format=dict(default='qcow2',
+                         choices=['ami', 'ari', 'aki', 'vhd', 'vmdk', 'raw', 'qcow2', 'vdi', 'iso', 'vhdx', 'ploop']),
        container_format=dict(default='bare', choices=['ami', 'aki', 'ari', 'bare', 'ovf', 'ova', 'docker']),
-        owner=dict(default=None),
+        owner=dict(type='str'),
        min_disk=dict(type='int', default=0),
        min_ram=dict(type='int', default=0),
        is_public=dict(type='bool', default=False),
        protected=dict(type='bool', default=False),
-        filename=dict(default=None),
-        ramdisk=dict(default=None),
-        kernel=dict(default=None),
+        filename=dict(type='str'),
+        ramdisk=dict(type='str'),
+        kernel=dict(type='str'),
        properties=dict(type='dict', default={}),
-        volume=dict(default=None),
+        volume=dict(type='str'),
+        tags=dict(type='list', default=[], elements='str'),
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
        mutually_exclusive=[['filename', 'volume']],
    )
-    module = AnsibleModule(argument_spec, **module_kwargs)

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
+    def run(self):

        changed = False
-        if module.params['id']:
-            image = cloud.get_image(name_or_id=module.params['id'])
-        elif module.params['checksum']:
-            image = cloud.get_image(name_or_id=module.params['name'], filters={'checksum': module.params['checksum']})
+        if self.params['id']:
+            image = self.conn.get_image(name_or_id=self.params['id'])
+        elif self.params['checksum']:
+            image = self.conn.get_image(name_or_id=self.params['name'], filters={'checksum': self.params['checksum']})
        else:
-            image = cloud.get_image(name_or_id=module.params['name'])
+            image = self.conn.get_image(name_or_id=self.params['name'])

-        if module.params['state'] == 'present':
+        if self.params['state'] == 'present':
            if not image:
                kwargs = {}
-                if module.params['id'] is not None:
-                    kwargs['id'] = module.params['id']
-                image = cloud.create_image(
-                    name=module.params['name'],
-                    filename=module.params['filename'],
-                    disk_format=module.params['disk_format'],
-                    container_format=module.params['container_format'],
-                    wait=module.params['wait'],
-                    timeout=module.params['timeout'],
-                    is_public=module.params['is_public'],
-                    protected=module.params['protected'],
-                    min_disk=module.params['min_disk'],
-                    min_ram=module.params['min_ram'],
-                    volume=module.params['volume'],
+                if self.params['id'] is not None:
+                    kwargs['id'] = self.params['id']
+                image = self.conn.create_image(
+                    name=self.params['name'],
+                    filename=self.params['filename'],
+                    disk_format=self.params['disk_format'],
+                    container_format=self.params['container_format'],
+                    wait=self.params['wait'],
+                    timeout=self.params['timeout'],
+                    is_public=self.params['is_public'],
+                    protected=self.params['protected'],
+                    min_disk=self.params['min_disk'],
+                    min_ram=self.params['min_ram'],
+                    volume=self.params['volume'],
+                    tags=self.params['tags'],
                    **kwargs
                )
                changed = True
-                if not module.params['wait']:
-                    module.exit_json(changed=changed, image=image, id=image.id)
+                if not self.params['wait']:
+                    self.exit(changed=changed, image=image, id=image.id)

-            cloud.update_image_properties(
+            self.conn.update_image_properties(
                image=image,
-                kernel=module.params['kernel'],
-                ramdisk=module.params['ramdisk'],
-                protected=module.params['protected'],
-                **module.params['properties'])
-            image = cloud.get_image(name_or_id=image.id)
-            module.exit_json(changed=changed, image=image, id=image.id)
+                kernel=self.params['kernel'],
+                ramdisk=self.params['ramdisk'],
+                protected=self.params['protected'],
+                **self.params['properties'])
+            if self.params['tags']:
+                self.conn.image.update_image(image.id, tags=self.params['tags'])
+            image = self.conn.get_image(name_or_id=image.id)
+            self.exit(changed=changed, image=image, id=image.id)

-        elif module.params['state'] == 'absent':
+        elif self.params['state'] == 'absent':
            if not image:
                changed = False
            else:
-                cloud.delete_image(
-                    name_or_id=module.params['name'],
-                    wait=module.params['wait'],
-                    timeout=module.params['timeout'])
+                self.conn.delete_image(
+                    name_or_id=self.params['name'],
+                    wait=self.params['wait'],
+                    timeout=self.params['timeout'])
                changed = True
-            module.exit_json(changed=changed)
-
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+            self.exit(changed=changed)


-if __name__ == "__main__":
+def main():
+    module = ImageModule()
+    module()
+
+
+if __name__ == '__main__':
    main()
--- a/plugins/modules/image_info.py
+++ b/plugins/modules/image_info.py
@@ -140,46 +140,40 @@ openstack_image:
            description: Size of the image.
            returned: success
            type: int
+        tags:
+            description: List of tags assigned to the image
+            returned: success
+            type: list
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class ImageInfoModule(OpenStackModule):
+
+    deprecated_names = ('openstack.cloud.os_image_facts', 'openstack.cloud.os_image_info')
+
+    argument_spec = dict(
+        image=dict(type='str', required=False),
+        properties=dict(type='dict', required=False),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+
+        if self.params['image']:
+            image = self.conn.get_image(self.params['image'])
+            self.exit(changed=False, openstack_image=image)
+        else:
+            images = self.conn.search_images(filters=self.params['properties'])
+            self.exit(changed=False, openstack_image=images)


 def main():
-
-    argument_spec = openstack_full_argument_spec(
-        image=dict(required=False),
-        properties=dict(default=None, type='dict'),
-    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    is_old_facts = module._name == 'openstack.cloud.image_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.image_facts' module has been renamed to 'openstack.cloud.image_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
-
-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        if module.params['image']:
-            image = cloud.get_image(module.params['image'])
-            if is_old_facts:
-                module.exit_json(changed=False, ansible_facts=dict(
-                    openstack_image=image))
-            else:
-                module.exit_json(changed=False, openstack_image=image)
-        else:
-            images = cloud.search_images(filters=module.params['properties'])
-            if is_old_facts:
-                module.exit_json(changed=False, ansible_facts=dict(
-                    openstack_image=images))
-            else:
-                module.exit_json(changed=False, openstack_image=images)
-
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+    module = ImageInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/keypair_info.py
+++ b/plugins/modules/keypair_info.py
@@ -0,0 +1,156 @@
+#!/usr/bin/python
+
+# Copyright (c) 2021 T-Systems International GmbH
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: keypair_info
+short_description: Get information about keypairs from OpenStack
+author: OpenStack Ansible SIG
+description:
+  - Get information about keypairs that are associated with the account
+options:
+  name:
+    description:
+      - Name or ID of the keypair
+    type: str
+  user_id:
+    description:
+      - It allows admin users to operate key-pairs of specified user ID.
+    type: str
+  limit:
+    description:
+      - Requests a page size of items.
+      - Returns a number of items up to a limit value.
+    type: int
+  marker:
+    description:
+      - The last-seen item.
+    type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+EXAMPLES = '''
+- name: Get information about keypairs
+  openstack.cloud.keypair_info:
+  register: result
+
+- name: Get information about keypairs using optional parameters
+  openstack.cloud.keypair_info:
+    name: "test"
+    user_id: "fed75b36fd7a4078a769178d2b1bd844"
+    limit: 10
+    marker: "jdksl"
+  register: result
+'''
+
+RETURN = '''
+openstack_keypairs:
+  description:
+    - Lists keypairs that are associated with the account.
+  type: complex
+  returned: always
+  contains:
+    created_at:
+      description:
+        - The date and time when the resource was created.
+      type: str
+      sample: "2021-01-19T14:52:07.261634"
+    id:
+      description:
+        - The id identifying the keypair
+      type: str
+      sample: "keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3"
+    is_deleted:
+      description:
+        - A boolean indicates whether this keypair is deleted or not.
+      type: bool
+    fingerprint:
+      description:
+        - The fingerprint for the keypair.
+      type: str
+      sample: "7e:eb:ab:24:ba:d1:e1:88:ae:9a:fb:66:53:df:d3:bd"
+    name:
+      description:
+        - A keypair name which will be used to reference it later.
+      type: str
+      sample: "keypair-5d935425-31d5-48a7-a0f1-e76e9813f2c3"
+    private_key:
+      description:
+        - The private key for the keypair.
+      type: str
+      sample: "MIICXAIBAAKBgQCqGKukO ... hZj6+H0qtjTkVxwTCpvKe4eCZ0FPq"
+    public_key:
+      description:
+        - The keypair public key.
+      type: str
+      sample: "ssh-rsa AAAAB3NzaC1yc ... 8rPsBUHNLQp Generated-by-Nova"
+    type:
+      description:
+        - The type of the keypair.
+        - Allowed values are ssh or x509.
+      type: str
+      sample: "ssh"
+    user_id:
+      description:
+        - It allows admin users to operate key-pairs of specified user ID.
+      type: str
+      sample: "59b10f2a2138428ea9358e10c7e44444"
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
+    OpenStackModule)
+
+
+class KeyPairInfoModule(OpenStackModule):
+    argument_spec = dict(
+        name=dict(type='str', required=False),
+        user_id=dict(type='str', required=False),
+        limit=dict(type='int', required=False),
+        marker=dict(type='str', required=False)
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )
+
+    def run(self):
+        name = self.params['name']
+        user_id = self.params['user_id']
+        limit = self.params['limit']
+        marker = self.params['marker']
+
+        filters = {}
+        data = []
+
+        if user_id:
+            filters['user_id'] = user_id
+        if limit:
+            filters['limit'] = limit
+        if marker:
+            filters['marker'] = marker
+
+        result = self.conn.search_keypairs(name_or_id=name,
+                                           filters=filters)
+        raws = [raw if isinstance(raw, dict) else raw.to_dict()
+                for raw in result]
+
+        for raw in raws:
+            raw.pop('location')
+            data.append(raw)
+
+        self.exit(changed=False, openstack_keypairs=data)
+
+
+def main():
+    module = KeyPairInfoModule()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/keystone_federation_protocol.py
+++ b/plugins/modules/keystone_federation_protocol.py
@@ -60,151 +60,127 @@ EXAMPLES = '''
 RETURN = '''
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def normalize_protocol(protocol):
-    """
-    Normalizes the protocol definitions so that the outputs are consistent with the
-    parameters
-
-    - "name" (parameter) == "id" (SDK)
-    """
-    if protocol is None:
-        return None
-
-    _protocol = protocol.to_dict()
-    _protocol['name'] = protocol['id']
-    # As of 0.44 SDK doesn't copy the URI parameters over, so let's add them
-    _protocol['idp_id'] = protocol['idp_id']
-    return _protocol
-
-
-def delete_protocol(module, sdk, cloud, protocol):
-    """
-    Delete an existing Protocol
-
-    returns: the "Changed" state
-    """
-
-    if protocol is None:
-        return False
-
-    if module.check_mode:
-        return True
-
-    try:
-        cloud.identity.delete_federation_protocol(None, protocol)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to delete protocol: {0}'.format(str(ex)))
-    return True
-
-
-def create_protocol(module, sdk, cloud, name):
-    """
-    Create a new Protocol
-
-    returns: the "Changed" state and the new protocol
-    """
-
-    if module.check_mode:
-        return True, None
-
-    idp_name = module.params.get('idp_id')
-    mapping_id = module.params.get('mapping_id')
-
-    attributes = {
-        'idp_id': idp_name,
-        'mapping_id': mapping_id,
-    }
-
-    try:
-        protocol = cloud.identity.create_federation_protocol(id=name, **attributes)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to create protocol: {0}'.format(str(ex)))
-    return (True, protocol)
-
-
-def update_protocol(module, sdk, cloud, protocol):
-    """
-    Update an existing Protocol
-
-    returns: the "Changed" state and the new protocol
-    """
-
-    mapping_id = module.params.get('mapping_id')
-
-    attributes = {}
-
-    if (mapping_id is not None) and (mapping_id != protocol.mapping_id):
-        attributes['mapping_id'] = mapping_id
-
-    if not attributes:
-        return False, protocol
-
-    if module.check_mode:
-        return True, None
-
-    try:
-        new_protocol = cloud.identity.update_federation_protocol(None, protocol, **attributes)
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to update protocol: {0}'.format(str(ex)))
-    return (True, new_protocol)
-
-
-def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityFederationProtocolModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True, aliases=['id']),
        state=dict(default='present', choices=['absent', 'present']),
        idp_id=dict(required=True, aliases=['idp_name']),
        mapping_id=dict(aliases=['mapping_name']),
    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
+    module_kwargs = dict(
+        supports_check_mode=True
    )

-    name = module.params.get('name')
-    state = module.params.get('state')
-    idp = module.params.get('idp_id')
-    changed = False
+    def normalize_protocol(self, protocol):
+        """
+        Normalizes the protocol definitions so that the outputs are consistent with the
+        parameters

-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
-
-    try:
-        protocol = cloud.identity.get_federation_protocol(idp, name)
-    except sdk.exceptions.ResourceNotFound:
-        protocol = None
-    except sdk.exceptions.OpenStackCloudException as ex:
-        module.fail_json(msg='Failed to get protocol: {0}'.format(str(ex)))
-
-    if state == 'absent':
-        if protocol is not None:
-            changed = delete_protocol(module, sdk, cloud, protocol)
-        module.exit_json(changed=changed)
-
-    # state == 'present'
-    else:
+        - "name" (parameter) == "id" (SDK)
+        """
        if protocol is None:
-            if module.params.get('mapping_id') is None:
-                module.fail_json(msg='A mapping_id must be passed when creating'
-                                 ' a protocol')
-            (changed, protocol) = create_protocol(module, sdk, cloud, name)
-            protocol = normalize_protocol(protocol)
-            module.exit_json(changed=changed, protocol=protocol)
+            return None

+        _protocol = protocol.to_dict()
+        _protocol['name'] = protocol['id']
+        # As of 0.44 SDK doesn't copy the URI parameters over, so let's add them
+        _protocol['idp_id'] = protocol['idp_id']
+        return _protocol
+
+    def delete_protocol(self, protocol):
+        """
+        Delete an existing Protocol
+
+        returns: the "Changed" state
+        """
+        if protocol is None:
+            return False
+
+        if self.ansible.check_mode:
+            return True
+
+        self.conn.identity.delete_federation_protocol(None, protocol)
+        return True
+
+    def create_protocol(self, name):
+        """
+        Create a new Protocol
+
+        returns: the "Changed" state and the new protocol
+        """
+        if self.ansible.check_mode:
+            return True, None
+
+        idp_name = self.params.get('idp_id')
+        mapping_id = self.params.get('mapping_id')
+
+        attributes = {
+            'idp_id': idp_name,
+            'mapping_id': mapping_id,
+        }
+
+        protocol = self.conn.identity.create_federation_protocol(id=name, **attributes)
+        return (True, protocol)
+
+    def update_protocol(self, protocol):
+        """
+        Update an existing Protocol
+
+        returns: the "Changed" state and the new protocol
+        """
+        mapping_id = self.params.get('mapping_id')
+
+        attributes = {}
+
+        if (mapping_id is not None) and (mapping_id != protocol.mapping_id):
+            attributes['mapping_id'] = mapping_id
+
+        if not attributes:
+            return False, protocol
+
+        if self.ansible.check_mode:
+            return True, None
+
+        new_protocol = self.conn.identity.update_federation_protocol(None, protocol, **attributes)
+        return (True, new_protocol)
+
+    def run(self):
+        """ Module entry point """
+        name = self.params.get('name')
+        state = self.params.get('state')
+        idp = self.params.get('idp_id')
+        changed = False
+
+        protocol = self.conn.identity.find_federation_protocol(idp, name)
+
+        if state == 'absent':
+            if protocol is not None:
+                changed = self.delete_protocol(protocol)
+            self.exit_json(changed=changed)
+
+        # state == 'present'
        else:
-            (changed, new_protocol) = update_protocol(module, sdk, cloud, protocol)
-            new_protocol = normalize_protocol(new_protocol)
-            module.exit_json(changed=changed, protocol=new_protocol)
+            if protocol is None:
+                if self.params.get('mapping_id') is None:
+                    self.fail_json(
+                        msg='A mapping_id must be passed when creating'
+                        ' a protocol')
+                (changed, protocol) = self.create_protocol(name)
+                protocol = self.normalize_protocol(protocol)
+                self.exit_json(changed=changed, protocol=protocol)
+
+            else:
+                (changed, new_protocol) = self.update_protocol(protocol)
+                new_protocol = self.normalize_protocol(new_protocol)
+                self.exit_json(changed=changed, protocol=new_protocol)
+
+
+def main():
+    module = IdentityFederationProtocolModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/keystone_federation_protocol_info.py
+++ b/plugins/modules/keystone_federation_protocol_info.py
@@ -45,65 +45,53 @@ EXAMPLES = '''
 RETURN = '''
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_module_kwargs
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def normalize_protocol(protocol):
-    """
-    Normalizes the protocol definitions so that the outputs are consistent with the
-    parameters
-
-    - "name" (parameter) == "id" (SDK)
-    """
-    if protocol is None:
-        return None
-
-    _protocol = protocol.to_dict()
-    _protocol['name'] = protocol['id']
-    # As of 0.44 SDK doesn't copy the URI parameters over, so let's add them
-    _protocol['idp_id'] = protocol['idp_id']
-    return _protocol
-
-
-def main():
-    """ Module entry point """
-
-    argument_spec = openstack_full_argument_spec(
+class IdentityFederationProtocolInfoModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(aliases=['id']),
        idp_id=dict(required=True, aliases=['idp_name']),
    )
-    module_kwargs = openstack_module_kwargs(
-    )
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
+    module_kwargs = dict(
+        supports_check_mode=True
    )

-    name = module.params.get('name')
-    idp = module.params.get('idp_id')
+    def normalize_protocol(self, protocol):
+        """
+        Normalizes the protocol definitions so that the outputs are consistent with the
+        parameters

-    sdk, cloud = openstack_cloud_from_module(module, min_version="0.44")
+        - "name" (parameter) == "id" (SDK)
+        """
+        if protocol is None:
+            return None

-    if name:
-        try:
-            protocol = cloud.identity.get_federation_protocol(idp, name)
-            protocol = normalize_protocol(protocol)
-        except sdk.exceptions.ResourceNotFound:
-            module.fail_json(msg='Failed to find protocol')
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to get protocol: {0}'.format(str(ex)))
-        module.exit_json(changed=False, protocols=[protocol])
+        _protocol = protocol.to_dict()
+        _protocol['name'] = protocol['id']
+        # As of 0.44 SDK doesn't copy the URI parameters over, so let's add them
+        _protocol['idp_id'] = protocol['idp_id']
+        return _protocol

-    else:
-        try:
-            protocols = list(map(normalize_protocol, cloud.identity.federation_protocols(idp)))
-        except sdk.exceptions.OpenStackCloudException as ex:
-            module.fail_json(msg='Failed to list protocols: {0}'.format(str(ex)))
-        module.exit_json(changed=False, protocols=protocols)
+    def run(self):
+        """ Module entry point """
+
+        name = self.params.get('name')
+        idp = self.params.get('idp_id')
+
+        if name:
+            protocol = self.conn.identity.get_federation_protocol(idp, name)
+            protocol = self.normalize_protocol(protocol)
+            self.exit_json(changed=False, protocols=[protocol])
+
+        else:
+            protocols = list(map(self.normalize_protocol, self.conn.identity.federation_protocols(idp)))
+            self.exit_json(changed=False, protocols=protocols)
+
+
+def main():
+    module = IdentityFederationProtocolInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/lb_health_monitor.py
+++ b/plugins/modules/lb_health_monitor.py
@@ -223,10 +223,10 @@ class HealthMonitorModule(OpenStackModule):
        expected_codes=dict(required=False, default="200"),
        admin_state_up=dict(required=False, default=True, type='bool'),
        state=dict(default='present', choices=['absent', 'present']),
-        http_method=dict(default="GET", requried=False, choices=["GET", "CONNECT", "DELETE",
+        http_method=dict(default="GET", required=False, choices=["GET", "CONNECT", "DELETE",
                                                                 "HEAD", "OPTIONS", "PATCH",
                                                                 "POST", "PUT", "TRACE"]),
-        url_path=dict(default="/", requires=False),
+        url_path=dict(default="/", required=False),
        type=dict(default='HTTP',
                  choices=['HTTP', 'HTTPS', 'PING', 'SCTP', 'TCP', 'TLS-HELLO', 'UDP-CONNECT']))

--- a/plugins/modules/lb_listener.py
+++ b/plugins/modules/lb_listener.py
@@ -30,7 +30,7 @@ options:
   protocol:
     description:
        - The protocol for the listener.
-     choices: [HTTP, HTTPS, TCP, TERMINATED_HTTPS]
+     choices: [HTTP, HTTPS, TCP, TERMINATED_HTTPS, UDP, SCTP]
     default: HTTP
     type: str
   protocol_port:
@@ -38,6 +38,16 @@ options:
        - The protocol port number for the listener.
     default: 80
     type: int
+   timeout_client_data:
+     description:
+        - Client inactivity timeout in milliseconds.
+     default: 50000
+     type: int
+   timeout_member_data:
+     description:
+        - Member inactivity timeout in milliseconds.
+     default: 50000
+     type: int
   wait:
     description:
        - If the module should wait for the load balancer to be ACTIVE.
@@ -108,6 +118,14 @@ listener:
            description: The protocol port number for the listener.
            type: int
            sample: 80
+        timeout_client_data:
+            description: Client inactivity timeout in milliseconds.
+            type: int
+            sample: 50000
+        timeout_member_data:
+            description: Member inactivity timeout in milliseconds.
+            type: int
+            sample: 50000
 '''

 EXAMPLES = '''
@@ -139,116 +157,130 @@ EXAMPLES = '''
    state: absent
    name: test-listener
    loadbalancer: test-loadbalancer
+
+# Create a listener, increase timeouts for connection persistence (for SSH for example).
+- openstack.cloud.lb_listener:
+    cloud: mycloud
+    endpoint_type: admin
+    state: present
+    name: test-listener
+    loadbalancer: test-loadbalancer
+    protocol: TCP
+    protocol_port: 22
+    timeout_client_data: 1800000
+    timeout_member_data: 1800000
 '''

 import time

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _lb_wait_for_status(module, cloud, lb, status, failures, interval=5):
-    """Wait for load balancer to be in a particular provisioning status."""
-    timeout = module.params['timeout']
-
-    total_sleep = 0
-    if failures is None:
-        failures = []
-
-    while total_sleep < timeout:
-        lb = cloud.load_balancer.get_load_balancer(lb.id)
-        if lb.provisioning_status == status:
-            return None
-        if lb.provisioning_status in failures:
-            module.fail_json(
-                msg="Load Balancer %s transitioned to failure state %s" %
-                    (lb.id, lb.provisioning_status)
-            )
-
-        time.sleep(interval)
-        total_sleep += interval
-
-    module.fail_json(
-        msg="Timeout waiting for Load Balancer %s to transition to %s" %
-            (lb.id, status)
-    )
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class LoadbalancerListenerModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
        loadbalancer=dict(required=True),
        protocol=dict(default='HTTP',
-                      choices=['HTTP', 'HTTPS', 'TCP', 'TERMINATED_HTTPS']),
+                      choices=['HTTP', 'HTTPS', 'TCP', 'TERMINATED_HTTPS', 'UDP', 'SCTP']),
        protocol_port=dict(default=80, type='int', required=False),
+        timeout_client_data=dict(default=50000, type='int', required=False),
+        timeout_member_data=dict(default=50000, type='int', required=False),
    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    sdk, cloud = openstack_cloud_from_module(module)
-    loadbalancer = module.params['loadbalancer']
-    loadbalancer_id = None
+    module_kwargs = dict()
+
+    def _lb_wait_for_status(self, lb, status, failures, interval=5):
+        """Wait for load balancer to be in a particular provisioning status."""
+        timeout = self.params['timeout']
+
+        total_sleep = 0
+        if failures is None:
+            failures = []
+
+        while total_sleep < timeout:
+            lb = self.conn.load_balancer.get_load_balancer(lb.id)
+            if lb.provisioning_status == status:
+                return None
+            if lb.provisioning_status in failures:
+                self.fail_json(
+                    msg="Load Balancer %s transitioned to failure state %s" %
+                        (lb.id, lb.provisioning_status)
+                )
+
+            time.sleep(interval)
+            total_sleep += interval
+
+        self.fail_json(
+            msg="Timeout waiting for Load Balancer %s to transition to %s" %
+                (lb.id, status)
+        )
+
+    def run(self):
+        loadbalancer = self.params['loadbalancer']
+        loadbalancer_id = None

-    try:
        changed = False
-        listener = cloud.load_balancer.find_listener(
-            name_or_id=module.params['name'])
+        listener = self.conn.load_balancer.find_listener(
+            name_or_id=self.params['name'])

-        if module.params['state'] == 'present':
+        if self.params['state'] == 'present':
            if not listener:
-                lb = cloud.load_balancer.find_load_balancer(loadbalancer)
+                lb = self.conn.load_balancer.find_load_balancer(loadbalancer)
                if not lb:
-                    module.fail_json(
+                    self.fail_json(
                        msg='load balancer %s is not found' % loadbalancer
                    )
                loadbalancer_id = lb.id

-                listener = cloud.load_balancer.create_listener(
-                    name=module.params['name'],
+                listener = self.conn.load_balancer.create_listener(
+                    name=self.params['name'],
                    loadbalancer_id=loadbalancer_id,
-                    protocol=module.params['protocol'],
-                    protocol_port=module.params['protocol_port'],
+                    protocol=self.params['protocol'],
+                    protocol_port=self.params['protocol_port'],
+                    timeout_client_data=self.params['timeout_client_data'],
+                    timeout_member_data=self.params['timeout_member_data'],
                )
                changed = True

-                if not module.params['wait']:
-                    module.exit_json(changed=changed,
-                                     listener=listener.to_dict(),
-                                     id=listener.id)
+                if not self.params['wait']:
+                    self.exit_json(
+                        changed=changed, listener=listener.to_dict(),
+                        id=listener.id)

-            if module.params['wait']:
+            if self.params['wait']:
                # Check in case the listener already exists.
-                lb = cloud.load_balancer.find_load_balancer(loadbalancer)
+                lb = self.conn.load_balancer.find_load_balancer(loadbalancer)
                if not lb:
-                    module.fail_json(
+                    self.fail_json(
                        msg='load balancer %s is not found' % loadbalancer
                    )
-                _lb_wait_for_status(module, cloud, lb, "ACTIVE", ["ERROR"])
+                self._lb_wait_for_status(lb, "ACTIVE", ["ERROR"])

-            module.exit_json(changed=changed, listener=listener.to_dict(),
-                             id=listener.id)
-        elif module.params['state'] == 'absent':
+            self.exit_json(
+                changed=changed, listener=listener.to_dict(), id=listener.id)
+        elif self.params['state'] == 'absent':
            if not listener:
                changed = False
            else:
-                cloud.load_balancer.delete_listener(listener)
+                self.conn.load_balancer.delete_listener(listener)
                changed = True

-                if module.params['wait']:
+                if self.params['wait']:
                    # Wait for the load balancer to be active after deleting
                    # the listener.
-                    lb = cloud.load_balancer.find_load_balancer(loadbalancer)
+                    lb = self.conn.load_balancer.find_load_balancer(loadbalancer)
                    if not lb:
-                        module.fail_json(
+                        self.fail_json(
                            msg='load balancer %s is not found' % loadbalancer
                        )
-                    _lb_wait_for_status(module, cloud, lb, "ACTIVE", ["ERROR"])
+                    self._lb_wait_for_status(lb, "ACTIVE", ["ERROR"])

-            module.exit_json(changed=changed)
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+            self.exit_json(changed=changed)
+
+
+def main():
+    module = LoadbalancerListenerModule()
+    module()


 if __name__ == "__main__":
--- a/plugins/modules/lb_member.py
+++ b/plugins/modules/lb_member.py
@@ -51,6 +51,14 @@ options:
          into ACTIVE state.
     default: 180
     type: int
+   monitor_address:
+     description:
+        - IP address used to monitor this member
+     type: str
+   monitor_port:
+     description:
+        - Port used to monitor this member
+     type: int
 requirements:
    - "python >= 3.6"
    - "openstacksdk"
@@ -130,97 +138,97 @@ EXAMPLES = '''

 import time

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _wait_for_member_status(module, cloud, pool_id, member_id, status,
-                            failures, interval=5):
-    timeout = module.params['timeout']
-
-    total_sleep = 0
-    if failures is None:
-        failures = []
-
-    while total_sleep < timeout:
-        member = cloud.load_balancer.get_member(member_id, pool_id)
-        provisioning_status = member.provisioning_status
-        if provisioning_status == status:
-            return member
-        if provisioning_status in failures:
-            module.fail_json(
-                msg="Member %s transitioned to failure state %s" %
-                    (member_id, provisioning_status)
-            )
-
-        time.sleep(interval)
-        total_sleep += interval
-
-    module.fail_json(
-        msg="Timeout waiting for member %s to transition to %s" %
-            (member_id, status)
-    )
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class LoadbalancerMemberModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
        pool=dict(required=True),
        address=dict(default=None),
        protocol_port=dict(default=80, type='int'),
        subnet_id=dict(default=None),
+        monitor_address=dict(default=None),
+        monitor_port=dict(default=None, type='int')
    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    sdk, cloud = openstack_cloud_from_module(module)
-    name = module.params['name']
-    pool = module.params['pool']
+    module_kwargs = dict()
+
+    def _wait_for_member_status(self, pool_id, member_id, status,
+                                failures, interval=5):
+        timeout = self.params['timeout']
+
+        total_sleep = 0
+        if failures is None:
+            failures = []
+
+        while total_sleep < timeout:
+            member = self.conn.load_balancer.get_member(member_id, pool_id)
+            provisioning_status = member.provisioning_status
+            if provisioning_status == status:
+                return member
+            if provisioning_status in failures:
+                self.fail_json(
+                    msg="Member %s transitioned to failure state %s" %
+                        (member_id, provisioning_status)
+                )
+
+            time.sleep(interval)
+            total_sleep += interval
+
+        self.fail_json(
+            msg="Timeout waiting for member %s to transition to %s" %
+                (member_id, status)
+        )
+
+    def run(self):
+        name = self.params['name']
+        pool = self.params['pool']

-    try:
        changed = False

-        pool_ret = cloud.load_balancer.find_pool(name_or_id=pool)
+        pool_ret = self.conn.load_balancer.find_pool(name_or_id=pool)
        if not pool_ret:
-            module.fail_json(msg='pool %s is not found' % pool)
+            self.fail_json(msg='pool %s is not found' % pool)

        pool_id = pool_ret.id
-        member = cloud.load_balancer.find_member(name, pool_id)
+        member = self.conn.load_balancer.find_member(name, pool_id)

-        if module.params['state'] == 'present':
+        if self.params['state'] == 'present':
            if not member:
-                member = cloud.load_balancer.create_member(
+                member = self.conn.load_balancer.create_member(
                    pool_ret,
-                    address=module.params['address'],
+                    address=self.params['address'],
                    name=name,
-                    protocol_port=module.params['protocol_port'],
-                    subnet_id=module.params['subnet_id']
+                    protocol_port=self.params['protocol_port'],
+                    subnet_id=self.params['subnet_id'],
+                    monitor_address=self.params['monitor_address'],
+                    monitor_port=self.params['monitor_port']
                )
                changed = True

-                if not module.params['wait']:
-                    module.exit_json(changed=changed,
-                                     member=member.to_dict(),
-                                     id=member.id)
+                if not self.params['wait']:
+                    self.exit_json(
+                        changed=changed, member=member.to_dict(), id=member.id)

-            if module.params['wait']:
-                member = _wait_for_member_status(module, cloud, pool_id,
-                                                 member.id, "ACTIVE",
-                                                 ["ERROR"])
+            if self.params['wait']:
+                member = self._wait_for_member_status(
+                    pool_id, member.id, "ACTIVE", ["ERROR"])

-            module.exit_json(changed=changed, member=member.to_dict(),
-                             id=member.id)
+            self.exit_json(
+                changed=changed, member=member.to_dict(), id=member.id)

-        elif module.params['state'] == 'absent':
+        elif self.params['state'] == 'absent':
            if member:
-                cloud.load_balancer.delete_member(member, pool_ret)
+                self.conn.load_balancer.delete_member(member, pool_ret)
                changed = True

-            module.exit_json(changed=changed)
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+            self.exit_json(changed=changed)
+
+
+def main():
+    module = LoadbalancerMemberModule()
+    module()


 if __name__ == "__main__":
--- a/plugins/modules/lb_pool.py
+++ b/plugins/modules/lb_pool.py
@@ -149,41 +149,11 @@ EXAMPLES = '''

 import time

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec, \
-    openstack_module_kwargs, openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _wait_for_pool_status(module, cloud, pool_id, status, failures,
-                          interval=5):
-    timeout = module.params['timeout']
-
-    total_sleep = 0
-    if failures is None:
-        failures = []
-
-    while total_sleep < timeout:
-        pool = cloud.load_balancer.get_pool(pool_id)
-        provisioning_status = pool.provisioning_status
-        if provisioning_status == status:
-            return pool
-        if provisioning_status in failures:
-            module.fail_json(
-                msg="pool %s transitioned to failure state %s" %
-                    (pool_id, provisioning_status)
-            )
-
-        time.sleep(interval)
-        total_sleep += interval
-
-    module.fail_json(
-        msg="timeout waiting for pool %s to transition to %s" %
-            (pool_id, status)
-    )
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class LoadbalancerPoolModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
        loadbalancer=dict(default=None),
@@ -195,71 +165,98 @@ def main():
            choices=['ROUND_ROBIN', 'LEAST_CONNECTIONS', 'SOURCE_IP']
        )
    )
-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
        mutually_exclusive=[['loadbalancer', 'listener']]
    )
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    sdk, cloud = openstack_cloud_from_module(module)

-    loadbalancer = module.params['loadbalancer']
-    listener = module.params['listener']
+    def _wait_for_pool_status(self, pool_id, status, failures,
+                              interval=5):
+        timeout = self.params['timeout']
+
+        total_sleep = 0
+        if failures is None:
+            failures = []
+
+        while total_sleep < timeout:
+            pool = self.conn.load_balancer.get_pool(pool_id)
+            provisioning_status = pool.provisioning_status
+            if provisioning_status == status:
+                return pool
+            if provisioning_status in failures:
+                self.fail_json(
+                    msg="pool %s transitioned to failure state %s" %
+                        (pool_id, provisioning_status)
+                )
+
+            time.sleep(interval)
+            total_sleep += interval
+
+        self.fail_json(
+            msg="timeout waiting for pool %s to transition to %s" %
+                (pool_id, status)
+        )
+
+    def run(self):
+        loadbalancer = self.params['loadbalancer']
+        listener = self.params['listener']

-    try:
        changed = False
-        pool = cloud.load_balancer.find_pool(name_or_id=module.params['name'])
+        pool = self.conn.load_balancer.find_pool(name_or_id=self.params['name'])

-        if module.params['state'] == 'present':
+        if self.params['state'] == 'present':
            if not pool:
                loadbalancer_id = None
                if not (loadbalancer or listener):
-                    module.fail_json(
+                    self.fail_json(
                        msg="either loadbalancer or listener must be provided"
                    )

                if loadbalancer:
-                    lb = cloud.load_balancer.find_load_balancer(loadbalancer)
+                    lb = self.conn.load_balancer.find_load_balancer(loadbalancer)
                    if not lb:
-                        module.fail_json(msg='load balancer %s is not '
-                                             'found' % loadbalancer)
+                        self.fail_json(
+                            msg='load balancer %s is not found' % loadbalancer)
                    loadbalancer_id = lb.id

                listener_id = None
                if listener:
-                    listener_ret = cloud.load_balancer.find_listener(listener)
+                    listener_ret = self.conn.load_balancer.find_listener(listener)
                    if not listener_ret:
-                        module.fail_json(msg='listener %s is not found'
-                                             % listener)
+                        self.fail_json(
+                            msg='listener %s is not found' % listener)
                    listener_id = listener_ret.id

-                pool = cloud.load_balancer.create_pool(
-                    name=module.params['name'],
+                pool = self.conn.load_balancer.create_pool(
+                    name=self.params['name'],
                    loadbalancer_id=loadbalancer_id,
                    listener_id=listener_id,
-                    protocol=module.params['protocol'],
-                    lb_algorithm=module.params['lb_algorithm']
+                    protocol=self.params['protocol'],
+                    lb_algorithm=self.params['lb_algorithm']
                )
                changed = True

-                if not module.params['wait']:
-                    module.exit_json(changed=changed,
-                                     pool=pool.to_dict(),
-                                     id=pool.id)
+                if not self.params['wait']:
+                    self.exit_json(
+                        changed=changed, pool=pool.to_dict(), id=pool.id)

-            if module.params['wait']:
-                pool = _wait_for_pool_status(module, cloud, pool.id, "ACTIVE",
-                                             ["ERROR"])
+            if self.params['wait']:
+                pool = self._wait_for_pool_status(
+                    pool.id, "ACTIVE", ["ERROR"])

-            module.exit_json(changed=changed, pool=pool.to_dict(),
-                             id=pool.id)
+            self.exit_json(
+                changed=changed, pool=pool.to_dict(), id=pool.id)

-        elif module.params['state'] == 'absent':
+        elif self.params['state'] == 'absent':
            if pool:
-                cloud.load_balancer.delete_pool(pool)
+                self.conn.load_balancer.delete_pool(pool)
                changed = True

-            module.exit_json(changed=changed)
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+            self.exit_json(changed=changed)
+
+
+def main():
+    module = LoadbalancerPoolModule()
+    module()


 if __name__ == "__main__":
--- a/plugins/modules/loadbalancer.py
+++ b/plugins/modules/loadbalancer.py
@@ -296,6 +296,35 @@ from ansible_collections.openstack.cloud.plugins.module_utils.openstack import O

 class LoadBalancerModule(OpenStackModule):

+    def _wait_for_pool(self, pool, provisioning_status, operating_status, failures, interval=5):
+        """Wait for pool to be in a particular provisioning and operating status."""
+        timeout = self.params['timeout']  # reuse loadbalancer timeout
+
+        total_sleep = 0
+        if failures is None:
+            failures = []
+
+        while total_sleep < timeout:
+            pool = self.conn.load_balancer.find_pool(name_or_id=pool.id)
+            if pool:
+                if pool.provisioning_status == provisioning_status and pool.operating_status == operating_status:
+                    return None
+                if pool.provisioning_status in failures:
+                    self.fail_json(
+                        msg="Pool %s transitioned to failure state %s" %
+                            (pool.id, pool.provisioning_status)
+                    )
+            else:
+                if provisioning_status == "DELETED":
+                    return None
+                else:
+                    self.fail_json(
+                        msg="Pool %s transitioned to DELETED" % pool.id
+                    )
+
+            time.sleep(interval)
+            total_sleep += interval
+
    def _wait_for_lb(self, lb, status, failures, interval=5):
        """Wait for load balancer to be in a particular provisioning status."""
        timeout = self.params['timeout']
@@ -497,6 +526,7 @@ class LoadBalancerModule(OpenStackModule):
                                protocol=protocol,
                                lb_algorithm=lb_algorithm
                            )
+                            self._wait_for_pool(pool, "ACTIVE", "ONLINE", ["ERROR"])
                            changed = True

                    # Ensure members in the pool
@@ -538,6 +568,7 @@ class LoadBalancerModule(OpenStackModule):
                                protocol_port=protocol_port,
                                subnet_id=subnet_id
                            )
+                            self._wait_for_pool(pool, "ACTIVE", "ONLINE", ["ERROR"])
                            changed = True

                # Associate public ip to the load balancer VIP. If
--- a/plugins/modules/networks_info.py
+++ b/plugins/modules/networks_info.py
@@ -124,6 +124,9 @@ class NetworkInfoModule(OpenStackModule):
        name=dict(required=False, default=None),
        filters=dict(required=False, type='dict', default=None)
    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

    def run(self):

--- a/plugins/modules/neutron_rbac_policies_info.py
+++ b/plugins/modules/neutron_rbac_policies_info.py
@@ -0,0 +1,237 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+
+# Copyright: Ansible Project
+# (c) 2021, Ashraf Hasson <ahasson@redhat.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: neutron_rbac_policies_info
+short_description: Fetch Neutron policies.
+author: OpenStack Ansible SIG
+description:
+  - Get RBAC policies against a network, security group or a QoS Policy for one or more projects.
+  - If a C(policy_id) was not provided, this module will attempt to fetch all available policies.
+  - Accepts same arguments as OpenStackSDK network proxy C(find_rbac_policy) and C(rbac_policies) functions which are ultimately passed over to C(RBACPolicy)
+  - All parameters passed in to this module act as a filter for when no C(policy_id) was provided, otherwise they're ignored.
+  - Returns None if no matching policy was found as opposed to failing.
+
+options:
+  policy_id:
+    description:
+      - The RBAC policy ID
+      - If provided, all other filters are ignored
+    type: str
+  object_id:
+    description:
+      - The object ID (the subject of the policy) to which the RBAC rules applies
+      - This would be the ID of a network, security group or a qos policy
+      - Mutually exclusive with the C(object_type)
+    type: str
+  object_type:
+    description:
+      - Can be one of the following object types C(network), C(security_group) or C(qos_policy)
+      - Mutually exclusive with the C(object_id)
+    choices: ['network', 'security_group', 'qos_policy']
+    type: str
+  target_project_id:
+    description:
+      - Filters the RBAC rules based on the target project id
+      - Logically AND'ed with other filters
+      - Mutually exclusive with C(project_id)
+    type: str
+  project_id:
+    description:
+      - Filters the RBAC rules based on the project id to which the object belongs to
+      - Logically AND'ed with other filters
+      - Mutually exclusive with C(target_project_id)
+    type: str
+  project:
+    description:
+      - Filters the RBAC rules based on the project name
+      - Logically AND'ed with other filters
+    type: str
+  action:
+    description:
+      - Can be either of the following options C(access_as_shared) | C(access_as_external)
+      - Logically AND'ed with other filters
+    choices: ['access_as_shared', 'access_as_external']
+    type: str
+
+extends_documentation_fragment:
+  - openstack.cloud.openstack
+'''
+
+EXAMPLES = r'''
+# Gather all rbac policies for a project
+- name: Get all rbac policies for {{ project }}
+  openstack.cloud.neutron_rbac_policies_info:
+    project_id: "{{ project.id }}"
+'''
+
+RETURN = r'''
+# return value can either be plural or signular depending on what was passed in as parameters
+policies:
+  description:
+    - List of rbac policies, this could also be returned as a singular element, i.e., 'policy'
+  type: complex
+  returned: always
+  contains:
+    object_id:
+      description:
+        - The UUID of the object to which the RBAC rules apply
+      type: str
+      sample: "7422172b-2961-475c-ac68-bd0f2a9960ad"
+    target_project_id:
+      description:
+        - The UUID of the target project
+      type: str
+      sample: "c201a689c016435c8037977166f77368"
+    project_id:
+      description:
+        - The UUID of the project to which access is granted
+      type: str
+      sample: "84b8774d595b41e89f3dfaa1fd76932c"
+    object_type:
+      description:
+        - The object type to which the RBACs apply
+      type: str
+      sample: "network"
+    action:
+      description:
+        -  The access model specified by the RBAC rules
+      type: str
+      sample: "access_as_shared"
+    id:
+      description:
+        - The ID of the RBAC rule/policy
+      type: str
+      sample: "4154ce0c-71a7-4d87-a905-09762098ddb9"
+    name:
+      description:
+        - The name of the RBAC rule; usually null
+      type: str
+      sample: null
+    location:
+       description:
+         - A dictionary of the project details to which access is granted
+       type: dict
+       sample: >-
+            {
+                "cloud": "devstack",
+                "region_name": "",
+                "zone": null,
+                "project": {
+                    "id": "84b8774d595b41e89f3dfaa1fd76932c",
+                    "name": null,
+                    "domain_id": null,
+                    "domain_name": null
+                }
+            }
+'''
+
+import re
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class NeutronRbacPoliciesInfo(OpenStackModule):
+    argument_spec = dict(
+        policy_id=dict(),
+        object_id=dict(),  # ID of the object that this RBAC policy affects.
+        object_type=dict(choices=['security_group', 'qos_policy', 'network']),  # Type of the object that this RBAC policy affects.
+        target_project_id=dict(),  # The ID of the project this RBAC will be enforced.
+        project_id=dict(),  # The owner project ID.
+        project=dict(),
+        action=dict(choices=['access_as_external', 'access_as_shared']),  # Action for the RBAC policy.
+    )
+
+    module_kwargs = dict(
+        supports_check_mode=True,
+    )
+
+    def _filter_policies_by(self, policies, key, value):
+        filtered = []
+        regexp = re.compile(r"location\.project\.([A-Za-z]+)")
+        if regexp.match(key):
+            attribute = key.split('.')[-1]
+            for p in policies:
+                if p['location']['project'][attribute] == value:
+                    filtered.append(p)
+        else:
+            for p in policies:
+                if getattr(p, key) == value:
+                    filtered.append(p)
+
+        return filtered
+
+    def _get_rbac_policies(self):
+        object_type = self.params.get('object_type')
+        project_id = self.params.get('project_id')
+        action = self.params.get('action')
+
+        search_attributes = {}
+        if object_type is not None:
+            search_attributes['object_type'] = object_type
+        if project_id is not None:
+            search_attributes['project_id'] = project_id
+        if action is not None:
+            search_attributes['action'] = action
+
+        try:
+            policies = []
+            generator = self.conn.network.rbac_policies(**search_attributes)
+            for p in generator:
+                policies.append(p)
+        except self.sdk.exceptions.OpenStackCloudException as ex:
+            self.fail_json(msg='Failed to get RBAC policies: {0}'.format(str(ex)))
+
+        return policies
+
+    def run(self):
+        policy_id = self.params.get('policy_id')
+        object_id = self.params.get('object_id')
+        object_type = self.params.get('object_type')
+        project_id = self.params.get('project_id')
+        project = self.params.get('project')
+        target_project_id = self.params.get('target_project_id')
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=False)
+
+        if policy_id is not None:
+            try:
+                policy = self.conn.network.get_rbac_policy(policy_id)
+                self.exit_json(changed=False, policy=policy)
+            except self.sdk.exceptions.ResourceNotFound:
+                self.exit_json(changed=False, policy=None)
+            except self.sdk.exceptions.OpenStackCloudException as ex:
+                self.fail_json(msg='Failed to get RBAC policy: {0}'.format(str(ex)))
+        else:
+            if object_id is not None and object_type is not None:
+                self.fail_json(msg='object_id and object_type are mutually exclusive, please specify one of the two.')
+            if project_id is not None and target_project_id is not None:
+                self.fail_json(msg='project_id and target_project_id are mutually exclusive, please specify one of the two.')
+
+        filtered_policies = self._get_rbac_policies()
+
+        if project is not None:
+            filtered_policies = self._filter_policies_by(filtered_policies, 'location.project.name', project)
+        if object_id is not None:
+            filtered_policies = self._filter_policies_by(filtered_policies, 'object_id', object_id)
+        if target_project_id is not None:
+            filtered_policies = self._filter_policies_by(filtered_policies, 'target_project_id', target_project_id)
+
+        self.exit_json(policies=filtered_policies, changed=False)
+
+
+def main():
+    module = NeutronRbacPoliciesInfo()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/neutron_rbac_policy.py
+++ b/plugins/modules/neutron_rbac_policy.py
@@ -0,0 +1,308 @@
+#!/usr/bin/python
+
+# Copyright: Ansible Project
+# (c) 2021, Ashraf Hasson <ahasson@redhat.com>
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = r'''
+---
+module: neutron_rbac_policy
+short_description: Create or delete a Neutron policy to apply a RBAC rule against an object.
+author: OpenStack Ansible SIG
+description:
+  - Create a policy to apply a RBAC rule against a network, security group or a QoS Policy or update/delete an existing policy.
+  - If a C(policy_id) was provided but not found, this module will attempt to create a new policy rather than error out when updating an existing rule.
+  - Accepts same arguments as OpenStackSDK network proxy C(find_rbac_policy) and C(rbac_policies) functions which are ultimately passed over to C(RBACPolicy)
+
+options:
+  policy_id:
+    description:
+      - The RBAC policy ID
+      - Required when deleting or updating an existing RBAC policy rule, ignored otherwise
+    type: str
+  object_id:
+    description:
+      - The object ID (the subject of the policy) to which the RBAC rule applies
+      - Cannot be changed when updating an existing policy
+      - Required when creating a RBAC policy rule, ignored when deleting a policy
+    type: str
+  object_type:
+    description:
+      - Can be one of the following object types C(network), C(security_group) or C(qos_policy)
+      - Cannot be changed when updating an existing policy
+      - Required when creating a RBAC policy rule, ignored when deleting a policy
+    choices: ['network', 'security_group', 'qos_policy']
+    type: str
+  target_project_id:
+    description:
+      - The project to which access to be allowed or revoked/disallowed
+      - Can be specified/changed when updating an existing policy
+      - Required when creating or updating a RBAC policy rule, ignored when deleting a policy
+    type: str
+  project_id:
+    description:
+      - The project to which the object_id belongs
+      - Cannot be changed when updating an existing policy
+      - Required when creating a RBAC policy rule, ignored when deleting a policy
+    type: str
+  action:
+    description:
+      - Can be either of the following options C(access_as_shared) | C(access_as_external)
+      - Cannot be changed when updating an existing policy
+      - Required when creating a RBAC policy rule, ignored when deleting a policy
+    choices: ['access_as_shared', 'access_as_external']
+    type: str
+  state:
+    description:
+      - Whether the RBAC rule should be C(present) or C(absent).
+    choices: ['present', 'absent']
+    default: present
+    type: str
+
+extends_documentation_fragment:
+  - openstack.cloud.openstack
+'''
+
+EXAMPLES = r'''
+# Ensure network RBAC policy exists
+- name: Create a new network RBAC policy
+  neutron_rbac_policy:
+    object_id: '7422172b-2961-475c-ac68-bd0f2a9960ad'
+    object_type: 'network'
+    target_project_id: 'a12f9ce1de0645e0a0b01c2e679f69ec'
+    project_id: '84b8774d595b41e89f3dfaa1fd76932d'
+
+# Update network RBAC policy
+- name: Update an existing network RBAC policy
+  neutron_rbac_policy:
+    policy_id: 'f625242a-6a73-47ac-8d1f-91440b2c617f'
+    target_project_id: '163c89e065a94e069064e551e15daf0e'
+
+# Delete an existing RBAC policy
+- name: Delete RBAC policy
+  openstack.cloud.openstack.neutron_rbac_policy:
+    policy_id: 'f625242a-6a73-47ac-8d1f-91440b2c617f'
+    state: absent
+'''
+
+RETURN = r'''
+policy:
+  description:
+    - A hash representing the policy
+  type: complex
+  returned: always
+  contains:
+    object_id:
+      description:
+        - The UUID of the object to which the RBAC rules apply
+      type: str
+      sample: "7422172b-2961-475c-ac68-bd0f2a9960ad"
+    target_project_id:
+      description:
+        - The UUID of the target project
+      type: str
+      sample: "c201a689c016435c8037977166f77368"
+    project_id:
+      description:
+        - The UUID of the project to which access is granted
+      type: str
+      sample: "84b8774d595b41e89f3dfaa1fd76932c"
+    object_type:
+      description:
+        - The object type to which the RBACs apply
+      type: str
+      sample: "network"
+    action:
+      description:
+        -  The access model specified by the RBAC rules
+      type: str
+      sample: "access_as_shared"
+    id:
+      description:
+        - The ID of the RBAC rule/policy
+      type: str
+      sample: "4154ce0c-71a7-4d87-a905-09762098ddb9"
+    name:
+      description:
+        - The name of the RBAC rule; usually null
+      type: str
+      sample: null
+    location:
+       description:
+         - A dictionary of the project details to which access is granted
+       type: dict
+       sample: >-
+            {
+                "cloud": "devstack",
+                "region_name": "",
+                "zone": null,
+                "project": {
+                    "id": "84b8774d595b41e89f3dfaa1fd76932c",
+                    "name": null,
+                    "domain_id": null,
+                    "domain_name": null
+                }
+            }
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class NeutronRbacPolicy(OpenStackModule):
+    argument_spec = dict(
+        policy_id=dict(),
+        object_id=dict(),  # ID of the object that this RBAC policy affects.
+        object_type=dict(choices=['security_group', 'qos_policy', 'network']),  # Type of the object that this RBAC policy affects.
+        target_project_id=dict(),  # The ID of the project this RBAC will be enforced.
+        project_id=dict(),  # The owner project ID.
+        action=dict(choices=['access_as_external', 'access_as_shared']),  # Action for the RBAC policy.
+        state=dict(default='present', choices=['absent', 'present'])
+    )
+
+    module_kwargs = dict(
+        supports_check_mode=True,
+    )
+
+    def _delete_rbac_policy(self, policy):
+        """
+        Delete an existing RBAC policy
+        returns: the "Changed" state
+        """
+
+        if policy is None:
+            self.fail_json(msg='Must specify policy_id for delete')
+
+        try:
+            self.conn.network.delete_rbac_policy(policy.id)
+        except self.sdk.exceptions.OpenStackCloudException as ex:
+            self.fail_json(msg='Failed to delete RBAC policy: {0}'.format(str(ex)))
+
+        return True
+
+    def _create_rbac_policy(self):
+        """
+        Creates a new RBAC policy
+        returns: the "Changed" state of the RBAC policy
+        """
+
+        object_id = self.params.get('object_id')
+        object_type = self.params.get('object_type')
+        target_project_id = self.params.get('target_project_id')
+        project_id = self.params.get('project_id')
+        action = self.params.get('action')
+
+        attributes = {
+            'object_id': object_id,
+            'object_type': object_type,
+            'target_project_id': target_project_id,
+            'project_id': project_id,
+            'action': action
+        }
+
+        if not all(attributes.values()):
+            self.fail_json(msg='Missing one or more required parameter for creating a RBAC policy')
+
+        try:
+            search_attributes = dict(attributes)
+            del search_attributes['object_id']
+            del search_attributes['target_project_id']
+            policies = self.conn.network.rbac_policies(**search_attributes)
+            for p in policies:
+                if p.object_id == object_id and p.target_project_id == target_project_id:
+                    return (False, p)
+
+            # if no matching policy exists, attempt to create one
+            policy = self.conn.network.create_rbac_policy(**attributes)
+        except self.sdk.exceptions.OpenStackCloudException as ex:
+            self.fail_json(msg='Failed to create RBAC policy: {0}'.format(str(ex)))
+
+        return (True, policy)
+
+    def _update_rbac_policy(self, policy):
+        """
+        Updates an existing RBAC policy
+        returns: the "Changed" state of the RBAC policy
+        """
+
+        object_id = self.params.get('object_id')
+        object_type = self.params.get('object_type')
+        target_project_id = self.params.get('target_project_id')
+        project_id = self.params.get('project_id')
+        action = self.params.get('action')
+
+        allowed_attributes = {
+            'rbac_policy': policy.id,
+            'target_project_id': target_project_id
+        }
+
+        disallowed_attributes = {
+            'object_id': object_id,
+            'object_type': object_type,
+            'project_id': project_id,
+            'action': action
+        }
+
+        if not all(allowed_attributes.values()):
+            self.fail_json(msg='Missing one or more required parameter for updating a RBAC policy')
+
+        if any(disallowed_attributes.values()):
+            self.fail_json(msg='Cannot change disallowed parameters while updating a RBAC policy: ["object_id", "object_type", "project_id", "action"]')
+
+        try:
+            policy = self.conn.network.update_rbac_policy(**allowed_attributes)
+        except self.sdk.exceptions.OpenStackCloudException as ex:
+            self.fail_json(msg='Failed to update the RBAC policy: {0}'.format(str(ex)))
+
+        return (True, policy)
+
+    def _policy_state_change(self, policy):
+        state = self.params['state']
+        if state == 'present':
+            if not policy:
+                return True
+        if state == 'absent' and policy:
+            return True
+        return False
+
+    def run(self):
+        policy_id = self.params.get('policy_id')
+        state = self.params.get('state')
+
+        if policy_id is not None:
+            try:
+                policy = self.conn.network.get_rbac_policy(policy_id)
+            except self.sdk.exceptions.ResourceNotFound:
+                policy = None
+            except self.sdk.exceptions.OpenStackCloudException as ex:
+                self.fail_json(msg='Failed to get RBAC policy: {0}'.format(str(ex)))
+        else:
+            policy = None
+
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._policy_state_change(policy), policy=policy)
+
+        if state == 'absent':
+            if policy is None and policy_id:
+                self.exit_json(changed=False)
+            if policy_id is None:
+                self.fail_json(msg='Must specify policy_id when state is absent')
+            if policy is not None:
+                changed = self._delete_rbac_policy(policy)
+                self.exit_json(changed=changed)
+        # state == 'present'
+        else:
+            if policy is None:
+                (changed, new_policy) = self._create_rbac_policy()
+            else:
+                (changed, new_policy) = self._update_rbac_policy(policy)
+
+            self.exit_json(changed=changed, policy=new_policy)
+
+
+def main():
+    module = NeutronRbacPolicy()
+    module()
+
+
+if __name__ == '__main__':
+    main()
--- a/plugins/modules/object.py
+++ b/plugins/modules/object.py
@@ -65,58 +65,55 @@ EXAMPLES = '''
    container: config
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def process_object(
-        cloud_obj, container, name, filename, container_access, **kwargs):
-
-    changed = False
-    container_obj = cloud_obj.get_container(container)
-    if kwargs['state'] == 'present':
-        if not container_obj:
-            container_obj = cloud_obj.create_container(container)
-            changed = True
-        if cloud_obj.get_container_access(container) != container_access:
-            cloud_obj.set_container_access(container, container_access)
-            changed = True
-        if name:
-            if cloud_obj.is_object_stale(container, name, filename):
-                cloud_obj.create_object(container, name, filename)
-                changed = True
-    else:
-        if container_obj:
-            if name:
-                if cloud_obj.get_object_metadata(container, name):
-                    cloud_obj.delete_object(container, name)
-                changed = True
-            else:
-                cloud_obj.delete_container(container)
-                changed = True
-    return changed
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class SwiftObjectModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=False, default=None),
        container=dict(required=True),
        filename=dict(required=False, default=None),
        container_access=dict(default='private', choices=['private', 'public']),
        state=dict(default='present', choices=['absent', 'present']),
    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
+    module_kwargs = dict()

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        changed = process_object(cloud, **module.params)
+    def process_object(
+        self, container, name, filename, container_access, **kwargs
+    ):
+        changed = False
+        container_obj = self.conn.get_container(container)
+        if kwargs['state'] == 'present':
+            if not container_obj:
+                container_obj = self.conn.create_container(container)
+                changed = True
+            if self.conn.get_container_access(container) != container_access:
+                self.conn.set_container_access(container, container_access)
+                changed = True
+            if name:
+                if self.conn.is_object_stale(container, name, filename):
+                    self.conn.create_object(container, name, filename)
+                    changed = True
+        else:
+            if container_obj:
+                if name:
+                    if self.conn.get_object_metadata(container, name):
+                        self.conn.delete_object(container, name)
+                    changed = True
+                else:
+                    self.conn.delete_container(container)
+                    changed = True
+        return changed

-        module.exit_json(changed=changed)
-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+    def run(self):
+        changed = self.process_object(**self.params)
+
+        self.exit_json(changed=changed)
+
+
+def main():
+    module = SwiftObjectModule()
+    module()


 if __name__ == "__main__":
--- a/plugins/modules/object_container.py
+++ b/plugins/modules/object_container.py
@@ -0,0 +1,207 @@
+#!/usr/bin/python
+# coding: utf-8 -*-
+#
+# Copyright (c) 2021 by Open Telekom Cloud, operated by T-Systems International GmbH
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+DOCUMENTATION = '''
+---
+module: object_container
+short_description: Manage Swift container.
+author: OpenStack Ansible SIG
+description:
+  - Manage Swift container.
+options:
+  container:
+    description: Name of a container in Swift.
+    type: str
+    required: true
+  metadata:
+    description:
+        - Key/value pairs to be set as metadata on the container.
+        - If a container doesn't exist, it will be created.
+        - Both custom and system metadata can be set.
+        - Custom metadata are keys and values defined by the user.
+        - The system metadata keys are content_type, content_encoding, content_disposition, delete_after,\
+         delete_at, is_content_type_detected
+    type: dict
+    required: false
+  keys:
+    description: Keys from 'metadata' to be deleted.
+    type: list
+    elements: str
+    required: false
+  delete_with_all_objects:
+    description:
+        - Whether the container should be deleted with all objects or not.
+        - Without this parameter set to "true", an attempt to delete a container that contains objects will fail.
+    type: bool
+    default: False
+    required: false
+  state:
+    description: Whether resource should be present or absent.
+    default: 'present'
+    choices: ['present', 'absent']
+    type: str
+requirements:
+    - "python >= 3.6"
+    - "openstacksdk"
+
+extends_documentation_fragment:
+- openstack.cloud.openstack
+'''
+
+RETURN = '''
+container:
+  description: Specifies the container.
+  returned: On success when C(state=present)
+  type: dict
+  sample:
+    {
+      "bytes": 5449,
+      "bytes_used": 5449,
+      "content_type": null,
+      "count": 1,
+      "id": "otc",
+      "if_none_match": null,
+      "is_content_type_detected": null,
+      "is_newest": null,
+      "meta_temp_url_key": null,
+      "meta_temp_url_key_2": null,
+      "name": "otc",
+      "object_count": 1,
+      "read_ACL": null,
+      "sync_key": null,
+      "sync_to": null,
+      "timestamp": null,
+      "versions_location": null,
+      "write_ACL": null
+    }
+'''
+
+EXAMPLES = '''
+# Create empty container
+ - openstack.cloud.object_container:
+    container: "new-container"
+    state: present
+
+# Set metadata for container
+ - openstack.cloud.object_container:
+    container: "new-container"
+    metadata: "Cache-Control='no-cache'"
+
+# Delete some keys from metadata of a container
+ - openstack.cloud.object_container:
+    container: "new-container"
+    keys:
+        - content_type
+
+# Delete container
+ - openstack.cloud.object_container:
+    container: "new-container"
+    state: absent
+
+# Delete container and its objects
+ - openstack.cloud.object_container:
+    container: "new-container"
+    delete_with_all_objects: true
+    state: absent
+'''
+
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
+
+
+class ContainerModule(OpenStackModule):
+
+    argument_spec = dict(
+        container=dict(type='str', required=True),
+        metadata=dict(type='dict', required=False),
+        keys=dict(type='list', required=False, elements='str', no_log=False),
+        state=dict(type='str', required=False, default='present', choices=['present', 'absent']),
+        delete_with_all_objects=dict(type='bool', default=False, required=False)
+    )
+
+    def create(self, container):
+
+        data = {}
+        if self._container_exist(container):
+            self.exit_json(changed=False)
+
+        container_data = self.conn.object_store.create_container(name=container).to_dict()
+        container_data.pop('location')
+        data['container'] = container_data
+        self.exit_json(changed=True, **data)
+
+    def delete(self, container):
+
+        delete_with_all_objects = self.params['delete_with_all_objects']
+
+        changed = False
+        if self._container_exist(container):
+            objects = []
+            for raw in self.conn.object_store.objects(container):
+                dt = raw.to_dict()
+                dt.pop('location')
+                objects.append(dt)
+            if len(objects) > 0:
+                if delete_with_all_objects:
+                    for obj in objects:
+                        self.conn.object_store.delete_object(container=container, obj=obj['id'])
+                else:
+                    self.fail_json(msg="Container has objects")
+            self.conn.object_store.delete_container(container=container)
+            changed = True
+
+        self.exit(changed=changed)
+
+    def set_metadata(self, container, metadata):
+
+        data = {}
+
+        if not self._container_exist(container):
+            new_container = self.conn.object_store.create_container(name=container).to_dict()
+
+        new_container = self.conn.object_store.set_container_metadata(container, **metadata).to_dict()
+        new_container.pop('location')
+        data['container'] = new_container
+        self.exit(changed=True, **data)
+
+    def delete_metadata(self, container, keys):
+
+        if not self._container_exist(container):
+            self.fail_json(msg="Container doesn't exist")
+
+        self.conn.object_store.delete_container_metadata(container=container, keys=keys)
+        self.exit(changed=True)
+
+    def _container_exist(self, container):
+        try:
+            self.conn.object_store.get_container_metadata(container)
+            return True
+        except self.sdk.exceptions.ResourceNotFound:
+            return False
+
+    def run(self):
+
+        container = self.params['container']
+        state = self.params['state']
+        metadata = self.params['metadata']
+        keys = self.params['keys']
+
+        if state == 'absent':
+            self.delete(container)
+        if metadata:
+            self.set_metadata(container, metadata)
+        if keys:
+            self.delete_metadata(container, keys)
+
+        self.create(container)
+
+
+def main():
+    module = ContainerModule()
+    module()
+
+
+if __name__ == "__main__":
+    main()
--- a/plugins/modules/port.py
+++ b/plugins/modules/port.py
@@ -119,6 +119,18 @@ options:
     description:
       - Whether to enable or disable the port security on the network.
     type: bool
+   binding_profile:
+     description:
+       - Binding profile dict that the port should be created with.
+     type: dict
+   dns_name:
+     description:
+       - The dns name of the port ( only with dns-integration enabled )
+     type: str
+   dns_domain:
+     description:
+       - The dns domain of the port ( only with dns-integration enabled )
+     type: str
 requirements:
    - "python >= 3.6"
    - "openstacksdk"
@@ -199,6 +211,20 @@ EXAMPLES = '''
    name: port1
    network: foo
    vnic_type: direct
+
+# Create a port with binding profile
+- openstack.cloud.port:
+    state: present
+    auth:
+      auth_url: https://identity.example.com
+      username: admin
+      password: admin
+      project_name: admin
+    name: port1
+    network: foo
+    binding_profile:
+      "pci_slot": "0000:03:11.1"
+      "physical_network": "provider"
 '''

 RETURN = '''
@@ -246,12 +272,14 @@ port_security_enabled:
    description: Port security state on the network.
    returned: success
    type: bool
+binding:profile:
+    description: Port binded profile
+    returned: success
+    type: dict
 '''

-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible.module_utils.basic import missing_required_lib
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule

 try:
    from collections import OrderedDict
@@ -264,120 +292,8 @@ except ImportError:
        HAS_ORDEREDDICT = False


-def _needs_update(module, port, cloud):
-    """Check for differences in the updatable values.
-
-    NOTE: We don't currently allow name updates.
-    """
-    compare_simple = ['admin_state_up',
-                      'mac_address',
-                      'device_owner',
-                      'device_id',
-                      'binding:vnic_type',
-                      'port_security_enabled']
-    compare_list_dict = ['allowed_address_pairs',
-                         'extra_dhcp_opts']
-    compare_list = ['security_groups']
-
-    for key in compare_simple:
-        if module.params[key] is not None and module.params[key] != port[key]:
-            return True
-    for key in compare_list:
-        if (
-            module.params[key] is not None
-            and set(module.params[key]) != set(port[key])
-        ):
-            return True
-
-    for key in compare_list_dict:
-        if not module.params[key]:
-            if not port[key]:
-                return True
-
-            # sort dicts in list
-            port_ordered = [OrderedDict(sorted(d.items())) for d in port[key]]
-            param_ordered = [OrderedDict(sorted(d.items())) for d in module.params[key]]
-
-            for d in param_ordered:
-                if d not in port_ordered:
-                    return True
-
-            for d in port_ordered:
-                if d not in param_ordered:
-                    return True
-
-    # NOTE: if port was created or updated with 'no_security_groups=True',
-    # subsequent updates without 'no_security_groups' flag or
-    # 'no_security_groups=False' and no specified 'security_groups', will not
-    # result in an update to the port where the default security group is
-    # applied.
-    if module.params['no_security_groups'] and port['security_groups'] != []:
-        return True
-
-    if module.params['fixed_ips'] is not None:
-        for item in module.params['fixed_ips']:
-            if 'ip_address' in item:
-                # if ip_address in request does not match any in existing port,
-                # update is required.
-                if not any(match['ip_address'] == item['ip_address']
-                           for match in port['fixed_ips']):
-                    return True
-            if 'subnet_id' in item:
-                return True
-        for item in port['fixed_ips']:
-            # if ip_address in existing port does not match any in request,
-            # update is required.
-            if not any(match.get('ip_address') == item['ip_address']
-                       for match in module.params['fixed_ips']):
-                return True
-
-    return False
-
-
-def _system_state_change(module, port, cloud):
-    state = module.params['state']
-    if state == 'present':
-        if not port:
-            return True
-        return _needs_update(module, port, cloud)
-    if state == 'absent' and port:
-        return True
-    return False
-
-
-def _compose_port_args(module, cloud):
-    port_kwargs = {}
-    optional_parameters = ['name',
-                           'fixed_ips',
-                           'admin_state_up',
-                           'mac_address',
-                           'security_groups',
-                           'allowed_address_pairs',
-                           'extra_dhcp_opts',
-                           'device_owner',
-                           'device_id',
-                           'binding:vnic_type',
-                           'port_security_enabled']
-    for optional_param in optional_parameters:
-        if module.params[optional_param] is not None:
-            port_kwargs[optional_param] = module.params[optional_param]
-
-    if module.params['no_security_groups']:
-        port_kwargs['security_groups'] = []
-
-    return port_kwargs
-
-
-def get_security_group_id(module, cloud, security_group_name_or_id):
-    security_group = cloud.get_security_group(security_group_name_or_id)
-    if not security_group:
-        module.fail_json(msg="Security group: %s, was not found"
-                             % security_group_name_or_id)
-    return security_group['id']
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class NetworkPortModule(OpenStackModule):
+    argument_spec = dict(
        network=dict(required=False),
        name=dict(required=False),
        fixed_ips=dict(type='list', default=None, elements='dict'),
@@ -393,81 +309,221 @@ def main():
        vnic_type=dict(default=None,
                       choices=['normal', 'direct', 'direct-physical',
                                'macvtap', 'baremetal', 'virtio-forwarder']),
-        port_security_enabled=dict(default=None, type='bool')
+        port_security_enabled=dict(default=None, type='bool'),
+        binding_profile=dict(default=None, type='dict'),
+        dns_name=dict(type='str', default=None),
+        dns_domain=dict(type='str', default=None)
    )

-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
        mutually_exclusive=[
            ['no_security_groups', 'security_groups'],
-        ]
+        ],
+        supports_check_mode=True
    )

-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+    def _is_dns_integration_enabled(self):
+        """ Check if dns-integraton is enabled """
+        for ext in self.conn.network.extensions():
+            if ext.alias == 'dns-integration':
+                return True
+        return False

-    if not HAS_ORDEREDDICT:
-        module.fail_json(msg=missing_required_lib('ordereddict'))
+    def _needs_update(self, port):
+        """Check for differences in the updatable values.

-    name = module.params['name']
-    state = module.params['state']
+        NOTE: We don't currently allow name updates.
+        """
+        compare_simple = ['admin_state_up',
+                          'mac_address',
+                          'device_owner',
+                          'device_id',
+                          'binding:vnic_type',
+                          'port_security_enabled',
+                          'binding:profile']
+        compare_dns = ['dns_name', 'dns_domain']
+        compare_list_dict = ['allowed_address_pairs',
+                             'extra_dhcp_opts']
+        compare_list = ['security_groups']

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        if module.params['security_groups']:
+        if self.conn.has_service('dns') and \
+           self._is_dns_integration_enabled():
+            for key in compare_dns:
+                if self.params[key] is not None and \
+                   self.params[key] != port[key]:
+                    return True
+
+        for key in compare_simple:
+            if self.params[key] is not None and self.params[key] != port[key]:
+                return True
+        for key in compare_list:
+            if (
+                self.params[key] is not None
+                and set(self.params[key]) != set(port[key])
+            ):
+                return True
+
+        for key in compare_list_dict:
+            if not self.params[key]:
+                if port.get(key):
+                    return True
+
+            if self.params[key]:
+                if not port.get(key):
+                    return True
+
+                # sort dicts in list
+                port_ordered = [OrderedDict(sorted(d.items())) for d in port[key]]
+                param_ordered = [OrderedDict(sorted(d.items())) for d in self.params[key]]
+
+                for d in param_ordered:
+                    if d not in port_ordered:
+                        return True
+
+                for d in port_ordered:
+                    if d not in param_ordered:
+                        return True
+
+        # NOTE: if port was created or updated with 'no_security_groups=True',
+        # subsequent updates without 'no_security_groups' flag or
+        # 'no_security_groups=False' and no specified 'security_groups', will not
+        # result in an update to the port where the default security group is
+        # applied.
+        if self.params['no_security_groups'] and port['security_groups'] != []:
+            return True
+
+        if self.params['fixed_ips'] is not None:
+            for item in self.params['fixed_ips']:
+                if 'ip_address' in item:
+                    # if ip_address in request does not match any in existing port,
+                    # update is required.
+                    if not any(match['ip_address'] == item['ip_address']
+                               for match in port['fixed_ips']):
+                        return True
+                if 'subnet_id' in item:
+                    return True
+            for item in port['fixed_ips']:
+                # if ip_address in existing port does not match any in request,
+                # update is required.
+                if not any(match.get('ip_address') == item['ip_address']
+                           for match in self.params['fixed_ips']):
+                    return True
+
+        return False
+
+    def _system_state_change(self, port):
+        state = self.params['state']
+        if state == 'present':
+            if not port:
+                return True
+            return self._needs_update(port)
+        if state == 'absent' and port:
+            return True
+        return False
+
+    def _compose_port_args(self):
+        port_kwargs = {}
+        optional_parameters = ['name',
+                               'fixed_ips',
+                               'admin_state_up',
+                               'mac_address',
+                               'security_groups',
+                               'allowed_address_pairs',
+                               'extra_dhcp_opts',
+                               'device_owner',
+                               'device_id',
+                               'binding:vnic_type',
+                               'port_security_enabled',
+                               'binding:profile']
+
+        if self.conn.has_service('dns') and \
+           self._is_dns_integration_enabled():
+            optional_parameters.extend(['dns_name', 'dns_domain'])
+
+        for optional_param in optional_parameters:
+            if self.params[optional_param] is not None:
+                port_kwargs[optional_param] = self.params[optional_param]
+
+        if self.params['no_security_groups']:
+            port_kwargs['security_groups'] = []
+
+        return port_kwargs
+
+    def get_security_group_id(self, security_group_name_or_id):
+        security_group = self.conn.get_security_group(security_group_name_or_id)
+        if not security_group:
+            self.fail_json(msg="Security group: %s, was not found"
+                           % security_group_name_or_id)
+        return security_group['id']
+
+    def run(self):
+        if not HAS_ORDEREDDICT:
+            self.fail_json(msg=missing_required_lib('ordereddict'))
+
+        name = self.params['name']
+        state = self.params['state']
+
+        if self.params['security_groups']:
            # translate security_groups to UUID's if names where provided
-            module.params['security_groups'] = [
-                get_security_group_id(module, cloud, v)
-                for v in module.params['security_groups']
+            self.params['security_groups'] = [
+                self.get_security_group_id(v)
+                for v in self.params['security_groups']
            ]

        # Neutron API accept 'binding:vnic_type' as an argument
        # for the port type.
-        module.params['binding:vnic_type'] = module.params.pop('vnic_type')
+        self.params['binding:vnic_type'] = self.params.pop('vnic_type')
+        # Neutron API accept 'binding:profile' as an argument
+        # for the port binding profile type.
+        self.params['binding:profile'] = self.params.pop('binding_profile')

        port = None
        network_id = None
        if name:
-            port = cloud.get_port(name)
+            port = self.conn.get_port(name)

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, port, cloud))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(port))

        changed = False
        if state == 'present':
            if not port:
-                network = module.params['network']
+                network = self.params['network']
                if not network:
-                    module.fail_json(
+                    self.fail_json(
                        msg="Parameter 'network' is required in Port Create"
                    )
-                port_kwargs = _compose_port_args(module, cloud)
-                network_object = cloud.get_network(network)
+                port_kwargs = self._compose_port_args()
+                network_object = self.conn.get_network(network)

                if network_object:
                    network_id = network_object['id']
                else:
-                    module.fail_json(
+                    self.fail_json(
                        msg="Specified network was not found."
                    )

-                port = cloud.create_port(network_id, **port_kwargs)
+                port_kwargs['network_id'] = network_id
+                port = self.conn.network.create_port(**port_kwargs)
                changed = True
            else:
-                if _needs_update(module, port, cloud):
-                    port_kwargs = _compose_port_args(module, cloud)
-                    port = cloud.update_port(port['id'], **port_kwargs)
+                if self._needs_update(port):
+                    port_kwargs = self._compose_port_args()
+                    port = self.conn.network.update_port(port['id'],
+                                                         **port_kwargs)
                    changed = True
-            module.exit_json(changed=changed, id=port['id'], port=port)
+            self.exit_json(changed=changed, id=port['id'], port=port)

        if state == 'absent':
            if port:
-                cloud.delete_port(port['id'])
+                self.conn.delete_port(port['id'])
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = NetworkPortModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/port_info.py
+++ b/plugins/modules/port_info.py
@@ -179,38 +179,31 @@ openstack_ports:
            sample: "51fce036d7984ba6af4f6c849f65ef00"
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
-    argument_spec = openstack_full_argument_spec(
+class NetworkPortInfoModule(OpenStackModule):
+    argument_spec = dict(
        port=dict(required=False),
        filters=dict(type='dict', required=False),
    )
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec, **module_kwargs)
-    is_old_facts = module._name == 'openstack.cloud.port_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.port_facts' module has been renamed to 'openstack.cloud.port_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    port = module.params.get('port')
-    filters = module.params.get('filters')
+    deprecated_names = ('openstack.cloud.port_facts')

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        ports = cloud.search_ports(port, filters)
-        if is_old_facts:
-            module.exit_json(changed=False, ansible_facts=dict(
-                openstack_ports=ports))
-        else:
-            module.exit_json(changed=False, openstack_ports=ports)
+    def run(self):
+        port = self.params.get('port')
+        filters = self.params.get('filters')

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+        ports = self.conn.search_ports(port, filters)
+        self.exit_json(changed=False, openstack_ports=ports)
+
+
+def main():
+    module = NetworkPortInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/project.py
+++ b/plugins/modules/project.py
@@ -38,7 +38,7 @@ options:
        - Additional properties to be associated with this project. Requires
          openstacksdk>0.45.
     type: dict
-     default: {}
+     required: false
   state:
     description:
       - Should the resource be present or absent.
@@ -99,133 +99,121 @@ project:
            sample: True
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _needs_update(module, project):
-    keys = ('description', 'enabled')
-    for key in keys:
-        if module.params[key] is not None and module.params[key] != project.get(key):
-            return True
-
-    properties = module.params['properties']
-    if properties:
-        project_properties = project.get('properties')
-        for k, v in properties.items():
-            if v is not None and v != project_properties[k]:
-                return True
-
-    return False
-
-
-def _system_state_change(module, project):
-    state = module.params['state']
-    if state == 'present':
-        if project is None:
-            changed = True
-        else:
-            if _needs_update(module, project):
-                changed = True
-            else:
-                changed = False
-
-    elif state == 'absent':
-        if project is None:
-            changed = False
-        else:
-            changed = True
-
-    return changed
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityProjectModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
-        description=dict(required=False, default=None),
-        domain_id=dict(required=False, default=None, aliases=['domain']),
-        properties=dict(type='dict', default={}),
+        description=dict(required=False),
+        domain_id=dict(required=False, aliases=['domain']),
+        properties=dict(required=False, type='dict', min_ver='0.45.1'),
        enabled=dict(default=True, type='bool'),
        state=dict(default='present', choices=['absent', 'present'])
    )
-
-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(
-        argument_spec,
-        supports_check_mode=True,
-        **module_kwargs
+    module_kwargs = dict(
+        supports_check_mode=True
    )

-    name = module.params['name']
-    description = module.params['description']
-    domain = module.params.get('domain_id')
-    enabled = module.params['enabled']
-    properties = module.params['properties']
-    state = module.params['state']
+    def _needs_update(self, project):
+        keys = ('description', 'enabled')
+        for key in keys:
+            if self.params[key] is not None and self.params[key] != project.get(key):
+                return True

-    min_version = None
+        properties = self.params['properties']
+        if properties:
+            project_properties = project.get('properties')
+            for k, v in properties.items():
+                if v is not None and (k not in project_properties or v != project_properties[k]):
+                    return True

-    if properties:
-        min_version = '0.45.1'
+        return False
+
+    def _system_state_change(self, project):
+        state = self.params['state']
+        if state == 'present':
+            if project is None:
+                changed = True
+            else:
+                if self._needs_update(project):
+                    changed = True
+                else:
+                    changed = False
+
+        elif state == 'absent':
+            changed = project is not None
+
+        return changed
+
+    def run(self):
+        name = self.params['name']
+        description = self.params['description']
+        domain = self.params['domain_id']
+        enabled = self.params['enabled']
+        properties = self.params['properties'] or {}
+        state = self.params['state']

-    sdk, cloud = openstack_cloud_from_module(module, min_version)
-    try:
        if domain:
            try:
                # We assume admin is passing domain id
-                dom = cloud.get_domain(domain)['id']
+                dom = self.conn.get_domain(domain)['id']
                domain = dom
            except Exception:
                # If we fail, maybe admin is passing a domain name.
                # Note that domains have unique names, just like id.
                try:
-                    dom = cloud.search_domains(filters={'name': domain})[0]['id']
+                    dom = self.conn.search_domains(filters={'name': domain})[0]['id']
                    domain = dom
                except Exception:
                    # Ok, let's hope the user is non-admin and passing a sane id
                    pass

        if domain:
-            project = cloud.get_project(name, domain_id=domain)
+            project = self.conn.get_project(name, domain_id=domain)
        else:
-            project = cloud.get_project(name)
+            project = self.conn.get_project(name)

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(module, project))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(project))

        if state == 'present':
            if project is None:
-                project = cloud.create_project(
+                project = self.conn.create_project(
                    name=name, description=description,
                    domain_id=domain,
                    enabled=enabled)
                changed = True

-                project = cloud.update_project(
-                    project['id'], description=description,
-                    enabled=enabled, **properties)
+                project = self.conn.update_project(
+                    project['id'],
+                    description=description,
+                    enabled=enabled,
+                    **properties)
            else:
-                if _needs_update(module, project):
-                    project = cloud.update_project(
-                        project['id'], description=description,
-                        enabled=enabled, **properties)
+                if self._needs_update(project):
+                    project = self.conn.update_project(
+                        project['id'],
+                        description=description,
+                        enabled=enabled,
+                        **properties)
                    changed = True
                else:
                    changed = False
-            module.exit_json(changed=changed, project=project)
+            self.exit_json(changed=changed, project=project)

        elif state == 'absent':
            if project is None:
                changed = False
            else:
-                cloud.delete_project(project['id'])
+                self.conn.delete_project(project['id'])
                changed = True
-            module.exit_json(changed=changed)
+            self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=e.message, extra_data=e.extra_data)
+
+def main():
+    module = IdentityProjectModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/project_access.py
+++ b/plugins/modules/project_access.py
@@ -91,49 +91,41 @@ flavor:

 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityProjectAccess(OpenStackModule):
+    argument_spec = dict(
        state=dict(required=False, default='present',
                   choices=['absent', 'present']),
-
        target_project_id=dict(required=True, type='str'),
        resource_type=dict(required=True, type='str'),
        resource_name=dict(required=True, type='str'),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(
-        argument_spec,
+    module_kwargs = dict(
        supports_check_mode=True,
        required_if=[
            ('state', 'present', ['target_project_id'])
-        ],
-        **module_kwargs)
+        ]
+    )

-    sdk, cloud = openstack_cloud_from_module(module)
+    def run(self):
+        state = self.params['state']
+        resource_name = self.params['resource_name']
+        resource_type = self.params['resource_type']
+        target_project_id = self.params['target_project_id']

-    state = module.params['state']
-    resource_name = module.params['resource_name']
-    resource_type = module.params['resource_type']
-    target_project_id = module.params['target_project_id']
-
-    try:
        if resource_type == 'nova_flavor':
            # returns Munch({'NAME_ATTR': 'name',
            # 'tenant_id': u'37e55da59ec842649d84230f3a24eed5',
            # 'HUMAN_ID': False,
            # 'flavor_id': u'6d4d37b9-0480-4a8c-b8c9-f77deaad73f9',
            #  'request_ids': [], 'human_id': None}),
-            _get_resource = cloud.get_flavor
-            _list_resource_access = cloud.list_flavor_access
-            _add_resource_access = cloud.add_flavor_access
-            _remove_resource_access = cloud.remove_flavor_access
+            _get_resource = self.conn.get_flavor
+            _list_resource_access = self.conn.list_flavor_access
+            _add_resource_access = self.conn.add_flavor_access
+            _remove_resource_access = self.conn.remove_flavor_access
        elif resource_type == 'cinder_volume_type':
            # returns [Munch({
            # 'project_id': u'178cdb9955b047eea7afbe582038dc94',
@@ -141,41 +133,43 @@ def main():
            #  'human_id': None,
            # 'HUMAN_ID': False},
            #  'id': u'd5573023-b290-42c8-b232-7c5ca493667f'}),
-            _get_resource = cloud.get_volume_type
-            _list_resource_access = cloud.get_volume_type_access
-            _add_resource_access = cloud.add_volume_type_access
-            _remove_resource_access = cloud.remove_volume_type_access
+            _get_resource = self.conn.get_volume_type
+            _list_resource_access = self.conn.get_volume_type_access
+            _add_resource_access = self.conn.add_volume_type_access
+            _remove_resource_access = self.conn.remove_volume_type_access
        else:
-            module.exit_json(changed=False,
-                             resource_name=resource_name,
-                             resource_type=resource_type,
-                             error="Not implemented.")
+            self.exit_json(
+                changed=False,
+                resource_name=resource_name,
+                resource_type=resource_type,
+                error="Not implemented.")

        resource = _get_resource(resource_name)
        if not resource:
-            module.exit_json(changed=False,
-                             resource_name=resource_name,
-                             resource_type=resource_type,
-                             error="Not found.")
+            self.exit_json(
+                changed=False,
+                resource_name=resource_name,
+                resource_type=resource_type,
+                error="Not found.")
        resource_id = getattr(resource, 'id', resource['id'])
        # _list_resource_access returns a list of dicts containing 'project_id'
        acls = _list_resource_access(resource_id)

        if not all(acl.get('project_id') for acl in acls):
-            module.exit_json(changed=False,
-                             resource_name=resource_name,
-                             resource_type=resource_type,
-                             error="Missing project_id in resource output.")
+            self.exit_json(
+                changed=False,
+                resource_name=resource_name,
+                resource_type=resource_type,
+                error="Missing project_id in resource output.")
        allowed_tenants = [acl['project_id'] for acl in acls]

        changed_access = any((
            state == 'present' and target_project_id not in allowed_tenants,
            state == 'absent' and target_project_id in allowed_tenants
        ))
-        if module.check_mode or not changed_access:
-            module.exit_json(changed=changed_access,
-                             resource=resource,
-                             id=resource_id)
+        if self.ansible.check_mode or not changed_access:
+            self.exit_json(
+                changed=changed_access, resource=resource, id=resource_id)

        if state == 'present':
            _add_resource_access(
@@ -186,12 +180,13 @@ def main():
                resource_id, target_project_id
            )

-        module.exit_json(changed=True,
-                         resource=resource,
-                         id=resource_id)
+        self.exit_json(
+            changed=True, resource=resource, id=resource_id)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), **module.params)
+
+def main():
+    module = IdentityProjectAccess()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/project_info.py
+++ b/plugins/modules/project_info.py
@@ -99,58 +99,57 @@ openstack_projects:
            type: bool
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import openstack_full_argument_spec, openstack_cloud_from_module
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def main():
+class IdentityProjectInfoModule(OpenStackModule):
+    deprecated_names = ('project_facts', 'openstack.cloud.project_facts')

-    argument_spec = openstack_full_argument_spec(
-        name=dict(required=False, default=None),
-        domain=dict(required=False, default=None),
-        filters=dict(required=False, type='dict', default=None),
+    argument_spec = dict(
+        name=dict(required=False),
+        domain=dict(required=False),
+        filters=dict(required=False, type='dict'),
+    )
+    module_kwargs = dict(
+        supports_check_mode=True
    )

-    module = AnsibleModule(argument_spec)
-    is_old_facts = module._name == 'openstack.cloud.project_facts'
-    if is_old_facts:
-        module.deprecate("The 'openstack.cloud.project_facts' module has been renamed to 'openstack.cloud.project_info', "
-                         "and the renamed one no longer returns ansible_facts", version='2.13')
-
-    sdk, opcloud = openstack_cloud_from_module(module)
-    try:
-        name = module.params['name']
-        domain = module.params['domain']
-        filters = module.params['filters']
+    def run(self):
+        name = self.params['name']
+        domain = self.params['domain']
+        filters = self.params['filters']
+        is_old_facts = self.module_name == 'openstack.cloud.project_facts'

        if domain:
            try:
                # We assume admin is passing domain id
-                dom = opcloud.get_domain(domain)['id']
+                dom = self.conn.get_domain(domain)['id']
                domain = dom
            except Exception:
                # If we fail, maybe admin is passing a domain name.
                # Note that domains have unique names, just like id.
-                dom = opcloud.search_domains(filters={'name': domain})
+                dom = self.conn.search_domains(filters={'name': domain})
                if dom:
                    domain = dom[0]['id']
                else:
-                    module.fail_json(msg='Domain name or ID does not exist')
+                    self.fail_json(msg='Domain name or ID does not exist')

            if not filters:
                filters = {}

            filters['domain_id'] = domain

-        projects = opcloud.search_projects(name, filters)
+        projects = self.conn.search_projects(name, filters)
        if is_old_facts:
-            module.exit_json(changed=False, ansible_facts=dict(
+            self.exit_json(changed=False, ansible_facts=dict(
                openstack_projects=projects))
        else:
-            module.exit_json(changed=False, openstack_projects=projects)
+            self.exit_json(changed=False, openstack_projects=projects)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityProjectInfoModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/quota.py
+++ b/plugins/modules/quota.py
@@ -69,6 +69,9 @@ options:
    loadbalancer:
        description: Number of load balancers to allow.
        type: int
+    metadata_items:
+       description: Number of metadata items allowed per instance.
+       type: int
    network:
        description: Number of networks to allow.
        type: int
@@ -125,7 +128,7 @@ options:
    volumes_types:
        description:
            - Per-driver volume count quotas.  Keys should be
-              prefixed with C(gigabytes_) values should be ints.
+              prefixed with C(volumes_) values should be ints.
        type: dict
    project:
        description: Unused, kept for compatability
@@ -183,6 +186,7 @@ EXAMPLES = '''
    instances: "{{ item.instances }}"
    key_pairs: "{{ item.key_pairs }}"
    loadbalancer: "{{ item.loadbalancer }}"
+    metadata_items: "{{ item.metadata_items }}"
    per_volume_gigabytes: "{{ item.per_volume_gigabytes }}"
    pool: "{{ item.pool }}"
    port: "{{ item.port }}"
@@ -256,117 +260,11 @@ openstack_quotas:

 '''

-import traceback
-
-KEYSTONEAUTH1_IMP_ERR = None
-try:
-    from keystoneauth1 import exceptions as ksa_exceptions
-    HAS_KEYSTONEAUTH1 = True
-except ImportError:
-    KEYSTONEAUTH1_IMP_ERR = traceback.format_exc()
-    HAS_KEYSTONEAUTH1 = False
-
-from ansible.module_utils.basic import AnsibleModule, missing_required_lib
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (
-    openstack_full_argument_spec,
-    openstack_cloud_from_module,
-)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _get_volume_quotas(cloud, project):
-
-    return cloud.get_volume_quotas(project)
-
-
-def _get_network_quotas(cloud, project):
-
-    return cloud.get_network_quotas(project)
-
-
-def _get_compute_quotas(cloud, project):
-
-    return cloud.get_compute_quotas(project)
-
-
-def _get_quotas(sdk, module, cloud, project):
-
-    quota = {}
-    try:
-        quota['volume'] = _get_volume_quotas(cloud, project)
-    except ksa_exceptions.EndpointNotFound:
-        module.warn("No public endpoint for volumev2 service was found. Ignoring volume quotas.")
-
-    try:
-        quota['network'] = _get_network_quotas(cloud, project)
-    except ksa_exceptions.EndpointNotFound:
-        module.warn("No public endpoint for network service was found. Ignoring network quotas.")
-
-    quota['compute'] = _get_compute_quotas(cloud, project)
-
-    for quota_type in quota.keys():
-        quota[quota_type] = _scrub_results(quota[quota_type])
-
-    return quota
-
-
-def _scrub_results(quota):
-
-    filter_attr = [
-        'HUMAN_ID',
-        'NAME_ATTR',
-        'human_id',
-        'request_ids',
-        'x_openstack_request_ids',
-    ]
-
-    for attr in filter_attr:
-        if attr in quota:
-            del quota[attr]
-
-    return quota
-
-
-def _system_state_change_details(module, project_quota_output):
-
-    quota_change_request = {}
-    changes_required = False
-
-    for quota_type in project_quota_output.keys():
-        for quota_option in project_quota_output[quota_type].keys():
-            if quota_option in module.params and module.params[quota_option] is not None:
-                if project_quota_output[quota_type][quota_option] != module.params[quota_option]:
-                    changes_required = True
-
-                    if quota_type not in quota_change_request:
-                        quota_change_request[quota_type] = {}
-
-                    quota_change_request[quota_type][quota_option] = module.params[quota_option]
-
-    return (changes_required, quota_change_request)
-
-
-def _system_state_change(module, project_quota_output):
-    """
-    Determine if changes are required to the current project quota.
-
-    This is done by comparing the current project_quota_output against
-    the desired quota settings set on the module params.
-    """
-
-    changes_required, quota_change_request = _system_state_change_details(
-        module,
-        project_quota_output
-    )
-
-    if changes_required:
-        return True
-    else:
-        return False
-
-
-def main():
-
-    argument_spec = openstack_full_argument_spec(
+class QuotaModule(OpenStackModule):
+    argument_spec = dict(
        name=dict(required=True),
        state=dict(default='present', choices=['absent', 'present']),
        backup_gigabytes=dict(required=False, type='int', default=None),
@@ -381,8 +279,9 @@ def main():
        injected_files=dict(required=False, type='int', default=None),
        injected_path_size=dict(required=False, type='int', default=None),
        instances=dict(required=False, type='int', default=None),
-        key_pairs=dict(required=False, type='int', default=None),
+        key_pairs=dict(required=False, type='int', default=None, no_log=False),
        loadbalancer=dict(required=False, type='int', default=None),
+        metadata_items=dict(required=False, type='int', default=None),
        network=dict(required=False, type='int', default=None),
        per_volume_gigabytes=dict(required=False, type='int', default=None),
        pool=dict(required=False, type='int', default=None),
@@ -404,16 +303,89 @@ def main():
        volumes_types=dict(required=False, type='dict', default={})
    )

-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True
-                           )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

-    if not HAS_KEYSTONEAUTH1:
-        module.fail_json(msg=missing_required_lib("keystoneauth1"), exception=KEYSTONEAUTH1_IMP_ERR)
+    def _get_volume_quotas(self, project):
+        return self.conn.get_volume_quotas(project)

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
-        cloud_params = dict(module.params)
+    def _get_network_quotas(self, project):
+        return self.conn.get_network_quotas(project)
+
+    def _get_compute_quotas(self, project):
+        return self.conn.get_compute_quotas(project)
+
+    def _get_quotas(self, project):
+        quota = {}
+        try:
+            quota['volume'] = self._get_volume_quotas(project)
+        except Exception:
+            self.warn("No public endpoint for volumev2 service was found. Ignoring volume quotas.")
+
+        try:
+            quota['network'] = self._get_network_quotas(project)
+        except Exception:
+            self.warn("No public endpoint for network service was found. Ignoring network quotas.")
+
+        quota['compute'] = self._get_compute_quotas(project)
+
+        for quota_type in quota.keys():
+            quota[quota_type] = self._scrub_results(quota[quota_type])
+
+        return quota
+
+    def _scrub_results(self, quota):
+        filter_attr = [
+            'HUMAN_ID',
+            'NAME_ATTR',
+            'human_id',
+            'request_ids',
+            'x_openstack_request_ids',
+        ]
+
+        for attr in filter_attr:
+            if attr in quota:
+                del quota[attr]
+
+        return quota
+
+    def _system_state_change_details(self, project_quota_output):
+        quota_change_request = {}
+        changes_required = False
+
+        for quota_type in project_quota_output.keys():
+            for quota_option in project_quota_output[quota_type].keys():
+                if quota_option in self.params and self.params[quota_option] is not None:
+                    if project_quota_output[quota_type][quota_option] != self.params[quota_option]:
+                        changes_required = True
+
+                        if quota_type not in quota_change_request:
+                            quota_change_request[quota_type] = {}
+
+                        quota_change_request[quota_type][quota_option] = self.params[quota_option]
+
+        return (changes_required, quota_change_request)
+
+    def _system_state_change(self, project_quota_output):
+        """
+        Determine if changes are required to the current project quota.
+
+        This is done by comparing the current project_quota_output against
+        the desired quota settings set on the module params.
+        """
+
+        changes_required, quota_change_request = self._system_state_change_details(
+            project_quota_output
+        )
+
+        if changes_required:
+            return True
+        else:
+            return False
+
+    def run(self):
+        cloud_params = dict(self.params)

        # In order to handle the different volume types we update module params after.
        dynamic_types = [
@@ -423,20 +395,19 @@ def main():
        ]

        for dynamic_type in dynamic_types:
-            for k, v in module.params[dynamic_type].items():
-                module.params[k] = int(v)
+            for k, v in self.params[dynamic_type].items():
+                self.params[k] = int(v)

        # Get current quota values
-        project_quota_output = _get_quotas(
-            sdk, module, cloud, cloud_params['name'])
+        project_quota_output = self._get_quotas(cloud_params['name'])
        changes_required = False

-        if module.params['state'] == "absent":
+        if self.params['state'] == "absent":
            # If a quota state is set to absent we should assume there will be changes.
            # The default quota values are not accessible so we can not determine if
            # no changes will occur or not.
-            if module.check_mode:
-                module.exit_json(changed=True)
+            if self.ansible.check_mode:
+                self.exit_json(changed=True)

            # Calling delete_network_quotas when a quota has not been set results
            # in an error, according to the sdk docs it should return the
@@ -447,49 +418,48 @@ def main():
            neutron_msg2 = "could not be found"

            for quota_type in project_quota_output.keys():
-                quota_call = getattr(cloud, 'delete_%s_quotas' % (quota_type))
+                quota_call = getattr(self.conn, 'delete_%s_quotas' % (quota_type))
                try:
                    quota_call(cloud_params['name'])
-                except sdk.exceptions.OpenStackCloudException as e:
+                except Exception as e:
                    error_msg = str(e)
                    if error_msg.find(neutron_msg1) > -1 and error_msg.find(neutron_msg2) > -1:
                        pass
                    else:
-                        module.fail_json(msg=str(e), extra_data=e.extra_data)
+                        self.fail_json(msg=str(e), extra_data=e.extra_data)

-            project_quota_output = _get_quotas(
-                sdk, module, cloud, cloud_params['name'])
+            project_quota_output = self._get_quotas(cloud_params['name'])
            changes_required = True

-        elif module.params['state'] == "present":
-            if module.check_mode:
-                module.exit_json(changed=_system_state_change(module, project_quota_output))
+        elif self.params['state'] == "present":
+            if self.ansible.check_mode:
+                self.exit_json(changed=self._system_state_change(
+                    project_quota_output))

-            changes_required, quota_change_request = _system_state_change_details(
-                module,
+            changes_required, quota_change_request = self._system_state_change_details(
                project_quota_output
            )

            if changes_required:
                for quota_type in quota_change_request.keys():
-                    quota_call = getattr(cloud, 'set_%s_quotas' % (quota_type))
+                    quota_call = getattr(self.conn, 'set_%s_quotas' % (quota_type))
                    quota_call(cloud_params['name'], **quota_change_request[quota_type])

                # Get quota state post changes for validation
-                project_quota_update = _get_quotas(
-                    sdk, module, cloud, cloud_params['name'])
+                project_quota_update = self._get_quotas(cloud_params['name'])

                if project_quota_output == project_quota_update:
-                    module.fail_json(msg='Could not apply quota update')
+                    self.fail_json(msg='Could not apply quota update')

                project_quota_output = project_quota_update

-        module.exit_json(changed=changes_required,
-                         openstack_quotas=project_quota_output
-                         )
+        self.exit_json(
+            changed=changes_required, openstack_quotas=project_quota_output)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e), extra_data=e.extra_data)
+
+def main():
+    module = QuotaModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/recordset.py
+++ b/plugins/modules/recordset.py
@@ -74,6 +74,8 @@ EXAMPLES = '''
    state: present
    zone: example.net.
    name: www.example.net.
+    recordset_type: "a"
+    records: ['10.1.1.1']
    ttl: 7200

 # Delete recordset named "www.example.net."
@@ -120,29 +122,11 @@ recordset:
            sample: ['10.0.0.1']
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _system_state_change(state, records, description, ttl, recordset):
-    if state == 'present':
-        if recordset is None:
-            return True
-        if records is not None and recordset['records'] != records:
-            return True
-        if description is not None and recordset['description'] != description:
-            return True
-        if ttl is not None and recordset['ttl'] != ttl:
-            return True
-    if state == 'absent' and recordset:
-        return True
-    return False
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class DnsRecordsetModule(OpenStackModule):
+    argument_spec = dict(
        zone=dict(required=True),
        name=dict(required=True),
        recordset_type=dict(required=False, choices=['a', 'aaaa', 'mx', 'cname', 'txt', 'ns', 'srv', 'ptr', 'caa']),
@@ -152,85 +136,102 @@ def main():
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs()
-    module = AnsibleModule(argument_spec,
-                           required_if=[
-                               ('state', 'present',
-                                ['recordset_type', 'records'])],
-                           supports_check_mode=True,
-                           **module_kwargs)
+    module_kwargs = dict(
+        required_if=[
+            ('state', 'present',
+             ['recordset_type', 'records'])],
+        supports_check_mode=True
+    )

-    module.module_min_sdk_version = '0.28.0'
-    zone = module.params.get('zone')
-    name = module.params.get('name')
-    state = module.params.get('state')
+    module_min_sdk_version = '0.28.0'

-    sdk, cloud = openstack_cloud_from_module(module)
-    recordsets = cloud.search_recordsets(zone, name_or_id=name)
+    def _system_state_change(self, state, records, description, ttl, recordset):
+        if state == 'present':
+            if recordset is None:
+                return True
+            if records is not None and recordset['records'] != records:
+                return True
+            if description is not None and recordset['description'] != description:
+                return True
+            if ttl is not None and recordset['ttl'] != ttl:
+                return True
+        if state == 'absent' and recordset:
+            return True
+        return False

-    if recordsets:
-        recordset = recordsets[0]
-        try:
-            recordset_id = recordset['id']
-        except KeyError as e:
-            module.fail_json(msg=str(e))
-    else:
-        # recordsets is filtered by type and should never be more than 1 return
-        recordset = None
+    def run(self):
+        zone = self.params.get('zone')
+        name = self.params.get('name')
+        state = self.params.get('state')

-    if state == 'present':
-        recordset_type = module.params.get('recordset_type').upper()
-        records = module.params.get('records')
-        description = module.params.get('description')
-        ttl = module.params.get('ttl')
+        recordsets = self.conn.search_recordsets(zone, name_or_id=name)

-        kwargs = {}
-        if description:
-            kwargs['description'] = description
-        kwargs['records'] = records
+        if recordsets:
+            recordset = recordsets[0]
+            try:
+                recordset_id = recordset['id']
+            except KeyError as e:
+                self.fail_json(msg=str(e))
+        else:
+            # recordsets is filtered by type and should never be more than 1 return
+            recordset = None

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(state,
-                                                          records, description,
-                                                          ttl, recordset))
+        if state == 'present':
+            recordset_type = self.params.get('recordset_type').upper()
+            records = self.params.get('records')
+            description = self.params.get('description')
+            ttl = self.params.get('ttl')

-        if recordset is None:
-            if ttl:
-                kwargs['ttl'] = ttl
+            kwargs = {}
+            if description:
+                kwargs['description'] = description
+            kwargs['records'] = records
+
+            if self.ansible.check_mode:
+                self.exit_json(
+                    changed=self._system_state_change(
+                        state, records, description, ttl, recordset))
+
+            if recordset is None:
+                if ttl:
+                    kwargs['ttl'] = ttl
+                else:
+                    kwargs['ttl'] = 300
+
+                recordset = self.conn.create_recordset(
+                    zone=zone, name=name, recordset_type=recordset_type,
+                    **kwargs)
+                changed = True
            else:
-                kwargs['ttl'] = 300

-            recordset = cloud.create_recordset(
-                zone=zone, name=name, recordset_type=recordset_type,
-                **kwargs)
-            changed = True
-        else:
+                if ttl:
+                    kwargs['ttl'] = ttl

-            if ttl:
-                kwargs['ttl'] = ttl
+                pre_update_recordset = recordset
+                changed = self._system_state_change(
+                    state, records, description, ttl, pre_update_recordset)
+                if changed:
+                    recordset = self.conn.update_recordset(
+                        zone=zone, name_or_id=recordset_id, **kwargs)

-            pre_update_recordset = recordset
-            changed = _system_state_change(state, records,
-                                           description, ttl,
-                                           pre_update_recordset)
-            if changed:
-                recordset = cloud.update_recordset(
-                    zone=zone, name_or_id=recordset_id, **kwargs)
+            self.exit_json(changed=changed, recordset=recordset)

-        module.exit_json(changed=changed, recordset=recordset)
+        elif state == 'absent':
+            if self.ansible.check_mode:
+                self.exit_json(changed=self._system_state_change(
+                    state, None, None, None, recordset))

-    elif state == 'absent':
-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(state,
-                                                          None, None,
-                                                          None, recordset))
+            if recordset is None:
+                changed = False
+            else:
+                self.conn.delete_recordset(zone, recordset_id)
+                changed = True
+            self.exit_json(changed=changed)

-        if recordset is None:
-            changed = False
-        else:
-            cloud.delete_recordset(zone, recordset_id)
-            changed = True
-        module.exit_json(changed=changed)
+
+def main():
+    module = DnsRecordsetModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/role_assignment.py
+++ b/plugins/modules/role_assignment.py
@@ -72,35 +72,11 @@ RETURN = '''
 #
 '''

-from ansible.module_utils.basic import AnsibleModule
-from ansible_collections.openstack.cloud.plugins.module_utils.openstack import (openstack_full_argument_spec,
-                                                                                openstack_module_kwargs,
-                                                                                openstack_cloud_from_module)
+from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule


-def _system_state_change(state, assignment):
-    if state == 'present' and not assignment:
-        return True
-    elif state == 'absent' and assignment:
-        return True
-    return False
-
-
-def _build_kwargs(user, group, project, domain):
-    kwargs = {}
-    if user:
-        kwargs['user'] = user
-    if group:
-        kwargs['group'] = group
-    if project:
-        kwargs['project'] = project
-    if domain:
-        kwargs['domain'] = domain
-    return kwargs
-
-
-def main():
-    argument_spec = openstack_full_argument_spec(
+class IdentityRoleAssignmentModule(OpenStackModule):
+    argument_spec = dict(
        role=dict(required=True),
        user=dict(required=False),
        group=dict(required=False),
@@ -109,92 +85,111 @@ def main():
        state=dict(default='present', choices=['absent', 'present']),
    )

-    module_kwargs = openstack_module_kwargs(
+    module_kwargs = dict(
        required_one_of=[
            ['user', 'group']
-        ])
-    module = AnsibleModule(argument_spec,
-                           supports_check_mode=True,
-                           **module_kwargs)
+        ],
+        supports_check_mode=True
+    )

-    role = module.params.get('role')
-    user = module.params.get('user')
-    group = module.params.get('group')
-    project = module.params.get('project')
-    domain = module.params.get('domain')
-    state = module.params.get('state')
+    def _system_state_change(self, state, assignment):
+        if state == 'present' and not assignment:
+            return True
+        elif state == 'absent' and assignment:
+            return True
+        return False
+
+    def _build_kwargs(self, user, group, project, domain):
+        kwargs = {}
+        if user:
+            kwargs['user'] = user
+        if group:
+            kwargs['group'] = group
+        if project:
+            kwargs['project'] = project
+        if domain:
+            kwargs['domain'] = domain
+        return kwargs
+
+    def run(self):
+        role = self.params.get('role')
+        user = self.params.get('user')
+        group = self.params.get('group')
+        project = self.params.get('project')
+        domain = self.params.get('domain')
+        state = self.params.get('state')

-    sdk, cloud = openstack_cloud_from_module(module)
-    try:
        filters = {}
        domain_id = None

-        r = cloud.get_role(role)
+        r = self.conn.get_role(role)
        if r is None:
-            module.fail_json(msg="Role %s is not valid" % role)
+            self.fail_json(msg="Role %s is not valid" % role)
        filters['role'] = r['id']

        if domain:
-            d = cloud.get_domain(name_or_id=domain)
+            d = self.conn.get_domain(name_or_id=domain)
            if d is None:
-                module.fail_json(msg="Domain %s is not valid" % domain)
+                self.fail_json(msg="Domain %s is not valid" % domain)
            filters['domain'] = d['id']
            domain_id = d['id']
        if user:
            if domain:
-                u = cloud.get_user(user, domain_id=filters['domain'])
+                u = self.conn.get_user(user, domain_id=filters['domain'])
            else:
-                u = cloud.get_user(user)
+                u = self.conn.get_user(user)

            if u is None:
-                module.fail_json(msg="User %s is not valid" % user)
+                self.fail_json(msg="User %s is not valid" % user)
            filters['user'] = u['id']
        if group:
            if domain:
-                g = cloud.get_group(group, domain_id=filters['domain'])
+                g = self.conn.get_group(group, domain_id=filters['domain'])
            else:
-                g = cloud.get_group(group)
+                g = self.conn.get_group(group)
            if g is None:
-                module.fail_json(msg="Group %s is not valid" % group)
+                self.fail_json(msg="Group %s is not valid" % group)
            filters['group'] = g['id']
        if project:
            if domain:
-                p = cloud.get_project(project, domain_id=filters['domain'])
+                p = self.conn.get_project(project, domain_id=filters['domain'])
                # OpenStack won't allow us to use both a domain and project as
                # filter. Once we identified the project (using the domain as
                # a filter criteria), we need to remove the domain itself from
                # the filters list.
                domain_id = filters.pop('domain')
            else:
-                p = cloud.get_project(project)
+                p = self.conn.get_project(project)

            if p is None:
-                module.fail_json(msg="Project %s is not valid" % project)
+                self.fail_json(msg="Project %s is not valid" % project)
            filters['project'] = p['id']

-        assignment = cloud.list_role_assignments(filters=filters)
+        assignment = self.conn.list_role_assignments(filters=filters)

-        if module.check_mode:
-            module.exit_json(changed=_system_state_change(state, assignment))
+        if self.ansible.check_mode:
+            self.exit_json(changed=self._system_state_change(state, assignment))

        changed = False

        if state == 'present':
            if not assignment:
-                kwargs = _build_kwargs(user, group, project, domain_id)
-                cloud.grant_role(role, **kwargs)
+                kwargs = self._build_kwargs(user, group, project, domain_id)
+                self.conn.grant_role(role, **kwargs)
                changed = True

        elif state == 'absent':
            if assignment:
-                kwargs = _build_kwargs(user, group, project, domain_id)
-                cloud.revoke_role(role, **kwargs)
+                kwargs = self._build_kwargs(user, group, project, domain_id)
+                self.conn.revoke_role(role, **kwargs)
                changed = True

-        module.exit_json(changed=changed)
+        self.exit_json(changed=changed)

-    except sdk.exceptions.OpenStackCloudException as e:
-        module.fail_json(msg=str(e))
+
+def main():
+    module = IdentityRoleAssignmentModule()
+    module()


 if __name__ == '__main__':
--- a/plugins/modules/router.py
+++ b/plugins/modules/router.py
@@ -211,13 +211,7 @@ router:
 '''

 from ansible_collections.openstack.cloud.plugins.module_utils.openstack import OpenStackModule
-
-
-ROUTER_INTERFACE_OWNERS = set([
-    'network:router_interface',
-    'network:router_interface_distributed',
-    'network:ha_router_replicated_interface'
-])
+import itertools


 class RouterModule(OpenStackModule):
@@ -232,14 +226,17 @@ class RouterModule(OpenStackModule):
        project=dict(default=None)
    )

-    def _router_internal_interfaces(self, router):
-        for port in self.conn.list_router_interfaces(router, 'internal'):
-            if port['device_owner'] in ROUTER_INTERFACE_OWNERS:
-                yield port
+    def _get_subnet_ids_from_ports(self, ports):
+        return [fixed_ip['subnet_id'] for fixed_ip in
+                itertools.chain.from_iterable(port['fixed_ips'] for port in ports if 'fixed_ips' in port)]

-    def _needs_update(self, router, network, internal_subnet_ids, internal_port_ids, filters=None):
-        """Decide if the given router needs an update.
-        """
+    def _needs_update(self, router, net,
+                      missing_port_ids,
+                      requested_subnet_ids,
+                      existing_subnet_ids,
+                      router_ifs_cfg,
+                      filters=None):
+        """Decide if the given router needs an update."""
        if router['admin_state_up'] != self.params['admin_state_up']:
            return True
        if router['external_gateway_info']:
@@ -247,68 +244,76 @@ class RouterModule(OpenStackModule):
            if self.params['enable_snat'] is not None:
                if router['external_gateway_info'].get('enable_snat', True) != self.params['enable_snat']:
                    return True
-        if network:
+        if net:
            if not router['external_gateway_info']:
                return True
-            elif router['external_gateway_info']['network_id'] != network['id']:
+            elif router['external_gateway_info']['network_id'] != net['id']:
                return True

-        # check external interfaces
-        if self.params['external_fixed_ips']:
-            for new_iface in self.params['external_fixed_ips']:
-                subnet = self.conn.get_subnet(new_iface['subnet'], filters)
-                exists = False
+        # check if external_fixed_ip has to be added
+        for external_fixed_ip in router_ifs_cfg['external_fixed_ips']:
+            exists = False

-                # compare the requested interface with existing, looking for an existing match
-                for existing_iface in router['external_gateway_info']['external_fixed_ips']:
-                    if existing_iface['subnet_id'] == subnet['id']:
-                        if 'ip' in new_iface:
-                            if existing_iface['ip_address'] == new_iface['ip']:
+            # compare the requested interface with existing, looking for an existing match
+            for existing_if in router['external_gateway_info']['external_fixed_ips']:
+                if existing_if['subnet_id'] == external_fixed_ip['subnet_id']:
+                    if 'ip' in external_fixed_ip:
+                        if existing_if['ip_address'] == external_fixed_ip['ip']:
+                            # both subnet id and ip address match
+                            exists = True
+                            break
+                    else:
+                        # only the subnet was given, so ip doesn't matter
+                        exists = True
+                        break
+
+            # this interface isn't present on the existing router
+            if not exists:
+                return True
+
+        # check if external_fixed_ip has to be removed
+        if router_ifs_cfg['external_fixed_ips']:
+            for external_fixed_ip in router['external_gateway_info']['external_fixed_ips']:
+                obsolete = True
+
+                # compare the existing interface with requested, looking for an requested match
+                for requested_if in router_ifs_cfg['external_fixed_ips']:
+                    if external_fixed_ip['subnet_id'] == requested_if['subnet_id']:
+                        if 'ip' in requested_if:
+                            if external_fixed_ip['ip_address'] == requested_if['ip']:
                                # both subnet id and ip address match
-                                exists = True
+                                obsolete = False
                                break
                        else:
                            # only the subnet was given, so ip doesn't matter
-                            exists = True
+                            obsolete = False
                            break

                # this interface isn't present on the existing router
-                if not exists:
+                if obsolete:
                    return True
-
-        # check internal interfaces
-        if self.params['interfaces']:
-            existing_subnet_ids = []
-            for port in self._router_internal_interfaces(router):
-                if 'fixed_ips' in port:
-                    for fixed_ip in port['fixed_ips']:
-                        existing_subnet_ids.append(fixed_ip['subnet_id'])
-
-            for iface in self.params['interfaces']:
-                if isinstance(iface, dict):
-                    for p_id in internal_port_ids:
-                        p = self.conn.get_port(name_or_id=p_id)
-                        if 'fixed_ips' in p:
-                            for fip in p['fixed_ips']:
-                                internal_subnet_ids.append(fip['subnet_id'])
-
-            if set(internal_subnet_ids) != set(existing_subnet_ids):
+        else:
+            # no external fixed ips requested
+            if router['external_gateway_info'] \
+               and router['external_gateway_info']['external_fixed_ips'] \
+               and len(router['external_gateway_info']['external_fixed_ips']) > 1:
+                # but router has several external fixed ips
                return True

-        return False
-
-    def _system_state_change(self, router, network, internal_ids, internal_portids, filters=None):
-        """Check if the system state would be changed."""
-        state = self.params['state']
-        if state == 'absent' and router:
+        # check if internal port has to be added
+        if router_ifs_cfg['internal_ports_missing']:
            return True
-        if state == 'present':
-            if not router:
-                return True
-            return self._needs_update(router, network, internal_ids, internal_portids, filters)
+
+        if missing_port_ids:
+            return True
+
+        # check if internal subnet has to be added or removed
+        if set(requested_subnet_ids) != set(existing_subnet_ids):
+            return True
+
        return False

-    def _build_kwargs(self, router, network):
+    def _build_kwargs(self, router, net):
        kwargs = {
            'admin_state_up': self.params['admin_state_up'],
        }
@@ -318,8 +323,8 @@ class RouterModule(OpenStackModule):
        else:
            kwargs['name'] = self.params['name']

-        if network:
-            kwargs['ext_gateway_net_id'] = network['id']
+        if net:
+            kwargs['ext_gateway_net_id'] = net['id']
            # can't send enable_snat unless we have a network
            if self.params.get('enable_snat') is not None:
                kwargs['enable_snat'] = self.params['enable_snat']
@@ -332,56 +337,83 @@ class RouterModule(OpenStackModule):
                if 'ip' in iface:
                    d['ip_address'] = iface['ip']
                kwargs['ext_fixed_ips'].append(d)
+        else:
+            # no external fixed ips requested
+            if router \
+               and router['external_gateway_info'] \
+               and router['external_gateway_info']['external_fixed_ips'] \
+               and len(router['external_gateway_info']['external_fixed_ips']) > 1:
+                # but router has several external fixed ips
+                # keep first external fixed ip only
+                fip = router['external_gateway_info']['external_fixed_ips'][0]
+                kwargs['ext_fixed_ips'] = [fip]

        return kwargs

-    def _validate_subnets(self, filters=None):
-        external_subnet_ids = []
-        internal_subnet_ids = []
-        internal_port_ids = []
-        existing_port_ips = []
+    def _build_router_interface_config(self, filters=None):
+        external_fixed_ips = []
+        internal_subnets = []
+        internal_ports = []
+        internal_ports_missing = []
+
+        # Build external interface configuration
        if self.params['external_fixed_ips']:
            for iface in self.params['external_fixed_ips']:
-                subnet = self.conn.get_subnet(iface['subnet'])
+                subnet = self.conn.get_subnet(iface['subnet'], filters)
                if not subnet:
-                    self.fail_json(msg='subnet %s not found' % iface['subnet'])
-                external_subnet_ids.append(subnet['id'])
+                    self.fail(msg='subnet %s not found' % iface['subnet'])
+                new_external_fixed_ip = {'subnet_name': subnet.name, 'subnet_id': subnet.id}
+                if 'ip' in iface:
+                    new_external_fixed_ip['ip'] = iface['ip']
+                external_fixed_ips.append(new_external_fixed_ip)

+        # Build internal interface configuration
        if self.params['interfaces']:
+            internal_ips = []
            for iface in self.params['interfaces']:
                if isinstance(iface, str):
                    subnet = self.conn.get_subnet(iface, filters)
                    if not subnet:
                        self.fail(msg='subnet %s not found' % iface)
-                    internal_subnet_ids.append(subnet['id'])
+                    internal_subnets.append(subnet)
+
                elif isinstance(iface, dict):
                    subnet = self.conn.get_subnet(iface['subnet'], filters)
                    if not subnet:
                        self.fail(msg='subnet %s not found' % iface['subnet'])
+
                    net = self.conn.get_network(iface['net'])
                    if not net:
                        self.fail(msg='net %s not found' % iface['net'])
+
                    if "portip" not in iface:
-                        internal_subnet_ids.append(subnet['id'])
+                        # portip not set, add any ip from subnet
+                        internal_subnets.append(subnet)
                    elif not iface['portip']:
-                        self.fail(msg='put an ip in portip or  remove it from list to assign default port to router')
+                        # portip is set but has invalid value
+                        self.fail(msg='put an ip in portip or remove it from list to assign default port to router')
                    else:
+                        # portip has valid value
+                        # look for ports whose fixed_ips.ip_address matchs portip
                        for existing_port in self.conn.list_ports(filters={'network_id': net.id}):
                            for fixed_ip in existing_port['fixed_ips']:
                                if iface['portip'] == fixed_ip['ip_address']:
-                                    internal_port_ids.append(existing_port.id)
-                                    existing_port_ips.append(fixed_ip['ip_address'])
-                        if iface['portip'] not in existing_port_ips:
-                            p = self.conn.create_port(network_id=net.id, fixed_ips=[
-                                {
-                                    'ip_address': iface['portip'],
-                                    'subnet_id': subnet.id
-                                }
-                            ])
-                            if p:
-                                internal_port_ids.append(p.id)
+                                    # portip exists in net already
+                                    internal_ports.append(existing_port)
+                                    internal_ips.append(fixed_ip['ip_address'])
+                        if iface['portip'] not in internal_ips:
+                            # no port with portip exists hence create a new port
+                            internal_ports_missing.append({
+                                'network_id': net.id,
+                                'fixed_ips': [{'ip_address': iface['portip'], 'subnet_id': subnet.id}]
+                            })

-        return external_subnet_ids, internal_subnet_ids, internal_port_ids
+        return {
+            'external_fixed_ips': external_fixed_ips,
+            'internal_subnets': internal_subnets,
+            'internal_ports': internal_ports,
+            'internal_ports_missing': internal_ports_missing
+        }

    def run(self):

@@ -391,7 +423,7 @@ class RouterModule(OpenStackModule):
        project = self.params['project']

        if self.params['external_fixed_ips'] and not network:
-            self.fail_json(msg='network is required when supplying external_fixed_ips')
+            self.fail(msg='network is required when supplying external_fixed_ips')

        if project is not None:
            proj = self.conn.get_project(project)
@@ -412,67 +444,125 @@ class RouterModule(OpenStackModule):

        # Validate and cache the subnet IDs so we can avoid duplicate checks
        # and expensive API calls.
-        external_ids, subnet_internal_ids, internal_portids = self._validate_subnets(filters)
+        router_ifs_cfg = self._build_router_interface_config(filters)
+        requested_subnet_ids = [subnet.id for subnet in router_ifs_cfg['internal_subnets']] + \
+            self._get_subnet_ids_from_ports(router_ifs_cfg['internal_ports'])
+        requested_port_ids = [i['id'] for i in router_ifs_cfg['internal_ports']]
+
+        if router:
+            router_ifs_internal = self.conn.list_router_interfaces(router, 'internal')
+            existing_subnet_ids = self._get_subnet_ids_from_ports(router_ifs_internal)
+            obsolete_subnet_ids = set(existing_subnet_ids) - set(requested_subnet_ids)
+            existing_port_ids = [i['id'] for i in router_ifs_internal]
+
+        else:
+            router_ifs_internal = []
+            existing_subnet_ids = []
+            obsolete_subnet_ids = []
+            existing_port_ids = []
+
+        missing_port_ids = set(requested_port_ids) - set(existing_port_ids)
+
        if self.ansible.check_mode:
-            self.exit_json(
-                changed=self._system_state_change(router, net, subnet_internal_ids, internal_portids, filters)
-            )
+            # Check if the system state would be changed
+            if state == 'absent' and router:
+                changed = True
+            elif state == 'absent' and not router:
+                changed = False
+            elif state == 'present' and not router:
+                changed = True
+            else:  # if state == 'present' and router
+                changed = self._needs_update(router, net,
+                                             missing_port_ids,
+                                             requested_subnet_ids,
+                                             existing_subnet_ids,
+                                             router_ifs_cfg,
+                                             filters)
+            self.exit_json(changed=changed)

        if state == 'present':
            changed = False

            if not router:
+                changed = True
+
                kwargs = self._build_kwargs(router, net)
                if project_id:
                    kwargs['project_id'] = project_id
                router = self.conn.create_router(**kwargs)
-                for int_s_id in subnet_internal_ids:
-                    self.conn.add_router_interface(router, subnet_id=int_s_id)
-                # add interface by port id as well
-                for int_p_id in internal_portids:
-                    self.conn.add_router_interface(router, port_id=int_p_id)
-                changed = True
+
+                # add interface by subnet id, because user did not specify a port id
+                for subnet in router_ifs_cfg['internal_subnets']:
+                    self.conn.add_router_interface(router, subnet_id=subnet.id)
+
+                # add interface by port id if user did specify a valid port id
+                for port in router_ifs_cfg['internal_ports']:
+                    self.conn.add_router_interface(router, port_id=port.id)
+
+                # add port and interface if user did specify an ip address but port is missing yet
+                for missing_internal_port in router_ifs_cfg['internal_ports_missing']:
+                    p = self.conn.create_port(**missing_internal_port)
+                    if p:
+                        self.conn.add_router_interface(router, port_id=p.id)
+
            else:
-                if self._needs_update(router, net, subnet_internal_ids, internal_portids, filters):
+                if self._needs_update(router, net,
+                                      missing_port_ids,
+                                      requested_subnet_ids,
+                                      existing_subnet_ids,
+                                      router_ifs_cfg,
+                                      filters):
+                    changed = True
                    kwargs = self._build_kwargs(router, net)
                    updated_router = self.conn.update_router(**kwargs)

-                    # Protect against update_router() not actually
-                    # updating the router.
+                    # Protect against update_router() not actually updating the router.
                    if not updated_router:
                        changed = False
-
-                    # On a router update, if any internal interfaces were supplied,
-                    # just detach all existing internal interfaces and attach the new.
-                    if internal_portids or subnet_internal_ids:
+                    else:
                        router = updated_router
-                        ports = self._router_internal_interfaces(router)
-                        for port in ports:
-                            self.conn.remove_router_interface(router, port_id=port['id'])
-                    if internal_portids:
-                        external_ids, subnet_internal_ids, internal_portids = self._validate_subnets(filters)
-                        for int_p_id in internal_portids:
-                            self.conn.add_router_interface(router, port_id=int_p_id)
-                        changed = True
-                    if subnet_internal_ids:
-                        for s_id in subnet_internal_ids:
-                            self.conn.add_router_interface(router, subnet_id=s_id)
+
+                    # delete internal subnets i.e. ports
+                    if obsolete_subnet_ids:
+                        for port in router_ifs_internal:
+                            if 'fixed_ips' in port:
+                                for fip in port['fixed_ips']:
+                                    if fip['subnet_id'] in obsolete_subnet_ids:
+                                        self.conn.remove_router_interface(router, port_id=port['id'])
+                                        changed = True
+
+                    # add new internal interface by subnet id, because user did not specify a port id
+                    for subnet in router_ifs_cfg['internal_subnets']:
+                        if subnet.id not in existing_subnet_ids:
+                            self.conn.add_router_interface(router, subnet_id=subnet.id)
+                            changed = True
+
+                    # add new internal interface by port id if user did specify a valid port id
+                    for port_id in missing_port_ids:
+                        self.conn.add_router_interface(router, port_id=port_id)
                        changed = True

-            self.exit(changed=changed, router=router, id=router['id'])
+                    # add new port and new internal interface if user did specify an ip address but port is missing yet
+                    for missing_internal_port in router_ifs_cfg['internal_ports_missing']:
+                        p = self.conn.create_port(**missing_internal_port)
+                        if p:
+                            self.conn.add_router_interface(router, port_id=p.id)
+                            changed = True
+
+            self.exit_json(changed=changed, router=router)

        elif state == 'absent':
            if not router:
-                self.exit(changed=False)
+                self.exit_json(changed=False)
            else:
-                # We need to detach all internal interfaces on a router before
-                # we will be allowed to delete it.
-                ports = self._router_internal_interfaces(router)
-                router_id = router['id']
-                for port in ports:
+                # We need to detach all internal interfaces on a router
+                # before we will be allowed to delete it. Deletion can
+                # still fail if e.g. floating ips are attached to the
+                # router.
+                for port in router_ifs_internal:
                    self.conn.remove_router_interface(router, port_id=port['id'])
-                self.conn.delete_router(router_id)
-                self.exit_json(changed=True)
+                self.conn.delete_router(router['id'])
+                self.exit_json(changed=True, router=router)


 def main():
--- a/plugins/modules/routers_info.py
+++ b/plugins/modules/routers_info.py
@@ -155,6 +155,9 @@ class RouterInfoModule(OpenStackModule):
        name=dict(required=False, default=None),
        filters=dict(required=False, type='dict', default=None)
    )
+    module_kwargs = dict(
+        supports_check_mode=True
+    )

    def run(self):

--- a/Show More
+++ b/Show More