X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FLifeCycleCORBA_SWIG%2FTestLifeCycleCORBA.py;h=94c70e0220a49ca80fed8c3ee504526ab8485e93;hb=39b7aec84a009a8a1946ea7b8e50c066f1cfa1f3;hp=a2ccd2f5d54d41b9fcd2d21fcc9b0bce2a5003f6;hpb=e6bfea36374791cd31c274a2f97df90dc60ddaf3;p=modules%2Fkernel.git

diff --git a/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py b/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
index a2ccd2f5d..94c70e022 100644
--- a/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
+++ b/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
@@ -1,24 +1,28 @@
-# Copyright (C) 2005  OPEN CASCADE, CEA, EDF R&D, LEG
-#           PRINCIPIA R&D, EADS CCR, Lip6, BV, CEDRAT
+#  -*- coding: iso-8859-1 -*-
+# Copyright (C) 2007-2020  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+# CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either 
-# version 2.1 of the License.
-# 
-# This library is distributed in the hope that it will be useful 
-# but WITHOUT ANY WARRANTY; without even the implied warranty of 
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 # Lesser General Public License for more details.
-# 
-# You should have received a copy of the GNU Lesser General Public  
-# License along with this library; if not, write to the Free Software 
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-# 
+#
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
-# 
+#
 
 #from TestLifeCycleCORBA import *
-
+#
 import os
 import Engines
 import LifeCycleCORBA
@@ -33,18 +37,17 @@ try :
     obj=lcc.FindOrLoad_Component("FactoryServer","SalomeTestComponent")
     comp=obj._narrow(Engines.TestComponent)
     comp.Coucou(1)
-    param={}
-    #param['hostname']='cli76cc'
-    param['hostname']=host
-    param['container_name']='FactoryServer'
+    param = LifeCycleCORBA.ContainerParameters()
+    param.resource_params.hostname = host
+    param.container_name = 'FactoryServer'
     comp=lcc.FindOrLoad_Component(param,'SalomeTestComponent')
     engine=lcc.FindComponent(param,'SalomeTestComponent')
     engine.Coucou(1)
 except :
-    print 'lcc.FindOrLoad_Component("FactoryServer","SalomeTestComponent") failed'
+    print('lcc.FindOrLoad_Component("FactoryServer","SalomeTestComponent") failed')
 
 import sys
-import CORBA
+from omniORB import CORBA
 import CosNaming
 orb = CORBA.ORB_init(sys.argv, CORBA.ORB_ID)
 obj = orb.resolve_initial_references("NameService")
@@ -54,32 +57,33 @@ context_name.append(CosNaming.NameComponent( 'ContainerManager' , 'object' ) )
 ContainerManager = rootContext.resolve( context_name )
 
 try :
-    myContainerparamsCPP = Engines.MachineParameters( 'myContainer' , host , 'osf' , 0 , 0 , 0 , 0 , 0 )
+    myContainerparamsCPP = LifeCycleCORBA.ContainerParameters()
+    param.resource_params.hostname = host
+    param.container_name = 'myContainer'
     computerlistCPP = [host]
     containerCPP = ContainerManager.FindOrStartContainer( myContainerparamsCPP , computerlistCPP )
     containerCPP.ping()
     ComponentparamsCPP={}
     ComponentparamsCPP['hostname']=host
     ComponentparamsCPP['container_name']='myContainer'
-    compCPP=lcc.FindOrLoad_Component(ComponentparamsCPP,'SalomeTestComponent')
+    compCPP=lcc.FindOrLoad_Component(myContainerparamsCPP,'SalomeTestComponent')
     compCPP.Coucou(1)
-    engineCPP=lcc.FindComponent(ComponentparamsCPP,'SalomeTestComponent')
+    engineCPP=lcc.FindComponent(myContainerparamsCPP,'SalomeTestComponent')
     engineCPP.Coucou(1)
 except :
-    print 'ContainerManager.FindOrStartContainer( myContainerparams , computerlist ) C++ failed'
+    print('ContainerManager.FindOrStartContainer( myContainerparams , computerlist ) C++ failed')
 
 try :
-    myContainerparamsPy = Engines.MachineParameters( 'myContainerPy' , host , 'osf' , 0 , 0 , 0 , 0 , 0 )
+    myContainerparamsPy = LifeCycleCORBA.ContainerParameters()
+    param.resource_params.hostname = host
+    param.container_name = 'myContainerPy'
     computerlistPy = [host]
     containerPy = ContainerManager.FindOrStartContainer( myContainerparamsPy , computerlistPy )
     containerPy.ping()
-    ComponentparamsPy={}
-    ComponentparamsPy['hostname']=host
-    ComponentparamsPy['container_name']='myContainerPy'
-    compPy=lcc.FindOrLoad_Component(ComponentparamsPy,'SALOME_TestComponentPy')
+    compPy=lcc.FindOrLoad_Component(myContainerparamsPy,'SALOME_TestComponentPy')
     compPy.Coucou(1)
-    enginePy=lcc.FindComponent(ComponentparamsPy,'SALOME_TestComponentPy')
+    enginePy=lcc.FindComponent(myContainerparamsPy,'SALOME_TestComponentPy')
     enginePy.Coucou(1)
 except :
-    print 'ContainerManager.FindOrStartContainer( myContainerparams , computerlist ) Python failed'
+    print('ContainerManager.FindOrStartContainer( myContainerparams , computerlist ) Python failed')