feat: Add the support for 'sub' includes in inventory

opsmill · Jul 19, 2024 · d31de9d · d31de9d
1 parent 2e9ec1d
commit d31de9d
Show file tree

Hide file tree

Showing 8 changed files with 137 additions and 289 deletions.
diff --git a/plugins/module_utils/exception.py b/plugins/module_utils/exception.py
@@ -9,10 +9,10 @@
 
 try:
     from infrahub_sdk.exceptions import (
-        FilterNotFound,
+        FilterNotFoundError,
         GraphQLError,
-        SchemaNotFound,
-        ServerNotReacheableError,
+        SchemaNotFoundError,
+        ServerNotReachableError,
         ServerNotResponsiveError,
     )
 except ImportError as imp_exc:
@@ -36,12 +36,12 @@ def wrapper(*args, **kwargs):
         try:
             return func(*args, **kwargs)
         except GraphQLError:
-            raise Exception("Database not Responsive")
-        except SchemaNotFound:
-            pass  # until we are able to return Generics Schema and Core Schema https://github.com/opsmill/infrahub/issues/1217
-        except FilterNotFound:
+            raise Exception(f"An error occurred while executing the GraphQL Query {kwargs}")
+        except SchemaNotFoundError:
+            raise Exception(f"Unable to find the schema {kwargs}")
+        except FilterNotFoundError:
             raise Exception(f"Filters not Found {kwargs}")
-        except ServerNotReacheableError:
+        except ServerNotReachableError:
             raise Exception("Server not Reacheable")
         except ServerNotResponsiveError:
             raise Exception("Server not Responsive")

diff --git a/plugins/module_utils/infrahub_utils.py b/plugins/module_utils/infrahub_utils.py
diff --git a/tests/integration/targets/inventory/output-test-inventory5.yml b/tests/integration/targets/inventory/output-test-inventory5.yml
diff --git a/tests/integration/targets/inventory/test-inventory2.yml b/tests/integration/targets/inventory/test-inventory2.yml
@@ -12,5 +12,5 @@ nodes:
   InfraDevice:
 
 keyed_groups:
-  - prefix: site
-    key: site.name
+  - prefix: location
+    key: location.name
diff --git a/tests/integration/targets/inventory/test-inventory3.yml b/tests/integration/targets/inventory/test-inventory3.yml
@@ -5,21 +5,24 @@
 plugin: opsmill.infrahub.inventory
 api_endpoint: "http://localhost:8000"
 
-strict: false
-
 nodes:
   InfraDevice:
     include:
       - name
-      - primary_address
-      - platform
-      - site
-      - tags
+      - primary_address.address
+      - platform.ansible_network_os
+      - location.parent.name
+      - location.name
       - role
+      - tags
 
 compose:
   hostname: name
   platform: platform.ansible_network_os
-  ansible_host: primary_address.address | ansible.utils.ipaddr('address')
+  ansible_host: primary_address | ansible.utils.ipaddr('address')
 
 keyed_groups:
+  - prefix: site
+    key: location.name | lower
+  - prefix: metro
+    key: location.parent.name | lower
diff --git a/tests/integration/targets/inventory/test-inventory4.yml b/tests/integration/targets/inventory/test-inventory4.yml
@@ -11,4 +11,4 @@ strict: true
 nodes:
   InfraDevice:
     exclude:
-      - site
+      - location
diff --git a/tests/integration/targets/inventory/test-inventory5.yml b/tests/integration/targets/inventory/test-inventory5.yml
@@ -15,7 +15,7 @@ nodes:
       - name
       - primary_address
       - platform
-      - site
+      - location
       - tags
 
 compose:
@@ -24,7 +24,7 @@ compose:
   ansible_host: primary_address.address | ansible.utils.ipaddr('address')
 
 keyed_groups:
-  - prefix: site
-    key: site.name
+  - prefix: location
+    key: location.name
   - prefix: platform
     key: platform
diff --git a/tests/integration/targets/inventory/test-inventory6.yml b/tests/integration/targets/inventory/test-inventory6.yml
@@ -14,13 +14,13 @@ branch: "jfk1-update-edge-ips"
 nodes:
   InfraDevice:
     filters:
-      site__ids: "1791a399-7e43-13b5-3995-d8e9955c926e"   # jfk1
+      location__ids: "1791a399-7e43-13b5-3995-d8e9955c926e"   # jfk1
       role__ids: "1791a399-31c4-c688-3992-d8ebd2cca61f"   # edge
     include:
       - name
       - primary_address
       - platform
-      - site
+      - location
       - interfaces
 
 compose: