openstack
/
fuel-dev-tools
Code Issues Proposed changes

Merge "setup-network: Raise exception if there is no env"

This commit is contained in:
Jenkins 2015-12-04 12:05:20 +00:00 committed by Gerrit Code Review
parent 891e5352c5 7f4a2c0f94
commit de2104dd6b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
contrib/fuel-setup-network/fuel-setup-network
View File

@ -4,7 +4,6 @@ import argparse
from ipaddress import ip_network
import os
import shutil
import sys
import tempfile
import paramiko
@ -12,6 +11,10 @@ import psycopg2
import yaml
class EnvironmentDoesntExistException(Exception):
pass
def get_env_networks(name, host='localhost', user='fuel_devops',
database='fuel_devops', password='fuel_devops'):
conn = psycopg2.connect(host=host, user=user, database=database,
@ -20,7 +23,14 @@ def get_env_networks(name, host='localhost', user='fuel_devops',
cursor = conn.cursor()
cursor.execute('SELECT DISTINCT id FROM devops_environment WHERE name=%s',
[name])
env_id = cursor.fetchone()[0]
env_id = cursor.fetchone()
if env_id is not None:
env_id = env_id[0]
else:
error = 'No environment named "{}" has been found.'.format(name)
raise EnvironmentDoesntExistException(error)
cursor.execute(('SELECT name,ip_network FROM devops_network'
' WHERE environment_id=%s'), [env_id])