From: Julien Tribino <julien.tribino@inria.fr>
Date: Thu, 5 Jun 2014 08:16:26 +0000 (+0200)
Subject: Merge the OMF 6 branch
X-Git-Tag: nepi-3.1.0~30
X-Git-Url: http://git.onelab.eu/?p=nepi.git;a=commitdiff_plain;h=2e80f0fafa0c2ef6a5f536efd4c868c91468f962

Merge the OMF 6 branch
---

2e80f0fafa0c2ef6a5f536efd4c868c91468f962
diff --cc src/nepi/resources/omf/application.py
index 8ef2b509,a7f131b8..b6d8d13a
--- a/src/nepi/resources/omf/application.py
+++ b/src/nepi/resources/omf/application.py
@@@ -46,20 -48,21 +48,21 @@@ class OMFApplication(OMFResource)
          """ Register the attributes of an OMF application
  
          """
-         appid = Attribute("appid", "Name of the application")
-         path = Attribute("path", "Path of the application")
-         args = Attribute("args", "Argument of the application")
+         command = Attribute("command", "Command to execute")
          env = Attribute("env", "Environnement variable of the application")
+ 
+         # For OMF 5:
+         appid = Attribute("appid", "Name of the application")
          stdin = Attribute("stdin", "Input of the application", default = "")
          sources = Attribute("sources", "Sources of the application", 
 -                     flags = Flags.ExecReadOnly)
 +                     flags = Flags.Design)
          sshuser = Attribute("sshUser", "user to connect with ssh", 
 -                     flags = Flags.ExecReadOnly)
 +                     flags = Flags.Design)
          sshkey = Attribute("sshKey", "key to use for ssh", 
 -                     flags = Flags.ExecReadOnly)
 +                     flags = Flags.Design)
+ 
          cls._register_attribute(appid)
-         cls._register_attribute(path)
-         cls._register_attribute(args)
+         cls._register_attribute(command)
          cls._register_attribute(env)
          cls._register_attribute(stdin)
          cls._register_attribute(sources)
diff --cc src/nepi/resources/omf/omf_client.py
index 05af4f1e,113bd1e3..42f1d516
--- a/src/nepi/resources/omf/omf_client.py
+++ b/src/nepi/resources/omf/omf_client.py
@@@ -19,7 -19,8 +19,7 @@@
  #         Julien Tribino <julien.tribino@inria.fr>
  
  from nepi.util.logger import Logger
- 
+ from nepi.resources.omf.omf6_parser import OMF6Parser
 -
  try:
      import sleekxmpp
      from sleekxmpp.exceptions import IqError, IqTimeout