Changeset 1064 for opsi/server

Timestamp:

Aug 16, 2012, 8:12:00 AM (12 years ago)

Author:

joergs

Message:

bugfix: don't overwrite ip and mac, when copying a client a second time

File:

• opsi/server/dass-opsi-tools/usr/bin/opsi-client (modified) (1 diff)

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

@@ -91 +91 @@
     
         print "create/update", dst, "from template", src + ":",
-        #method host_createOpsiClient id *opsiHostKey *description *notes *hardwareAddress *ipAddress *inventoryNumber *oneTimePassword *created *lastSeen
-        #id=dst
-        opsiHostKey=None
-        description=""
-        notes="copy of " + src
-        self.rpc.host_createOpsiClient( dst, opsiHostKey, description, notes, hardwareAddress, ipAddress )
+        obj = {
+          "id" : dst,
+          "type" : "OpsiClient",
+          "notes" : "copy of " + src,
+          #"description" : "",
+          #"inventoryNumber" : "",
+        }
+        if hardwareAddress:
+            obj['hardwareAddress'] = hardwareAddress
+        if ipAddress:
+            obj['ipAddress'] = ipAddress
+
+        if self.exists( dst ):
+            self.rpc.host_updateObject(obj)
+        else:
+            self.rpc.host_insertObject(obj)
+            
         if depot:
             self.rpc.configState_create( "clientconfig.depot.id", dst, depot )        
+            
         if self.debug:
             pprint( self.getProductOnClient( src ) )