[tokkee]

tokkee.org

Code

projects / gosa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: cead0ab)
* new functionality for gosa-si plugin opsi_com.pm: opsi_getAllSoftwareLicenses
authorrettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 28 Sep 2009 14:36:16 +0000 (14:36 +0000)
committerrettenbe <rettenbe@594d385d-05f5-0310-b6e9-bd551577e9d8>
Mon, 28 Sep 2009 14:36:16 +0000 (14:36 +0000)
* extended function check_opsi_res at GosaSupportDaemon.pm

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@14379 594d385d-05f5-0310-b6e9-bd551577e9d8

gosa-si/modules/GosaSupportDaemon.pm patch | blob | history
gosa-si/server/events/opsi_com.pm patch | blob | history
gosa-si/tests/client.php patch | blob | history

diff --git a/gosa-si/modules/GosaSupportDaemon.pm b/gosa-si/modules/GosaSupportDaemon.pm
index 1301f6605f51f48e7b584d3117d6e5a2d22ad9bb..6a28f8c730ec86655436e30746331836ea399b47 100644 (file)
--- a/gosa-si/modules/GosaSupportDaemon.pm
+++ b/gosa-si/modules/GosaSupportDaemon.pm
@@ -848,13 +848,19 @@ sub check_opsi_res {
         if ($res->is_error) {
             my $error_string;
             if (ref $res->error_message eq "HASH") { 
+                               # for different versions
                 $error_string = $res->error_message->{'message'}; 
+                               $_ = $res->error_message->{'message'};
             } else { 
+                               # for different versions
                 $error_string = $res->error_message; 
+                               $_ = $res->error_message;
             }
             return 1, $error_string;
         }
     } else {
+               # for different versions
+               $_ = $main::opsi_client->status_line;
         return 1, $main::opsi_client->status_line;
     }
     return 0;
diff --git a/gosa-si/server/events/opsi_com.pm b/gosa-si/server/events/opsi_com.pm
index 040f4a9b9542e3076a83fb12eaf7a8db5e9c22b7..567e6119fc0bcfcb7d43225a39ee3d070cdeeeb4 100644 (file)
--- a/gosa-si/server/events/opsi_com.pm
+++ b/gosa-si/server/events/opsi_com.pm
@@ -34,6 +34,7 @@ my @events = (
        "opsi_getLicensePools_listOfHashes",
        "opsi_getLicenseInformationForProduct",
        "opsi_getPool",
+       "opsi_getAllSoftwareLicenses",
        "opsi_removeLicense",
        "opsi_getReservedLicenses",
        "opsi_boundHostToLicense",
@@ -96,13 +97,17 @@ sub _check_xml_tag_is_ok {
 #
 # @brief Writes the log line and returns the error message for GOsa.
 #
-sub _give_feedback {
-       my ($msg, $msg_hash, $session_id, $error) = @_;
-       &main::daemon_log("$session_id ERROR: $error: ".$msg, 1);
-       my $out_hash = &main::create_xml_hash("error", $main::server_address, @{$msg_hash->{'source'}}[0], $error);
-       return &create_xml_string($out_hash);
+sub _giveErrorFeedback {
+       my ($msg_hash, $err_string, $session_id) = @_;
+       &main::daemon_log("$session_id ERROR: $err_string", 1);
+       my $out_hash = &main::create_xml_hash("error", $main::server_address, @{$msg_hash->{source}}[0], $err_string);
+    if (exists $msg_hash->{forward_to_gosa}) {
+        &add_content2xml_hash($out_hash, "forward_to_gosa", @{$msg_hash->{'forward_to_gosa'}}[0]);
+    }
+       return ( &create_xml_string($out_hash) );
 }
 
+
 ## @method opsi_add_product_to_client
 # Adds an Opsi product to an Opsi client.
 # @param msg - STRING - xml message with tags hostId and productId
@@ -115,8 +120,6 @@ sub opsi_add_product_to_client {
     my $source = @{$msg_hash->{'source'}}[0];
     my $target = @{$msg_hash->{'target'}}[0];
     my $forward_to_gosa = @{$msg_hash->{'forward_to_gosa'}}[0];
-    my ($hostId, $productId);
-    my $error = 0;
 
     # Build return message
     my $out_hash = &main::create_xml_hash("answer_$header", $main::server_address, $source);
@@ -126,41 +129,28 @@ sub opsi_add_product_to_client {
 
     # Sanity check of needed parameter
     if ((not exists $msg_hash->{'hostId'}) || (@{$msg_hash->{'hostId'}} != 1) || (@{$msg_hash->{'hostId'}}[0] eq ref 'HASH'))  {
-        $error++;
-        &add_content2xml_hash($out_hash, "error_string", "no hostId specified or hostId tag invalid");
-        &add_content2xml_hash($out_hash, "error", "hostId");
-        &main::daemon_log("$session_id ERROR: no hostId specified or hostId tag invalid: $msg", 1); 
-
+               return &_giveErrorFeedback($msg_hash, "no hostId specified or hostId tag invalid", $session_id);
     }
     if ((not exists $msg_hash->{'productId'}) || (@{$msg_hash->{'productId'}} != 1) || (@{$msg_hash->{'productId'}}[0] eq ref 'HASH')) {
-        $error++;
-        &add_content2xml_hash($out_hash, "error_string", "no productId specified or productId tag invalid");
-        &add_content2xml_hash($out_hash, "error", "productId");
-        &main::daemon_log("$session_id ERROR: no productId specified or procutId tag invalid: $msg", 1); 
+               return &_giveErrorFeedback($msg_hash, "no productId specified or productId tag invalid", $session_id);
     }
 
-    if (not $error) {
-        # Get hostId
-        $hostId = @{$msg_hash->{'hostId'}}[0];
-        &add_content2xml_hash($out_hash, "hostId", $hostId);
+       # Get hostId
+       my $hostId = @{$msg_hash->{'hostId'}}[0];
+       &add_content2xml_hash($out_hash, "hostId", $hostId);
 
-        # Get productID
-        $productId = @{$msg_hash->{'productId'}}[0];
-        &add_content2xml_hash($out_hash, "productId", $productId);
+       # Get productID
+       my $productId = @{$msg_hash->{'productId'}}[0];
+       &add_content2xml_hash($out_hash, "productId", $productId);
 
-        # Do an action request for all these -> "setup".
-        my $callobj = {
-            method  => 'setProductActionRequest',
-            params  => [ $productId, $hostId, "setup" ],
-            id  => 1, }; 
+       # Do an action request for all these -> "setup".
+       my $callobj = {
+               method  => 'setProductActionRequest',
+               params  => [ $productId, $hostId, "setup" ],
+               id  => 1, }; 
 
-        my $sres = $main::opsi_client->call($main::opsi_url, $callobj);
-        my ($sres_err, $sres_err_string) = &check_opsi_res($sres);
-        if ($sres_err){
-            &main::daemon_log("$session_id ERROR: cannot add product: ".$sres_err_string, 1);
-            &add_content2xml_hash($out_hash, "error", $sres_err_string);
-        }
-    } 
+       my $res = $main::opsi_client->call($main::opsi_url, $callobj);
+       if (&check_opsi_res($res)) { return ( (caller(0))[3]." : ".$_, 1 ); };
 
     # return message
     return ( &create_xml_string($out_hash) );
@@ -1453,7 +1443,7 @@ sub opsi_getLicensePool_hash {
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_giveErrorFeedback($msg_hash, "", $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, "", $session_id, $_);
        }
 
        # Fetch infos from Opsi server
@@ -1561,7 +1551,7 @@ sub opsi_getSoftwareLicenseUsagesForProductId {
        if (&_check_xml_tag_is_ok ($msg_hash, 'productId')) {
                $productId= @{$msg_hash->{'productId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Fetch licensePoolId for productId
@@ -1605,7 +1595,7 @@ sub opsi_getSoftwareLicense_hash {
        if (&_check_xml_tag_is_ok ($msg_hash, 'softwareLicenseId')) {
                $softwareLicenseId = @{$msg_hash->{'softwareLicenseId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        my $callobj = {
@@ -1656,7 +1646,7 @@ sub opsi_deleteLicensePool {
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Fetch softwareLicenseIds used in license pool
@@ -1754,15 +1744,15 @@ sub opsi_createLicense {
        if (&_check_xml_tag_is_ok ($msg_hash, 'licenseKey')) {
                $licenseKey = @{$msg_hash->{'licenseKey'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        if ((defined $licenseType) && (not exists $licenseTyp_hash->{$licenseType})) {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, "The typ of a license can be either 'OEM', 'VOLUME' or 'RETAIL'."));
+               return &_giveErrorFeedback($msg_hash, "The typ of a license can be either 'OEM', 'VOLUME' or 'RETAIL'.", $session_id);
        }
        
        # Automatically define licenseContractId if ID is not given
@@ -1849,12 +1839,12 @@ sub opsi_assignSoftwareLicenseToHost {
        if (&_check_xml_tag_is_ok ($msg_hash, 'hostId')) {
                $hostId = @{$msg_hash->{'hostId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Assign a software license to a host
@@ -1898,12 +1888,12 @@ sub opsi_unassignSoftwareLicenseFromHost {
        if (&_check_xml_tag_is_ok ($msg_hash, 'hostId')) {
                $hostId = @{$msg_hash->{'hostId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Unassign a software license from a host
@@ -1945,7 +1935,7 @@ sub opsi_unassignAllSoftwareLicensesFromHost {
        if (&_check_xml_tag_is_ok ($msg_hash, 'hostId')) {
                $hostId = @{$msg_hash->{'hostId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Unassign all software licenses from a host
@@ -1989,7 +1979,7 @@ sub opsi_getLicenseInformationForProduct {
        if (&_check_xml_tag_is_ok ($msg_hash, 'productId')) {
                $productId = @{$msg_hash->{'productId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Fetch infos from Opsi server
@@ -2053,7 +2043,7 @@ sub opsi_getPool {
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Create hash for the answer
@@ -2153,13 +2143,13 @@ sub opsi_removeLicense {
        if (&_check_xml_tag_is_ok ($msg_hash, 'softwareLicenseId')) {
                $softwareLicenseId = @{$msg_hash->{'softwareLicenseId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        my $licensePoolId;
        if (&_check_xml_tag_is_ok ($msg_hash, 'licensePoolId')) {
                $licensePoolId = @{$msg_hash->{'licensePoolId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        
        # Call Opsi
@@ -2195,7 +2185,7 @@ sub opsi_getReservedLicenses {
        if (&_check_xml_tag_is_ok ($msg_hash, 'hostId')) {
                $hostId = @{$msg_hash->{'hostId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Fetch informations from Opsi server
@@ -2256,13 +2246,13 @@ sub opsi_boundHostToLicense {
        if (&_check_xml_tag_is_ok ($msg_hash, 'hostId')) {
                $hostId = @{$msg_hash->{'hostId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        my $softwareLicenseId;
        if (&_check_xml_tag_is_ok ($msg_hash, 'softwareLicenseId')) {
                $softwareLicenseId = @{$msg_hash->{'softwareLicenseId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
 
        # Fetch informations from Opsi server
@@ -2288,7 +2278,7 @@ sub opsi_boundHostToLicense {
        }
 
        if (not $found) {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, "no softwarelicenseId found with name '".$softwareLicenseId."'") );
+               return &_giveErrorFeedback($msg_hash, "no softwarelicenseId found with name '".$softwareLicenseId."'", $session_id);
        }
 
        # Set boundToHost option for a given software license
@@ -2324,7 +2314,7 @@ sub opsi_unboundHostFromLicense {
        if (&_check_xml_tag_is_ok ($msg_hash, 'softwareLicenseId')) {
                $softwareLicenseId = @{$msg_hash->{'softwareLicenseId'}}[0];
        } else {
-               return ( &_give_feedback($msg, $msg_hash, $session_id, $_) );
+               return &_giveErrorFeedback($msg_hash, $_, $session_id);
        }
        
        # Memorize parameter witch are required for this procedure
@@ -2393,6 +2383,45 @@ sub opsi_unboundHostFromLicense {
     return ( &create_xml_string($out_hash) );
 }
 
+################################
+#
+# @brief
+# @param 
+#
+sub opsi_getAllSoftwareLicenses {
+       my ($msg, $msg_hash, $session_id) = @_;
+       my $header = @{$msg_hash->{'header'}}[0];
+       my $source = @{$msg_hash->{'source'}}[0];
+
+       my ($res, $err) = &_getSoftwareLicenses_listOfHashes();
+       if ($err) {
+               return &_giveErrorFeedback($msg_hash, "cannot fetch software licenses from Opsi server : ".$res, $session_id);
+       }
+
+       # Parse result
+       my $res_hash = { 'hit'=> [] };
+       foreach my $license ( @$res) {
+               my $license_hash = { 'softwareLicenseId' => [$license->{'softwareLicenseId'}],
+                       'maxInstallations' => [$license->{'maxInstallations'}],
+                       'boundToHost' => [$license->{'boundToHost'}],
+                       'expirationDate' => [$license->{'expirationDate'}],
+                       'licenseContractId' => [$license->{'licenseContractId'}],
+                       'licenseType' => [$license->{'licenseType'}],
+                       'licensePoolIds' => [],
+                       'licenseKeys'=> {}
+                       };
+               foreach my $licensePoolId (@{$license->{'licensePoolIds'}}) {
+                       push( @{$license_hash->{'licensePoolIds'}}, $licensePoolId);
+                       $license_hash->{licenseKeys}->{$licensePoolId} =  [ $license->{'licenseKeys'}->{$licensePoolId} ];
+               }
+               push( @{$res_hash->{hit}}, $license_hash );
+       }
+       
+       my $out_hash = &main::create_xml_hash("answer_$header", $main::server_address, $source);
+       $out_hash->{licenses} = [$res_hash];
+    return ( &create_xml_string($out_hash) );
+}
+
 sub opsi_test {
     my ($msg, $msg_hash, $session_id) = @_;
     my $header = @{$msg_hash->{'header'}}[0];
@@ -2413,12 +2442,7 @@ print STDERR Dumper $pram1;
        return ();
 }
 
-sub _giveErrorFeedback {
-       my ($msg_hash, $err_string, $session_id) = @_;
-       &main::daemon_log("$session_id ERROR: $err_string", 1);
-       my $out_hash = &main::create_xml_hash("error", $main::server_address, @{$msg_hash->{source}}[0], $err_string);
-       return ( &create_xml_string($out_hash) );
-}
+
 
 
 sub _getLicensePool_hash {
diff --git a/gosa-si/tests/client.php b/gosa-si/tests/client.php
index d98a5f93d6d322d433f20653e628fa20211a383b..f01246d9ebffef2860422c38ad033ea01e5e6c88 100755 (executable)
--- a/gosa-si/tests/client.php
+++ b/gosa-si/tests/client.php
@@ -14,6 +14,8 @@ for($count = 1; $count <= $zahl; $count++)
   #$sock = new Socket_Client("10.89.1.42","20081",TRUE,5);
   #$sock->setEncryptionKey("secret-gosa-password");
 
+  $mac = "00:01:6C:9D:B9:FA"; # ws-muc-02
+
   if($sock->connected()){
 
        # Funktioniert noch nicht
@@ -51,9 +53,11 @@ for($count = 1; $count <= $zahl; $count++)
 
        #$data = "<xml><header>gosa_opsi_getReservedLicenses</header><source>GOSA</source><target>00:01:6C:9D:B9:FA</target><hostId>krakenarme.intranet.gonicus.de</hostId></xml>";
 
-       $data = "<xml><header>gosa_opsi_boundHostToLicense</header><source>GOSA</source><target>00:01:6C:9D:B9:FA</target><softwareLicenseId>andisLizenz</softwareLicenseId><hostId>krakenarme.intranet.gonicus.de</hostId></xml>";
+       #$data = "<xml><header>gosa_opsi_boundHostToLicense</header><source>GOSA</source><target>00:01:6C:9D:B9:FA</target><softwareLicenseId>andisLizenz</softwareLicenseId><hostId>krakenarme.intranet.gonicus.de</hostId></xml>";
        #$data = "<xml><header>gosa_opsi_unboundHostFromLicense</header><source>GOSA</source><target>00:01:6C:9D:B9:FA</target><softwareLicenseId>andisLizenz</softwareLicenseId></xml>";
 
+       $data = "<xml><header>gosa_opsi_getAllSoftwareLicenses</header><source>GOSA</source><target>00:01:6C:9D:B9:FA</target></xml>";
+
 
        ##############################
        # periodical jobs
@@ -209,14 +213,21 @@ for($count = 1; $count <= $zahl; $count++)
     #$data = "<xml> <header>gosa_opsi_add_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e5</macaddress> <description>Test halt</description> <ip>1.2.3.4</ip> <notes>Im a note</notes> </xml>";
 
     # Add product to Opsi client
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>winxppro</productId> </xml>";
+    #$data = "<xml><header>gosa_opsi_add_product_to_client</header><source>GOSA</source><target>$mac</target><hostId>linux-cl-2.intranet.gonicus.de</hostId><productId>winxppro</productId></xml>";
+    #$data = "<xml><header>gosa_opsi_add_product_to_client</header><source>GOSA</source><target>$mac</target><hostId>linux-cl-2.intranet.gonicus.de</hostId><productId>acroread</productId></xml>";
     #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>preloginloader</productId> </xml>";
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>opsi-adminutils</productId> </xml>";
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>xpconfig</productId> </xml>";
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>hwaudit</productId> </xml>";
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>javavm</productId> </xml>";
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>firefox</productId> </xml>";
-    #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>flashplayer</productId> </xml>";
+    
+       #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>opsi-adminutils</productId> </xml>";
+    
+       #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>xpconfig</productId> </xml>";
+    
+       #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>hwaudit</productId> </xml>";
+    
+       #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>javavm</productId> </xml>";
+    
+       #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>firefox</productId> </xml>";
+    
+       #$data = "<xml> <header>gosa_opsi_add_product_to_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <macaddress>00:11:25:4b:8c:e5</macaddress> <hostId>linux-cl-2.intranet.gonicus.de</hostId> <productId>flashplayer</productId> </xml>";
 
     # Delete product from Opsi client
     #$data = "<xml> <header>gosa_opsi_del_product_from_client</header> <source>GOSA</source> <target>00:01:6c:9d:b9:fa</target> <hostId>linux-cl-1.intranet.gonicus.de</hostId> <macaddress>00:11:25:4b:8c:e5</macaddress> <productId>wipedisk</productId>  </xml>";
GONICUS system administrator (SVN clone)