Cleanup orphaned code from cinder root directory
There were several methods in the root directory source files that were no longer being used anywhere. While some of these have potential for being useful, they are not in use and should not be sitting around the codebase waiting for someone to need them. This patch removes unused methods from utils as well as their associated unit tests. Change-Id: Iee5bac44b41a2696ab972a2fbfe0281ec423b393
This commit is contained in:
Sean McGinnis
parent
c9eef31820
commit
b3297f3984
@ -136,10 +136,6 @@ class RequestContextSerializer(messaging.Serializer):
|
|||||||
return cinder.context.RequestContext.from_dict(context)
|
return cinder.context.RequestContext.from_dict(context)
|
||||||
|
|
||||||
|
|
||||||
def get_transport_url(url_str=None):
|
|
||||||
return messaging.TransportURL.parse(CONF, url_str, TRANSPORT_ALIASES)
|
|
||||||
|
|
||||||
|
|
||||||
def get_client(target, version_cap=None, serializer=None):
|
def get_client(target, version_cap=None, serializer=None):
|
||||||
assert TRANSPORT is not None
|
assert TRANSPORT is not None
|
||||||
serializer = RequestContextSerializer(serializer)
|
serializer = RequestContextSerializer(serializer)
|
||||||
|
|||||||
@ -15,7 +15,6 @@
|
|||||||
|
|
||||||
import datetime
|
import datetime
|
||||||
import functools
|
import functools
|
||||||
import hashlib
|
|
||||||
import os
|
import os
|
||||||
import time
|
import time
|
||||||
import uuid
|
import uuid
|
||||||
@ -68,161 +67,6 @@ class ExecuteTestCase(test.TestCase):
|
|||||||
root_helper=mock_helper)
|
root_helper=mock_helper)
|
||||||
|
|
||||||
|
|
||||||
class GetFromPathTestCase(test.TestCase):
|
|
||||||
def test_tolerates_nones(self):
|
|
||||||
f = utils.get_from_path
|
|
||||||
|
|
||||||
input = []
|
|
||||||
self.assertEqual([], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [None]
|
|
||||||
self.assertEqual([], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': None}]
|
|
||||||
self.assertEqual([], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': None}}]
|
|
||||||
self.assertEqual([{'b': None}], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': None}}}]
|
|
||||||
self.assertEqual([{'b': {'c': None}}], f(input, "a"))
|
|
||||||
self.assertEqual([{'c': None}], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': None}}}, {'a': None}]
|
|
||||||
self.assertEqual([{'b': {'c': None}}], f(input, "a"))
|
|
||||||
self.assertEqual([{'c': None}], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': None}}}, {'a': {'b': None}}]
|
|
||||||
self.assertEqual([{'b': {'c': None}}, {'b': None}], f(input, "a"))
|
|
||||||
self.assertEqual([{'c': None}], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
def test_does_select(self):
|
|
||||||
f = utils.get_from_path
|
|
||||||
|
|
||||||
input = [{'a': 'a_1'}]
|
|
||||||
self.assertEqual(['a_1'], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': 'b_1'}}]
|
|
||||||
self.assertEqual([{'b': 'b_1'}], f(input, "a"))
|
|
||||||
self.assertEqual(['b_1'], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': 'c_1'}}}]
|
|
||||||
self.assertEqual([{'b': {'c': 'c_1'}}], f(input, "a"))
|
|
||||||
self.assertEqual([{'c': 'c_1'}], f(input, "a/b"))
|
|
||||||
self.assertEqual(['c_1'], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': 'c_1'}}}, {'a': None}]
|
|
||||||
self.assertEqual([{'b': {'c': 'c_1'}}], f(input, "a"))
|
|
||||||
self.assertEqual([{'c': 'c_1'}], f(input, "a/b"))
|
|
||||||
self.assertEqual(['c_1'], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': 'c_1'}}},
|
|
||||||
{'a': {'b': None}}]
|
|
||||||
self.assertEqual([{'b': {'c': 'c_1'}}, {'b': None}], f(input, "a"))
|
|
||||||
self.assertEqual([{'c': 'c_1'}], f(input, "a/b"))
|
|
||||||
self.assertEqual(['c_1'], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': {'c': 'c_1'}}},
|
|
||||||
{'a': {'b': {'c': 'c_2'}}}]
|
|
||||||
self.assertEqual([{'b': {'c': 'c_1'}}, {'b': {'c': 'c_2'}}],
|
|
||||||
f(input, "a"))
|
|
||||||
self.assertEqual([{'c': 'c_1'}, {'c': 'c_2'}], f(input, "a/b"))
|
|
||||||
self.assertEqual(['c_1', 'c_2'], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
self.assertEqual([], f(input, "a/b/c/d"))
|
|
||||||
self.assertEqual([], f(input, "c/a/b/d"))
|
|
||||||
self.assertEqual([], f(input, "i/r/t"))
|
|
||||||
|
|
||||||
def test_flattens_lists(self):
|
|
||||||
f = utils.get_from_path
|
|
||||||
|
|
||||||
input = [{'a': [1, 2, 3]}]
|
|
||||||
self.assertEqual([1, 2, 3], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': [1, 2, 3]}}]
|
|
||||||
self.assertEqual([{'b': [1, 2, 3]}], f(input, "a"))
|
|
||||||
self.assertEqual([1, 2, 3], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': {'b': [1, 2, 3]}}, {'a': {'b': [4, 5, 6]}}]
|
|
||||||
self.assertEqual([1, 2, 3, 4, 5, 6], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': [{'b': [1, 2, 3]}, {'b': [4, 5, 6]}]}]
|
|
||||||
self.assertEqual([1, 2, 3, 4, 5, 6], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = [{'a': [1, 2, {'b': 'b_1'}]}]
|
|
||||||
self.assertEqual([1, 2, {'b': 'b_1'}], f(input, "a"))
|
|
||||||
self.assertEqual(['b_1'], f(input, "a/b"))
|
|
||||||
|
|
||||||
def test_bad_xpath(self):
|
|
||||||
f = utils.get_from_path
|
|
||||||
|
|
||||||
self.assertRaises(exception.Error, f, [], None)
|
|
||||||
self.assertRaises(exception.Error, f, [], "")
|
|
||||||
self.assertRaises(exception.Error, f, [], "/")
|
|
||||||
self.assertRaises(exception.Error, f, [], "/a")
|
|
||||||
self.assertRaises(exception.Error, f, [], "/a/")
|
|
||||||
self.assertRaises(exception.Error, f, [], "//")
|
|
||||||
self.assertRaises(exception.Error, f, [], "//a")
|
|
||||||
self.assertRaises(exception.Error, f, [], "a//a")
|
|
||||||
self.assertRaises(exception.Error, f, [], "a//a/")
|
|
||||||
self.assertRaises(exception.Error, f, [], "a/a/")
|
|
||||||
|
|
||||||
def test_real_failure1(self):
|
|
||||||
# Real world failure case...
|
|
||||||
# We weren't coping when the input was a Dictionary instead of a List
|
|
||||||
# This led to test_accepts_dictionaries
|
|
||||||
f = utils.get_from_path
|
|
||||||
|
|
||||||
inst = {'fixed_ip': {'floating_ips': [{'address': '1.2.3.4'}],
|
|
||||||
'address': '192.168.0.3'},
|
|
||||||
'hostname': ''}
|
|
||||||
|
|
||||||
private_ips = f(inst, 'fixed_ip/address')
|
|
||||||
public_ips = f(inst, 'fixed_ip/floating_ips/address')
|
|
||||||
self.assertEqual(['192.168.0.3'], private_ips)
|
|
||||||
self.assertEqual(['1.2.3.4'], public_ips)
|
|
||||||
|
|
||||||
def test_accepts_dictionaries(self):
|
|
||||||
f = utils.get_from_path
|
|
||||||
|
|
||||||
input = {'a': [1, 2, 3]}
|
|
||||||
self.assertEqual([1, 2, 3], f(input, "a"))
|
|
||||||
self.assertEqual([], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = {'a': {'b': [1, 2, 3]}}
|
|
||||||
self.assertEqual([{'b': [1, 2, 3]}], f(input, "a"))
|
|
||||||
self.assertEqual([1, 2, 3], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = {'a': [{'b': [1, 2, 3]}, {'b': [4, 5, 6]}]}
|
|
||||||
self.assertEqual([1, 2, 3, 4, 5, 6], f(input, "a/b"))
|
|
||||||
self.assertEqual([], f(input, "a/b/c"))
|
|
||||||
|
|
||||||
input = {'a': [1, 2, {'b': 'b_1'}]}
|
|
||||||
self.assertEqual([1, 2, {'b': 'b_1'}], f(input, "a"))
|
|
||||||
self.assertEqual(['b_1'], f(input, "a/b"))
|
|
||||||
|
|
||||||
|
|
||||||
class GenericUtilsTestCase(test.TestCase):
|
class GenericUtilsTestCase(test.TestCase):
|
||||||
|
|
||||||
@mock.patch('os.path.exists', return_value=True)
|
@mock.patch('os.path.exists', return_value=True)
|
||||||
@ -407,17 +251,6 @@ class GenericUtilsTestCase(test.TestCase):
|
|||||||
utils.safe_minidom_parse_string,
|
utils.safe_minidom_parse_string,
|
||||||
killer_body())
|
killer_body())
|
||||||
|
|
||||||
def test_xhtml_escape(self):
|
|
||||||
self.assertEqual('"foo"', utils.xhtml_escape('"foo"'))
|
|
||||||
self.assertEqual(''foo'', utils.xhtml_escape("'foo'"))
|
|
||||||
|
|
||||||
def test_hash_file(self):
|
|
||||||
data = b'Mary had a little lamb, its fleece as white as snow'
|
|
||||||
flo = six.BytesIO(data)
|
|
||||||
h1 = utils.hash_file(flo)
|
|
||||||
h2 = hashlib.sha1(data).hexdigest()
|
|
||||||
self.assertEqual(h1, h2)
|
|
||||||
|
|
||||||
def test_check_ssh_injection(self):
|
def test_check_ssh_injection(self):
|
||||||
cmd_list = ['ssh', '-D', 'my_name@name_of_remote_computer']
|
cmd_list = ['ssh', '-D', 'my_name@name_of_remote_computer']
|
||||||
self.assertIsNone(utils.check_ssh_injection(cmd_list))
|
self.assertIsNone(utils.check_ssh_injection(cmd_list))
|
||||||
@ -468,17 +301,6 @@ class GenericUtilsTestCase(test.TestCase):
|
|||||||
utils.check_ssh_injection,
|
utils.check_ssh_injection,
|
||||||
with_multiple_quotes)
|
with_multiple_quotes)
|
||||||
|
|
||||||
@mock.patch('paramiko.SSHClient')
|
|
||||||
def test_create_channel(self, mock_client):
|
|
||||||
test_width = 600
|
|
||||||
test_height = 800
|
|
||||||
mock_channel = mock.Mock()
|
|
||||||
mock_client.invoke_shell.return_value = mock_channel
|
|
||||||
utils.create_channel(mock_client, test_width, test_height)
|
|
||||||
mock_client.invoke_shell.assert_called_once_with()
|
|
||||||
mock_channel.resize_pty.assert_called_once_with(test_width,
|
|
||||||
test_height)
|
|
||||||
|
|
||||||
@mock.patch('os.stat')
|
@mock.patch('os.stat')
|
||||||
def test_get_file_mode(self, mock_stat):
|
def test_get_file_mode(self, mock_stat):
|
||||||
class stat_result(object):
|
class stat_result(object):
|
||||||
|
|||||||
@ -22,7 +22,6 @@ import abc
|
|||||||
import contextlib
|
import contextlib
|
||||||
import datetime
|
import datetime
|
||||||
import functools
|
import functools
|
||||||
import hashlib
|
|
||||||
import inspect
|
import inspect
|
||||||
import logging as py_logging
|
import logging as py_logging
|
||||||
import os
|
import os
|
||||||
@ -40,7 +39,6 @@ from xml.dom import minidom
|
|||||||
from xml.parsers import expat
|
from xml.parsers import expat
|
||||||
from xml import sax
|
from xml import sax
|
||||||
from xml.sax import expatreader
|
from xml.sax import expatreader
|
||||||
from xml.sax import saxutils
|
|
||||||
|
|
||||||
from os_brick.initiator import connector
|
from os_brick.initiator import connector
|
||||||
from oslo_concurrency import lockutils
|
from oslo_concurrency import lockutils
|
||||||
@ -190,13 +188,6 @@ def check_ssh_injection(cmd_list):
|
|||||||
raise exception.SSHInjectionThreat(command=cmd_list)
|
raise exception.SSHInjectionThreat(command=cmd_list)
|
||||||
|
|
||||||
|
|
||||||
def create_channel(client, width, height):
|
|
||||||
"""Invoke an interactive shell session on server."""
|
|
||||||
channel = client.invoke_shell()
|
|
||||||
channel.resize_pty(width, height)
|
|
||||||
return channel
|
|
||||||
|
|
||||||
|
|
||||||
def cinderdir():
|
def cinderdir():
|
||||||
import cinder
|
import cinder
|
||||||
return os.path.abspath(cinder.__file__).split('cinder/__init__.py')[0]
|
return os.path.abspath(cinder.__file__).split('cinder/__init__.py')[0]
|
||||||
@ -347,62 +338,6 @@ def safe_minidom_parse_string(xml_string):
|
|||||||
raise expat.ExpatError()
|
raise expat.ExpatError()
|
||||||
|
|
||||||
|
|
||||||
def xhtml_escape(value):
|
|
||||||
"""Escapes a string so it is valid within XML or XHTML."""
|
|
||||||
return saxutils.escape(value, {'"': '"', "'": '''})
|
|
||||||
|
|
||||||
|
|
||||||
def get_from_path(items, path):
|
|
||||||
"""Returns a list of items matching the specified path.
|
|
||||||
|
|
||||||
Takes an XPath-like expression e.g. prop1/prop2/prop3, and for each item
|
|
||||||
in items, looks up items[prop1][prop2][prop3]. Like XPath, if any of the
|
|
||||||
intermediate results are lists it will treat each list item individually.
|
|
||||||
A 'None' in items or any child expressions will be ignored, this function
|
|
||||||
will not throw because of None (anywhere) in items. The returned list
|
|
||||||
will contain no None values.
|
|
||||||
|
|
||||||
"""
|
|
||||||
if path is None:
|
|
||||||
raise exception.Error('Invalid mini_xpath')
|
|
||||||
|
|
||||||
(first_token, sep, remainder) = path.partition('/')
|
|
||||||
|
|
||||||
if first_token == '':
|
|
||||||
raise exception.Error('Invalid mini_xpath')
|
|
||||||
|
|
||||||
results = []
|
|
||||||
|
|
||||||
if items is None:
|
|
||||||
return results
|
|
||||||
|
|
||||||
if not isinstance(items, list):
|
|
||||||
# Wrap single objects in a list
|
|
||||||
items = [items]
|
|
||||||
|
|
||||||
for item in items:
|
|
||||||
if item is None:
|
|
||||||
continue
|
|
||||||
get_method = getattr(item, 'get', None)
|
|
||||||
if get_method is None:
|
|
||||||
continue
|
|
||||||
child = get_method(first_token)
|
|
||||||
if child is None:
|
|
||||||
continue
|
|
||||||
if isinstance(child, list):
|
|
||||||
# Flatten intermediate lists
|
|
||||||
for x in child:
|
|
||||||
results.append(x)
|
|
||||||
else:
|
|
||||||
results.append(child)
|
|
||||||
|
|
||||||
if not sep:
|
|
||||||
# No more tokens
|
|
||||||
return results
|
|
||||||
else:
|
|
||||||
return get_from_path(results, remainder)
|
|
||||||
|
|
||||||
|
|
||||||
def is_valid_boolstr(val):
|
def is_valid_boolstr(val):
|
||||||
"""Check if the provided string is a valid bool string or not."""
|
"""Check if the provided string is a valid bool string or not."""
|
||||||
val = str(val).lower()
|
val = str(val).lower()
|
||||||
@ -497,13 +432,6 @@ def sanitize_hostname(hostname):
|
|||||||
return hostname
|
return hostname
|
||||||
|
|
||||||
|
|
||||||
def hash_file(file_like_object):
|
|
||||||
"""Generate a hash for the contents of a file."""
|
|
||||||
checksum = hashlib.sha1()
|
|
||||||
any(map(checksum.update, iter(lambda: file_like_object.read(32768), b'')))
|
|
||||||
return checksum.hexdigest()
|
|
||||||
|
|
||||||
|
|
||||||
def service_is_up(service):
|
def service_is_up(service):
|
||||||
"""Check whether a service is up based on last heartbeat."""
|
"""Check whether a service is up based on last heartbeat."""
|
||||||
last_heartbeat = service['updated_at'] or service['created_at']
|
last_heartbeat = service['updated_at'] or service['created_at']
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user