Change in vdsm[master]: vdsm: removed optional markers for volUUID

cshereme at redhat.com cshereme at redhat.com
Fri Mar 6 00:33:51 UTC 2015


Candace Sheremeta has uploaded a new change for review.

Change subject: vdsm: removed optional markers for volUUID
......................................................................

vdsm: removed optional markers for volUUID

after examining the code, it's clear that the volUUID parameter
for vdsClient's prepareImage command is NOT optional. therefore,
I have removed any comments marking it as optional in the
vdsClient documentation and in vdsmapi-schema.json

Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1115556
Change-Id: Ic88bc322bbf84bf79e51edd714687565b123a9c8
Signed-off-by: Candace Sheremeta <cshereme at redhat.com>
---
M client/vdsClient.py
M vdsm/rpc/vdsmapi-schema.json
2 files changed, 3 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/40/38440/1

diff --git a/client/vdsClient.py b/client/vdsClient.py
index 07dbaa2..c8aa7cf 100644
--- a/client/vdsClient.py
+++ b/client/vdsClient.py
@@ -2595,7 +2595,7 @@
             'methodArgs.'
         )),
         'prepareImage': (serv.prepareImage, (
-            '<spUUID> <sdUUID> <imgUUID> [<volUUID>]',
+            '<spUUID> <sdUUID> <imgUUID> <volUUID>',
             'Prepare an image, making the needed volumes available.'
         )),
         'teardownImage': (serv.teardownImage, (
diff --git a/vdsm/rpc/vdsmapi-schema.json b/vdsm/rpc/vdsmapi-schema.json
index 1d919e8..5b99aaa 100644
--- a/vdsm/rpc/vdsmapi-schema.json
+++ b/vdsm/rpc/vdsmapi-schema.json
@@ -4715,13 +4715,13 @@
 #
 # @imageID:          The UUID of the Image
 #
-# @volumeID:         #optional The UUID of the Volume (optional)
+# @volumeID:         The UUID of the Volume
 #
 # Since: 4.15.0
 ##
 {'command': {'class': 'Image', 'name': 'prepare'},
  'data': {'storagepoolID': 'UUID', 'storagedomainID': 'UUID',
-          'imageID': 'UUID', '*volumeID': 'UUID'}}
+          'imageID': 'UUID', 'volumeID': 'UUID'}}
 
 ##
 # @Image.teardown:


-- 
To view, visit https://gerrit.ovirt.org/38440
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic88bc322bbf84bf79e51edd714687565b123a9c8
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Candace Sheremeta <cshereme at redhat.com>


More information about the vdsm-patches mailing list