Merge branch 'develop' into unittesting

modules/virtual_machine.py

@@ -1,9 +1,10 @@
-#!/usr/bin/env python3
 # pylint: disable=duplicate-code
 """Module that hosts all functions for virtual machine processing"""
 from modules.device import PhysicalDevice
+from modules.exceptions import InterfaceConfigError, SyncInventoryError, TemplateError
 from modules.hostgroups import Hostgroup
 from modules.interface import ZabbixInterface
+
 from modules.exceptions import (TemplateError, InterfaceConfigError,
                                 SyncInventoryError)
 from modules.config import load_config
@@ -13,24 +14,42 @@ config = load_config()
 
 class VirtualMachine(PhysicalDevice):
     """Model for virtual machines"""
+
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.hostgroup = None
         self.zbx_template_names = None
 
+    def _inventory_map(self):
+        """use VM inventory maps"""
+        return vm_inventory_map
+
+    def _usermacro_map(self):
+        """use VM usermacro maps"""
+        return vm_usermacro_map
+
+    def _tag_map(self):
+        """use VM tag maps"""
+        return vm_tag_map
+
     def set_hostgroup(self, hg_format, nb_site_groups, nb_regions):
         """Set the hostgroup for this device"""
         # Create new Hostgroup instance
-        hg = Hostgroup("vm", self.nb, self.nb_api_version, logger=self.logger,
-                       nested_sitegroup_flag=config["traverse_site_groups"],
-                       nested_region_flag=config["traverse_regions"],
-                       nb_groups=nb_site_groups,
-                       nb_regions=nb_regions)
+        hg = Hostgroup(
+            "vm",
+            self.nb,
+            self.nb_api_version,
+            logger=self.logger,
+            nested_sitegroup_flag=traverse_site_groups,
+            nested_region_flag=traverse_regions,
+            nb_groups=nb_site_groups,
+            nb_regions=nb_regions,
+        )
         # Generate hostgroup based on hostgroup format
         self.hostgroup = hg.generate(hg_format)
 
     def set_vm_template(self):
-        """ Set Template for VMs. Overwrites default class
+        """Set Template for VMs. Overwrites default class
         to skip a lookup of custom fields."""
         # Gather templates ONLY from the device specific context
         try: