jqueue: Improve inotify error reporting

[ganeti-local] / lib / objects.py

diff --git a/lib/objects.py b/lib/objects.py
index a31b2a5..dd83bd2 100644 (file)
--- a/lib/objects.py
+++ b/lib/objects.py
@@ -420,7 +420,7 @@ class MasterNetworkParameters(ConfigObject):
     "ip",
     "netmask",
     "netdev",
-    "ip_family"
+    "ip_family",
     ]
 
 
@@ -503,7 +503,7 @@ class ConfigData(ConfigObject):
 
 class NIC(ConfigObject):
   """Config object representing a network card."""
-  __slots__ = ["mac", "ip", "network", "nicparams"]
+  __slots__ = ["mac", "ip", "network", "nicparams", "netinfo"]
 
   @classmethod
   def CheckParameterSyntax(cls, nicparams):
@@ -905,7 +905,7 @@ class Disk(ConfigObject):
 
     elif disk_template == constants.DT_RBD:
       result.append(FillDict(constants.DISK_LD_DEFAULTS[constants.LD_RBD], {
-        constants.LDP_POOL: dt_params[constants.RBD_POOL]
+        constants.LDP_POOL: dt_params[constants.RBD_POOL],
         }))
 
     return result
@@ -1997,7 +1997,7 @@ class InstanceConsole(ConfigObject):
     return True
 
 
-class Network(ConfigObject):
+class Network(TaggableObject):
   """Object representing a network definition for ganeti.
 
   """