Changeset 1176 for opsi

Timestamp:

Feb 18, 2015, 7:24:49 PM (9 years ago)

Author:

joergs

Message:

added function clientGetDepot

File:

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

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

@@ -74 +74 @@
         print "  last seen:", host["lastSeen"]
         print "  notes:", host["notes"]
+        print "  depot:", self.clientGetDepot( src )
 
         print "  products:"
@@ -142 +143 @@
         return True
 
+    def clientGetDepot(self, name):
+        depot = self.rpc.configState_getHashes( [], {
+            "configId": "clientconfig.depot.id",
+            "objectId": name } )
+        try:
+            return depot[0]["values"][0]
+        except (IndexError,KeyError):
+            return self.getOpsiConfigserverId()
 
     def clientSetDepot(self, name, depot):
@@ -212 +221 @@
         for i in productProperties_src:
             use_default=False
+            default_value=None
             for j in productProperties_default:
                 if i['productId'] == j['productId'] and i["propertyId"] == j["propertyId"]:
+                    default_value = j['values']
                     if i['values'] == j['values']:
                         use_default=True
@@ -221 +232 @@
                     print "(use default)"
                 else:
-                    print "(set)"
+                    print "(set, default:", default_value, ")"
             if not use_default:
                 i['objectId'] = dst