Changeset 1177 for opsi

Timestamp:

May 13, 2015, 4:46:01 PM (10 years ago)

Author:

joergs

Message:

allow setting the inventory number when updating the client

File:

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

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

@@ -113 +113 @@
     def createClient(self, name, opsiHostKey, description, notes, hardwareAddress, ipAddress):
         #    self.rpc.host_createOpsiClient( name, opsiHostKey, description, notes, hardwareAddress, ipAddress )
-        self.updateClient( name, opsiHostKey, description, notes, hardwareAddress, ipAddress )
+        self.updateClient( name, opsiHostKey, description, notes, None, hardwareAddress, ipAddress )
 
     def deleteClient(self, name):
         self.rpc.host_delete( name )
 
-    def updateClient(self, src, opsiHostKey = None, description = None, notes = None, hardwareAddress = None, ipAddress = None, depot = None ):
+    def updateClient(self, src, opsiHostKey = None, description = None, notes = None, inventoryNumber = None, hardwareAddress = None, ipAddress = None, depot = None ):
         obj = {
           "id" : src,
@@ -129 +129 @@
         if notes:
             obj['notes'] = notes
+        if inventoryNumber:
+            obj['inventoryNumber'] = inventoryNumber
         if hardwareAddress:
             obj['hardwareAddress'] = hardwareAddress
@@ -312 +314 @@
             fd.write( "# automatically generated at {0}\n".format( time.asctime() ) )
             fd.write( "#\n\n" )
-        except BaseException as e:        
+        except BaseException as e:
             self.logger.exception( "failed to create files" )
             return False
@@ -395 +397 @@
 
     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" )
-    
+    parser_update.add_argument( 'src', help="opsi client to be created/updated" )
+    parser_update.add_argument( '--ip', help="IP address of the opsi client" )
+    parser_update.add_argument( '--mac', help="MAC address of the opsi client" )
+    parser_update.add_argument( '--description', help="a description of the client" )
+    parser_update.add_argument( '--notes', help="notes about the client" )
+    parser_update.add_argument( '--inventory', help="inventory number" )
+    parser_update.add_argument( '--depot', help="depot server the opsi client should be located" )
+
     args = parser.parse_args()
-    
+
     if args.debug:
         logger.setLevel(logging.DEBUG)
@@ -439 +442 @@
             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 )
+            result = opsi.updateClient( args.src, None, args.description, args.notes, args.inventory, args.mac, args.ip, args.depot )
         else:
             print "not yet implemented"