slap/slap.py: software release

slapos/slap/slap.py

@@ -197,7 +197,7 @@ class SoftwareRelease(SlapDocument):
         {
           'url': self.getURI(),
           'computer_id': self.getComputerId(),
-          'error_log': error_log
+          'error_log': str(error_log)
         }
       )
     except (RequestException, ConnectionError):
@@ -206,22 +206,40 @@ class SoftwareRelease(SlapDocument):
       (logger or fallback_logger).exception('')
 
   def available(self):
-    if getattr(self, '_known_state', 'unknown') != "available":
-      # Not required to repost if not needed.
-      self._connection_helper.POST('availableSoftwareRelease', data={
-        'url': self.getURI(),
-        'computer_id': self.getComputerId()})
+    # if getattr(self, '_known_state', 'unknown') != "available":
+    # Not required to repost if not needed.
+    self._connection_helper.callJsonRpcAPI(
+      'slapos.put.software_installation',
+      {
+        "portal_type": "Software Installation",
+        'computer_id': self.getComputerId(),
+        'software_release_uri': self.getURI(),
+        'reported_state': 'available'
+      }
+    )
 
   def building(self):
-    if getattr(self, '_known_state', 'unknown') != "building":
-      self._connection_helper.POST('buildingSoftwareRelease', data={
-        'url': self.getURI(),
-        'computer_id': self.getComputerId()})
+    # if getattr(self, '_known_state', 'unknown') != "building":
+    self._connection_helper.callJsonRpcAPI(
+      'slapos.put.software_installation',
+      {
+        "portal_type": "Software Installation",
+        'computer_id': self.getComputerId(),
+        'software_release_uri': self.getURI(),
+        'reported_state': 'building'
+      }
+    )
 
   def destroyed(self):
-    self._connection_helper.POST('destroyedSoftwareRelease', data={
-      'url': self.getURI(),
-      'computer_id': self.getComputerId()})
+    self._connection_helper.callJsonRpcAPI(
+      'slapos.put.software_installation',
+      {
+        "portal_type": "Software Installation",
+        'computer_id': self.getComputerId(),
+        'software_release_uri': self.getURI(),
+        'reported_state': 'destroyed'
+      }
+    )
 
   def getState(self):
     return getattr(self, '_requested_state', 'available')