Fri Nov 23 10:56:41 UTC 2012 Marcel Smit <msmit@remedy.nl>

        * tests/Bug_3769_Regression/Foo_exec.cpp:
	  Minor layout change.

        * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp:
          Added new attribute.

        * bin/ciao_tests.lst:
        * tests/Bug_3769_Regression/descriptors/run_test_cdr.pl:
	  New test: using CDR as input for the plan launcher.

5 files changed, 343 insertions, 1 deletions

diff --git a/CIAO/ChangeLog b/CIAO/ChangeLog
index 627d1f237d9..a922aa214fa 100644
--- a/CIAO/ChangeLog
+++ b/CIAO/ChangeLog
@@ -1,3 +1,15 @@
+Fri Nov 23 10:56:41 UTC 2012  Marcel Smit  <msmit@remedy.nl>
+
+        * tests/Bug_3769_Regression/Foo_exec.cpp:
+	  Minor layout change.
+
+        * tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp:
+          Added new attribute.
+
+        * bin/ciao_tests.lst:
+        * tests/Bug_3769_Regression/descriptors/run_test_cdr.pl:
+	  New test: using CDR as input for the plan launcher.
+
 Fri Nov 23 10:28:23 UTC 2012  Marcel Smit  <msmit@remedy.nl>
 
         * tests/Bug_3769_Regression/Foo.idl:
diff --git a/CIAO/bin/ciao_tests.lst b/CIAO/bin/ciao_tests.lst
index e70ac1e52b1..0fb2c5d210b 100644
--- a/CIAO/bin/ciao_tests.lst
+++ b/CIAO/bin/ciao_tests.lst
@@ -27,6 +27,7 @@ TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test.pl:
 TAO/CIAO/tests/Bug_3834_Regression/descriptors/run_test_without_ns.pl:
 TAO/CIAO/tests/IDL3/Events/Any/run_test.pl: !CCM_NOEVENT
 TAO/CIAO/tests/Bug_3769_Regression/descriptors/run_test.pl:
+TAO/CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl:
 TAO/CIAO/tests/Thread/descriptors/run_test.pl: !CCM_NOEVENT
 TAO/CIAO/tests/Thread/descriptors/run_test_cdd.pl: !CCM_NOEVENT
 TAO/CIAO/tests/CIF/descriptors/run_test.pl: ATIC
diff --git a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp
index 301d53dc378..8c6ca2bc282 100644
--- a/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp
+++ b/CIAO/tests/Bug_3769_Regression/Foo_exec.cpp
@@ -531,7 +531,7 @@ namespace CIAO_Foo_Impl
   void Foo_exec_i::my_struct_struct (const StructModule::StructStruct & my_struct_struct)
   {
     bool error_found = false;
-    
+   
     if (my_struct_struct.type != StructModule::DLT_HARD)
       {
         ACE_ERROR ((LM_ERROR, "ERROR: my_struct_struct.deadline_type != 2, it is %d\n",
diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp b/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp
index ef8f777f3f6..ab3eb7e8328 100644
--- a/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp
+++ b/CIAO/tests/Bug_3769_Regression/descriptors/DeploymentPlan.cdp
@@ -542,6 +542,84 @@
         </value>
       </value>
     </configProperty>
+
+    <configProperty>
+      <name>my_struct_struct</name>
+      <value>
+        <type>
+          <kind>tk_struct</kind>
+          <struct>
+            <name>StructStruct</name>
+            <typeId>IDL:StructModule/StructStruct:1.0</typeId>
+            <member>
+              <name>struct_time</name>
+              <type>
+                <kind>tk_struct</kind>
+                <struct>
+                  <name>Time</name>
+                  <typeId>IDL:StructModule/Time:1.0</typeId>
+                  <member>
+                    <name>sec</name>
+                    <type>
+                      <kind>tk_ulonglong</kind>
+                    </type>
+                  </member>
+                  <member>
+                    <name>nanosec</name>
+                    <type>
+                      <kind>tk_ulong</kind>
+                    </type>
+                  </member>
+                </struct>
+              </type>
+            </member>
+
+            <member>
+              <name>type</name>
+              <type>
+                <kind>tk_enum</kind>
+                <enum>
+                  <name>EndTime</name>
+                  <typeId>IDL:StructModule/EndTime:1.0</typeId>
+                  <member>DLT_NONE</member>
+                  <member>DLT_SOFT</member>
+                  <member>DLT_HARD</member>
+                </enum>
+              </type>
+            </member>
+
+          </struct>
+        </type>
+        <value>
+          <member>
+            <name>struct_time</name>
+            <value>
+              <member>
+                <name>sec</name>
+                <value>
+                  <ulonglong>15</ulonglong>
+                </value>
+              </member>
+              <member>
+                <name>nanosec</name>
+                <value>
+                  <ulong>20</ulong>
+                </value>
+              </member>
+            </value>
+          </member>
+
+          <member>
+            <name>type</name>
+            <value>
+              <enum>DLT_HARD</enum>
+            </value>
+          </member>
+        </value>
+
+      </value>
+    </configProperty>
+    
   </instance>
 
   <artifact xmi:id="_669DBD2E-E130-11DE-B472-00242C889DAA">
diff --git a/CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl b/CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl
new file mode 100755
index 00000000000..ead7a7c7e98
--- /dev/null
+++ b/CIAO/tests/Bug_3769_Regression/descriptors/run_test_cdr.pl
@@ -0,0 +1,251 @@
+eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}'
+    & eval 'exec perl -S $0 $argv:q'
+    if 0;
+
+# $Id$
+# -*- perl -*-
+
+use lib "$ENV{'ACE_ROOT'}/bin";
+use PerlACE::TestTarget;
+
+$CIAO_ROOT = "$ENV{'CIAO_ROOT'}";
+$TAO_ROOT = "$ENV{'TAO_ROOT'}";
+$DANCE_ROOT = "$ENV{'DANCE_ROOT'}";
+
+$daemons_running = 0;
+$em_running = 0;
+$ns_running = 0;
+
+$nr_daemon = 1;
+@ports = ( 60001 );
+@iorbases = ( "NodeApp2.ior" );
+@iorfiles = 0;
+@nodenames = ( "NodeOne" );
+
+# ior files other than daemon
+# ior files other than daemon
+$ior_nsbase = "ns.ior";
+$ior_nsfile = 0;
+$ior_embase = "EM.ior";
+$ior_emfile = 0;
+
+#  Processes
+$E = 0;
+$EM = 0;
+$NS = 0;
+@DEAMONS = 0;
+
+# targets
+@tg_daemons = 0;
+$tg_naming = 0;
+$tg_exe_man = 0;
+$tg_executor = 0;
+
+$status = 0;
+$cdp_file = "DeploymentPlan.cdp";
+
+sub create_targets {
+    #   naming service
+    $tg_naming = PerlACE::TestTarget::create_target (1) || die "Create target for ns failed\n";
+    $tg_naming->AddLibPath ('..');
+    #   daemon
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i] = PerlACE::TestTarget::create_target ($i+1) || die "Create target for daemon $i failed\n";
+        $tg_daemons[$i]->AddLibPath ('..');
+    }
+    #   execution manager
+    $tg_exe_man = PerlACE::TestTarget::create_target (1) || die "Create target for EM failed\n";
+    $tg_exe_man->AddLibPath ('..');
+    #   executor (plan_launcher)
+    $tg_executor = PerlACE::TestTarget::create_target (1) || die "Create target for executor failed\n";
+    $tg_executor->AddLibPath ('..');
+}
+
+sub init_ior_files {
+    $ior_nsfile = $tg_naming->LocalFile ($ior_nsbase);
+    $ior_emfile = $tg_exe_man->LocalFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+    delete_ior_files ();
+}
+
+# Delete if there are any .ior files.
+sub delete_ior_files {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $tg_daemons[$i]->DeleteFile ($iorbases[$i]);
+    }
+    $tg_naming->DeleteFile ($ior_nsbase);
+    $tg_exe_man->DeleteFile ($ior_embase);
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorfiles[$i] = $tg_daemons[$i]->LocalFile ($iorbases[$i]);
+    }
+}
+
+sub kill_node_daemon {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+    }
+}
+
+sub kill_open_processes {
+    if ($daemons_running == 1) {
+        kill_node_daemon ();
+    }
+
+    if ($em_running == 1) {
+        $EM->Kill (); $EM->TimedWait (1);
+    }
+
+    if ($ns_running == 1) {
+        $NS->Kill (); $NS->TimedWait (1);
+    }
+    # in case shutdown did not perform as expected
+    $tg_executor->KillAll ('dance_locality_manager');
+}
+
+sub run_node_daemons {
+    for ($i = 0; $i < $nr_daemon; ++$i) {
+        $iorbase = $iorbases[$i];
+        $iorfile = $iorfiles[$i];
+        $port = $ports[$i];
+        $nodename = $nodenames[$i];
+        $iiop = "iiop://localhost:$port";
+        $node_app = $tg_daemons[$i]->GetArchDir("$DANCE_ROOT/bin/") . "dance_locality_manager";
+
+        $d_cmd = "$DANCE_ROOT/bin/dance_node_manager";
+        $d_param = "-ORBEndpoint $iiop -s $node_app -n $nodename=$iorfile -t 30 --domain-nc corbaloc:rir:/NameService --instance-nc corbaloc:rir:/NameService";
+
+        print "Run dance_node_manager with $d_param\n";
+
+        $DEAMONS[$i] = $tg_daemons[$i]->CreateProcess ($d_cmd, $d_param);
+        $DEAMONS[$i]->Spawn ();
+
+        if ($tg_daemons[$i]->WaitForFileTimed($iorbase,
+                                        $tg_daemons[$i]->ProcessStartWaitInterval ()) == -1) {
+            print STDERR
+                "ERROR: The ior $iorfile file of node daemon $i could not be found\n";
+            for (; $i >= 0; --$i) {
+                $DEAMONS[$i]->Kill (); $DEAMONS[$i]->TimedWait (1);
+            }
+            return -1;
+        }
+    }
+    return 0;
+}
+
+create_targets ();
+init_ior_files ();
+
+# Invoke naming service
+
+$NS = $tg_naming->CreateProcess ("$TAO_ROOT/orbsvcs/Naming_Service/tao_cosnaming", " -ORBEndpoint iiop://localhost:60003 -o $ior_nsfile");
+
+$ns_status = $NS->Spawn ();
+
+if ($ns_status != 0) {
+    print STDERR "ERROR: Unable to execute the naming service\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+print STDERR "Starting Naming Service with  -ORBEndpoint iiop://localhost:60003 -o ns.ior\n";
+
+if ($tg_naming->WaitForFileTimed ($ior_nsbase,
+                                  $tg_naming->ProcessStartWaitInterval ()) == -1) {
+    print STDERR "ERROR: cannot find naming service IOR file\n";
+    $NS->Kill (); $NS->TimedWait (1);
+    exit 1;
+}
+
+$ns_running = 1;
+# Set up NamingService environment
+$ENV{"NameServiceIOR"} = "corbaloc:iiop:localhost:60003/NameService";
+
+# Invoke node daemon.
+print "Invoking node daemon\n";
+$status = run_node_daemons ();
+
+if ($status != 0) {
+    print STDERR "ERROR: Unable to execute the node daemon\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$cdr_file = $cdp_file;
+$cdr_file =~ s/cdp/cdr/;
+
+print "Converting $cdp_file to $cdr_file\n";
+
+$tg_executor->DeleteFile ($cdr_file);
+
+$CONVERT = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_convert_plan", "-x $cdp_file -o $cdr_file");
+
+$convert_status = $CONVERT->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
+
+if ($convert_status != 0) {
+  print STDERR "ERROR: Can't convert $cdp_file to $cdr_file\n";
+  kill_open_processes ();
+  exit 1;
+}
+
+$daemons_running = 1;
+
+# Invoke execution manager.
+print "Invoking execution manager (dance_execution_manager.exe) with -e$ior_emfile\n";
+$EM = $tg_exe_man->CreateProcess ("$DANCE_ROOT/bin/dance_execution_manager",
+                                    "-e$ior_emfile --domain-nc corbaloc:rir:/NameService");
+$EM->Spawn ();
+
+if ($tg_exe_man->WaitForFileTimed ($ior_embase,
+                                $tg_exe_man->ProcessStartWaitInterval ()) == -1) {
+    print STDERR
+      "ERROR: The ior file of execution manager could not be found\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+$em_running = 1;
+
+# Invoke executor - start the application -.
+print "Invoking executor - launch the application -\n";
+
+print "Start dance_plan_launcher.exe with -c $cdr_file -k file://$ior_emfile\n";
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                                  "-c $cdr_file -k file://$ior_emfile");
+$E->SpawnWaitKill (2*$tg_executor->ProcessStartWaitInterval ());
+
+for ($i = 0; $i < $nr_daemon; ++$i) {
+    if ($tg_daemons[$i]->WaitForFileTimed ($iorbases[$i],
+                            $tg_daemons[$i]->ProcessStopWaitInterval ()) == -1) {
+        print STDERR "ERROR: The ior file of daemon $i could not be found\n";
+        kill_open_processes ();
+        exit 1;
+    }
+}
+
+print "Sleeping 5 seconds to allow task to complete\n";
+sleep (5);
+
+# Invoke executor - stop the application -.
+print "Invoking executor - stop the application -\n";
+print "by running dance_plan_launcher.exe with -k file://$ior_emfile -c $cdr_file\n";
+
+$E = $tg_executor->CreateProcess ("$DANCE_ROOT/bin/dance_plan_launcher",
+                                  "-k file://$ior_emfile -c $cdr_file -s");
+
+$pl_status = $E->SpawnWaitKill ($tg_executor->ProcessStartWaitInterval ());
+
+if ($pl_status != 0) {
+    print STDERR "ERROR: dance_plan_launcher returned $pl_status\n";
+    kill_open_processes ();
+    exit 1;
+}
+
+print "Executor returned.\n";
+print "Shutting down rest of the processes.\n";
+
+delete_ior_files ();
+kill_open_processes ();
+
+exit $status;