From e65001ee228cabec856eb7610d4106f45f7ff028 Mon Sep 17 00:00:00 2001
From: Vincent Bernat <vincent@bernat.im>
Date: Tue, 28 Nov 2017 07:46:43 +0100
Subject: [PATCH] cloudstack: fix spelling of "affinity_type" (#33231)

The previous spelling, "affinty_type" is marked as deprecated and will
be removed in Ansible 2.9. Both spelling are mutually exclusives.
---
 .../modules/cloud/cloudstack/cs_affinitygroup.py    | 13 +++++++++----
 .../targets/cs_affinitygroup/tasks/main.yml         |  2 +-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py b/lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py
index 79f873ae9d8..e04d19f1b1a 100644
--- a/lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py
+++ b/lib/ansible/modules/cloud/cloudstack/cs_affinitygroup.py
@@ -36,11 +36,12 @@ options:
     description:
       - Name of the affinity group.
     required: true
-  affinty_type:
+  affinity_type:
     description:
       - Type of the affinity group. If not specified, first found affinity type is used.
     required: false
     default: null
+    aliases: [ affinty_type ]
   description:
     description:
       - Description of the affinity group.
@@ -80,7 +81,7 @@ EXAMPLES = '''
 - local_action:
     module: cs_affinitygroup
     name: haproxy
-    affinty_type: host anti-affinity
+    affinity_type: host anti-affinity
 
 # Remove a affinity group
 - local_action:
@@ -160,7 +161,7 @@ class AnsibleCloudStackAffinityGroup(AnsibleCloudStack):
         return self.affinity_group
 
     def get_affinity_type(self):
-        affinity_type = self.module.params.get('affinty_type')
+        affinity_type = self.module.params.get('affinity_type') or self.module.params.get('affinty_type')
 
         affinity_types = self.query_api('listAffinityGroupTypes', )
         if affinity_types:
@@ -217,7 +218,8 @@ def main():
     argument_spec = cs_argument_spec()
     argument_spec.update(dict(
         name=dict(required=True),
-        affinty_type=dict(),
+        affinty_type=dict(removed_in_version='2.9'),
+        affinity_type=dict(),
         description=dict(),
         state=dict(choices=['present', 'absent'], default='present'),
         domain=dict(),
@@ -229,6 +231,9 @@ def main():
     module = AnsibleModule(
         argument_spec=argument_spec,
         required_together=cs_required_together(),
+        mutually_exclusive=(
+            ['affinity_type', 'affinty_type'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/test/integration/targets/cs_affinitygroup/tasks/main.yml b/test/integration/targets/cs_affinitygroup/tasks/main.yml
index 0b11d75f963..994f21a1a5a 100644
--- a/test/integration/targets/cs_affinitygroup/tasks/main.yml
+++ b/test/integration/targets/cs_affinitygroup/tasks/main.yml
@@ -22,7 +22,7 @@
 - name: test fail unknown affinity type
   cs_affinitygroup:
     name: "{{ cs_resource_prefix }}_ag"
-    affinty_type: unexistent affinity type
+    affinity_type: unexistent affinity type
   register: ag
   ignore_errors: true
 - name: verify test fail unknown affinity type