slapos_json_rpc_api: one test

master/bt5/slapos_json_rpc_api/TestTemplateItem/portal_components/test.erp5.testSlapOSJsonRpc.py

@@ -521,33 +521,47 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJsonRpcMixin):
     software_installation = self.start_requested_software_installation
     self.assertEqual(software_installation.getValidationState(), "validated")
     software_release_uri = software_installation.getUrlString()
-    self.callSoftwarePutToApiAndCheck(
-      {
-        "software_release_uri": urllib.quote(software_release_uri),
+
+    with PinnedDateTime(self, DateTime('2020/05/19')):
+      response = self.callJsonRpcWebService("slapos.put.slapos_jio_api_put_software_installation", {
+        "portal_type": "Software Installation",
+        "software_release_uri": software_release_uri,
         "compute_node_id": self.compute_node_id,
         "reported_state": "building",
-        "portal_type": "Software Installation",
       },
-      software_release_uri
-    )
+          self.compute_node_user_id)
+    self.assertEqual('application/json', response.headers.get('content-type'))
+    self.assertEqual(
+      byteify(json.loads(response.getBody())),
+      {
+        'compute_node_id': self.compute_node_id,
+        'date': '2020-05-19T00:00:00+00:00',
+        'portal_type': 'Software Installation',
+        'software_release_uri': software_release_uri,
+        'success': 'Done'
+      })
+    self.assertEqual(response.getStatus(), 200)
 
     response = self.callJsonRpcWebService("slapos.get.slapos_jio_api_get_software_installation", {
       "portal_type": "Software Installation",
-      "software_release_uri": urllib.quote(software_release_uri),
-      "compute_node_id": self.compute_node_id,
-    })
-    software_dict = json.loads(response.getBody())
-    expected_dict = {
-      "$schema": software_installation.getJSONSchemaUrl(),
       "software_release_uri": software_release_uri,
-      "compute_node_id": software_installation.getAggregateReference(),
-      "state": "available",
-      "reported_state": "building",
-      "status_message": "#building software release %s" % software_release_uri,
-      "portal_type": "Software Installation",
-      "api_revision": software_installation.getJIOAPIRevision(self.connector.getRelativeUrl()),
-    }
-    self.assertEqual(expected_dict, software_dict)
+      "compute_node_id": self.compute_node_id
+    },
+        self.compute_node_user_id)
+    self.assertEqual('application/json', response.headers.get('content-type'))
+    self.assertEqual(
+      byteify(json.loads(response.getBody())),
+      {
+        # "$schema": software_installation.getJSONSchemaUrl(),
+        "software_release_uri": software_release_uri,
+        "compute_node_id": software_installation.getAggregateReference(),
+        "state": "available",
+        "reported_state": "building",
+        "status_message": "#building software release %s" % software_release_uri,
+        "portal_type": "Software Installation",
+        # "api_revision": software_installation.getJIOAPIRevision(self.connector.getRelativeUrl()),
+      })
+    self.assertEqual(response.getStatus(), 200)
 
   def test_ComputeNodeAccess_09_softwareReleaseError(self):
     self._makeComplexComputeNode(self.project)