External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-25 12:55:04 -02:30
Code Issues Packages Projects Releases Wiki Activity

Return the changed status of imports

Browse Source
This commit is contained in:
Jeff Bradberry
2020-05-28 15:19:34 -04:00
parent aeeed4d371
commit 19b7c91486
1 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
awxkit/awxkit/api/pages/api.py
View File

@@ -189,6 +189,9 @@ class ApiV2(base.Base):
def _import_list(self, endpoint, assets): def _import_list(self, endpoint, assets):
log.debug("_import_list -- endpoint: %s, assets: %s", endpoint.endpoint, repr(assets)) log.debug("_import_list -- endpoint: %s, assets: %s", endpoint.endpoint, repr(assets))
post_fields = utils.get_post_fields(endpoint, self._cache) post_fields = utils.get_post_fields(endpoint, self._cache)
changed = False
for asset in assets: for asset in assets:
post_data = {} post_data = {}
for field, value in asset.items(): for field, value in asset.items():
@@ -207,6 +210,7 @@ class ApiV2(base.Base):
# We should only impose a default password if the resource doesn't exist. # We should only impose a default password if the resource doesn't exist.
post_data.setdefault('password', 'abc123') post_data.setdefault('password', 'abc123')
_page = endpoint.post(post_data) _page = endpoint.post(post_data)
changed = True
if asset['natural_key']['type'] == 'project': if asset['natural_key']['type'] == 'project':
# When creating a project, we need to wait for its # When creating a project, we need to wait for its
# first project update to finish so that associated # first project update to finish so that associated
@@ -214,6 +218,7 @@ class ApiV2(base.Base):
_page.wait_until_completed() _page.wait_until_completed()
else: else:
_page = _page.put(post_data) _page = _page.put(post_data)
changed = True
except (exc.Common, AssertionError) as e: except (exc.Common, AssertionError) as e:
log.error("Object import failed: %s.", e) log.error("Object import failed: %s.", e)
log.debug("post_data: %r", post_data) log.debug("post_data: %r", post_data)
@@ -230,6 +235,8 @@ class ApiV2(base.Base):
else: else:
self._related.put((_page, name, S)) self._related.put((_page, name, S))
return changed
def _assign_roles(self): def _assign_roles(self):
while True: while True:
try: try:
@@ -294,15 +301,20 @@ class ApiV2(base.Base):
self._related = queue.Queue() self._related = queue.Queue()
self._roles = queue.Queue() self._roles = queue.Queue()
changed = False
for resource in self._dependent_resources(data): for resource in self._dependent_resources(data):
endpoint = getattr(self, resource) endpoint = getattr(self, resource)
# Load up existing objects, so that we can try to update or link to them # Load up existing objects, so that we can try to update or link to them
self._cache.get_page(endpoint) self._cache.get_page(endpoint)
self._import_list(endpoint, data.get(resource) or []) imported = self._import_list(endpoint, data.get(resource) or [])
changed = changed or imported
# FIXME: should we delete existing unpatched assets? # FIXME: should we delete existing unpatched assets?
self._assign_related() self._assign_related()
self._assign_roles() self._assign_roles()
return changed
page.register_page(resources.v2, ApiV2) page.register_page(resources.v2, ApiV2)