Tue Feb 23 04:44:49 UTC 2010 William R. Otte <wotte@dre.vanderbilt.edu>

5 files changed, 526 insertions, 9 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index f4a15a76ba3..6b1a3ee9c5f 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,16 @@
+Tue Feb 23 04:44:49 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
+
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp:
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp:
+
+          Tests to excercise process colocation when passed through the
+          EM.
+
+        * DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl:
+
+          Test script was broken and not actually running tests.
+
 Tue Feb 23 04:05:06 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
         * DAnCE/bin/PythonDAnCE/generator/__init__.py:
@@ -10,7 +23,7 @@ Tue Feb 23 04:05:06 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
         * DAnCE/bin/PythonDAnCE/generator/internal_endpoint.py:
         * DAnCE/bin/generate_plan.py:
 
-          Improvements to allow more expressive plan generation. 
+          Improvements to allow more expressive plan generation.
 
 Tue Feb 23 04:03:46 UTC 2010  William R. Otte  <wotte@dre.vanderbilt.edu>
 
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp
new file mode 100644
index 00000000000..f50259d17a6
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation.cdp
@@ -0,0 +1,127 @@
+<Deployment:DeploymentPlan
+  xmlns:Deployment="http://www.omg.org/Deployment"
+  xmlns:xmi="http://www.omg.org/XMI"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Server Dance implementation-->
+  <implementation xmi:id="ProcessColocationComponentImplementation">
+    <name>ProcessColocationComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="ProcessColocation_ExecArtifact" />
+    <artifact xmi:idref="ProcessColocation_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_ProcessColocation_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_ProcessColocation_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ProcessColocation_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ProcessColocation_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="ProcessColocationComponentInstance_1">
+    <name>ProcessColocationComponent_One</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process One</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_2">
+    <name>ProcessColocationComponent_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process Two</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="ProcessColocation_ExecArtifact">
+    <name>ProcessColocation_exec</name>
+    <source/>
+    <node/>
+    <location>ProcessColocation_exec</location>
+  </artifact>
+  <artifact xmi:id="ProcessColocation_SvntArtifact">
+    <name>ProcessColocation_svnt</name>
+    <source/>
+    <node/>
+    <location>ProcessColocation_svnt</location>
+  </artifact>
+  
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" />
+  </localityConstraint>
+    
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" />
+  </localityConstraint>
+
+  </Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp
new file mode 100644
index 00000000000..bed7f909530
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_2.cdp
@@ -0,0 +1,168 @@
+<Deployment:DeploymentPlan
+  xmlns:Deployment="http://www.omg.org/Deployment"
+  xmlns:xmi="http://www.omg.org/XMI"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Server Dance implementation-->
+  <implementation xmi:id="ProcessColocationComponentImplementation">
+    <name>ProcessColocationComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="ProcessColocation_ExecArtifact" />
+    <artifact xmi:idref="ProcessColocation_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_ProcessColocation_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_ProcessColocation_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ProcessColocation_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ProcessColocation_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="ProcessColocationComponentInstance_1">
+    <name>ProcessColocationComponent_One</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process One</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_1_2">
+    <name>ProcessColocationComponent_One_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process One</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_2">
+    <name>ProcessColocationComponent_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process Two</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_2_2">
+    <name>ProcessColocationComponent_Two_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process Two</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="ProcessColocation_ExecArtifact">
+    <name>ProcessColocation_exec</name>
+    <source/>
+    <node/>
+    <location>ProcessColocation_exec</location>
+  </artifact>
+  <artifact xmi:id="ProcessColocation_SvntArtifact">
+    <name>ProcessColocation_svnt</name>
+    <source/>
+    <node/>
+    <location>ProcessColocation_svnt</location>
+  </artifact>
+  
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" />
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" />
+  </localityConstraint>
+    
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" />
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2_2" />
+  </localityConstraint>
+
+  </Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp
new file mode 100644
index 00000000000..b8aa525c2b2
--- /dev/null
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/SimpleProcessColocation_Default.cdp
@@ -0,0 +1,208 @@
+<Deployment:DeploymentPlan
+  xmlns:Deployment="http://www.omg.org/Deployment"
+  xmlns:xmi="http://www.omg.org/XMI"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://www.omg.org/Deployment Deployment.xsd">
+  <label>SimpleComponent_Home</label>
+  <UUID>SimpleComponent_Home</UUID>
+
+  <!-- Implementations declarations -->
+
+  <!-- Server Dance implementation-->
+  <implementation xmi:id="ProcessColocationComponentImplementation">
+    <name>ProcessColocationComponentImplementation</name>
+    <source/>
+    <artifact xmi:idref="ProcessColocation_ExecArtifact" />
+    <artifact xmi:idref="ProcessColocation_SvntArtifact" />
+    <execParameter>
+      <!-- entrypoint as exec parameter (see §10.6.1) -->
+      <name>component factory</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_ProcessColocation_Impl</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantEntrypoint</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>create_Simple_ProcessColocation_Servant</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ServantArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ProcessColocation_svnt</string>
+        </value>
+      </value>
+    </execParameter>
+    <execParameter>
+      <name>edu.vanderbilt.dre.CIAO.ExecutorArtifact</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>ProcessColocation_exec</string>
+        </value>
+      </value>
+    </execParameter>
+  </implementation>
+
+  <instance xmi:id="ProcessColocationComponentInstance_Default_1">
+    <name>ProcessColocationComponent_Default_One</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Default Process</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_Default_2">
+    <name>ProcessColocationComponent_Default_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Default Process</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_1">
+    <name>ProcessColocationComponent_One</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process One</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_1_2">
+    <name>ProcessColocationComponent_One_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process One</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_2">
+    <name>ProcessColocationComponent_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process Two</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <instance xmi:id="ProcessColocationComponentInstance_2_2">
+    <name>ProcessColocationComponent_Two_Two</name>
+    <node>NodeOne</node>
+    <!-- hostname -->
+    <source/>
+    <implementation xmi:idref="ProcessColocationComponentImplementation" />
+    <configProperty>
+      <name>process_name</name>
+      <value>
+        <type>
+          <kind>tk_string</kind>
+        </type>
+        <value>
+          <string>Process Two</string>
+        </value>
+      </value>
+    </configProperty>
+  </instance>
+
+  <!-- Artifacts declarations -->
+  <artifact xmi:id="ProcessColocation_ExecArtifact">
+    <name>ProcessColocation_exec</name>
+    <source/>
+    <node/>
+    <location>ProcessColocation_exec</location>
+  </artifact>
+  <artifact xmi:id="ProcessColocation_SvntArtifact">
+    <name>ProcessColocation_svnt</name>
+    <source/>
+    <node/>
+    <location>ProcessColocation_svnt</location>
+  </artifact>
+  
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1" />
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_1_2" />
+  </localityConstraint>
+    
+  <localityConstraint>
+    <constraint>SameProcess</constraint>
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2" />
+    <constrainedInstance xmi:idref="ProcessColocationComponentInstance_2_2" />
+  </localityConstraint>
+
+  </Deployment:DeploymentPlan>
diff --git a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
index 3bed5e781d3..847b3192f3c 100755
--- a/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
+++ b/CIAO/DAnCE/tests/CIAO/ExecutionManager-Deployments/run_test.pl
@@ -16,11 +16,11 @@ $daemons_running = 0;
 $em_running = 0;
 $ns_running = 0;
 
-$nr_daemon = 1;
-@ports = ( 60001 );
-@iorbases = ( "NodeApp1.ior" );
+$nr_daemon = 2;
+@ports = ( 60001, 60002 );
+@iorbases = ( "NodeApp1.ior", "NodeApp2.ior" );
 @iorfiles = 0;
-@nodenames = ( "NodeOne" );
+@nodenames = ( "NodeOne", "NodeTwo" );
 
 # ior files other than daemon
 $ior_nsbase = "ns.ior";
@@ -52,7 +52,7 @@ sub create_targets {
     #   daemon
     for ($i = 0; $i < $nr_daemon; ++$i) {
         $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for deamon $i failed\n";
-        $tg_daemons[$i]->AddLibPath ('..');
+        $tg_daemons[$i]->AddLibPath ('../Components');
     }
     #   execution manager
     $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
@@ -198,9 +198,10 @@ foreach $file (@files) {
     # Invoke executor - start the application -.
     print "Invoking executor - launch the application -\n";
     $E = $tg_executor->CreateProcess ("simple_em_launcher",
-                               "file://$ior_emfile $file");
-
-
+				      "file://$ior_emfile $file");
+    
+    $E->SpawnWaitKill (120);
+    
     print "Executor finished.\n";
 
     delete_ior_files ();