Frame13/ayon-core
1
0
Fork 1
mirror of https://github.com/ynput/ayon-core.git synced 2025-12-26 05:42:15 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

AY-745 - refactored format of credentials

Browse source 
Now on instance, in `deadline` dictionary
This commit is contained in:
Petr Kalis 2024-03-26 13:50:26 +01:00
parent 6faa5acdf7
commit 2ed1d0feee
2 changed files with 9 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

21
client/ayon_core/modules/deadline/plugins/publish/validate_deadline_connection.py
View file

@ -10,29 +10,22 @@ class ValidateDeadlineConnection(pyblish.api.InstancePlugin):
label = "Validate Deadline Web Service"
order = pyblish.api.ValidatorOrder
hosts = ["maya", "nuke"]
families = ["renderlayer", "render"]
hosts = ["maya", "nuke", "aftereffects", "harmony", "fusion"]
families = ["renderlayer", "render", "render.farm"]
# cache
responses = {}
def process(self, instance):
context = instance.context
# get default deadline webservice url from deadline module
deadline_url = context.data["defaultDeadline"]
# if custom one is set in instance, use that
if instance.data.get("deadlineUrl"):
deadline_url = instance.data.get("deadlineUrl")
self.log.debug(
"We have deadline URL on instance {}".format(deadline_url)
)
deadline_url = instance.data["deadline"]["url"]
assert deadline_url, "Requires Deadline Webservice URL"
kwargs = {}
if context.data["deadline_require_authentication"]:
kwargs["auth"] = context.data["deadline_auth"]
if instance.data["deadline"]["require_authentication"]:
auth = instance.data["deadline"]["auth"]
kwargs["auth"] = auth
if not context.data["deadline_auth"][0]:
if not auth[0]:
raise PublishXmlValidationError(
self,
"Deadline requires authentication. "

12
client/ayon_core/modules/deadline/plugins/publish/validate_deadline_pools.py
View file

@ -37,9 +37,9 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
self.log.debug("Skipping local instance.")
return
deadline_url = self.get_deadline_url(instance)
deadline_url = instance.data["deadline"]["url"]
pools = self.get_pools(deadline_url,
instance.context.data["deadline_auth"])
instance.data["deadline"].get("auth"))
invalid_pools = {}
primary_pool = instance.data.get("primaryPool")
@ -62,14 +62,6 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
formatting_data={"pools_str": ", ".join(pools)}
)
def get_deadline_url(self, instance):
# get default deadline webservice url from deadline module
deadline_url = instance.context.data["defaultDeadline"]
if instance.data.get("deadlineUrl"):
# if custom one is set in instance, use that
deadline_url = instance.data.get("deadlineUrl")
return deadline_url
def get_pools(self, deadline_url, auth):
if deadline_url not in self.pools_per_url:
self.log.debug(