Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

After add/remove_pool execute Pool.setup/destroy

Browse Source
This commit is contained in:
Bahtiar `kalkin-` Gadimov 2016-04-15 20:31:56 +02:00
parent 9674d03088
commit 97d04791b7
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qubes/__init__.py
View File

@ -1492,13 +1492,19 @@ class Qubes(PropertyHolder):
def add_pool(self, **kwargs): def add_pool(self, **kwargs):
""" Add a storage pool to config.""" """ Add a storage pool to config."""
name = kwargs['name'] name = kwargs['name']
self.pools[name] = self._get_pool(**kwargs) assert name not in self.pools.keys(), \
"Pool named %s already exists" % name
pool = self._get_pool(**kwargs)
pool.setup()
self.pools[name] = pool
self.save() self.save()
def remove_pool(self, name): def remove_pool(self, name):
""" Remove a storage pool from config file. """ """ Remove a storage pool from config file. """
try: try:
pool = self.pools[name]
del self.pools[name] del self.pools[name]
pool.destroy()
except KeyError: except KeyError:
return return

13
qubes/storage/__init__.py
View File

@ -23,7 +23,6 @@
# with this program; if not, write to the Free Software Foundation, Inc., # with this program; if not, write to the Free Software Foundation, Inc.,
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
# #
""" Qubes storage system""" """ Qubes storage system"""
from __future__ import absolute_import from __future__ import absolute_import
@ -164,7 +163,8 @@ class Storage(object):
pool = self.get_pool(target) pool = self.get_pool(target)
source = src_vm.volumes[name] source = src_vm.volumes[name]
volume = pool.clone(source, target) volume = pool.clone(source, target)
assert volume, "%s.clone() returned '%s'" % (pool.__class__, volume) assert volume, "%s.clone() returned '%s'" % (pool.__class__,
volume)
self.vm.volumes[name] = volume self.vm.volumes[name] = volume
# TODO migrate this # TODO migrate this
@ -236,6 +236,7 @@ class Pool(object):
# :pylint: disable=unused-argument # :pylint: disable=unused-argument
assert name, "Pool name is missing" assert name, "Pool name is missing"
self.name = name self.name = name
kwargs['name'] = self.name
def create(self, volume, source_volume): def create(self, volume, source_volume):
''' Create the given volume on disk or copy from provided ''' Create the given volume on disk or copy from provided
@ -261,6 +262,10 @@ class Pool(object):
raise NotImplementedError("Pool %s has clone() not implemented" % raise NotImplementedError("Pool %s has clone() not implemented" %
self.name) self.name)
def destroy(self):
raise NotImplementedError("Pool %s has destroy() not implemented" %
self.name)
def remove(self, volume): def remove(self, volume):
''' Remove volume''' ''' Remove volume'''
raise NotImplementedError("Pool %s has remove() not implemented" % raise NotImplementedError("Pool %s has remove() not implemented" %
@ -271,6 +276,10 @@ class Pool(object):
raise NotImplementedError("Pool %s has start() not implemented" % raise NotImplementedError("Pool %s has start() not implemented" %
self.name) self.name)
def setup(self):
raise NotImplementedError("Pool %s has setup() not implemented" %
self.name)
def stop(self, volume): def stop(self, volume):
''' Do what ever is needed on stop''' ''' Do what ever is needed on stop'''
raise NotImplementedError("Pool %s has stop() not implemented" % raise NotImplementedError("Pool %s has stop() not implemented" %