Changeset 1051

Timestamp:

Aug 15, 2012, 3:09:28 PM (12 years ago)

Author:

joergs

Message:

added more functions

File:

• opsi/server/dass-opsi-tools/usr/bin/opsi-client.py (modified) (8 diffs)

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

@@ -1 +1 @@
 #!/usr/bin/env python
 
-# Skript erstellen, dass ein OPSI-Rechner-Eintrag kopiert.
+# Skript, dass ein OPSI-Rechner-Eintrag kopiert.
 # D.h. die Produkte, Anforderung.
 # Ggf. optional Stand und ggf. Versionsnummer
 # Ggf. optional ProductProperties
 
-                #self.command("opsi-admin -d method host_createOpsiClient "+ \
-                        #computername + " null " + "\\'"+description+"\\'" + \
-                        #" \\'created by dassadmin\\' " + mac_address + " " + \
-                        #ip_address)
-                #method host_createOpsiClient id *opsiHostKey *description *notes *hardwareAddress *ipAddress *inventoryNumber *oneTimePassword *created *lastSeen
-                #self.command("opsi-admin -d method configState_create clientconfig.depot.id " + \
-                        #computername + " " + depotName)                        
+#self.command("opsi-admin -d method host_createOpsiClient "+ \
+        #computername + " null " + "\\'"+description+"\\'" + \
+        #" \\'created by dassadmin\\' " + mac_address + " " + \
+        #ip_address)
+#method host_createOpsiClient id *opsiHostKey *description *notes *hardwareAddress *ipAddress *inventoryNumber *oneTimePassword *created *lastSeen
+#self.command("opsi-admin -d method configState_create clientconfig.depot.id " + \
+        #computername + " " + depotName)                        
                         
 import argparse
@@ -32 +32 @@
         print self.urlJsonRpc
         print self.rpc.getClientIds_list()
+
+    def list(self):
+        return self.rpc.getClientIds_list()
+        
+    def exists(self, src):
+        return len( self.rpc.host_getObjects( [], {"id":src} ) ) == 1
+        
+    def info(self, src):
+        if not self.exists( src ):
+            print "failed: opsi client", src, "does not exist"
+            return False
+        print src + ":"
+        products = self.getProductOnClient( src, [] )
+        for i in products:
+            print i['productId'] + ": (", i['actionRequest'], i['actionProgress'], ")", i['installationStatus']
+            pprint( i, indent=4 )
+        return True
+
+    def clean(self, src):
+        if not self.exists( src ):
+            return False
+        products = self.rpc.productOnClient_getObjects( [], { 'clientId': src } )
+        self.rpc.productOnClient_deleteObjects( products )
+        if self.debug:
+            pprint( self.getProductOnClient( src ) )
+        return True
         
     def copyClient( self, src, dst, ipAddress = None, hardwareAddress = None, depot = None ):
@@ -45 +71 @@
             self.rpc.configState_create( "clientconfig.depot.id", dst, depot )        
         if self.debug:
-            self.productOnClient( src )
+            pprint( self.getProductOnClient( src ) )
         self.copyProductOnClient( src, dst )
         # TODO: 
@@ -53 +79 @@
 
         
-    def productOnClient( self, client, attributes = ProductAttributesCopy ):
+    def getProductOnClient( self, client, attributes = ProductAttributesCopy ):
         #pprint( self.rpc.productOnClient_getObjects( [], { 'clientId': client } ) )
         #pprint( self.rpc.productOnClient_getHashes( attributes, { 'clientId': client } ) )
-        pprint( self.rpc.productOnClient_getHashes( [], { 'clientId': client } ) )
+        return self.rpc.productOnClient_getHashes( [], { 'clientId': client } )
         
     def copyProductOnClient( self, src, dst, attributes = ProductAttributesCopy ):
@@ -62 +88 @@
         for i in products:
             if self.debug: 
+                print i['productId']
                 pprint( i )
-                print i['productId']
             i['clientId'] = dst
             self.rpc.productOnClient_createObjects( i )
-            if self.debug:
-                self.productOnClient( dst )
+        if self.debug:
+            pprint( self.getProductOnClient( dst ) )
         
 
@@ -86 +112 @@
     parser_exists = subparsers.add_parser('exists', help='check, if a opsi clients exists' )
     parser_exists.add_argument( 'src', help="source opsi client" )
-    
+
+    parser_info = subparsers.add_parser('info', help='print information about a opsi client' )
+    parser_info.add_argument( 'src', help="opsi client" )
+        
     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" )
@@ -96 +125 @@
     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_bar.set_defaults(func=bar)
-    #>>> # parse the args and call whatever function was selected
-    #>>> args = parser.parse_args('bar XYZYX'.split())
-    #>>> args.func(args)    
-    
     
     args = parser.parse_args()
@@ -112 +135 @@
     opsi=OpsiRpc( urlJsonRpc, args.debug )
     
-    if args.subcommand == "copy": 
+    result = True
+
+    if args.subcommand == "list":
+        print( "\n".join( opsi.list() ) )
+    elif args.subcommand == "exists":
+        result = opsi.exists( args.src )
+    elif args.subcommand == "info":
+        result = opsi.info( args.src )        
+    elif args.subcommand == "clean":
+        result = opsi.clean( args.src )
+    elif args.subcommand == "copy": 
         opsi.copyClient( args.src, args.dst, args.ip, args.mac, args.depot )
     else:
         print "not yet implemented"
 
-    if args.debug: print "end"
-    
+    if args.debug: print result    
+        
+    if result:
+        exit(0)
+    else:
+        exit(1)