diff options
| author |   Vikas Varma <vikas.varma@att.com> | 2020-04-29 21:00:11 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-04-29 21:00:11 +0000 |
| commit | 806d6a26b04af01c06ae65cdb2bf3e8af36bfa62 (patch) | |
| tree | d1eeb41087bc64fe947b8ef01c009f43359e139a | |
| parent | bb53f794e64d92bd24c4a7027315612cde6550a6 (diff) | |
| parent | 2742ab00c427340431ded379da5fa9908d88282c (diff) | |
Merge "Fix aai relationship link query"
| -rw-r--r-- | conductor/conductor/data/plugins/inventory_provider/aai.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/conductor/conductor/data/plugins/inventory_provider/aai.py b/conductor/conductor/data/plugins/inventory_provider/aai.py index ae3f203..302bb89 100644 --- a/conductor/conductor/data/plugins/inventory_provider/aai.py +++ b/conductor/conductor/data/plugins/inventory_provider/aai.py @@ -1880,7 +1880,7 @@ class AAI(base.InventoryProviderBase): elif inventory_type == 'nssi': if filtering_attributes and model_invariant_id: - resolved_demands[name].append(self.get_nssi_candidates(filtering_attributes, + resolved_demands[name].extend(self.get_nssi_candidates(filtering_attributes, model_invariant_id, model_version_id, service_role, candidate_uniqueness)) @@ -1984,7 +1984,7 @@ class AAI(base.InventoryProviderBase): if self.match_inventory_attributes(filtering_attributes, inventory_attributes, nssi_instance.get('service-instance-id')): - nsi_link = self._get_aai_rel_link(response_body, 'service-instance') + nsi_link = self._get_aai_rel_link(nssi_instance, 'service-instance') nsi_info = self.get_nsi_info(nsi_link) @@ -2033,7 +2033,8 @@ class AAI(base.InventoryProviderBase): nsi_info = dict() if nsi_link: nsi_link_path = self._get_aai_path_from_link(nsi_link) - nsi_response = self._request('get', nsi_link_path, data=None) + path = self._aai_versioned_path(nsi_link_path) + nsi_response = self._request('get', path, data=None) if nsi_response and nsi_response.status_code == 200: nsi_response_body = nsi_response.json() nsi_info['instance_id'] = nsi_response_body.get('service-instance-id') |