storage: drop 'internal' and 'removable' volume properties

Since dynamic volumes (qvm-block) are moved to devices API, those two
are not needed anymore.

QubesOS/qubes-issues#2256

qubes/api/admin.py

@@ -261,7 +261,7 @@ def vm_volume_info(self):
         volume = self.dest.volumes[self.arg]
         # properties defined in API
         volume_properties = [
-            'pool', 'vid', 'size', 'usage', 'rw', 'internal', 'source',
+            'pool', 'vid', 'size', 'usage', 'rw', 'source',
             'save_on_stop', 'snap_on_start']
         return ''.join('{}={}\n'.format(key, getattr(volume, key)) for key in
             volume_properties)

qubes/storage/__init__.py

@@ -82,18 +82,14 @@ class Volume(object):
     #: for sparse volumes
     usage = 0
 
-    def __init__(self, name, pool, vid, internal=False, removable=False,
+    def __init__(self, name, pool, vid,
             revisions_to_keep=0, rw=False, save_on_stop=False, size=0,
             snap_on_start=False, source=None, **kwargs):
         ''' Initialize a volume.
 
             :param str name: The name of the volume inside owning domain
             :param Pool pool: The pool object
             :param str vid:  Volume identifier needs to be unique in pool
-            :param bool internal: If `True` volume is hidden when qvm-block ls
-                is used
-            :param bool removable: If `True` volume can be detached from vm at
-                run time
             :param int revisions_to_keep: Amount of revisions to keep around
             :param bool rw: If true volume will be mounted read-write
             :param bool snap_on_start: Create a snapshot from source on
@@ -125,8 +121,6 @@ def __init__(self, name, pool, vid, internal=False, removable=False,
         self.name = str(name)
         #: :py:class:`Pool` instance owning this volume
         self.pool = pool
-        self.internal = internal
-        self.removable = removable
         #: How many revisions of the volume to keep. Each revision is created
         #  at :py:meth:`stop`, if :py:attr:`save_on_stop` is True
         self.revisions_to_keep = int(revisions_to_keep)
@@ -317,8 +311,6 @@ def config(self):
             'name': self.name,
             'pool': str(self.pool),
             'vid': self.vid,
-            'internal': self.internal,
-            'removable': self.removable,
             'revisions_to_keep': self.revisions_to_keep,
             'rw': self.rw,
             'save_on_stop': self.save_on_stop,
@@ -382,6 +374,9 @@ def init_volume(self, name, volume_config):
             pool = getattr(self.vm.app, 'default_pool_' + name)
         else:
             pool = self.vm.app.get_pool(volume_config['pool'])
+        if 'internal' in volume_config:
+            # migrate old config
+            del volume_config['internal']
         volume = pool.init_volume(self.vm, volume_config)
         self.vm.volumes[name] = volume
         return volume

qubes/storage/kernels.py

@@ -167,7 +167,6 @@ def volumes(self):
                              kernel_version,
                              pool=self,
                              name=kernel_version,
-                             internal=True,
                              rw=False
                              )
                 for kernel_version in os.listdir(self.dir_path)]

qubes/tests/api_admin.py

@@ -37,7 +37,7 @@
 
 # properties defined in API
 volume_properties = [
-    'pool', 'vid', 'size', 'usage', 'rw', 'internal', 'source',
+    'pool', 'vid', 'size', 'usage', 'rw', 'source',
     'save_on_stop', 'snap_on_start']
 
 

qubes/tests/integ/storage.py

@@ -59,7 +59,6 @@ def _test_000_volatile(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'save_on_stop': False,
             'rw': True,
         }
@@ -91,7 +90,6 @@ def _test_001_non_volatile(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'save_on_stop': True,
             'rw': True,
         }
@@ -126,7 +124,6 @@ def _test_002_read_only(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'save_on_stop': False,
             'rw': False,
         }
@@ -157,7 +154,6 @@ def _test_003_snapshot(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'save_on_stop': True,
             'rw': True,
         }
@@ -166,7 +162,6 @@ def _test_003_snapshot(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'snap_on_start': True,
             'source': testvol.vid,
             'rw': True,
@@ -225,7 +220,6 @@ def _test_004_snapshot_non_persistent(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'save_on_stop': True,
             'rw': True,
         }
@@ -234,7 +228,6 @@ def _test_004_snapshot_non_persistent(self):
         volume_config = {
             'pool': self.pool.name,
             'size': size,
-            'internal': False,
             'snap_on_start': True,
             'source': testvol.vid,
             'rw': True,

qubes/vm/appvm.py

@@ -49,7 +49,6 @@ class AppVM(qubes.vm.qubesvm.QubesVM):
                 'save_on_stop': False,
                 'rw': False,
                 'source': None,
-                'internal': True
             },
             'private': {
                 'name': 'private',
@@ -58,15 +57,13 @@ class AppVM(qubes.vm.qubesvm.QubesVM):
                 'save_on_stop': True,
                 'rw': True,
                 'size': defaults['private_img_size'],
-                'internal': True
             },
             'volatile': {
                 'name': 'volatile',
                 'pool': 'default',
                 'snap_on_start': False,
                 'save_on_stop': False,
                 'size': defaults['root_img_size'],
-                'internal': True,
                 'rw': True,
             },
             'kernel': {
@@ -75,7 +72,6 @@ class AppVM(qubes.vm.qubesvm.QubesVM):
                 'snap_on_start': False,
                 'save_on_stop': False,
                 'rw': False,
-                'internal': True
             }
         }
 

qubes/vm/dispvm.py

@@ -47,20 +47,17 @@ def __init__(self, *args, **kwargs):
                 'snap_on_start': True,
                 'save_on_stop': False,
                 'rw': False,
-                'internal': True
             },
             'private': {
                 'name': 'private',
                 'pool': 'default',
                 'snap_on_start': True,
                 'save_on_stop': False,
-                'internal': True,
                 'rw': True,
             },
             'volatile': {
                 'name': 'volatile',
                 'pool': 'default',
-                'internal': True,
                 'snap_on_start': False,
                 'save_on_stop': False,
                 'rw': True,
@@ -73,7 +70,6 @@ def __init__(self, *args, **kwargs):
                 'snap_on_start': False,
                 'save_on_stop': False,
                 'rw': False,
-                'internal': True
             }
         }
         if 'name' not in kwargs and 'dispid' in kwargs:

qubes/vm/qubesvm.py

@@ -1815,9 +1815,9 @@ def get_prefmem(self):
 
 
 def _clean_volume_config(config):
-    common_attributes = ['name', 'pool', 'size', 'internal', 'removable',
-                            'revisions_to_keep', 'rw', 'snap_on_start',
-                            'save_on_stop', 'source']
+    common_attributes = ['name', 'pool', 'size',
+                         'revisions_to_keep', 'rw', 'snap_on_start',
+                         'save_on_stop', 'source']
     config_copy = copy.deepcopy(config)
     return {k: v for k, v in config_copy.items() if k in common_attributes}
 

qubes/vm/standalonevm.py

@@ -35,7 +35,6 @@ def __init__(self, *args, **kwargs):
                 'save_on_stop': True,
                 'rw': True,
                 'source': None,
-                'internal': True,
                 'size': qubes.config.defaults['root_img_size'],
             },
             'private': {
@@ -45,15 +44,13 @@ def __init__(self, *args, **kwargs):
                 'save_on_stop': True,
                 'rw': True,
                 'source': None,
-                'internal': True,
                 'size': qubes.config.defaults['private_img_size'],
             },
             'volatile': {
                 'name': 'volatile',
                 'pool': 'default',
                 'snap_on_start': False,
                 'save_on_stop': False,
-                'internal': True,
                 'rw': True,
                 'size': qubes.config.defaults['root_img_size'],
             },
@@ -63,7 +60,6 @@ def __init__(self, *args, **kwargs):
                 'snap_on_start': False,
                 'save_on_stop': False,
                 'rw': False,
-                'internal': True
             }
         }
         super(StandaloneVM, self).__init__(*args, **kwargs)

qubes/vm/templatevm.py

@@ -71,7 +71,6 @@ def __init__(self, *args, **kwargs):
                 'rw': True,
                 'source': None,
                 'size': defaults['root_img_size'],
-                'internal': True
             },
             'private': {
                 'name': 'private',
@@ -82,23 +81,20 @@ def __init__(self, *args, **kwargs):
                 'source': None,
                 'size': defaults['private_img_size'],
                 'revisions_to_keep': 0,
-                'internal': True
             },
             'volatile': {
                 'name': 'volatile',
                 'pool': 'default',
                 'size': defaults['root_img_size'],
                 'snap_on_start': False,
                 'save_on_stop': False,
-                'internal': True,
                 'rw': True,
             },
             'kernel': {
                 'name': 'kernel',
                 'pool': 'linux-kernel',
                 'snap_on_start': False,
                 'save_on_stop': False,
-                'internal': True,
                 'rw': False
             }
         }