removed "runthis" and other unused functions from utils.py

Fixes Bug #1012234

Removed all unused functions and imports from common/utils.py.

Patch set 2: Submitted same code by mistake
Patch set 3: removed commented code but inappropriate commit msg.
Patch set 4: removed commented code with appropriate commit msg. Removed pep8 changes for ucs plugin.

Change-Id: I0ec33be127ef0389685a378c6f8d39ce5cbdb58c
This commit is contained in:
Harsh Prasad
2012-06-18 14:18:24 +05:30
parent 1c3a2a0d97
commit dd0fe18690

View File

@@ -22,13 +22,9 @@
import ConfigParser
import datetime
import inspect
import logging
import os
import random
import subprocess
import sys
from quantum.common import exceptions as exception
from quantum.common.exceptions import ProcessExecutionError
@@ -39,37 +35,6 @@ TIME_FORMAT = "%Y-%m-%dT%H:%M:%SZ"
FLAGS = flags.FLAGS
def int_from_bool_as_string(subject):
"""
Interpret a string as a boolean and return either 1 or 0.
Any string value in:
('True', 'true', 'On', 'on', '1')
is interpreted as a boolean True.
Useful for JSON-decoded stuff and config file parsing
"""
return bool_from_string(subject) and 1 or 0
def bool_from_string(subject):
"""
Interpret a string as a boolean.
Any string value in:
('True', 'true', 'On', 'on', '1')
is interpreted as a boolean True.
Useful for JSON-decoded stuff and config file parsing
"""
if isinstance(subject, bool):
return subject
elif isinstance(subject, basestring):
if subject.strip().lower() in ('true', 'on', '1'):
return True
return False
def boolize(subject):
"""
Quak like a boolean
@@ -110,67 +75,6 @@ def execute(cmd, process_input=None, addl_env=None, check_exit_code=True):
return result
def abspath(s):
return os.path.join(os.path.dirname(__file__), s)
# TODO(sirp): when/if utils is extracted to common library, we should remove
# the argument's default.
def default_flagfile(filename='quantum.conf'):
for arg in sys.argv:
if arg.find('flagfile') != -1:
break
else:
if not os.path.isabs(filename):
# turn relative filename into an absolute path
script_dir = os.path.dirname(inspect.stack()[-1][1])
filename = os.path.abspath(os.path.join(script_dir, filename))
if os.path.exists(filename):
sys.argv.insert(1, '--flagfile=%s' % filename)
def debug(arg):
logging.debug('debug in callback: %s', arg)
return arg
def runthis(prompt, cmd, check_exit_code=True):
logging.debug("Running %s" % (cmd))
exit_code = subprocess.call(cmd.split(" "))
logging.debug(prompt % (exit_code))
if check_exit_code and exit_code != 0:
raise ProcessExecutionError(exit_code=exit_code,
stdout=None,
stderr=None,
cmd=cmd)
def generate_uid(topic, size=8):
return '%s-%s' % (topic, ''.join(
[random.choice('01234567890abcdefghijklmnopqrstuvwxyz')
for x in xrange(size)]))
def generate_mac():
mac = [0x02, 0x16, 0x3e, random.randint(0x00, 0x7f),
random.randint(0x00, 0xff), random.randint(0x00, 0xff)]
return ':'.join(map(lambda x: "%02x" % x, mac))
def last_octet(address):
return int(address.split(".")[-1])
def isotime(at=None):
if not at:
at = datetime.datetime.utcnow()
return at.strftime(TIME_FORMAT)
def parse_isotime(timestr):
return datetime.datetime.strptime(timestr, TIME_FORMAT)
def get_plugin_from_config(file="config.ini"):
Config = ConfigParser.ConfigParser()
Config.read(file)