Add manager host to list of nodes when deploy method is Server

[myxie]

Issue

This PR addresses #255, in which I was not able to generate and deploy physical graphs because only a single node was being returned to the translator when the ManagerClient was queried for current nodes.

This is only an issue with the Server deploy method; the Browser Direct method is working fine.

Cause

The server and the Browser Direct method use different REST calls:

• Server: \gen_pg
• Browser Direct: \gen_pg_spec

This is likely due to their requiring different pieces of information at runtime.

They do get the same list of nodes, albeit in different through different methods. What they do with this list, however, is the difference.

\gen_pg, Server

daliuge/daliuge-translator/dlg/dropmake/web/translator_rest.py

Lines 637 to 641 in bf3a8fc

	# 1. get a list of nodes
	node_list = mgr_client.nodes()
	logger.debug("Calling mapping to nodes: %s", node_list)
	# 2. mapping PGTP to resources (node list)
	pg_spec = pgtp.to_pg_spec(node_list, ret_str=False)

\gen_pg_spec, Browser Direct

daliuge/daliuge-translator/dlg/dropmake/web/translator_rest.py

Lines 721 to 726 in bf3a8fc

	logger.debug("Calling mapping to host: %s", [manager_host] + node_list)
	pg_spec = pgtp.to_pg_spec(
	[manager_host] + node_list,
	tpl_nodes_len=tpl_nodes_len,
	ret_str=False,
	)

It is clear that for the Browser Direct case (i.e., the one that works) we are adding the manager to the start of any list of nodes, which is what we need when we split the list of nodes into island and node managers in to_pg_spec:

daliuge/daliuge-translator/dlg/dropmake/pgt.py

Lines 279 to 280 in bf3a8fc

	is_list = node_list[0:num_islands]
	nm_list = node_list[num_islands:]

Solution

The following is necessary to resolve the issue:

• Add the manager to the list of nodes for the server (Done)
• Add some documentation to make explicit what is happening (In-progress)
• Add more informative error handling when it comes to the node list.

[sourcery-ai]

Hey @myxie - I've reviewed your changes and they look great!

Here's what I looked at during the review

• 🟢 General issues: all looks good
• 🟢 Security: all looks good
• 🟢 Testing: all looks good
• 🟢 Complexity: all looks good

---

Sourcery is free for open source - if you like our reviews please consider sharing them ✨

• X
• Mastodon
• LinkedIn
• Facebook

_{Help me be more useful! Please click 👍 or 👎 on each comment to tell me if it was helpful.}

[coveralls]

coverage: 78.622% (-1.1%) from 79.725%
when pulling 89b8d34 on fix_server_genpgt_nodelist
into bf3a8fc on master.

[myxie]

@awicenec Are you happy with this approach to the fix? I recall you saying in-person you'd made changes to the API instead, but that may have been orthogonal to this issue.

[awicenec]

These changes are perfect, thanks.