From 12186f3b0e193d5de92e43e5dde7c698f8e56c99 Mon Sep 17 00:00:00 2001
From: Eric Harney <eharney@redhat.com>
Date: Fri, 2 Mar 2018 05:17:25 -0500
Subject: [PATCH] Remove utils.read_file_as_root()

This is no longer used, and removes a rootwrap entry.

Change-Id: Iad1f96de38cf23b85241bac4231c26e866ad4519
---
 cinder/tests/unit/test_utils.py      | 20 --------------------
 cinder/utils.py                      |  9 ---------
 etc/cinder/rootwrap.d/volume.filters |  3 ---
 3 files changed, 32 deletions(-)

diff --git a/cinder/tests/unit/test_utils.py b/cinder/tests/unit/test_utils.py
index 91268318c7b..23118772c29 100644
--- a/cinder/tests/unit/test_utils.py
+++ b/cinder/tests/unit/test_utils.py
@@ -22,7 +22,6 @@ import time
 
 import ddt
 import mock
-from oslo_concurrency import processutils as putils
 from oslo_utils import timeutils
 import six
 from six.moves import range
@@ -151,25 +150,6 @@ class GenericUtilsTestCase(test.TestCase):
         self.assertEqual('/dev/xvdb1', utils.make_dev_path('xvdb', 1))
         self.assertEqual('/foo/xvdc1', utils.make_dev_path('xvdc', 1, '/foo'))
 
-    @mock.patch('cinder.utils.execute')
-    def test_read_file_as_root(self, mock_exec):
-        out = mock.Mock()
-        err = mock.Mock()
-        mock_exec.return_value = (out, err)
-        test_filepath = '/some/random/path'
-        output = utils.read_file_as_root(test_filepath)
-        mock_exec.assert_called_once_with('cat', test_filepath,
-                                          run_as_root=True)
-        self.assertEqual(out, output)
-
-    @mock.patch('cinder.utils.execute',
-                side_effect=putils.ProcessExecutionError)
-    def test_read_file_as_root_fails(self, mock_exec):
-        test_filepath = '/some/random/path'
-        self.assertRaises(exception.FileNotFound,
-                          utils.read_file_as_root,
-                          test_filepath)
-
     @test.testtools.skipIf(sys.platform == "darwin", "SKIP on OSX")
     @mock.patch('tempfile.NamedTemporaryFile')
     @mock.patch.object(os, 'open')
diff --git a/cinder/utils.py b/cinder/utils.py
index e02c812da04..c9833302e53 100644
--- a/cinder/utils.py
+++ b/cinder/utils.py
@@ -379,15 +379,6 @@ def sanitize_hostname(hostname):
     return hostname
 
 
-def read_file_as_root(file_path):
-    """Secure helper to read file as root."""
-    try:
-        out, _err = execute('cat', file_path, run_as_root=True)
-        return out
-    except processutils.ProcessExecutionError:
-        raise exception.FileNotFound(file_path=file_path)
-
-
 def robust_file_write(directory, filename, data):
     """Robust file write.
 
diff --git a/etc/cinder/rootwrap.d/volume.filters b/etc/cinder/rootwrap.d/volume.filters
index 733bc9b8273..abc15172117 100644
--- a/etc/cinder/rootwrap.d/volume.filters
+++ b/etc/cinder/rootwrap.d/volume.filters
@@ -107,9 +107,6 @@ qemu-img_convert: CommandFilter, qemu-img, root
 
 udevadm: CommandFilter, udevadm, root
 
-# cinder/volume/driver.py: utils.read_file_as_root()
-cat: CommandFilter, cat, root
-
 # cinder/volume/nfs.py
 stat: CommandFilter, stat, root
 mount: CommandFilter, mount, root