diff options
| author |   yayogev <yaronyogev@gmail.com> | 2018-02-27 17:00:05 +0200 |
|---|---|---|
| committer | yayogev <yaronyogev@gmail.com> | 2018-02-27 17:00:05 +0200 |
| commit | 648a394f7a318443dfd82f790f83a79616c26905 (patch) | |
| tree | 719508e9d99771c3de056a9c2914d461c35fb967 /app/discover/fetchers/api/api_fetch_availability_zones.py | |
| parent | 100add41cfe2b987524b190c1c92771a3c4f1d5f (diff) | |
US3541 merge various fixes to OPNFV branch
timestamp of last commit tt was merged: 26-Jan-2018 16:25.
Change-Id: I7b0bf7885d7d0badb81c794a52c480b905d78459
Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/discover/fetchers/api/api_fetch_availability_zones.py')
| -rw-r--r-- | app/discover/fetchers/api/api_fetch_availability_zones.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/app/discover/fetchers/api/api_fetch_availability_zones.py b/app/discover/fetchers/api/api_fetch_availability_zones.py index 196893b..ad9550e 100644 --- a/app/discover/fetchers/api/api_fetch_availability_zones.py +++ b/app/discover/fetchers/api/api_fetch_availability_zones.py @@ -28,7 +28,7 @@ class ApiFetchAvailabilityZones(ApiAccess): # because the later does not inclde the "internal" zone in the results endpoint = self.get_region_url_nover(region, "nova") req_url = endpoint + "/v2/" + token["tenant"]["id"] + \ - "/os-availability-zone/detail" + "/os-availability-zone/detail" headers = { "X-Auth-Project-Id": project, "X-Auth-Token": token["id"] @@ -45,11 +45,10 @@ class ApiFetchAvailabilityZones(ApiAccess): for doc in azs: doc["id"] = doc["zoneName"] doc["name"] = doc.pop("zoneName") - doc["master_parent_type"] = "region" - doc["master_parent_id"] = region - doc["parent_type"] = "availability_zones_folder" - doc["parent_id"] = region + "-availability_zones" - doc["parent_text"] = "Availability Zones" + self.set_folder_parent(doc, object_type="availability_zone", + master_parent_type="region", + master_parent_id=region, + parent_text="Availability Zones") doc["available"] = doc["zoneState"]["available"] doc.pop("zoneState") ret.append(doc) |