summaryrefslogtreecommitdiffstats
path: root/nova/utils.py
diff options
context:
space:
mode:
authorMark Washenberger <mark.washenberger@rackspace.com>2011-03-16 19:37:00 +0000
committerTarmac <>2011-03-16 19:37:00 +0000
commitde7707f9707a0166d01d6a7dfce51f34c3c58967 (patch)
tree21d41fe7c1857aefc0e34d857d7cd73c87fa7480 /nova/utils.py
parent6b50c033b1a464c6681aae279f0763e135aacf65 (diff)
parent19a2f8ce5174fa758de9031d64f1bed0f7c44788 (diff)
downloadnova-de7707f9707a0166d01d6a7dfce51f34c3c58967.tar.gz
nova-de7707f9707a0166d01d6a7dfce51f34c3c58967.tar.xz
nova-de7707f9707a0166d01d6a7dfce51f34c3c58967.zip
Fix lp727225 by adding support for personality files to the openstack api.
Description: This merge adds support for personality files to the openstack api. It leverages previous work which added this functionality to the compute api, compute manager, and xen api.
Diffstat (limited to 'nova/utils.py')
-rw-r--r--nova/utils.py12
1 files changed, 0 insertions, 12 deletions
diff --git a/nova/utils.py b/nova/utils.py
index 199ee8701..f8160c0b6 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -538,18 +538,6 @@ def synchronized(name):
return wrap
-def ensure_b64_encoding(val):
- """Safety method to ensure that values expected to be base64-encoded
- actually are. If they are, the value is returned unchanged. Otherwise,
- the encoded value is returned.
- """
- try:
- dummy = base64.decode(val)
- return val
- except TypeError:
- return base64.b64encode(val)
-
-
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,