add support for Cb Protection URL query parameters when updating certain values

jgarman · jgarman · commit ac5d138ba74b · 2017-08-29T13:24:56.000-04:00
diff --git a/src/cbapi/models.py b/src/cbapi/models.py
@@ -244,7 +244,7 @@ def _refresh(self):
             return True
         return False
 
-    def _build_api_request_uri(self):
+    def _build_api_request_uri(self, http_method="GET"):
         baseuri = self.__class__.__dict__.get('urlobject', None)
         if self._model_unique_id is not None:
             return baseuri + "/%s" % self._model_unique_id
@@ -372,8 +372,9 @@ def _update_object(self):
                                             data=new_object_info)
         else:
             log.debug("Updating {0:s} with unique ID {1:s}".format(self.__class__.__name__, str(self._model_unique_id)))
-            ret = self._cb.api_json_request(self.__class__._change_object_http_method,
-                                            self._build_api_request_uri(), data=self._info)
+            http_method = self.__class__._change_object_http_method
+            ret = self._cb.api_json_request(http_method,self._build_api_request_uri(http_method=http_method),
+                                            data=self._info)
 
         return self._refresh_if_needed(ret)
 
diff --git a/src/cbapi/protection/models.py b/src/cbapi/protection/models.py
@@ -102,6 +102,23 @@ class Computer(MutableBaseModel):
     def __init__(self, cb, model_unique_id, initial_data=None):
         super(Computer, self).__init__(cb, model_unique_id, initial_data)
 
+    def _build_api_request_uri(self, http_method="GET"):
+        base_uri = super(Computer, self)._build_api_request_uri(http_method=http_method)
+        args = []
+
+        if http_method == "PUT":
+            if any(n in self._dirty_attributes
+                   for n in ["debugLevel", "kernelDebugLevel", "debugFlags", "debugDuration", "ccLevel", "ccFlags"]):
+                args.append("changeDiagnostics=true")
+            if any(n in self._dirty_attributes
+                   for n in ["template", "templateCloneCleanupMode", "templateCloneCleanupTime", "templateCloneCleanupTimeScale", "templateTrackModsOnly"]):
+                args.append("changeTemplate=true")
+
+            if args:
+                base_uri += "?{0}".format("&".join(args))
+
+        return base_uri
+
     @property
     def policy(self):
         return self._join(Policy, "policyId")
@@ -115,13 +132,14 @@ def fileInstances(self):
         return self._cb.select(FileInstance).where("computerId:{0:d}".format(self.id))
 
     @property
-    def template(self):
+    def templateComputer(self):
         return self._join(Computer, "templateComputerId")
 
     def resetCLIPassword(self):
-        self._build_api_request_uri()
+        url = self._build_api_request_uri() + "?resetCLIPassword=true"
+        self._cb.put_object(url, {})
         self.refresh()
-        return getattr(self, "cliPassword")
+        return getattr(self, "CLIPassword")
 
 
 class Connector(MutableBaseModel, CreatableModelMixin):
