aboutsummaryrefslogtreecommitdiffstats
path: root/netmodel/model/query.py
diff options
context:
space:
mode:
authorMarcel Enguehard <mengueha+fdio@cisco.com>2017-07-19 11:26:26 +0200
committerMarcel Enguehard <mengueha+fdio@cisco.com>2017-07-19 11:51:26 +0000
commit3e6678f9c692553e8902da4d6fb1fe6c087db1f4 (patch)
tree580a46ca5de22a044319eabb295ad980d50589ec /netmodel/model/query.py
parent08c4f765cf29dbd6e9a616c542552417eece14fc (diff)
* GUI resource
* MemIf interface for VPP * Better netmodel integration * Draft documentation * New tutorials * Improved monitoring and error handling * Refactored IP addresses and prefixes representation * Improved image mgmt for LXD * Various bugfixes and code refactoring Change-Id: I90da6cf7b5716bc7deb6bf4e24d3f9f01b5a9b0f Signed-off-by: Marcel Enguehard <mengueha+fdio@cisco.com>
Diffstat (limited to 'netmodel/model/query.py')
-rw-r--r--netmodel/model/query.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/netmodel/model/query.py b/netmodel/model/query.py
index c182cb45..a1d331fb 100644
--- a/netmodel/model/query.py
+++ b/netmodel/model/query.py
@@ -46,7 +46,7 @@ FUNCTION2STR = {
STR2FUNCTION = dict((v, k) for k, v in FUNCTION2STR.items())
class Query:
- def __init__(self, action, object_name, filter = None, params = None,
+ def __init__(self, action, object_name, filter = None, params = None,
field_names = None, aggregate = None, last = False, reply = False):
self.action = action
self.object_name = object_name
@@ -64,13 +64,13 @@ class Query:
if field_names:
if isinstance(field_names, FieldNames):
self.field_names = field_names
- else:
+ else:
self.field_names = FieldNames(field_names)
else:
self.field_names = FieldNames()
self.aggregate = aggregate
-
+
self.last = last
self.reply = reply
@@ -100,7 +100,7 @@ class Query:
field_names = FieldNames(star = True)
last = dic.get('last', False)
reply = dic.get('reply', False)
- return Query(action, object_name, filter, params, field_names,
+ return Query(action, object_name, filter, params, field_names,
aggregate, last)
def to_sql(self, multiline = False):
@@ -140,8 +140,7 @@ class Query:
return strmap[self.action] % locals()
- def __str__(self):
- return self.to_sql()
-
def __repr__(self):
return self.to_sql()
+
+ __str__ = __repr__