airship/shipyard
Code Issues Proposed changes

Merge "[FIX] Correct design ref use with Drydock client"

Browse Source
This commit is contained in:
Zuul 2018-08-22 16:58:57 +00:00 committed by Gerrit Code Review
commit 6d01f3f07b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/bin/shipyard_airflow/shipyard_airflow/control/helpers/design_reference_helper.py
View File

@ -36,6 +36,10 @@ class DesignRefHelper:
"""
return json.dumps(self.get_design_reference_dict(revision_id))
def get_design_reference_href(self, revision_id):
"""Returns only the href to the deckhand design"""
return "deckhand+{}".format(self._path.format(revision_id))
def get_design_reference_dict(self, revision_id):
"""Constructs a Deckhand specific design reference
@ -44,6 +48,6 @@ class DesignRefHelper:
"""
return {
"rel": "design",
"href": "deckhand+{}".format(self._path.format(revision_id)),
"href": self.get_design_reference_href(revision_id),
"type": "application/x-yaml"
}

2
src/bin/shipyard_airflow/shipyard_airflow/control/validators/validate_deployment_strategy.py
View File

@ -42,7 +42,7 @@ def _get_node_lookup(revision_id):
return NodeLookup(
service_clients.drydock_client(),
DesignRefHelper().get_design_reference_dict(revision_id)
DesignRefHelper().get_design_reference_href(revision_id)
).lookup