tests: updates of mock-insights from subscription-manager-cockpit #20842
Conversation
When querying for the details of a system, properly return 404 in case the system was not registered previously. This makes sure that insights-client properly reacts to this situation, mimicking what happens with a real Inventory service.
Tweak their implementations a bit to prepare them for more substantial changes; in particular: - properly name the ID we get: the "insights_id" query parameter as such, and the UUID as Inventory ID - use an helper variable to which add/set all the bits to the replies, dumping them as JSON only in one place This is only a refactor with no behaviour change.
Currently, the fake systems (or better, only one) is kept in the helper "systems" dictionary by the machine ID; while this seems to work fine, in practice it will not work for upcoming changes, and it does not match what Inventory actually does. Change the ID handling to represent better what Inventory does: - assign "id" as Inventory ID for each newly registered system; in practice we have only one, and keep hardcoding "123-nice-id" for now (the "testInsights" test checks for it) - use the "id" as key in the "systems" dictionary, rather than the "machine_id" - when registering a new system, copy "machine_id" as "insights_id"; this will help later on when implementing the non-legacy API endpoints - adapt endpoints to search for the ID they need Even with all the changes, there should be no behaviour changes.
Implement a couple of missing platform endpoints needed to make insights-client work in non-legacy-upload mode: - the upload endpoint, which needs to get the system metadata from the MIME data sent with POST: because of this, the implementation needs a bit more work; because of testing reasons, the Inventory ID is still hardcoded as "123-nice-id" - the delete endpoint, needed to unregister a system
| if insights_id in systems: | ||
| res["total"] += 1 | ||
| res["results"].append({"id": "123-nice-id"}) | ||
| self.wfile.write(json.dumps(res).encode("utf-8") + b"\n") |
There was a problem hiding this comment.
Just FYI, "UTF-8" is the default. See commit c0caea8
(Not enough by itself to block this PR)
| for system in systems.values(): | ||
| if system["machine_id"] == machine_id: |
There was a problem hiding this comment.
Ah, so systems is not indexed by machine ID any more but by "inventory ID" like "123-nice-id". So many IDs! 😉
There was a problem hiding this comment.
well yes, Inventory has lots of IDs: the ID of a system, the machine ID, the Insights ID, etc...
| + b""" | ||
|
|
||
| """ |
There was a problem hiding this comment.
This is quite hard to read, and may be better written as b"\n\n"?
There was a problem hiding this comment.
hm not bad- would it be possible to fix it in a followup? this PR is a simple backport of the existing commits from sub-man-cockpit
| if part.get_filename() == "metadata": | ||
| s = json.loads(part.get_payload()) | ||
| s["id"] = "123-nice-id" | ||
| print(s) |
There was a problem hiding this comment.
there is the same in the other endpoint that "uploads" a system, so it's consistent :P i find it useful to check the log file for the result of the registration, especially in this case that the metadata is even more "entangled"
This forwards various updates to
mock-insightsas done in subscription-manager-cockpit, where it is stressed/used a bit more; in particular, the changes come from:This should hopefully avoid failures in case
insights-client(or better, insights-core) switches the default value oflegacy_uploadfrom true to false; no ETA planned for that, although that's what we are trying to work on.See the message of each commit for longer explanations.