mir/ovs
2
0
Fork 0
mirror of https://github.com/openvswitch/ovs synced 2025-08-30 22:05:19 +00:00
Code Issues Releases Wiki Activity

python ovsdb: Fix one style inconsistency.

Browse Source 
Reported-by: Justin Pettit <jpettit@nicira.com>
This commit is contained in:
Ben Pfaff
2011-06-06 09:09:47 -07:00
parent 6910a6e6f2
commit d26c5b7422
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
python/ovs/db/schema.py
View File

@@ -165,7 +165,7 @@ class TableSchema(object):
@staticmethod
def from_json(json, name):
parser = ovs.db.parser.Parser(json, "table schema for table %s" % name)
columnsJson = parser.get("columns", [dict])
columns_json = parser.get("columns", [dict])
mutable = parser.get_optional("mutable", [bool], True)
max_rows = parser.get_optional("maxRows", [int])
is_root = parser.get_optional("isRoot", [bool], False)
@@ -177,18 +177,18 @@ class TableSchema(object):
elif max_rows <= 0:
raise error.Error("maxRows must be at least 1", json)
if not columnsJson:
if not columns_json:
raise error.Error("table must have at least one column", json)
columns = {}
for columnName, columnJson in columnsJson.iteritems():
if columnName.startswith('_'):
for column_name, column_json in columns_json.iteritems():
if column_name.startswith('_'):
raise error.Error("names beginning with \"_\" are reserved",
json)
elif not ovs.db.parser.is_identifier(columnName):
elif not ovs.db.parser.is_identifier(column_name):
raise error.Error("name must be a valid id", json)
columns[columnName] = ColumnSchema.from_json(columnJson,
columnName)
columns[column_name] = ColumnSchema.from_json(column_json,
column_name)
indexes = []
for index_json in indexes_json: