vdsm-patches December 2012

vdsm-patches@lists.fedorahosted.org

51 participants
408 discussions

Change in vdsm[master]: schema: nit fixes in vm definition
by lvroyce＠linux.vnet.ibm.com 20 Dec '12

20 Dec '12

Royce Lv has uploaded a new change for review. Change subject: schema: nit fixes in vm definition ...................................................................... schema: nit fixes in vm definition delete displayPort and displaySecurePort in vmdef These two ports are selected by libvirt according to API.py Add boot to vmDef Change-Id: I14c8f2919390d65a6938b6aadfb09fb2419f74bc Signed-off-by: Royce Lv<lvroyce(a)linux.vnet.ibm.com> --- M vdsm_api/vdsmapi-schema.json 1 file changed, 5 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/8487/1 diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index e3a1c2a..1c61e36 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -2289,6 +2289,8 @@ # # @acpiEnable: Indicates if ACPI is enabled inside the VM # +# @boot: #optional An alias for the type of device used to boot the VM +# # @clientIp: The IP address of the client connected to the display # # @cpuPinning: #optional Information about CPU pinning @@ -2302,10 +2304,6 @@ # @display: The type of display # # @displayIp: The IP address to use for accessing the VM display -# -# @displayPort: The port in use for unencrypted display data -# -# @displaySecurePort: The port in use for encrypted display data # # @emulatedMachine: The specific machine specification being emulated # @@ -2345,8 +2343,9 @@ # Since: 4.10.0 ## {'type': 'VmFullStatus', - 'data': {'acpiEnable': 'bool', 'clientIp': 'str', '*cpuPinning': 'CpuPinInfoMap', - 'cpuType': 'str', 'custom': 'StringMap', 'devices': ['VmDevice'], + 'data': {'acpiEnable': 'bool', 'clientIp': 'str', '*boot': 'VmBootMode', + '*cpuPinning': 'CpuPinInfoMap', 'cpuType': 'str', + 'custom': 'StringMap', 'devices': ['VmDevice'], 'display': 'VmDisplayType', 'displayIp': 'str', 'displayPort': 'uint', 'displaySecurePort': 'uint', 'emulatedMachine': 'str', 'keyboardLayout': 'str', -- To view, visit http://gerrit.ovirt.org/8487 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I14c8f2919390d65a6938b6aadfb09fb2419f74bc Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Royce Lv <lvroyce(a)linux.vnet.ibm.com>

2 2

Change in vdsm[master]: Override compellent device defaults in multipath.conf
by ykaplan＠redhat.com 19 Dec '12

19 Dec '12

Yeela Kaplan has uploaded a new change for review. Change subject: Override compellent device defaults in multipath.conf ...................................................................... Override compellent device defaults in multipath.conf Change-Id: Ice1d3c1845746384794e724a064ba05c56bf2a42 Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=865673 Signed-off-by: Yeela Kaplan <ykaplan(a)redhat.com> --- M vdsm/constants.py.in M vdsm/storage/multipath.py 2 files changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/10192/1 diff --git a/vdsm/constants.py.in b/vdsm/constants.py.in index 8034b8e..78e2176 100644 --- a/vdsm/constants.py.in +++ b/vdsm/constants.py.in @@ -178,5 +178,10 @@ " getuid_callout \"@SCSI_ID_PATH@ --whitelisted " "--replace-whitespace --device=/dev/%n\"\n" "}\n" + "device {\n" + " vendor \"COMPELNT\"\n" + " product \"Compellent Vol\"\n" + " no_path_retry fail\n" + "}\n" "}" ) diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py index 741f1a1..ecb644e 100644 --- a/vdsm/storage/multipath.py +++ b/vdsm/storage/multipath.py @@ -49,8 +49,9 @@ OLD_TAGS = ["# RHAT REVISION 0.2", "# RHEV REVISION 0.3", "# RHEV REVISION 0.4", "# RHEV REVISION 0.5", - "# RHEV REVISION 0.6", "# RHEV REVISION 0.7"] -MPATH_CONF_TAG = "# RHEV REVISION 0.8" + "# RHEV REVISION 0.6", "# RHEV REVISION 0.7", + "# RHEV REVISION 0.8"] +MPATH_CONF_TAG = "# RHEV REVISION 0.9" MPATH_CONF_PRIVATE_TAG = "# RHEV PRIVATE" MPATH_CONF_TEMPLATE = MPATH_CONF_TAG + constants.STRG_MPATH_CONF -- To view, visit http://gerrit.ovirt.org/10192 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ice1d3c1845746384794e724a064ba05c56bf2a42 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <ykaplan(a)redhat.com>

4 5

Change in vdsm[master]: Distinguish between local and mounted SD's.
by ewarszaw＠redhat.com 19 Dec '12

19 Dec '12

Eduardo has uploaded a new change for review. Change subject: Distinguish between local and mounted SD's. ...................................................................... Distinguish between local and mounted SD's. Remote SD's were identified like locals due to mismatched name mangling. This patch is a minimal emergency fix. The /rhev/datacenter hierarchy should be revised. The need for localFsSD's should be revised too. Change-Id: I12b5ba80121b8e8d23a63ecc7aaab829bfc67a51 Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=886533 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/localFsSD.py 1 file changed, 25 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/24/10024/1 diff --git a/vdsm/storage/localFsSD.py b/vdsm/storage/localFsSD.py index 198c073..d9ac3f0 100644 --- a/vdsm/storage/localFsSD.py +++ b/vdsm/storage/localFsSD.py @@ -94,14 +94,36 @@ @staticmethod def findDomainPath(sdUUID): for tmpSdUUID, domainPath in fileSD.scanDomains("_*"): - if tmpSdUUID == sdUUID: + if tmpSdUUID == sdUUID and isLocalFsDomain(sdUUID): return domainPath - - raise se.StorageDomainDoesNotExist(sdUUID) + else: + raise se.StorageDomainDoesNotExist(sdUUID) def getRealPath(self): return os.readlink(self.mountpoint) +# TODO: This function should be removed when the mangled mangling name scheme +# of mounted (nfs, Posix) SD's and local SD's is fixed but... +# Is better to remove completely the localFS SD's concept, but... +# this will not fixed by now +def isLocalFsDomain(sdUUID): + """This ancillary function differentiates local and mounted SD's. + + Assumed that a local SD can't be mounted. + mounted: nfs, posixFS + local: a link to a local dir in the /rhev/datacenter + """ + mtab = open("/etc/mtab", "r").readlines() + for mEntry in mtab: + if sdUUID in mEntry: + # This is a mounted domain therefore not exists as a local SD. + isLocal = False + break + else: + isLocal = True + return isLocal + + def findDomain(sdUUID): return LocalFsStorageDomain(LocalFsStorageDomain.findDomainPath(sdUUID)) -- To view, visit http://gerrit.ovirt.org/10024 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I12b5ba80121b8e8d23a63ecc7aaab829bfc67a51 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

7 24

Change in vdsm[master]: Fix caps code related broken master compilation.
by ewarszaw＠redhat.com 19 Dec '12

19 Dec '12

Eduardo has uploaded a new change for review. Change subject: Fix caps code related broken master compilation. ...................................................................... Fix caps code related broken master compilation. Change-Id: Ie441664564e9cd227744e7b59c9ab0c90821b88b Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M tests/capsTests.py M vdsm/caps.py 2 files changed, 3 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/10025/1 diff --git a/tests/capsTests.py b/tests/capsTests.py index dec0ec7..b39e8e2 100644 --- a/tests/capsTests.py +++ b/tests/capsTests.py @@ -67,8 +67,8 @@ path = os.path.join(dirName, "caps_libvirt.out") machines = caps._getEmulatedMachines(file(path).read()) expectedMachines = ['pc-1.2', 'none', 'pc', 'pc-1.1', 'pc-1.0', - 'pc-0.15', 'pc-0.14', 'pc-0.13', 'pc-0.12', 'pc-0.11', - 'pc-0.10', 'isapc'] + 'pc-0.15', 'pc-0.14', 'pc-0.13', 'pc-0.12', + 'pc-0.11', 'pc-0.10', 'isapc'] self.assertEqual(machines, expectedMachines) def test_parseKeyVal(self): diff --git a/vdsm/caps.py b/vdsm/caps.py index 0b16796..d6298df 100644 --- a/vdsm/caps.py +++ b/vdsm/caps.py @@ -135,6 +135,7 @@ if m.nodeName == 'machine'] return [] + def _getAllCpuModels(): cpu_map = minidom.parseString( file('/usr/share/libvirt/cpu_map.xml').read()) -- To view, visit http://gerrit.ovirt.org/10025 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie441664564e9cd227744e7b59c9ab0c90821b88b Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

5 11

Change in vdsm[master]: [WIP] JsonRpcServer Threading support
by smizrahi＠redhat.com 19 Dec '12

19 Dec '12

Saggi Mizrahi has uploaded a new change for review. Change subject: [WIP] JsonRpcServer Threading support ...................................................................... [WIP] JsonRpcServer Threading support Change-Id: I1510320f192f448ade41018d513dd10308b207d3 Signed-off-by: Saggi Mizrahi <smizrahi(a)redhat.com> --- M vdsm/clientIF.py M vdsm_api/BindingJsonRpc.py M vdsm_api/jsonrpc/__init__.py 3 files changed, 83 insertions(+), 33 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/06/10206/1 diff --git a/vdsm/clientIF.py b/vdsm/clientIF.py index 231e0b4..04653bb 100644 --- a/vdsm/clientIF.py +++ b/vdsm/clientIF.py @@ -156,7 +156,8 @@ schema = os.path.join(constants.P_VDSM, 'vdsmapi-schema.json') ip = self._getServerIP(config.get('addresses', 'management_ip')) port = config.getint('addresses', 'json_port') - conf = [('tcp', {"ip": ip, "port": port})] + conf = [('tcp', {"ip": ip, "port": port}), + ('amqp', {"host": ip})] self.bindings['json'] = BindingJsonRpc(DynamicBridge(schema), conf) def _prepareBindings(self): diff --git a/vdsm_api/BindingJsonRpc.py b/vdsm_api/BindingJsonRpc.py index f71491f..a41dcef 100644 --- a/vdsm_api/BindingJsonRpc.py +++ b/vdsm_api/BindingJsonRpc.py @@ -21,6 +21,11 @@ from jsonrpc import JsonRpcServer from jsonrpc.tcpReactor import TCPReactor +ProtonReactor = None +try: + from jsonrpc.protonReactor import ProtonReactor +except ImportError: + pass class BindingJsonRpc(object): @@ -33,6 +38,11 @@ for backendType, cfg in backendConfig: if backendType == "tcp": reactors.append(self._createTcpReactor(cfg)) + elif backendType == "amqp": + if ProtonReactor is None: + continue + + reactors.append(self._createProtonReactor(cfg)) self._reactors = reactors @@ -41,6 +51,11 @@ port = cfg.get("port", 4044) return TCPReactor((address, port), self.server) + def _createProtonReactor(self, cfg): + address = cfg.get("host", "0.0.0.0") + port = cfg.get("port", 5672) + return TCPReactor((address, port), self.server) + def start(self): for reactor in self._reactors: reactorName = reactor.__class__.__name__ diff --git a/vdsm_api/jsonrpc/__init__.py b/vdsm_api/jsonrpc/__init__.py index d0ed044..f35a014 100644 --- a/vdsm_api/jsonrpc/__init__.py +++ b/vdsm_api/jsonrpc/__init__.py @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import json import logging +from Queue import Queue __all__ = ["tcpReactor"] @@ -51,16 +52,19 @@ class JsonRpcInternalError(JsonRpcError): - def __init__(self): - JsonRpcError.__init__(self, -32603, - "Internal JSON-RPC error.") + def __init__(self, msg=None): + if msg is None: + msg = "Internal JSON-RPC error." + JsonRpcError.__init__(self, -32603, msg) -class JsonRpcRequest(object): - def __init__(self, method, params, reqId): - self.method = method +class _JsonRpcRequest(object): + def __init__(self, ctx, queue, methodName, params, reqId): + self.method = methodName self.params = params self.id = reqId + self._ctx = ctx + self._queue = queue def invokeFunction(self, func): if isinstance(self.params, list): @@ -71,12 +75,28 @@ def isNotification(self): return self.id is None + def sendReply(self, result, error): + # TBD: Should calling this for a notification raise an error or be + # ignored + self._queue.put_nowait(_JsonRpcResponse(self._ctx, result, error)) + + +class _JsonRpcResponse(object): + def __init__(self, ctx, result, error): + self._ctx = ctx + self._result = result + self._error = error + + def generateRespnose(self): + pass + class JsonRpcServer(object): log = logging.getLogger("JsonRpcServer") def __init__(self, bridge): self._bridge = bridge + self._workQueue = Queue() def _parseMessage(self, msg): try: @@ -84,7 +104,7 @@ except: raise JsonRpcParseError() - def _parseRequest(self, obj): + def _parseRequest(self, obj, ctx, queue): if obj.get("jsonrpc") != "2.0": raise JsonRpcInvalidRequestError() @@ -100,7 +120,7 @@ if not isinstance(params, (list, dict)): raise JsonRpcInvalidRequestError() - return JsonRpcRequest(method, params, reqId) + return _JsonRpcRequest(ctx, queue, method, params, reqId) def _jsonError2Response(self, err, req): respId = None @@ -116,38 +136,52 @@ "result": result, "id": req.id}, 'utf-8') + def _serveRequest(self, req): + mangledMethod = req.method.replace(".", "_") + self.log.debug("Looking for method '%s' in bridge", + mangledMethod) + try: + method = getattr(self._bridge, mangledMethod) + except AttributeError: + raise JsonRpcMethodNotFoundError() + else: + res = req.invokeFunction(method) + resp = self._generateResponse(req, res) + + def serve_requests(self): + obj = self._queue.get() + while True: + if obj is None: + break + + if isinstance(obj, JsonRpcRequest): + self._serveRequest(obj) + else: + self._processResponse(obj) + def handleMessage(self, msgCtx): #TODO: support batch requests req = None - resp = None + error = None try: obj = self._parseMessage(msgCtx.data) - req = self._parseRequest(obj) + req = self._parseRequest(obj, msgCtx, self._workQueue) - mangledMethod = req.method.replace(".", "_") - self.log.debug("Looking for method '%s' in bridge", - mangledMethod) - try: - method = getattr(self._bridge, mangledMethod) - except AttributeError: - raise JsonRpcMethodNotFoundError() - else: - res = req.invokeFunction(method) - resp = self._generateResponse(req, res) - - except JsonRpcError as e: - resp = self._jsonError2Response(e, req) - self.log.error("Error processing request", exc_info=True) - except: - resp = self._jsonError2Response(JsonRpcInternalError(), req) - self.log.error("Unexpected error while processing request", - exc_info=True) - - if resp is None: + self._queue.put_nowait(req) return - # Notification don't respond even on errors + except JsonRpcError as e: + self.log.error("Error processing request", exc_info=True) + error = e + except: + self.log.error("Unexpected error while processing request", + exc_info=True) + + error = JsonRpcInternalError() + + # Notification, don't respond even on errors if req is not None and req.isNotification(): return - msgCtx.sendReply(resp) + self._workQueue.put_nowait(_JsonRpcResponse(msgCtx, None, e)) + -- To view, visit http://gerrit.ovirt.org/10206 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1510320f192f448ade41018d513dd10308b207d3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Saggi Mizrahi <smizrahi(a)redhat.com>

2 4

Change in vdsm[master]: api: Remove object instancing
by agl＠us.ibm.com 19 Dec '12

19 Dec '12

Adam Litke has uploaded a new change for review. Change subject: api: Remove object instancing ...................................................................... api: Remove object instancing After further discussions on the mailing list, we decided to use object namespacing instead of object instances. Doing this involves several changes to the schema and the DynamicBridge: - Remove construction parameters from 'class' definitions in the schema - Add the former construction parameters to each command - Change the DynamicBridge to handle API.py object instantiation - Fix spUUID handling in the API.py StorageDomain class - Update the xmlrpc binding to reflect changes to API.py Change-Id: Ib74950bd3721a23cc2b84f8c860d3aea8144e01e Signed-off-by: Adam Litke <agl(a)us.ibm.com> --- M tests/apiTests.py M vdsm/API.py M vdsm/BindingXMLRPC.py M vdsm_api/Bridge.py M vdsm_api/vdsmapi-schema.json 5 files changed, 703 insertions(+), 339 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/10246/1 diff --git a/tests/apiTests.py b/tests/apiTests.py index bf40f9e..668830f 100644 --- a/tests/apiTests.py +++ b/tests/apiTests.py @@ -38,7 +38,11 @@ apiWhitelist = ('StorageDomain.Classes', 'StorageDomain.Types', 'Volume.Formats', 'Volume.Types', 'Volume.Roles', - 'Image.DiskTypes') + 'Image.DiskTypes', 'ConnectionRefs.ctorArgs', + 'Global.ctorArgs', 'ISCSIConnection.ctorArgs', + 'Image.ctorArgs', 'LVMVolumeGroup.ctorArgs', + 'StorageDomain.ctorArgs', 'StoragePool.ctorArgs', + 'Task.ctorArgs', 'VM.ctorArgs', 'Volume.ctorArgs') def createFakeAPI(): diff --git a/vdsm/API.py b/vdsm/API.py index e0f2d97..c0ef5cc 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -52,6 +52,7 @@ class APIBase(object): + ctorArgs = [] def __init__(self): self._cif = clientIF.getInstance() @@ -60,6 +61,7 @@ class ConnectionRefs(APIBase): + ctorArgs = [] def __init__(self): APIBase.__init__(self) @@ -75,6 +77,7 @@ class Task(APIBase): + ctorArgs = ['taskID'] def __init__(self, UUID): APIBase.__init__(self) @@ -97,6 +100,7 @@ class VM(APIBase): + ctorArgs = ['vmID'] def __init__(self, UUID): APIBase.__init__(self) @@ -651,6 +655,7 @@ class Volume(APIBase): + ctorArgs = ['volumeID', 'storagepoolID', 'storagedomainID', 'imageID'] class Types: UNKNOWN = storage.volume.UNKNOWN_VOL @@ -735,6 +740,8 @@ class Image(APIBase): + ctorArgs = ['imageID', 'storagepoolID', 'storagedomainID'] + BLANK_UUID = storage.volume.BLANK_UUID class DiskTypes: @@ -786,6 +793,7 @@ class LVMVolumeGroup(APIBase): + ctorArgs = ['lvmvolumegroupID'] def __init__(self, UUID=None): APIBase.__init__(self) @@ -810,6 +818,7 @@ class ISCSIConnection(APIBase): + ctorArgs = ['host', 'port', 'user', 'password'] def __init__(self, host, port, user="", password=""): APIBase.__init__(self) @@ -825,6 +834,7 @@ class StorageDomain(APIBase): + ctorArgs = ['storagedomainID'] class Types: UNKNOWN = storage.sd.UNKNOWN_DOMAIN @@ -842,16 +852,14 @@ BLANK_UUID = storage.sd.BLANK_UUID - def __init__(self, UUID, spUUID=None): + def __init__(self, UUID): APIBase.__init__(self) self._UUID = UUID - self._spUUID = spUUID - def activate(self): - return self._irs.activateStorageDomain(self._UUID, self._spUUID) + def activate(self, spUUID): + return self._irs.activateStorageDomain(self._UUID, spUUID) def attach(self, spUUID): - # XXX: on success, self._spUUID should be set return self._irs.attachStorageDomain(self._UUID, spUUID) def create(self, type, typeArgs, name, domainClass, version=None): @@ -860,21 +868,19 @@ return self._irs.createStorageDomain(type, self._UUID, name, typeArgs, domainClass, version) - def deactivate(self, masterSdUUID, masterVersion): - return self._irs.deactivateStorageDomain(self._UUID, self._spUUID, + def deactivate(self, spUUID, masterSdUUID, masterVersion): + return self._irs.deactivateStorageDomain(self._UUID, spUUID, masterSdUUID, masterVersion) - def detach(self, masterSdUUID, masterVersion, force): - # XXX: on success, self._spUUID should be set to None + def detach(self, spUUID, masterSdUUID, masterVersion, force): if force: - return self._irs.forcedDetachStorageDomain(self._UUID, - self._spUUID) + return self._irs.forcedDetachStorageDomain(self._UUID, spUUID) else: - return self._irs.detachStorageDomain(self._UUID, self._spUUID, + return self._irs.detachStorageDomain(self._UUID, spUUID, masterSdUUID, masterVersion) - def extend(self, devlist, force=False): - return self._irs.extendStorageDomain(self._UUID, self._spUUID, devlist, + def extend(self, spUUID, devlist, force=False): + return self._irs.extendStorageDomain(self._UUID, spUUID, devlist, force) def format(self, autoDetach): @@ -892,21 +898,22 @@ def getStats(self): return self._irs.getStorageDomainStats(self._UUID) - def getVolumes(self, imgUUID=Image.BLANK_UUID): - return self._irs.getVolumesList(self._UUID, self._spUUID, imgUUID) + def getVolumes(self, spUUID, imgUUID=Image.BLANK_UUID): + return self._irs.getVolumesList(self._UUID, spUUID, imgUUID) def setDescription(self, description): return self._irs.setStorageDomainDescription(self._UUID, description) - def uploadVolume(self, imgUUID, volUUID, srcPath, size, method): - return self._irs.uploadVolume(self._UUID, self._spUUID, imgUUID, - volUUID, srcPath, size, method) + def uploadVolume(self, spUUID, imgUUID, volUUID, srcPath, size, method): + return self._irs.uploadVolume(self._UUID, spUUID, imgUUID, volUUID, + srcPath, size, method) def validate(self): return self._irs.validateStorageDomain(self._UUID) class StoragePool(APIBase): + ctorArgs = ['storagepoolID'] def __init__(self, UUID): APIBase.__init__(self) @@ -1017,6 +1024,7 @@ class Global(APIBase): + ctorArgs = [] def __init__(self): APIBase.__init__(self) diff --git a/vdsm/BindingXMLRPC.py b/vdsm/BindingXMLRPC.py index 43c135a..ef9ae81 100644 --- a/vdsm/BindingXMLRPC.py +++ b/vdsm/BindingXMLRPC.py @@ -386,75 +386,76 @@ return api.setMOMPolicy(policy) def domainActivate(self, sdUUID, spUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.activate() + domain = API.StorageDomain(sdUUID) + return domain.activate(spUUID) def domainAttach(self, sdUUID, spUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID) + domain = API.StorageDomain(sdUUID) return domain.attach(spUUID) def domainCreate(self, storageType, sdUUID, domainName, typeSpecificArg, domClass, domVersion=None, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.create(storageType, typeSpecificArg, domainName, domClass, domVersion) def domainDeactivate(self, sdUUID, spUUID, msdUUID, masterVersion, options=None): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.deactivate(msdUUID, masterVersion) + domain = API.StorageDomain(sdUUID) + return domain.deactivate(spUUID, msdUUID, masterVersion) def domainDetach(self, sdUUID, spUUID, msdUUID, masterVersion, options=None): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.detach(msdUUID, masterVersion, force=False) + domain = API.StorageDomain(sdUUID) + return domain.detach(spUUID, msdUUID, masterVersion, force=False) def domainDetachForced(self, sdUUID, spUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.detach(None, None, force=True) + domain = API.StorageDomain(sdUUID) + return domain.detach(spUUID, None, None, force=True) def domainExtend(self, sdUUID, spUUID, devlist, force=False, options=None): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.extend(devlist, force) + domain = API.StorageDomain(sdUUID) + return domain.extend(spUUID, devlist, force) def domainFormat(self, sdUUID, autoDetach=False, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.format(autoDetach) def domainGetFileList(self, sdUUID, pattern='*', options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.getFileList(pattern) def domainGetImages(self, sdUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.getImages() def domainGetInfo(self, sdUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.getInfo() def domainGetStats(self, sdUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.getStats() def domainGetVolumes(self, sdUUID, spUUID, imgUUID=API.Image.BLANK_UUID): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.getVolumes(imgUUID) + domain = API.StorageDomain(sdUUID) + return domain.getVolumes(spUUID, imgUUID) def domainSetDescription(self, sdUUID, description, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.setDescription(description) def domainUploadVolume(self, sdUUID, spUUID, imgUUID, volUUID, srcPath, size, method="rsync", options=None): - domain = API.StorageDomain(sdUUID, spUUID) - return domain.uploadVolume(imgUUID, volUUID, srcPath, size, method) + domain = API.StorageDomain(sdUUID) + return domain.uploadVolume(spUUID, imgUUID, volUUID, srcPath, size, + method) def domainValidate(self, sdUUID, options=None): - domain = API.StorageDomain(sdUUID, spUUID=None) + domain = API.StorageDomain(sdUUID) return domain.validate() def imageDelete(self, sdUUID, spUUID, diff --git a/vdsm_api/Bridge.py b/vdsm_api/Bridge.py index d93dc22..fce89b2 100644 --- a/vdsm_api/Bridge.py +++ b/vdsm_api/Bridge.py @@ -26,7 +26,10 @@ self.message = message -class MethodBridge(object): +class DynamicBridge(object): + def __init__(self, schema): + self._parseSchema(schema) + def dispatch(self, name, argobj): methodName = name.replace('.', '_') result = None @@ -54,11 +57,6 @@ except KeyError: raise VdsmError(5, "Response is missing '%s' member" % member) - -class DynamicBridge(MethodBridge): - def __init__(self, schema): - self._parseSchema(schema) - def _parseSchema(self, schema): self.commands = {} self.classes = {} @@ -84,19 +82,51 @@ else: raise AttributeError() - def _getArgList(self, cmd): - return self.commands[cmd].get('data', {}).keys() - - def _getObjargList(self, className): - return self.classes[className]['data'].keys() - - def _getApiClass(self, className): + def _convertClassName(self, name): + """ + The schema has a different name for the 'Global' namespace. Until + API.py is fixed, we convert the schema name if we are looking up + something in API.py. + """ name_map = {'Host': 'Global'} try: - className = name_map[className] + return name_map[name] except KeyError: - pass - return getattr(API, className) + return name + + def _getMethodArgs(self, className, cmd, argObj): + """ + An internal API call currently looks like: + + instance = API.<className>(<*ctor_args>) + intance.<method>(<*method_args>) + + Eventually we can remove this instancing but for now that's the way it + works. Each API.py object defines its ctor_args so that we can query + them from here. For any given method, the method_args are obtained by + chopping off the ctor_args from the beginning of argObj. + """ + className = self._convertClassName(className) + # Get the full argument list + allArgs = self.commands[cmd].get('data', {}).keys() + + # Get the list of ctor_args + ctorArgs = getattr(API, className).ctorArgs + + # Determine the method arguments by subtraction + methodArgs = [] + for arg in allArgs: + if arg not in ctorArgs: + methodArgs.append(arg) + + return self._getArgs(argObj, methodArgs) + + def _getApiInstance(self, className, argObj): + className = self._convertClassName(className) + + apiObj = getattr(API, className) + ctorArgs = self._getArgs(argObj, apiObj.ctorArgs) + return apiObj(*ctorArgs) def _symNameFilter(self, symName): """ @@ -150,13 +180,9 @@ def _dynamicMethod(self, className, methodName, argobj): cmd = '%s_%s' % (className, methodName) - ctorArgObj = argobj.get('__obj__', {}) - ctorargs = self._getArgs(ctorArgObj, self._getObjargList(className)) - args = self._getArgs(argobj, self._getArgList(cmd)) - apiobj = self._getApiClass(className) - api = apiobj(*ctorargs) - - self._fixupArgs(cmd, args) + api = self._getApiInstance(className, argobj) + methodArgs = self._getMethodArgs(className, cmd, argobj) + self._fixupArgs(cmd, methodArgs) # Call the override function (if given). Otherwise, just call directly fn = command_info.get(cmd, {}).get('call') @@ -164,7 +190,7 @@ result = fn(api, argobj) else: fn = getattr(api, methodName) - result = fn(*args) + result = fn(*methodArgs) if result['status']['code']: code = result['status']['code'] diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json index 1b1c075..1bc337c 100644 --- a/vdsm_api/vdsmapi-schema.json +++ b/vdsm_api/vdsmapi-schema.json @@ -26,19 +26,11 @@ ## # @Host: # -# The host-level API object. -# -# @hostname: The hostname or IP address to connect to -# -# @port: The port number to connect to -# -# @sync_mode: If True, fetch responses synchronously, otherwise responses must -# be asynchronously read. +# The Host namespace. # # Since: 4.10.0 ## -{'class': 'Host', - 'data': {'hostname': 'str', 'port': 'uint', 'sync_mode': 'bool'}} +{'class': 'Host'} ## # @UUID: @@ -943,12 +935,12 @@ # Get a list of all Storage Pools that are connected to this host. # # Returns: -# A list of Storage Pools +# A list of Storage Pool UUIDs # # Since: 4.10.0 ## {'command': {'class': 'Host', 'name': 'getConnectedStoragePools'}, - 'returns': ['StoragePool']} + 'returns': ['UUID']} ## # @BlockDeviceType: @@ -1595,14 +1587,14 @@ # @remotePath: #optional Limit to Domains having this remotePath # # Returns: -# A list of known Storage Domains +# A list of Storage Domain UUIDs # # Since: 4.10.0 ## {'command': {'class': 'Host', 'name': 'getStorageDomains'}, 'data': {'*storagepoolID': 'UUID', '*domainClass': 'StorageDomainImageClass', '*storageType': 'StorageDomainType', '*remotePath': 'str'}, - 'returns': ['StorageDomain']} + 'returns': ['UUID']} ## # @Host.getStorageRepoStats: @@ -2540,13 +2532,13 @@ # @vmList: #optional Filter the results by a list of UUIDs # # Returns: -# A list of VMs +# A list of VM UUIDs # # Since: 4.10.0 ## {'command': {'class': 'Host', 'name': 'getVMList'}, 'data': {'*vmList': ['UUID']}, - 'returns': ['VM']} + 'returns': ['UUID']} ## # @Host.ping: @@ -2604,13 +2596,11 @@ ## # @ConnectionRefs: # -# ConnectionRefs API object. -# -# @conn: A connected base API object +# The ConnectionRefs namespace. # # Since: 4.10.0 ## -{'class': 'ConnectionRefs', 'data': {'conn': 'Host'}} +{'class': 'ConnectionRefs'} ## # @IscsiPortal: @@ -2889,9 +2879,16 @@ ## # @ISCSIConnection: # -# ISCSIConnection API object. +# The ISCSIConnection namespace. # -# @conn: A connected base API object +# Since: 4.10.0 +## +{'class': 'ISCSIConnection'} + +## +# @ISCSIConnection.discoverSendTargets: +# +# Discover available targets for this @ISCSIConnection. # # @host: A fully-qualified domain name (FQDN) or IP address # @@ -2901,32 +2898,29 @@ # # @password: #optional The password associated with the given username # -# Since: 4.10.0 -## -{'class': 'ISCSIConnection', - 'data': {'conn': 'Host', 'host': 'str', 'port': 'int', '*user': 'str', - '*password': 'str'}} - -## -# @ISCSIConnection.discoverSendTargets: -# -# Discover available targets for this @ISCSIConnection. -# # Returns: # A list of discovered targets in the form: '<host>:<port>,<tpgt> <iqn>' # # Since: 4.10.0 ## {'command': {'class': 'ISCSIConnection', 'name': 'discoverSendTargets'}, + 'data': {'host': 'str', 'port': 'int', '*user': 'str', '*password': 'str'}, 'returns': ['str']} ## Category: @Image ############################################################ ## # @Image: # -# Image API object. +# The Image namespace. # -# @conn: A connected base API object +# Since: 4.10.0 +## +{'class': 'Image'} + +## +# @Image.delete: +# +# Delete the Image and all of its Volumes. # # @imageID: The UUID of the Image # @@ -2934,20 +2928,9 @@ # # @storagedomainID: The UUID of the Storage Domain associated with the Image # -# Since: 4.10.0 -## -{'class': 'Image', - 'data': {'conn': 'Host', 'imageID': 'UUID', 'storagepoolID': 'UUID', - 'storagedomainID': 'UUID'}} - -## -# @Image.delete: +# @postZero: If True, overwrite Volume data with zeroes after deletion # -# Delete the Image and all of its Volumes. -# -# @postZero: If True, overwrite Volume data with zeroes after deletion -# -# @force: Force the operation and do not perform any validation +# @force: Force the operation and do not perform any validation # # Returns: # A task UUID @@ -2955,7 +2938,8 @@ # Since: 4.10.0 ## {'command': {'class': 'Image', 'name': 'delete'}, - 'data': {'postZero': 'bool', 'force': 'bool'}, + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'postZero': 'bool', 'force': 'bool'}, 'returns': 'UUID'} ## @@ -2963,11 +2947,17 @@ # # Delete one or more Volumes associated with this image. # -# @volumeList: A list of Volume UUIDs +# @imageID: The UUID of the Image # -# @postZero: If True, overwrite Volume data with zeroes after deletion +# @storagepoolID: The UUID of the Storage Pool associated with the Image # -# @force: Force the operation and do not perform any validation +# @storagedomainID: The UUID of the Storage Domain associated with the Image +# +# @volumeList: A list of Volume UUIDs +# +# @postZero: If True, overwrite Volume data with zeroes after deletion +# +# @force: Force the operation and do not perform any validation # # Returns: # A task UUID @@ -2975,7 +2965,8 @@ # Since: 4.10.0 ## {'command': {'class': 'Image', 'name': 'deleteVolumes'}, - 'data': {'volumeList': ['UUID'], '*postZero': 'bool', '*force': 'bool'}, + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'volumeList': ['UUID'], '*postZero': 'bool', '*force': 'bool'}, 'returns': 'UUID'} ## @@ -2983,24 +2974,37 @@ # # Get a list of Volumes associated with this Image. # +# @imageID: The UUID of the Image +# +# @storagepoolID: The UUID of the Storage Pool associated with the Image +# +# @storagedomainID: The UUID of the Storage Domain associated with the Image +# # Returns: -# A list of Volumes +# A list of Volume UUIDs # # Since: 4.10.0 ## {'command': {'class': 'Image', 'name': 'getVolumes'}, - 'returns': ['Volume']} + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID'}, + 'returns': ['UUID']} ## # @Image.mergeSnapshots: # # Merge snapshot @successor into @ancestor. # -# @ancestor: A Volume UUID representing the parent snapshot +# @imageID: The UUID of the Image # -# @successor: A Volume UUID representing the child snapshot +# @storagepoolID: The UUID of the Storage Pool associated with the Image # -# @postZero: If True, overwrite @successor with zeroes after conversion +# @storagedomainID: The UUID of the Storage Domain associated with the Image +# +# @ancestor: A Volume UUID representing the parent snapshot +# +# @successor: A Volume UUID representing the child snapshot +# +# @postZero: If True, overwrite @successor with zeroes after conversion # # Returns: # A task UUID @@ -3008,7 +3012,8 @@ # Since: 4.10.0 ## {'command': {'class': 'Image', 'name': 'mergeSnapshots'}, - 'data': {'ancestor': 'UUID', 'successor': 'UUID', 'postZero': 'bool'}, + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'ancestor': 'UUID', 'successor': 'UUID', 'postZero': 'bool'}, 'returns': 'UUID'} ## @@ -3031,13 +3036,19 @@ # # Move or copy an image to another Storage Domain within the same Storage Pool. # -# @dstSdUUID: The destination Storage Domain UUID +# @imageID: The UUID of the Image # -# @operation: The operation to perform +# @storagepoolID: The UUID of the Storage Pool associated with the Image # -# @postZero: If True, overwrite Volume data with zeroes after deletion +# @storagedomainID: The UUID of the Storage Domain associated with the Image # -# @force: Force the operation and do not perform any validation +# @dstSdUUID: The destination Storage Domain UUID +# +# @operation: The operation to perform +# +# @postZero: If True, overwrite Volume data with zeroes after deletion +# +# @force: Force the operation and do not perform any validation # # Returns: # A task UUID @@ -3045,7 +3056,8 @@ # Since: 4.10.0 ## {'command': {'class': 'Image', 'name': 'move'}, - 'data': {'dstSdUUID': 'UUID', 'operation': 'ImageMoveOperation', + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'dstSdUUID': 'UUID', 'operation': 'ImageMoveOperation', 'postZero': 'bool', 'force': 'bool'}, 'returns': 'UUID'} @@ -3055,7 +3067,13 @@ # Clone an image structure from a source domain to a destination domain # within the same Storage Pool. # -# @dstSdUUID: The destination Storage Domain UUID +# @imageID: The UUID of the Image +# +# @storagepoolID: The UUID of the Storage Pool associated with the Image +# +# @storagedomainID: The UUID of the Storage Domain associated with the Image +# +# @dstSdUUID: The destination Storage Domain UUID # # Returns: # A task UUID @@ -3063,7 +3081,8 @@ # Since: 4.11.0 ## {'command': {'class': 'Image', 'name': 'cloneStructure'}, - 'data': {'dstSdUUID': 'UUID'}, + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'dstSdUUID': 'UUID'}, 'returns': 'UUID'} ## @@ -3086,9 +3105,15 @@ # # Synchronize image data between storage domains within same Storage Pool. # -# @dstSdUUID: The destination Storage Domain UUID +# @imageID: The UUID of the Image # -# @syncType: The type of synchronization to perform +# @storagepoolID: The UUID of the Storage Pool associated with the Image +# +# @storagedomainID: The UUID of the Storage Domain associated with the Image +# +# @dstSdUUID: The destination Storage Domain UUID +# +# @syncType: The type of synchronization to perform # # Returns: # A task UUID @@ -3096,24 +3121,19 @@ # Since: 4.11.0 ## {'command': {'class': 'Image', 'name': 'syncData'}, - 'data': {'dstSdUUID': 'UUID', 'syncType': 'syncType'}, + 'data': {'imageID': 'UUID', 'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'dstSdUUID': 'UUID', 'syncType': 'syncType'}, 'returns': 'UUID'} ## Category: @LVMVolumeGroup ################################################### ## # @LVMVolumeGroup: # -# LVMVolumeGroup API object. -# -# @conn: A connected base API object -# -# @lvmvolumegroupID: #optional Associate this object with an existing LVM -# Volume Group +# The LVMVolumeGroup namespace. # # Since: 4.10.0 ## -{'class': 'LVMVolumeGroup', - 'data': {'conn': 'Host', 'lvmvolumegroupID': 'UUID'}} +{'class': 'LVMVolumeGroup'} ## # @LVMVolumeGroup.create: @@ -3143,12 +3163,15 @@ # # Get information about a Volume Group. # +# @lvmvolumegroupID: The UUID of the LVM Volume Group +# # Returns: # Volume Group information # # Since: 4.10.0 ## {'command': {'class': 'LVMVolumeGroup', 'name': 'getInfo'}, + 'data': {'lvmvolumegroupID': 'UUID'}, 'returns': 'VolumeGroupInfo'} ## @@ -3156,9 +3179,12 @@ # # Remove this Volume Group. # +# @lvmvolumegroupID: The UUID of the LVM Volume Group +# # Since: 4.10.0 ## -{'command': {'class': 'LVMVolumeGroup', 'name': 'remove'}} +{'command': {'class': 'LVMVolumeGroup', 'name': 'remove'}, + 'data': {'lvmvolumegroupID': 'UUID'}} ## Category: @StorageDomain #################################################### ## @@ -3166,38 +3192,38 @@ # # StorageDomain API object. # -# @conn: A connected base API object -# -# @storagedomainID: Associate this object with a new or existing Storage Domain -# -# @storagepoolID: #optional The Storage Pool UUID if this Storage Domain is -# attached -# # Since: 4.10.0 ## -{'class': 'StorageDomain', - 'data': {'conn': 'Host', 'storagedomainID': 'UUID', 'storagepoolID': 'UUID'}} +{'class': 'StorageDomain'} ## # @StorageDomain.activate: # # Activate an attached but inactive Storage Domain. # +# @storagedomainID: The UUID of the Storage Domain +# +# @storagepoolID: The UUID of the Storage Pool to which the Storage Domain +# is attached +# # Since: 4.10.0 ## -{'command': {'class': 'StorageDomain', 'name': 'activate'}} +{'command': {'class': 'StorageDomain', 'name': 'activate'}, + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID'}} ## # @StorageDomain.attach: # # Attach a Storage Domain to a Storage Pool. # -# @storagepoolID: The UUID of the pool to which this domain should be attached +# @storagedomainID: The UUID of the Storage Domain +# +# @storagepoolID: The UUID of the Storage Pool # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'attach'}, - 'data': {'storagepoolID': 'UUID'}} + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID'}} ## # @StorageDomainCreateArgumentsBlock: @@ -3255,20 +3281,22 @@ # # Create a new Storage Domain. # -# @domainType: The type of backing storage used by the Storage Domain +# @storagedomainID: The UUID of the Storage Domain # -# @typeArgs: Type specific backing storage specifier +# @domainType: The type of backing storage used by the Storage Domain # -# @name: A human-readable name +# @typeArgs: Type specific backing storage specifier # -# @domainClass: The Storage Domain Class +# @name: A human-readable name # -# @version: #optional The Storage Domain version that should be used +# @domainClass: The Storage Domain Class +# +# @version: #optional The Storage Domain version that should be used # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'create'}, - 'data': {'domainType': 'StorageDomainType', + 'data': {'storagedomainID': 'UUID', 'domainType': 'StorageDomainType', 'typeArgs': 'StorageDomainCreateArguments', 'name': 'str', 'domainClass': 'StorageDomainImageClass', '*version': 'int'}} @@ -3277,62 +3305,81 @@ # # Deactivate an active, attached Storage Domain. # -# @masterSdUUID: The UUID of a Storage Domain that should become master after -# this domain has been deactivated. If this domain was not the -# master domain, then the current master's UUID may be used. +# @storagedomainID: The UUID of the Storage Domain # -# @masterVersion: The Storage Domain version of the new master domain +# @storagepoolID: The UUID of the Storage Pool +# +# @masterSdUUID: The UUID of a Storage Domain that should become master +# after this domain has been deactivated. If this domain +# was not the master domain, then the current master's UUID +# may be used. +# +# @masterVersion: The Storage Domain version of the new master domain # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'deactivate'}, - 'data': {'masterSdUUID': 'UUID', 'masterVersion': 'int'}} + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID', + 'masterSdUUID': 'UUID', 'masterVersion': 'int'}} ## # @StorageDomain.detach: # # Detach an inactive Storage Domain from its Storage Pool. # -# @masterSdUUID: The UUID of a Storage Domain that should become master after -# this domain has been deactivated. If this domain was not the -# master domain, then the current master's UUID may be used. +# @storagedomainID: The UUID of the Storage Domain # -# @masterVersion: The Storage Domain version of the new master domain +# @storagepoolID: The UUID of the Storage Pool # -# @force: Force operation -- do not perform validation +# @masterSdUUID: The UUID of a Storage Domain that should become master +# after this domain has been deactivated. If this domain +# was not the master domain, then the current master's UUID +# may be used. +# +# @masterVersion: The Storage Domain version of the new master domain +# +# @force: Force operation -- do not perform validation # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'detach'}, - 'data': {'masterSdUUID': 'UUID', 'masterVersion': 'int', 'force': 'bool'}} + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID', + 'masterSdUUID': 'UUID', 'masterVersion': 'int', 'force': 'bool'}} ## # @StorageDomain.extend: # # Extend a block-based Storage Domain onto more block devices. # -# @devlist: An array of block device names to add to the domain +# @storagedomainID: The UUID of the Storage Domain # -# @force: #optional Try to extend a domain with LUN even if it is not empty -# (e.g. already marked as part of a VG). +# @storagepoolID: The UUID of the Storage Pool +# +# @devlist: An array of block device names to add to the domain +# +# @force: #optional Try to extend a domain with LUN even if it is +# not empty (e.g. already marked as part of a VG). # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'extend'}, - 'data': {'devlist': ['str'], '*force': 'bool'}} + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID', + 'devlist': ['str'], '*force': 'bool'}} ## # @StorageDomain.format: # # Format a storage domain and erase all of its data. # -# @autoDetach: Detach the Storage Domain before formatting. Useful when -# formatting the master domain. +# @storagedomainID: The UUID of the Storage Domain +# +# @autoDetach: Detach the Storage Domain before formatting. Useful when +# formatting the master domain. # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'format'}, - 'data': {'autoDetach': 'bool'}} + 'data': {'storagedomainID': 'UUID', 'autoDetach': 'bool'}} ## # @StorageDomainFileStats: @@ -3365,7 +3412,9 @@ # # Get a list of files in an ISO domain. # -# @pattern: Filter results by this glob pattern +# @storagedomainID: The UUID of the Storage Domain +# +# @pattern: Filter results by this glob pattern # # Returns: # A dictionary of file information indexed by file name @@ -3373,7 +3422,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'getFileList'}, - 'data': {'pattern': 'str'}, + 'data': {'storagedomainID': 'UUID', 'pattern': 'str'}, 'returns': 'StorageDomainFileStatsMap'} ## @@ -3381,13 +3430,16 @@ # # Get a list of Images associated with this Storage Domain. # +# @storagedomainID: The UUID of the Storage Domain +# # Returns: -# An array of Imags +# A list of Image UUIDs # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'getImages'}, - 'returns': ['Image']} + 'data': {'storagedomainID': 'UUID'}, + 'returns': ['UUID']} ## # @StorageDomainRole: @@ -3440,12 +3492,15 @@ # # Get information about a Storage Domain. # +# @storagedomainID: The UUID of the Storage Domain +# # Returns: # Storage domain information # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'getInfo'}, + 'data': {'storagedomainID': 'UUID'}, 'returns': 'StorageDomainInfo'} ## @@ -3476,12 +3531,15 @@ # # Get Storage Domain statistics. # +# @storagedomainID: The UUID of the Storage Domain +# # Returns: # Storage Domain statistics # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'getStats'}, + 'data': {'storagedomainID': 'UUID'}, 'returns': 'StorageDomainStats'} ## @@ -3489,28 +3547,35 @@ # # Get a list of Volumes contained within a Storage Domain. # -# @imageID: Limit results to Volumes associated with a single Image +# @storagedomainID: The UUID of the Storage Domain +# +# @storagepoolID: The UUID of the Storage Pool +# +# @imageID: Limit results to Volumes associated with a single Image # # Returns: -# A list of Volumes +# A list of Volume UUIDs # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'getVolumes'}, - 'data': {'imageID': 'UUID'}, - 'returns': ['Volume']} + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID', + 'imageID': 'UUID'}, + 'returns': ['UUID']} ## # @StorageDomain.setDescription: # # Set the Storage Domain description. # -# @description: A human-readable description +# @storagedomainID: The UUID of the Storage Domain +# +# @description: A human-readable description # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'setDescription'}, - 'data': {'description': 'str'}} + 'data': {'storagedomainID': 'UUID', 'description': 'str'}} ## # @UploadVolumeMethod: @@ -3530,21 +3595,28 @@ # # Upload a Volume into a Storage Domain from a remote location. # -# @imageID: The UUID of the image that is associated with the Volume +# @storagedomainID: The UUID of the Storage Domain # -# @volumeID: The UUID of an existing Volume where the data will be uploaded +# @storagepoolID: The UUID of the Storage Pool # -# @srcPath: The remote location of the Volume data. Must be in a format that -# can be understood by the command indicated in @method. +# @imageID: The UUID of the image that is associated with the Volume # -# @size: The size of the volume data in blocks +# @volumeID: The UUID of an existing Volume where the data will be +# uploaded # -# @method: The method (command) to use to upload the data +# @srcPath: The remote location of the Volume data. Must be in a +# format that can be understood by the command indicated in +# @method. +# +# @size: The size of the volume data in blocks +# +# @method: The method (command) to use to upload the data # # Since: 4.10.0 ## {'command': {'class': 'StorageDomain', 'name': 'uploadVolume'}, - 'data': {'imageID': 'UUID', 'volumeID': 'UUID', 'srcPath': 'str', + 'data': {'storagedomainID': 'UUID', 'storagepoolID': 'UUID', + 'imageID': 'UUID', 'volumeID': 'UUID', 'srcPath': 'str', 'size': 'int', 'method': 'UploadVolumeMethod'}} ## @@ -3552,28 +3624,29 @@ # # Check that the Storage Domain is accessible. # +# @storagedomainID: The UUID of the Storage Domain +# # Since: 4.10.0 ## -{'command': {'class': 'StorageDomain', 'name': 'validate'}} +{'command': {'class': 'StorageDomain', 'name': 'validate'}, + 'data': {'storagedomainID': 'UUID'}} ## Category: @StoragePool ###################################################### ## # @StoragePool: # -# StoragePool API object. -# -# @conn: A connected base API object -# -# @storagepoolID: Associate this object with a new or existing Storage Pool +# The StoragePool namespace. # # Since: 4.10.0 ## -{'class': 'StoragePool', 'data': {'conn': 'Host', 'storagepoolID': 'UUID'}} +{'class': 'StoragePool'} ## # @StoragePool.connect: # # Connect to an existing Storage Pool. +# +# @storagepoolID: The UUID of the Storage Pool # # @hostID: A host ID number unique across all hosts in the same cluster # @@ -3589,8 +3662,8 @@ # Notes: Only one Storage pool may be connected at a time ## {'command': {'class': 'StoragePool', 'name': 'connect'}, - 'data': {'hostID': 'int', 'scsiKey': 'str', 'masterSdUUID': 'UUID', - 'masterVersion': 'int'}} + 'data': {'storagepoolID': 'UUID', 'hostID': 'int', 'scsiKey': 'str', + 'masterSdUUID': 'UUID', 'masterVersion': 'int'}} ## # @ConnectStorageServerStatus: @@ -3611,6 +3684,8 @@ # # Establish a connection to backing storage. # +# @storagepoolID: The UUID of the Storage Pool +# # @domainType: The type of storage to connect # # @connectionParams: An array of connection information @@ -3621,7 +3696,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'connectStorageServer'}, - 'data': {'domainType': 'StorageDomainType', + 'data': {'storagepoolID': 'UUID', 'domainType': 'StorageDomainType', 'connectionParams': ['ConnectionRefParameters']}, 'returns': ['ConnectStorageServerStatus']} @@ -3629,6 +3704,8 @@ # @StoragePool.create: # # Create a new Storage Pool. +# +# @storagepoolID: The UUID of the Storage Pool # # @name: A human-readable name for the Storage Pool # @@ -3657,45 +3734,52 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'create'}, - 'data': {'name': 'str', 'masterSdUUID': 'UUID', 'masterVersion': 'int', - 'domainList': ['UUID'], 'lockRenewalIntervalSec': 'int', - 'leaseTimeSec': 'int', 'ioOpTimeoutSec': 'int', - 'leaseRetries': 'int'}} + 'data': {'storagepoolID': 'UUID', 'name': 'str', 'masterSdUUID': 'UUID', + 'masterVersion': 'int', 'domainList': ['UUID'], + 'lockRenewalIntervalSec': 'int', 'leaseTimeSec': 'int', + 'ioOpTimeoutSec': 'int', 'leaseRetries': 'int'}} ## # @StoragePool.destroy: # # Destroy a Storage Pool. # -# @hostID: A host ID number unique across all hosts in the same cluster +# @storagepoolID: The UUID of the Storage Pool # -# @scsiKey: The key that was passed into @StoragePool.connect +# @hostID: A host ID number unique across all hosts in the same cluster +# +# @scsiKey: The key that was passed into @StoragePool.connect # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'destroy'}, - 'data': {'hostID': 'int', 'scsiKey': 'str'}} + 'data': {'storagepoolID': 'UUID', 'hostID': 'int', 'scsiKey': 'str'}} ## # @StoragePool.disconnect: # # Disconnect and optionally remove a Storage Pool. # -# @hostID: A host ID number unique across all hosts in the same cluster +# @storagepoolID: The UUID of the Storage Pool # -# @scsiKey: The key that was passed into @StoragePool.connect +# @hostID: A host ID number unique across all hosts in the same cluster # -# @remove: If True, remove the Storage Pool after it is disconnected +# @scsiKey: The key that was passed into @StoragePool.connect +# +# @remove: If True, remove the Storage Pool after it is disconnected # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'disconnect'}, - 'data': {'hostID': 'int', 'scsiKey': 'str', 'remove': 'bool'}} + 'data': {'storagepoolID': 'UUID', 'hostID': 'int', 'scsiKey': 'str', + 'remove': 'bool'}} ## # @StoragePool.disconnectStorageServer: # # Remove backing storage connections. +# +# @storagepoolID: The UUID of the Storage Pool # # @domainType: The type of backing storage # @@ -3707,7 +3791,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'disconnectStorageServer'}, - 'data': {'domainType': 'StorageDomainType', + 'data': {'storagepoolID': 'UUID', 'domainType': 'StorageDomainType', 'connectionParams': ['ConnectionRefParameters']}, 'returns': ['ConnectStorageServerStatus']} @@ -3748,6 +3832,8 @@ # # Fence the SPM host via the storage. # +# @storagepoolID: The UUID of the Storage Pool +# # Returns: # SPM status information for the Storage Pool # @@ -3756,6 +3842,7 @@ # Notes: Deprecated ## {'command': {'class': 'StoragePool', 'name': 'fence'}, + 'data': {'storagepoolID': 'UUID'}, 'returns': 'SpmStatus'} ## @@ -3773,9 +3860,11 @@ # # Get information about backed-up virtual machines from a Backup Storage Domain. # +# @storagepoolID: The UUID of the Storage Pool +# # @storagedomainID: The UUID of the Backup Storage Domain to check # -# @vmList: Limit results to a list of VM UUIDs +# @vmList: Limit results to a list of VM UUIDs # # Returns: # A dictionary of OVF information indexed by VM UUID @@ -3786,13 +3875,16 @@ # previously injected it into the Backup Storage Domain. ## {'command': {'class': 'StoragePool', 'name': 'getBackedUpVmsInfo'}, - 'data': {'storagedomainID': 'UUID', 'vmList': ['UUID']}, + 'data': {'storagepoolID': 'UUID', 'storagedomainID': 'UUID', + 'vmList': ['UUID']}, 'returns': 'OVFMap'} ## # @StoragePool.getBackedUpVmsList: # # Get a list of backed up virtual machines from a Backup Storage Domain. +# +# @storagepoolID: The UUID of the Storage Pool # # @storagedomainID: The UUID of the Backup Storage Domain to check # @@ -3802,7 +3894,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'getBackedUpVmsList'}, - 'data': {'storagedomainID': 'UUID'}, + 'data': {'storagepoolID': 'UUID', 'storagedomainID': 'UUID'}, 'returns': ['UUID']} ## @@ -3810,12 +3902,15 @@ # # Get a list of all floppy disk images associated with a Storage Pool. # +# @storagepoolID: The UUID of the Storage Pool +# # Returns: # A list of floppy disk file names # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'getFloppyList'}, + 'data': {'storagepoolID': 'UUID'}, 'returns': ['str']} ## @@ -3823,23 +3918,28 @@ # # Get a list of Storage Domains that contain an Image. # +# @storagepoolID: The UUID of the Storage Pool +# # @imageID: The UUID of the Image to search for # # @onlyDataDomains: #optional Only include Data Storage Domains # # Returns: -# A list of Storage Domains that contain the Image +# A list of UUIDs of Storage Domains that contain the Image # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'getDomainsContainingImage'}, - 'data': {'imageID': 'UUID', '*onlyDataDomains': 'bool'}, - 'returns': ['StorageDomain']} + 'data': {'storagepoolID': 'UUID', 'imageID': 'UUID', + '*onlyDataDomains': 'bool'}, + 'returns': ['UUID']} ## # @StoragePool.getIsoList: # # Get a list of all ISO images associated with a Storage Pool. +# +# @storagepoolID: The UUID of the Storage Pool # # @filenameExtension: #optional Specify an alternate file extension (the # default extension used is 'iso') @@ -3850,7 +3950,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'getIsoList'}, - 'data': {'*filenameExtension': 'str'}, + 'data': {'storagepoolID': 'UUID', '*filenameExtension': 'str'}, 'returns': ['str']} ## @@ -3858,12 +3958,15 @@ # # Get the status of the Storage Pool Manager role. # +# @storagepoolID: The UUID of the Storage Pool +# # Returns: # SPM status information # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'getSpmStatus'}, + 'data': {'storagepoolID': 'UUID'}, 'returns': 'SpmStatus'} ## @@ -3994,12 +4097,15 @@ # # Get information about a Storage Pool and its Active Storage Domains. # +# @storagepoolID: The UUID of the Storage Pool +# # Returns: # Storage Pool and active Storage Domain information # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'getInfo'}, + 'data': {'storagepoolID': 'UUID'}, 'returns': 'StoragePoolFullInfo'} ## @@ -4017,19 +4123,23 @@ # # Move images from one Storage Domain to another within the same Storage Pool. # -# @srcSdUUID: The source Storage Domain +# @storagepoolID: The UUID of the Storage Pool # -# @dstSdUUID: The destination Storage Domain +# @srcSdUUID: The source Storage Domain # -# @imgDict: A mapping keyed by Image UUID where the values indicate if the -# source Image should be zeroed after the data has been moved +# @dstSdUUID: The destination Storage Domain # -# @force: Move Images even if it would overwrite data on the destination +# @imgDict: A mapping keyed by Image UUID where the values indicate if +# the source Image should be zeroed after the data has been +# moved +# +# @force: Move Images even if it would overwrite data on the +# destination # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'moveMultipleImages'}, - 'data': {'srcSdUUID': 'UUID', 'dstSdUUID': 'UUID', + 'data': {'storagepoolID': 'UUID', 'srcSdUUID': 'UUID', 'dstSdUUID': 'UUID', 'imgDict': 'ImagePostZeroMap', 'force': 'bool'}} ## @@ -4046,6 +4156,8 @@ # @StoragePool.reconstructMaster: # # Recover a Storage Pool by reconstructing its Storage Domains. +# +# @storagepoolID: The UUID of the Storage Pool # # @name: A human-readable name for the Storage Pool # @@ -4073,8 +4185,8 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'reconstructMaster'}, - 'data': {'name': 'str', 'masterSdUUID': 'UUID', 'masterVersion': 'int', - 'domainDict': 'StorageDomainStatusMap', + 'data': {'storagepoolID': 'UUID', 'name': 'str', 'masterSdUUID': 'UUID', + 'masterVersion': 'int', 'domainDict': 'StorageDomainStatusMap', 'lockRenewalIntervalSec': 'int', 'leaseTimeSec': 'int', 'ioOpTimeoutSec': 'int', 'leaseRetries': 'int'}}} @@ -4083,6 +4195,8 @@ # # Refresh Storage Pool information. # +# @storagepoolID: The UUID of the Storage Pool +# # @masterSdUUID: The UUID of the master Storage Domain # # @masterVersion: The Storage Domain version of the master domain @@ -4090,24 +4204,29 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'refresh'}, - 'data': {'masterSdUUID': 'UUID', 'masterVersion': 'int'}} + 'data': {'storagepoolID': 'UUID', 'masterSdUUID': 'UUID', + 'masterVersion': 'int'}} ## # @StoragePool.setDescription: # # Set the Storage Pool description # -# @description: A human-readable string describing the Storage Pool +# @storagepoolID: The UUID of the Storage Pool +# +# @description: A human-readable string describing the Storage Pool # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'setDescription'}, - 'data': {'description': 'str'}} + 'data': {'storagepoolID': 'UUID', 'description': 'str'}} ## # @StoragePool.spmStart: # # Instruct this host to acquire the Storage Pool Manager role for this pool. +# +# @storagepoolID: The UUID of the Storage Pool # # @prevID: Deprecated. The Host ID of the previous SPM # @@ -4125,8 +4244,9 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'spmStart'}, - 'data': {'prevID': 'int', 'prevLver': 'int', 'enableScsiFencing': 'bool', - '*maxHostID': 'int', '*domVersion': 'int'}, + 'data': {'storagepoolID': 'UUID', 'prevID': 'int', 'prevLver': 'int', + 'enableScsiFencing': 'bool', '*maxHostID': 'int', + '*domVersion': 'int'}, 'returns': 'UUID'} ## @@ -4134,9 +4254,12 @@ # # Instruct this host to release the Storage Pool Manager role for this pool. # +# @storagepoolID: The UUID of the Storage Pool +# # Since: 4.10.0 ## -{'command': {'class': 'StoragePool', 'name': 'spmStop'}} +{'command': {'class': 'StoragePool', 'name': 'spmStop'}, + 'data': {'storagepoolID': 'UUID'}} ## # @StoragePoolUpgradeStatus: @@ -4154,6 +4277,8 @@ # # Upgrade all Storage Domains in this Storage Pool to a new version. # +# @storagepoolID: The UUID of the Storage Pool +# # @targetDomVersion: The version to upgrade to # # Returns: @@ -4162,7 +4287,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'upgrade'}, - 'data': {'targetDomVersion': 'int'}, + 'data': {'storagepoolID': 'UUID', 'targetDomVersion': 'int'}, 'returns': 'StoragePoolUpgradeStatus'} ## @@ -4200,6 +4325,8 @@ # # Validate storage server connection parameters. # +# @storagepoolID: The UUID of the Storage Pool +# # @domainType: The type of backing storage being validated # # @connectionParams: A list of connection parameter dictionaries @@ -4212,7 +4339,7 @@ # Notes: Deprecated since 4.10.0. Returns 0 for all connections. ## {'command': {'class': 'StoragePool', 'name': 'validateStorageServerConnection'}, - 'data': {'domainType': 'StorageDomainType', + 'data': {'storagepoolID': 'UUID', 'domainType': 'StorageDomainType', 'connectionParams': ['StorageServerConnectionValidateParams']}, 'returns': ['StorageServerConnectionValidateStatus']} @@ -4238,19 +4365,24 @@ # # Store virtual machine OVF files on a Storage Domain in the Storage Pool. # -# @vmList: A list of virtual machine definitions to store +# @storagepoolID: The UUID of the Storage Pool +# +# @vmList: A list of virtual machine definitions to store # # @storagedomainID: The Storage Domain to use for storing the VM definitions # # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'updateVMs'}, - 'data': {'vmList': ['UpdateVmDefinition'], 'storagedomainID': 'UUID'}} + 'data': {'storagepoolID': 'UUID', 'vmList': ['UpdateVmDefinition'], + 'storagedomainID': 'UUID'}} ## # @StoragePool.removeVM: # # Remove a previously saved virtual machine definition. +# +# @storagepoolID: The UUID of the Storage Pool # # @vmUUID: Remove the saved definition of the VM with this UUID # @@ -4259,7 +4391,7 @@ # Since: 4.10.0 ## {'command': {'class': 'StoragePool', 'name': 'removeVM'}, - 'data': {'vmUUID': 'UUID', 'storagedomainID': 'UUID'}} + 'data': {'storagepoolID': 'UUID', 'vmUUID': 'UUID', 'storagedomainID': 'UUID'}} ## Category: @Task ############################################################# ## @@ -4267,27 +4399,28 @@ # # Task API object. # -# @conn: A connected base API object -# -# @taskID: Associate this object with an existing Task -# # Since: 4.10.0 ## -{'class': 'Task', 'data': {'conn': 'Host', 'taskID': 'UUID'}} +{'class': 'Task'} ## # @Task.clear: # # Discard information about a finished Task. # +# @taskID: The UUID of the Task +# # Since: 4.10.0 ## -{'command': {'class': 'Task', 'name': 'clear'}} +{'command': {'class': 'Task', 'name': 'clear'}, + 'data': {'taskID': 'UUID'}} ## # @Task.getInfo: # # Get information about a Task. +# +# @taskID: The UUID of the Task # # Returns: # General Task information @@ -4295,6 +4428,7 @@ # Since: 4.10.0 ## {'command': {'class': 'Task', 'name': 'getInfo'}, + 'data': {'taskID': 'UUID'}, 'returns': 'TaskInfo'} ## @@ -4302,12 +4436,15 @@ # # Get Task status information. # +# @taskID: The UUID of the Task +# # Returns: # Status infomation # # Since: 4.10.0 ## {'command': {'class': 'Task', 'name': 'getStatus'}, + 'data': {'taskID': 'UUID'}, 'returns': 'TaskStatus'} ## @@ -4315,18 +4452,24 @@ # # Rollback a Task to restore the previous system state. # +# @taskID: The UUID of the Task +# # Since: 4.10.0 ## -{'command': {'class': 'Task', 'name': 'revert'}} +{'command': {'class': 'Task', 'name': 'revert'}, + 'data': {'taskID': 'UUID'}} ## # @Task.stop: # # Stop a currently running Task. # +# @taskID: The UUID of the Task +# # Since: 4.10.0 ## -{'command': {'class': 'Task', 'name': 'stop'}} +{'command': {'class': 'Task', 'name': 'stop'}, + 'data': {'taskID': 'UUID'}} ## Category: @VM ############################################################### ## @@ -4334,13 +4477,9 @@ # # VM API object. # -# @conn: A connected base API object -# -# @vmID: Associate this object with an existing VM -# # Since: 4.10.0 ## -{'class': 'VM', 'data': {'conn': 'Host', 'vmID': 'UUID'}} +{'class': 'VM'} ## # @DriveSpecVolume: @@ -4451,6 +4590,8 @@ # # Change the CD in the VM's CD-ROM device. # +# @vmID: The UUID of the VM +# # @driveSpec: The specification of the new CD # # Returns: @@ -4459,13 +4600,15 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'changeCD'}, - 'data': {'driveSpec': 'DriveSpec'}, + 'data': {'vmID': 'UUID', 'driveSpec': 'DriveSpec'}, 'returns': 'VmDefinition'} ## # @VM.changeFloppy: # # Change the disk in the VM's floppy device. +# +# @vmID: The UUID of the VM # # @driveSpec: The specification of the new floppy disk # @@ -4475,7 +4618,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'changeFloppy'}, - 'data': {'driveSpec': 'DriveSpec'}, + 'data': {'vmID': 'UUID', 'driveSpec': 'DriveSpec'}, 'returns': 'VmDefinition'} ## @@ -4483,14 +4626,19 @@ # # Resume a paused VM. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 ## -{'command': {'class': 'VM', 'name': 'cont'}} +{'command': {'class': 'VM', 'name': 'cont'}, + 'data': {'vmID': 'UUID'}} ## # @VM.create: # # Create a new virtual machine. +# +# @vmID: The UUID of the VM # # @vmParams: The VM definition # @@ -4500,7 +4648,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'create'}, - 'data': {'vmParams': 'VmParameters'}, + 'data': {'vmID': 'UUID', 'vmParams': 'VmParameters'}, 'returns': 'VmDefinition'} ## @@ -4508,14 +4656,19 @@ # # Lock the active user session in the guest operating system. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 ## -{'command': {'class': 'VM', 'name': 'desktopLock'}} +{'command': {'class': 'VM', 'name': 'desktopLock'}, + 'data': {'vmID': 'UUID'}} ## # @VM.desktopLogin: # # Log a user into the guest operating system. +# +# @vmID: The UUID of the VM # # @domain: The Active Directory domain (if applicable) # @@ -4526,24 +4679,29 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'desktopLogin'}, - 'data': {'domain': 'str', 'username': 'str', 'password': 'str'}} + 'data': {'vmID': 'UUID', 'domain': 'str', 'username': 'str', + 'password': 'str'}} ## # @VM.desktopLogoff: # # Logoff the active user of the guest operating system. # +# @vmID: The UUID of the VM +# # @force: Force the operation (unused) # # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'desktopLogoff'}, - 'data': {'force': 'bool'}} + 'data': {'vmID': 'UUID', 'force': 'bool'}} ## # @VM.desktopSendHcCommand: # # Send an arbitrary command to the guest agent. +# +# @vmID: The UUID of the VM # # @message: The message to send # @@ -4552,21 +4710,26 @@ # Notes: Deprecated since 4.10.0 ## {'command': {'class': 'VM', 'name': 'desktopSendHcCommand'}, - 'data': {'message': 'str'}} + 'data': {'vmID': 'UUID', 'message': 'str'}} ## # @VM.destroy: # # Forcibly stop a running VM. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 ## -{'command': {'class': 'VM', 'name': 'destroy'}} +{'command': {'class': 'VM', 'name': 'destroy'}, + 'data': {'vmID': 'UUID'}} ## # @VM.getInfo: # # Get detailed information about a VM. +# +# @vmID: The UUID of the VM # # Returns: # VM information @@ -4574,6 +4737,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'getInfo'}, + 'data': {'vmID': 'UUID'}, 'returns': 'VmDefinition'} @@ -4582,12 +4746,15 @@ # # Report status of a currently outgoing migration. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 # # Notes: Migration status is returned as the command status ('code' and # 'message') ## -{'command': {'class': 'VM', 'name': 'getMigrationStatus'}} +{'command': {'class': 'VM', 'name': 'getMigrationStatus'}, + 'data': {'vmID': 'UUID'}} ## # @VmExitCode: @@ -4874,12 +5041,15 @@ # # Get statistics about a running virtual machine. # +# @vmID: The UUID of the VM +# # Returns: # An array containing a single VmStats record # # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'getStats'}, + 'data': {'vmID': 'UUID'}, 'returns': ['VmStats']} ## @@ -4898,6 +5068,8 @@ # # Save the live state of the VM to disk and stop it. # +# @vmID: The UUID of the VM +# # @hibernationVolHandle: Volumes to use for storing VM state and metadata # # Since: 4.10.0 @@ -4906,7 +5078,7 @@ # guest operating system suspend to disk functionality. ## {'command': {'class': 'VM', 'name': 'hibernate'}, - 'data': {'hibernationVolHandle': 'HibernationVolumeHandle'}} + 'data': {'vmID': 'UUID', 'hibernationVolHandle': 'HibernationVolumeHandle'}} ## # @vmUpdateDeviceParams: @@ -4954,9 +5126,9 @@ # # Update the status of a VM's device. # -# @vmId: The UUID of the VM to modify +# @vmID: The UUID of the VM # -# @params: The VM UUID and device information. +# @params: The VM UUID and device information. # # Returns: # The VM definition, as updated @@ -4964,7 +5136,7 @@ # Since: 4.10.3 ## {'command': {'class': 'VM', 'name': 'updateDevice'}, - 'data': {'vmId': 'UUID', 'params': 'vmUpdateDeviceParams'}, + 'data': {'vmID': 'UUID', 'params': 'vmUpdateDeviceParams'}, 'returns': 'VmDefinition'} ## @@ -4986,6 +5158,8 @@ # # Add a new network device to a running VM. # +# @vmID: The UUID of the VM +# # @params: The VM UUID and device information # # Returns: @@ -4997,13 +5171,15 @@ # XXX: Split 'params' into direct parameters ## {'command': {'class': 'VM', 'name': 'hotplugNic'}, - 'data': {'params': 'HotplugNicParams'}, + 'data': {'vmID': 'UUID', 'params': 'HotplugNicParams'}, 'returns': 'VmDefinition'} ## # @VM.hotunplugNic: # # Remove a network device from a running VM. +# +# @vmID: The UUID of the VM # # @params: The VM UUID and device information # @@ -5016,7 +5192,7 @@ # XXX: Split 'params' into direct parameters ## {'command': {'class': 'VM', 'name': 'hotunplugNic'}, - 'data': {'params': 'HotplugNicParams'}, + 'data': {'vmID': 'UUID', 'params': 'HotplugNicParams'}, 'returns': 'VmDefinition'} ## @@ -5039,6 +5215,8 @@ # # Add a new disk device to a running VM. # +# @vmID: The UUID of the VM +# # @params: The VM UUID and device information # # Returns: @@ -5050,13 +5228,15 @@ # XXX: Split 'params' into direct parameters ## {'command': {'class': 'VM', 'name': 'hotplugDisk'}, - 'data': {'params': 'HotplugDiskParams'}, + 'data': {'vmID': 'UUID', 'params': 'HotplugDiskParams'}, 'returns': 'VmDefinition'} ## # @VM.hotunplugDisk: # # Remove a disk device from a running VM. +# +# @vmID: The UUID of the VM # # @params: The VM UUID and device information # @@ -5068,7 +5248,7 @@ # Notes: ## {'command': {'class': 'VM', 'name': 'hotunplugDisk'}, - 'data': {'params': 'HotplugDiskParams'}, + 'data': {'vmID': 'UUID', 'params': 'HotplugDiskParams'}, 'returns': 'VmDefinition'} ## @@ -5122,6 +5302,8 @@ # # Migrate a VM to a remote host. # +# @vmID: The UUID of the VM +# # @params: Migration parameters # # Since: 4.10.0 @@ -5132,16 +5314,19 @@ # XXX: Split 'params' into direct parameters ## {'command': {'class': 'VM', 'name': 'migrate'}, - 'data': {'params': 'MigrateParams'}} + 'data': {'vmID': 'UUID', 'params': 'MigrateParams'}} ## # @VM.migrateCancel: # # Cancel a currently outgoing migration process. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 ## -{'command': {'class': 'VM', 'name': 'migrateCancel'}} +{'command': {'class': 'VM', 'name': 'migrateCancel'}, + 'data': {'vmID': 'UUID'}} ## # @MigrationCreateState: @@ -5162,6 +5347,8 @@ # # Start a migrating VM on a destination host. # +# @vmID: The UUID of the VM +# # @params: The VM definition # # Returns: @@ -5173,13 +5360,15 @@ # called directly. ## {'command': {'class': 'VM', 'name': 'migrationCreate'}, - 'data': {'params': 'VmDefinition'}, + 'data': {'vmID': 'UUID', 'params': 'VmDefinition'}, 'returns': 'MigrationCreateState'} ## # @VM.monitorCommand: # # Send a command to the qemu monitor. +# +# @vmID: The UUID of the VM # # @command: The command string # @@ -5188,32 +5377,40 @@ # Notes: This function is not implemented. ## {'command': {'class': 'VM', 'name': 'monitorCommand'}, - 'data': {'command': 'str'}} + 'data': {'vmID': 'UUID', 'command': 'str'}} ## # @VM.pause: # # Pause the CPUs of a running VM. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 ## -{'command': {'class': 'VM', 'name': 'pause'}} +{'command': {'class': 'VM', 'name': 'pause'}, + 'data': {'vmID': 'UUID'}} ## # @VM.reset: # # Reset a virtual machine. # +# @vmID: The UUID of the VM +# # Since: 4.10.0 # # Notes: This function is not implemented. ## -{'command': {'class': 'VM', 'name': 'reset'}} +{'command': {'class': 'VM', 'name': 'reset'}, + 'data': {'vmID': 'UUID'}} ## # @VM.sendKeys: # # Send a string of keys to a guest's keyboard. +# +# @vmID: The UUID of the VM # # @keySequence: A sequence of keystrokes to send # @@ -5222,7 +5419,7 @@ # Notes: This function is not implemented. ## {'command': {'class': 'VM', 'name': 'sendKeys'}, - 'data': {'keySequence': 'str'}} + 'data': {'vmID': 'UUID', 'keySequence': 'str'}} ## # @VmTicketConflictAction: @@ -5244,6 +5441,8 @@ # # Set the password to be used to connect to a VM display. # +# @vmID: The UUID of the VM +# # @password: The desired connection password # # @ttl: The number of seconds before the password expires @@ -5255,7 +5454,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'setTicket'}, - 'data': {'password': 'str', 'ttl': 'int', + 'data': {'vmID': 'UUID', 'password': 'str', 'ttl': 'int', 'existingConnAction': 'VmTicketConflictAction', 'params': 'StringMap'}} @@ -5264,6 +5463,8 @@ # # Request a graceful shutdown of a VM. # +# @vmID: The UUID of the VM +# # @delay: #optional Wait a number of seconds before shutting down # # @message: #optional Message to display to VM users before shutting down @@ -5271,7 +5472,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'shutdown'}, - 'data': {'delay': 'int', 'message': 'str'}} + 'data': {'vmID': 'UUID', 'delay': 'int', 'message': 'str'}} ## # @SnapshotVolumeDriveInfo: @@ -5339,17 +5540,21 @@ # # Create a live snapshot of a VM's disks. # +# @vmID: The UUID of the VM +# # @snapDrives: A list of disk snapshot creation instructions # # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'snapshot'}, - 'data': {'snapDrives': ['SnapshotDriveInfo']}} + 'data': {'vmID': 'UUID', 'snapDrives': ['SnapshotDriveInfo']}} ## # @VM.merge: # # Merge VM disk snapshots. +# +# @vmID: The UUID of the VM # # @mergeDrives: A list of drives on which to perform merge operations. Each # entry must have @baseVolumeID set to indicate the new desired @@ -5358,7 +5563,7 @@ # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'merge'}, - 'data': {'mergeDrives': ['VmDiskDevice']}} + 'data': {'vmID': 'UUID', 'mergeDrives': ['VmDiskDevice']}} ## # @MergeStatusCode: @@ -5407,12 +5612,15 @@ # # Check the status of an ongoing snapshot merge operation. # +# @vmID: The UUID of the VM +# # Returns: # Status information for each VM disk # # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'mergeStatus'}, + 'data': {'vmID': 'UUID'}, 'returns': ['MergeStatus']} ## @@ -5420,17 +5628,21 @@ # # Dynamically change the target amount of physical memory allocated to a guest. # -# @target: The target of guest's physical memory size in kibibytes +# @vmID: The UUID of the VM +# +# @target: The target of guest's physical memory size in kibibytes # # Since: 4.10.0 ## {'command': {'class': 'VM', 'name': 'setBalloonTarget'}, - 'data': {'target': 'uint'}} + 'data': {'vmID': 'UUID', 'target': 'uint'}} ## # @VM.diskReplicateStart: # # Start the replication of a disk to a destination. +# +# @vmID: The UUID of the VM # # @srcDisk: A @DriveSpecVolume structure rapresenting the source disk # @@ -5439,12 +5651,15 @@ # Since: 4.11.0 ## {'command': {'class': 'VM', 'name': 'diskReplicateStart'}, - 'data': {'srcDisk': 'DriveSpecVolume', 'dstDisk': 'DriveSpecVolume'}} + 'data': {'vmID': 'UUID', 'srcDisk': 'DriveSpecVolume', + 'dstDisk': 'DriveSpecVolume'}} ## # @VM.diskReplicateFinish: # # Stop the replication of a disk switching to a destination. +# +# @vmID: The UUID of the VM # # @srcDisk: A @DriveSpecVolume structure rapresenting the source disk # @@ -5453,29 +5668,18 @@ # Since: 4.11.0 ## {'command': {'class': 'VM', 'name': 'diskReplicateFinish'}, - 'data': {'srcDisk': 'DriveSpecVolume', 'dstDisk': 'DriveSpecVolume'}} + 'data': {'vmID': 'UUID', 'srcDisk': 'DriveSpecVolume', + 'dstDisk': 'DriveSpecVolume'}} ## Category: @Volume ########################################################### ## # @Volume: # -# Volume API object. -# -# @conn: A connected base API object -# -# @volumeID: The UUID of the Volume -# -# @storagepoolID: The Storage Pool associated with @UUID -# -# @storagedomainID: The Storage Domain associated with @UUID -# -# @imageID: The Image associated with @UUID +# The Volume namespace. # # Since: 4.10.0 ## -{'class': 'Volume', - 'data': {'conn': 'Host', 'volumeID': 'UUID', 'storagepoolID': 'UUID', - 'storagedomainID': 'UUID', 'imageID': 'UUID'}} +{'class': 'Volume'} ## # @VolumeRole: @@ -5529,24 +5733,32 @@ # # Duplicate a volume to produce a new template image. # -# @dstSdUUID: The UUID of the destination Storage Domain +# @volumeID: The UUID of the Volume # -# @dstImgUUID: The UUID of the destination Image +# @storagepoolID: The Storage Pool associated with the Volume # -# @dstVolUUID: The UUID of the destination Volume +# @storagedomainID: The Storage Domain associated with the Volume # -# @desc: Set the destination Volume description +# @imageID: The Image associated with the Volume # -# @volType: (Unused) The role of the destination Volume +# @dstSdUUID: The UUID of the destination Storage Domain # -# @volFormat: The data format to use for the destination Volume +# @dstImgUUID: The UUID of the destination Image # -# @preallocate: The Volume allocation mode +# @dstVolUUID: The UUID of the destination Volume # -# @postZero: If @force is set and @dstVolUUID exists, zero the destination -# Volume before copying new data +# @desc: Set the destination Volume description # -# @force: If @dstVolUUID already exists, overwrite it +# @volType: (Unused) The role of the destination Volume +# +# @volFormat: The data format to use for the destination Volume +# +# @preallocate: The Volume allocation mode +# +# @postZero: If @force is set and @dstVolUUID exists, zero the +# destination Volume before copying new data +# +# @force: If @dstVolUUID already exists, overwrite it # # Returns: # A task UUID @@ -5558,7 +5770,9 @@ # XXX: The @volType parameter is not used ## {'command': {'class': 'Volume', 'name': 'copy'}, - 'data': {'dstSdUUID': 'UUID', 'dstImgUUID': 'UUID', 'dstVolUUID': 'UUID', + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', + 'dstSdUUID': 'UUID', 'dstImgUUID': 'UUID', 'dstVolUUID': 'UUID', 'desc': 'str', 'volType': 'VolumeRole', 'volFormat': 'VolumeFormat', 'preallocate': 'VolumeAllocation', 'postZero': 'bool', 'force': 'bool'}, @@ -5591,19 +5805,27 @@ # # Create a new Volume. # -# @size: The Volume size in sectors +# @volumeID: The UUID of the Volume # -# @volFormat: The data format to use for the destination Volume +# @storagepoolID: The Storage Pool associated with the Volume # -# @preallocate: The Volume allocation mode +# @storagedomainID: The Storage Domain associated with the Volume # -# @diskType: An advisory disk usage type +# @imageID: The Image associated with the Volume # -# @desc: The Volume description +# @size: The Volume size in sectors # -# @srcImgUUID: If specified, create a snapshot from this Image +# @volFormat: The data format to use for the destination Volume # -# @srcVolUUID: If specified, create a snapshot from this Volume +# @preallocate: The Volume allocation mode +# +# @diskType: An advisory disk usage type +# +# @desc: The Volume description +# +# @srcImgUUID: If specified, create a snapshot from this Image +# +# @srcVolUUID: If specified, create a snapshot from this Volume # # Returns: # A task UUID @@ -5611,7 +5833,9 @@ # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'create'}, - 'data': {'size': 'int', 'volFormat': 'VolumeFormat', + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', + 'size': 'int', 'volFormat': 'VolumeFormat', 'preallocate': 'VolumeAllocation', 'diskType': 'DiskType', 'desc': 'str', 'srcImgUUID': 'UUID', 'srcVolUUID': 'UUID'}, 'returns': 'UUID'} @@ -5621,9 +5845,17 @@ # # Delete a Volume. # -# @postZero: Zero Volume data before deletion +# @volumeID: The UUID of the Volume # -# @force: Remove even if @VolumeRole is SHARED or INTERNAL +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# @postZero: Zero Volume data before deletion +# +# @force: Remove even if @VolumeRole is SHARED or INTERNAL # # Returns: # A task UUID @@ -5631,7 +5863,9 @@ # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'delete'}, - 'data': {'postZero': 'bool', 'force': 'bool'}, + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', + 'postZero': 'bool', 'force': 'bool'}, 'returns': 'UUID'} ## @@ -5639,16 +5873,26 @@ # # Increase the size of a Volume. # -# @size: The new desired size (in sectors) +# @volumeID: The UUID of the Volume # -# @isShuttingDown: (Unused) +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# @size: The new desired size (in sectors) +# +# @isShuttingDown: (Unused) # # Since: 4.10.0 # # Notes: Valid for block-based Volumes only ## {'command': {'class': 'Volume', 'name': 'extend'}, - 'data': {'size': 'int', 'isShuttingDown': 'bool'}} + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', + 'size': 'int', 'isShuttingDown': 'bool'}} ## # @VolumeLegality: @@ -5737,12 +5981,22 @@ # # Get information about a Volume. # +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# # Returns: # Volume information # # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'getInfo'}, + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID'}, 'returns': 'VolumeInfo'} ## @@ -5750,12 +6004,22 @@ # # Get the path to the Volume in the host's storage repository. # +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# # Returns: # The Volume's storage repository path # # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'getPath'}, + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID'}, 'returns': 'str'} ## @@ -5777,12 +6041,22 @@ # # Get Volume size information. # +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# # Returns: # Volume size information # # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'getSize'}, + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID'}, 'returns': 'VolumeSizeInfo'} ## @@ -5790,51 +6064,102 @@ # # Make a Volume accessible. # -# @rw: If True, the Volume should be made writeable, otherwise read-only +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# @rw: If True, the Volume should be made writeable, otherwise +# read-only # # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'prepare'}, - 'data': {'rw': 'bool'}} + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', 'rw': 'bool'}} ## # @Volume.refresh: # # Refresh Volume to synchronize changes made by a remote host. # +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# # Since: 4.10.0 ## -{'command': {'class': 'Volume', 'name': 'refresh'}} +{'command': {'class': 'Volume', 'name': 'refresh'}, + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID'}} ## # @Volume.setDescription: # # Set the Volume description field. # -# @description: A human-readable Volume description +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# @description: A human-readable Volume description # # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'setDescription'}, - 'data': {'description': 'str'}} + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', 'description': 'str'}} ## # @Volume.setLegality: # # Set the legality of a Volume. # -# @legality: The new Volume legality +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# @legality: The new Volume legality # # Since: 4.10.0 ## {'command': {'class': 'Volume', 'name': 'setLegality'}, - 'data': {'legality': 'VolumeLegality'}} + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID', + 'legality': 'VolumeLegality'}} ## # @Volume.tearDown: # # Deactivate the Volume and release resources. # +# @volumeID: The UUID of the Volume +# +# @storagepoolID: The Storage Pool associated with the Volume +# +# @storagedomainID: The Storage Domain associated with the Volume +# +# @imageID: The Image associated with the Volume +# +# @legality: The new Volume legality +# # Since: 4.10.0 ## -{'command': {'class': 'Volume', 'name': 'tearDown'}} +{'command': {'class': 'Volume', 'name': 'tearDown'}, + 'data': {'volumeID': 'UUID', 'storagepoolID': 'UUID', + 'storagedomainID': 'UUID', 'imageID': 'UUID'}} -- To view, visit http://gerrit.ovirt.org/10246 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib74950bd3721a23cc2b84f8c860d3aea8144e01e Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <agl(a)us.ibm.com>

4 11

Change in vdsm[master]: vdsm: Add results.log to .gitignore
by masayag＠redhat.com 19 Dec '12

19 Dec '12

Moti Asayag has uploaded a new change for review. Change subject: vdsm: Add results.log to .gitignore ...................................................................... vdsm: Add results.log to .gitignore Change-Id: I5f623af645f5b90a6772f1588e91c1ddd2f81992 Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M .gitignore 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/16/10216/1 diff --git a/.gitignore b/.gitignore index 7b19b9a..9e659f3 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,7 @@ .project .pydevproject .deps/ +results.log INSTALL Makefile Makefile.in -- To view, visit http://gerrit.ovirt.org/10216 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5f623af645f5b90a6772f1588e91c1ddd2f81992 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>

3 14

Change in vdsm[master]: vdsm: Support guest agent selective ip reporting
by masayag＠redhat.com 19 Dec '12

19 Dec '12

Moti Asayag has uploaded a new change for review. Change subject: vdsm: Support guest agent selective ip reporting ...................................................................... vdsm: Support guest agent selective ip reporting The guest agent might not report inet element, therefore processing its input should support it and return an emply ips list instead. Change-Id: I5264058737cc2b53b9bfa22d344bf26c8d269f87 Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M vdsm/guestIF.py 1 file changed, 8 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/14/10214/1 diff --git a/vdsm/guestIF.py b/vdsm/guestIF.py index 96c421b..8ec6f1b 100644 --- a/vdsm/guestIF.py +++ b/vdsm/guestIF.py @@ -136,8 +136,14 @@ for iface in args['interfaces']: iface['name'] = _filterXmlChars(iface['name']) iface['hw'] = _filterXmlChars(iface['hw']) - iface['inet'] = map(_filterXmlChars, iface['inet']) - iface['inet6'] = map(_filterXmlChars, iface['inet6']) + if 'inet' in iface: + iface['inet'] = map(_filterXmlChars, iface['inet']) + else: + iface['inet'] = [] + if 'inet6' in iface: + iface['inet6'] = map(_filterXmlChars, iface['inet6']) + else: + iface['inet6'] = [] interfaces.append(iface) # Provide the old information which includes # only the IP addresses. -- To view, visit http://gerrit.ovirt.org/10214 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5264058737cc2b53b9bfa22d344bf26c8d269f87 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>

3 14

Change in vdsm[master]: vdsm: pep8 cleanups
by masayag＠redhat.com 19 Dec '12

19 Dec '12

Moti Asayag has uploaded a new change for review. Change subject: vdsm: pep8 cleanups ...................................................................... vdsm: pep8 cleanups Change-Id: I481621405ec782e4e6707a16ac06e27e0f4cdffd Signed-off-by: Moti Asayag <masayag(a)redhat.com> --- M tests/guestIFTests.py M vdsm/storage/blockSD.py M vdsm/storage/sd.py 3 files changed, 127 insertions(+), 78 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/15/10215/1 diff --git a/tests/guestIFTests.py b/tests/guestIFTests.py index 7c8d6cf..1d5a731 100644 --- a/tests/guestIFTests.py +++ b/tests/guestIFTests.py @@ -51,7 +51,7 @@ {'name': 'example.ovirt.org'}, {'version': '2.6.32-71.el6.x86_64'}, - {'interfaces':[ + {'interfaces': [ {'hw': '00:21:cc:68:d7:38', 'name': 'eth0', 'inet': ['9.115.122.77'], 'inet6': ['fe80::221:ccff:fe68:d738']}, {'hw': 'a0:88:b4:f0:ce:a0', 'name': 'wlan0', 'inet': @@ -62,9 +62,9 @@ {'applications': ['kernel-2.6.32-71.7.1.el6', 'kernel-2.6.32-220.el6']}, - {'disks':[ + {'disks': [ {'total': 130062397440, 'path': '/', 'fs': 'ext4', - 'used':76402614272}, + 'used': 76402614272}, {'total': 203097088, 'path': '/boot', 'fs': 'ext4', 'used': 153149440}]}] diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 61ec996..b5447cd 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -73,7 +73,8 @@ MAX_PVS_LIMIT = 10 # BZ#648051 MAX_PVS = config.getint('irs', 'maximum_allowed_pvs') if MAX_PVS > MAX_PVS_LIMIT: - log.warning("maximum_allowed_pvs = %d ignored. MAX_PVS = %d", MAX_PVS, MAX_PVS_LIMIT) + log.warning("maximum_allowed_pvs = %d ignored. MAX_PVS = %d", MAX_PVS, + MAX_PVS_LIMIT) MAX_PVS = MAX_PVS_LIMIT PVS_METADATA_SIZE = MAX_PVS * 142 @@ -111,8 +112,10 @@ # Key dec, enc DMDK_PV_REGEX: (decodePVInfo, encodePVInfo), DMDK_VGUUID: (str, str), - DMDK_LOGBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), - DMDK_PHYBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), str), + DMDK_LOGBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), + str), + DMDK_PHYBLKSIZE: (functools.partial(sd.intOrDefault, DEFAULT_BLOCKSIZE), + str), }) INVALID_CHARS = re.compile(r"[^a-zA-Z0-9_+.\-/=!:#]") @@ -173,7 +176,7 @@ res[vPar]['imgs'].append(vImg) return dict((k, sd.ImgsPar(tuple(v['imgs']), v['parent'])) - for k, v in res.iteritems()) + for k, v in res.iteritems()) def deleteVolumes(sdUUID, vols): @@ -193,8 +196,8 @@ count = size / BS cmd = tuple(constants.CMD_LOWPRIO) cmd += (constants.EXT_DD, "oflag=%s" % misc.DIRECTFLAG, "if=/dev/zero", - "of=%s" % lvm.lvPath(sdUUID, volUUID), "bs=%s" % BS, - "count=%s" % count) + "of=%s" % lvm.lvPath(sdUUID, volUUID), "bs=%s" % BS, + "count=%s" % count) p = misc.execCmd(cmd, sudo=False, sync=False) return p @@ -208,7 +211,7 @@ # Prepare for zeroing try: lvm.changelv(sdUUID, volUUIDs, (("-a", "y"), ("--deltag", imgUUID), - ("--addtag", sd.REMOVED_IMAGE_PREFIX + imgUUID))) + ("--addtag", sd.REMOVED_IMAGE_PREFIX + imgUUID))) except se.StorageException as e: log.error("Can't activate or change LV tags in SD %s. " "failing Image %s pre zeroing operation for vols: %s. %s", @@ -250,17 +253,18 @@ proc.returncode, proc.stderr.read(1000)) else: log.debug("%s/%s was zeroed and will be deleted", - sdUUID, volUUID) + sdUUID, volUUID) toDelete.append(vol) if toDelete: try: deleteVolumes(sdUUID, toDelete) except se.CannotRemoveLogicalVolume: # TODO: Add the list of removed fail volumes to the exception. - log.error("Remove failed for some of VG: %s zeroed volumes: %s", - sdUUID, toDelete, exc_info=True) + log.error("Remove failed for some of VG: %s zeroed volumes: " + "%s", sdUUID, toDelete, exc_info=True) - log.debug("finished with VG:%s LVs: %s, img: %s", sdUUID, volUUIDs, imgUUID) + log.debug("finished with VG:%s LVs: %s, img: %s", sdUUID, volUUIDs, + imgUUID) return @@ -289,15 +293,18 @@ newMetadata = set(lines) # Remove all items that do not exist in the new metadata - toRemove = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in currentMetadata.difference(newMetadata)] + toRemove = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in + currentMetadata.difference(newMetadata)] # Add all missing items that do no exist in the old metadata - toAdd = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in newMetadata.difference(currentMetadata)] + toAdd = [self.METADATA_TAG_PREFIX + lvmTagEncode(item) for item in + newMetadata.difference(currentMetadata)] if len(toAdd) == 0 and len(toRemove) == 0: return - self.log.debug("Updating metadata adding=%s removing=%s", ", ".join(toAdd), ", ".join(toRemove)) + self.log.debug("Updating metadata adding=%s removing=%s", + ", ".join(toAdd), ", ".join(toRemove)) lvm.changeVGTags(self._vgName, delTags=toRemove, addTags=toAdd) @@ -346,8 +353,12 @@ f.seek(self._offset) f.write(data) -LvBasedSDMetadata = lambda vg, lv: DictValidator(PersistentDict(LvMetadataRW(vg, lv, 0, SD_METADATA_SIZE)), BLOCK_SD_MD_FIELDS) -TagBasedSDMetadata = lambda vg: DictValidator(PersistentDict(VGTagMetadataRW(vg)), BLOCK_SD_MD_FIELDS) +LvBasedSDMetadata = lambda vg, lv: DictValidator( + PersistentDict(LvMetadataRW(vg, lv, 0, SD_METADATA_SIZE)), + BLOCK_SD_MD_FIELDS) +TagBasedSDMetadata = lambda vg: DictValidator( + PersistentDict(VGTagMetadataRW(vg)), + BLOCK_SD_MD_FIELDS) def selectMetadata(sdUUID): @@ -362,7 +373,8 @@ def metadataValidity(vg): """ Return the metadata validity: - mdathreshold - False if the VG's metadata exceeded its threshold, else True + mdathreshold - False if the VG's metadata exceeded its threshold, + else True mdavalid - False if the VG's metadata size too small, else True """ mdaStatus = {'mdavalid': True, 'mdathreshold': True} @@ -380,7 +392,7 @@ class BlockStorageDomain(sd.StorageDomain): mountpoint = os.path.join(sd.StorageDomain.storage_repository, - sd.DOMAIN_MNT_POINT, sd.BLOCKSD_DIR) + sd.DOMAIN_MNT_POINT, sd.BLOCKSD_DIR) def __init__(self, sdUUID): domaindir = os.path.join(self.mountpoint, sdUUID) @@ -424,12 +436,16 @@ rmanager = rm.ResourceManager.getInstance() # Register lvm activation resource namespace for the underlying VG - lvmActivationFactory = resourceFactories.LvmActivationFactory(self.sdUUID) - lvmActivationNamespace = sd.getNamespace(self.sdUUID, LVM_ACTIVATION_NAMESPACE) + lvmActivationFactory = resourceFactories.LvmActivationFactory( + self.sdUUID) + lvmActivationNamespace = sd.getNamespace(self.sdUUID, + LVM_ACTIVATION_NAMESPACE) try: - rmanager.registerNamespace(lvmActivationNamespace, lvmActivationFactory) + rmanager.registerNamespace(lvmActivationNamespace, + lvmActivationFactory) except Exception: - self.log.warn("Resource namespace %s already registered", lvmActivationNamespace) + self.log.warn("Resource namespace %s already registered", + lvmActivationNamespace) @classmethod def metaSize(cls, vgroup): @@ -439,17 +455,22 @@ # extent size of 128MB. In any case we compute the right size on line. vg = lvm.getVG(vgroup) minmetasize = (SD_METADATA_SIZE / sd.METASIZE * int(vg.extent_size) + - (1024 * 1024 - 1)) / (1024 * 1024) + (1024 * 1024 - 1)) / (1024 * 1024) metaratio = int(vg.extent_size) / sd.METASIZE - metasize = (int(vg.extent_count) * sd.METASIZE + (1024 * 1024 - 1)) / (1024 * 1024) + metasize = (int(vg.extent_count) * sd.METASIZE + + (1024 * 1024 - 1)) / (1024 * 1024) metasize = max(minmetasize, metasize) if metasize > int(vg.free) / (1024 * 1024): - raise se.VolumeGroupSizeError("volume group has not enough extents %s (Minimum %s), VG may be too small" % (vg.extent_count, (1024 * 1024) / sd.METASIZE)) + raise se.VolumeGroupSizeError( + "volume group has not enough extents %s (Minimum %s), VG may " + "be too small" % (vg.extent_count, + (1024 * 1024) / sd.METASIZE)) cls.log.info("size %s MB (metaratio %s)" % (metasize, metaratio)) return metasize @classmethod - def create(cls, sdUUID, domainName, domClass, vgUUID, storageType, version): + def create(cls, sdUUID, domainName, domClass, vgUUID, storageType, + version): """ Create new storage domain 'sdUUID' - Storage Domain UUID 'domainName' - storage domain name @@ -459,8 +480,8 @@ 'version' - DOMAIN_VERSIONS """ cls.log.info("sdUUID=%s domainName=%s domClass=%s vgUUID=%s " - "storageType=%s version=%s", sdUUID, domainName, domClass, vgUUID, - storageType, version) + "storageType=%s version=%s", sdUUID, domainName, domClass, + vgUUID, storageType, version) if not misc.isAscii(domainName) and not sd.supportsUnicode(version): raise se.UnicodeArgumentException() @@ -534,21 +555,25 @@ # Do we really need to keep the VGUUID? # no one reads it from here anyway initialMetadata = { - sd.DMDK_VERSION: version, - sd.DMDK_SDUUID: sdUUID, - sd.DMDK_TYPE: storageType, - sd.DMDK_CLASS: domClass, - sd.DMDK_DESCRIPTION: domainName, - sd.DMDK_ROLE: sd.REGULAR_DOMAIN, - sd.DMDK_POOLS: [], - sd.DMDK_LOCK_POLICY: '', - sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], - sd.DMDK_LEASE_TIME_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], - sd.DMDK_IO_OP_TIMEOUT_SEC: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_IO_OP_TIMEOUT_SEC], - sd.DMDK_LEASE_RETRIES: sd.DEFAULT_LEASE_PARAMS[sd.DMDK_LEASE_RETRIES], - DMDK_VGUUID: vgUUID, - DMDK_LOGBLKSIZE: logBlkSize, - DMDK_PHYBLKSIZE: phyBlkSize, + sd.DMDK_VERSION: version, + sd.DMDK_SDUUID: sdUUID, + sd.DMDK_TYPE: storageType, + sd.DMDK_CLASS: domClass, + sd.DMDK_DESCRIPTION: domainName, + sd.DMDK_ROLE: sd.REGULAR_DOMAIN, + sd.DMDK_POOLS: [], + sd.DMDK_LOCK_POLICY: '', + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], + sd.DMDK_LEASE_TIME_SEC: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_LOCK_RENEWAL_INTERVAL_SEC], + sd.DMDK_IO_OP_TIMEOUT_SEC: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_IO_OP_TIMEOUT_SEC], + sd.DMDK_LEASE_RETRIES: sd.DEFAULT_LEASE_PARAMS[ + sd.DMDK_LEASE_RETRIES], + DMDK_VGUUID: vgUUID, + DMDK_LOGBLKSIZE: logBlkSize, + DMDK_PHYBLKSIZE: phyBlkSize, } initialMetadata.update(mapping) @@ -557,7 +582,8 @@ # Mark VG with Storage Domain Tag try: - lvm.replaceVGTag(vgName, STORAGE_UNREADY_DOMAIN_TAG, STORAGE_DOMAIN_TAG) + lvm.replaceVGTag(vgName, STORAGE_UNREADY_DOMAIN_TAG, + STORAGE_DOMAIN_TAG) except se.StorageException: raise se.VolumeGroupUninitialized(vgName) @@ -603,16 +629,18 @@ 'volFormat' - volume format RAW/QCOW2 'preallocate' - sparse/preallocate """ - blockVolume.BlockVolume.validateCreateVolumeParams(volFormat, preallocate, srcVolUUID) + blockVolume.BlockVolume.validateCreateVolumeParams( + volFormat, preallocate, srcVolUUID) - def createVolume(self, imgUUID, size, volFormat, preallocate, diskType, volUUID, desc, srcImgUUID, srcVolUUID): + def createVolume(self, imgUUID, size, volFormat, preallocate, diskType, + volUUID, desc, srcImgUUID, srcVolUUID): """ Create a new volume """ repoPath = self._getRepoPath() - return blockVolume.BlockVolume.create(repoPath, self.sdUUID, - imgUUID, size, volFormat, preallocate, diskType, - volUUID, desc, srcImgUUID, srcVolUUID) + return blockVolume.BlockVolume.create( + repoPath, self.sdUUID, imgUUID, size, volFormat, preallocate, + diskType, volUUID, desc, srcImgUUID, srcVolUUID) @classmethod def getMetaDataMapping(cls, vgName, oldMapping={}): @@ -620,7 +648,8 @@ firstExtent = int(firstExtent) if firstExtent != 0: cls.log.error("INTERNAL: metadata ext is not 0") - raise se.MetaDataMappingError("vg %s: metadata extent is not the first extent" % vgName) + raise se.MetaDataMappingError("vg %s: metadata extent is not the " + "first extent" % vgName) pvlist = lvm.listPVNames(vgName) @@ -659,7 +688,8 @@ except KeyError: prevInfo = oldMapping["PV%d" % (prevDevNum,)] - mapOffset = int(prevInfo["mapoffset"]) + int(prevInfo["pecount"]) + mapOffset = int(prevInfo["mapoffset"]) + \ + int(prevInfo["pecount"]) pvInfo["mapoffset"] = mapOffset mapping["PV%d" % devNum] = pvInfo @@ -670,7 +700,8 @@ def updateMapping(self): # First read existing mapping from metadata with self._metadata.transaction(): - mapping = self.getMetaDataMapping(self.sdUUID, self.readMetadataMapping()) + mapping = self.getMetaDataMapping(self.sdUUID, + self.readMetadataMapping()) for key in set(self._metadata.keys() + mapping.keys()): if DMDK_PV_REGEX.match(key): if key in mapping: @@ -725,14 +756,16 @@ offset = int(stripPrefix(tag, blockVolume.TAG_PREFIX_MD)) if tag.startswith(blockVolume.TAG_PREFIX_MDNUMBLKS): - size = int(stripPrefix(tag, blockVolume.TAG_PREFIX_MDNUMBLKS)) + size = int(stripPrefix(tag, + blockVolume.TAG_PREFIX_MDNUMBLKS)) if offset is not None and size != blockVolume.VOLUME_MDNUMBLKS: # I've found everything I need break if offset is None: - self.log.warn("Could not find mapping for lv %s/%s", self.sdUUID, lv.name) + self.log.warn("Could not find mapping for lv %s/%s", + self.sdUUID, lv.name) continue occupiedSlots.append((offset, size)) @@ -762,7 +795,8 @@ dev, ext = lvm.getFirstExt(self.sdUUID, vol_name) self.log.debug("vol %s dev %s ext %s" % (vol_name, dev, ext)) for pv in self.readMetadataMapping().values(): - self.log.debug("MAPOFFSET: pv %s -- dev %s ext %s" % (pv, dev, ext)) + self.log.debug("MAPOFFSET: pv %s -- dev %s ext %s" % + (pv, dev, ext)) pestart = int(pv["pestart"]) pecount = int(pv["pecount"]) if (os.path.basename(dev) == pv["guid"] and @@ -770,9 +804,12 @@ offs = int(ext) + int(pv["mapoffset"]) if offs < SD_METADATA_SIZE / sd.METASIZE: - raise se.MetaDataMappingError("domain %s: vol %s MD offset %s is bad - will overwrite SD's MD" % (self.sdUUID, vol_name, offs)) + raise se.MetaDataMappingError( + "domain %s: vol %s MD offset %s is bad - will " + "overwrite SD's MD" % (self.sdUUID, vol_name, offs)) return offs - raise se.MetaDataMappingError("domain %s: can't map PV %s ext %s" % (self.sdUUID, dev, ext)) + raise se.MetaDataMappingError("domain %s: can't map PV %s ext %s" % + (self.sdUUID, dev, ext)) def readMetadataMapping(self): meta = self.getMetadata() @@ -871,7 +908,8 @@ try: lvm.removeLVs(sdUUID, lv.name) except se.CannotRemoveLogicalVolume, e: - cls.log.warning("Remove logical volume failed %s/%s %s", sdUUID, lv.name, str(e)) + cls.log.warning("Remove logical volume failed %s/%s %s", + sdUUID, lv.name, str(e)) lvm.removeVG(sdUUID) return True @@ -918,7 +956,7 @@ # Drop non image tags and strip prefix taglen = len(blockVolume.TAG_PREFIX_IMAGE) images = [i[taglen:] for i in tags - if i.startswith(blockVolume.TAG_PREFIX_IMAGE)] + if i.startswith(blockVolume.TAG_PREFIX_IMAGE)] return images def rmDCVolLinks(self, imgPath, volsImgs): @@ -947,7 +985,7 @@ def deleteImage(self, sdUUID, imgUUID, volsImgs): toDel = tuple(vName for vName, v in volsImgs.iteritems() - if v.imgs[0] == imgUUID) + if v.imgs[0] == imgUUID) deleteVolumes(sdUUID, toDel) self.rmDCImgDir(imgUUID, volsImgs) @@ -984,8 +1022,8 @@ if self.hasVolumeLeases(): # TODO: use the sanlock specific offset when present leaseSlot = self.produceVolume(imgUUID, volUUID).getMetaOffset() - leaseOffset = ((leaseSlot + blockVolume.RESERVED_LEASES) - * self.logBlkSize * sd.LEASE_BLOCKS) + leaseOffset = ((leaseSlot + blockVolume.RESERVED_LEASES) * + self.logBlkSize * sd.LEASE_BLOCKS) return self.getLeasesFilePath(), leaseOffset return None, None @@ -1024,8 +1062,8 @@ # to the public the code that created ext2 file system instead of ext3. # In order to make up for it we are trying to add journal here, just # to be sure (and we have fixed the file system creation). - # If there is a journal already tune2fs will do nothing, indicating this - # condition only with exit code. However, we do not really care. + # If there is a journal already tune2fs will do nothing, indicating + # this condition only with exit code. However, we do not really care. cmd = [constants.EXT_TUNE2FS, "-j", masterfsdev] misc.execCmd(cmd, sudo=True) @@ -1037,7 +1075,8 @@ rc, out = ex raise se.BlockStorageDomainMasterMountError(masterfsdev, rc, out) - cmd = [constants.EXT_CHOWN, "%s:%s" % (constants.METADATA_USER, constants.METADATA_GROUP), masterDir] + cmd = [constants.EXT_CHOWN, "%s:%s" % + (constants.METADATA_USER, constants.METADATA_GROUP), masterDir] (rc, out, err) = misc.execCmd(cmd, sudo=True) if rc != 0: self.log.error("failed to chown %s", masterDir) @@ -1088,12 +1127,14 @@ try: vgName = masterDir.rsplit("/", 2)[1] - masterDev = os.path.join("/dev/mapper", vgName.replace("-", "--") + "-" + MASTERLV) + masterDev = os.path.join( + "/dev/mapper", vgName.replace("-", "--") + "-" + MASTERLV) except KeyError: # Umount succeeded after all return - cls.log.warn("master mount resource is `%s`, trying to disconnect underlying storage", masterDev) + cls.log.warn("master mount resource is `%s`, trying to disconnect " + "underlying storage", masterDev) iscsi.disconnectFromUndelyingStorage(masterDev) @classmethod @@ -1101,7 +1142,8 @@ """ Unmount the master metadata file system. Should be called only by SPM. """ - # fuser processes holding mount point and validate that the umount succeeded + # fuser processes holding mount point and validate that the umount + # succeeded cls.__handleStuckUmount(masterdir) try: masterMount = mount.getMountFromTarget(masterdir) @@ -1123,7 +1165,8 @@ return if len(pids) == 0: - cls.log.warn("Unmount failed because of errors that fuser can't solve") + cls.log.warn("Unmount failed because of errors that fuser " + "can't solve") else: for pid in pids: try: @@ -1132,12 +1175,17 @@ except OSError, e: if e.errno == errno.ESRCH: # No such process pass - elif e.errno == errno.EPERM: # Operation not permitted - cls.log.warn("Could not kill pid %d because operation was not permitted", pid) + elif e.errno == errno.EPERM: # Op. not permitted + cls.log.warn("Could not kill pid %d because " + "operation was not permitted", + pid) else: - cls.log.warn("Could not kill pid %d because an unexpected error", exc_info=True) + cls.log.warn("Could not kill pid %d because an" + " unexpected error", + exc_info=True) except: - cls.log.warn("Could not kill pid %d because an unexpected error", exc_info=True) + cls.log.warn("Could not kill pid %d because an " + "unexpected error", exc_info=True) # Try umount, take 2 try: @@ -1178,7 +1226,8 @@ def extendVolume(self, volumeUUID, size, isShuttingDown=None): self._extendlock.acquire() try: - lvm.extendLV(self.sdUUID, volumeUUID, size) # , isShuttingDown) # FIXME + # FIXME: following line. + lvm.extendLV(self.sdUUID, volumeUUID, size) # , isShuttingDown) finally: self._extendlock.release() diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index 1b11017..cfb46a0 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -634,7 +634,7 @@ """ Get 'images' directory from Iso domain """ - return os.path.join(self.domaindir, DOMAIN_IMAGES, ISO_IMAGE_UUID) + return os.path.join(self.domaindir, DOMAIN_IMAGES, ISO_IMAGE_UUID) def supportsUnicode(self): return supportsUnicode(self.getVersion()) -- To view, visit http://gerrit.ovirt.org/10215 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I481621405ec782e4e6707a16ac06e27e0f4cdffd Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Moti Asayag <masayag(a)redhat.com>

3 9

Change in vdsm[master]: Handling removing file Exceptions.
by ewarszaw＠redhat.com 19 Dec '12

19 Dec '12

Eduardo has uploaded a new change for review. Change subject: Handling removing file Exceptions. ...................................................................... Handling removing file Exceptions. Change-Id: If76e158ad69921d382e3d42ae45486534b9379f9 Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/utils.py 1 file changed, 7 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/25/8625/1 diff --git a/vdsm/utils.py b/vdsm/utils.py index 0dbb342..c6e8514 100644 --- a/vdsm/utils.py +++ b/vdsm/utils.py @@ -61,8 +61,13 @@ """ try: os.unlink(fileToRemove) - except: - pass + except OSError as e: + if e.errno == errno.ENOENT: + logging.warning("File: %s already removed", fileToRemove) + else: + logging.error("Removing file: %s failed", fileToRemove, + exc_info=True) + raise def readMemInfo(): """ -- To view, visit http://gerrit.ovirt.org/8625 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If76e158ad69921d382e3d42ae45486534b9379f9 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

8 15

← Newer
1
...
28
29
30
31
32
33
34
...
41
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches December 2012