improve vm create/update and fix network edge case

netbox_agent/network.py

@@ -350,11 +350,12 @@ class Network(object):
         # delete unknown interface
         nb_nics = self.get_netbox_network_cards()
         local_nics = [x['name'] for x in self.nics]
-        for nic in nb_nics:
+        for nic in nb_nics[:]:
             if nic.name not in local_nics:
                 logging.info('Deleting netbox interface {name} because not present locally'.format(
                     name=nic.name
                 ))
+                nb_nics.remove(nic)
                 nic.delete()
 
         # delete IP on netbox that are not known on this server

netbox_agent/virtualmachine.py

@@ -1,3 +1,6 @@
+import math
+import os
+
 import netbox_agent.dmidecode as dmidecode
 from netbox_agent.config import config
 from netbox_agent.config import netbox_instance as nb
@@ -14,6 +17,14 @@ class VirtualMachine(object):
             self.dmi = dmidecode.parse()
         self.network = None
 
+    def get_memory(self):
+        mem_bytes = os.sysconf('SC_PAGE_SIZE') * os.sysconf('SC_PHYS_PAGES')  # e.g. 4015976448
+        mem_gib = mem_bytes/(1024.**3)  # e.g. 3.74
+        return math.ceil(mem_gib)
+
+    def get_vcpus(self):
+        return os.cpu_count()
+
     def get_netbox_vm(self):
         hostname = get_hostname(config)
         vm = nb.virtualization.virtual_machines.get(
@@ -27,10 +38,15 @@ class VirtualMachine(object):
         )
         return cluster
 
-    def netbox_create(self, config):
+    def netbox_create_or_update(self, config):
+        created = False
+        updated = 0
+
         hostname = get_hostname(config)
         vm = self.get_netbox_vm()
 
+        vcpus = self.get_vcpus()
+        memory = self.get_memory()
         if not vm:
             logging.debug('Creating Virtual machine..')
             cluster = self.get_netbox_cluster(config.virtual.cluster_name)
@@ -38,11 +54,20 @@ class VirtualMachine(object):
             vm = nb.virtualization.virtual_machines.create(
                 name=hostname,
                 cluster=cluster.id,
-                vcpu=0,  # FIXME
-                memory=0,  # FIXME
+                vcpus=vcpus,
+                memory=memory,
             )
-            self.network = VirtualNetwork(server=self)
-            self.network.update_netbox_network_cards()
-        else:
-            self.network = VirtualNetwork(server=self)
-            self.network.update_netbox_network_cards()
+            created = True
+
+        self.network = VirtualNetwork(server=self)
+        self.network.create_or_update_netbox_network_cards()
+
+        if not created and vm.vcpus != vcpus:
+            vm.vcpus = vcpus
+            updated += 1
+        elif not created and vm.memory != memory:
+            vm.memory = memory
+            updated += 1
+
+        if updated:
+            vm.save()