Commit 0df4d98a authored by Guido Trotter's avatar Guido Trotter
Browse files

KVM: classify _Instance{Monitor,Serial,KVMRuntime}

Those methods need nothing from the instantiated class, and just
manipulate strings, and fetch some class global variables, so they can
be classmethods.

Reviewed-by: iustinp
parent e33a0080
......@@ -75,23 +75,26 @@ class KVMHypervisor(hv_base.BaseHypervisor):
return (pidfile, pid, alive)
def _InstanceMonitor(self, instance_name):
@classmethod
def _InstanceMonitor(cls, instance_name):
"""Returns the instance monitor socket name
"""
return '%s/%s.monitor' % (self._CTRL_DIR, instance_name)
return '%s/%s.monitor' % (cls._CTRL_DIR, instance_name)
def _InstanceSerial(self, instance_name):
@classmethod
def _InstanceSerial(cls, instance_name):
"""Returns the instance serial socket name
"""
return '%s/%s.serial' % (self._CTRL_DIR, instance_name)
return '%s/%s.serial' % (cls._CTRL_DIR, instance_name)
def _InstanceKVMRuntime(self, instance_name):
@classmethod
def _InstanceKVMRuntime(cls, instance_name):
"""Returns the instance KVM runtime filename
"""
return '%s/%s.runtime' % (self._CONF_DIR, instance_name)
return '%s/%s.runtime' % (cls._CONF_DIR, instance_name)
def _WriteNetScript(self, instance, seq, nic):
"""Write a script to connect a net interface to the proper bridge.
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment