From cf5d03580db15ac257f8798f87095f3a1c783ef2 Mon Sep 17 00:00:00 2001
From: Fernando Giorgetti <fgiorgetti@users.noreply.github.com>
Date: Wed, 9 Aug 2023 11:13:12 -0300
Subject: [PATCH] Services module (#23)

---
 .github/workflows/pulls.yml                   |  17 +-
 .gitignore                                    |   2 +
 Makefile                                      |   6 +
 docs/_static/antsibull-minimal.css            |   2 +-
 docs/collections/index_module.html            |   2 +
 docs/collections/skupper/network/index.html   |   4 +-
 .../skupper/network/links_load_module.html    |   6 +-
 .../skupper/network/links_module.html         |   2 +-
 .../skupper/network/services_load_module.html | 235 +++++++++
 .../skupper/network/services_module.html      | 214 ++++++++
 .../skupper/network/site_load_module.html     |   6 +-
 docs/objects.inv                              | Bin 790 -> 891 bytes
 docs/searchindex.js                           |   2 +-
 skupper/network/docs/conf.py                  |   1 -
 .../docs/rst/collections/index_module.rst     |   2 +
 .../rst/collections/skupper/network/index.rst |   6 +-
 .../skupper/network/links_load_module.rst     |   2 +-
 .../skupper/network/links_module.rst          |   2 +-
 .../skupper/network/services_load_module.rst  | 203 +++++++
 .../skupper/network/services_module.rst       | 146 ++++++
 .../skupper/network/site_load_module.rst      |   2 +-
 skupper/network/galaxy.yml                    |   2 +-
 skupper/network/plugins/action/__init__.py    |  37 ++
 skupper/network/plugins/action/links.py       |   2 +-
 skupper/network/plugins/action/links_load.py  |   4 +-
 skupper/network/plugins/action/services.py    | 159 ++++++
 .../network/plugins/action/services_load.py   |  16 +
 skupper/network/plugins/action/site_load.py   |   2 +-
 .../network/plugins/doc_fragments/common.py   |  42 ++
 skupper/network/plugins/module_utils/args.py  |   6 +
 .../plugins/module_utils/base_action.py       |  37 --
 skupper/network/plugins/module_utils/sites.py |   6 +
 .../plugins/module_utils/skupper_cli.py       |   6 +
 skupper/network/plugins/module_utils/types.py |  55 ++
 skupper/network/plugins/modules/links.py      | 118 +++--
 skupper/network/plugins/modules/links_load.py |  85 ++-
 skupper/network/plugins/modules/services.py   | 380 ++++++++++++++
 .../network/plugins/modules/services_load.py  | 252 +++++++++
 skupper/network/plugins/modules/site_load.py  |  48 +-
 .../network/roles/skupper_service/README.md   |  20 +-
 .../roles/skupper_service/defaults/main.yml   |  26 +-
 .../skupper_service/tasks/common-validate.yml |  42 --
 .../roles/skupper_service/tasks/execute.yml   |  13 -
 .../tasks/kube-command-bind.yml               |  26 -
 .../tasks/kube-command-create.yml             |  26 -
 .../tasks/kube-command-label.yml              |  33 --
 .../skupper_service/tasks/kube-commands.yml   |  14 -
 .../skupper_service/tasks/kube-validate.yml   |   9 -
 .../roles/skupper_service/tasks/main.yml      |   9 +-
 .../tasks/podman-command-bind.yml             |  11 -
 .../tasks/podman-command-create.yml           |  37 --
 .../skupper_service/tasks/podman-commands.yml |   9 -
 .../skupper_service/tasks/podman-validate.yml |   9 -
 .../skupper_service/tasks/service-bind.yml    |  22 -
 .../skupper_service/tasks/service-create.yml  |  34 --
 ...r.network.plugins.action.site_load_1.stats | Bin 0 -> 2017 bytes
 ...twork.plugins.doc_fragments.common_1.stats | Bin 0 -> 2171 bytes
 ...network.plugins.module_utils.types_1.stats | Bin 0 -> 1406 bytes
 ....network.plugins.modules.site_load_1.stats | Bin 0 -> 1885 bytes
 ...k.tests.unit.plugins.modules.utils_1.stats | Bin 0 -> 1693 bytes
 .../bot/ansible-test-sanity-ansible-doc.json  |  10 +
 ...sible-test-sanity-compile-python-3.11.json |  10 +
 ...nsible-test-sanity-import-python-3.11.json |  14 +
 .../output/bot/ansible-test-sanity-pep8.json  |  15 +
 .../bot/ansible-test-sanity-pylint.json       |  15 +
 .../bot/ansible-test-sanity-shebang.json      |  10 +
 .../ansible-test-sanity-validate-modules.json |  15 +
 .../output/junit/python3.11-modules-units.xml |   1 +
 .../unit/plugins/modules/test_links_load.py   | 222 ++++++++
 .../plugins/modules/test_services_load.py     | 495 ++++++++++++++++++
 .../unit/plugins/modules/test_site_load.py    | 108 ++++
 .../tests/unit/plugins/modules/utils.py       |  41 ++
 skupper/network/tests/unit/requirements.txt   |   3 +
 73 files changed, 2979 insertions(+), 439 deletions(-)
 create mode 100644 docs/collections/skupper/network/services_load_module.html
 create mode 100644 docs/collections/skupper/network/services_module.html
 create mode 100644 skupper/network/docs/rst/collections/skupper/network/services_load_module.rst
 create mode 100644 skupper/network/docs/rst/collections/skupper/network/services_module.rst
 create mode 100644 skupper/network/plugins/action/services.py
 create mode 100644 skupper/network/plugins/action/services_load.py
 create mode 100644 skupper/network/plugins/doc_fragments/common.py
 delete mode 100644 skupper/network/plugins/module_utils/base_action.py
 create mode 100644 skupper/network/plugins/modules/services.py
 create mode 100644 skupper/network/plugins/modules/services_load.py
 delete mode 100644 skupper/network/roles/skupper_service/tasks/common-validate.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/execute.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/kube-command-bind.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/kube-command-create.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/kube-command-label.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/kube-commands.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/kube-validate.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/podman-command-bind.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/podman-command-create.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/podman-commands.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/podman-validate.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/service-bind.yml
 delete mode 100644 skupper/network/roles/skupper_service/tasks/service-create.yml
 create mode 100644 skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.action.site_load_1.stats
 create mode 100644 skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.doc_fragments.common_1.stats
 create mode 100644 skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.module_utils.types_1.stats
 create mode 100644 skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.modules.site_load_1.stats
 create mode 100644 skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.tests.unit.plugins.modules.utils_1.stats
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-ansible-doc.json
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-compile-python-3.11.json
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-import-python-3.11.json
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-pep8.json
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-pylint.json
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-shebang.json
 create mode 100644 skupper/network/tests/output/bot/ansible-test-sanity-validate-modules.json
 create mode 100644 skupper/network/tests/output/junit/python3.11-modules-units.xml
 create mode 100644 skupper/network/tests/unit/plugins/modules/test_links_load.py
 create mode 100644 skupper/network/tests/unit/plugins/modules/test_services_load.py
 create mode 100644 skupper/network/tests/unit/plugins/modules/test_site_load.py
 create mode 100644 skupper/network/tests/unit/plugins/modules/utils.py
 create mode 100644 skupper/network/tests/unit/requirements.txt

diff --git a/.github/workflows/pulls.yml b/.github/workflows/pulls.yml
index 5af1e8c..70b731b 100644
--- a/.github/workflows/pulls.yml
+++ b/.github/workflows/pulls.yml
@@ -7,9 +7,20 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
+        with:
+          path: ./ansible_collections
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
+        with:
+          cache: 'pip'
       - name: Install ansible, ansible-lint, yamllint
-        run: pip3 install yamllint ansible ansible-lint
+        run: pip3 install yamllint ansible ansible-lint virtualenv
       - name: Run ansible-lint
-        run: make ansible-lint
+        run: cd ansible_collections && make ansible-lint
+      - name: Run sanity tests
+        run: cd ansible_collections && make sanity-tests
+      - name: Run unit tests
+        run: |
+          cd ansible_collections
+          pip3 install -r ./skupper/network/tests/unit/requirements.txt
+          make unit-tests
diff --git a/.gitignore b/.gitignore
index 3c675d8..557863c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
 *.tar.gz
 skupper/network/docs/build
 skupper/network/docs/temp-rst
+skupper/network/tests/output
+__pycache__/
diff --git a/Makefile b/Makefile
index d62e986..129ba09 100644
--- a/Makefile
+++ b/Makefile
@@ -23,3 +23,9 @@ clean:
 install:
 	@[[ -f "$(TARBALL)" ]] && true || (echo "Collection has not been built" && false)
 	@ansible-galaxy collection install -f "$(TARBALL)"
+
+sanity-tests:
+	cd skupper/network && ansible-test sanity -v --color
+
+unit-tests:
+	cd skupper/network && ansible-test units -vvv --color
diff --git a/docs/_static/antsibull-minimal.css b/docs/_static/antsibull-minimal.css
index f07c2b2..ebc82d8 100644
--- a/docs/_static/antsibull-minimal.css
+++ b/docs/_static/antsibull-minimal.css
@@ -1,3 +1,3 @@
 @charset "UTF-8";
 /* Copyright (c) Ansible and contributors */
-/* GNU General Public License v3.0+ (see https://www.gnu.org/licenses/gpl-3.0.txt) */.ansible-links{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.ansible-links>a{padding:4px 12px;margin:2px 4px;cursor:pointer;border-radius:3px;background-color:#5bbdbf;color:#fff}.ansible-links>a:active,.ansible-links>a:focus,.ansible-links>a:hover{background-color:#91d9db}.ansible-links>a:focus{outline:3px solid #204748}table.documentation-table{border-bottom:1px solid #000;border-right:1px solid #000}table.documentation-table th{background-color:#6ab0de}table.documentation-table td,table.documentation-table th{padding:4px;border-left:1px solid #000;border-top:1px solid #000}table.documentation-table td.elbow-placeholder{border-top:0;width:30px;min-width:30px}table.documentation-table td{vertical-align:top}table.documentation-table td:first-child{white-space:nowrap}table.documentation-table tr .ansibleOptionLink{display:inline-block;visibility:hidden}table.documentation-table tr .ansibleOptionLink:after{content:"🔗"}table.documentation-table tr:hover .ansibleOptionLink:after{visibility:visible}table.documentation-table tr:nth-child(odd){background-color:#fff}table.documentation-table tr:nth-child(2n){background-color:#e7f2fa}table.ansible-option-table{display:table;border-color:#000!important;height:1px}table.ansible-option-table tr{height:100%}table.ansible-option-table td,table.ansible-option-table th{border-color:#000!important;border-bottom:none!important;vertical-align:top!important}table.ansible-option-table th>p{font-size:medium!important}table.ansible-option-table thead tr{background-color:#6ab0de}table.ansible-option-table tbody .row-odd td{background-color:#fff!important}table.ansible-option-table tbody .row-even td{background-color:#e7f2fa!important}table.ansible-option-table ul>li>p{margin:0!important}table.ansible-option-table ul>li>div[class^=highlight]{margin-bottom:4px!important}table.ansible-option-table p.ansible-option-title{display:inline}table.ansible-option-table .ansible-option-type-line{font-size:small;margin-bottom:0}table.ansible-option-table .ansible-option-elements,table.ansible-option-table .ansible-option-type{color:purple}table.ansible-option-table .ansible-option-required{color:red}table.ansible-option-table .ansible-option-versionadded{font-style:italic;font-size:small;color:#006400}table.ansible-option-table .ansible-option-aliases{color:#006400;white-space:normal}table.ansible-option-table .ansible-option-line{margin-top:8px}table.ansible-option-table .ansible-option-choices{font-weight:700}table.ansible-option-table .ansible-option-choices-default-mark,table.ansible-option-table .ansible-option-default{color:#00f}table.ansible-option-table .ansible-option-default-bold{color:#00f;font-weight:700}table.ansible-option-table .ansible-option-returned-bold{font-weight:700}table.ansible-option-table .ansible-option-sample{color:#00f;word-wrap:break-word;word-break:break-all}table.ansible-option-table .ansible-option-sample-bold{color:#000;font-weight:700}table.ansible-option-table .ansible-option-configuration{font-weight:700}table.ansible-option-table .ansibleOptionLink{display:inline-block;visibility:hidden}table.ansible-option-table .ansibleOptionLink:after{content:"🔗"}table.ansible-option-table p{margin:0 0 8px}table.ansible-option-table tr:hover .ansibleOptionLink:after{visibility:visible}table.ansible-option-table td{padding:0!important;white-space:normal}table.ansible-option-table td>div.ansible-option-cell{padding:8px 16px;border-top:1px solid #000}table.ansible-option-table td:first-child{height:inherit;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}table.ansible-option-table td:first-child>div.ansible-option-cell{height:inherit;-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto;white-space:nowrap;max-width:100%}table.ansible-option-table .ansible-option-indent{margin-left:2em;border-right:1px solid #000}table.ansible-option-table .ansible-attribute-support-label{display:none}table.ansible-option-table .ansible-attribute-support-label,table.ansible-option-table .ansible-attribute-support-property{font-weight:700}table.ansible-option-table .ansible-attribute-support-none{font-weight:700;color:red}table.ansible-option-table .ansible-attribute-support-partial{font-weight:700;color:#a5a500}table.ansible-option-table .ansible-attribute-support-full{font-weight:700;color:green}table.ansible-option-table .ansible-attribute-details{font-style:italic}@media (max-width:1200px){table.ansible-option-table{display:block;height:unset;border:none!important}table.ansible-option-table thead{display:none}table.ansible-option-table tbody,table.ansible-option-table td,table.ansible-option-table tr{display:block;border:none!important}table.ansible-option-table tbody .row-even td,table.ansible-option-table tbody .row-odd td{background-color:unset!important}table.ansible-option-table td>div.ansible-option-cell{border-top:none}table.ansible-option-table td:first-child>div.ansible-option-cell{background-color:#e7f2fa!important}table.ansible-option-table td:not(:first-child){display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}table.ansible-option-table td:not(:first-child)>div.ansible-option-cell{margin-left:1em}table.ansible-option-table .ansible-option-indent,table.ansible-option-table .ansible-option-indent-desc{margin-left:1em;border:none;border-right:3px solid #e7f2fa}table.ansible-option-table .ansible-attribute-support-label{display:unset}}.ansible-version-added{font-style:italic}.ansible-option-value a.reference.external,.ansible-option-value a.reference.external:hover,.ansible-option-value a.reference.internal,.ansible-option-value a.reference.internal:hover,.ansible-option a.reference.external,.ansible-option a.reference.external:hover,.ansible-option a.reference.internal,.ansible-option a.reference.internal:hover,.ansible-return-value a.reference.external,.ansible-return-value a.reference.external:hover,.ansible-return-value a.reference.internal,.ansible-return-value a.reference.internal:hover{color:unset}
\ No newline at end of file
+/* GNU General Public License v3.0+ (see https://www.gnu.org/licenses/gpl-3.0.txt) */.ansible-links{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:start;-webkit-justify-content:flex-start;-ms-flex-pack:start;justify-content:flex-start;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap}.ansible-links>a{padding:4px 12px;margin:2px 4px;cursor:pointer;border-radius:3px;background-color:#5bbdbf;color:#fff}.ansible-links>a:active,.ansible-links>a:focus,.ansible-links>a:hover{background-color:#91d9db}.ansible-links>a:focus{outline:3px solid #204748}table.documentation-table{border-bottom:1px solid #000;border-right:1px solid #000}table.documentation-table th{background-color:#6ab0de}table.documentation-table td,table.documentation-table th{padding:4px;border-left:1px solid #000;border-top:1px solid #000}table.documentation-table td.elbow-placeholder{border-top:0;width:30px;min-width:30px}table.documentation-table td{vertical-align:top}table.documentation-table td:first-child{white-space:nowrap}table.documentation-table tr .ansibleOptionLink{display:inline-block}table.documentation-table tr .ansibleOptionLink:after{content:"🔗";opacity:0}table.documentation-table tr:hover .ansibleOptionLink:after{opacity:1}table.documentation-table tr:nth-child(odd){background-color:#fff}table.documentation-table tr:nth-child(2n){background-color:#e7f2fa}table.ansible-option-table{display:table;border-color:#000!important;height:1px}table.ansible-option-table tr{height:100%}table.ansible-option-table td,table.ansible-option-table th{border-color:#000!important;border-bottom:none!important;vertical-align:top!important}table.ansible-option-table th>p{font-size:medium!important}table.ansible-option-table thead tr{background-color:#6ab0de}table.ansible-option-table tbody .row-odd td{background-color:#fff!important}table.ansible-option-table tbody .row-even td{background-color:#e7f2fa!important}table.ansible-option-table ul>li>p{margin:0!important}table.ansible-option-table ul>li>div[class^=highlight]{margin-bottom:4px!important}table.ansible-option-table p.ansible-option-title{display:inline}table.ansible-option-table .ansible-option-type-line{font-size:small;margin-bottom:0}table.ansible-option-table .ansible-option-elements,table.ansible-option-table .ansible-option-type{color:purple}table.ansible-option-table .ansible-option-required{color:red}table.ansible-option-table .ansible-option-versionadded{font-style:italic;font-size:small;color:#006400}table.ansible-option-table .ansible-option-aliases{color:#006400;white-space:normal}table.ansible-option-table .ansible-option-line{margin-top:8px}table.ansible-option-table .ansible-option-choices{font-weight:700}table.ansible-option-table .ansible-option-choices-default-mark,table.ansible-option-table .ansible-option-default{color:#00f}table.ansible-option-table .ansible-option-default-bold{color:#00f;font-weight:700}table.ansible-option-table .ansible-option-returned-bold{font-weight:700}table.ansible-option-table .ansible-option-sample{color:#00f;word-wrap:break-word;word-break:break-all}table.ansible-option-table .ansible-option-sample-bold{color:#000;font-weight:700}table.ansible-option-table .ansible-option-configuration{font-weight:700}table.ansible-option-table .ansibleOptionLink{display:inline-block}table.ansible-option-table .ansibleOptionLink:after{content:"🔗";opacity:0}table.ansible-option-table p{margin:0 0 8px}table.ansible-option-table tr:hover .ansibleOptionLink:after{opacity:1}table.ansible-option-table td{padding:0!important;white-space:normal}table.ansible-option-table td>div.ansible-option-cell{padding:8px 16px;border-top:1px solid #000}table.ansible-option-table td:first-child{height:inherit;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}table.ansible-option-table td:first-child>div.ansible-option-cell{height:inherit;-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto;white-space:nowrap;max-width:100%}table.ansible-option-table .ansible-option-indent{margin-left:2em;border-right:1px solid #000}table.ansible-option-table .ansible-attribute-support-label{display:none}table.ansible-option-table .ansible-attribute-support-label,table.ansible-option-table .ansible-attribute-support-property{font-weight:700}table.ansible-option-table .ansible-attribute-support-none{font-weight:700;color:red}table.ansible-option-table .ansible-attribute-support-partial{font-weight:700;color:#a5a500}table.ansible-option-table .ansible-attribute-support-full{font-weight:700;color:green}table.ansible-option-table .ansible-attribute-details{font-style:italic}@media (max-width:1200px){table.ansible-option-table{display:block;height:unset;border:none!important}table.ansible-option-table thead{display:none}table.ansible-option-table tbody,table.ansible-option-table td,table.ansible-option-table tr{display:block;border:none!important}table.ansible-option-table tbody .row-even td,table.ansible-option-table tbody .row-odd td{background-color:unset!important}table.ansible-option-table td>div.ansible-option-cell{border-top:none}table.ansible-option-table td:first-child>div.ansible-option-cell{background-color:#e7f2fa!important}table.ansible-option-table td:not(:first-child){display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-webkit-flex-direction:row;-ms-flex-direction:row;flex-direction:row}table.ansible-option-table td:not(:first-child)>div.ansible-option-cell{margin-left:1em}table.ansible-option-table .ansible-option-indent,table.ansible-option-table .ansible-option-indent-desc{margin-left:1em;border:none;border-right:3px solid #e7f2fa}table.ansible-option-table .ansible-attribute-support-label{display:unset}}.ansible-version-added{font-style:italic}.ansible-option-value a.reference.external,.ansible-option-value a.reference.external:hover,.ansible-option-value a.reference.internal,.ansible-option-value a.reference.internal:hover,.ansible-option a.reference.external,.ansible-option a.reference.external:hover,.ansible-option a.reference.internal,.ansible-option a.reference.internal:hover,.ansible-return-value a.reference.external,.ansible-return-value a.reference.external:hover,.ansible-return-value a.reference.internal,.ansible-return-value a.reference.internal:hover{color:unset}
\ No newline at end of file
diff --git a/docs/collections/index_module.html b/docs/collections/index_module.html
index 99c1f6b..c104dcb 100644
--- a/docs/collections/index_module.html
+++ b/docs/collections/index_module.html
@@ -123,6 +123,8 @@ <h2>skupper.network<a class="headerlink" href="#skupper-network" title="Permalin
 <ul class="simple">
 <li><p><a class="reference internal" href="skupper/network/links_module.html#ansible-collections-skupper-network-links-module"><span class="std std-ref">skupper.network.links</span></a> – Update links based on provided links list</p></li>
 <li><p><a class="reference internal" href="skupper/network/links_load_module.html#ansible-collections-skupper-network-links-load-module"><span class="std std-ref">skupper.network.links_load</span></a> – Loads existing links to other sites</p></li>
+<li><p><a class="reference internal" href="skupper/network/services_module.html#ansible-collections-skupper-network-services-module"><span class="std std-ref">skupper.network.services</span></a> – Update services based on provided services list</p></li>
+<li><p><a class="reference internal" href="skupper/network/services_load_module.html#ansible-collections-skupper-network-services-load-module"><span class="std std-ref">skupper.network.services_load</span></a> – Loads existing services and targets</p></li>
 <li><p><a class="reference internal" href="skupper/network/site_load_module.html#ansible-collections-skupper-network-site-load-module"><span class="std std-ref">skupper.network.site_load</span></a> – Loads site information as ansible facts into the respective host</p></li>
 </ul>
 </section>
diff --git a/docs/collections/skupper/network/index.html b/docs/collections/skupper/network/index.html
index d1113fc..7373b54 100644
--- a/docs/collections/skupper/network/index.html
+++ b/docs/collections/skupper/network/index.html
@@ -127,7 +127,7 @@
              
   <section id="skupper-network">
 <span id="plugins-in-skupper-network"></span><h1>Skupper.Network<a class="headerlink" href="#skupper-network" title="Permalink to this heading"></a></h1>
-<p>Collection version 1.1.0</p>
+<p>Collection version 1.1.3</p>
 <nav class="contents local" id="contents">
 <ul class="simple">
 <li><p><a class="reference internal" href="#description" id="id1">Description</a></p></li>
@@ -160,6 +160,8 @@ <h3>Modules<a class="headerlink" href="#modules" title="Permalink to this headin
 <ul class="simple">
 <li><p><a class="reference internal" href="links_module.html#ansible-collections-skupper-network-links-module"><span class="std std-ref">links module</span></a> – Update links based on provided links list</p></li>
 <li><p><a class="reference internal" href="links_load_module.html#ansible-collections-skupper-network-links-load-module"><span class="std std-ref">links_load module</span></a> – Loads existing links to other sites</p></li>
+<li><p><a class="reference internal" href="services_module.html#ansible-collections-skupper-network-services-module"><span class="std std-ref">services module</span></a> – Update services based on provided services list</p></li>
+<li><p><a class="reference internal" href="services_load_module.html#ansible-collections-skupper-network-services-load-module"><span class="std std-ref">services_load module</span></a> – Loads existing services and targets</p></li>
 <li><p><a class="reference internal" href="site_load_module.html#ansible-collections-skupper-network-site-load-module"><span class="std std-ref">site_load module</span></a> – Loads site information as ansible facts into the respective host</p></li>
 </ul>
 <div class="toctree-wrapper compound">
diff --git a/docs/collections/skupper/network/links_load_module.html b/docs/collections/skupper/network/links_load_module.html
index e87f032..6aa02a1 100644
--- a/docs/collections/skupper/network/links_load_module.html
+++ b/docs/collections/skupper/network/links_load_module.html
@@ -21,7 +21,7 @@
         <script src="../../../_static/sphinx_highlight.js"></script>
     <script src="../../../_static/js/theme.js"></script>
     <link rel="search" title="Search" href="../../../search.html" />
-    <link rel="next" title="skupper.network.site_load module – Loads site information as ansible facts into the respective host" href="site_load_module.html" />
+    <link rel="next" title="skupper.network.services module – Update services based on provided services list" href="services_module.html" />
     <link rel="prev" title="skupper.network.links module – Update links based on provided links list" href="links_module.html" /><!-- extra head elements for Ansible beyond RTD Sphinx Theme -->
 
 
@@ -130,7 +130,7 @@
 <h1>skupper.network.links_load module – Loads existing links to other sites<a class="headerlink" href="#skupper-network-links-load-module-loads-existing-links-to-other-sites" title="Permalink to this heading"></a></h1>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.0).</p>
+<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.3).</p>
 <p>To install it, use: <code class="code docutils literal notranslate"><span class="pre">ansible-galaxy</span> <span class="pre">collection</span> <span class="pre">install</span> <span class="pre">skupper.network</span></code>.
 You need further requirements to be able to use this module,
 see <a class="reference internal" href="#ansible-collections-skupper-network-links-load-module-requirements"><span class="std std-ref">Requirements</span></a> for details.</p>
@@ -208,7 +208,7 @@ <h3>Collection links<a class="headerlink" href="#collection-links" title="Permal
 
 <footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
         <a href="links_module.html" class="btn btn-neutral float-left" title="skupper.network.links module – Update links based on provided links list" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
-        <a href="site_load_module.html" class="btn btn-neutral float-right" title="skupper.network.site_load module – Loads site information as ansible facts into the respective host" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
+        <a href="services_module.html" class="btn btn-neutral float-right" title="skupper.network.services module – Update services based on provided services list" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
     </div>
 
   <hr/>
diff --git a/docs/collections/skupper/network/links_module.html b/docs/collections/skupper/network/links_module.html
index 91a2c66..34bc533 100644
--- a/docs/collections/skupper/network/links_module.html
+++ b/docs/collections/skupper/network/links_module.html
@@ -130,7 +130,7 @@
 <h1>skupper.network.links module – Update links based on provided links list<a class="headerlink" href="#skupper-network-links-module-update-links-based-on-provided-links-list" title="Permalink to this heading"></a></h1>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.0).</p>
+<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.3).</p>
 <p>To install it, use: <code class="code docutils literal notranslate"><span class="pre">ansible-galaxy</span> <span class="pre">collection</span> <span class="pre">install</span> <span class="pre">skupper.network</span></code>.
 You need further requirements to be able to use this module,
 see <a class="reference internal" href="#ansible-collections-skupper-network-links-module-requirements"><span class="std std-ref">Requirements</span></a> for details.</p>
diff --git a/docs/collections/skupper/network/services_load_module.html b/docs/collections/skupper/network/services_load_module.html
new file mode 100644
index 0000000..a0ef440
--- /dev/null
+++ b/docs/collections/skupper/network/services_load_module.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html class="writer-html5" lang="en" >
+<head>
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>skupper.network.services_load module – Loads existing services and targets &mdash; Skupper Ansible collection  documentation</title>
+      <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="../../../_static/css/ansible.css" type="text/css" />
+      <link rel="stylesheet" href="../../../_static/antsibull-minimal.css" type="text/css" />
+      <link rel="stylesheet" href="../../../_static/css/rtd-ethical-ads.css" type="text/css" />
+    <link rel="shortcut icon" href="../../../_static/images/Ansible-Mark-RGB_Black.png"/>
+  <!--[if lt IE 9]>
+    <script src="../../../_static/js/html5shiv.min.js"></script>
+  <![endif]-->
+  
+        <script src="../../../_static/jquery.js"></script>
+        <script src="../../../_static/_sphinx_javascript_frameworks_compat.js"></script>
+        <script data-url_root="../../../" id="documentation_options" src="../../../_static/documentation_options.js"></script>
+        <script src="../../../_static/doctools.js"></script>
+        <script src="../../../_static/sphinx_highlight.js"></script>
+    <script src="../../../_static/js/theme.js"></script>
+    <link rel="search" title="Search" href="../../../search.html" />
+    <link rel="next" title="skupper.network.site_load module – Loads site information as ansible facts into the respective host" href="site_load_module.html" />
+    <link rel="prev" title="skupper.network.services module – Update services based on provided services list" href="services_module.html" /><!-- extra head elements for Ansible beyond RTD Sphinx Theme -->
+
+
+
+
+</head>
+
+<body class="wy-body-for-nav"><!-- extra body elements for Ansible beyond RTD Sphinx Theme -->
+
+<div class="DocSite-globalNav ansibleNav">
+  <ul>
+    <li><a href="https://www.ansible.com/ansiblefest" target="_blank">AnsibleFest</a></li>
+    <li><a href="https://www.ansible.com/tower" target="_blank">Products</a></li>
+    <li><a href="https://www.ansible.com/community" target="_blank">Community</a></li>
+    <li><a href="https://www.ansible.com/webinars-training" target="_blank">Webinars & Training</a></li>
+    <li><a href="https://www.ansible.com/blog" target="_blank">Blog</a></li>
+  </ul>
+</div>
+
+<a class="DocSite-nav" href="/" style="padding-bottom: 30px;">
+
+  <img class="DocSiteNav-logo"
+    src="../../../_static/images/Ansible-Mark-RGB_White.png"
+    alt="Ansible Logo">
+  <div class="DocSiteNav-title">Skupper Ansible Documentation</div>
+</a>
+  <div class="wy-grid-for-nav">
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-scroll">
+        <div class="wy-side-nav-search" >
+
+          
+          
+          <a href="../../../index.html" class="icon icon-home">
+            Skupper Ansible collection
+          </a><!--- Based on https://github.com/rtfd/sphinx_rtd_theme/pull/438/files -->
+
+<div class="version">
+  
+    
+  
+</div>
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../../../search.html" method="get">
+    <label class="sr-only" for="q">Search docs:</label>
+    <input type="text" class="st-default-search-input" id="q" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+        </div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
+  
+              <p class="caption" role="heading"><span class="caption-text">Collections:</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="../../index.html">Collection Index</a><ul class="current">
+<li class="toctree-l2 current"><a class="reference internal" href="../index.html">Collections in the Skupper Namespace</a><ul class="current">
+<li class="toctree-l3 current"><a class="reference internal" href="index.html">Skupper.Network</a><ul class="current">
+<li class="toctree-l4"><a class="reference internal" href="index.html#description">Description</a></li>
+<li class="toctree-l4 current"><a class="reference internal" href="index.html#plugin-index">Plugin Index</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<p class="caption" role="heading"><span class="caption-text">Plugin indexes:</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../../index_module.html">Index of all Modules</a></li>
+</ul>
+<p class="caption" role="heading"><span class="caption-text">Reference indexes:</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../../environment_variables.html">Index of all Collection Environment Variables</a></li>
+</ul>
+<!-- extra nav elements for Ansible beyond RTD Sphinx Theme -->
+
+        </div>
+      </div>
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
+          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+          <a href="../../../index.html">Skupper Ansible collection</a>
+      </nav>
+
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="Page navigation">
+  <ul class="wy-breadcrumbs">
+      <li><a href="../../../index.html" class="icon icon-home" aria-label="Home"></a></li>
+          <li class="breadcrumb-item"><a href="../../index.html">Collection Index</a></li>
+          <li class="breadcrumb-item"><a href="../index.html">Collections in the Skupper Namespace</a></li>
+          <li class="breadcrumb-item"><a href="index.html">Skupper.Network</a></li>
+      <li class="breadcrumb-item active">skupper.network.services_load module – Loads existing services and targets</li>
+      <li class="wy-breadcrumbs-aside">
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+
+  
+           <div itemprop="articleBody">
+             
+  <span class="target" id="ansible-collections-skupper-network-services-load-module"></span><section id="skupper-network-services-load-module-loads-existing-services-and-targets">
+<h1>skupper.network.services_load module – Loads existing services and targets<a class="headerlink" href="#skupper-network-services-load-module-loads-existing-services-and-targets" title="Permalink to this heading"></a></h1>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.3).</p>
+<p>To install it, use: <code class="code docutils literal notranslate"><span class="pre">ansible-galaxy</span> <span class="pre">collection</span> <span class="pre">install</span> <span class="pre">skupper.network</span></code>.
+You need further requirements to be able to use this module,
+see <a class="reference internal" href="#ansible-collections-skupper-network-services-load-module-requirements"><span class="std std-ref">Requirements</span></a> for details.</p>
+<p>To use it in a playbook, specify: <code class="code docutils literal notranslate"><span class="pre">skupper.network.services_load</span></code>.</p>
+</div>
+<p class="ansible-version-added">New in skupper.network 1.1.3</p>
+<nav class="contents local" id="contents">
+<ul class="simple">
+<li><p><a class="reference internal" href="#synopsis" id="id1">Synopsis</a></p></li>
+<li><p><a class="reference internal" href="#requirements" id="id2">Requirements</a></p></li>
+<li><p><a class="reference internal" href="#examples" id="id3">Examples</a></p></li>
+<li><p><a class="reference internal" href="#return-values" id="id4">Return Values</a></p></li>
+</ul>
+</nav>
+<section id="synopsis">
+<h2><a class="toc-backref" href="#id1" role="doc-backlink">Synopsis</a><a class="headerlink" href="#synopsis" title="Permalink to this heading"></a></h2>
+<ul class="simple">
+<li><p>Loads existing Skupper services and targets. Existing services will be returned under the `existing_services` fact.</p></li>
+</ul>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>This module has a corresponding <a class="reference external" href="https://docs.ansible.com/ansible/devel/plugins/action.html#action-plugins" title="(in Ansible vdevel)"><span class="xref std std-ref">action plugin</span></a>.</p>
+</div>
+</section>
+<section id="requirements">
+<span id="ansible-collections-skupper-network-services-load-module-requirements"></span><h2><a class="toc-backref" href="#id2" role="doc-backlink">Requirements</a><a class="headerlink" href="#requirements" title="Permalink to this heading"></a></h2>
+<p>The below requirements are needed on the host that executes this module.</p>
+<ul class="simple">
+<li><p>kubectl if using kubernetes platform</p></li>
+<li><p>podman v4+ if using podman as the site platform</p></li>
+</ul>
+</section>
+<section id="examples">
+<h2><a class="toc-backref" href="#id3" role="doc-backlink">Examples</a><a class="headerlink" href="#examples" title="Permalink to this heading"></a></h2>
+<div class="highlight-yaml+jinja notranslate"><div class="highlight"><pre><span></span><span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">Loading existing services</span>
+<span class="w">  </span><span class="nt">skupper.network.services_load</span><span class="p">:</span>
+</pre></div>
+</div>
+</section>
+<section id="return-values">
+<h2><a class="toc-backref" href="#id4" role="doc-backlink">Return Values</a><a class="headerlink" href="#return-values" title="Permalink to this heading"></a></h2>
+<p>Common return values are documented <a class="reference external" href="https://docs.ansible.com/ansible/devel/reference_appendices/common_return_values.html#common-return-values" title="(in Ansible vdevel)"><span class="xref std std-ref">here</span></a>, the following are the fields unique to this module:</p>
+<table class="ansible-option-table docutils align-default" style="width: 100%">
+<thead>
+<tr class="row-odd"><th class="head"><p>Key</p></th>
+<th class="head"><p>Description</p></th>
+</tr>
+</thead>
+<tbody>
+<tr class="row-even"><td><div class="ansible-option-cell">
+<div class="ansibleOptionAnchor" id="return-existing_services"></div><p class="ansible-option-title" id="ansible-collections-skupper-network-services-load-module-return-existing-services"><strong>existing_services</strong></p>
+<a class="ansibleOptionLink" href="#return-existing_services" title="Permalink to this return value"></a><p class="ansible-option-type-line"><span class="ansible-option-type">dictionary</span></p>
+</div></td>
+<td><div class="ansible-option-cell"><p>List of existing services and targets</p>
+<p class="ansible-option-line"><span class="ansible-option-returned-bold">Returned:</span> always</p>
+<p class="ansible-option-line ansible-option-sample"><span class="ansible-option-sample-bold">Sample:</span> <code class="ansible-option-sample docutils literal notranslate"><span class="pre">{&quot;existing_services&quot;:</span> <span class="pre">{&quot;db&quot;:</span> <span class="pre">{&quot;ports&quot;:</span> <span class="pre">[5432]},</span> <span class="pre">&quot;nearestprime&quot;:</span> <span class="pre">{&quot;ports&quot;:</span> <span class="pre">[8000],</span> <span class="pre">&quot;targets&quot;:</span> <span class="pre">[{&quot;name&quot;:</span> <span class="pre">&quot;nearestprime&quot;,</span> <span class="pre">&quot;type&quot;:</span> <span class="pre">&quot;deployment&quot;}]}}}</span></code></p>
+</div></td>
+</tr>
+</tbody>
+</table>
+<section id="collection-links">
+<h3>Collection links<a class="headerlink" href="#collection-links" title="Permalink to this heading"></a></h3>
+<p class="ansible-links">
+  <a href="http://github.com/skupperproject/skupper-ansible/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+  <a href="http://skupper.io" aria-role="button" target="_blank" rel="noopener external">Homepage</a>
+  <a href="http://github.com/skupperproject/skupper-ansible" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+</p></section>
+</section>
+</section>
+
+
+           </div>
+          </div>
+          
+
+<footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
+        <a href="services_module.html" class="btn btn-neutral float-left" title="skupper.network.services module – Update services based on provided services list" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
+        <a href="site_load_module.html" class="btn btn-neutral float-right" title="skupper.network.site_load module – Loads site information as ansible facts into the respective host" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
+    </div>
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>&#169; Copyright Skupper Ansible contributors.</p>
+  </div>
+
+  
+   
+
+</footer>
+        </div>
+      </div>
+    </section>
+  </div>
+  <script>
+      jQuery(function () {
+          SphinxRtdTheme.Navigation.enable(true);
+      });
+  </script><!-- extra footer elements for Ansible beyond RTD Sphinx Theme -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/collections/skupper/network/services_module.html b/docs/collections/skupper/network/services_module.html
new file mode 100644
index 0000000..fe422d9
--- /dev/null
+++ b/docs/collections/skupper/network/services_module.html
@@ -0,0 +1,214 @@
+<!DOCTYPE html>
+<html class="writer-html5" lang="en" >
+<head>
+  <meta charset="utf-8" /><meta name="generator" content="Docutils 0.18.1: http://docutils.sourceforge.net/" />
+
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>skupper.network.services module – Update services based on provided services list &mdash; Skupper Ansible collection  documentation</title>
+      <link rel="stylesheet" href="../../../_static/pygments.css" type="text/css" />
+      <link rel="stylesheet" href="../../../_static/css/ansible.css" type="text/css" />
+      <link rel="stylesheet" href="../../../_static/antsibull-minimal.css" type="text/css" />
+      <link rel="stylesheet" href="../../../_static/css/rtd-ethical-ads.css" type="text/css" />
+    <link rel="shortcut icon" href="../../../_static/images/Ansible-Mark-RGB_Black.png"/>
+  <!--[if lt IE 9]>
+    <script src="../../../_static/js/html5shiv.min.js"></script>
+  <![endif]-->
+  
+        <script src="../../../_static/jquery.js"></script>
+        <script src="../../../_static/_sphinx_javascript_frameworks_compat.js"></script>
+        <script data-url_root="../../../" id="documentation_options" src="../../../_static/documentation_options.js"></script>
+        <script src="../../../_static/doctools.js"></script>
+        <script src="../../../_static/sphinx_highlight.js"></script>
+    <script src="../../../_static/js/theme.js"></script>
+    <link rel="search" title="Search" href="../../../search.html" />
+    <link rel="next" title="skupper.network.services_load module – Loads existing services and targets" href="services_load_module.html" />
+    <link rel="prev" title="skupper.network.links_load module – Loads existing links to other sites" href="links_load_module.html" /><!-- extra head elements for Ansible beyond RTD Sphinx Theme -->
+
+
+
+
+</head>
+
+<body class="wy-body-for-nav"><!-- extra body elements for Ansible beyond RTD Sphinx Theme -->
+
+<div class="DocSite-globalNav ansibleNav">
+  <ul>
+    <li><a href="https://www.ansible.com/ansiblefest" target="_blank">AnsibleFest</a></li>
+    <li><a href="https://www.ansible.com/tower" target="_blank">Products</a></li>
+    <li><a href="https://www.ansible.com/community" target="_blank">Community</a></li>
+    <li><a href="https://www.ansible.com/webinars-training" target="_blank">Webinars & Training</a></li>
+    <li><a href="https://www.ansible.com/blog" target="_blank">Blog</a></li>
+  </ul>
+</div>
+
+<a class="DocSite-nav" href="/" style="padding-bottom: 30px;">
+
+  <img class="DocSiteNav-logo"
+    src="../../../_static/images/Ansible-Mark-RGB_White.png"
+    alt="Ansible Logo">
+  <div class="DocSiteNav-title">Skupper Ansible Documentation</div>
+</a>
+  <div class="wy-grid-for-nav">
+    <nav data-toggle="wy-nav-shift" class="wy-nav-side">
+      <div class="wy-side-scroll">
+        <div class="wy-side-nav-search" >
+
+          
+          
+          <a href="../../../index.html" class="icon icon-home">
+            Skupper Ansible collection
+          </a><!--- Based on https://github.com/rtfd/sphinx_rtd_theme/pull/438/files -->
+
+<div class="version">
+  
+    
+  
+</div>
+<div role="search">
+  <form id="rtd-search-form" class="wy-form" action="../../../search.html" method="get">
+    <label class="sr-only" for="q">Search docs:</label>
+    <input type="text" class="st-default-search-input" id="q" name="q" placeholder="Search docs" />
+    <input type="hidden" name="check_keywords" value="yes" />
+    <input type="hidden" name="area" value="default" />
+  </form>
+</div>
+        </div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
+  
+              <p class="caption" role="heading"><span class="caption-text">Collections:</span></p>
+<ul class="current">
+<li class="toctree-l1 current"><a class="reference internal" href="../../index.html">Collection Index</a><ul class="current">
+<li class="toctree-l2 current"><a class="reference internal" href="../index.html">Collections in the Skupper Namespace</a><ul class="current">
+<li class="toctree-l3 current"><a class="reference internal" href="index.html">Skupper.Network</a><ul class="current">
+<li class="toctree-l4"><a class="reference internal" href="index.html#description">Description</a></li>
+<li class="toctree-l4 current"><a class="reference internal" href="index.html#plugin-index">Plugin Index</a></li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+</li>
+</ul>
+<p class="caption" role="heading"><span class="caption-text">Plugin indexes:</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../../index_module.html">Index of all Modules</a></li>
+</ul>
+<p class="caption" role="heading"><span class="caption-text">Reference indexes:</span></p>
+<ul>
+<li class="toctree-l1"><a class="reference internal" href="../../environment_variables.html">Index of all Collection Environment Variables</a></li>
+</ul>
+<!-- extra nav elements for Ansible beyond RTD Sphinx Theme -->
+
+        </div>
+      </div>
+    </nav>
+
+    <section data-toggle="wy-nav-shift" class="wy-nav-content-wrap"><nav class="wy-nav-top" aria-label="Mobile navigation menu" >
+          <i data-toggle="wy-nav-top" class="fa fa-bars"></i>
+          <a href="../../../index.html">Skupper Ansible collection</a>
+      </nav>
+
+      <div class="wy-nav-content">
+        <div class="rst-content">
+          <div role="navigation" aria-label="Page navigation">
+  <ul class="wy-breadcrumbs">
+      <li><a href="../../../index.html" class="icon icon-home" aria-label="Home"></a></li>
+          <li class="breadcrumb-item"><a href="../../index.html">Collection Index</a></li>
+          <li class="breadcrumb-item"><a href="../index.html">Collections in the Skupper Namespace</a></li>
+          <li class="breadcrumb-item"><a href="index.html">Skupper.Network</a></li>
+      <li class="breadcrumb-item active">skupper.network.services module – Update services based on provided services list</li>
+      <li class="wy-breadcrumbs-aside">
+      </li>
+  </ul>
+  <hr/>
+</div>
+          <div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
+
+  
+           <div itemprop="articleBody">
+             
+  <span class="target" id="ansible-collections-skupper-network-services-module"></span><section id="skupper-network-services-module-update-services-based-on-provided-services-list">
+<h1>skupper.network.services module – Update services based on provided services list<a class="headerlink" href="#skupper-network-services-module-update-services-based-on-provided-services-list" title="Permalink to this heading"></a></h1>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.3).</p>
+<p>To install it, use: <code class="code docutils literal notranslate"><span class="pre">ansible-galaxy</span> <span class="pre">collection</span> <span class="pre">install</span> <span class="pre">skupper.network</span></code>.
+You need further requirements to be able to use this module,
+see <a class="reference internal" href="#ansible-collections-skupper-network-services-module-requirements"><span class="std std-ref">Requirements</span></a> for details.</p>
+<p>To use it in a playbook, specify: <code class="code docutils literal notranslate"><span class="pre">skupper.network.services</span></code>.</p>
+</div>
+<p class="ansible-version-added">New in skupper.network 1.1.3</p>
+<nav class="contents local" id="contents">
+<ul class="simple">
+<li><p><a class="reference internal" href="#synopsis" id="id1">Synopsis</a></p></li>
+<li><p><a class="reference internal" href="#requirements" id="id2">Requirements</a></p></li>
+<li><p><a class="reference internal" href="#examples" id="id3">Examples</a></p></li>
+</ul>
+</nav>
+<section id="synopsis">
+<h2><a class="toc-backref" href="#id1" role="doc-backlink">Synopsis</a><a class="headerlink" href="#synopsis" title="Permalink to this heading"></a></h2>
+<ul class="simple">
+<li><p>Updates the services defined by the respective site, based on the services list defined through the host variables</p></li>
+<li><p>The services plugin will generate a list of services (or targets) to be created and deleted</p></li>
+<li><p>If targets have changed then the create and delete lists will have just the name and respective targets (no spec)</p></li>
+</ul>
+<div class="admonition note">
+<p class="admonition-title">Note</p>
+<p>This module has a corresponding <a class="reference external" href="https://docs.ansible.com/ansible/devel/plugins/action.html#action-plugins" title="(in Ansible vdevel)"><span class="xref std std-ref">action plugin</span></a>.</p>
+</div>
+</section>
+<section id="requirements">
+<span id="ansible-collections-skupper-network-services-module-requirements"></span><h2><a class="toc-backref" href="#id2" role="doc-backlink">Requirements</a><a class="headerlink" href="#requirements" title="Permalink to this heading"></a></h2>
+<p>The below requirements are needed on the host that executes this module.</p>
+<ul class="simple">
+<li><p>kubectl if using kubernetes platform</p></li>
+<li><p>podman v4+ if using podman as the site platform</p></li>
+</ul>
+</section>
+<section id="examples">
+<h2><a class="toc-backref" href="#id3" role="doc-backlink">Examples</a><a class="headerlink" href="#examples" title="Permalink to this heading"></a></h2>
+<div class="highlight-yaml+jinja notranslate"><div class="highlight"><pre><span></span><span class="p p-Indicator">-</span><span class="w"> </span><span class="nt">name</span><span class="p">:</span><span class="w"> </span><span class="l l-Scalar l-Scalar-Plain">Updating services</span>
+<span class="w">  </span><span class="nt">skupper.network.services</span><span class="p">:</span>
+</pre></div>
+</div>
+<section id="collection-links">
+<h3>Collection links<a class="headerlink" href="#collection-links" title="Permalink to this heading"></a></h3>
+<p class="ansible-links">
+  <a href="http://github.com/skupperproject/skupper-ansible/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+  <a href="http://skupper.io" aria-role="button" target="_blank" rel="noopener external">Homepage</a>
+  <a href="http://github.com/skupperproject/skupper-ansible" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+</p></section>
+</section>
+</section>
+
+
+           </div>
+          </div>
+          
+
+<footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
+        <a href="links_load_module.html" class="btn btn-neutral float-left" title="skupper.network.links_load module – Loads existing links to other sites" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
+        <a href="services_load_module.html" class="btn btn-neutral float-right" title="skupper.network.services_load module – Loads existing services and targets" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
+    </div>
+
+  <hr/>
+
+  <div role="contentinfo">
+    <p>&#169; Copyright Skupper Ansible contributors.</p>
+  </div>
+
+  
+   
+
+</footer>
+        </div>
+      </div>
+    </section>
+  </div>
+  <script>
+      jQuery(function () {
+          SphinxRtdTheme.Navigation.enable(true);
+      });
+  </script><!-- extra footer elements for Ansible beyond RTD Sphinx Theme -->
+
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/collections/skupper/network/site_load_module.html b/docs/collections/skupper/network/site_load_module.html
index c9665be..7fe5869 100644
--- a/docs/collections/skupper/network/site_load_module.html
+++ b/docs/collections/skupper/network/site_load_module.html
@@ -22,7 +22,7 @@
     <script src="../../../_static/js/theme.js"></script>
     <link rel="search" title="Search" href="../../../search.html" />
     <link rel="next" title="Index of all Modules" href="../../index_module.html" />
-    <link rel="prev" title="skupper.network.links_load module – Loads existing links to other sites" href="links_load_module.html" /><!-- extra head elements for Ansible beyond RTD Sphinx Theme -->
+    <link rel="prev" title="skupper.network.services_load module – Loads existing services and targets" href="services_load_module.html" /><!-- extra head elements for Ansible beyond RTD Sphinx Theme -->
 
 
 
@@ -130,7 +130,7 @@
 <h1>skupper.network.site_load module – Loads site information as ansible facts into the respective host<a class="headerlink" href="#skupper-network-site-load-module-loads-site-information-as-ansible-facts-into-the-respective-host" title="Permalink to this heading"></a></h1>
 <div class="admonition note">
 <p class="admonition-title">Note</p>
-<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.0).</p>
+<p>This module is part of the <a class="reference external" href="https://galaxy.ansible.com/skupper/network">skupper.network collection</a> (version 1.1.3).</p>
 <p>To install it, use: <code class="code docutils literal notranslate"><span class="pre">ansible-galaxy</span> <span class="pre">collection</span> <span class="pre">install</span> <span class="pre">skupper.network</span></code>.
 You need further requirements to be able to use this module,
 see <a class="reference internal" href="#ansible-collections-skupper-network-site-load-module-requirements"><span class="std std-ref">Requirements</span></a> for details.</p>
@@ -208,7 +208,7 @@ <h3>Collection links<a class="headerlink" href="#collection-links" title="Permal
           
 
 <footer><div class="rst-footer-buttons" role="navigation" aria-label="Footer">
-        <a href="links_load_module.html" class="btn btn-neutral float-left" title="skupper.network.links_load module – Loads existing links to other sites" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
+        <a href="services_load_module.html" class="btn btn-neutral float-left" title="skupper.network.services_load module – Loads existing services and targets" accesskey="p" rel="prev"><span class="fa fa-arrow-circle-left" aria-hidden="true"></span> Previous</a>
         <a href="../../index_module.html" class="btn btn-neutral float-right" title="Index of all Modules" accesskey="n" rel="next">Next <span class="fa fa-arrow-circle-right" aria-hidden="true"></span></a>
     </div>
 
diff --git a/docs/objects.inv b/docs/objects.inv
index a981db047e8786fcfe262065bffbf61c0342873f..ed2e328b5e05bcf41278a55d5dca6d9ddc086df8 100644
GIT binary patch
delta 766
zcmV<a0s;M&2Kxq(iGNnjj?*v@zUL`M+Oxaj$_*h7NU&OgfMeuM+}2vh4z^o%Z@dF<
z$dll|q|R>>x2U%^^Y_hoX1>8((I-aoLNG=OO$ApQ^?aynA~&4qUqU`_80F6@X9Aab
zCCURMpmh0`;U~fXy@AN|KA7GI)BAzxX0I!DhkaBOnWA8df`2J;rpTJ25EW%O1#O;7
zq7RZI@<NrSe3v_w+a!T{SiDAZYLfgsP)RDn_3aXhAbg4btVk)Xt<tb3G}9G|eF@eJ
zORR`I(t;#T@R;@TG#cxKIUWl<9OXvqmI)1Jx&?JXrfJRgUy{2@^CkCPauR9XcAfHH
z2>Q~ZQ%w@5y?<x9A_HTYGUdI1?SxywEpVeaeqs)Z&2!BhrrIY4K=_eL!L1-aVo9-y
z<MEcF=%XD~b`aqsFUbptEnvpreQN_BPA2fZG3g+n&T=B66Z!~|Qx|OLB<}PnUvXW#
zpg%i77hCf@vlu%{eXI&72fZio)oZ~6u868}L9)3%Sbr3-qwE8RD4Pc_%2r)~OXH27
zjxc?xLh%3h_aFFV{wru`68!0_1qf3l3AT$>w)B)*2ly=380NRS#Af*Y_b04K38wLC
zDUP%>zx{V+lE~Il@lw!}G!C=3!%VH)lLYe;G?qJ}Rkni4RwG{mdZg&BXju1FbiVXs
z{I>-B*nb9w$#p+0w<8V8w?bCfZ7XaG?iM&~aiQ%-F#T?Kf;5}J;y4o63zLt5=NwBR
zbbeX^Epwa({Vu2?tBSnp55fvj5j#xPE4&LKPq~7zIoL()U}ZbPM?y4TqXn4_mQkd!
zGN^sFTx=sM%?+toGMORCY1+B7{*c&4%!rIOa(DjLQPL3E45H{Eh6vP<sz#jWp{35>
z2J^w1Ltq)_G(f_UQnSO3o=voKi!>0zmC<+@rBb6a(qi>1Y6QNAym}~AaA?{;?+xAZ
wD=Mm3aA!uOe=!ZXGQxER@Z+oAo44)YRs_pp-!=5#0yBI0Bi@nhAEr}&S_M9KnE(I)

delta 665
zcmV;K0%raD29^epiGNkQj@vL0?DZ83TumEk(*;3_0LkHSL6VZ7CE6xTkqSvU=Pv({
zKg^eeFWJ<~mUIWWv&Eg=S#oxk2+cN};#_i0bHk+2D}AV|imH{M=C@Rb6=&k0F_)yk
zr7UVrL7U<|CmYHEy@Le0j?i_4u6xkc-jw`-gsLckq6kG1ihn#5IVg%%QAU=q#aK~O
zD}m?>(}sy1_96Fa0(H2Ah{dfb`m1J&mQ<MgHIz_zPX5ejX_>5+abF;&H@NKAaDC+!
zYi8)O>Fpw?(|5=Pv)e6r9$j~E58f!Pzp#g8vU$@U#^jR{pyJ4s6z%{YiDJao349Bg
zci9dGdy4Q`6o2#u<Q53$@bQd+PZtRMXdo>H%p*rC`omBmN$QLBlcY)?%az`1oAg(I
z(B{@W&sC1Cpe|PpOn})__!gqzk(5+dB&XRm9ZV|N3J!&1mDOW7%4Y3@sr7~z35@S8
zi248h`3qm{e+|tdgs=#W1Zgixfm5;0rW)%!!Z*35G=INW1+l{)zHf-81z6!#N*-BZ
ze~0hfHj&L4=c$ATZ2(3+r+>fRxtQ2WRT4ikL_>5D*pl2hS=vi?!c<m{j>nP0UfO;v
zJ)c-fY4AmdXZyOS?IDID7m7mYPs(#yQum_e2|mP<mtMhQYUc)?R<@&JphWXEnbNE`
z5lO_%qJQq$u-qnoj;*sfN4w(G<KFk+@*%lR>>1f;<nzt*#XhqujFN}wGthm%97v9%
zq;4;$>&2RFG|l)LB5_kzyxy^!jkXqILm{rZCc~hg+n51~RVUOO1Pz7ocvUf>l|Swb
z-SkzS+*nL!N2I&9dxo9xx<UBqWcK!LTf8+TDiYtff#F+R58?cY>}d8MXzgB<$q7><

diff --git a/docs/searchindex.js b/docs/searchindex.js
index 21c85e2..a1a3d19 100644
--- a/docs/searchindex.js
+++ b/docs/searchindex.js
@@ -1 +1 @@
-Search.setIndex({"docnames": ["collections/environment_variables", "collections/index", "collections/index_module", "collections/skupper/index", "collections/skupper/network/index", "collections/skupper/network/links_load_module", "collections/skupper/network/links_module", "collections/skupper/network/site_load_module", "index"], "filenames": ["collections/environment_variables.rst", "collections/index.rst", "collections/index_module.rst", "collections/skupper/index.rst", "collections/skupper/network/index.rst", "collections/skupper/network/links_load_module.rst", "collections/skupper/network/links_module.rst", "collections/skupper/network/site_load_module.rst", "index.rst"], "titles": ["Index of all Collection Environment Variables", "Collection Index", "Index of all Modules", "Collections in the Skupper Namespace", "Skupper.Network", "skupper.network.links_load module \u2013 Loads existing links to other sites", "skupper.network.links module \u2013 Update links based on provided links list", "skupper.network.site_load module \u2013 Loads site information as ansible facts into the respective host", "Welcome to my Ansible collection documentation"], "terms": {"The": [0, 5, 6, 7], "follow": [0, 5, 7], "document": [0, 1, 3, 5, 7], "declar": 0, "plugin": [0, 5, 6, 7], "us": [0, 5, 6, 7], "ansibl": [0, 2, 4, 5, 6], "core": [0, 4], "configur": 0, "ar": [0, 1, 3, 4, 5, 6, 7], "set": [0, 7], "No": 0, "have": 0, "been": 0, "defin": [0, 5, 6, 7], "These": [1, 3, 4], "here": [1, 3, 4, 5, 7], "skupper": [1, 8], "network": [1, 3, 8], "link": [2, 4], "updat": [2, 4], "base": [2, 4], "provid": [2, 4], "list": [2, 4, 5], "links_load": [2, 4], "load": [2, 4], "exist": [2, 4, 6], "other": [2, 4], "site": [2, 4, 6], "site_load": [2, 4, 5], "inform": [2, 4], "fact": [2, 4], "respect": [2, 4, 6], "host": [2, 4, 5, 6], "collect": 4, "version": [4, 5, 6, 7], "1": [4, 5, 6, 7], "0": [4, 5, 6, 7], "role": [4, 6], "help": 4, "manag": 4, "author": 4, "fernando": 4, "giorgetti": 4, "fgiorgetti": 4, "gmail": 4, "com": 4, "support": 4, "2": 4, "14": 4, "newer": 4, "issu": [4, 5, 6, 7], "tracker": [4, 5, 6, 7], "homepag": [4, 5, 6, 7], "repositori": [4, 5, 6, 7], "sourc": [4, 5, 6, 7], "doc": 4, "thi": [5, 6, 7, 8], "i": [5, 6, 7], "part": [5, 6, 7], "To": [5, 6, 7], "instal": [5, 6, 7], "galaxi": [5, 6, 7], "you": [5, 6, 7], "need": [5, 6, 7], "further": [5, 6, 7], "abl": [5, 6, 7], "see": [5, 6, 7], "detail": [5, 6, 7], "playbook": [5, 6, 7], "specifi": [5, 6, 7], "new": [5, 6, 7], "same": 5, "format": 5, "expect": 5, "refer": 5, "map": [5, 6, 7], "inventori": [5, 6, 7], "file": [5, 7], "depend": 5, "previou": 5, "execut": [5, 6, 7], "which": 5, "id": [5, 7], "each": 5, "without": 5, "consid": 5, "unmap": 5, "might": 5, "remov": 5, "invok": 5, "ha": [5, 6, 7], "correspond": [5, 6, 7], "action": [5, 6, 7], "below": [5, 6, 7], "kubectl": [5, 6, 7], "kubernet": [5, 6, 7], "platform": [5, 6, 7], "podman": [5, 6, 7], "v4": [5, 6, 7], "name": [5, 6, 7], "common": [5, 7], "field": [5, 7], "uniqu": [5, 7], "kei": [5, 7], "descript": [5, 7], "existing_link": 5, "dictionari": [5, 7], "hostnam": [5, 7], "alwai": [5, 7], "sampl": [5, 7], "cost": 5, "b": 5, "through": [6, 7], "variabl": [6, 7, 8], "cannot": 6, "an": [6, 7], "delet": 6, "token": 6, "skupper_token": 6, "manual": 6, "properti": 6, "creat": 6, "If": 6, "found": 6, "request": 6, "fail": 6, "hostvar": 7, "It": 7, "contain": [7, 8], "relat": 7, "info": 7, "can": 7, "runtim": 7, "option": 7, "kubeconfig": 7, "context": 7, "namespac": 7, "endpoint": 7, "custom": 7, "init": 7, "podmanendpoint": 7, "53899d80": 7, "1ae6": 7, "11ee": 7, "be28": 7, "1e9341abe0db": 7, "docsit": 8, "all": 8, "modul": 8, "environ": 8}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"index": [0, 1, 2, 4, 8], "all": [0, 2], "collect": [0, 1, 3, 5, 6, 7, 8], "environ": 0, "variabl": 0, "modul": [2, 4, 5, 6, 7], "skupper": [2, 3, 4, 5, 6, 7], "network": [2, 4, 5, 6, 7], "namespac": 3, "descript": 4, "plugin": [4, 8], "links_load": 5, "load": [5, 7], "exist": 5, "link": [5, 6, 7], "other": 5, "site": [5, 7], "synopsi": [5, 6, 7], "requir": [5, 6, 7], "exampl": [5, 6, 7], "return": [5, 7], "valu": [5, 7], "updat": 6, "base": 6, "provid": 6, "list": 6, "site_load": 7, "inform": 7, "ansibl": [7, 8], "fact": 7, "respect": 7, "host": 7, "welcom": 8, "my": 8, "document": 8, "refer": 8}, "envversion": {"sphinx.domains.c": 2, "sphinx.domains.changeset": 1, "sphinx.domains.citation": 1, "sphinx.domains.cpp": 8, "sphinx.domains.index": 1, "sphinx.domains.javascript": 2, "sphinx.domains.math": 2, "sphinx.domains.python": 3, "sphinx.domains.rst": 2, "sphinx.domains.std": 2, "sphinx.ext.intersphinx": 1, "sphinx": 57}, "alltitles": {"Index of all Collection Environment Variables": [[0, "index-of-all-collection-environment-variables"]], "Collection Index": [[1, "collection-index"]], "Index of all Modules": [[2, "index-of-all-modules"]], "skupper.network": [[2, "skupper-network"]], "Collections in the Skupper Namespace": [[3, "collections-in-the-skupper-namespace"]], "Skupper.Network": [[4, "skupper-network"]], "Description": [[4, "description"]], "Plugin Index": [[4, "plugin-index"]], "Modules": [[4, "modules"]], "skupper.network.links_load module \u2013 Loads existing links to other sites": [[5, "skupper-network-links-load-module-loads-existing-links-to-other-sites"]], "Synopsis": [[5, "synopsis"], [6, "synopsis"], [7, "synopsis"]], "Requirements": [[5, "requirements"], [6, "requirements"], [7, "requirements"]], "Examples": [[5, "examples"], [6, "examples"], [7, "examples"]], "Return Values": [[5, "return-values"], [7, "return-values"]], "Collection links": [[5, "collection-links"], [6, "collection-links"], [7, "collection-links"]], "skupper.network.links module \u2013 Update links based on provided links list": [[6, "skupper-network-links-module-update-links-based-on-provided-links-list"]], "skupper.network.site_load module \u2013 Loads site information as ansible facts into the respective host": [[7, "skupper-network-site-load-module-loads-site-information-as-ansible-facts-into-the-respective-host"]], "Welcome to my Ansible collection documentation": [[8, "welcome-to-my-ansible-collection-documentation"]], "Collections:": [[8, null]], "Plugin indexes:": [[8, null]], "Reference indexes:": [[8, null]]}, "indexentries": {}})
\ No newline at end of file
+Search.setIndex({"docnames": ["collections/environment_variables", "collections/index", "collections/index_module", "collections/skupper/index", "collections/skupper/network/index", "collections/skupper/network/links_load_module", "collections/skupper/network/links_module", "collections/skupper/network/services_load_module", "collections/skupper/network/services_module", "collections/skupper/network/site_load_module", "index"], "filenames": ["collections/environment_variables.rst", "collections/index.rst", "collections/index_module.rst", "collections/skupper/index.rst", "collections/skupper/network/index.rst", "collections/skupper/network/links_load_module.rst", "collections/skupper/network/links_module.rst", "collections/skupper/network/services_load_module.rst", "collections/skupper/network/services_module.rst", "collections/skupper/network/site_load_module.rst", "index.rst"], "titles": ["Index of all Collection Environment Variables", "Collection Index", "Index of all Modules", "Collections in the Skupper Namespace", "Skupper.Network", "skupper.network.links_load module \u2013 Loads existing links to other sites", "skupper.network.links module \u2013 Update links based on provided links list", "skupper.network.services_load module \u2013 Loads existing services and targets", "skupper.network.services module \u2013 Update services based on provided services list", "skupper.network.site_load module \u2013 Loads site information as ansible facts into the respective host", "Welcome to my Ansible collection documentation"], "terms": {"The": [0, 5, 6, 7, 8, 9], "follow": [0, 5, 7, 9], "document": [0, 1, 3, 5, 7, 9], "declar": 0, "plugin": [0, 5, 6, 7, 8, 9], "us": [0, 5, 6, 7, 8, 9], "ansibl": [0, 2, 4, 5, 6, 7, 8], "core": [0, 4], "configur": 0, "ar": [0, 1, 3, 4, 5, 6, 7, 8, 9], "set": [0, 9], "No": 0, "have": [0, 8], "been": 0, "defin": [0, 5, 6, 8, 9], "These": [1, 3, 4], "here": [1, 3, 4, 5, 7, 9], "skupper": [1, 10], "network": [1, 3, 10], "link": [2, 4], "updat": [2, 4], "base": [2, 4], "provid": [2, 4], "list": [2, 4, 5, 7], "links_load": [2, 4], "load": [2, 4], "exist": [2, 4, 6], "other": [2, 4], "site": [2, 4, 6, 7, 8], "servic": [2, 4], "services_load": [2, 4], "target": [2, 4, 8], "site_load": [2, 4, 5], "inform": [2, 4], "fact": [2, 4, 7], "respect": [2, 4, 6, 8], "host": [2, 4, 5, 6, 7, 8], "collect": 4, "version": [4, 5, 6, 7, 8, 9], "1": [4, 5, 6, 7, 8, 9], "3": [4, 5, 6, 7, 8, 9], "role": [4, 6], "help": 4, "manag": 4, "author": 4, "fernando": 4, "giorgetti": 4, "fgiorgetti": 4, "gmail": 4, "com": 4, "support": 4, "2": 4, "14": 4, "0": [4, 5, 6, 9], "newer": 4, "issu": [4, 5, 6, 7, 8, 9], "tracker": [4, 5, 6, 7, 8, 9], "homepag": [4, 5, 6, 7, 8, 9], "repositori": [4, 5, 6, 7, 8, 9], "sourc": [4, 5, 6, 7, 8, 9], "doc": 4, "thi": [5, 6, 7, 8, 9, 10], "i": [5, 6, 7, 8, 9], "part": [5, 6, 7, 8, 9], "To": [5, 6, 7, 8, 9], "instal": [5, 6, 7, 8, 9], "galaxi": [5, 6, 7, 8, 9], "you": [5, 6, 7, 8, 9], "need": [5, 6, 7, 8, 9], "further": [5, 6, 7, 8, 9], "abl": [5, 6, 7, 8, 9], "see": [5, 6, 7, 8, 9], "detail": [5, 6, 7, 8, 9], "playbook": [5, 6, 7, 8, 9], "specifi": [5, 6, 7, 8, 9], "new": [5, 6, 7, 8, 9], "same": 5, "format": 5, "expect": 5, "refer": 5, "map": [5, 6, 9], "inventori": [5, 6, 9], "file": [5, 9], "depend": 5, "previou": 5, "execut": [5, 6, 7, 8, 9], "which": 5, "id": [5, 9], "each": 5, "without": 5, "consid": 5, "unmap": 5, "might": 5, "remov": 5, "invok": 5, "ha": [5, 6, 7, 8, 9], "correspond": [5, 6, 7, 8, 9], "action": [5, 6, 7, 8, 9], "below": [5, 6, 7, 8, 9], "kubectl": [5, 6, 7, 8, 9], "kubernet": [5, 6, 7, 8, 9], "platform": [5, 6, 7, 8, 9], "podman": [5, 6, 7, 8, 9], "v4": [5, 6, 7, 8, 9], "name": [5, 6, 7, 8, 9], "common": [5, 7, 9], "field": [5, 7, 9], "uniqu": [5, 7, 9], "kei": [5, 7, 9], "descript": [5, 7, 9], "existing_link": 5, "dictionari": [5, 7, 9], "hostnam": [5, 9], "alwai": [5, 7, 9], "sampl": [5, 7, 9], "cost": 5, "b": 5, "through": [6, 8, 9], "variabl": [6, 8, 9, 10], "cannot": 6, "an": [6, 9], "delet": [6, 8], "token": 6, "skupper_token": 6, "manual": 6, "properti": 6, "creat": [6, 8], "If": [6, 8], "found": 6, "request": 6, "fail": 6, "under": 7, "existing_servic": 7, "db": 7, "port": 7, "5432": 7, "nearestprim": 7, "8000": 7, "type": 7, "deploy": 7, "gener": 8, "chang": 8, "just": 8, "spec": 8, "hostvar": 9, "It": 9, "contain": [9, 10], "relat": 9, "info": 9, "can": 9, "runtim": 9, "option": 9, "kubeconfig": 9, "context": 9, "namespac": 9, "endpoint": 9, "custom": 9, "init": 9, "podmanendpoint": 9, "53899d80": 9, "1ae6": 9, "11ee": 9, "be28": 9, "1e9341abe0db": 9, "docsit": 10, "all": 10, "modul": 10, "environ": 10}, "objects": {}, "objtypes": {}, "objnames": {}, "titleterms": {"index": [0, 1, 2, 4, 10], "all": [0, 2], "collect": [0, 1, 3, 5, 6, 7, 8, 9, 10], "environ": 0, "variabl": 0, "modul": [2, 4, 5, 6, 7, 8, 9], "skupper": [2, 3, 4, 5, 6, 7, 8, 9], "network": [2, 4, 5, 6, 7, 8, 9], "namespac": 3, "descript": 4, "plugin": [4, 10], "links_load": 5, "load": [5, 7, 9], "exist": [5, 7], "link": [5, 6, 7, 8, 9], "other": 5, "site": [5, 9], "synopsi": [5, 6, 7, 8, 9], "requir": [5, 6, 7, 8, 9], "exampl": [5, 6, 7, 8, 9], "return": [5, 7, 9], "valu": [5, 7, 9], "updat": [6, 8], "base": [6, 8], "provid": [6, 8], "list": [6, 8], "services_load": 7, "servic": [7, 8], "target": 7, "site_load": 9, "inform": 9, "ansibl": [9, 10], "fact": 9, "respect": 9, "host": 9, "welcom": 10, "my": 10, "document": 10, "refer": 10}, "envversion": {"sphinx.domains.c": 2, "sphinx.domains.changeset": 1, "sphinx.domains.citation": 1, "sphinx.domains.cpp": 8, "sphinx.domains.index": 1, "sphinx.domains.javascript": 2, "sphinx.domains.math": 2, "sphinx.domains.python": 3, "sphinx.domains.rst": 2, "sphinx.domains.std": 2, "sphinx.ext.intersphinx": 1, "sphinx": 57}, "alltitles": {"Index of all Collection Environment Variables": [[0, "index-of-all-collection-environment-variables"]], "Collection Index": [[1, "collection-index"]], "Index of all Modules": [[2, "index-of-all-modules"]], "skupper.network": [[2, "skupper-network"]], "Collections in the Skupper Namespace": [[3, "collections-in-the-skupper-namespace"]], "Skupper.Network": [[4, "skupper-network"]], "Description": [[4, "description"]], "Plugin Index": [[4, "plugin-index"]], "Modules": [[4, "modules"]], "skupper.network.links_load module \u2013 Loads existing links to other sites": [[5, "skupper-network-links-load-module-loads-existing-links-to-other-sites"]], "Synopsis": [[5, "synopsis"], [6, "synopsis"], [7, "synopsis"], [8, "synopsis"], [9, "synopsis"]], "Requirements": [[5, "requirements"], [6, "requirements"], [7, "requirements"], [8, "requirements"], [9, "requirements"]], "Examples": [[5, "examples"], [6, "examples"], [7, "examples"], [8, "examples"], [9, "examples"]], "Return Values": [[5, "return-values"], [7, "return-values"], [9, "return-values"]], "Collection links": [[5, "collection-links"], [6, "collection-links"], [7, "collection-links"], [8, "collection-links"], [9, "collection-links"]], "skupper.network.links module \u2013 Update links based on provided links list": [[6, "skupper-network-links-module-update-links-based-on-provided-links-list"]], "skupper.network.services_load module \u2013 Loads existing services and targets": [[7, "skupper-network-services-load-module-loads-existing-services-and-targets"]], "skupper.network.services module \u2013 Update services based on provided services list": [[8, "skupper-network-services-module-update-services-based-on-provided-services-list"]], "skupper.network.site_load module \u2013 Loads site information as ansible facts into the respective host": [[9, "skupper-network-site-load-module-loads-site-information-as-ansible-facts-into-the-respective-host"]], "Welcome to my Ansible collection documentation": [[10, "welcome-to-my-ansible-collection-documentation"]], "Collections:": [[10, null]], "Plugin indexes:": [[10, null]], "Reference indexes:": [[10, null]]}, "indexentries": {}})
\ No newline at end of file
diff --git a/skupper/network/docs/conf.py b/skupper/network/docs/conf.py
index 8ae6dc1..f29e0a9 100644
--- a/skupper/network/docs/conf.py
+++ b/skupper/network/docs/conf.py
@@ -41,4 +41,3 @@
 default_role = 'any'
 
 nitpicky = True
-
diff --git a/skupper/network/docs/rst/collections/index_module.rst b/skupper/network/docs/rst/collections/index_module.rst
index 1dc39dc..a55cca3 100644
--- a/skupper/network/docs/rst/collections/index_module.rst
+++ b/skupper/network/docs/rst/collections/index_module.rst
@@ -11,5 +11,7 @@ skupper.network
 
 * :ansplugin:`skupper.network.links#module` -- Update links based on provided links list
 * :ansplugin:`skupper.network.links_load#module` -- Loads existing links to other sites
+* :ansplugin:`skupper.network.services#module` -- Update services based on provided services list
+* :ansplugin:`skupper.network.services_load#module` -- Loads existing services and targets
 * :ansplugin:`skupper.network.site_load#module` -- Loads site information as ansible facts into the respective host
 
diff --git a/skupper/network/docs/rst/collections/skupper/network/index.rst b/skupper/network/docs/rst/collections/skupper/network/index.rst
index ffada65..cac9f50 100644
--- a/skupper/network/docs/rst/collections/skupper/network/index.rst
+++ b/skupper/network/docs/rst/collections/skupper/network/index.rst
@@ -6,7 +6,7 @@
 Skupper.Network
 ===============
 
-Collection version 1.1.0
+Collection version 1.1.3
 
 .. contents::
    :local:
@@ -50,6 +50,8 @@ Modules
 
 * :ansplugin:`links module <skupper.network.links#module>` -- Update links based on provided links list
 * :ansplugin:`links_load module <skupper.network.links_load#module>` -- Loads existing links to other sites
+* :ansplugin:`services module <skupper.network.services#module>` -- Update services based on provided services list
+* :ansplugin:`services_load module <skupper.network.services_load#module>` -- Loads existing services and targets
 * :ansplugin:`site_load module <skupper.network.site_load#module>` -- Loads site information as ansible facts into the respective host
 
 .. toctree::
@@ -58,6 +60,8 @@ Modules
 
     links_module
     links_load_module
+    services_module
+    services_load_module
     site_load_module
 
 
diff --git a/skupper/network/docs/rst/collections/skupper/network/links_load_module.rst b/skupper/network/docs/rst/collections/skupper/network/links_load_module.rst
index f864fb8..1d01a8c 100644
--- a/skupper/network/docs/rst/collections/skupper/network/links_load_module.rst
+++ b/skupper/network/docs/rst/collections/skupper/network/links_load_module.rst
@@ -38,7 +38,7 @@ skupper.network.links_load module -- Loads existing links to other sites
 .. Collection note
 
 .. note::
-    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.0).
+    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.3).
 
     To install it, use: :code:`ansible-galaxy collection install skupper.network`.
     You need further requirements to be able to use this module,
diff --git a/skupper/network/docs/rst/collections/skupper/network/links_module.rst b/skupper/network/docs/rst/collections/skupper/network/links_module.rst
index 9e6cb50..d6f7e8a 100644
--- a/skupper/network/docs/rst/collections/skupper/network/links_module.rst
+++ b/skupper/network/docs/rst/collections/skupper/network/links_module.rst
@@ -38,7 +38,7 @@ skupper.network.links module -- Update links based on provided links list
 .. Collection note
 
 .. note::
-    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.0).
+    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.3).
 
     To install it, use: :code:`ansible-galaxy collection install skupper.network`.
     You need further requirements to be able to use this module,
diff --git a/skupper/network/docs/rst/collections/skupper/network/services_load_module.rst b/skupper/network/docs/rst/collections/skupper/network/services_load_module.rst
new file mode 100644
index 0000000..bb3eb5f
--- /dev/null
+++ b/skupper/network/docs/rst/collections/skupper/network/services_load_module.rst
@@ -0,0 +1,203 @@
+
+.. Document meta
+
+:orphan:
+
+.. |antsibull-internal-nbsp| unicode:: 0xA0
+    :trim:
+
+.. role:: ansible-attribute-support-label
+.. role:: ansible-attribute-support-property
+.. role:: ansible-attribute-support-full
+.. role:: ansible-attribute-support-partial
+.. role:: ansible-attribute-support-none
+.. role:: ansible-attribute-support-na
+.. role:: ansible-option-type
+.. role:: ansible-option-elements
+.. role:: ansible-option-required
+.. role:: ansible-option-versionadded
+.. role:: ansible-option-aliases
+.. role:: ansible-option-choices
+.. role:: ansible-option-choices-default-mark
+.. role:: ansible-option-default-bold
+.. role:: ansible-option-configuration
+.. role:: ansible-option-returned-bold
+.. role:: ansible-option-sample-bold
+
+.. Anchors
+
+.. _ansible_collections.skupper.network.services_load_module:
+
+.. Anchors: short name for ansible.builtin
+
+.. Title
+
+skupper.network.services_load module -- Loads existing services and targets
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. Collection note
+
+.. note::
+    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.3).
+
+    To install it, use: :code:`ansible-galaxy collection install skupper.network`.
+    You need further requirements to be able to use this module,
+    see :ref:`Requirements <ansible_collections.skupper.network.services_load_module_requirements>` for details.
+
+    To use it in a playbook, specify: :code:`skupper.network.services_load`.
+
+.. version_added
+
+.. rst-class:: ansible-version-added
+
+New in skupper.network 1.1.3
+
+.. contents::
+   :local:
+   :depth: 1
+
+.. Deprecated
+
+
+Synopsis
+--------
+
+.. Description
+
+- Loads existing Skupper services and targets. Existing services will be returned under the \`existing\_services\` fact.
+
+.. note::
+    This module has a corresponding :ref:`action plugin <action_plugins>`.
+
+.. Aliases
+
+
+.. Requirements
+
+.. _ansible_collections.skupper.network.services_load_module_requirements:
+
+Requirements
+------------
+The below requirements are needed on the host that executes this module.
+
+- kubectl if using kubernetes platform
+- podman v4+ if using podman as the site platform
+
+
+
+
+
+
+.. Options
+
+
+.. Attributes
+
+
+.. Notes
+
+
+.. Seealso
+
+
+.. Examples
+
+Examples
+--------
+
+.. code-block:: yaml+jinja
+
+    
+    - name: Loading existing services
+      skupper.network.services_load:
+
+
+
+
+.. Facts
+
+
+.. Return values
+
+Return Values
+-------------
+Common return values are documented :ref:`here <common_return_values>`, the following are the fields unique to this module:
+
+.. rst-class:: ansible-option-table
+
+.. list-table::
+  :width: 100%
+  :widths: auto
+  :header-rows: 1
+
+  * - Key
+    - Description
+
+  * - .. raw:: html
+
+        <div class="ansible-option-cell">
+        <div class="ansibleOptionAnchor" id="return-existing_services"></div>
+
+      .. _ansible_collections.skupper.network.services_load_module__return-existing_services:
+
+      .. rst-class:: ansible-option-title
+
+      **existing_services**
+
+      .. raw:: html
+
+        <a class="ansibleOptionLink" href="#return-existing_services" title="Permalink to this return value"></a>
+
+      .. rst-class:: ansible-option-type-line
+
+      :ansible-option-type:`dictionary`
+
+      .. raw:: html
+
+        </div>
+
+    - .. raw:: html
+
+        <div class="ansible-option-cell">
+
+      List of existing services and targets
+
+
+      .. rst-class:: ansible-option-line
+
+      :ansible-option-returned-bold:`Returned:` always
+
+      .. rst-class:: ansible-option-line
+      .. rst-class:: ansible-option-sample
+
+      :ansible-option-sample-bold:`Sample:` :ansible-rv-sample-value:`{"existing\_services": {"db": {"ports": [5432]}, "nearestprime": {"ports": [8000], "targets": [{"name": "nearestprime", "type": "deployment"}]}}}`
+
+
+      .. raw:: html
+
+        </div>
+
+
+
+..  Status (Presently only deprecated)
+
+
+.. Authors
+
+
+
+.. Extra links
+
+Collection links
+~~~~~~~~~~~~~~~~
+
+.. raw:: html
+
+  <p class="ansible-links">
+    <a href="http://github.com/skupperproject/skupper-ansible/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+    <a href="http://skupper.io" aria-role="button" target="_blank" rel="noopener external">Homepage</a>
+    <a href="http://github.com/skupperproject/skupper-ansible" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+  </p>
+
+.. Parsing errors
+
diff --git a/skupper/network/docs/rst/collections/skupper/network/services_module.rst b/skupper/network/docs/rst/collections/skupper/network/services_module.rst
new file mode 100644
index 0000000..199961c
--- /dev/null
+++ b/skupper/network/docs/rst/collections/skupper/network/services_module.rst
@@ -0,0 +1,146 @@
+
+.. Document meta
+
+:orphan:
+
+.. |antsibull-internal-nbsp| unicode:: 0xA0
+    :trim:
+
+.. role:: ansible-attribute-support-label
+.. role:: ansible-attribute-support-property
+.. role:: ansible-attribute-support-full
+.. role:: ansible-attribute-support-partial
+.. role:: ansible-attribute-support-none
+.. role:: ansible-attribute-support-na
+.. role:: ansible-option-type
+.. role:: ansible-option-elements
+.. role:: ansible-option-required
+.. role:: ansible-option-versionadded
+.. role:: ansible-option-aliases
+.. role:: ansible-option-choices
+.. role:: ansible-option-choices-default-mark
+.. role:: ansible-option-default-bold
+.. role:: ansible-option-configuration
+.. role:: ansible-option-returned-bold
+.. role:: ansible-option-sample-bold
+
+.. Anchors
+
+.. _ansible_collections.skupper.network.services_module:
+
+.. Anchors: short name for ansible.builtin
+
+.. Title
+
+skupper.network.services module -- Update services based on provided services list
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+.. Collection note
+
+.. note::
+    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.3).
+
+    To install it, use: :code:`ansible-galaxy collection install skupper.network`.
+    You need further requirements to be able to use this module,
+    see :ref:`Requirements <ansible_collections.skupper.network.services_module_requirements>` for details.
+
+    To use it in a playbook, specify: :code:`skupper.network.services`.
+
+.. version_added
+
+.. rst-class:: ansible-version-added
+
+New in skupper.network 1.1.3
+
+.. contents::
+   :local:
+   :depth: 1
+
+.. Deprecated
+
+
+Synopsis
+--------
+
+.. Description
+
+- Updates the services defined by the respective site, based on the services list defined through the host variables
+- The services plugin will generate a list of services (or targets) to be created and deleted
+- If targets have changed then the create and delete lists will have just the name and respective targets (no spec)
+
+.. note::
+    This module has a corresponding :ref:`action plugin <action_plugins>`.
+
+.. Aliases
+
+
+.. Requirements
+
+.. _ansible_collections.skupper.network.services_module_requirements:
+
+Requirements
+------------
+The below requirements are needed on the host that executes this module.
+
+- kubectl if using kubernetes platform
+- podman v4+ if using podman as the site platform
+
+
+
+
+
+
+.. Options
+
+
+.. Attributes
+
+
+.. Notes
+
+
+.. Seealso
+
+
+.. Examples
+
+Examples
+--------
+
+.. code-block:: yaml+jinja
+
+    
+    - name: Updating services
+      skupper.network.services:
+
+
+
+
+.. Facts
+
+
+.. Return values
+
+
+..  Status (Presently only deprecated)
+
+
+.. Authors
+
+
+
+.. Extra links
+
+Collection links
+~~~~~~~~~~~~~~~~
+
+.. raw:: html
+
+  <p class="ansible-links">
+    <a href="http://github.com/skupperproject/skupper-ansible/issues" aria-role="button" target="_blank" rel="noopener external">Issue Tracker</a>
+    <a href="http://skupper.io" aria-role="button" target="_blank" rel="noopener external">Homepage</a>
+    <a href="http://github.com/skupperproject/skupper-ansible" aria-role="button" target="_blank" rel="noopener external">Repository (Sources)</a>
+  </p>
+
+.. Parsing errors
+
diff --git a/skupper/network/docs/rst/collections/skupper/network/site_load_module.rst b/skupper/network/docs/rst/collections/skupper/network/site_load_module.rst
index 060e0e2..235ef78 100644
--- a/skupper/network/docs/rst/collections/skupper/network/site_load_module.rst
+++ b/skupper/network/docs/rst/collections/skupper/network/site_load_module.rst
@@ -38,7 +38,7 @@ skupper.network.site_load module -- Loads site information as ansible facts into
 .. Collection note
 
 .. note::
-    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.0).
+    This module is part of the `skupper.network collection <https://galaxy.ansible.com/skupper/network>`_ (version 1.1.3).
 
     To install it, use: :code:`ansible-galaxy collection install skupper.network`.
     You need further requirements to be able to use this module,
diff --git a/skupper/network/galaxy.yml b/skupper/network/galaxy.yml
index f90404b..5debc3d 100644
--- a/skupper/network/galaxy.yml
+++ b/skupper/network/galaxy.yml
@@ -8,7 +8,7 @@ namespace: skupper
 name: network
 
 # The version of the collection. Must be compatible with semantic versioning
-version: 1.1.2
+version: 1.2.0
 
 # The path to the Markdown (.md) readme file. This path is relative to the root of the collection
 readme: README.md
diff --git a/skupper/network/plugins/action/__init__.py b/skupper/network/plugins/action/__init__.py
index e69de29..436d7c2 100644
--- a/skupper/network/plugins/action/__init__.py
+++ b/skupper/network/plugins/action/__init__.py
@@ -0,0 +1,37 @@
+from ansible.plugins.action import ActionBase
+
+
+class BaseActionModule(ActionBase):
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+        self.platform = ""
+        self.kubeconfig = ""
+        self.context = ""
+        self.namespace = ""
+        self.hostname = ""
+        self.podman_endpoint = ""
+        self.hostvars = dict()
+        self.my_hostvars = dict()
+
+    def run(self, tmp=None, task_vars=None):
+        result = super(BaseActionModule, self).run(tmp, task_vars)
+        self.hostname = task_vars['vars']['inventory_hostname']
+        self.hostvars = task_vars['hostvars'] if 'hostvars' in task_vars else dict()
+        self.my_hostvars = self.hostvars[self.hostname] if self.hostname in self.hostvars else dict()
+        self.platform = self.my_hostvars['platform'] if 'platform' in self.my_hostvars else 'kubernetes'
+        self.kubeconfig = self.my_hostvars['kubeconfig'] if 'kubeconfig' in self.my_hostvars else ''
+        self.context = self.my_hostvars['context'] if 'context' in self.my_hostvars else ''
+        self.namespace = self.my_hostvars['namespace'] if 'namespace' in self.my_hostvars else ''
+        init = self.my_hostvars['init'] if 'init' in self.my_hostvars else dict()
+        self.podman_endpoint = init['podmanEndpoint'] if 'podmanEndpoint' in init else ""
+        return result
+
+    def module_args(self) -> dict:
+        module_args = self._task.args.copy()
+        module_args['platform'] = self.platform
+        module_args['kubeconfig'] = self.kubeconfig
+        module_args['context'] = self.context
+        module_args['namespace'] = self.namespace
+        module_args['podman_endpoint'] = self.podman_endpoint
+        module_args['hostname'] = self.hostname
+        return module_args
diff --git a/skupper/network/plugins/action/links.py b/skupper/network/plugins/action/links.py
index adb5276..c858789 100644
--- a/skupper/network/plugins/action/links.py
+++ b/skupper/network/plugins/action/links.py
@@ -1,5 +1,5 @@
 from ansible.utils.vars import merge_hash
-from ..module_utils.base_action import *
+from . import BaseActionModule
 
 
 class ActionModule(BaseActionModule):
diff --git a/skupper/network/plugins/action/links_load.py b/skupper/network/plugins/action/links_load.py
index 1d3b161..31bcc92 100644
--- a/skupper/network/plugins/action/links_load.py
+++ b/skupper/network/plugins/action/links_load.py
@@ -1,6 +1,6 @@
 from ansible.utils.vars import merge_hash
-from ..module_utils.base_action import *
-from ..module_utils.sites import *
+from . import BaseActionModule
+from ..module_utils.sites import get_sites
 
 
 class ActionModule(BaseActionModule):
diff --git a/skupper/network/plugins/action/services.py b/skupper/network/plugins/action/services.py
new file mode 100644
index 0000000..76a32b8
--- /dev/null
+++ b/skupper/network/plugins/action/services.py
@@ -0,0 +1,159 @@
+from ansible.utils.vars import merge_hash
+from . import BaseActionModule
+from ..module_utils.types import Service, ServiceTarget, ServiceParam
+
+
+class ActionModule(BaseActionModule):
+
+    @staticmethod
+    def remove_service_targets_labels(svc: Service):
+        """
+        Remove targets and labels from service specification.
+        Labels and targets are evaluated and managed separately,
+        as they can be individually added/removed.
+        :param svc:
+        """
+        if 'targets' in svc.__dict__:
+            delattr(svc, 'targets')
+        if 'labels' in svc.__dict__:
+            delattr(svc, 'labels')
+
+    @staticmethod
+    def labels_dict_to_list(labels: dict, delete: bool = False) -> list[str]:
+        ll = list[str]()
+        for k, v in labels.items():
+            ll.append(("%s=%s" % (k, v) if not delete else ("%s-" % k)))
+        return ll
+
+    @staticmethod
+    def labels_as_dict(labels: list) -> dict[str, str]:
+        ld = dict[str, str]()
+        if not labels:
+            return ld
+        for label in labels:
+            k, v = label.split("=")
+            ld[k] = v
+        return ld
+
+    def run(self, tmp=None, task_vars=None):
+        # parsing arguments and initializing result dict
+        result = super(ActionModule, self).run(tmp, task_vars)
+        module_args = self.module_args()
+
+        # determining services to create and delete
+        # services = task_vars['vars']['services'] if 'services' in task_vars['vars'] else dict()
+        services = self.my_hostvars['services'] if 'services' in self.my_hostvars else dict()
+        existing_services = task_vars['vars']['existing_services'] if 'existing_services' in task_vars['vars'] \
+            else dict()
+
+        # lists with ServiceParam dictionaries to be passed as arguments to the module
+        create = list()
+        delete = list()
+
+        # services to be removed or updated
+        for svc_name, ex_svc_info in existing_services.items():
+            if svc_name not in services:
+                delete.append(ServiceParam(name=svc_name).vars())
+            else:
+                svc_info = services[svc_name]
+                ex_svc = Service(**ex_svc_info)
+                ex_labels = self.labels_as_dict(ex_svc.labels if ex_svc.labels else dict())
+                svc = Service(**svc_info)
+                labels = self.labels_as_dict(svc.labels if svc.labels else dict())
+                # removing targets and labels to compare service definition only
+                self.remove_service_targets_labels(ex_svc)
+                self.remove_service_targets_labels(svc)
+                # svc spec has changed (delete and create service and targets)
+                if vars(ex_svc) != vars(svc):
+                    delete.append(ServiceParam(name=svc_name).vars())
+                    create.append(ServiceParam(
+                        name=svc_name,
+                        spec=svc.vars(),
+                        labels=self.labels_dict_to_list(labels),
+                        targets=list[ServiceTarget](svc_info['targets'] if 'targets' in svc_info else list())
+                    ).vars())
+                    continue
+
+                # validating existing targets
+                del_targets = list[dict]()
+                if 'targets' in ex_svc_info:
+                    ex_targets = ex_svc_info['targets']
+                    if 'targets' not in svc_info:
+                        del_targets += ex_targets
+                        # delete.append(ServiceParam(name=svc_name, targets=ex_targets).vars())
+                    else:
+                        targets = svc_info['targets']
+                        all_target_ports = list[str]()
+                        for port in svc.ports:
+                            all_target_ports.append("%d:%d" % (port, port))
+                        for target in targets:
+                            if 'ports' not in target:
+                                target['ports'] = all_target_ports
+
+                        for ex_target in ex_targets:
+                            if ex_target not in targets:
+                                del_targets.append(ServiceTarget(**ex_target).vars())
+                        # if len(del_targets) > 0:
+                        #     delete.append(ServiceParam(name=svc_name, targets=del_targets).vars())
+
+                # validating labels
+                del_labels = dict()
+                # removed or modified labels
+                for key, val in ex_labels.items():
+                    if key not in labels:
+                        del_labels[key] = val
+                if len(del_targets) > 0 or len(del_labels) > 0:
+                    delete.append(ServiceParam(name=svc_name,
+                                               targets=del_targets,
+                                               labels=self.labels_dict_to_list(del_labels, True)
+                                               ).vars())
+
+        for svc_name, svc_info in services.items():
+            # new service found
+            svc = Service(**svc_info)
+
+            # adding target ports if missing
+            targets = svc_info['targets'] if 'targets' in svc_info else list()
+            all_target_ports = list[str]()
+            for port in svc.ports:
+                all_target_ports.append("%d:%d" % (port, port))
+            for target in targets:
+                if 'ports' not in target:
+                    target['ports'] = all_target_ports
+
+            labels = self.labels_as_dict(svc.labels if svc.labels else dict())
+            if svc_name not in existing_services:
+                create.append(ServiceParam(
+                    name=svc_name,
+                    spec=svc.vars(),
+                    labels=self.labels_dict_to_list(labels),
+                    targets=targets
+                ).vars())
+                continue
+
+            # validating new targets
+            ex_svc_info = existing_services[svc_name]
+            ex_targets = ex_svc_info['targets'] if 'targets' in ex_svc_info else list()
+            add_targets = list[dict]()
+            for target in targets:
+                if target not in ex_targets:
+                    add_targets.append(ServiceTarget(**target).vars())
+
+            # validating new labels
+            ex_svc = Service(**ex_svc_info)
+            ex_labels = self.labels_as_dict(ex_svc.labels if ex_svc.labels else dict())
+            add_labels = dict[str, str]()
+            for key, val in labels.items():
+                if key not in ex_labels:
+                    add_labels[key] = val
+
+            if len(add_targets) > 0 or len(add_labels) > 0:
+                create.append(ServiceParam(name=svc_name,
+                                           targets=add_targets,
+                                           labels=self.labels_dict_to_list(add_labels)).vars())
+
+        # executing module
+        module_args['create'] = create
+        module_args['delete'] = delete
+        result = merge_hash(result, self._execute_module(module_args=module_args, task_vars=task_vars, tmp=tmp))
+        return result
diff --git a/skupper/network/plugins/action/services_load.py b/skupper/network/plugins/action/services_load.py
new file mode 100644
index 0000000..d2216ec
--- /dev/null
+++ b/skupper/network/plugins/action/services_load.py
@@ -0,0 +1,16 @@
+from ansible.utils.vars import merge_hash
+from . import BaseActionModule
+
+
+class ActionModule(BaseActionModule):
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+    def run(self, tmp=None, task_vars=None):
+        # parsing arguments and initializing result dict
+        result = super(ActionModule, self).run(tmp, task_vars)
+        module_args = self.module_args()
+        # executing module
+        result = merge_hash(result, self._execute_module(module_args=module_args, task_vars=task_vars, tmp=tmp))
+        return result
diff --git a/skupper/network/plugins/action/site_load.py b/skupper/network/plugins/action/site_load.py
index 5ef7155..d2216ec 100644
--- a/skupper/network/plugins/action/site_load.py
+++ b/skupper/network/plugins/action/site_load.py
@@ -1,5 +1,5 @@
 from ansible.utils.vars import merge_hash
-from ..module_utils.base_action import *
+from . import BaseActionModule
 
 
 class ActionModule(BaseActionModule):
diff --git a/skupper/network/plugins/doc_fragments/common.py b/skupper/network/plugins/doc_fragments/common.py
new file mode 100644
index 0000000..4f3d0c6
--- /dev/null
+++ b/skupper/network/plugins/doc_fragments/common.py
@@ -0,0 +1,42 @@
+# -*- coding: utf-8 -*-
+
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+class ModuleDocFragment(object):
+    # Standard documentation
+    DOCUMENTATION = r'''
+    options:
+        platform:
+            description:
+                - Platform to be used (kubernetes or podman)
+            type: str
+            required: false
+        kubeconfig:
+            description:
+                - KUBECONFIG file to be used (defaults to ${HOME}/.kube/config)
+            type: str
+            required: false
+        context:
+            description:
+                - KUBECONFIG context to use
+            type: str
+            required: false
+        namespace:
+            description:
+                - Kubernetes namespace to run the Skupper site
+            type: str
+            required: false
+        podman_endpoint:
+            description:
+                - Podman endpoint to use when managing a Skupper site
+            type: str
+            required: false
+        hostname:
+            description:
+                - Ansible's inventory_hostname used to represent the given Skupper site
+                - This is automatically provided by the action plugin
+            type: str
+            required: false
+    '''
diff --git a/skupper/network/plugins/module_utils/args.py b/skupper/network/plugins/module_utils/args.py
index 879429a..c1a811d 100644
--- a/skupper/network/plugins/module_utils/args.py
+++ b/skupper/network/plugins/module_utils/args.py
@@ -1,3 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+
+__metaclass__ = type
+
+
 def common_args() -> dict:
     return dict(
         platform=dict(type='str', required=False),
diff --git a/skupper/network/plugins/module_utils/base_action.py b/skupper/network/plugins/module_utils/base_action.py
deleted file mode 100644
index 436d7c2..0000000
--- a/skupper/network/plugins/module_utils/base_action.py
+++ /dev/null
@@ -1,37 +0,0 @@
-from ansible.plugins.action import ActionBase
-
-
-class BaseActionModule(ActionBase):
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
-        self.platform = ""
-        self.kubeconfig = ""
-        self.context = ""
-        self.namespace = ""
-        self.hostname = ""
-        self.podman_endpoint = ""
-        self.hostvars = dict()
-        self.my_hostvars = dict()
-
-    def run(self, tmp=None, task_vars=None):
-        result = super(BaseActionModule, self).run(tmp, task_vars)
-        self.hostname = task_vars['vars']['inventory_hostname']
-        self.hostvars = task_vars['hostvars'] if 'hostvars' in task_vars else dict()
-        self.my_hostvars = self.hostvars[self.hostname] if self.hostname in self.hostvars else dict()
-        self.platform = self.my_hostvars['platform'] if 'platform' in self.my_hostvars else 'kubernetes'
-        self.kubeconfig = self.my_hostvars['kubeconfig'] if 'kubeconfig' in self.my_hostvars else ''
-        self.context = self.my_hostvars['context'] if 'context' in self.my_hostvars else ''
-        self.namespace = self.my_hostvars['namespace'] if 'namespace' in self.my_hostvars else ''
-        init = self.my_hostvars['init'] if 'init' in self.my_hostvars else dict()
-        self.podman_endpoint = init['podmanEndpoint'] if 'podmanEndpoint' in init else ""
-        return result
-
-    def module_args(self) -> dict:
-        module_args = self._task.args.copy()
-        module_args['platform'] = self.platform
-        module_args['kubeconfig'] = self.kubeconfig
-        module_args['context'] = self.context
-        module_args['namespace'] = self.namespace
-        module_args['podman_endpoint'] = self.podman_endpoint
-        module_args['hostname'] = self.hostname
-        return module_args
diff --git a/skupper/network/plugins/module_utils/sites.py b/skupper/network/plugins/module_utils/sites.py
index 6352b6e..53b1fed 100644
--- a/skupper/network/plugins/module_utils/sites.py
+++ b/skupper/network/plugins/module_utils/sites.py
@@ -1,3 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+
+__metaclass__ = type
+
+
 def get_sites(hostvars) -> list[dict]:
     # map site entry by site id
     sites = list[dict]()
diff --git a/skupper/network/plugins/module_utils/skupper_cli.py b/skupper/network/plugins/module_utils/skupper_cli.py
index 41f292a..e0104dd 100644
--- a/skupper/network/plugins/module_utils/skupper_cli.py
+++ b/skupper/network/plugins/module_utils/skupper_cli.py
@@ -1,3 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+
+
+__metaclass__ = type
+
+
 def prepare_command(params: dict) -> list[str]:
     command = list[str]()
     platform = params['platform'] if 'platform' in params else 'kubernetes'
diff --git a/skupper/network/plugins/module_utils/types.py b/skupper/network/plugins/module_utils/types.py
index 239b8bf..4770fe2 100644
--- a/skupper/network/plugins/module_utils/types.py
+++ b/skupper/network/plugins/module_utils/types.py
@@ -1,3 +1,9 @@
+from __future__ import (absolute_import, division, print_function)
+import typing
+
+__metaclass__ = type
+
+
 class Result:
     def __init__(self):
         self.msgs: list = list()
@@ -40,3 +46,52 @@ def __init__(self):
 
     def unmapped(self) -> bool:
         return self.host == ""
+
+
+class ServiceTarget:
+    def __init__(self, **kwargs):
+        self.type: str = ""
+        self.name: str = ""
+        self.ports: typing.Optional[list[str]] = None
+        self.__dict__.update(kwargs)
+
+    def vars(self) -> dict:
+        return {k: v for k, v in vars(self).items() if v}
+
+
+class Service:
+    def __init__(self, **kwargs):
+        self.ports: list[int] = []
+        self.protocol: str = ""
+        self.targets: typing.Optional[list[dict]] = None
+        self.labels: typing.Optional[list] = None
+        self.aggregate: typing.Optional[str] = None
+        self.generateTlsSecrets: typing.Optional[bool] = None
+        self.eventChannel: typing.Optional[bool] = None
+        # podman only
+        self.containerName: typing.Optional[str] = None
+        self.hostIp: typing.Optional[str] = None
+        self.hostPorts: typing.Optional[list[str]] = None
+        self.__dict__.update(kwargs)
+        if self.protocol == "":
+            self.protocol = "tcp"
+
+    def vars(self) -> dict:
+        return {k: v for k, v in vars(self).items() if v}
+
+
+class ServiceParam:
+    def __init__(self, **kwargs):
+        self.name: str = ""
+        # spec can be omitted if intention is just to manipulate targets or labels
+        self.spec: typing.Optional[dict] = None
+        self.targets: typing.Optional[list[ServiceTarget]] = None
+        self.labels: typing.Optional[list[str]] = None
+        self.__dict__.update(**kwargs)
+        if self.spec and 'targets' in self.spec:
+            del (self.spec['targets'])
+        if self.spec and 'labels' in self.spec:
+            del (self.spec['labels'])
+
+    def vars(self) -> dict:
+        return {k: v for k, v in vars(self).items() if v}
diff --git a/skupper/network/plugins/modules/links.py b/skupper/network/plugins/modules/links.py
index 1a92106..6f9df39 100644
--- a/skupper/network/plugins/modules/links.py
+++ b/skupper/network/plugins/modules/links.py
@@ -1,20 +1,16 @@
 #!/usr/bin/python
-import tempfile
-import traceback
-
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
+# -*- coding: utf-8 -*-
 
-from ..module_utils.args import *
-from ..module_utils.skupper_cli import prepare_command
-from ..module_utils.types import Result
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-__metaclass__ = type
+from __future__ import (absolute_import, division, print_function)
 
 DOCUMENTATION = r'''
 ---
 module: links
-short_description: Update links based on provided links list 
+short_description: Update links based on provided links list
 description:
     - Updates the links defined by the respective site, based on the links list defined through the host variables.
     - Existing links that cannot be mapped to an inventory host will be deleted.
@@ -22,9 +18,55 @@
     - If a corresponding token cannot be found for a requested link, it will fail.
 requirements:
     - kubectl if using kubernetes platform
-    - podman v4+ if using podman as the site platform 
+    - podman v4+ if using podman as the site platform
 version_added: "1.1.0"
-options: {}
+author: "Fernando Giorgetti (@fgiorgetti)"
+extends_documentation_fragment:
+    - skupper.network.common
+options:
+    create:
+        description:
+            - List of links to create for a given site
+            - This list is automatically provided by the links plugin based on host variable named I(links)
+            - More information on how to define a link can be found at the I(skupper_link) role documentation
+            - For links to be created the I(skupper_token) role must have been invoked for the target host
+        required: false
+        type: list
+        elements: dict
+        suboptions:
+            host:
+                description:
+                    - The ansible_inventory hostname that the respective link is intending to use as a target
+                type: str
+                required: true
+            name:
+                description:
+                    - Name of the link to be created
+                type: str
+                required: false
+            cost:
+                description:
+                    - Cost of the link
+                type: int
+                required: false
+            token:
+                description:
+                    - Token to use in case I(skupper_token) role hasn't been called (generated token is not available)
+                type: str
+                required: false
+    delete:
+        description:
+            - List of link names to be deleted
+            - Existing links must have been loaded earlier by calling M(skupper.network.links_load) module
+        required: false
+        type: list
+        elements: dict
+        suboptions:
+            name:
+                description:
+                    - Name of the link to be deleted
+                type: str
+                required: true
 '''
 
 EXAMPLES = r'''
@@ -34,6 +76,18 @@
 
 RETURN = r''' # '''
 
+import tempfile
+import traceback
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.common.text.converters import to_native
+
+from ..module_utils.args import common_args
+from ..module_utils.skupper_cli import prepare_command
+from ..module_utils.types import Result
+
+__metaclass__ = type
+
 
 class Links:
     def __init__(self, module: AnsibleModule):
@@ -103,26 +157,30 @@ def create_links(self):
         return res
 
 
-def run_module():
-    module_args = dict(
-        common_args(),
-        create=dict(type='list', required=False, elements='dict', options=dict(
-            host=dict(type='str', required=True),
-            name=dict(type='str', required=False),
-            cost=dict(type='int', required=False),
-            token=dict(type='str', required=False),
-        )),
-        delete=dict(type='list', required=False, elements='dict', options=dict(
-            host=dict(type='str', required=False),
-            name=dict(type='str', required=True),
-            cost=dict(type='int', required=False),
-            token=dict(type='str', required=False),
-        )),
-    )
+argument_spec = dict(
+    common_args(),
+    create=dict(type='list', required=False, elements='dict', options=dict(
+        host=dict(type='str', required=True),
+        name=dict(type='str', required=False),
+        cost=dict(type='int', required=False),
+        token=dict(type='str', required=False, no_log=True),
+    )),
+    delete=dict(type='list', required=False, elements='dict', options=dict(
+        name=dict(type='str', required=True),
+    )),
+)
+
+
+def setup_module_object():
     module = AnsibleModule(
-        argument_spec=module_args,
+        argument_spec=argument_spec,
         supports_check_mode=True
     )
+    return module
+
+
+def main():
+    module = setup_module_object()
     result = dict(changed=False)
     # loading params
     links = Links(module)
@@ -137,4 +195,4 @@ def run_module():
 
 
 if __name__ == '__main__':
-    run_module()
+    main()
diff --git a/skupper/network/plugins/modules/links_load.py b/skupper/network/plugins/modules/links_load.py
index 14b79b0..6d62845 100644
--- a/skupper/network/plugins/modules/links_load.py
+++ b/skupper/network/plugins/modules/links_load.py
@@ -1,13 +1,11 @@
 #!/usr/bin/python
-import json
-import traceback
+# -*- coding: utf-8 -*-
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
-from ..module_utils.args import *
-from ..module_utils.types import Link
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-__metaclass__ = type
+from __future__ import (absolute_import, division, print_function)
 
 DOCUMENTATION = r'''
 ---
@@ -15,16 +13,42 @@
 short_description: Loads existing links to other sites
 description:
     Loads existing Skupper links to other sites, using the same format expected for links,
-    referring other ansible hosts. The mapping of existing links to ansible hosts defined 
+    referring other ansible hosts. The mapping of existing links to ansible hosts defined
     in the inventory file, depends on previous execution of site_load module, which loads
     site ids for each site defined in the inventory. Without it, links will be considered
-    as unmapped and might be removed if links module is invoked.  
+    as unmapped and might be removed if links module is invoked.
 
 requirements:
     - kubectl if using kubernetes platform
-    - podman v4+ if using podman as the site platform 
+    - podman v4+ if using podman as the site platform
+author: "Fernando Giorgetti (@fgiorgetti)"
+extends_documentation_fragment:
+    - skupper.network.common
 version_added: "1.1.0"
-options: {}
+options:
+    sites:
+        description:
+            - List of sites used to correlate existing links to Ansible's inventory_hostname entries
+            - This module expects that site_load module has been invoked previously
+        type: list
+        required: false
+        elements: dict
+        suboptions:
+            host:
+                description:
+                    - The Ansible's inventory_hostname value that represent a given site entry (provided by site_load module)
+                required: true
+                type: str
+            id:
+                description:
+                    - The Skupper site id (provided by site_load module)
+                required: true
+                type: str
+            name:
+                description:
+                    - The Skupper site name (provided by site_load module)
+                required: true
+                type: str
 '''
 
 EXAMPLES = r'''
@@ -47,6 +71,16 @@
         cost: 1
 '''
 
+import json
+import traceback
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.common.text.converters import to_native
+from ..module_utils.args import add_fact, common_args
+from ..module_utils.types import Link
+
+__metaclass__ = type
+
 
 class LinksLoader:
     def __init__(self, module: AnsibleModule):
@@ -125,19 +159,26 @@ def load_kube(self) -> list[dict]:
         return links
 
 
-def run_module():
-    module_args = dict(
-        common_args(),
-        sites=dict(type='list', required=False, elements='dict', options=dict(
-            host=dict(type='str', required=True),
-            name=dict(type='str', required=True),
-            id=dict(type='str', required=True)
-        ))
-    )
+argument_spec = dict(
+    common_args(),
+    sites=dict(type='list', required=False, elements='dict', options=dict(
+        host=dict(type='str', required=True),
+        name=dict(type='str', required=True),
+        id=dict(type='str', required=True)
+    ))
+)
+
+
+def setup_module_object():
     module = AnsibleModule(
-        argument_spec=module_args,
+        argument_spec=argument_spec,
         supports_check_mode=True
     )
+    return module
+
+
+def main():
+    module = setup_module_object()
     result = dict(changed=False)
     # loading params
     loader = LinksLoader(module)
@@ -151,4 +192,4 @@ def run_module():
 
 
 if __name__ == '__main__':
-    run_module()
+    main()
diff --git a/skupper/network/plugins/modules/services.py b/skupper/network/plugins/modules/services.py
new file mode 100644
index 0000000..ec8d9fd
--- /dev/null
+++ b/skupper/network/plugins/modules/services.py
@@ -0,0 +1,380 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+
+DOCUMENTATION = r'''
+---
+module: services
+short_description: Update services based on provided services list
+description:
+    - Updates the services defined by the respective site, based on the services list defined through the host variables
+    - The services plugin will generate a list of services (or targets) to be created and deleted
+    - If targets have changed then the create and delete lists will have just the name and respective targets (no spec)
+extends_documentation_fragment:
+    - skupper.network.common
+requirements:
+    - kubectl if using kubernetes platform
+    - podman v4+ if using podman as the site platform
+author: "Fernando Giorgetti (@fgiorgetti)"
+version_added: "1.2.0"
+options:
+    create:
+        description:
+            - List of service definitions to be created
+            - This list will be populated automatically by the action plugin based on the I(services) definition
+            - For more information on how to define services, read the I(skupper_service) role documentation
+        required: false
+        type: list
+        elements: dict
+        suboptions:
+            name:
+                description:
+                    - Service name
+                required: true
+                type: str
+            spec:
+                description:
+                    - Service specification provided by the action plugin based on the I(services) definition
+                required: true
+                type: dict
+                suboptions:
+                    ports:
+                        description:
+                            - List of ports
+                        required: true
+                        type: list
+                        elements: int
+                    protocol:
+                        description:
+                            - Protocol to use
+                        type: str
+                        choices: ["tcp", "http", "http2"]
+                        default: "tcp"
+                    aggregate:
+                        description:
+                            - Strategy to aggregate http responses
+                        required: false
+                        type: str
+                        choices: ["json", "multipart"]
+                    generateTlsSecrets:
+                        description:
+                            - If enabled, service communication will be encrypted using TLS
+                        required: false
+                        type: bool
+                    eventChannel:
+                        description:
+                            - If specified this service will be a channel for multicast events
+                        required: false
+                        type: bool
+                    containerName:
+                        description:
+                            - Alternative container name to be used for proxy container
+                            - This option is only relevant on podman sites
+                        required: false
+                        type: str
+                    hostIp:
+                        description:
+                            - Host IP to be bound to the proxy container port(s)
+                            - This option is only relevant on podman sites
+                        required: false
+                        type: str
+                    hostPorts:
+                        description:
+                            - List of ports to be mapped to the container port
+                            - "Format for each entry is: <service-port>:<host-port>"
+                            - This option is only relevant on podman sites
+                        required: false
+                        type: list
+                        elements: str
+            targets:
+                description:
+                    - List of targets that the respective service definition will be bound to
+                required: false
+                type: list
+                elements: dict
+                suboptions:
+                    type:
+                        description:
+                            - Type of target to bind
+                            - "Valid values for kubernetes: deployment, statefulset, service, deploymentconfig"
+                            - "Valid values for podman: host"
+                        required: true
+                        type: str
+                    name:
+                        description:
+                            - Name or identification of the chosen resource type
+                        required: true
+                        type: str
+                    ports:
+                        description:
+                            - List of ports to be mapped to the from the service to the chosen target
+                            - "Format for each entry is: <service-port>:<target-resource-port>"
+                        required: false
+                        type: list
+                        elements: str
+            labels:
+                description:
+                    - List of labels to be applied to the service
+                    - "The format to use for each entry is: <key>=<value>"
+                required: false
+                type: list
+                elements: str
+    delete:
+        description:
+            - List of services, labels or targets to be removed
+            - This list will be populated automatically by the action plugin based on the I(services) definition
+            - It also requires that the M(skupper.network.services_load) module is invoked first
+        required: false
+        type: list
+        elements: dict
+        suboptions:
+            name:
+                description:
+                    - Service name to be deleted
+                required: true
+                type: str
+            targets:
+                description:
+                    - List of targets to unbind
+                required: false
+                type: list
+                elements: dict
+                suboptions:
+                    type:
+                        description:
+                            - Type of target to bind
+                            - "Valid values for kubernetes: deployment, statefulset, service, deploymentconfig"
+                            - "Valid values for podman: host"
+                        required: true
+                        type: str
+                    name:
+                        description:
+                            - Name or identification of the chosen resource type
+                        required: true
+                        type: str
+            labels:
+                description:
+                    - List of labels to be removed from service
+                    - "The format to use for each entry is: <key>-"
+                required: false
+                type: list
+                elements: str
+'''
+
+EXAMPLES = r'''
+- name: Updating services
+  skupper.network.services:
+'''
+
+RETURN = r''' # '''
+
+import traceback
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.common.text.converters import to_native
+
+from ..module_utils.args import common_args
+from ..module_utils.skupper_cli import prepare_command
+from ..module_utils.types import Result
+
+__metaclass__ = type
+
+
+class Services:
+    def __init__(self, module: AnsibleModule):
+        self._module = module
+        self.platform = module.params['platform']
+        self.kubeconfig = module.params['kubeconfig']
+        self.context = module.params['context']
+        self.namespace = module.params['namespace']
+        self.hostname = module.params['hostname']
+        self.podman_endpoint = module.params['podman_endpoint']
+        self.create = module.params['create']
+        self.delete = module.params['delete']
+        self.command = prepare_command(module.params)
+
+    def manage_labels(self, delete=False) -> Result:
+        res = Result()
+        param = self.delete if delete else self.create
+        for service in [s for s in param if s['labels'] and len(s['labels']) > 0]:
+            if self.platform == "podman":
+                res.warnings.append("Labels are not yet supported on podman sites")
+                return res
+            command = self.command.copy()
+            command.append('service')
+            command.append('label')
+            command.append(service['name'])
+            for label in service['labels']:
+                rc, stdout, stderr = self._module.run_command(command + [label])
+                if rc != 0:
+                    res.msgs.append("error %s label %s for service %s - %s" %
+                                    ("deleting" if delete else "creating", label, service['name'], stderr))
+                    res.failed = True
+                else:
+                    res.msgs.append("label %s for service %s has been %s" %
+                                    (label, service['name'], "deleted" if delete else "created"))
+                    res.changed = True
+        return res
+
+    def unbind_targets(self) -> Result:
+        res = Result()
+        for service in [s for s in self.delete if s['targets'] and len(s['targets']) > 0]:
+            command = self.command.copy()
+            command.append('service')
+            command.append('unbind')
+            command.append(service['name'])
+            for target in service['targets']:
+                target_type = target['type']
+                target_name = target['name']
+                rc, stdout, stderr = self._module.run_command(command + [target_type, target_name])
+                if rc != 0:
+                    res.msgs.append("error unbinding target %s/%s for service %s - %s" % (target_type, target_name,
+                                                                                          service['name'], stderr))
+                    res.failed = True
+                else:
+                    res.msgs.append("target %s/%s for service %s has been unbound" %
+                                    (target_type, target_name, service['name']))
+                    res.changed = True
+        return res
+
+    def delete_services(self) -> Result:
+        res = Result()
+        for service in [s for s in self.delete if not s['labels'] and not s['targets']]:
+            command = self.command.copy()
+            command.append('service')
+            command.append('delete')
+            command.append(service['name'])
+            rc, stdout, stderr = self._module.run_command(command)
+            if rc != 0:
+                res.msgs.append("error deleting service %s - %s" % (service['name'], stderr))
+                res.failed = True
+            else:
+                res.msgs.append("service %s has been deleted" % (service['name']))
+                res.changed = True
+        return res
+
+    def bind_targets(self) -> Result:
+        res = Result()
+        for service in [s for s in self.create if s['targets'] and len(s['targets']) > 0]:
+            command = self.command.copy()
+            command.append('service')
+            command.append('bind')
+            command.append(service['name'])
+            for target in service['targets']:
+                target_type = target['type']
+                target_name = target['name']
+                bind_command = command + [target_type, target_name]
+                for port in [port for port in target['ports'] if target['ports']]:
+                    bind_command.append("--target-port")
+                    bind_command.append(port)
+                rc, stdout, stderr = self._module.run_command(bind_command)
+                if rc != 0:
+                    res.msgs.append("error binding target %s/%s for service %s - %s" % (target_type, target_name,
+                                                                                        service['name'], stderr))
+                    res.failed = True
+                else:
+                    res.msgs.append("target %s/%s for service %s has been bound" %
+                                    (target_type, target_name, service['name']))
+                    res.changed = True
+        return res
+
+    def create_services(self) -> Result:
+        res = Result()
+        for service in [s for s in self.create if s['spec']]:
+            spec = service['spec']
+            command = self.command.copy()
+            command.append('service')
+            command.append('create')
+            command.append(service['name'])
+            command += [str(port) for port in spec['ports']]
+            if spec['protocol'] and spec['protocol'] != "":
+                command += ["--protocol", spec['protocol']]
+            if spec['aggregate'] and spec['aggregate'] != "":
+                command += ["--aggregate", spec['aggregate']]
+            if spec['generateTlsSecrets'] is not None:
+                command += ["--generate-tls-secrets=%s" % spec['generateTlsSecrets']]
+            if spec['eventChannel'] is not None:
+                command += ["--event-channel=%s" % spec['eventChannel']]
+            if self.platform == "podman":
+                if spec['containerName'] and spec['containerName'] != "":
+                    command += ["--container-name", spec['containerName']]
+                if spec['hostIp'] and spec['hostIp'] != "":
+                    command += ["--host-ip", spec['hostIp']]
+                if spec['hostPorts'] and len(spec['hostPorts']) > 0:
+                    for host_port in spec['hostPorts']:
+                        command += ["--host-port", host_port]
+            rc, stdout, stderr = self._module.run_command(command)
+            if rc != 0:
+                res.msgs.append("error creating service %s - %s [command: %s]" % (service['name'], stderr, command))
+                res.failed = True
+            else:
+                res.msgs.append("service %s has been created" % (service['name']))
+                res.changed = True
+        return res
+
+
+argument_spec = dict(
+    common_args(),
+    create=dict(type='list', required=False, elements='dict', options=dict(
+        name=dict(type='str', required=True),
+        spec=dict(type='dict', required=True, options=dict(
+            ports=dict(type='list', required=True, elements='int'),
+            protocol=dict(type='str', default="tcp", choices=["tcp", "http", "http2"]),
+            aggregate=dict(type='str', required=False, choices=["json", "multipart"]),
+            generateTlsSecrets=dict(type='bool', required=False),
+            eventChannel=dict(type='bool', required=False),
+            containerName=dict(type='str', required=False),
+            hostIp=dict(type='str', required=False),
+            hostPorts=dict(type='list', required=False, elements='str'),
+        )),
+        targets=dict(type='list', required=False, elements='dict', options=dict(
+            type=dict(type='str', required=True),
+            name=dict(type='str', required=True),
+            ports=dict(type='list', required=False, elements='str'),
+        )),
+        labels=dict(type='list', required=False, elements='str'),
+    )),
+    delete=dict(type='list', required=False, elements='dict', options=dict(
+        name=dict(type='str', required=True),
+        targets=dict(type='list', required=False, elements='dict', options=dict(
+            type=dict(type='str', required=True),
+            name=dict(type='str', required=True),
+        )),
+        labels=dict(type='list', required=False, elements='str'),
+    ))
+)
+
+
+def setup_module_object():
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        supports_check_mode=True
+    )
+    return module
+
+
+def main():
+    module = setup_module_object()
+    result = dict(changed=False)
+    # loading params
+    services = Services(module)
+    try:
+        res = services.manage_labels(delete=True)
+        res.merge(services.unbind_targets())
+        res.merge(services.delete_services())
+        res.merge(services.create_services())
+        res.merge(services.bind_targets())
+        res.merge(services.manage_labels())
+        result.update(res.result())
+    except Exception as ex:
+        module.fail_json(msg=to_native(ex), exception=traceback.format_exc())
+    module.exit_json(**result)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/skupper/network/plugins/modules/services_load.py b/skupper/network/plugins/modules/services_load.py
new file mode 100644
index 0000000..6e11e36
--- /dev/null
+++ b/skupper/network/plugins/modules/services_load.py
@@ -0,0 +1,252 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+
+DOCUMENTATION = r'''
+---
+module: services_load
+short_description: Loads existing services and targets
+description:
+    Loads existing Skupper services and targets. Existing services will be returned under the `existing_services` fact.
+requirements:
+    - kubectl if using kubernetes platform
+    - podman v4+ if using podman as the site platform
+author: "Fernando Giorgetti (@fgiorgetti)"
+extends_documentation_fragment:
+    - skupper.network.common
+version_added: "1.2.0"
+options: {}
+'''
+
+EXAMPLES = r'''
+- name: Loading existing services
+  skupper.network.services_load:
+'''
+
+RETURN = r'''
+existing_services:
+  description: List of existing services and targets
+  returned: always
+  type: dict
+  sample:
+    existing_services:
+      nearestprime:
+        ports:
+          - 8000
+        targets:
+          - type: deployment
+            name: nearestprime
+      db:
+        ports:
+          - 5432
+'''
+
+import json
+import traceback
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.common.text.converters import to_native
+from ..module_utils.args import add_fact, common_args
+from ..module_utils.types import Service, ServiceTarget
+
+__metaclass__ = type
+
+
+class ServicesLoader:
+    def __init__(self, module: AnsibleModule):
+        self._module = module
+        self.platform = module.params['platform']
+        self.kubeconfig = module.params['kubeconfig']
+        self.context = module.params['context']
+        self.namespace = module.params['namespace']
+        self.hostname = module.params['hostname']
+        self.podman_endpoint = module.params['podman_endpoint']
+        self.sites = dict()
+        self.resource_types = ["deployment", "statefulset"]
+        self.resources = dict()
+        self.podman_containers = dict()
+
+    def load(self) -> dict:
+        return self.load_podman() if self.platform == "podman" else self.load_kube()
+
+    def load_podman(self) -> dict:
+        # loading podman containers info
+        rc, stdout, stderr = self._module.run_command(self._podman() +
+                                                      "container ls -f label=skupper.io/address --format json"
+                                                      .split())
+        json_data = json.loads(stdout)
+        for container in json_data:
+            name = container['Names'][0]
+            address = container['Labels']['skupper.io/address']
+            host_ip = None
+            host_ports = list[str]()
+            if 'Ports' in container and container['Ports'] is not None:
+                for port in container['Ports']:
+                    if 'host_ip' in port:
+                        host_ip = port['host_ip']
+                    svc_port = port['container_port'] if 'container_port' in port else None
+                    ctr_port = port['host_port'] if 'host_port' in port else None
+                    if svc_port is not None:
+                        host_ports.append("%s:%s" % (svc_port, ctr_port if ctr_port is not None else svc_port))
+            info = dict()
+            info['containerName'] = name if name != address else None
+            info['hostIp'] = host_ip
+            info['hostPorts'] = host_ports if len(host_ports) > 0 else None
+            self.podman_containers[address] = info
+
+        vol_info = self._podman() + ['volume', 'inspect', 'skupper-services']
+        # executing podman cli
+        rc, stdout, stderr = self._module.run_command(vol_info)
+        if rc != 0:
+            raise RuntimeError("error inspecting volume %s: %s" % ("skupper-services", stderr))
+        vol_json = json.loads(stdout)
+        try:
+            services_file = open("%s/skupper-services.json" % (vol_json[0]['Mountpoint']))
+            services_json = json.load(services_file)
+            services = self.load_services(services_json)
+        except Exception:
+            # if no services
+            return dict()
+
+        return services
+
+    def load_kube(self) -> dict:
+        resources = dict()
+
+        # detect if deploymentconfigs are available
+        kubectl_get_dc = self._kubectl() + ["api-resources", "--api-group", "apps.openshift.io", "-o", "name"]
+        rc, stdout, stderr = self._module.run_command(kubectl_get_dc)
+        if rc == 0 and str(stdout).__contains__("deploymentconfig"):
+            self.resource_types.append("deploymentconfig")
+
+        # loading existing resources
+        for resource_type in self.resource_types:
+            self.resources[resource_type] = list()
+            # load all resources
+            rc, stdout, stderr = self._module.run_command(self._kubectl() + ["get", resource_type, "-o", "json"])
+            if rc != 0:
+                raise RuntimeError("unable to load existing %s - %s" % (resource_type, stderr))
+            res_json = json.loads(stdout)
+            for res in res_json['items']:
+                self.resources[resource_type].append(res['metadata']['name'])
+
+        # retrieving skupper services
+        kubectl_get_secret = self._kubectl() + ["get", "configmap", "skupper-services", "--output", "json"]
+        rc, stdout, stderr = self._module.run_command(kubectl_get_secret)
+        if rc != 0:
+            raise RuntimeError("error retrieving service list - %s" % stderr)
+        services_cm_json = json.loads(stdout)
+        if 'data' not in services_cm_json or len(services_cm_json['data']) == 0:
+            return dict()
+        services_dict_json = services_cm_json['data']
+        # load service definition as json dict
+        for service in services_dict_json:
+            info = json.loads(services_dict_json[service])
+            services_dict_json[service] = info
+        services = self.load_services(services_dict_json)
+        return services
+
+    def _kubectl(self):
+        kubectl = ['kubectl']
+        if self.kubeconfig != "":
+            kubectl.append("--kubeconfig=%s" % self.kubeconfig)
+        if self.context != "":
+            kubectl.append("--context=%s" % self.context)
+        if self.namespace != "":
+            kubectl.append("--namespace=%s" % self.namespace)
+        return kubectl
+
+    def _podman(self):
+        base_cmd = ['podman']
+        if len(self.podman_endpoint) > 0:
+            base_cmd.append("--url=%s" % self.podman_endpoint)
+        return base_cmd
+
+    def load_services(self, services_json: dict) -> dict:
+        services = dict()
+        for name in services_json:
+            info = services_json[name]
+            service = Service()
+            service_targets = list()
+            service.ports = info['ports']
+            service.protocol = info['protocol']
+            service.labels = ["%s=%s" % (k, v) for k, v in info['labels'].items()] if 'labels' in info else None
+            service.aggregate = info['aggregate'] if 'aggregate' in info else None
+            service.generateTlsSecrets = info['tlsCredentials'] if 'tlsCredentials' in info else None
+            service.eventChannel = info['eventchannel'] if 'eventchannel' in info else None
+
+            # retrieving podman specific settings
+            if self.platform == "podman" and name in self.podman_containers:
+                container_info = self.podman_containers[name]
+                service.containerName = container_info['containerName']
+                service.hostIp = container_info['hostIp']
+                service.hostPorts = container_info['hostPorts']
+
+            # processing (optional) targets
+            if 'targets' in info and info['targets'] is not None:
+                for target in info['targets']:
+                    service_target = ServiceTarget()
+                    if 'targetPorts' in target:
+                        target_ports = list()
+                        for target_port in target['targetPorts']:
+                            target_ports.append("%s:%d" % (target_port, target['targetPorts'][target_port]))
+                        service_target.ports = target_ports
+                    if 'service' in target and len(target['service']) > 0:
+                        if self.platform == "podman":
+                            service_target.type = "host"
+                        else:
+                            service_target.type = "service"
+                        service_target.name = target['service']
+                    elif self.platform == "kubernetes":
+                        service_target.type = self.get_resource_type(target['name'])
+                        service_target.name = target['name']
+                    service_targets.append({k: v for k, v in vars(service_target).items() if v})
+
+            if len(service_targets) > 0:
+                service.targets = service_targets
+
+            services[name] = {k: v for k, v in vars(service).items() if v}
+
+        return services
+
+    def get_resource_type(self, name):
+        for resource_type in self.resource_types:
+            if name in self.resources[resource_type]:
+                return resource_type
+        raise RuntimeError("unable to determine resource type for: %s" % name)
+
+
+argument_spec = dict(
+    common_args(),
+)
+
+
+def setup_module_object():
+    module = AnsibleModule(
+        argument_spec=argument_spec,
+        supports_check_mode=True
+    )
+    return module
+
+
+def main():
+    module = setup_module_object()
+    result = dict(changed=False)
+    # loading params
+    loader = ServicesLoader(module)
+    # loading services
+    try:
+        services = loader.load()
+        add_fact(result, {"existing_services": services})
+    except Exception as ex:
+        module.fail_json(msg=to_native(ex), exception=traceback.format_exc())
+    module.exit_json(**result)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/skupper/network/plugins/modules/site_load.py b/skupper/network/plugins/modules/site_load.py
index c8deac4..25c60ba 100644
--- a/skupper/network/plugins/modules/site_load.py
+++ b/skupper/network/plugins/modules/site_load.py
@@ -1,13 +1,11 @@
 #!/usr/bin/python
-import json
-import traceback
+# -*- coding: utf-8 -*-
 
-from ansible.module_utils.basic import AnsibleModule
-from ansible.module_utils.common.text.converters import to_native
-from ..module_utils.args import *
-from ..module_utils.types import Site
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
 
-__metaclass__ = type
+from __future__ import (absolute_import, division, print_function)
 
 DOCUMENTATION = r'''
 ---
@@ -20,11 +18,14 @@
     the inventory file.
 
     Kubernetes options can be set through host variables (kubeconfig, context, namespace).
-    Podman endpoint can be customized through init.podmanEndpoint host variable.  
+    Podman endpoint can be customized through init.podmanEndpoint host variable.
 requirements:
     - kubectl if using kubernetes platform
-    - podman v4+ if using podman as the site platform 
+    - podman v4+ if using podman as the site platform
 version_added: "1.1.0"
+author: "Fernando Giorgetti (@fgiorgetti)"
+extends_documentation_fragment:
+    - skupper.network.common
 options: {}
 '''
 
@@ -45,6 +46,16 @@
       id: 53899d80-1ae6-11ee-be28-1e9341abe0db
 '''
 
+import json
+import traceback
+
+from ansible.module_utils.basic import AnsibleModule
+from ansible.module_utils.common.text.converters import to_native
+from ..module_utils.args import add_fact, common_args
+from ..module_utils.types import Site
+
+__metaclass__ = type
+
 
 class SiteLoader:
     def __init__(self, module: AnsibleModule):
@@ -111,14 +122,21 @@ def load_kube(self) -> Site:
         return site
 
 
-def run_module():
-    module_args = dict(
-        common_args(),
-    )
+argument_spec = dict(
+    common_args(),
+)
+
+
+def setup_module_object():
     module = AnsibleModule(
-        argument_spec=module_args,
+        argument_spec=argument_spec,
         supports_check_mode=True
     )
+    return module
+
+
+def main():
+    module = setup_module_object()
     result = dict(changed=False)
 
     # loading params
@@ -135,4 +153,4 @@ def run_module():
 
 
 if __name__ == '__main__':
-    run_module()
+    main()
diff --git a/skupper/network/roles/skupper_service/README.md b/skupper/network/roles/skupper_service/README.md
index 23fe253..67a041e 100644
--- a/skupper/network/roles/skupper_service/README.md
+++ b/skupper/network/roles/skupper_service/README.md
@@ -22,16 +22,16 @@ target.
 services:
   # Sample service definition (indexed by name)
   name:
-    ports: []           # int array
-    protocol: ""        # choice tcp, http, http2
-    labels: []          # label and value separated by equal sign
-    aggregate: ""       # choice: json, multiplart
-    enableTls: False    # boolean
-    eventChannel: False # boolean
-    targets: []         # array of type and name
-      type: ""          # type of target to bind (values vary based on selected platform)
-      name: ""          # value that represents the selected target type
-      ports: []         # array mapping service ports to target ports
+    ports: []                    # int array
+    protocol: ""                 # choice tcp, http, http2
+    labels: []                   # label and value separated by equal sign
+    aggregate: ""                # choice: json, multiplart
+    generateTlsSecrets: False    # boolean
+    eventChannel: False          # boolean
+    targets: []                  # array of type and name
+      type: ""                   # type of target to bind (values vary based on selected platform)
+      name: ""                   # value that represents the selected target type
+      ports: []                  # array mapping service ports to target ports
 
     #
     # kubernetes flags
diff --git a/skupper/network/roles/skupper_service/defaults/main.yml b/skupper/network/roles/skupper_service/defaults/main.yml
index 1893be3..4ef8555 100644
--- a/skupper/network/roles/skupper_service/defaults/main.yml
+++ b/skupper/network/roles/skupper_service/defaults/main.yml
@@ -3,16 +3,16 @@
 services: {}
   # # Sample service definition (indexed by name)
   # name:
-  #   ports: []           # int array
-  #   protocol: ""        # choice tcp, http, http2
-  #   labels: []          # label and value separated by equal sign
-  #   aggregate: ""       # choice: json, multiplart
-  #   enableTls: False    # boolean
-  #   eventChannel: False # boolean
-  #   targets: []         # array of type and name
-  #     type: ""          # type of target to bind (values vary based on selected platform)
-  #     name: ""          # value that represents the selected target type
-  #     ports: []         # array mapping service ports to target ports
+  #   ports: []                    # int array
+  #   protocol: ""                 # choice tcp, http, http2
+  #   labels: []                   # label and value separated by equal sign
+  #   aggregate: ""                # choice: json, multiplart
+  #   generateTlsSecrets: False    # boolean
+  #   eventChannel: False          # boolean
+  #   targets: []                  # array of type and name
+  #     type: ""                   # type of target to bind (values vary based on selected platform)
+  #     name: ""                   # value that represents the selected target type
+  #     ports: []                  # array mapping service ports to target ports
 
   #   #
   #   # kubernetes flags
@@ -24,6 +24,6 @@ services: {}
   #   # podman flags
   #   #
   #   # valid targetType values: "host"
-  #   containerName: ""   # optinal alternative name for service container
-  #   hostIp: ""          # optional host ip address used to bind to the service ports
-  #   hostPorts: []       # array mapping service ports to a host port
+  #   containerName: ""            # optinal alternative name for service container
+  #   hostIp: ""                   # optional host ip address used to bind to the service ports
+  #   hostPorts: []                # array mapping service ports to a host port
diff --git a/skupper/network/roles/skupper_service/tasks/common-validate.yml b/skupper/network/roles/skupper_service/tasks/common-validate.yml
deleted file mode 100644
index 0f8756b..0000000
--- a/skupper/network/roles/skupper_service/tasks/common-validate.yml
+++ /dev/null
@@ -1,42 +0,0 @@
----
-- name: Validate name defined
-  ansible.builtin.debug:
-    msg: "Service name is not defined"
-  when: item.key is not defined
-
-- name: Validate ports defined
-  ansible.builtin.debug:
-    msg: "No ports defined for {{ item.key }}"
-  when: item.value is not defined or item.value.ports is not defined
-
-- name: Validate provided ports
-  ansible.builtin.debug:
-    msg: "Invalid port: {{ port }}"
-  when: not (port | int) or port <= 0 or port > 65535
-  with_items: "{{ item.value.ports }}"
-  loop_control:
-    loop_var: port
-
-- name: Defining has_targets variable
-  ansible.builtin.set_fact:
-    has_targets: "{{ item.value['targets'] is defined and item.value.targets | length() > 0 }}"
-
-- name: Defining has_labels variable
-  ansible.builtin.set_fact:
-    has_labels: "{{ item.value['labels'] is defined and item.value.labels | length() > 0 }}"
-
-- name: Validate targets
-  ansible.builtin.debug:
-    msg: "Invalid target: {{ target }} - targets must have a type and name"
-  when: has_targets
-  failed_when: target['type'] is not defined or target['name'] is not defined
-  with_items: "{{ item.value.targets }}"
-  loop_control:
-    loop_var: target
-
-- name: Validate service for kubernetes
-  ansible.builtin.include_tasks: kube-validate.yml
-  when: platform == 'kubernetes'
-- name: Validate service for podman
-  ansible.builtin.include_tasks: podman-validate.yml
-  when: platform == 'podman'
diff --git a/skupper/network/roles/skupper_service/tasks/execute.yml b/skupper/network/roles/skupper_service/tasks/execute.yml
deleted file mode 100644
index 5cd0ff7..0000000
--- a/skupper/network/roles/skupper_service/tasks/execute.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-# validating
-- name: Validate service common
-  ansible.builtin.include_tasks: common-validate.yml
-
-# execute commands for kubernetes platform
-- name: Kubernetes tasks
-  ansible.builtin.include_tasks: kube-commands.yml
-  when: platform == 'kubernetes'
-
-# execute commands for podman platform
-- name: Podman tasks
-  ansible.builtin.include_tasks: podman-commands.yml
-  when: platform == 'podman'
diff --git a/skupper/network/roles/skupper_service/tasks/kube-command-bind.yml b/skupper/network/roles/skupper_service/tasks/kube-command-bind.yml
deleted file mode 100644
index 08e02b3..0000000
--- a/skupper/network/roles/skupper_service/tasks/kube-command-bind.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- name: Preparing service bind command
-  ansible.builtin.set_fact:
-    skupper_bind_command:
-      - skupper
-      - service
-      - bind
-      - --platform
-      - "{{ platform }}"
-
-- name: Adding --kubeconfig
-  ansible.builtin.set_fact:
-    skupper_bind_command: "{{ skupper_bind_command + ['--kubeconfig', kubeconfig] }}"
-  when: kubeconfig is defined and kubeconfig | length() > 0
-
-- name: Adding --context
-  ansible.builtin.set_fact:
-    skupper_bind_command: "{{ skupper_bind_command + ['--context', context] }}"
-  when: context is defined and context | length() > 0
-
-- name: Adding --namespace
-  ansible.builtin.set_fact:
-    skupper_bind_command: "{{ skupper_bind_command + ['--namespace', namespace] }}"
-  when: namespace is defined and namespace | length() > 0
-
-- name: Execute skupper service bind command
-  ansible.builtin.include_tasks: service-bind.yml
diff --git a/skupper/network/roles/skupper_service/tasks/kube-command-create.yml b/skupper/network/roles/skupper_service/tasks/kube-command-create.yml
deleted file mode 100644
index 3fa9d11..0000000
--- a/skupper/network/roles/skupper_service/tasks/kube-command-create.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- name: Preparing service create command
-  ansible.builtin.set_fact:
-    skupper_create_command:
-      - skupper
-      - service
-      - create
-      - --platform
-      - "{{ platform }}"
-
-- name: Adding --kubeconfig
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--kubeconfig', kubeconfig] }}"
-  when: kubeconfig is defined and kubeconfig | length() > 0
-
-- name: Adding --context
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--context', context] }}"
-  when: context is defined and context | length() > 0
-
-- name: Adding --namespace
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--namespace', namespace] }}"
-  when: namespace is defined and namespace | length() > 0
-
-- name: Execute skupper service create command
-  ansible.builtin.include_tasks: service-create.yml
diff --git a/skupper/network/roles/skupper_service/tasks/kube-command-label.yml b/skupper/network/roles/skupper_service/tasks/kube-command-label.yml
deleted file mode 100644
index 316cf45..0000000
--- a/skupper/network/roles/skupper_service/tasks/kube-command-label.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-- name: Preparing service label command
-  ansible.builtin.set_fact:
-    skupper_label_command:
-      - skupper
-      - service
-      - label
-      - --platform
-      - "{{ platform }}"
-
-- name: Adding --kubeconfig
-  ansible.builtin.set_fact:
-    skupper_label_command: "{{ skupper_label_command + ['--kubeconfig', kubeconfig] }}"
-  when: kubeconfig is defined and kubeconfig | length() > 0
-
-- name: Adding --context
-  ansible.builtin.set_fact:
-    skupper_label_command: "{{ skupper_label_command + ['--context', context] }}"
-  when: context is defined and context | length() > 0
-
-- name: Adding --namespace
-  ansible.builtin.set_fact:
-    skupper_label_command: "{{ skupper_label_command + ['--namespace', namespace] }}"
-  when: namespace is defined and namespace | length() > 0
-
-- name: Adding service name and labels
-  ansible.builtin.set_fact:
-    skupper_label_command: "{{ skupper_label_command + [item.key] + item.value.labels }}"
-
-# executing and validating result
-- name: Executing skupper service label
-  ansible.builtin.command:
-    argv: "{{ skupper_label_command }}"
-  changed_when: false
diff --git a/skupper/network/roles/skupper_service/tasks/kube-commands.yml b/skupper/network/roles/skupper_service/tasks/kube-commands.yml
deleted file mode 100644
index 52de1a3..0000000
--- a/skupper/network/roles/skupper_service/tasks/kube-commands.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-- name: Prepare skupper service create command
-  ansible.builtin.include_tasks: kube-command-create.yml
-
-- name: Prepare skupper service bind command
-  ansible.builtin.include_tasks: kube-command-bind.yml
-  when: has_targets
-  with_items: "{{ item.value.targets }}"
-  loop_control:
-    loop_var: target
-
-- name: Add service labels
-  ansible.builtin.include_tasks: kube-command-label.yml
-  when: has_labels
diff --git a/skupper/network/roles/skupper_service/tasks/kube-validate.yml b/skupper/network/roles/skupper_service/tasks/kube-validate.yml
deleted file mode 100644
index adcdd7c..0000000
--- a/skupper/network/roles/skupper_service/tasks/kube-validate.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Validate target type
-  ansible.builtin.debug:
-    msg: "Invalid target type: {{ target.type }} - valid target types are {{ valid_target_types_kube }}"
-  when: has_targets
-  failed_when: target.type not in valid_target_types_kube
-  with_items: "{{ item.value.targets }}"
-  loop_control:
-    loop_var: target
diff --git a/skupper/network/roles/skupper_service/tasks/main.yml b/skupper/network/roles/skupper_service/tasks/main.yml
index 7cf6701..d504820 100644
--- a/skupper/network/roles/skupper_service/tasks/main.yml
+++ b/skupper/network/roles/skupper_service/tasks/main.yml
@@ -1,7 +1,8 @@
 ---
 # tasks file for skupper_service
 
-# execute the service create command
-- name: Executing service creation tasks for each entry
-  ansible.builtin.include_tasks: execute.yml
-  with_items: "{{ services | dict2items }}"
+- name: Loading existing services
+  skupper.network.services_load:
+
+- name: Updating service definitions
+  skupper.network.services:
diff --git a/skupper/network/roles/skupper_service/tasks/podman-command-bind.yml b/skupper/network/roles/skupper_service/tasks/podman-command-bind.yml
deleted file mode 100644
index 52dcf39..0000000
--- a/skupper/network/roles/skupper_service/tasks/podman-command-bind.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-- name: Preparing service bind command
-  ansible.builtin.set_fact:
-    skupper_bind_command:
-      - skupper
-      - service
-      - bind
-      - --platform
-      - "{{ platform }}"
-
-- name: Execute skupper service bind command
-  ansible.builtin.include_tasks: service-bind.yml
diff --git a/skupper/network/roles/skupper_service/tasks/podman-command-create.yml b/skupper/network/roles/skupper_service/tasks/podman-command-create.yml
deleted file mode 100644
index f071fc0..0000000
--- a/skupper/network/roles/skupper_service/tasks/podman-command-create.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-- name: Preparing service create command
-  ansible.builtin.set_fact:
-    skupper_create_command:
-      - skupper
-      - service
-      - create
-      - --platform
-      - "{{ platform }}"
-
-- name: Adding --labels
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--label', label] }}"
-  when: has_labels
-  with_items: "{{ item.value.labels }}"
-  loop_control:
-    loop_var: label
-
-- name: Adding --container-name
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--container-name', item.value.containerName] }}"
-  when: item.value['containerName'] is defined
-
-- name: Adding --host-ip
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--host-ip', item.value.hostIp] }}"
-  when: item.value['hostIp'] is defined
-
-- name: Adding --host-port
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--host-port', hostPort] }}"
-  when: item.value['hostPorts'] is defined and item.value.hostPorts | length() > 0
-  with_items: "{{ item.value.hostPorts }}"
-  loop_control:
-    loop_var: hostPort
-
-- name: Execute skupper service create command
-  ansible.builtin.include_tasks: service-create.yml
diff --git a/skupper/network/roles/skupper_service/tasks/podman-commands.yml b/skupper/network/roles/skupper_service/tasks/podman-commands.yml
deleted file mode 100644
index 13e5b08..0000000
--- a/skupper/network/roles/skupper_service/tasks/podman-commands.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-- name: Create skupper service
-  ansible.builtin.include_tasks: podman-command-create.yml
-
-- name: Bind skupper service to target
-  ansible.builtin.include_tasks: podman-command-bind.yml
-  when: has_targets
-  with_items: "{{ item.value.targets }}"
-  loop_control:
-    loop_var: target
diff --git a/skupper/network/roles/skupper_service/tasks/podman-validate.yml b/skupper/network/roles/skupper_service/tasks/podman-validate.yml
deleted file mode 100644
index a572b07..0000000
--- a/skupper/network/roles/skupper_service/tasks/podman-validate.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-- name: Validate target type
-  ansible.builtin.debug:
-    msg: "Invalid target type: {{ target.type }} - valid target types are {{ valid_target_types_podman }}"
-  when: has_targets
-  failed_when: target.type not in valid_target_types_podman
-  with_items: "{{ item.value.targets }}"
-  loop_control:
-    loop_var: target
diff --git a/skupper/network/roles/skupper_service/tasks/service-bind.yml b/skupper/network/roles/skupper_service/tasks/service-bind.yml
deleted file mode 100644
index 43600fc..0000000
--- a/skupper/network/roles/skupper_service/tasks/service-bind.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-# command flags and execution of skupper service bind
-- name: Adding --target-port
-  ansible.builtin.set_fact:
-    skupper_bind_command: "{{ skupper_bind_command + ['--target-port', targetPort] }}"
-  with_items: "{{ target.ports }}"
-  when: target['ports'] is defined and target.ports | length() > 0
-  loop_control:
-    loop_var: targetPort
-
-- name: Adding service name, target type and target name
-  ansible.builtin.set_fact:
-    skupper_bind_command: "{{ skupper_bind_command + [item.key, target.type, target.name] }}"
-
-# executing and validating result
-- name: Executing skupper service bind
-  ansible.builtin.command:
-    argv: "{{ skupper_bind_command }}"
-  register: bindStatus
-  changed_when: not bindStatus.failed
-  failed_when: >
-    bindStatus.failed and
-    ' already defined' not in bindStatus.stderr_lines[0]
diff --git a/skupper/network/roles/skupper_service/tasks/service-create.yml b/skupper/network/roles/skupper_service/tasks/service-create.yml
deleted file mode 100644
index 82ccde2..0000000
--- a/skupper/network/roles/skupper_service/tasks/service-create.yml
+++ /dev/null
@@ -1,34 +0,0 @@
-# command flags and execution of skupper service create
-- name: Adding --protocol
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--protocol', item.value.protocol] }}"
-  when: item.value['protocol'] is defined
-
-- name: Adding --aggregate
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--aggregate', item.value.aggregate] }}"
-  when: item.value['aggregate'] is defined
-
-- name: Adding --enable-tls
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--enable-tls'] }}"
-  when: item.value['enableTls'] is defined and item.value['enableTls'] | bool
-
-- name: Adding --event-channel
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + ['--event-channel'] }}"
-  when: item.value['eventChannel'] is defined and item.value['eventChannel'] | bool
-
-- name: Adding name and ports
-  ansible.builtin.set_fact:
-    skupper_create_command: "{{ skupper_create_command + [item.key] + item.value.ports }}"
-
-# executing and validating result
-- name: Executing skupper service create
-  ansible.builtin.command:
-    argv: "{{ skupper_create_command }}"
-  register: createStatus
-  changed_when: not createStatus.failed
-  failed_when: >
-    createStatus.failed and
-    ' already defined' not in createStatus.stderr_lines[0]
diff --git a/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.action.site_load_1.stats b/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.action.site_load_1.stats
new file mode 100644
index 0000000000000000000000000000000000000000..56554eabade0d2b4d94f0c02a4cafbd1f326132d
GIT binary patch
literal 2017
zcmcJQ&2AGh5XVy~n`D!U1dvd#2nm%#7nKt#AF9NmhxEn+SkA7Kwc^;TwVjd!5^%Oe
zB$hi*!ehWI@C=-ou@lJB3tfdhjlae}&+Po?UHkL5Zp(k}s8|UuO=1lfIzf|_+EAk_
zH@Nhp*M9V=di1_}TOGT2LNg-if@weO(Q;-NOqy!ka&2l%iAFRRRBN<`DOv;<_{189
zbAvFKDyjXkXk!gs%q1YOCG}o<Q!7)$mBd4x1v9zIf~hhqysI8;<#d9Bw(FWzu{|53
zO$Db&VS#!@7U2{=;)F`g;S@=g5X|496Fs*@!OBE3bEV38lBrZDfHw6H?Sr+1cW!VZ
zR+cKfbxI8t$kpa@s?g|_Y)VrT)?*AO3n9Agx>vN6T+Tezvwy)Tgq?Az6L1K3Cxmdx
z4I%r3x?hKS+5ifYHV^;9Uc&USPV}NF5fO@J`wP@z9ji(9G%J@p-PBIQSRJ_CUy9VB
z&KtyP3$^EP_3LEMn~-tC{wtMr9aIKAgTKTLj8Z45S`>o4sm2Ey#7kw2ppt-4SkO4s
zjy6tWm3Lw5R{3HS3y?Tp*e+s=!mMylWK<9b>kczkFqtu#@=gBlZ6cD?OT79Bw>-Id
zw5qkcv-KF{9K=zhxBOLpoS)`r`Q^Hi<G)<Iya`)ST@rva<TDVRu3d9Cn33S-Y;D~r
zvxVR(h-^l%djui6D<|aI0%YU}Bt8WlzrJ`8T4D>@MPFj#f9E{EHE!kcxRVdZqkJ^(
zLNcv{jQhsNyu$2kiNcn>RQLDY8ghe~P!lSMRM1E-&L8}E{N?M1pSc7&^@o0v`~t;2
B0FwX!

literal 0
HcmV?d00001

diff --git a/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.doc_fragments.common_1.stats b/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.doc_fragments.common_1.stats
new file mode 100644
index 0000000000000000000000000000000000000000..9d49fd6cd369f72ed9720bafb99167aa2766392f
GIT binary patch
literal 2171
zcmcJQ&u$Yj5XMuKH2*3RKtjDDBvcMv2~Ma5REa|m>5T`loLy(viq~GP?X)={!QB#(
zSk8zif-7&pV=!YUkfj&03OS9}_W0-doNwN@KNr20|GDF0DY!I|HC*TjLsn`-jjr7A
z%8%aq(WmO^hw5E*;`&pX5J_{U{jf*N)aFc@YSMCTYD|eiXD+DL7>#0#2u|>+H4MKE
z!?##T?YDK-(a80=1O&FAK1*+AWo)>TxalxwCR0fWRbqut)q|y+PI1t7U9&7Ud;1tu
z!6{N$pk9(Z?7~Z&QmHxYBC!&J`7?B+=e8(V8A)cYRXL9m73&DlX8xiBh!$|qHBN_>
zr3!bQQ9}iCwYi)r40<J-(b$CfK9-Y(65Vs%Yg$S!Q%`mNFBpZeDVI8egm8952$$Rt
zvOlOtb*L8&pg^>Fcn^Ci(~~;UtENOmD4OiAP)BvFChBQcE_l5D?=-B{f!lskqz-k_
zpjI2GJ(p`xCwtk1j2rfUsdlOtI0BiKG{rwNT0@?LH=&<2RI*i5@=mQ@)*Yf}=@brd
zL!;CwoL2~TQ%w#u*s4kxL5~9qv*5l+(Z-MHKV3vydvYIb49wSCj_a_zFiTw1F)G-W
zbw>#+m`s?A`TAu(Tx%88&8PYZr##<X$7<#7Z!(5P1GcR(TXvFNWpA>x?AfYO;=fY7
z-i0mn0}_BVytF_BB+b*HA|cJ$%DQo43&CTs|Ab&)3l{l6PRXqaP~;ezPYkNvp1cgr
zx&@7FAW`_=nrC+>t*k%kW~0eC8&7&5rj?+$Z^_Ji-`0{&Skmyd)_v#4_G@*+RH!Kx
aL@H?UmluzJrr*DP{gPb+-OV5RY4i(E^E<Bq

literal 0
HcmV?d00001

diff --git a/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.module_utils.types_1.stats b/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.module_utils.types_1.stats
new file mode 100644
index 0000000000000000000000000000000000000000..be914d4bcdab50d7e35ea986c747df053ea2f672
GIT binary patch
literal 1406
zcmb`H&2H2%5XVy~$!@w;TL}sE0XV=VZvX-bsRwfa@c@=%dlPG&aTMDvdq9G_Z-n<{
zY`3MW-d3B_Ozg3L^YQnu@~^Fm^o5&guNAn~JEd(KO*vb~oL$1^OY*)a@6Yn?_wsXj
z8=8&@3T%`%xobA}ew5%Aau!PF+`N!FR6EVAT}T<Oc(iC-P@Q*jAw}5af82n@up(4X
zR-*tB<Q>CPim={#;7%EcPCZID7?DjQyiP~0ajRlobk4%c?Wf1sCfZCZh7^TI>OCEE
zR7~O%1FJBKa-+3Oci7hM{4~kA1?le1ylW@zdj+=5aWq$mQU%IUnvy?9@H@=?0kM+v
zY!Z33Wsd2{S}NF@Xsl<sW!&ZUCYD&{vK3)<&t_22C(`#vqhTj<Pfmi>9AbSq8p|s8
zFe@kFx;*6id^}ffH|1KLu9>e7>5i{j9N!amlN@mQP)9x39ur4}8X;-C57ppN$Wb6=
z{29k~#m)FQr;RY&qK?y~hDwf;+s8eXGkMy5xDaxZAS7^=@WZw6lU5w3UC=1)oYO1l
z=!*qB=?3-3QBW@zZ}WRqpq9@e0za`1m!upTQV&<;Vz?$1LU=&Z^eRaa(|NX~#w{hD
jaSG-BcwW@7>9y&YreN@uyZ!hk0}o$GF?{<^-?je$LLChd

literal 0
HcmV?d00001

diff --git a/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.modules.site_load_1.stats b/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.plugins.modules.site_load_1.stats
new file mode 100644
index 0000000000000000000000000000000000000000..96a19b1d0ff630de65dcc92855b55dce7f28eebd
GIT binary patch
literal 1885
zcmb`IL2uJA6vr#nv`vfHG%kb7E*y$Lk#+>Z1OjP?fP~nAqvbemZPl@(*zV{73GSAd
zv~cFD^6aEzUAYjYr{_Gs*Pq|>`}_Ow*XQvd{M>Q55nP(Y8ZLC=O<HM#jjrA7Ls(se
z)ph;!NBymyyEwx+lDMEcEGM{H+JZ_`rvo>{##G*jRsw5Xr;$4#-a_8NGi#{#&YEvT
zNgcwX8!P4#5a=3*ER%(m#Be2j(5Rq>sk|{&Zbe8nfvp^8esSc+W>aosV{c=@F;EOF
zP;XGtMEOI!!cudHLPQBc!++>RuWVV;Dv{J&s%n*#!Y;YgNfW0Ngt+7ep>XagFt6d*
zEnP&bN;OAcV1tFn9CEo(-k4N$fr)ASv9B)OR&0EUE6L?DK)&cg1@&4rt>^{m!tEfP
zbw)x$;k>_6ec9#e)Id$EH7D)G?WJ1RyHszxRBKDsbHRS^qP^~f#trQm>(dUFbt6BR
zdI=W=q(bEs`MHI$w4f+{QiuMdAEGf)#dd1qToDa|66VH5v?$HS?}?0RX3x6&IW4Ko
zsU*B@_~W($?L4DK@iMGAsejgUHfJx{DLY~BuH3VKZuJ04CWd}BNtpi1YvtY84ux(}
zKuPzqz5oBVwb@!VLqza^c*0JvT!(RP)A_dCrL*oZx250&1T9BixEmpQC^NL@fc6}N
zx)RXLedl@e8Vx|Hr_$eon+w1mq*E5B5j#j9vBPu(owX9$AKn}q1m@P3BiIr_jvmDM
h<MVsBud16Zh03r%Qo$p3{^m(T%t$(5`Ct4j`2*I|$lw3~

literal 0
HcmV?d00001

diff --git a/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.tests.unit.plugins.modules.utils_1.stats b/skupper/network/tests/output/.tmp/pylint/ansible_collections.skupper.network.tests.unit.plugins.modules.utils_1.stats
new file mode 100644
index 0000000000000000000000000000000000000000..d41a9f0004d6c765c6e7d4b2a76aba74653836bf
GIT binary patch
literal 1693
zcmb_dL5tKd6dtghneNE$f}o2RFCIn~3hP}_5cW_NWWAR(%}m3jNokT<=dhsnfP>b5
z=nwI|q`S_z9%OA#FMWBhU%q_r>*wglxADk7?xfiWE=_6;7dpj|wb~G)J2!jlR~LTu
zy?gehyXxjHDM*=1QZwzBQ_?PN&7|qFk&B2iEe7#Q5Usl`az_-S922~-hGBLV-ccpB
zFN^yqaS4|Ifvt(}GF@0n4ObG2#x*mQDnqDBD}1XdY~`c~i;3AZ*R=`8L~sHqMix+S
z@;X%EA>I?IIaK9T3Bmj~bgEajX;_;|W-e8`N)6LSr&e;4Ho`8s)M;p;eJTf}E1e5P
zO3%aroMH_`^mt>|wknXZAchD89&x!)7))EXAk>6>f_$^U;i;Qkl2&rL^sqk+fm5?~
z%_$oiYO@dZ-5^l8VFNSzd>`hU|Agu1WVri&w1>{RG3rz=;R7%^s$@CJ7*uLuz)-jm
zzC;C0sH(5WE-4k&FkfCYE@pLOHn=A?DhSWI`z33bESaRdAKb@15xu7KU;qWtoOWNk
zdG)Y5tLD{{t$X<|jQu$vJG0@NZQU@$2V@@C>$~9Ep9Sm&Cwy_IPB&7;F7vHB{VSn(
zO-h1cd@`vwh!zdjGkmtS?zps#;1uS+L_g{8=7B8oTM4+(6R;-=7IQm!9_)MsR(Bv#
zH#d^04zqhzlEu|gc32%}5op0m5R5l%=B;aI%Pede#LIr}YTM10LKQ^hQo&E){MFL{
OxVp$j)yLoHi}V*U34-AO

literal 0
HcmV?d00001

diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-ansible-doc.json b/skupper/network/tests/output/bot/ansible-test-sanity-ansible-doc.json
new file mode 100644
index 0000000..cf43dfe
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-ansible-doc.json
@@ -0,0 +1,10 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/ansible-doc.html", 
+    "results": [
+        {
+            "message": "The test `ansible-test sanity --test ansible-doc` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/ansible-doc.html)] failed with the error:", 
+            "output": "Command \"ansible-doc -t module skupper.network.links skupper.network.links_load skupper.network.services skupper.network.services_load skupper.network.site_load\" returned exit status 1.\n>>> Standard Error\nERROR! Unable to retrieve documentation from 'skupper.network.services' due to: Expected string in description of type at index 3, got <class 'ansible.parsing.yaml.objects.AnsibleMapping'>. Expected string in description of type at index 3, got <class 'ansible.parsing.yaml.objects.AnsibleMapping'>"
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-compile-python-3.11.json b/skupper/network/tests/output/bot/ansible-test-sanity-compile-python-3.11.json
new file mode 100644
index 0000000..65bc8f6
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-compile-python-3.11.json
@@ -0,0 +1,10 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/compile.html", 
+    "results": [
+        {
+            "message": "The test `ansible-test sanity --test compile --python 3.11` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/compile.html)] failed with 1 error:", 
+            "output": "plugins/modules/links.py:8:1: SyntaxError: from __future__ import (absolute_import, division, print_function)"
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-import-python-3.11.json b/skupper/network/tests/output/bot/ansible-test-sanity-import-python-3.11.json
new file mode 100644
index 0000000..63e38c8
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-import-python-3.11.json
@@ -0,0 +1,14 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/import.html", 
+    "results": [
+        {
+            "message": "The test `ansible-test sanity --test import --python 3.11` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/import.html)] failed with 1 error:", 
+<<<<<<< HEAD
+            "output": "plugins/modules/links.py:8:1: traceback: SyntaxError: from __future__ imports must occur at the beginning of the file"
+=======
+            "output": "plugins/module_utils/base_action.py:15:0: traceback: NameError: name 'ActionBase' is not defined"
+>>>>>>> 9e073cd (Improved services and fixed sanity test issues)
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-pep8.json b/skupper/network/tests/output/bot/ansible-test-sanity-pep8.json
new file mode 100644
index 0000000..41b9d5e
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-pep8.json
@@ -0,0 +1,15 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/pep8.html", 
+    "results": [
+        {
+<<<<<<< HEAD
+            "message": "The test `ansible-test sanity --test pep8` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/pep8.html)] failed with 2 errors:", 
+            "output": "tests/unit/plugins/modules/test_services_load.py:495:4: W292: no newline at end of file\ntests/unit/plugins/modules/test_services_load.py:495:161: E501: line too long (1028 > 160 characters)"
+=======
+            "message": "The test `ansible-test sanity --test pep8` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/pep8.html)] failed with 12 errors:", 
+            "output": "plugins/modules/links.py:18:61: W291: trailing whitespace\nplugins/modules/links.py:26:54: W291: trailing whitespace\nplugins/modules/links_load.py:19:90: W291: trailing whitespace\nplugins/modules/links_load.py:22:65: W291: trailing whitespace\nplugins/modules/links_load.py:26:54: W291: trailing whitespace\nplugins/modules/services.py:16:67: W291: trailing whitespace\nplugins/modules/services.py:20:120: W291: trailing whitespace\nplugins/modules/services.py:23:54: W291: trailing whitespace\nplugins/modules/services_load.py:19:40: W291: trailing whitespace\nplugins/modules/services_load.py:23:54: W291: trailing whitespace\nplugins/modules/site_load.py:24:81: W291: trailing whitespace\nplugins/modules/site_load.py:27:54: W291: trailing whitespace"
+>>>>>>> 9e073cd (Improved services and fixed sanity test issues)
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-pylint.json b/skupper/network/tests/output/bot/ansible-test-sanity-pylint.json
new file mode 100644
index 0000000..0ecb385
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-pylint.json
@@ -0,0 +1,15 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/pylint.html", 
+    "results": [
+        {
+<<<<<<< HEAD
+            "message": "The test `ansible-test sanity --test pylint` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/pylint.html)] failed with 1 error:", 
+            "output": "tests/unit/plugins/modules/test_services_load.py:34:0: implicit-str-concat: Implicit string concatenation found in list"
+=======
+            "message": "The test `ansible-test sanity --test pylint` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/pylint.html)] failed with 10 errors:", 
+            "output": "plugins/module_utils/base_action.py:6:4: ansible-bad-module-import: Import external package or ansible.module_utils not ansible.plugins.action\nplugins/modules/links.py:9:0: unused-wildcard-import: Unused import(s) add_fact from wildcard import of module_utils.args\nplugins/modules/links.py:9:0: wildcard-import: Wildcard import module_utils.args\nplugins/modules/links_load.py:8:0: wildcard-import: Wildcard import module_utils.args\nplugins/modules/services.py:7:0: unused-wildcard-import: Unused import(s) add_fact from wildcard import of module_utils.args\nplugins/modules/services.py:7:0: wildcard-import: Wildcard import module_utils.args\nplugins/modules/services.py:126:54: undefined-variable: Undefined variable 'traceback'\nplugins/modules/services_load.py:8:0: wildcard-import: Wildcard import module_utils.args\nplugins/modules/services_load.py:115:20: disallowed-name: Disallowed name \"_\"\nplugins/modules/site_load.py:8:0: wildcard-import: Wildcard import module_utils.args"
+>>>>>>> 9e073cd (Improved services and fixed sanity test issues)
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-shebang.json b/skupper/network/tests/output/bot/ansible-test-sanity-shebang.json
new file mode 100644
index 0000000..087c86a
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-shebang.json
@@ -0,0 +1,10 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/shebang.html", 
+    "results": [
+        {
+            "message": "The test `ansible-test sanity --test shebang` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/shebang.html)] failed with 1 error:", 
+            "output": "tests/unit/plugins/modules/utils.py:1:1: unexpected non-module shebang: b'#!/usr/bin/python'"
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/bot/ansible-test-sanity-validate-modules.json b/skupper/network/tests/output/bot/ansible-test-sanity-validate-modules.json
new file mode 100644
index 0000000..aaefaae
--- /dev/null
+++ b/skupper/network/tests/output/bot/ansible-test-sanity-validate-modules.json
@@ -0,0 +1,15 @@
+{
+    "docs": "https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/validate-modules.html", 
+    "results": [
+        {
+<<<<<<< HEAD
+            "message": "The test `ansible-test sanity --test validate-modules` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/validate-modules.html)] failed with 1 error:", 
+            "output": "plugins/modules/links.py:0:0: missing-python-interpreter: Interpreter line is not \"#!/usr/bin/python\""
+=======
+            "message": "The test `ansible-test sanity --test validate-modules` [[explain](https://docs.ansible.com/ansible-core/2.15/dev_guide/testing/sanity/validate-modules.html)] failed with 208 errors:", 
+            "output": "plugins/modules/links.py:0:0: doc-elements-mismatch: Argument 'create' in argument_spec specifies elements as dict,but elements is not documented\nplugins/modules/links.py:0:0: doc-elements-mismatch: Argument 'delete' in argument_spec specifies elements as dict,but elements is not documented\nplugins/modules/links.py:0:0: doc-required-mismatch: Argument 'host' in argument_spec found in create is required, but is not documented as being required\nplugins/modules/links.py:0:0: doc-required-mismatch: Argument 'name' in argument_spec found in delete is required, but is not documented as being required\nplugins/modules/links.py:0:0: invalid-documentation: DOCUMENTATION.author: required key not provided @ data['author']. Got None\nplugins/modules/links.py:0:0: missing-gplv3-license: GPLv3 license header not found in the first 20 lines of the module\nplugins/modules/links.py:0:0: missing-suboption-docs: Argument 'create' in argument_spec has sub-options but documentation does not define it\nplugins/modules/links.py:0:0: missing-suboption-docs: Argument 'delete' in argument_spec has sub-options but documentation does not define it\nplugins/modules/links.py:0:0: no-log-needed: Argument 'token' in argument_spec could be a secret, though doesn't have `no_log` set found in create\nplugins/modules/links.py:0:0: no-log-needed: Argument 'token' in argument_spec could be a secret, though doesn't have `no_log` set found in delete\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'context' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'cost' in argument_spec found in create defines type as 'int' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'cost' in argument_spec found in delete defines type as 'int' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'create' in argument_spec defines type as 'list' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'delete' in argument_spec defines type as 'list' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'host' in argument_spec found in create defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'host' in argument_spec found in delete defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'hostname' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'kubeconfig' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in create defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in delete defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'namespace' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'platform' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'podman_endpoint' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'token' in argument_spec found in create defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: parameter-type-not-in-doc: Argument 'token' in argument_spec found in delete defines type as 'str' but documentation doesn't define type\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'context' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'cost' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'cost' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'create' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'delete' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'host' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'host' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'hostname' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'kubeconfig' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'name' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'name' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'namespace' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'platform' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'podman_endpoint' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'token' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:0:0: undocumented-parameter: Argument 'token' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links.py:3:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN.\nplugins/modules/links_load.py:0:0: doc-elements-mismatch: Argument 'sites' in argument_spec specifies elements as dict,but elements is not documented\nplugins/modules/links_load.py:0:0: doc-required-mismatch: Argument 'host' in argument_spec found in sites is required, but is not documented as being required\nplugins/modules/links_load.py:0:0: doc-required-mismatch: Argument 'id' in argument_spec found in sites is required, but is not documented as being required\nplugins/modules/links_load.py:0:0: doc-required-mismatch: Argument 'name' in argument_spec found in sites is required, but is not documented as being required\nplugins/modules/links_load.py:0:0: invalid-documentation: DOCUMENTATION.author: required key not provided @ data['author']. Got None\nplugins/modules/links_load.py:0:0: missing-gplv3-license: GPLv3 license header not found in the first 20 lines of the module\nplugins/modules/links_load.py:0:0: missing-suboption-docs: Argument 'sites' in argument_spec has sub-options but documentation does not define it\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'context' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'host' in argument_spec found in sites defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'hostname' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'id' in argument_spec found in sites defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'kubeconfig' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in sites defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'namespace' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'platform' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'podman_endpoint' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: parameter-type-not-in-doc: Argument 'sites' in argument_spec defines type as 'list' but documentation doesn't define type\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'context' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'host' found in sites is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'hostname' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'id' found in sites is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'kubeconfig' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'name' found in sites is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'namespace' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'platform' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'podman_endpoint' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:0:0: undocumented-parameter: Argument 'sites' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/links_load.py:3:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN.\nplugins/modules/services.py:0:0: doc-default-does-not-match-spec: Argument 'protocol' in argument_spec found in create -> spec defines default as ('tcp') but documentation defines default as (None)\nplugins/modules/services.py:0:0: doc-default-does-not-match-spec: Argument 'protocol' in argument_spec found in delete -> spec defines default as ('tcp') but documentation defines default as (None)\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'create' in argument_spec specifies elements as dict,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'delete' in argument_spec specifies elements as dict,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'hostPorts' in argument_spec found in create -> spec specifies elements as str,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'hostPorts' in argument_spec found in delete -> spec specifies elements as str,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'labels' in argument_spec found in create specifies elements as str,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'labels' in argument_spec found in delete specifies elements as str,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'ports' in argument_spec found in create -> spec specifies elements as int,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'ports' in argument_spec found in create -> targets specifies elements as str,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'ports' in argument_spec found in delete -> spec specifies elements as int,but elements is not documented\nplugins/modules/services.py:0:0: doc-elements-mismatch: Argument 'ports' in argument_spec found in delete -> targets specifies elements as str,but elements is not documented\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'name' in argument_spec found in create -> targets is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'name' in argument_spec found in create is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'name' in argument_spec found in delete -> targets is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'name' in argument_spec found in delete is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'ports' in argument_spec found in create -> spec is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'ports' in argument_spec found in delete -> spec is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'type' in argument_spec found in create -> targets is required, but is not documented as being required\nplugins/modules/services.py:0:0: doc-required-mismatch: Argument 'type' in argument_spec found in delete -> targets is required, but is not documented as being required\nplugins/modules/services.py:0:0: invalid-documentation: DOCUMENTATION.author: required key not provided @ data['author']. Got None\nplugins/modules/services.py:0:0: missing-gplv3-license: GPLv3 license header not found in the first 20 lines of the module\nplugins/modules/services.py:0:0: missing-suboption-docs: Argument 'create' in argument_spec has sub-options but documentation does not define it\nplugins/modules/services.py:0:0: missing-suboption-docs: Argument 'delete' in argument_spec has sub-options but documentation does not define it\nplugins/modules/services.py:0:0: missing-suboption-docs: Argument 'spec' in argument_spec found in create has sub-options but documentation does not define it\nplugins/modules/services.py:0:0: missing-suboption-docs: Argument 'spec' in argument_spec found in delete has sub-options but documentation does not define it\nplugins/modules/services.py:0:0: missing-suboption-docs: Argument 'targets' in argument_spec found in create has sub-options but documentation does not define it\nplugins/modules/services.py:0:0: missing-suboption-docs: Argument 'targets' in argument_spec found in delete has sub-options but documentation does not define it\nplugins/modules/services.py:0:0: parameter-list-no-elements: Argument 'targets' in argument_spec found in create defines type as list but elements is not defined\nplugins/modules/services.py:0:0: parameter-list-no-elements: Argument 'targets' in argument_spec found in delete defines type as list but elements is not defined\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'aggregate' in argument_spec found in create -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'aggregate' in argument_spec found in delete -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'containerName' in argument_spec found in create -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'containerName' in argument_spec found in delete -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'context' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'create' in argument_spec defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'delete' in argument_spec defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'eventChannel' in argument_spec found in create -> spec defines type as 'bool' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'eventChannel' in argument_spec found in delete -> spec defines type as 'bool' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'generateTlsSecrets' in argument_spec found in create -> spec defines type as 'bool' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'generateTlsSecrets' in argument_spec found in delete -> spec defines type as 'bool' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'hostIp' in argument_spec found in create -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'hostIp' in argument_spec found in delete -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'hostPorts' in argument_spec found in create -> spec defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'hostPorts' in argument_spec found in delete -> spec defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'hostname' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'kubeconfig' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'labels' in argument_spec found in create defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'labels' in argument_spec found in delete defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in create -> targets defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in create defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in delete -> targets defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'name' in argument_spec found in delete defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'namespace' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'platform' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'podman_endpoint' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'ports' in argument_spec found in create -> spec defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'ports' in argument_spec found in create -> targets defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'ports' in argument_spec found in delete -> spec defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'ports' in argument_spec found in delete -> targets defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'protocol' in argument_spec found in create -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'protocol' in argument_spec found in delete -> spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'spec' in argument_spec found in create defines type as 'dict' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'spec' in argument_spec found in delete defines type as 'dict' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'targets' in argument_spec found in create defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'targets' in argument_spec found in delete defines type as 'list' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'type' in argument_spec found in create -> targets defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: parameter-type-not-in-doc: Argument 'type' in argument_spec found in delete -> targets defines type as 'str' but documentation doesn't define type\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'aggregate' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'aggregate' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'containerName' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'containerName' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'context' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'create' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'delete' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'eventChannel' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'eventChannel' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'generateTlsSecrets' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'generateTlsSecrets' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'hostIp' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'hostIp' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'hostPorts' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'hostPorts' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'hostname' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'kubeconfig' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'labels' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'labels' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'name' found in create -> targets is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'name' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'name' found in delete -> targets is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'name' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'namespace' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'platform' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'podman_endpoint' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'ports' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'ports' found in create -> targets is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'ports' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'ports' found in delete -> targets is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'protocol' found in create -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'protocol' found in delete -> spec is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'spec' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'spec' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'targets' found in create is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'targets' found in delete is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'type' found in create -> targets is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:0:0: undocumented-parameter: Argument 'type' found in delete -> targets is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services.py:4:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN.\nplugins/modules/services_load.py:0:0: invalid-documentation: DOCUMENTATION.author: required key not provided @ data['author']. Got None\nplugins/modules/services_load.py:0:0: missing-gplv3-license: GPLv3 license header not found in the first 20 lines of the module\nplugins/modules/services_load.py:0:0: parameter-type-not-in-doc: Argument 'context' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services_load.py:0:0: parameter-type-not-in-doc: Argument 'hostname' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services_load.py:0:0: parameter-type-not-in-doc: Argument 'kubeconfig' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services_load.py:0:0: parameter-type-not-in-doc: Argument 'namespace' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services_load.py:0:0: parameter-type-not-in-doc: Argument 'platform' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services_load.py:0:0: parameter-type-not-in-doc: Argument 'podman_endpoint' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/services_load.py:0:0: undocumented-parameter: Argument 'context' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services_load.py:0:0: undocumented-parameter: Argument 'hostname' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services_load.py:0:0: undocumented-parameter: Argument 'kubeconfig' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services_load.py:0:0: undocumented-parameter: Argument 'namespace' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services_load.py:0:0: undocumented-parameter: Argument 'platform' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services_load.py:0:0: undocumented-parameter: Argument 'podman_endpoint' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/services_load.py:3:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN.\nplugins/modules/site_load.py:0:0: invalid-documentation: DOCUMENTATION.author: required key not provided @ data['author']. Got None\nplugins/modules/site_load.py:0:0: missing-gplv3-license: GPLv3 license header not found in the first 20 lines of the module\nplugins/modules/site_load.py:0:0: parameter-type-not-in-doc: Argument 'context' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/site_load.py:0:0: parameter-type-not-in-doc: Argument 'hostname' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/site_load.py:0:0: parameter-type-not-in-doc: Argument 'kubeconfig' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/site_load.py:0:0: parameter-type-not-in-doc: Argument 'namespace' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/site_load.py:0:0: parameter-type-not-in-doc: Argument 'platform' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/site_load.py:0:0: parameter-type-not-in-doc: Argument 'podman_endpoint' in argument_spec defines type as 'str' but documentation doesn't define type\nplugins/modules/site_load.py:0:0: undocumented-parameter: Argument 'context' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/site_load.py:0:0: undocumented-parameter: Argument 'hostname' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/site_load.py:0:0: undocumented-parameter: Argument 'kubeconfig' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/site_load.py:0:0: undocumented-parameter: Argument 'namespace' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/site_load.py:0:0: undocumented-parameter: Argument 'platform' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/site_load.py:0:0: undocumented-parameter: Argument 'podman_endpoint' is listed in the argument_spec, but not documented in the module documentation\nplugins/modules/site_load.py:3:0: import-before-documentation: Import found before documentation variables. All imports must appear below DOCUMENTATION/EXAMPLES/RETURN."
+>>>>>>> 9e073cd (Improved services and fixed sanity test issues)
+        }
+    ], 
+    "verified": false
+}
diff --git a/skupper/network/tests/output/junit/python3.11-modules-units.xml b/skupper/network/tests/output/junit/python3.11-modules-units.xml
new file mode 100644
index 0000000..c3a6bfd
--- /dev/null
+++ b/skupper/network/tests/output/junit/python3.11-modules-units.xml
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="utf-8"?><testsuites><testsuite name="pytest" errors="0" failures="0" skipped="0" tests="6" time="1.253" timestamp="2023-07-25T13:35:40.842266" hostname="fedora"><testcase classname="tests.unit.plugins.modules.test_links_load.TestLinksLoad" name="test_links_load_kube" file="tests/unit/plugins/modules/test_links_load.py" line="38" time="0.003" /><testcase classname="tests.unit.plugins.modules.test_links_load.TestLinksLoad" name="test_site_load_podman" file="tests/unit/plugins/modules/test_links_load.py" line="52" time="0.004" /><testcase classname="tests.unit.plugins.modules.test_services_load.TestServicesLoad" name="test_site_load_podman" file="tests/unit/plugins/modules/test_services_load.py" line="113" time="0.004" /><testcase classname="tests.unit.plugins.modules.test_site_load.TestSiteLoad" name="test_site_load_podman" file="tests/unit/plugins/modules/test_site_load.py" line="90" time="0.005" /><testcase classname="tests.unit.plugins.modules.test_site_load.TestSiteLoad" name="test_site_load_kube" file="tests/unit/plugins/modules/test_site_load.py" line="71" time="0.005" /><testcase classname="tests.unit.plugins.modules.test_services_load.TestServicesLoad" name="test_services_load_kube" file="tests/unit/plugins/modules/test_services_load.py" line="64" time="0.005" /></testsuite></testsuites>
\ No newline at end of file
diff --git a/skupper/network/tests/unit/plugins/modules/test_links_load.py b/skupper/network/tests/unit/plugins/modules/test_links_load.py
new file mode 100644
index 0000000..52ba2af
--- /dev/null
+++ b/skupper/network/tests/unit/plugins/modules/test_links_load.py
@@ -0,0 +1,222 @@
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+import unittest
+
+from ansible.module_utils import basic
+from unittest.mock import patch
+
+from ansible_collections.skupper.network.plugins.modules import links_load
+from ansible_collections.skupper.network.tests.unit.plugins.modules.utils import exit_json, fail_json, \
+    AnsibleExitJson, set_module_args
+
+
+class TestLinksLoad(unittest.TestCase):
+
+    def setUp(self):
+        # Mocking AnsibleModule
+        self.mock_module = patch.multiple(basic.AnsibleModule,
+                                          exit_json=exit_json,
+                                          fail_json=fail_json,
+                                          run_command=self.run_command_mock)
+        self.mock_module.start()
+        self.addCleanup(self.mock_module.stop)
+
+    def run_command_mock(self, args, **kwargs):
+        if args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                    '--namespace=my-namespace', 'get', 'secret',
+                    '--selector', 'skupper.io/type in (token-claim, connection-token)', '--output', 'json']:
+            return 0, kube_secrets, ''
+        elif args == ['podman', '--url=/tmp/podman.socket', 'volume', 'inspect', '--all']:
+            return 0, podman_secrets, ''
+        return 1, '', 'unexpected request - args = %s' % args
+
+    def test_links_load_kube(self):
+        set_module_args({
+            "kubeconfig": "/home/user/.kube/config",
+            "context": "my-context",
+            "namespace": "my-namespace",
+            "hostname": "my-hostname-1",
+            "sites": sites,
+        })
+        with self.assertRaises(AnsibleExitJson) as ex:
+            links_load.main()
+
+        result = ex.exception.args[0]
+        self.assert_links(result)
+
+    def test_site_load_podman(self):
+        set_module_args({
+            "platform": "podman",
+            "podman_endpoint": "/tmp/podman.socket",
+            "hostname": "my-hostname-1",
+            "sites": sites,
+        })
+        with self.assertRaises(AnsibleExitJson) as ex:
+            links_load.main()
+
+        result = ex.exception.args[0]
+        self.assert_links(result)
+
+    def assert_links(self, result):
+        self.assertEquals(True, result['changed'])
+        self.assertIsNotNone(result['ansible_facts']['existing_links'])
+
+        links = result['ansible_facts']['existing_links']
+        self.assertEquals(2, len(links))
+        idx = 1
+        for link in links:
+            linkid = idx
+            idx += 1
+            self.assertIn({'host': 'hostname-%d' % idx, 'name': 'link%d' % linkid, 'cost': idx, 'token': ''}, links)
+
+
+sites = [{
+    "host": "hostname-1",
+    "name": "my-name-1",
+    "id": "my-id-1",
+}, {
+    "host": "hostname-2",
+    "name": "my-name-2",
+    "id": "my-id-2",
+}, {
+    "host": "hostname-3",
+    "name": "my-name-3",
+    "id": "my-id-3",
+}]
+
+kube_secrets = """{
+    "apiVersion": "v1",
+    "items": [
+        {
+            "apiVersion": "v1",
+            "data": {
+                "ca.crt": "data",
+                "tls.crt": "data",
+                "tls.key": "data"
+            },
+            "kind": "Secret",
+            "metadata": {
+                "annotations": {
+                    "edge-host": "10.0.0.1",
+                    "edge-port": "45671",
+                    "inter-router-host": "10.0.0.1",
+                    "inter-router-port": "55671",
+                    "skupper.io/cost": "2",
+                    "skupper.io/generated-by": "my-id-2",
+                    "skupper.io/site-version": "1.4.2"
+                },
+                "creationTimestamp": "2023-07-21T12:30:43Z",
+                "labels": {
+                    "skupper.io/type": "connection-token"
+                },
+                "name": "link1",
+                "namespace": "my-namespace",
+                "ownerReferences": [
+                    {
+                        "apiVersion": "apps/v1",
+                        "kind": "Deployment",
+                        "name": "skupper-router",
+                        "uid": "7cc3f896-f1e2-4cff-9d3e-607bb10da8ad"
+                    }
+                ],
+                "resourceVersion": "139324",
+                "uid": "9021ce4c-8839-41c0-95f3-5a588cb0766d"
+            },
+            "type": "kubernetes.io/tls"
+        },
+        {
+            "apiVersion": "v1",
+            "data": {
+                "ca.crt": "data",
+                "tls.crt": "data",
+                "tls.key": "data"
+            },
+            "kind": "Secret",
+            "metadata": {
+                "annotations": {
+                    "edge-host": "10.0.0.2",
+                    "edge-port": "45671",
+                    "inter-router-host": "10.0.0.2",
+                    "inter-router-port": "55671",
+                    "skupper.io/cost": "3",
+                    "skupper.io/generated-by": "my-id-3",
+                    "skupper.io/site-version": "manual",
+                    "skupper.io/url": "https://10.0.0.2:8081/"
+                },
+                "creationTimestamp": "2023-07-21T12:30:43Z",
+                "labels": {
+                    "skupper.io/type": "connection-token"
+                },
+                "name": "link2",
+                "namespace": "my-namespace",
+                "ownerReferences": [
+                    {
+                        "apiVersion": "apps/v1",
+                        "kind": "Deployment",
+                        "name": "skupper-router",
+                        "uid": "7cc3f896-f1e2-4cff-9d3e-607bb10da8ad"
+                    }
+                ],
+                "resourceVersion": "139329",
+                "uid": "12167ad4-397a-4888-b040-6a37acabaf32"
+            },
+            "type": "Opaque"
+        }
+    ],
+    "kind": "List",
+    "metadata": {
+        "resourceVersion": ""
+    }
+}
+"""
+
+podman_secrets = """[
+     {
+          "Name": "link1",
+          "Driver": "local",
+          "Mountpoint": "/home/fgiorget/.local/share/containers/storage/volumes/link1/_data",
+          "CreatedAt": "2023-07-21T09:30:43.92102414-03:00",
+          "Labels": {
+               "application": "skupper",
+               "internal.skupper.io/metadata": "{\\"name\\":\\"link1\\",\\"creationTimestamp\\":null,\\"labels\\":\
+               {\\"skupper.io/type\\":\\"connection-token\\"},\\"annotations\\":{\\"edge-host\\":\\"10.105.3.187\\",\
+               \\"edge-port\\":\\"45671\\",\\"inter-router-host\\":\\"10.105.3.187\\",\
+               \\"inter-router-port\\":\\"55671\\",\\"skupper.io/generated-by\\":\\"my-id-2\\",\
+               \\"skupper.io/cost\\":\\"2\\",\
+               \\"skupper.io/url\\":\\"https://10.110.231.48:8081/681edc45-27c2-11ee-aad3-047bcb64f0f2\\"}}",
+               "skupper.io/type": "connection-token"
+          },
+          "Scope": "local",
+          "Options": {},
+          "MountCount": 0,
+          "NeedsCopyUp": true,
+          "NeedsChown": true
+     },
+     {
+          "Name": "link2",
+          "Driver": "local",
+          "Mountpoint": "/home/fgiorget/.local/share/containers/storage/volumes/link2/_data",
+          "CreatedAt": "2023-07-21T09:30:44.410553295-03:00",
+          "Labels": {
+               "application": "skupper",
+               "internal.skupper.io/metadata": "{\\"name\\":\\"link2\\",\\"creationTimestamp\\":null,\\"labels\\":\
+               {\\"skupper.io/type\\":\\"connection-token\\"},\\"annotations\\":{\\"edge-host\\":\\"10.100.97.179\\",\
+               \\"edge-port\\":\\"45671\\",\\"inter-router-host\\":\\"10.100.97.179\\",\
+               \\"inter-router-port\\":\\"55671\\",\\"skupper.io/generated-by\\":\\"my-id-3\\",\
+               \\"skupper.io/cost\\":\\"3\\",\\"skupper.io/site-version\\":\\"manual\\"}}",
+               "skupper.io/type": "connection-token"
+          },
+          "Scope": "local",
+          "Options": {},
+          "MountCount": 0,
+          "NeedsCopyUp": true,
+          "NeedsChown": true
+     }
+]
+"""
diff --git a/skupper/network/tests/unit/plugins/modules/test_services_load.py b/skupper/network/tests/unit/plugins/modules/test_services_load.py
new file mode 100644
index 0000000..d973120
--- /dev/null
+++ b/skupper/network/tests/unit/plugins/modules/test_services_load.py
@@ -0,0 +1,495 @@
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+import unittest
+
+from ansible.module_utils import basic
+from io import TextIOWrapper, BytesIO
+from unittest.mock import patch
+
+from ansible_collections.skupper.network.plugins.modules import services_load
+from ansible_collections.skupper.network.tests.unit.plugins.modules.utils import exit_json, fail_json, \
+    AnsibleExitJson, set_module_args
+
+
+class TestServicesLoad(unittest.TestCase):
+
+    def setUp(self):
+        # Mocking AnsibleModule
+        self.mock_module = patch.multiple(basic.AnsibleModule,
+                                          exit_json=exit_json,
+                                          fail_json=fail_json,
+                                          run_command=self.run_command_mock)
+        self.mock_module.start()
+        self.addCleanup(self.mock_module.stop)
+
+        self.mock_open_ctrl = patch('builtins.open', side_effect=self.open_side_effect)
+        self.mock_open_ctrl.start()
+        self.addCleanup(self.mock_open_ctrl.stop)
+
+    def run_command_mock(self, args, **kwargs):
+        if args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                    '--namespace=my-namespace', 'api-resources', '--api-group', 'apps.openshift.io', '-o', 'name']:
+            return 0, 'deploymentconfigs.apps.openshift.io', ''
+
+        elif args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                      '--namespace=my-namespace', 'get', 'deployment', '-o', 'json']:
+            return 0, deployments_json, ''
+        elif args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                      '--namespace=my-namespace', 'get', 'statefulset', '-o', 'json']:
+            return 0, statefulsets_json, ''
+        elif args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                      '--namespace=my-namespace', 'get', 'deploymentconfig', '-o', 'json']:
+            return 0, deploymentconfigs_json, ''
+        elif args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                      '--namespace=my-namespace', 'get', 'configmap', 'skupper-services', '--output', 'json']:
+            return 0, skupper_services_kube, ''
+        elif args == ['podman', '--url=/tmp/podman.socket', 'container', 'ls', '-f', 'label=skupper.io/address',
+                      '--format', 'json']:
+            return 0, container_ls_json, ''
+        elif args == ['podman', '--url=/tmp/podman.socket', 'volume', 'inspect', 'skupper-services']:
+            return 0, volume_inspect_json, ''
+        return 1, '', 'unexpected request - args = %s' % args
+
+    def open_side_effect(self, *args, **kwargs):
+        mount_point = '/home/my_user/.local/share/containers/storage/volumes/skupper-services/_data'
+        if args[0] == '%s/skupper-services.json' % mount_point:
+            return TextIOWrapper(BytesIO(bytes(skupper_services_podman, 'utf-8')))
+        return TextIOWrapper(BytesIO(bytes('algo inesperado', 'utf-8')))
+
+    def test_services_load_kube(self):
+        set_module_args({
+            "kubeconfig": "/home/user/.kube/config",
+            "context": "my-context",
+            "namespace": "my-namespace",
+            "hostname": "my-hostname-1",
+            "platform": "kubernetes",
+        })
+        with self.assertRaises(AnsibleExitJson) as ex:
+            services_load.main()
+
+        result = ex.exception.args[0]
+        self.assertEquals(True, result['changed'])
+        self.assertIsNotNone(result['ansible_facts']['existing_services'])
+
+        services = result['ansible_facts']['existing_services']
+        self.assertEquals(4, len(services))
+        for name, service in services.items():
+            if name == "my-service-a":
+                self.assertEquals([8080, 9090], service['ports'])
+                self.assertEquals('http', service['protocol'])
+                self.assertEquals(2, len(service['labels']))
+                self.assertEquals(['label1=value1', 'label2=value2'], service['labels'])
+                self.assertEquals(1, len(service['targets']))
+                self.assertEquals('deployment', service['targets'][0]['type'])
+                self.assertEquals('nginx', service['targets'][0]['name'])
+                self.assertEquals(2, len(service['targets'][0]['ports']))
+                self.assertEquals(['8080:8080', '9090:8080'], service['targets'][0]['ports'])
+            elif name == "nginx-dc":
+                self.assertEquals([8080], service['ports'])
+                self.assertEquals('tcp', service['protocol'])
+                self.assertEquals(1, len(service['targets']))
+                self.assertEquals('deploymentconfig', service['targets'][0]['type'])
+                self.assertEquals('nginx-dc', service['targets'][0]['name'])
+                self.assertEquals(1, len(service['targets'][0]['ports']))
+                self.assertEquals(['8080:8080'], service['targets'][0]['ports'])
+            elif name == "nginx-skupper":
+                self.assertEquals([8080], service['ports'])
+                self.assertEquals('tcp', service['protocol'])
+                self.assertEquals(1, len(service['targets']))
+                self.assertEquals('service', service['targets'][0]['type'])
+                self.assertEquals('nginx.my-namespace', service['targets'][0]['name'])
+            elif name == "postgres":
+                self.assertEquals([5432], service['ports'])
+                self.assertEquals('tcp', service['protocol'])
+                self.assertEquals(1, len(service['targets']))
+                self.assertEquals('statefulset', service['targets'][0]['type'])
+                self.assertEquals('postgres', service['targets'][0]['name'])
+
+    def test_site_load_podman(self):
+        set_module_args({
+            "platform": "podman",
+            "podman_endpoint": "/tmp/podman.socket",
+            "hostname": "my-hostname-1",
+        })
+        with self.assertRaises(AnsibleExitJson) as ex:
+            services_load.main()
+        result = ex.exception.args[0]
+        self.assertEquals(True, result['changed'])
+        self.assertIsNotNone(result['ansible_facts']['existing_services'])
+
+        services = result['ansible_facts']['existing_services']
+        self.assertEquals(2, len(services))
+        for name, service in services.items():
+            if name == "my-service-a":
+                self.assertEquals([8080, 9090], service['ports'])
+                self.assertEquals('http', service['protocol'])
+                self.assertEquals(1, len(service['targets']))
+                self.assertEquals('host', service['targets'][0]['type'])
+                self.assertEquals('10.0.0.1', service['targets'][0]['name'])
+                self.assertEquals(2, len(service['targets'][0]['ports']))
+                self.assertEquals(['8080:8080', '9090:8080'], service['targets'][0]['ports'])
+            elif name == "postgres":
+                self.assertEquals([5432], service['ports'])
+                self.assertEquals('tcp', service['protocol'])
+                self.assertEquals(2, len(service['targets']))
+                self.assertEquals('host', service['targets'][0]['type'])
+                self.assertEquals('10.0.0.2', service['targets'][0]['name'])
+                self.assertEquals(['5432:5432'], service['targets'][0]['ports'])
+                self.assertEquals('host', service['targets'][1]['type'])
+                self.assertEquals('10.0.0.3', service['targets'][1]['name'])
+                self.assertEquals(['5432:2345'], service['targets'][1]['ports'])
+
+
+deployments_json = """{
+  "apiVersion": "v1",
+  "items": [
+    {
+      "apiVersion": "apps/v1",
+      "kind": "Deployment",
+      "metadata": {
+        "labels": {
+          "app": "nginx"
+        },
+        "name": "nginx",
+        "namespace": "my-namespace"
+      },
+      "spec": {
+        "selector": {
+          "matchLabels": {
+            "app": "nginx"
+          }
+        },
+        "template": {
+          "metadata": {
+            "labels": {
+              "app": "nginx"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "image": "nginxinc/nginx-unprivileged:stable-alpine",
+                "imagePullPolicy": "IfNotPresent",
+                "name": "nginx",
+                "ports": [
+                  {
+                    "containerPort": 8080,
+                    "name": "web",
+                    "protocol": "TCP"
+                  }
+                ]
+              }
+            ],
+            "restartPolicy": "Always"
+          }
+        }
+      }
+    }
+  ],
+  "kind": "List",
+  "metadata": {
+    "resourceVersion": ""
+  }
+}
+"""
+
+statefulsets_json = """{
+  "apiVersion": "v1",
+  "items": [
+    {
+      "apiVersion": "apps/v1",
+      "kind": "StatefulSet",
+      "metadata": {
+        "generation": 1,
+        "name": "postgres",
+        "namespace": "my-namespace"
+      },
+      "spec": {
+        "replicas": 3,
+        "revisionHistoryLimit": 10,
+        "selector": {
+          "matchLabels": {
+            "app": "postgres"
+          }
+        },
+        "serviceName": "postgres",
+        "template": {
+          "metadata": {
+            "creationTimestamp": null,
+            "labels": {
+              "app": "postgres"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "image": "registry.redhat.io/rhel9/postgresql-15",
+                "imagePullPolicy": "Always",
+                "name": "postgres",
+                "ports": [
+                  {
+                    "containerPort": 5432,
+                    "name": "postgres",
+                    "protocol": "TCP"
+                  }
+                ]
+              }
+            ]
+          }
+        }
+      }
+    },
+    {
+      "apiVersion": "apps/v1",
+      "kind": "StatefulSet",
+      "metadata": {
+        "annotations": {
+          "internal.skupper.io/service": "postgres"
+        },
+        "labels": {
+          "app.kubernetes.io/name": "skupper-router",
+          "app.kubernetes.io/part-of": "skupper",
+          "application": "skupper-router",
+          "internal.skupper.io/type": "proxy",
+          "skupper.io/component": "router"
+        },
+        "name": "postgres-proxy",
+        "namespace": "my-namespace",
+        "ownerReferences": [
+          {
+            "apiVersion": "apps/v1",
+            "kind": "Deployment",
+            "name": "skupper-router",
+            "uid": "e312c6e1-c6c8-4675-ba06-0bd0ad63003b"
+          }
+        ]
+      },
+      "spec": {
+        "podManagementPolicy": "OrderedReady",
+        "replicas": 3,
+        "revisionHistoryLimit": 10,
+        "selector": {
+          "matchLabels": {
+            "internal.skupper.io/service": "postgres"
+          }
+        },
+        "serviceName": "postgres-proxy",
+        "template": {
+          "metadata": {
+            "labels": {
+              "internal.skupper.io/service": "postgres"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "image": "quay.io/skupper/skupper-router:2.4.2",
+                "imagePullPolicy": "Always",
+                "name": "proxy"
+              }
+            ],
+            "restartPolicy": "Always",
+            "serviceAccount": "skupper-router",
+            "serviceAccountName": "skupper-router"
+          }
+        }
+      }
+    }
+  ],
+  "kind": "List",
+  "metadata": {
+    "resourceVersion": ""
+  }
+}
+"""
+
+deploymentconfigs_json = """{
+  "apiVersion": "v1",
+  "items": [
+    {
+      "apiVersion": "apps.openshift.io/v1",
+      "kind": "DeploymentConfig",
+      "metadata": {
+        "name": "nginx-dc",
+        "namespace": "my-namespace"
+      },
+      "spec": {
+        "replicas": 1,
+        "selector": {
+          "deployment-config.name": "nginx-dc"
+        },
+        "template": {
+          "metadata": {
+            "labels": {
+              "deployment-config.name": "nginx-dc"
+            }
+          },
+          "spec": {
+            "containers": [
+              {
+                "image": "nginxinc/nginx-unprivileged:stable-alpine",
+                "imagePullPolicy": "IfNotPresent",
+                "name": "nginx"
+              }
+            ],
+            "restartPolicy": "Always"
+          }
+        }
+      }
+    }
+  ],
+  "kind": "List",
+  "metadata": {
+    "resourceVersion": ""
+  }
+}
+"""
+
+skupper_services_kube = """{
+  "apiVersion": "v1",
+  "data": {
+    "my-service-a": "{\\"address\\":\\"my-service-a\\",\\"protocol\\":\\"http\\",\\"ports\\":[8080,9090],\
+    \\"exposeIngress\\":\\"\\",\\"labels\\":{\\"label1\\":\\"value1\\",\\"label2\\":\\"value2\\"},\
+    \\"targets\\":[{\\"name\\":\\"nginx\\",\\"selector\\":\\"app=nginx\\",\
+    \\"targetPorts\\":{\\"8080\\":8080,\\"9090\\":8080},\\"namespace\\":\\"my-namespace\\"}]}",
+    "nginx-dc": "{\\"address\\":\\"nginx-dc\\",\\"protocol\\":\\"tcp\\",\\"ports\\":[8080],\
+    \\"exposeIngress\\":\\"\\",\\"targets\\":[{\\"name\\":\\"nginx-dc\\",\
+    \\"selector\\":\\"deployment-config.name=nginx-dc\\",\\"targetPorts\\":{\\"8080\\":8080}}]}",
+    "nginx-skupper": "{\\"address\\":\\"nginx-skupper\\",\\"protocol\\":\\"tcp\\",\\"ports\\":[8080],\
+    \\"exposeIngress\\":\\"\\",\\"targets\\":[{\\"name\\":\\"nginx.my-namespace\\",\
+    \\"service\\":\\"nginx.my-namespace\\",\\"namespace\\":\\"my-namespace\\"}]}",
+    "postgres": "{\\"address\\":\\"postgres\\",\\"protocol\\":\\"tcp\\",\\"ports\\":[5432],\
+    \\"exposeIngress\\":\\"\\",\\"headless\\":{\\"name\\":\\"postgres\\",\\"size\\":3},\
+    \\"targets\\":[{\\"name\\":\\"postgres\\",\\"selector\\":\\"app=postgres\\",\\"namespace\\":\\"my-namespace\\"}]}"
+  },
+  "kind": "ConfigMap",
+  "metadata": {
+    "name": "skupper-services",
+    "namespace": "my-namespace",
+    "ownerReferences": [
+      {
+        "apiVersion": "v1",
+        "kind": "ConfigMap",
+        "name": "skupper-site",
+        "uid": "ec72fd67-65c0-43c8-9244-c8da8a67b12a"
+      }
+    ]
+  }
+}
+"""
+
+container_ls_json = """[
+  {
+    "Labels": {
+      "application": "skupper",
+      "skupper.io/address": "my-service-a"
+    },
+    "Names": [
+      "my-service-a"
+    ],
+    "Networks": [
+      "skupper"
+    ],
+    "Ports": [
+      {
+        "host_ip": "192.168.124.1",
+        "container_port": 8080,
+        "host_port": 8888,
+        "range": 1,
+        "protocol": "tcp"
+      },
+      {
+        "host_ip": "192.168.124.1",
+        "container_port": 9090,
+        "host_port": 9999,
+        "range": 1,
+        "protocol": "tcp"
+      }
+    ],
+    "State": "running",
+    "Status": "Up About a minute",
+    "Created": 1690300422
+  },
+  {
+    "Labels": {
+      "application": "skupper",
+      "skupper.io/address": "postgres"
+    },
+    "Names": [
+      "postgres"
+    ],
+    "Networks": [
+      "skupper"
+    ],
+    "Ports": null,
+    "State": "running",
+    "Status": "Up About a minute",
+    "Created": 1690300445
+  }
+]
+"""
+
+volume_inspect_json = """[
+     {
+          "Name": "skupper-services",
+          "Driver": "local",
+          "Mountpoint": "/home/my_user/.local/share/containers/storage/volumes/skupper-services/_data",
+          "Labels": {
+               "application": "skupper"
+          }
+     }
+]
+"""
+
+skupper_services_podman = """{
+  "my-service-a": {
+    "address": "my-service-a",
+    "protocol": "http",
+    "ports": [
+      8080,
+      9090
+    ],
+    "exposeIngress": "",
+    "targets": [
+      {
+        "name": "*domain.EgressResolverHost={\\"host\\":\\"10.0.0.1\\",\\"ports\\":{\\"8080\\":8080,\\"9090\\":8080}}",
+        "targetPorts": {
+          "8080": 8080,
+          "9090": 8080
+        },
+        "service": "10.0.0.1"
+      }
+    ]
+  },
+  "postgres": {
+    "address": "postgres",
+    "protocol": "tcp",
+    "ports": [
+      5432
+    ],
+    "exposeIngress": "",
+    "targets": [
+      {
+        "name": "*domain.EgressResolverHost={\\"host\\":\\"10.0.0.2\\",\\"ports\\":{\\"5432\\":5432}}",
+        "targetPorts": {
+          "5432": 5432
+        },
+        "service": "10.0.0.2"
+      },
+      {
+        "name": "*domain.EgressResolverHost={\\"host\\":\\"10.0.0.3\\",\\"ports\\":{\\"5432\\":2345}}",
+        "targetPorts": {
+          "5432": 2345
+        },
+        "service": "10.0.0.3"
+      }
+    ]
+  }
+}
+"""
diff --git a/skupper/network/tests/unit/plugins/modules/test_site_load.py b/skupper/network/tests/unit/plugins/modules/test_site_load.py
new file mode 100644
index 0000000..c4f25ac
--- /dev/null
+++ b/skupper/network/tests/unit/plugins/modules/test_site_load.py
@@ -0,0 +1,108 @@
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+import json
+import unittest
+
+from ansible.module_utils import basic
+from unittest.mock import patch, mock_open
+
+from ansible_collections.skupper.network.plugins.modules import site_load
+from ansible_collections.skupper.network.tests.unit.plugins.modules.utils import exit_json, fail_json, \
+    AnsibleExitJson, set_module_args
+
+
+class TestSiteLoad(unittest.TestCase):
+
+    def setUp(self):
+        # Mocking AnsibleModule
+        self.mock_module = patch.multiple(basic.AnsibleModule,
+                                          exit_json=exit_json,
+                                          fail_json=fail_json,
+                                          run_command=self.run_command_mock)
+        self.mock_module.start()
+        self.addCleanup(self.mock_module.stop)
+
+        # mocking builtins.open for skrouterd.json
+        skrouterd_data = [
+            [
+                "router",
+                {
+                    "id": "my_podman_name",
+                    "mode": "interior",
+                    "helloMaxAgeSeconds": "3",
+                    "metadata": "{\"id\":\"my_podman_id\",\"version\":\"manual\",\"platform\":\"podman\"}"
+                },
+            ],
+        ]
+        self.mock_open = patch('builtins.open', mock_open(read_data=json.dumps(skrouterd_data)))
+        self.mock_open_state = self.mock_open.start()
+        self.addCleanup(self.mock_open.stop)
+
+    def run_command_mock(self, args, **kwargs):
+        if args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                    '--namespace=my-namespace', 'wait', '--for=condition=ready', 'pod',
+                    '--selector=skupper.io/component=service-controller', '--timeout=120s']:
+            return 0, '{}', ''
+        elif args == ['kubectl', '--kubeconfig=/home/user/.kube/config', '--context=my-context',
+                      '--namespace=my-namespace', 'get', 'configmap', 'skupper-site', '--output=json']:
+            resp = {
+                "data": {
+                    "name": "my_name",
+                },
+                "metadata": {
+                    "uid": "my_id",
+                }
+            }
+            return 0, json.dumps(resp), ''
+        elif args == ['podman', '--url=/tmp/podman.socket', 'volume', 'inspect', 'skupper-internal']:
+            resp = [
+                {
+                    "Mountpoint": "/my-volume/mountpoint",
+                }
+            ]
+            return 0, json.dumps(resp), ''
+        return 1, '', 'unexpected request - args = %s' % args
+
+    def test_site_load_kube(self):
+        set_module_args({
+            "kubeconfig": "/home/user/.kube/config",
+            "context": "my-context",
+            "namespace": "my-namespace",
+            "hostname": "my-hostname",
+        })
+        with self.assertRaises(AnsibleExitJson) as ex:
+            site_load.main()
+
+        result = ex.exception.args[0]
+        self.assertEquals(True, result['changed'])
+        self.assertIsNotNone(result['ansible_facts']['site'])
+
+        site = result['ansible_facts']['site']
+        self.assertEquals(site['host'], 'my-hostname')
+        self.assertEquals(site['name'], 'my_name')
+        self.assertEquals(site['id'], 'my_id')
+
+    def test_site_load_podman(self):
+        set_module_args({
+            "hostname": "my-podman-hostname",
+            "platform": "podman",
+            "podman_endpoint": "/tmp/podman.socket",
+        })
+        with self.assertRaises(AnsibleExitJson) as ex:
+            site_load.main()
+
+        result = ex.exception.args[0]
+        self.assertEquals(True, result['changed'])
+        self.assertIsNotNone(result['ansible_facts']['site'])
+
+        site = result['ansible_facts']['site']
+        self.mock_open_state.assert_called_with('/my-volume/mountpoint/skrouterd.json')
+        self.assertEquals(site['host'], 'my-podman-hostname')
+        self.assertEquals(site['name'], 'my_podman_name')
+        self.assertEquals(site['id'], 'my_podman_id')
diff --git a/skupper/network/tests/unit/plugins/modules/utils.py b/skupper/network/tests/unit/plugins/modules/utils.py
new file mode 100644
index 0000000..d661c95
--- /dev/null
+++ b/skupper/network/tests/unit/plugins/modules/utils.py
@@ -0,0 +1,41 @@
+# Copyright Skupper Project
+# GNU General Public License v3.0+ (see COPYING or https://www.gnu.org/licenses/gpl-3.0.txt)
+# SPDX-License-Identifier: GPL-3.0-or-later
+
+from __future__ import (absolute_import, division, print_function)
+
+__metaclass__ = type
+
+import json
+
+from ansible.module_utils import basic
+from ansible.module_utils.common.text.converters import to_bytes
+
+
+def set_module_args(args):
+    if '_ansible_remote_tmp' not in args:
+        args['_ansible_remote_tmp'] = '/tmp'
+    if '_ansible_keep_remote_files' not in args:
+        args['_ansible_keep_remote_files'] = False
+
+    args = json.dumps({'ANSIBLE_MODULE_ARGS': args})
+    basic._ANSIBLE_ARGS = to_bytes(args)
+
+
+class AnsibleExitJson(Exception):
+    pass
+
+
+class AnsibleFailJson(Exception):
+    pass
+
+
+def exit_json(*args, **kwargs):
+    if 'changed' not in kwargs:
+        kwargs['changed'] = False
+    raise AnsibleExitJson(kwargs)
+
+
+def fail_json(*args, **kwargs):
+    kwargs['failed'] = True
+    raise AnsibleFailJson(kwargs)
diff --git a/skupper/network/tests/unit/requirements.txt b/skupper/network/tests/unit/requirements.txt
new file mode 100644
index 0000000..fedef69
--- /dev/null
+++ b/skupper/network/tests/unit/requirements.txt
@@ -0,0 +1,3 @@
+pytest
+pytest-forked
+pytest-xdist