Changeset 1088 for opsi

Timestamp:

Aug 29, 2012, 7:24:39 PM (12 years ago)

Author:

joergs

Message:

copyProductPropertyState

File:

• opsi/server/dass-opsi-tools/usr/bin/opsiclient (modified) (6 diffs)

opsi/server/dass-opsi-tools/usr/bin/opsiclient

@@ -85 +85 @@
         products = self.rpc.productOnClient_getObjects( [], { 'clientId': src } )
         self.rpc.productOnClient_deleteObjects( products )
+
+        products = self.rpc.productPropertyState_getObjects( [], { 'clientId': src } )
+        self.rpc.productPropertyState_deleteObjects( products )
+        
         if self.debug:
             pprint( self.getProductOnClient( src ) )
@@ -95 +99 @@
         self.rpc.configState_create( "clientconfig.depot.id", name, depot )        
 
-    def copyClient( self, src, dst, ipAddress = None, hardwareAddress = None, depot = None, description = "" ):
+    def copyClient( self, src, dst, ipAddress = None, hardwareAddress = None, depot = None, description = "", copyProperties = True ):
     
         print "create/update", dst, "from template", src + ":",
@@ -124 +128 @@
         #  copy product properties:
         #  opsiCallClientBaculaProperties=[ "method", "getProductProperties_hash", "bacula" ]
+        if copyProperties:
+            if self.debug:
+                print "copy product properties"
+            self.copyProductPropertyState( src, dst )
         print "done"
         return True
@@ -134 +142 @@
         
     def copyProductOnClient( self, src, dst, attributes = ProductAttributesCopy ):
-        products = self.rpc.productOnClient_getHashes( attributes, { 'clientId': src } )
-        for i in products:
+        products_src = self.rpc.productOnClient_getHashes( attributes, { 'clientId': src } )
+        products_dst = []
+        for i in products_src:
             if self.debug: 
                 print i['productId']
                 pprint( i )
             i['clientId'] = dst
-            self.rpc.productOnClient_createObjects( i )
+            products_dst.append(i)
+        self.rpc.productOnClient_createObjects( products_dst )
         if self.debug:
             pprint( self.getProductOnClient( dst ) )
+
+    def getProductPropertyState( self, client, attributes = [] ):
+        return self.rpc.productPropertyState_getHashes( [], { 'objectId': client } )
+                        
+    def copyProductPropertyState( self, src, dst, attributes = [] ):
+        productProperties_src = self.getProductPropertyState( src, attributes )
+        productProperties_dst = []
+        for i in productProperties_src:
+            if self.debug: 
+                print i['productId'], "-", i["propertyId"] + ": ",
+                pprint(i["values"])
+                #pprint( i )
+            i['objectId'] = dst
+            productProperties_dst.append(i)
+        self.rpc.productPropertyState_createObjects( productProperties_dst )
+        if self.debug:
+            pprint( self.getProductPropertyState( dst ) )
+            
         
 
@@ -176 +204 @@
     parser_copy.add_argument( '--mac', help="MAC address of the new opsi client" )
     parser_copy.add_argument( '--depot', help="depot server the new opsi client should be located" )
+    #parser_copy.add_argument( '--no-properties', action='store_false', help="don't copy product properties" )
     
     args = parser.parse_args()
@@ -192 +221 @@
         result = opsi.clean( args.src )
     elif args.subcommand == "copy": 
+        #result = opsi.copyClient( args.src, args.dst, args.ip, args.mac, args.depot, not args.no-properties )
         result = opsi.copyClient( args.src, args.dst, args.ip, args.mac, args.depot )
     else: