Merge "Remove VFSLocalFS"

Author: Zuul

nova/privsep/fs.py

@@ -129,12 +129,6 @@ def remove_device_maps(device):
     return processutils.execute('kpartx', '-d', device)
 
 
-@nova.privsep.sys_admin_pctxt.entrypoint
-def get_filesystem_type(device):
-    return processutils.execute('blkid', '-o', 'value', '-s', 'TYPE', device,
-                                check_exit_code=[0, 2])
-
-
 @nova.privsep.sys_admin_pctxt.entrypoint
 def e2fsck(image, flags='-fp'):
     unprivileged_e2fsck(image, flags=flags)

nova/privsep/path.py

@@ -25,14 +25,6 @@
 import nova.privsep
 
 
-@nova.privsep.sys_admin_pctxt.entrypoint
-def readfile(path):
-    if not os.path.exists(path):
-        raise exception.FileNotFound(file_path=path)
-    with open(path, 'r') as f:
-        return f.read()
-
-
 @nova.privsep.sys_admin_pctxt.entrypoint
 def writefile(path, mode, content):
     if not os.path.exists(os.path.dirname(path)):
@@ -41,13 +33,6 @@ def writefile(path, mode, content):
         f.write(content)
 
 
-@nova.privsep.sys_admin_pctxt.entrypoint
-def readlink(path):
-    if not os.path.exists(path):
-        raise exception.FileNotFound(file_path=path)
-    return os.readlink(path)
-
-
 @nova.privsep.sys_admin_pctxt.entrypoint
 def chown(
     path: str, uid: int = -1, gid: int = -1, recursive: bool = False,
@@ -102,13 +87,6 @@ def rmdir(path):
     os.rmdir(path)
 
 
-class path(object):
-    @staticmethod
-    @nova.privsep.sys_admin_pctxt.entrypoint
-    def exists(path):
-        return os.path.exists(path)
-
-
 @nova.privsep.sys_admin_pctxt.entrypoint
 def last_bytes(path, num):
     """Return num bytes from the end of the file, and remaining byte count.

nova/tests/unit/privsep/test_fs.py

@@ -142,13 +142,6 @@ def test_remove_device_maps(self, mock_execute):
         nova.privsep.fs.remove_device_maps('/dev/nosuch')
         mock_execute.assert_called_with('kpartx', '-d', '/dev/nosuch')
 
-    @mock.patch('oslo_concurrency.processutils.execute')
-    def test_get_filesystem_type(self, mock_execute):
-        nova.privsep.fs.get_filesystem_type('/dev/nosuch')
-        mock_execute.assert_called_with('blkid', '-o', 'value', '-s',
-                                        'TYPE', '/dev/nosuch',
-                                        check_exit_code=[0, 2])
-
     @mock.patch('oslo_concurrency.processutils.execute')
     def test_privileged_e2fsck(self, mock_execute):
         nova.privsep.fs.e2fsck('/path/nosuch')

nova/tests/unit/privsep/test_path.py

@@ -31,19 +31,6 @@ def setUp(self):
         super(FileTestCase, self).setUp()
         self.useFixture(fixtures.PrivsepFixture())
 
-    @mock.patch('os.path.exists', return_value=True)
-    def test_readfile(self, mock_exists):
-        mock_open = mock.mock_open(read_data='hello world')
-        with mock.patch('builtins.open', new=mock_open):
-            self.assertEqual('hello world',
-                             nova.privsep.path.readfile('/fake/path'))
-
-    @mock.patch('os.path.exists', return_value=False)
-    def test_readfile_file_not_found(self, mock_exists):
-        self.assertRaises(exception.FileNotFound,
-                          nova.privsep.path.readfile,
-                          '/fake/path')
-
     @mock.patch('os.path.exists', return_value=True)
     def test_write(self, mock_exists):
         mock_open = mock.mock_open()
@@ -62,19 +49,6 @@ def test_write_dir_missing(self, mock_exists):
                           nova.privsep.path.writefile,
                           '/fake/path', 'w', 'foo')
 
-    @mock.patch('os.path.exists', return_value=True)
-    @mock.patch('os.readlink')
-    def test_readlink(self, mock_readlink, mock_exists):
-        nova.privsep.path.readlink('/fake/path')
-        mock_exists.assert_called_with('/fake/path')
-        mock_readlink.assert_called_with('/fake/path')
-
-    @mock.patch('os.path.exists', return_value=False)
-    def test_readlink_file_not_found(self, mock_exists):
-        self.assertRaises(exception.FileNotFound,
-                          nova.privsep.path.readlink,
-                          '/fake/path')
-
     @mock.patch('os.path.exists', return_value=True)
     @mock.patch('os.chown')
     def test_chown(self, mock_chown, mock_exists):
@@ -162,11 +136,6 @@ def test_rmdir_file_not_found(self, mock_exists):
                           nova.privsep.path.rmdir,
                           '/fake/path')
 
-    @mock.patch('os.path.exists', return_value=True)
-    def test_exists(self, mock_exists):
-        nova.privsep.path.path.exists('/fake/path')
-        mock_exists.assert_called_with('/fake/path')
-
 
 class LastBytesTestCase(test.NoDBTestCase):
     """Test the last_bytes() utility method."""