summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStamatis Katsaounis <mokats@intracom-telecom.com>2018-10-12 10:09:06 +0300
committerStamatis Katsaounis <mokats@intracom-telecom.com>2018-10-12 10:16:51 +0300
commitedd6cfe15ecd4e2bf608c23c6ca4612334df044b (patch)
treeba3385f7e80f438efa72aae0ad61367b934fb6e2
parent9a70acabe83d10fd1ac1b0de5b7ce480929b55e7 (diff)
Fix error on querying neutron quota
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 <mokats@intracom-telecom.com> (cherry picked from commit 7e52a1809501699a6da9fda5c2613a76abe384d3)
-rw-r--r--sdnvpn/lib/utils.py5
1 files 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