Split filters into separate files (#14)

* Split filters into separate files

* Skip fact gathering on filter tests

Author: mattclay

plugins/filter/ec2_az_vpc_route_tables_subnets.py

@@ -0,0 +1,18 @@
+# Copyright (C) 2016 Matt Clay <[email protected]>
+# GNU General Public License v3.0+ (see LICENSE.md or https://www.gnu.org/licenses/gpl-3.0.txt)
+
+
+def ec2_az_vpc_route_tables_subnets(zones, subnet):
+    return [map_zone_to_subnet(z, subnet) for z in zones]
+
+
+def map_zone_to_subnet(zone, subnet):
+    position = ord(zone[-1:]) - ord('a')
+    return subnet % position
+
+
+class FilterModule(object):
+    def filters(self):
+        return dict(
+            ec2_az_vpc_route_tables_subnets=ec2_az_vpc_route_tables_subnets,
+        )

plugins/filter/ec2_filters.py renamed to plugins/filter/ec2_az_vpc_subnets.py

@@ -11,10 +11,6 @@ def ec2_az_vpc_subnets(zones, subnet, name):
     ) for z in zones]
 
 
-def ec2_az_vpc_route_tables_subnets(zones, subnet):
-    return [map_zone_to_subnet(z, subnet) for z in zones]
-
-
 def map_zone_to_subnet(zone, subnet):
     position = ord(zone[-1:]) - ord('a')
     return subnet % position
@@ -24,5 +20,4 @@ class FilterModule(object):
     def filters(self):
         return dict(
             ec2_az_vpc_subnets=ec2_az_vpc_subnets,
-            ec2_az_vpc_route_tables_subnets=ec2_az_vpc_route_tables_subnets
         )

tests/integration/targets/filter_dictfilter/aliases

@@ -0,0 +1 @@
+gather_facts/no

tests/integration/targets/filter_ec2_az_vpc_route_tables_subnets/aliases

@@ -0,0 +1 @@
+gather_facts/no

tests/integration/targets/filter_ec2_az_vpc_route_tables_subnets/tasks/main.yml

@@ -0,0 +1,7 @@
+- name: Test ec2_az_vpc_route_tables_subnets filter
+  assert:
+    that:
+      - '{{ {"us-east-1a": {}, "us-east-1b": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
+            ["192.168.0.0/24", "192.168.1.0/24"] }}'
+      - '{{ {"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
+            ["192.168.5.0/24"] }}'

tests/integration/targets/filter_ec2_az_vpc_subnets/aliases

@@ -0,0 +1 @@
+gather_facts/no

tests/integration/targets/filter_ec2_filters/tasks/main.yml renamed to tests/integration/targets/filter_ec2_az_vpc_subnets/tasks/main.yml

@@ -5,11 +5,3 @@
             [{ "az": "us-east-1a", "cidr": "192.168.0.0/24", "resource_tags": {"Name": "Bob"}}] }}'
       - '{{ {"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_subnets("192.168.%s.0/24", "Bob") ==
             [{ "az": "us-east-1f", "cidr": "192.168.5.0/24", "resource_tags": {"Name": "Bob"}}] }}'
-
-- name: Test ec2_az_vpc_route_tables_subnets filter
-  assert:
-    that:
-      - '{{ {"us-east-1a": {}, "us-east-1b": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
-            ["192.168.0.0/24", "192.168.1.0/24"] }}'
-      - '{{ {"us-east-1f": {}} | mattclay.aws.ec2_az_vpc_route_tables_subnets("192.168.%s.0/24") ==
-            ["192.168.5.0/24"] }}'

tests/integration/targets/filter_map_format/aliases

@@ -0,0 +1 @@
+gather_facts/no