Skip to content

S
slapos.core
Commit 52799122 authored by Cédric Le Ninivin's avatar Cédric Le Ninivin Committed by Cédric Le Ninivin
Browse files
Options

slapos_jio_api_style: Tests Update excpected json for Software Installation

parent 978fbc9f
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 8 deletions
master/bt5/slapos_jio_api_style/TestTemplateItem/portal_components/test.erp5.testSlapOSJIOAPI.py
View file @ 52799122
...@@ -393,13 +393,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin): ...@@ -393,13 +393,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin):
status_dict = software_installation.getAccessStatus() status_dict = software_installation.getAccessStatus()
expected_dict = { expected_dict = {
"$schema": software_installation.getJSONSchemaUrl(), "$schema": software_installation.getJSONSchemaUrl(),
"reference": software_installation.getReference(),
"software_release_uri": software_installation.getUrlString(), "software_release_uri": software_installation.getUrlString(),
"compute_node_id": software_installation.getAggregateReference(), "compute_node_id": software_installation.getAggregateReference(),
"state": "available", "state": "available",
"reported_state": status_dict.get("state"), "reported_state": status_dict.get("state"),
"status_message": status_dict.get("text"), "status_message": status_dict.get("text"),
"processing_timestamp": software_installation.getSlapTimestamp(), "portal_type": "Software Installation",
"api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()), "api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()),
} }
...@@ -510,13 +509,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin): ...@@ -510,13 +509,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin):
}) })
expected_dict = { expected_dict = {
"$schema": software_installation.getJSONSchemaUrl(), "$schema": software_installation.getJSONSchemaUrl(),
"reference": software_installation.getReference(),
"software_release_uri": software_release_uri, "software_release_uri": software_release_uri,
"compute_node_id": software_installation.getAggregateReference(), "compute_node_id": software_installation.getAggregateReference(),
"state": "available", "state": "available",
"reported_state": "available", "reported_state": "available",
"status_message": "#access software release %s available" % software_release_uri, "status_message": "#access software release %s available" % software_release_uri,
"processing_timestamp": software_installation.getSlapTimestamp(), "portal_type": "Software Installation",
"api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()), "api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()),
} }
self.assertEqual(expected_dict, software_dict) self.assertEqual(expected_dict, software_dict)
...@@ -545,13 +543,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin): ...@@ -545,13 +543,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin):
}) })
expected_dict = { expected_dict = {
"$schema": software_installation.getJSONSchemaUrl(), "$schema": software_installation.getJSONSchemaUrl(),
"reference": software_installation.getReference(),
"software_release_uri": software_release_uri, "software_release_uri": software_release_uri,
"compute_node_id": software_installation.getAggregateReference(), "compute_node_id": software_installation.getAggregateReference(),
"state": "available", "state": "available",
"reported_state": "building", "reported_state": "building",
"status_message": "#building software release %s" % software_release_uri, "status_message": "#building software release %s" % software_release_uri,
"processing_timestamp": software_installation.getSlapTimestamp(), "portal_type": "Software Installation",
"api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()), "api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()),
} }
self.assertEqual(expected_dict, software_dict) self.assertEqual(expected_dict, software_dict)
...@@ -580,13 +577,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin): ...@@ -580,13 +577,12 @@ class TestSlapOSSlapToolComputeNodeAccess(TestSlapOSJIOAPIMixin):
}) })
expected_dict = { expected_dict = {
"$schema": software_installation.getJSONSchemaUrl(), "$schema": software_installation.getJSONSchemaUrl(),
"reference": software_installation.getReference(),
"software_release_uri": software_release_uri, "software_release_uri": software_release_uri,
"compute_node_id": software_installation.getAggregateReference(), "compute_node_id": software_installation.getAggregateReference(),
"state": "available", "state": "available",
"reported_state": "", "reported_state": "",
"status_message": "#error while installing %s" % software_release_uri, "status_message": "#error while installing %s" % software_release_uri,
"processing_timestamp": software_installation.getSlapTimestamp(), "portal_type": "Software Installation",
"api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()), "api_revision": software_installation.getJIOAPIRevision(self.web_site.api.getRelativeUrl()),
} }
self.assertEqual(expected_dict, software_dict) self.assertEqual(expected_dict, software_dict)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7