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

AY-745 - updated validator for DL pools

Browse source
This commit is contained in:
Petr Kalis 2024-03-19 14:54:41 +01:00
parent 20d47e54ca
commit 5ad0d4af00
2 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
client/ayon_core/modules/deadline/deadline_module.py
View file

@ -45,7 +45,7 @@ class DeadlineModule(AYONAddon, IPluginPaths):
}
@staticmethod
def get_deadline_pools(webservice, log=None):
def get_deadline_pools(webservice, auth=None, log=None):
# type: (str) -> list
"""Get pools from Deadline.
Args:
@ -64,7 +64,10 @@ class DeadlineModule(AYONAddon, IPluginPaths):
argument = "{}/api/pools?NamesOnly=true".format(webservice)
try:
response = requests_get(argument)
kwargs = {}
if auth:
kwargs["auth"] = auth
response = requests_get(argument, **kwargs)
except requests.exceptions.ConnectionError as exc:
msg = 'Cannot connect to DL web service {}'.format(webservice)
log.error(msg)

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

@ -38,7 +38,8 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
return
deadline_url = self.get_deadline_url(instance)
pools = self.get_pools(deadline_url)
pools = self.get_pools(deadline_url,
instance.context.data["deadline_auth"])
invalid_pools = {}
primary_pool = instance.data.get("primaryPool")
@ -69,13 +70,14 @@ class ValidateDeadlinePools(OptionalPyblishPluginMixin,
deadline_url = instance.data.get("deadlineUrl")
return deadline_url
def get_pools(self, deadline_url):
def get_pools(self, deadline_url, auth):
if deadline_url not in self.pools_per_url:
self.log.debug(
"Querying available pools for Deadline url: {}".format(
deadline_url)
)
pools = DeadlineModule.get_deadline_pools(deadline_url,
auth=auth,
log=self.log)
self.log.info("Available pools: {}".format(pools))
self.pools_per_url[deadline_url] = pools