fix examples

Author: jgarman

examples/protection/policy_return.py

@@ -1,10 +1,24 @@
-from cbapi.protection import CbEnterpriseProtectionAPI
-from cbapi.protection.models import Computer
+from cbapi.example_helpers import get_cb_protection_object, build_cli_parser
+from cbapi.protection.models import Computer, Policy
+import sys
 
-p = CbEnterpriseProtectionAPI()
+def main():
+    parser = build_cli_parser("Revert computers in policy to previous policy")
+    parser.add_argument("--policy", "-p", help="Policy name or ID", required=True)
+    args = parser.parse_args()
 
-for computer in p.select(Computer).where("policyId:5"):
-    print("%s was in %s" % (computer.name, computer.policyName))
-    computer.policyId = computer.previousPolicyId
-    computer.save()
-    print ("%s is now in %s" % (computer.name, "is now in", computer.policyName))
+    p = get_cb_protection_object(args)
+
+    try:
+        policyId = int(args.policy)
+    except ValueError:
+        policyId = p.select(Policy).where("name:{}".format(args.policy)).id
+
+    for computer in p.select(Computer).where("policyId:{}".format(policyId)):
+        print("%s was in %s" % (computer.name, computer.policyName))
+        computer.policyId = computer.previousPolicyId
+        computer.save()
+        print("%s is now in %s" % (computer.name, computer.policyName))
+
+if __name__ == '__main__':
+    sys.exit(main())

examples/protection/remove_duplicates.py

@@ -1,32 +1,33 @@
-from cbapi.protection import CbEnterpriseProtectionAPI, Computer
+from cbapi.example_helpers import get_cb_protection_object, build_cli_parser
+from cbapi.protection.models import Computer
 from collections import defaultdict
 import sys
-import argparse
+from six import iteritems
 
 
 def main():
-    parser = argparse.ArgumentParser("delete duplicate computers")
-    parser.add_argument("--profile", "-p", help="profile name", default="default")
+    parser = build_cli_parser("Delete duplicate computers")
     parser.add_argument("--dry-run", "-d", help="perform a dry run, don't actually delete the computers",
                         action="store_true", dest="dry_run")
 
     args = parser.parse_args()
-    p = CbEnterpriseProtectionAPI(profile=args.profile)
+    p = get_cb_protection_object(args)
 
     computer_list = defaultdict(list)
     for computer in p.select(Computer).where("deleted:false"):
         computer_list[computer.name].append({"id": computer.id, "offline": computer.daysOffline})
 
-    for computer_name, computer_ids in computer_list.iteritems():
+    for computer_name, computer_ids in iteritems(computer_list):
         if len(computer_ids) > 1:
             sorted_computers = sorted(computer_ids, key=lambda x: x["offline"], reverse=True)
             for computer_id in sorted_computers[:-1]:
-                print("deleting computer id %d (offline %d days, hostname %s)" % (computer_id["id"],
-                                                                                  computer_id["offline"],
-                                                                                  computer_name))
-                if not args.dry_run:
-                    print("deleting from server...")
-                    p.select(Computer, computer_id["id"]).delete()
+                if computer_id["offline"] > 0:
+                    print("deleting computer id %d (offline %d days, hostname %s)" % (computer_id["id"],
+                                                                                      computer_id["offline"],
+                                                                                      computer_name))
+                    if not args.dry_run:
+                        print("deleting from server...")
+                        p.select(Computer, computer_id["id"]).delete()
 
 if __name__ == '__main__':
     sys.exit(main())

src/cbapi/oldmodels.py

@@ -13,10 +13,6 @@
 log = logging.getLogger(__name__)
 
 
-class UnimplementedError(Exception):
-    pass
-
-
 class CreatableModelMixin(object):
     pass
 
@@ -157,10 +153,8 @@ def _attribute(self, attrname, default=None):
 
     def __str__(self):
         ret = '{0:s}.{1:s}:\n'.format(self.__class__.__module__, self.__class__.__name__)
-        try:
+        if self.webui_link:
             ret += "-> available via web UI at %s" % self.webui_link
-        except UnimplementedError:
-            pass
 
         ret += u'\n'.join(['%-20s : %s' %
                            (a, getattr(self, a, "")) for a in self._stat_titles])