A 'repository' keyword to python_distribution module

plugins/modules/python_distribution.py

@@ -43,6 +43,11 @@
       - Or the empty string to remove the remote
     type: str
     required: false
+  repository:
+    description:
+      - Name of the repository of which the latest RepositoryVersion will be served
+    type: str
+    required: false
 extends_documentation_fragment:
   - pulp.squeezer.pulp.entity_state
   - pulp.squeezer.pulp.glue
@@ -73,6 +78,16 @@
     publication: /pub/api/v3/publications/python/python/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/
     state: present
 
+- name: Create a python distribution that serves the latest repository version
+  pulp.squeezer.python_distribution:
+    pulp_url: https://pulp.example.org
+    username: admin
+    password: password
+    name: new_python_distribution
+    base_path: new/python/dist
+    repository: my_python_repository
+    state: present
+
 - name: Create a python destribution with remote for pull-through caching
   pulp.squeezer.python_distribution:
     pulp_url: https://pulp.example.org
@@ -110,7 +125,11 @@
 
 try:
     from pulp_glue.core.context import PulpContentGuardContext
-    from pulp_glue.python.context import PulpPythonDistributionContext, PulpPythonRemoteContext
+    from pulp_glue.python.context import (
+        PulpPythonDistributionContext,
+        PulpPythonRemoteContext,
+        PulpPythonRepositoryContext,
+    )
 
     # Fix this in pulp-glue
     if "content_guard" not in PulpPythonDistributionContext.NULLABLES:
@@ -128,14 +147,15 @@ def main():
     with PulpEntityAnsibleModule(
         context_class=PulpPythonDistributionContext,
         entity_singular="distribution",
-        entity_plural="distribuions",
+        entity_plural="distributions",
         import_errors=[("pulp-glue", PULP_CLI_IMPORT_ERR)],
         argument_spec=dict(
             name=dict(),
             base_path=dict(),
             publication=dict(),
             content_guard=dict(),
             remote=dict(),
+            repository=dict(),
         ),
         required_if=[
             ("state", "present", ["name", "base_path"]),
@@ -144,6 +164,7 @@ def main():
     ) as module:
         content_guard_name = module.params["content_guard"]
         remote_name = module.params["remote"]
+        repository_name = module.params["repository"]
 
         natural_key = {
             "name": module.params["name"],
@@ -170,6 +191,15 @@ def main():
             else:
                 desired_attributes["remote"] = ""
 
+        if repository_name is not None:
+            if repository_name:
+                repository_ctx = PulpPythonRepositoryContext(
+                    module.pulp_ctx, entity={"name": repository_name}
+                )
+                desired_attributes["repository"] = repository_ctx.pulp_href
+            else:
+                desired_attributes["repository"] = ""
+
         module.process(natural_key, desired_attributes)
 
 

tests/playbooks/python_distribution.yaml

@@ -224,6 +224,52 @@
           - ansible_check_mode or result.distribution.base_url is regex(".*/pypi/pull_through_mirror")
           - result.distribution.remote == ""
 
+    - name: Retrieve repository
+      pulp.squeezer.python_repository:
+        name: test_python_repository
+      register: repository_result
+
+    - name: Distribute latest version of repository
+      pulp.squeezer.python_distribution:
+        name: test_python_distribution
+        base_path: test_python_base_path
+        repository: test_python_repository
+        state: present
+      register: result
+    - name: Verify distribute latest version of repository
+      ansible.builtin.assert:
+        that:
+          - result.changed == true
+          - result.distribution.name == "test_python_distribution"
+          - result.distribution.base_path == "test_python_base_path"
+          - ansible_check_mode or result.distribution.base_url is regex(".*/pypi/test_python_base_path")
+          - result.distribution.repository == repository_result.repository.pulp_href
+
+    - name: Distribute publication of repository (2nd try)
+      pulp.squeezer.python_distribution:
+        name: test_python_distribution
+        base_path: test_python_base_path
+        repository: test_python_repository
+        state: present
+      register: result
+    - name: Verify distribute publication of repository (2nd try)
+      ansible.builtin.assert:
+        that:
+          - result.changed == false
+
+    - name: Read distribution
+      pulp.squeezer.python_distribution:
+        name: test_python_distribution
+      register: result
+    - name: Verify read distribution
+      ansible.builtin.assert:
+        that:
+          - result.changed == false
+          - result.distribution.name == "test_python_distribution"
+          - result.distribution.base_path == "test_python_base_path"
+          - result.distribution.base_url is regex(".*/pypi/test_python_base_path")
+          - result.distribution.repository == repository_result.repository.pulp_href
+
 - hosts: localhost
   gather_facts: false
   vars_files: