Allon Mureinik has uploaded a new change for review. Change subject: api: Mandate force param in createVG ......................................................................
api: Mandate force param in createVG vdsm 4.10 introduced a new parameter, "force" top the createVG verb to be used by the engine in 3.1 and newer data centers (see commit f4304e2). As VDSM no long supports 3.0 DCs (see commit 9185d7e), there's no point in keeping this this parameter optional, as the engine always sends it. Change-Id: I56deb0ffa0f3051464868ebeacfe7080aa292c34 Signed-off-by: Allon Mureinik <[email protected]> --- M lib/api/vdsmapi-schema.json M lib/vdsm/rpc/bindingxmlrpc.py M tests/functional/storageTests.py M vdsm/API.py M vdsm/storage/hsm.py 5 files changed, 6 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/99/54899/1 diff --git a/lib/api/vdsmapi-schema.json b/lib/api/vdsmapi-schema.json index d83aa4a..da58cc3 100644 --- a/lib/api/vdsmapi-schema.json +++ b/lib/api/vdsmapi-schema.json @@ -5382,8 +5382,7 @@ # # @devlist: An array of device names to include in the Volume Group # -# @force: #optional Force the operation and do not perform any -# validation +# @force: Force the operation and do not perform any validation # # Returns: # The uuid of the created Volume Group @@ -5395,7 +5394,7 @@ ## {'command': {'class': 'LVMVolumeGroup', 'name': 'create'}, 'data': {'*lvmvolumegroupID': 'UUID', 'name': 'UUID', - 'devlist': ['str'], '*force': 'bool'}, + 'devlist': ['str'], 'force': 'bool'}, 'returns': 'UUID'} ## diff --git a/lib/vdsm/rpc/bindingxmlrpc.py b/lib/vdsm/rpc/bindingxmlrpc.py index 8850634..10eca62 100644 --- a/lib/vdsm/rpc/bindingxmlrpc.py +++ b/lib/vdsm/rpc/bindingxmlrpc.py @@ -968,7 +968,7 @@ con['user'], con['password']) return iscsiConn.discoverSendTargets() - def vgCreate(self, name, devlist, force=False): + def vgCreate(self, name, devlist, force): vg = API.LVMVolumeGroup(self.cif) return vg.create(name, devlist, force) diff --git a/tests/functional/storageTests.py b/tests/functional/storageTests.py index c5be7e6..4d0f11a 100644 --- a/tests/functional/storageTests.py +++ b/tests/functional/storageTests.py @@ -438,7 +438,7 @@ return connections def _createVG(self, vgName, devName, rollback): - r = self.s.createVG(vgName, [devName]) + r = self.s.createVG(vgName, [devName], False) self.asserts.assertVdsOK(r) vgid = r['uuid'] rollback.prependDefer( diff --git a/vdsm/API.py b/vdsm/API.py index 077d875..b92e027 100644 --- a/vdsm/API.py +++ b/vdsm/API.py @@ -956,7 +956,7 @@ APIBase.__init__(self) self._UUID = lvmvolumegroupID - def create(self, name, devlist, force=False): + def create(self, name, devlist, force): return self._irs.createVG(name, devlist, force) def getInfo(self): diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 86c7281..2b4b21d 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -2104,7 +2104,7 @@ return {'visible': visibility} @public - def createVG(self, vgname, devlist, force=False, options=None): + def createVG(self, vgname, devlist, force, options=None): """ Creates a volume group with the name 'vgname' out of the devices in 'devlist' -- To view, visit https://gerrit.ovirt.org/54899 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I56deb0ffa0f3051464868ebeacfe7080aa292c34 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Allon Mureinik <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
