Inventory: group_by status working properly (#398)

Author: FragmentedPacket

plugins/inventory/nb_inventory.py

@@ -136,6 +136,7 @@
                 - cluster_group
                 - is_virtual
                 - services
+                - status
             default: []
         group_names_raw:
             description: Will not add the group_by choice name to the group names
@@ -487,7 +488,7 @@ def extract_vcpus(self, host):
         return host.get("vcpus")
 
     def extract_status(self, host):
-        return host.get("status")
+        return host["status"]
 
     def extract_memory(self, host):
         return host.get("memory")
@@ -1264,6 +1265,9 @@ def generate_group_name(self, grouping, group):
             group = group["name"]
             grouping = "service"
 
+        if grouping == "status":
+            group = group["value"]
+
         if self.group_names_raw:
             return group
         else:

tests/integration/targets/inventory-latest/files/test-inventory-options-flatten.json

@@ -736,6 +736,7 @@
             "Test_Cluster_2",
             "Test_Rack",
             "Test_Rack_Site_2",
+            "active",
             "cisco",
             "cisco_test",
             "core_switch",
@@ -800,6 +801,20 @@
             "test_region"
         ]
     },
+    "active": {
+        "hosts": [
+            "R1-Device",
+            "Test Nexus One",
+            "Test VM With Spaces",
+            "TestDeviceR1",
+            "test100",
+            "test100-vm",
+            "test101-vm",
+            "test102-vm",
+            "test103-vm",
+            "test104-vm"
+        ]
+    },
     "test_cluster_group": {
         "hosts": [
             "test100-vm",

tests/integration/targets/inventory-latest/files/test-inventory-options-flatten.yml

@@ -9,7 +9,6 @@ cache_timeout: 3600
 cache_plugin: jsonfile
 cache_connection: /tmp/inventory_netbox
 
-
 config_context: True
 flatten_config_context: True
 flatten_custom_fields: True
@@ -37,3 +36,4 @@ group_by:
   - cluster_group
   - cluster_type
   - is_virtual
+  - status

tests/integration/targets/inventory-latest/files/test-inventory-options.json

@@ -212,6 +212,7 @@
             "Test_Cluster_2",
             "Test_Rack",
             "Test_Rack_Site_2",
+            "active",
             "cisco",
             "cisco_test",
             "core_switch",
@@ -283,6 +284,20 @@
             "test_region"
         ]
     },
+    "active": {
+        "hosts": [
+            "R1-Device",
+            "Test VM With Spaces",
+            "TestDeviceR1",
+            "VC1",
+            "test100",
+            "test100-vm",
+            "test101-vm",
+            "test102-vm",
+            "test103-vm",
+            "test104-vm"
+        ]
+    },
     "test_cluster_group": {
         "hosts": [
             "test100-vm",

tests/integration/targets/inventory-latest/files/test-inventory-options.yml

@@ -34,6 +34,7 @@ group_by:
   - cluster_group
   - cluster_type
   - is_virtual
+  - status
 
 query_filters:
 

tests/integration/targets/inventory-latest/files/test-inventory-plurals-flatten.json

@@ -271,6 +271,7 @@
             "Test_Cluster_2",
             "Test_Rack",
             "Test_Rack_Site_2",
+            "active",
             "cisco",
             "cisco_test",
             "core_switch",
@@ -335,6 +336,20 @@
             "test_region"
         ]
     },
+    "active": {
+        "hosts": [
+            "R1-Device",
+            "Test Nexus One",
+            "Test VM With Spaces",
+            "TestDeviceR1",
+            "test100",
+            "test100-vm",
+            "test101-vm",
+            "test102-vm",
+            "test103-vm",
+            "test104-vm"
+        ]
+    },
     "test_cluster_group": {
         "hosts": [
             "test100-vm",

tests/integration/targets/inventory-latest/files/test-inventory-plurals-flatten.yml

@@ -28,3 +28,4 @@ group_by:
   - cluster_group
   - cluster_type
   - is_virtual
+  - status

tests/integration/targets/inventory-latest/files/test-inventory-plurals.json

@@ -844,6 +844,7 @@
             "region_other_region",
             "region_parent_region",
             "sites_test_site2",
+            "status_active",
             "ungrouped"
         ]
     },
@@ -967,5 +968,19 @@
         "hosts": [
             "R1-Device"
         ]
+    },
+    "status_active": {
+        "hosts": [
+            "R1-Device",
+            "Test Nexus One",
+            "Test VM With Spaces",
+            "TestDeviceR1",
+            "test100",
+            "test100-vm",
+            "test101-vm",
+            "test102-vm",
+            "test103-vm",
+            "test104-vm"
+        ]
     }
 }

tests/integration/targets/inventory-latest/files/test-inventory-plurals.yml

@@ -33,3 +33,4 @@ group_by:
   - cluster_group
   - cluster_type
   - is_virtual
+  - status

tests/integration/targets/inventory-latest/files/test-inventory.json

@@ -754,6 +754,7 @@
             "service_ssh",
             "service_telnet",
             "site_test_site2",
+            "status_active",
             "ungrouped"
         ]
     },
@@ -893,5 +894,19 @@
         "hosts": [
             "R1-Device"
         ]
+    },
+    "status_active": {
+        "hosts": [
+            "R1-Device",
+            "Test Nexus One",
+            "Test VM With Spaces",
+            "TestDeviceR1",
+            "test100",
+            "test100-vm",
+            "test101-vm",
+            "test102-vm",
+            "test103-vm",
+            "test104-vm"
+        ]
     }
 }

tests/integration/targets/inventory-latest/files/test-inventory.yml

@@ -25,3 +25,4 @@ group_by:
   - cluster_type
   - is_virtual
   - services
+  - status