Merge pull request #132 from rackerlabs/issue-131-remove-requirement-for-targets-and_excluded_targets-when-using-api

Removed requirement for both targets and excluded_targets when using API

Author: derpadoo

master/django_scantron/__init__.py

@@ -1 +1 @@
-__version__ = "1.9"
+__version__ = "1.10"

master/django_scantron/api/serializers.py

@@ -36,24 +36,26 @@ def validate(self, attrs):
         """Checks for any invalid IPs, IP subnets, or FQDNs in the targets or excluded_targets fields."""
 
         # Targets
-        targets = attrs["targets"]
+        if "targets" in attrs:
+            targets = attrs["targets"]
 
-        target_extractor = extract_targets.TargetExtractor(targets_string=targets, private_ips_allowed=True, sort_targets=True)
-        targets_dict = target_extractor.targets_dict
+            target_extractor = extract_targets.TargetExtractor(targets_string=targets, private_ips_allowed=True, sort_targets=True)
+            targets_dict = target_extractor.targets_dict
 
-        if targets_dict["invalid_targets"]:
-            invalid_targets = ",".join(targets_dict["invalid_targets"])
-            raise serializers.ValidationError(f"Invalid targets provided: {invalid_targets}")
+            if targets_dict["invalid_targets"]:
+                invalid_targets = ",".join(targets_dict["invalid_targets"])
+                raise serializers.ValidationError(f"Invalid targets provided: {invalid_targets}")
 
         # Excluded targets
-        excluded_targets = attrs["excluded_targets"]
+        if "excluded_targets" in attrs:
+            excluded_targets = attrs["excluded_targets"]
 
-        target_extractor = extract_targets.TargetExtractor(targets_string=excluded_targets, private_ips_allowed=True, sort_targets=True)
-        targets_dict = target_extractor.targets_dict
+            target_extractor = extract_targets.TargetExtractor(targets_string=excluded_targets, private_ips_allowed=True, sort_targets=True)
+            targets_dict = target_extractor.targets_dict
 
-        if targets_dict["invalid_targets"]:
-            invalid_targets = ",".join(targets_dict["invalid_targets"])
-            raise serializers.ValidationError(f"Invalid excluded targets provided: {invalid_targets}")
+            if targets_dict["invalid_targets"]:
+                invalid_targets = ",".join(targets_dict["invalid_targets"])
+                raise serializers.ValidationError(f"Invalid excluded targets provided: {invalid_targets}")
 
         return attrs