git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update test and examples for OMF6 in OMF section
[nepi.git]
/
src
/
nepi
/
resources
/
omf
/
omf5_api.py
diff --git
a/src/nepi/resources/omf/omf5_api.py
b/src/nepi/resources/omf/omf5_api.py
index
e01a754
..
517a95c
100644
(file)
--- a/
src/nepi/resources/omf/omf5_api.py
+++ b/
src/nepi/resources/omf/omf5_api.py
@@
-31,10
+31,10
@@
class OMF5API(Logger):
"""
.. class:: Class Args :
"""
.. class:: Class Args :
- :param slice: Xmpp Slice
- :type slice: str
:param host: Xmpp Server
:type host: str
:param host: Xmpp Server
:type host: str
+ :param slice: Xmpp Slice
+ :type slice: str
:param port: Xmpp Port
:type port: str
:param password: Xmpp password
:param port: Xmpp Port
:type port: str
:param password: Xmpp password
@@
-49,14
+49,13
@@
class OMF5API(Logger):
instead of OMF used for OMF5.3
"""
instead of OMF used for OMF5.3
"""
- def __init__(self,
slice, host
, port, password, xmpp_root = None,
+ def __init__(self,
host, slice
, port, password, xmpp_root = None,
exp_id = None):
"""
exp_id = None):
"""
-
- :param slice: Xmpp Slice
- :type slice: str
:param host: Xmpp Server
:type host: str
:param host: Xmpp Server
:type host: str
+ :param slice: Xmpp Slice
+ :type slice: str
:param port: Xmpp Port
:type port: str
:param password: Xmpp password
:param port: Xmpp Port
:type port: str
:param password: Xmpp password
@@
-65,7
+64,7
@@
class OMF5API(Logger):
:type xmpp_root: str
"""
:type xmpp_root: str
"""
- super(OMF
API, self).__init__("OMF
API")
+ super(OMF
5API, self).__init__("OMF5
API")
self._exp_id = exp_id
self._user = "%s-%s" % (slice, self._exp_id)
self._slice = slice
self._exp_id = exp_id
self._user = "%s-%s" % (slice, self._exp_id)
self._slice = slice