projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovs.stream: Drop Stream.get_name() since clients can use 'name' directly.
[openvswitch]
/
python
/
ovs
/
jsonrpc.py
diff --git
a/python/ovs/jsonrpc.py
b/python/ovs/jsonrpc.py
index 975d40f7128ecfaf85b148e406a1cdc9b8784536..da7fa084bd37524993ae3d596bc1c40c2d6a6b47 100644
(file)
--- a/
python/ovs/jsonrpc.py
+++ b/
python/ovs/jsonrpc.py
@@
-1,4
+1,4
@@
-# Copyright (c) 2010 Nicira Networks
+# Copyright (c) 2010
, 2011
Nicira Networks
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-16,6
+16,7
@@
import errno
import logging
import os
import logging
import os
+import ovs.json
import ovs.poller
import ovs.reconnect
import ovs.stream
import ovs.poller
import ovs.reconnect
import ovs.stream
@@
-33,10
+34,9
@@
class Message(object):
T_NOTIFY: "notification",
T_REPLY: "reply",
T_ERROR: "error"}
T_NOTIFY: "notification",
T_REPLY: "reply",
T_ERROR: "error"}
- __next_id = 0
- def __init__(self, type, method, params, result, error, id):
- self.type = type
+ def __init__(self, type
_
, method, params, result, error, id):
+ self.type = type
_
self.method = method
self.params = params
self.result = result
self.method = method
self.params = params
self.result = result
@@
-69,8
+69,8
@@
class Message(object):
return Message(Message.T_ERROR, None, None, None, error, id)
@staticmethod
return Message(Message.T_ERROR, None, None, None, error, id)
@staticmethod
- def type_to_string(type):
- return Message.__types[type]
+ def type_to_string(type
_
):
+ return Message.__types[type
_
]
@staticmethod
def __validate_arg(value, name, must_have):
@staticmethod
def __validate_arg(value, name, must_have):
@@
-174,7
+174,7
@@
class Message(object):
class Connection(object):
def __init__(self, stream):
class Connection(object):
def __init__(self, stream):
- self.name = stream.
get_name()
+ self.name = stream.
name
self.stream = stream
self.status = 0
self.input = ""
self.stream = stream
self.status = 0
self.input = ""
@@
-215,9
+215,6
@@
class Connection(object):
else:
return len(self.output)
else:
return len(self.output)
- def get_name(self):
- return self.name
-
def __log_msg(self, title, msg):
logging.debug("%s: %s %s" % (self.name, title, msg))
def __log_msg(self, title, msg):
logging.debug("%s: %s %s" % (self.name, title, msg))
@@
-252,7
+249,7
@@
class Connection(object):
return self.status, None
while True:
return self.status, None
while True:
- if
len(self.input) == 0
:
+ if
not self.input
:
error, data = self.stream.recv(4096)
if error:
if error == errno.EAGAIN:
error, data = self.stream.recv(4096)
if error:
if error == errno.EAGAIN:
@@
-263,7
+260,7
@@
class Connection(object):
% (self.name, os.strerror(error)))
self.error(error)
return self.status, None
% (self.name, os.strerror(error)))
self.error(error)
return self.status, None
- elif
len(data) == 0
:
+ elif
not data
:
self.error(EOF)
return EOF, None
else:
self.error(EOF)
return EOF, None
else:
@@
-324,7
+321,7
@@
class Connection(object):
return msg
def recv_wait(self, poller):
return msg
def recv_wait(self, poller):
- if self.status or
len(self.input) > 0
:
+ if self.status or
self.input
:
poller.immediate_wake()
else:
self.stream.recv_wait(poller)
poller.immediate_wake()
else:
self.stream.recv_wait(poller)
@@
-371,7
+368,7
@@
class Session(object):
def open_unreliably(jsonrpc):
reconnect = ovs.reconnect.Reconnect(ovs.timeval.msec())
reconnect.set_quiet(True)
def open_unreliably(jsonrpc):
reconnect = ovs.reconnect.Reconnect(ovs.timeval.msec())
reconnect.set_quiet(True)
- reconnect.set_name(jsonrpc.
get_name()
)
+ reconnect.set_name(jsonrpc.
name
)
reconnect.set_max_tries(0)
reconnect.connected(ovs.timeval.msec())
return Session(reconnect, jsonrpc)
reconnect.set_max_tries(0)
reconnect.connected(ovs.timeval.msec())
return Session(reconnect, jsonrpc)