From 5f3157c897eaa5ef538d716e905f55085654a6c5 Mon Sep 17 00:00:00 2001 From: Stamatis Katsaounis Date: Fri, 12 Oct 2018 10:09:06 +0300 Subject: Fix error on querying neutron quota JIRA: SDNVPN-237 JIRA: SDNVPN-233 This patch fixes the bug which exists when trying to query neutron quota with openstacksdk. Change-Id: Iead824ca44f381ba314f38933cf48fe7932f74f3 Signed-off-by: Stamatis Katsaounis (cherry picked from commit edd6cfe15ecd4e2bf608c23c6ca4612334df044b) --- sdnvpn/lib/utils.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/sdnvpn/lib/utils.py b/sdnvpn/lib/utils.py index 693a407..9a5e181 100644 --- a/sdnvpn/lib/utils.py +++ b/sdnvpn/lib/utils.py @@ -15,6 +15,7 @@ import requests import re import subprocess from concurrent.futures import ThreadPoolExecutor +from openstack.exceptions import ResourceNotFound from requests.auth import HTTPBasicAuth from opnfv.deployment.factory import Factory as DeploymentFactory @@ -833,8 +834,8 @@ def update_instance_quota_class(cloud, instances_quota): def get_neutron_quota(conn, tenant_id): try: - return conn.network.quotas(project_id=tenant_id).next() - except Exception as e: + return conn.network.get_quota(tenant_id) + except ResourceNotFound as e: logger.error("Error in getting network quota for tenant " " '%s' )]: %s" % (tenant_id, e)) raise -- cgit 1.2.3-korg