From: Daniel Henrique Barboza<danielhb(a)linux.vnet.ibm.com> Added a new update parameter to storagepool resource. Changed the logic in the model to accept any update parameter ('autostart' or 'disks'). 'disks' parameter will add disks/partitions to the target LVM pool.

Signed-off-by: Daniel Henrique Barboza<danielhb(a)linux.vnet.ibm.com> --- src/kimchi/control/storagepools.py | 2 +- src/kimchi/model/storagepools.py | 35 +++++++++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/src/kimchi/control/storagepools.py b/src/kimchi/control/storagepools.py index ae5185c..af10acd 100644 --- a/src/kimchi/control/storagepools.py +++ b/src/kimchi/control/storagepools.py @@ -80,7 +80,7 @@ class StoragePools(Collection): class StoragePool(Resource): def __init__(self, model, ident): super(StoragePool, self).__init__(model, ident) - self.update_params = ["autostart"] + self.update_params = ["autostart", "disks"] self.uri_fmt = "/storagepools/%s" self.activate = self.generate_action_handler('activate') self.deactivate = self.generate_action_handler('deactivate') diff --git a/src/kimchi/model/storagepools.py b/src/kimchi/model/storagepools.py index 233a8a7..89cb61f 100644 --- a/src/kimchi/model/storagepools.py +++ b/src/kimchi/model/storagepools.py @@ -28,7 +28,7 @@ from kimchi.exception import InvalidOperation, MissingParameter from kimchi.exception import NotFoundError, OperationFailed from kimchi.model.libvirtstoragepool import StoragePoolDef from kimchi.utils import add_task, kimchi_log - +from kimchi.utils import run_command ISO_POOL_NAME = u'kimchi_isos' POOL_STATE_MAP = {0: 'inactive', @@ -200,15 +200,34 @@ class StoragePoolModel(object): pass return res + def _update_lvm_disks(self, pool_name, disks): + vgextend_cmd = ["vgextend", pool_name] + vgextend_cmd += disks + output, error, returncode = run_command(vgextend_cmd) + if returncode != 0: + kimchi_log.error('Could not add disks to pool %s, ' + 'error: %s', pool_name, error) + raise OperationFailed('Error while adding disks to pool %s.', + pool_name) + pool_refresh_cmd = ["virsh", "pool-refresh", pool_name]

+ output, error, returncode = run_command(pool_refresh_cmd) + if returncode != 0: + kimchi_log.error('Could not refresh pool %s using libvirt, ' + 'error: %s', pool_name, error) + raise OperationFailed('Error while refreshing pool %s ' + 'using libvirt.', pool_name) + def update(self, name, params): - autostart = params['autostart'] - if autostart not in [True, False]: - raise InvalidOperation("Autostart flag must be true or false") pool = self.get_storagepool(name, self.conn) - if autostart: - pool.setAutostart(1) - else: - pool.setAutostart(0) + if 'autostart' in params: + if params['autostart'] not in [True, False]: + raise InvalidOperation("Autostart flag must be true or false") + if params['autostart']: + pool.setAutostart(1) + else: + pool.setAutostart(0)

+ if 'disks' in params: + self._update_lvm_disks(name, params['disks']) ident = pool.name() return ident

a minor comment below On 02/07/2014 08:53 PM, Daniel Barboza wrote: > From: Daniel Henrique Barboza<danielhb(a)linux.vnet.ibm.com> > > Added a new update parameter to storagepool resource. Changed the > logic in the model to accept any update parameter ('autostart' or > 'disks'). 'disks' parameter will add disks/partitions to the > target LVM pool. need to update API.json? > Signed-off-by: Daniel Henrique Barboza<danielhb(a)linux.vnet.ibm.com> > --- > src/kimchi/control/storagepools.py | 2 +- > src/kimchi/model/storagepools.py | 35 > +++++++++++++++++++++++++++-------- > 2 files changed, 28 insertions(+), 9 deletions(-) > > diff --git a/src/kimchi/control/storagepools.py > b/src/kimchi/control/storagepools.py > index ae5185c..af10acd 100644 > --- a/src/kimchi/control/storagepools.py > +++ b/src/kimchi/control/storagepools.py > @@ -80,7 +80,7 @@ class StoragePools(Collection): > class StoragePool(Resource): > def __init__(self, model, ident): > super(StoragePool, self).__init__(model, ident) > - self.update_params = ["autostart"] > + self.update_params = ["autostart", "disks"] > self.uri_fmt = "/storagepools/%s" > self.activate = self.generate_action_handler('activate') > self.deactivate = self.generate_action_handler('deactivate') > diff --git a/src/kimchi/model/storagepools.py > b/src/kimchi/model/storagepools.py > index 233a8a7..89cb61f 100644 > --- a/src/kimchi/model/storagepools.py > +++ b/src/kimchi/model/storagepools.py > @@ -28,7 +28,7 @@ from kimchi.exception import InvalidOperation, > MissingParameter > from kimchi.exception import NotFoundError, OperationFailed > from kimchi.model.libvirtstoragepool import StoragePoolDef > from kimchi.utils import add_task, kimchi_log > - > +from kimchi.utils import run_command > > ISO_POOL_NAME = u'kimchi_isos' > POOL_STATE_MAP = {0: 'inactive', > @@ -200,15 +200,34 @@ class StoragePoolModel(object): > pass > return res > > + def _update_lvm_disks(self, pool_name, disks): > + vgextend_cmd = ["vgextend", pool_name] > + vgextend_cmd += disks > + output, error, returncode = run_command(vgextend_cmd) > + if returncode != 0: > + kimchi_log.error('Could not add disks to pool %s, ' > + 'error: %s', pool_name, error) > + raise OperationFailed('Error while adding disks to pool > %s.', > + pool_name) > + pool_refresh_cmd = ["virsh", "pool-refresh", pool_name] src/kimchi/model/storagepools.py: pool = self.get_storagepool(pool_name , self.conn) pool.refresh(0) > + output, error, returncode = run_command(pool_refresh_cmd) > + if returncode != 0: > + kimchi_log.error('Could not refresh pool %s using > libvirt, ' > + 'error: %s', pool_name, error) > + raise OperationFailed('Error while refreshing pool %s ' > + 'using libvirt.', pool_name) > + > def update(self, name, params): > - autostart = params['autostart'] > - if autostart not in [True, False]: > - raise InvalidOperation("Autostart flag must be true or > false") > pool = self.get_storagepool(name, self.conn) > - if autostart: > - pool.setAutostart(1) > - else: > - pool.setAutostart(0) > + if 'autostart' in params: > + if params['autostart'] not in [True, False]: > + raise InvalidOperation("Autostart flag must be true > or false") > + if params['autostart']: > + pool.setAutostart(1) > + else: > + pool.setAutostart(0) do you need to check this pool is a logical pool here as you docs says. * disks: Adds one or more disks to the pool (for 'logical' pool only)

> + if 'disks' in params: > + self._update_lvm_disks(name, params['disks']) > ident = pool.name() > return ident >

On 02/07/2014 10:53 AM, Daniel Barboza wrote: > From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; > > Added a new update parameter to storagepool resource. Changed the > logic in the model to accept any update parameter ('autostart' or > 'disks'). 'disks' parameter will add disks/partitions to the > target LVM pool. > > Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; > --- > src/kimchi/control/storagepools.py | 2 +- > src/kimchi/model/storagepools.py | 35 > +++++++++++++++++++++++++++-------- > 2 files changed, 28 insertions(+), 9 deletions(-) > > diff --git a/src/kimchi/control/storagepools.py > b/src/kimchi/control/storagepools.py > index ae5185c..af10acd 100644 > --- a/src/kimchi/control/storagepools.py > +++ b/src/kimchi/control/storagepools.py > @@ -80,7 +80,7 @@ class StoragePools(Collection): > class StoragePool(Resource): > def __init__(self, model, ident): > super(StoragePool, self).__init__(model, ident) > - self.update_params = ["autostart"] > + self.update_params = ["autostart", "disks"] > self.uri_fmt = "/storagepools/%s" > self.activate = self.generate_action_handler('activate') > self.deactivate = self.generate_action_handler('deactivate') > diff --git a/src/kimchi/model/storagepools.py > b/src/kimchi/model/storagepools.py > index 233a8a7..89cb61f 100644 > --- a/src/kimchi/model/storagepools.py > +++ b/src/kimchi/model/storagepools.py > @@ -28,7 +28,7 @@ from kimchi.exception import InvalidOperation, > MissingParameter > from kimchi.exception import NotFoundError, OperationFailed > from kimchi.model.libvirtstoragepool import StoragePoolDef > from kimchi.utils import add_task, kimchi_log > - > +from kimchi.utils import run_command > > ISO_POOL_NAME = u'kimchi_isos' > POOL_STATE_MAP = {0: 'inactive', > @@ -200,15 +200,34 @@ class StoragePoolModel(object): > pass > return res > > + def _update_lvm_disks(self, pool_name, disks): You need to verify the disks. Are all those exists in system? Remember that we can always use the REST API direclty > + vgextend_cmd = ["vgextend", pool_name] > + vgextend_cmd += disks > + output, error, returncode = run_command(vgextend_cmd) > + if returncode != 0: > + kimchi_log.error('Could not add disks to pool %s, ' > + 'error: %s', pool_name, error) > + raise OperationFailed('Error while adding disks to pool > %s.', > + pool_name) > + pool_refresh_cmd = ["virsh", "pool-refresh", pool_name] > + output, error, returncode = run_command(pool_refresh_cmd) > + if returncode != 0: > + kimchi_log.error('Could not refresh pool %s using > libvirt, ' > + 'error: %s', pool_name, error) > + raise OperationFailed('Error while refreshing pool %s ' > + 'using libvirt.', pool_name) pool = StoragePoolModel.get_storagepool(poll_name) pool.refresh(0) > + > def update(self, name, params): > - autostart = params['autostart'] > - if autostart not in [True, False]: > - raise InvalidOperation("Autostart flag must be true or > false") > pool = self.get_storagepool(name, self.conn) > - if autostart: > - pool.setAutostart(1) > - else: > - pool.setAutostart(0) > + if 'autostart' in params: > + if params['autostart'] not in [True, False]: > + raise InvalidOperation("Autostart flag must be true > or false") > + if params['autostart']: > + pool.setAutostart(1) > + else: > + pool.setAutostart(0) > + if 'disks' in params: > + self._update_lvm_disks(name, params['disks']) > ident = pool.name() > return ident >

From: Daniel Henrique Barboza&lt;danielhb(a)linux.vnet.ibm.com&gt;

Signed-off-by: Daniel Henrique Barboza&lt;danielhb(a)linux.vnet.ibm.com&gt; --- docs/API.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/API.md b/docs/API.md index 580728c..48a293f 100644 --- a/docs/API.md +++ b/docs/API.md @@ -319,7 +319,10 @@ A interface represents available network interface on VM. * path: export path of this storage pool(for 'netfs' pool) * **PUT**: Set whether the Storage Pool should be enabled automatically when the system boots - * autostart: Toggle the autostart flag of the VM + * autostart: Toggle the autostart flag of the VM. This flag sets whether + the Storage Pool should be enabled automatically when the + system boots + * disks: Adds one or more disks to the pool (for 'logical' pool only) * **DELETE**: Remove the Storage Pool * **POST**: *See Storage Pool Actions*

On 02/07/2014 10:53 AM, Daniel Barboza wrote: > From: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; > > Signed-off-by: Daniel Henrique Barboza <danielhb(a)linux.vnet.ibm.com&gt; > --- > src/kimchi/mockmodel.py | 12 ++++++------ > 1 file changed, 6 insertions(+), 6 deletions(-) > > diff --git a/src/kimchi/mockmodel.py b/src/kimchi/mockmodel.py > index 4e276eb..5303bda 100644 > --- a/src/kimchi/mockmodel.py > +++ b/src/kimchi/mockmodel.py > @@ -316,12 +316,12 @@ class MockModel(object): > return storagepool.info > > def storagepool_update(self, name, params): > - autostart = params['autostart'] > - if autostart not in [True, False]: > - raise InvalidOperation("Autostart flag must be true or > false") > - storagepool = self._get_storagepool(name) > - storagepool.info['autostart'] = autostart > - ident = storagepool.name > + pool = self._get_storagepool(name) > + if 'autostart' in params: > + if params['autostart'] not in [True, False]: > + raise InvalidOperation("Autostart flag must be true > or false") > + pool.info['autostart'] = params['autostart'] > + ident = pool.name What about the 'disks' for logical pool?

> return ident > > def storagepool_activate(self, name):