cloudstack: improve required params

11 files changed, 39 insertions, 0 deletions

diff --git a/cloud/cloudstack/cs_account.py b/cloud/cloudstack/cs_account.py
index 399dfa09..a8510bbc 100644
--- a/cloud/cloudstack/cs_account.py
+++ b/cloud/cloudstack/cs_account.py
@@ -369,6 +369,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_affinitygroup.py b/cloud/cloudstack/cs_affinitygroup.py
index 2a8de46f..9ff3b123 100644
--- a/cloud/cloudstack/cs_affinitygroup.py
+++ b/cloud/cloudstack/cs_affinitygroup.py
@@ -223,6 +223,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_firewall.py b/cloud/cloudstack/cs_firewall.py
index c9e42be4..ef78b6a2 100644
--- a/cloud/cloudstack/cs_firewall.py
+++ b/cloud/cloudstack/cs_firewall.py
@@ -422,6 +422,13 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_one_of = (
+            ['ip_address', 'network'],
+        ),
+        required_together = (
+            ['icmp_type', 'icmp_code'],
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         mutually_exclusive = (
             ['icmp_type', 'start_port'],
             ['icmp_type', 'end_port'],
diff --git a/cloud/cloudstack/cs_instance.py b/cloud/cloudstack/cs_instance.py
index 1f5cc6ca..c2c219fe 100644
--- a/cloud/cloudstack/cs_instance.py
+++ b/cloud/cloudstack/cs_instance.py
@@ -788,6 +788,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_instancegroup.py b/cloud/cloudstack/cs_instancegroup.py
index d62004cc..9041e351 100644
--- a/cloud/cloudstack/cs_instancegroup.py
+++ b/cloud/cloudstack/cs_instancegroup.py
@@ -200,6 +200,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_iso.py b/cloud/cloudstack/cs_iso.py
index 749acdf5..4a97fc3d 100644
--- a/cloud/cloudstack/cs_iso.py
+++ b/cloud/cloudstack/cs_iso.py
@@ -333,6 +333,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_portforward.py b/cloud/cloudstack/cs_portforward.py
index 123da67e..47af7848 100644
--- a/cloud/cloudstack/cs_portforward.py
+++ b/cloud/cloudstack/cs_portforward.py
@@ -407,6 +407,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_securitygroup.py b/cloud/cloudstack/cs_securitygroup.py
index 73a54fef..9ef81095 100644
--- a/cloud/cloudstack/cs_securitygroup.py
+++ b/cloud/cloudstack/cs_securitygroup.py
@@ -167,6 +167,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_securitygroup_rule.py b/cloud/cloudstack/cs_securitygroup_rule.py
index ef48b389..a467d3f5 100644
--- a/cloud/cloudstack/cs_securitygroup_rule.py
+++ b/cloud/cloudstack/cs_securitygroup_rule.py
@@ -402,6 +402,10 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['icmp_type', 'icmp_code'],
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         mutually_exclusive = (
             ['icmp_type', 'start_port'],
             ['icmp_type', 'end_port'],
diff --git a/cloud/cloudstack/cs_sshkeypair.py b/cloud/cloudstack/cs_sshkeypair.py
index 0d2e2c82..e7ee88e3 100644
--- a/cloud/cloudstack/cs_sshkeypair.py
+++ b/cloud/cloudstack/cs_sshkeypair.py
@@ -219,6 +219,9 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )
 
diff --git a/cloud/cloudstack/cs_vmsnapshot.py b/cloud/cloudstack/cs_vmsnapshot.py
index b71901a3..cadf229a 100644
--- a/cloud/cloudstack/cs_vmsnapshot.py
+++ b/cloud/cloudstack/cs_vmsnapshot.py
@@ -292,6 +292,10 @@ def main():
             api_url = dict(default=None),
             api_http_method = dict(default='get'),
         ),
+        required_together = (
+            ['icmp_type', 'icmp_code'],
+            ['api_key', 'api_secret', 'api_url'],
+        ),
         supports_check_mode=True
     )