Changeset 1117 for opsi/server

Timestamp:

Nov 9, 2012, 5:40:28 PM (11 years ago)

Author:

joergs

Message:

added function update client

File:

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

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

@@ -104 +104 @@
         
     def createClient(self, name, opsiHostKey, description, notes, hardwareAddress, ipAddress):
-        self.rpc.host_createOpsiClient( name, opsiHostKey, description, notes, hardwareAddress, ipAddress )
-
+        #    self.rpc.host_createOpsiClient( name, opsiHostKey, description, notes, hardwareAddress, ipAddress )
+        self.updateClient( name, opsiHostKey, description, notes, hardwareAddress, ipAddress )
+
+    def updateClient(self, src, opsiHostKey = None, description = None, notes = None, hardwareAddress = None, ipAddress = None, depot = None ):
+        obj = {
+          "id" : src,
+          "type" : "OpsiClient",
+        }
+        if opsiHostKey:
+            obj['opsiHostKey'] = opsiHostKey
+        if description:
+            obj['description'] = description
+        if notes:
+            obj['notes'] = notes            
+        if hardwareAddress:
+            obj['hardwareAddress'] = hardwareAddress
+        if ipAddress:
+            obj['ipAddress'] = ipAddress
+
+        if self.exists( src ):
+            self.rpc.host_updateObject(obj)
+        else:
+            self.rpc.host_insertObject(obj)
+            
+        if depot:
+            self.clientSetDepot(src,depot)
+        return True
+
+
+        
     def clientSetDepot(self, name, depot):
         self.rpc.configState_create( "clientconfig.depot.id", name, depot )        
@@ -310 +338 @@
     parser_clean = subparsers.add_parser('clean', help='remove all product states from a opsi client' )
     parser_clean.add_argument( 'src', help="source opsi client to clean" )
-                
+                    
     parser_copy = subparsers.add_parser('copy', help='copy/create a opsi client from a template opsi client')    
     parser_copy.add_argument( 'src', help="source/template opsi client" )
@@ -331 +359 @@
     parser_info = subparsers.add_parser('info', help='print information about a opsi client' )
     parser_info.add_argument( 'src', help="opsi client" )
+    
+    parser_update = subparsers.add_parser('update', help='update/create a opsi client')
+    parser_update.add_argument( 'src', help="opsi client to be created" )
+    parser_update.add_argument( '--ip', help="IP address of the new opsi client" )
+    parser_update.add_argument( '--mac', help="MAC address of the new opsi client" )
+    parser_update.add_argument( '--description', help="IP address of the new opsi client" )
+    parser_update.add_argument( '--notes', help="MAC address of the new opsi client" )    
+    parser_update.add_argument( '--depot', help="depot server the new opsi client should be located" )
     
     args = parser.parse_args()
@@ -366 +402 @@
         result = opsi.listClients( args.product )        
     elif args.subcommand == "info":
-        result = opsi.info( args.src )        
+        result = opsi.info( args.src )
+    elif args.subcommand == "update": 
+        result = opsi.updateClient( args.src, None, args.description, args.notes, args.mac, args.ip, args.depot )
     else:
         print "not yet implemented"