Merge from BR_LIBBATCH_2_0

[modules/kernel.git] / src / LifeCycleCORBA_SWIG / TestLifeCycleCORBA.py

diff --git a/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py b/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
index 31d1d310f3e231b044891e95b040002bbce947ae..7fb60dfeb78f122d9c2554ed90de5b8e150b0af9 100644 (file)
--- a/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
+++ b/src/LifeCycleCORBA_SWIG/TestLifeCycleCORBA.py
@@ -37,10 +37,9 @@ 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)
@@ -58,31 +57,32 @@ 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'
 
 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'