openstack/sahara
Code Issues Proposed changes

many pylint warns has been fixed

Browse Source
This commit is contained in:
Sergey Lukjanov
2013-02-26 00:55:13 +04:00
parent ccacb4225d
commit 8a1355bae4
5 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/eho-api
View File

@@ -5,7 +5,8 @@ import eho.server.main as server
from eventlet import wsgi
import eventlet
if __name__ == '__main__':
def main():
parser = argparse.ArgumentParser(description='EHO server')
parser.add_argument(
'--dev', action='store_true', dest='dev', help='enable dev mode'
@@ -29,15 +30,16 @@ if __name__ == '__main__':
'--stub-data, --stub_data', action='store_true', dest='stub_data',
help='put stub templates and clusters into db'
)
args = parser.parse_args()
opts = dict()
opts['DEBUG'] = args.dev
opts['LOG_LEVEL'] = args.log_level
opts['RESET_DB'] = args.reset_db
opts['STUB_DATA'] = args.stub_data
app = server.make_app(**opts)
wsgi.server(eventlet.listen((args.host, args.port), backlog=500), app,
debug=args.dev)
if __name__ == '__main__':
main()

4
eho/common/test_lib.py
View File

@@ -1,4 +1,5 @@
# vim: tabstop=4 shiftwidth=4 softtabstop=4
#pylint: disable-all
# Copyright (c) 2010 OpenStack, LLC
# All Rights Reserved.
@@ -75,8 +76,7 @@ class _AnsiColorizer(object):
except curses.error:
curses.setupterm()
return curses.tigetnum("colors") > 2
except:
raise
except Exception:
# guess false in case of error
return False
supported = classmethod(supported)

4
eho/server/main.py
View File

@@ -24,10 +24,10 @@ def make_app(**local_conf):
app.config.from_envvar('EHO_API_CFG', silent=True)
app.config.update(**local_conf)
rootLogger = logging.getLogger()
root_logger = logging.getLogger()
ll = app.config.pop('LOG_LEVEL', 'WARN')
if ll:
rootLogger.setLevel(ll)
root_logger.setLevel(ll)
app.register_blueprint(api_v01.rest, url_prefix='/v0.1')

3
eho/server/scheduler.py
View File

@@ -1,7 +1,7 @@
import logging
import eventlet
pool = eventlet.GreenPool()
POOL = eventlet.GreenPool()
def test_job_fun(idx):
@@ -10,4 +10,5 @@ def test_job_fun(idx):
def setup_scheduler(app):
app.pool = POOL
eventlet.spawn(test_job_fun, 0)

38
eho/server/storage/models.py
View File

@@ -3,15 +3,7 @@ from uuid import uuid4
from eho.server.storage.storage import db
class BaseModel(object):
def __getitem__(self, item):
return getattr(self, item)
def __setitem__(self, key, value):
setattr(self, key, value)
class NodeTemplate(db.Model, BaseModel):
class NodeTemplate(db.Model):
__tablename__ = 'NodeTemplate'
id = db.Column(db.String(36), primary_key=True)
@@ -41,7 +33,7 @@ class NodeTemplate(db.Model, BaseModel):
return '<NodeTemplate %s / %s>' % (self.name, self.node_type_id)
class Cluster(db.Model, BaseModel):
class Cluster(db.Model):
__tablename__ = 'Cluster'
id = db.Column(db.String(36), primary_key=True)
@@ -71,21 +63,21 @@ class Cluster(db.Model, BaseModel):
return '<Cluster %s / %s>' % (self.name, self.status)
node_type_node_process = db.Table('NodeType_NodeProcess', db.metadata,
db.Column('node_type_id', db.String(36),
db.ForeignKey('NodeType.id')),
db.Column('node_process_id', db.String(36),
db.ForeignKey('NodeProcess.id')))
NodeType_NodeProcess = db.Table('NodeType_NodeProcess', db.metadata,
db.Column('node_type_id', db.String(36),
db.ForeignKey('NodeType.id')),
db.Column('node_process_id', db.String(36),
db.ForeignKey('NodeProcess.id')))
class NodeType(db.Model, BaseModel):
class NodeType(db.Model):
__tablename__ = 'NodeType'
id = db.Column(db.String(36), primary_key=True)
name = db.Column(db.String(80), unique=True, nullable=False)
processes = db.relationship('NodeProcess',
cascade="all,delete",
secondary=node_type_node_process,
secondary=NodeType_NodeProcess,
backref='node_types')
node_templates = db.relationship('NodeTemplate', cascade="all,delete",
backref='node_type')
@@ -98,7 +90,7 @@ class NodeType(db.Model, BaseModel):
return '<NodeType %s>' % self.name
class NodeProcess(db.Model, BaseModel):
class NodeProcess(db.Model):
__tablename__ = 'NodeProcess'
id = db.Column(db.String(36), primary_key=True)
@@ -115,7 +107,7 @@ class NodeProcess(db.Model, BaseModel):
return '<NodeProcess %s>' % self.name
class NodeProcessProperty(db.Model, BaseModel):
class NodeProcessProperty(db.Model):
__tablename__ = 'NodeProcessProperty'
__table_args__ = (
db.UniqueConstraint('node_process_id', 'name'),
@@ -141,7 +133,7 @@ class NodeProcessProperty(db.Model, BaseModel):
return '<NodeProcessProperty %s>' % self.name
class NodeTemplateConfig(db.Model, BaseModel):
class NodeTemplateConfig(db.Model):
__tablename__ = 'NodeTemplateConfig'
__table_args__ = (
db.UniqueConstraint('node_template_id', 'node_process_property_id'),
@@ -168,7 +160,7 @@ class NodeTemplateConfig(db.Model, BaseModel):
self.value)
class ClusterNodeCount(db.Model, BaseModel):
class ClusterNodeCount(db.Model):
__tablename__ = 'ClusterNodeCount'
__table_args__ = (
db.UniqueConstraint('cluster_id', 'node_template_id'),
@@ -191,7 +183,7 @@ class ClusterNodeCount(db.Model, BaseModel):
% (self.node_template_id, self.count)
class Node(db.Model, BaseModel):
class Node(db.Model):
__tablename__ = 'Node'
# do we need own id?
@@ -209,7 +201,7 @@ class Node(db.Model, BaseModel):
return '<Node based on %s>' % self.node_template.name
class ServiceUrl(db.Model, BaseModel):
class ServiceUrl(db.Model):
__tablename__ = 'ServiceUrl'
id = db.Column(db.String(36), primary_key=True)