x/vmtp
Code Issues Proposed changes

Adding logging framework to VMTP

Browse Source 
1. Adding logging framework to VMTP;
2. Fix the dependency issue while building VMTP container;

Change-Id: Idb532aaec758d0a062e0ccee16f1fb9dfd466a6f
This commit is contained in:
Yichen Wang 2016-05-25 09:38:17 -07:00
parent b3e7917d6b
commit 5fbc516b2c
14 changed files with 230 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Dockerfile
View File

@ -4,16 +4,14 @@ MAINTAINER vmtp-core <vmtp-core@lists.launchpad.net>
# Install VMTP script and dependencies # Install VMTP script and dependencies
RUN apt-get update && apt-get install -y \ RUN apt-get update && apt-get install -y \
lib32z1-dev \ libz-dev \
libffi-dev \ libffi-dev \
libssl-dev \ libssl-dev \
libxml2-dev \ libxml2-dev \
libxslt1-dev \ libxslt-dev \
libyaml-dev \ libyaml-dev \
openssh-client \
python \ python \
python-dev \ python-dev \
python-lxml \
python-pip \ python-pip \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*

1
requirements.txt
View File

@ -15,6 +15,7 @@ python-neutronclient<3,>=2.3.6
python-novaclient>=2.18.1 python-novaclient>=2.18.1
python-openstackclient>=0.4.1 python-openstackclient>=0.4.1
python-keystoneclient>=1.0.0 python-keystoneclient>=1.0.0
pytz>=2016.4
scp>=0.8.0 scp>=0.8.0
tabulate>=0.7.3 tabulate>=0.7.3

70
vmtp/compute.py
View File

@ -15,6 +15,7 @@
'''Module for Openstack compute operations''' '''Module for Openstack compute operations'''
import log
import os import os
import time import time
@ -22,6 +23,10 @@ import glanceclient.exc as glance_exception
import novaclient import novaclient
import novaclient.exceptions as exceptions import novaclient.exceptions as exceptions
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
class Compute(object): class Compute(object):
def __init__(self, nova_client, config): def __init__(self, nova_client, config):
@ -61,34 +66,32 @@ class Compute(object):
while img.status in ['queued', 'saving'] and retry < retry_count: while img.status in ['queued', 'saving'] and retry < retry_count:
img = glance_client.images.find(name=img.name) img = glance_client.images.find(name=img.name)
retry = retry + 1 retry = retry + 1
if self.config.debug: CONLOG.debug("Image not yet active, retrying %s of %s..." % (retry, retry_count))
print "Image not yet active, retrying %s of %s..." \
% (retry, retry_count)
time.sleep(2) time.sleep(2)
if img.status != 'active': if img.status != 'active':
raise Exception raise Exception
except glance_exception.HTTPForbidden: except glance_exception.HTTPForbidden:
print "Cannot upload image without admin access. Please make sure the "\ CONLOG.error("Cannot upload image without admin access. Please make "
"image is uploaded and is either public or owned by you." "sure the image is uploaded and is either public or owned by you.")
return False return False
except IOError: except IOError:
# catch the exception for file based errors. # catch the exception for file based errors.
print "Failed while uploading the image. Please make sure the " \ CONLOG.error("Failed while uploading the image. Please make sure the "
"image at the specified location %s is correct." % image_url "image at the specified location %s is correct." % image_url)
return False return False
except Exception: except Exception:
print "Failed while uploading the image, please make sure the cloud "\ CONLOG.error("Failed while uploading the image, please make sure the "
"under test has the access to URL: %s." % image_url "cloud under test has the access to URL: %s." % image_url)
return False return False
return True return True
def delete_image(self, glance_client, img_name): def delete_image(self, glance_client, img_name):
try: try:
print "Deleting image %s..." % img_name CONLOG.log("Deleting image %s..." % img_name)
img = glance_client.images.find(name=img_name) img = glance_client.images.find(name=img_name)
glance_client.images.delete(img.id) glance_client.images.delete(img.id)
except Exception: except Exception:
print "Failed to delete the image %s." % img_name CONLOG.error("Failed to delete the image %s." % img_name)
return False return False
return True return True
@ -99,7 +102,7 @@ class Compute(object):
for key in keypair_list: for key in keypair_list:
if key.name == name: if key.name == name:
self.novaclient.keypairs.delete(name) self.novaclient.keypairs.delete(name)
print 'Removed public key %s' % (name) CONLOG.info('Removed public key %s' % (name))
break break
# Test if keypair file is present if not create it # Test if keypair file is present if not create it
@ -123,8 +126,7 @@ class Compute(object):
with open(os.path.expanduser(public_key_file)) as pkf: with open(os.path.expanduser(public_key_file)) as pkf:
public_key = pkf.read() public_key = pkf.read()
except IOError as exc: except IOError as exc:
print 'ERROR: Cannot open public key file %s: %s' % \ CONLOG.error('Cannot open public key file %s: %s' % (public_key_file, exc))
(public_key_file, exc)
return None return None
keypair = self.novaclient.keypairs.create(name, public_key) keypair = self.novaclient.keypairs.create(name, public_key)
return keypair return keypair
@ -174,15 +176,14 @@ class Compute(object):
if instance.status == 'ACTIVE': if instance.status == 'ACTIVE':
return instance return instance
if instance.status == 'ERROR': if instance.status == 'ERROR':
print 'Instance creation error:' + instance.fault['message'] CONLOG.error('Instance creation error:' + instance.fault['message'])
break break
if self.config.debug: CONLOG.debug("[%s] VM status=%s, retrying %s of %s..." %
print "[%s] VM status=%s, retrying %s of %s..." \ (vmname, instance.status, (retry_attempt + 1), retry_count))
% (vmname, instance.status, (retry_attempt + 1), retry_count)
time.sleep(2) time.sleep(2)
# instance not in ACTIVE state # instance not in ACTIVE state
print('Instance failed status=' + instance.status) CONLOG.error('Instance failed status=' + instance.status)
self.delete_server(instance) self.delete_server(instance)
return None return None
@ -212,11 +213,10 @@ class Compute(object):
if server.name == vmname and server.status == "ACTIVE": if server.name == vmname and server.status == "ACTIVE":
return True return True
# Sleep between retries # Sleep between retries
if self.config.debug: CONLOG.debug("[%s] VM not yet found, retrying %s of %s..." %
print "[%s] VM not yet found, retrying %s of %s..." \ (vmname, (retry_attempt + 1), retry_count))
% (vmname, (retry_attempt + 1), retry_count)
time.sleep(2) time.sleep(2)
print "[%s] VM not found, after %s attempts" % (vmname, retry_count) CONLOG.error("[%s] VM not found, after %s attempts" % (vmname, retry_count))
return False return False
# Returns True if server is found and deleted/False if not, # Returns True if server is found and deleted/False if not,
@ -225,7 +225,7 @@ class Compute(object):
servers_list = self.get_server_list() servers_list = self.get_server_list()
for server in servers_list: for server in servers_list:
if server.name == vmname: if server.name == vmname:
print 'deleting server %s' % (server) CONLOG.info('Deleting server %s' % (server))
self.novaclient.servers.delete(server) self.novaclient.servers.delete(server)
return True return True
return False return False
@ -253,11 +253,11 @@ class Compute(object):
if hyp.host == host: if hyp.host == host:
return self.normalize_az_host(hyp.zone, host) return self.normalize_az_host(hyp.zone, host)
# no match on host # no match on host
print('Error: passed host name does not exist: ' + host) CONLOG.error('Passed host name does not exist: ' + host)
return None return None
if self.config.availability_zone: if self.config.availability_zone:
return self.normalize_az_host(None, host) return self.normalize_az_host(None, host)
print('Error: --hypervisor passed without an az and no az configured') CONLOG.error('--hypervisor passed without an az and no az configured')
return None return None
def sanitize_az_host(self, host_list, az_host): def sanitize_az_host(self, host_list, az_host):
@ -285,7 +285,7 @@ class Compute(object):
return az_host return az_host
# else continue - another zone with same host name? # else continue - another zone with same host name?
# no match # no match
print('Error: no match for availability zone and host ' + az_host) CONLOG.error('No match for availability zone and host ' + az_host)
return None return None
else: else:
return self.auto_fill_az(host_list, az_host) return self.auto_fill_az(host_list, az_host)
@ -318,8 +318,8 @@ class Compute(object):
try: try:
host_list = self.novaclient.services.list() host_list = self.novaclient.services.list()
except novaclient.exceptions.Forbidden: except novaclient.exceptions.Forbidden:
print ('Warning: Operation Forbidden: could not retrieve list of hosts' CONLOG.warning('Operation Forbidden: could not retrieve list of hosts'
' (likely no permission)') ' (likely no permission)')
# the user has specified a list of 1 or 2 hypervisors to use # the user has specified a list of 1 or 2 hypervisors to use
if self.config.hypervisors: if self.config.hypervisors:
@ -338,7 +338,7 @@ class Compute(object):
# pick first 2 matches at most # pick first 2 matches at most
if len(avail_list) == 2: if len(avail_list) == 2:
break break
print 'Using hypervisors ' + ', '.join(avail_list) CONLOG.info('Using hypervisors ' + ', '.join(avail_list))
else: else:
for host in host_list: for host in host_list:
# this host must be a compute node # this host must be a compute node
@ -360,10 +360,10 @@ class Compute(object):
if not avail_list: if not avail_list:
if not self.config.availability_zone: if not self.config.availability_zone:
print('Error: availability_zone must be configured') CONLOG.error('Availability_zone must be configured')
elif host_list: elif host_list:
print('Error: no host matching the selection for availability zone: ' + CONLOG.error('No host matching the selection for availability zone: ' +
self.config.availability_zone) self.config.availability_zone)
avail_list = [] avail_list = []
else: else:
avail_list = [self.config.availability_zone] avail_list = [self.config.availability_zone]
@ -379,7 +379,7 @@ class Compute(object):
else: else:
return False return False
except novaclient.exceptions: except novaclient.exceptions:
print "Exception in retrieving the hostId of servers" CONLOG.warning("Exception in retrieving the hostId of servers")
# Create a new security group with appropriate rules # Create a new security group with appropriate rules
def security_group_create(self): def security_group_create(self):
@ -407,7 +407,7 @@ class Compute(object):
# Delete a security group # Delete a security group
def security_group_delete(self, group): def security_group_delete(self, group):
if group: if group:
print "Deleting security group" CONLOG.info("Deleting security group")
self.novaclient.security_groups.delete(group) self.novaclient.security_groups.delete(group)
# Add rules to the security group # Add rules to the security group

5
vmtp/config.py
View File

@ -14,8 +14,13 @@
# #
from attrdict import AttrDict from attrdict import AttrDict
import log
import yaml import yaml
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
def config_load(file_name, from_cfg=None): def config_load(file_name, from_cfg=None):
'''Load a yaml file into a config dict, merge with from_cfg if not None '''Load a yaml file into a config dict, merge with from_cfg if not None
The config file content taking precedence in case of duplicate The config file content taking precedence in case of duplicate

8
vmtp/credentials.py
View File

@ -15,9 +15,13 @@
# Module for credentials in Openstack # Module for credentials in Openstack
import getpass import getpass
import log
import os import os
import re import re
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
class Credentials(object): class Credentials(object):
@ -86,7 +90,7 @@ class Credentials(object):
elif name == "CACERT": elif name == "CACERT":
self.rc_cacert = value self.rc_cacert = value
else: else:
print 'Error: rc file does not exist %s' % (openrc_file) CONLOG.error('Error: rc file does not exist %s' % (openrc_file))
success = False success = False
elif not no_env: elif not no_env:
# no openrc file passed - we assume the variables have been # no openrc file passed - we assume the variables have been
@ -94,7 +98,7 @@ class Credentials(object):
# just check that they are present # just check that they are present
for varname in ['OS_USERNAME', 'OS_AUTH_URL', 'OS_TENANT_NAME']: for varname in ['OS_USERNAME', 'OS_AUTH_URL', 'OS_TENANT_NAME']:
if varname not in os.environ: if varname not in os.environ:
# print 'Warning: %s is missing' % (varname) CONLOG.warning('%s is missing' % (varname))
success = False success = False
if success: if success:
self.rc_username = os.environ['OS_USERNAME'] self.rc_username = os.environ['OS_USERNAME']

19
vmtp/instance.py
View File

@ -15,10 +15,15 @@
import re import re
import log
import monitor import monitor
from netaddr import IPAddress from netaddr import IPAddress
import sshutils import sshutils
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
# a dictionary of sequence number indexed by a name prefix # a dictionary of sequence number indexed by a name prefix
prefix_seq = {} prefix_seq = {}
@ -63,7 +68,7 @@ class Instance(object):
if not self.internal_ip: if not self.internal_ip:
self.internal_ip = host_access.host self.internal_ip = host_access.host
self.ssh_access = host_access self.ssh_access = host_access
self.buginf('Setup SSH for %s@%s' % (host_access.username, host_access.host)) self.display('Setup SSH for %s@%s' % (host_access.username, host_access.host))
self.ssh = sshutils.SSH(self.ssh_access, self.ssh = sshutils.SSH(self.ssh_access,
connect_retry_count=self.config.ssh_retry_count) connect_retry_count=self.config.ssh_retry_count)
return True return True
@ -144,13 +149,12 @@ class Instance(object):
return False return False
self.ssh_access.host = fip['floatingip']['floating_ip_address'] self.ssh_access.host = fip['floatingip']['floating_ip_address']
self.ssh_ip_id = fip['floatingip']['id'] self.ssh_ip_id = fip['floatingip']['id']
self.buginf('Floating IP %s created', self.ssh_access.host) self.display('Associating floating IP %s', self.ssh_access.host)
self.buginf('Started - associating floating IP %s', self.ssh_access.host)
self.instance.add_floating_ip(self.ssh_access.host, ipv4_fixed_address) self.instance.add_floating_ip(self.ssh_access.host, ipv4_fixed_address)
# extract the IP for the data network # extract the IP for the data network
self.buginf('Internal network IP: %s', self.internal_ip) self.display('Internal network IP: %s', self.internal_ip)
self.buginf('SSH IP: %s', self.ssh_access.host) self.display('SSH IP: %s', self.ssh_access.host)
# create ssh session # create ssh session
if not self.setup_ssh(self.ssh_access): if not self.setup_ssh(self.ssh_access):
@ -174,12 +178,11 @@ class Instance(object):
# Display a status message with the standard header that has the instance # Display a status message with the standard header that has the instance
# name (e.g. [foo] some text) # name (e.g. [foo] some text)
def display(self, fmt, *args): def display(self, fmt, *args):
print ('[%s] ' + fmt) % ((self.name,) + args) CONLOG.info(('[%s] ' + fmt) % ((self.name,) + args))
# Debugging message, to be printed only in debug mode # Debugging message, to be printed only in debug mode
def buginf(self, fmt, *args): def buginf(self, fmt, *args):
if self.config.debug: CONLOG.debug(('[%s] ' + fmt) % ((self.name,) + args))
self.display(fmt, *args)
# Ping an IP from this instance # Ping an IP from this instance
def ping_check(self, target_ip, ping_count, pass_threshold): def ping_check(self, target_ip, ping_count, pass_threshold):

7
vmtp/iperf_tool.py
View File

@ -15,8 +15,13 @@
import re import re
import log
from perf_tool import PerfTool from perf_tool import PerfTool
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
# The resulting unit should be in K # The resulting unit should be in K
MULTIPLIERS = {'K': 1, MULTIPLIERS = {'K': 1,
'M': 1.0e3, 'M': 1.0e3,
@ -28,7 +33,7 @@ def get_bdw_kbps(bdw, bdw_unit):
return bdw / 1000 return bdw / 1000
if bdw_unit in MULTIPLIERS: if bdw_unit in MULTIPLIERS:
return int(bdw * MULTIPLIERS[bdw_unit]) return int(bdw * MULTIPLIERS[bdw_unit])
print('Error: unknown multiplier: ' + bdw_unit) CONLOG.error('Error: unknown multiplier: ' + bdw_unit)
return bdw return bdw
class IperfTool(PerfTool): class IperfTool(PerfTool):

51
vmtp/log.py Normal file
View File

@ -0,0 +1,51 @@
# Copyright 2016 Cisco Systems, Inc. All rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
import logging
def setup(product_name, debug=False, logfile=None):
log_level = logging.DEBUG if debug else logging.INFO
console_handler = file_handler = None
# logging.basicConfig()
console_formatter_str = '%(asctime)s %(levelname)s %(message)s'
console_handler = logging.StreamHandler()
console_handler.setFormatter(logging.Formatter(console_formatter_str))
# Add a FileHandler if logfile is supplied
if logfile:
file_formatter_str = '%(asctime)s %(levelname)s %(message)s'
file_handler = logging.FileHandler(logfile, mode='w')
file_handler.setFormatter(logging.Formatter(file_formatter_str))
# Add appropriate handlers to loggers
console_logger = logging.getLogger(product_name + '_' + 'console')
console_logger.addHandler(console_handler)
console_logger.setLevel(log_level)
logstash_logger = logging.getLogger(product_name + '_' + 'logstash')
logstash_logger.setLevel(log_level)
all_logger = logging.getLogger(product_name + '_' + 'all')
all_logger.addHandler(console_handler)
all_logger.setLevel(log_level)
if file_handler:
logstash_logger.addHandler(file_handler)
all_logger.addHandler(file_handler)
def getLogger(product, target):
logger = logging.getLogger(product + "_" + target)
return logger

39
vmtp/network.py
View File

@ -15,11 +15,16 @@
import time import time
import log
# Module containing a helper class for operating on OpenStack networks # Module containing a helper class for operating on OpenStack networks
from neutronclient.common.exceptions import NetworkInUseClient from neutronclient.common.exceptions import NetworkInUseClient
from neutronclient.common.exceptions import NeutronException from neutronclient.common.exceptions import NeutronException
import vmtp import vmtp
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
class Network(object): class Network(object):
# #
@ -75,10 +80,10 @@ class Network(object):
break break
if not self.ext_net: if not self.ext_net:
print "No external network found." CONLOG.error("No external network found.")
return return
print "Using external network: " + self.ext_net['name'] CONLOG.info("Using external network: " + self.ext_net['name'])
# Find or create the router to the external network # Find or create the router to the external network
ext_net_id = self.ext_net['id'] ext_net_id = self.ext_net['id']
@ -88,8 +93,7 @@ class Network(object):
if external_gw_info: if external_gw_info:
if external_gw_info['network_id'] == ext_net_id: if external_gw_info['network_id'] == ext_net_id:
self.ext_router = router self.ext_router = router
print 'Found external router: %s' % \ CONLOG.info('Found external router: %s' % (self.ext_router['name']))
(self.ext_router['name'])
break break
# create a new external router if none found and a name was given # create a new external router if none found and a name was given
@ -97,7 +101,7 @@ class Network(object):
if (not self.ext_router) and self.ext_router_name: if (not self.ext_router) and self.ext_router_name:
self.ext_router = self.create_router(self.ext_router_name, self.ext_router = self.create_router(self.ext_router_name,
self.ext_net['id']) self.ext_net['id'])
print '[%s] Created ext router' % (self.ext_router_name) CONLOG.info('Created ext router %s.' % (self.ext_router_name))
self.ext_router_created = True self.ext_router_created = True
if config.ipv6_mode: if config.ipv6_mode:
@ -142,8 +146,7 @@ class Network(object):
for network in self.networks: for network in self.networks:
if network['name'] == network_name: if network['name'] == network_name:
print ('Found existing internal network: %s' CONLOG.info('Found existing internal network: %s' % (network_name))
% (network_name))
return network return network
body = { body = {
@ -182,7 +185,7 @@ class Network(object):
subnet = self.neutron_client.create_subnet(body)['subnet'] subnet = self.neutron_client.create_subnet(body)['subnet']
# add the subnet id to the network dict # add the subnet id to the network dict
network['subnets'].append(subnet['id']) network['subnets'].append(subnet['id'])
print 'Created internal network: %s' % (network_name) CONLOG.info('Created internal network: %s.' % (network_name))
return network return network
# Delete a network and associated subnet # Delete a network and associated subnet
@ -193,7 +196,7 @@ class Network(object):
for _ in range(1, 5): for _ in range(1, 5):
try: try:
self.neutron_client.delete_network(network['id']) self.neutron_client.delete_network(network['id'])
print 'Network %s deleted' % (name) CONLOG.info('Network %s deleted.' % (name))
break break
except NetworkInUseClient: except NetworkInUseClient:
time.sleep(1) time.sleep(1)
@ -217,7 +220,7 @@ class Network(object):
port_ip = port['fixed_ips'][0] port_ip = port['fixed_ips'][0]
if (port['device_id'] == self.ext_router['id']) and \ if (port['device_id'] == self.ext_router['id']) and \
(port_ip['subnet_id'] == self.vm_int_net[0]['subnets'][0]): (port_ip['subnet_id'] == self.vm_int_net[0]['subnets'][0]):
print 'Ext router already associated to the internal network' CONLOG.info('Ext router already associated to the internal network.')
return return
for int_net in self.vm_int_net: for int_net in self.vm_int_net:
@ -225,8 +228,7 @@ class Network(object):
'subnet_id': int_net['subnets'][0] 'subnet_id': int_net['subnets'][0]
} }
self.neutron_client.add_interface_router(self.ext_router['id'], body) self.neutron_client.add_interface_router(self.ext_router['id'], body)
if self.config.debug: CONLOG.debug('Ext router associated to ' + int_net['name'])
print 'Ext router associated to ' + int_net['name']
# If ipv6 is enabled than add second subnet # If ipv6 is enabled than add second subnet
if self.ipv6_enabled: if self.ipv6_enabled:
body = { body = {
@ -254,7 +256,7 @@ class Network(object):
except NeutronException: except NeutronException:
# May fail with neutronclient.common.exceptions.Conflict # May fail with neutronclient.common.exceptions.Conflict
# if there are floating IP in use - just ignore # if there are floating IP in use - just ignore
print('Router interface may have floating IP in use: not deleted') CONLOG.warning('Router interface may have floating IP in use: not deleted')
# Lookup network given network name # Lookup network given network name
def lookup_network(self, network_name): def lookup_network(self, network_name):
@ -283,7 +285,6 @@ class Network(object):
# Update a router given router and network id # Update a router given router and network id
def update_router(self, router_id, net_id): def update_router(self, router_id, net_id):
print net_id
body = { body = {
"router": { "router": {
"name": "pns-router", "name": "pns-router",
@ -307,12 +308,11 @@ class Network(object):
body['port']['binding:vnic_type'] = vnic_type body['port']['binding:vnic_type'] = vnic_type
port = self.neutron_client.create_port(body) port = self.neutron_client.create_port(body)
if self.config.debug: if self.config.debug:
print 'Created port ' + port['port']['id'] CONLOG.info('Created port ' + port['port']['id'])
return port['port'] return port['port']
def delete_port(self, port): def delete_port(self, port):
if self.config.debug: CONLOG.debug('Deleting port ' + port['id'])
print 'Deleting port ' + port['id']
self.neutron_client.delete_port(port['id']) self.neutron_client.delete_port(port['id'])
# Create a floating ip on the external network and return it # Create a floating ip on the external network and return it
@ -344,10 +344,9 @@ class Network(object):
self.neutron_client.remove_gateway_router( self.neutron_client.remove_gateway_router(
self.ext_router['id']) self.ext_router['id'])
self.neutron_client.delete_router(self.ext_router['id']) self.neutron_client.delete_router(self.ext_router['id'])
print 'External router %s deleted' % \ CONLOG.info('External router %s deleted' % (self.ext_router['name']))
(self.ext_router['name'])
except TypeError: except TypeError:
print "No external router set" CONLOG.info("No external router set")
def _get_l2agent_type(self): def _get_l2agent_type(self):
''' '''

5
vmtp/nuttcp_tool.py
View File

@ -15,9 +15,14 @@
import re import re
import log
from perf_tool import PerfTool from perf_tool import PerfTool
import sshutils import sshutils
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
class NuttcpTool(PerfTool): class NuttcpTool(PerfTool):
def __init__(self, instance): def __init__(self, instance):

5
vmtp/perf_instance.py
View File

@ -14,8 +14,13 @@
# #
from instance import Instance as Instance from instance import Instance as Instance
import log
from perf_tool import PingTool from perf_tool import PingTool
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
class PerfInstance(Instance): class PerfInstance(Instance):
'''An openstack instance to run performance tools '''An openstack instance to run performance tools
''' '''

9
vmtp/perf_tool.py
View File

@ -16,11 +16,16 @@
import abc import abc
import re import re
import log
from pkg_resources import resource_filename from pkg_resources import resource_filename
# where to copy the tool on the target, must end with slash # where to copy the tool on the target, must end with slash
SCP_DEST_DIR = '/tmp/' SCP_DEST_DIR = '/tmp/'
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
# #
# A base class for all tools that can be associated to an instance # A base class for all tools that can be associated to an instance
# #
@ -188,7 +193,7 @@ class PerfTool(object):
min_kbps = int((max_kbps + min_kbps) / 2) min_kbps = int((max_kbps + min_kbps) / 2)
kbps = int((max_kbps + min_kbps) / 2) kbps = int((max_kbps + min_kbps) / 2)
# print ' undershot, min=%d kbps=%d max=%d' % (min_kbps, kbps, max_kbps) # CONLOG.debug(' undershot, min=%d kbps=%d max=%d' % (min_kbps, kbps, max_kbps))
elif loss_rate > max_loss_rate: elif loss_rate > max_loss_rate:
# overshot # overshot
max_kbps = kbps max_kbps = kbps
@ -196,7 +201,7 @@ class PerfTool(object):
kbps = measured_kbps kbps = measured_kbps
else: else:
kbps = int((max_kbps + min_kbps) / 2) kbps = int((max_kbps + min_kbps) / 2)
# print ' overshot, min=%d kbps=%d max=%d' % (min_kbps, kbps, max_kbps) # CONLOG.debug(' overshot, min=%d kbps=%d max=%d' % (min_kbps, kbps, max_kbps))
else: else:
# converged within loss rate bracket # converged within loss rate bracket
break break

17
vmtp/sshutils.py
View File

@ -64,9 +64,14 @@ import StringIO
import sys import sys
import time import time
import log
import paramiko import paramiko
import scp import scp
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
# from rally.openstack.common.gettextutils import _ # from rally.openstack.common.gettextutils import _
@ -407,7 +412,7 @@ class SSH(object):
if int(pkt_loss) < int(pass_threshold): if int(pkt_loss) < int(pass_threshold):
return 1 return 1
else: else:
print 'Ping to %s failed: %s' % (target_ip, cmd_output) CONLOG.error('Ping to %s failed: %s' % (target_ip, cmd_output))
return 0 return 0
def get_file_from_host(self, from_path, to_path): def get_file_from_host(self, from_path, to_path):
@ -420,7 +425,7 @@ class SSH(object):
try: try:
scpcon.get(from_path, to_path) scpcon.get(from_path, to_path)
except scp.SCPException as exp: except scp.SCPException as exp:
print "Receive failed: [%s]" % exp CONLOG.error("Receive failed: [%s]" % exp)
return 0 return 0
return 1 return 1
@ -434,7 +439,7 @@ class SSH(object):
try: try:
scpcon.put(from_path, remote_path=to_path) scpcon.put(from_path, remote_path=to_path)
except scp.SCPException as exp: except scp.SCPException as exp:
print "Send failed: [%s]" % exp CONLOG.error("Send failed: [%s]" % exp)
return 0 return 0
return 1 return 1
@ -460,7 +465,7 @@ class SSH(object):
if self.stat(os_release_file): if self.stat(os_release_file):
data = self.read_remote_file(os_release_file) data = self.read_remote_file(os_release_file)
if data is None: if data is None:
print "ERROR:Failed to read file %s" % os_release_file CONLOG.error("Failed to read file %s" % os_release_file)
return None return None
for line in data.splitlines(): for line in data.splitlines():
@ -478,7 +483,7 @@ class SSH(object):
if self.stat(sys_release_file): if self.stat(sys_release_file):
data = self.read_remote_file(sys_release_file) data = self.read_remote_file(sys_release_file)
if data is None: if data is None:
print "ERROR:Failed to read file %s" % sys_release_file CONLOG.error("Failed to read file %s" % sys_release_file)
return None return None
for line in data.splitlines(): for line in data.splitlines():
@ -507,7 +512,7 @@ class SSH(object):
if mobj: if mobj:
return mobj.group(0) return mobj.group(0)
print "%s pkg installed " % rpm_pkg CONLOG.info("%s pkg installed " % rpm_pkg)
return None return None

127
vmtp/vmtp.py
View File

@ -18,7 +18,7 @@ import argparse
import datetime import datetime
import hashlib import hashlib
import json import json
import logging import log
import os import os
import pprint import pprint
import re import re
@ -44,14 +44,18 @@ import pns_mongo
from prettytable import PrettyTable from prettytable import PrettyTable
import sshutils import sshutils
CONLOG = log.getLogger('vmtp', 'console')
LSLOG = log.getLogger('vmtp', 'logstash')
LOG = log.getLogger('vmtp', 'all')
flow_num = 0 flow_num = 0
class FlowPrinter(object): class FlowPrinter(object):
@staticmethod @staticmethod
def print_desc(desc): def print_desc(desc):
global flow_num global flow_num
flow_num = flow_num + 1 flow_num = flow_num + 1
print "=" * 60 CONLOG.info("=" * 60)
print('Flow %d: %s' % (flow_num, desc)) CONLOG.info('Flow %d: %s' % (flow_num, desc))
class ResultsCollector(object): class ResultsCollector(object):
@ -70,13 +74,6 @@ class ResultsCollector(object):
def add_flow_result(self, flow_res): def add_flow_result(self, flow_res):
self.results['flows'].append(flow_res) self.results['flows'].append(flow_res)
self.ppr.pprint(flow_res)
def display(self):
self.ppr.pprint(self.results)
def pprint(self, res):
self.ppr.pprint(res)
def get_result(self, key): def get_result(self, key):
if keystoneclient in self.results: if keystoneclient in self.results:
@ -102,13 +99,13 @@ class ResultsCollector(object):
def save(self, cfg): def save(self, cfg):
'''Save results in json format file.''' '''Save results in json format file.'''
print('Saving results in json file: ' + cfg.json_file + "...") CONLOG.info('Saving results in json file: ' + cfg.json_file + "...")
with open(cfg.json_file, 'w') as jfp: with open(cfg.json_file, 'w') as jfp:
json.dump(self.results, jfp, indent=4, sort_keys=True) json.dump(self.results, jfp, indent=4, sort_keys=True)
def save_to_db(self, cfg): def save_to_db(self, cfg):
'''Save results to MongoDB database.''' '''Save results to MongoDB database.'''
print "Saving results to MongoDB database..." CONLOG.info("Saving results to MongoDB database...")
post_id = pns_mongo.\ post_id = pns_mongo.\
pns_add_test_result_to_mongod(cfg.vmtp_mongod_ip, pns_add_test_result_to_mongod(cfg.vmtp_mongod_ip,
cfg.vmtp_mongod_port, cfg.vmtp_mongod_port,
@ -116,7 +113,7 @@ class ResultsCollector(object):
cfg.vmtp_collection, cfg.vmtp_collection,
self.results) self.results)
if post_id is None: if post_id is None:
print "ERROR: Failed to add result to DB" CONLOG.error("Failed to add result to DB")
class VmtpException(Exception): class VmtpException(Exception):
pass pass
@ -187,14 +184,14 @@ class VmtpTest(object):
self.instance_access.public_key_file = pub_key self.instance_access.public_key_file = pub_key
self.instance_access.private_key_file = priv_key self.instance_access.private_key_file = priv_key
else: else:
print('Error: Default keypair ~/.ssh/id_rsa[.pub] does not exist. Please ' CONLOG.error('Default keypair ~/.ssh/id_rsa[.pub] does not exist. Please '
'either create one in your home directory, or specify your keypair ' 'either create one in your home directory, or specify your '
'information in the config file before running VMTP.') 'keypair information in the config file before running VMTP.')
sys.exit(1) sys.exit(1)
if self.config.debug and self.instance_access.public_key_file: if self.config.debug and self.instance_access.public_key_file:
print('VM public key: ' + self.instance_access.public_key_file) CONLOG.info('VM public key: ' + self.instance_access.public_key_file)
print('VM private key: ' + self.instance_access.private_key_file) CONLOG.info('VM private key: ' + self.instance_access.private_key_file)
# If we need to reuse existing vms just return without setup # If we need to reuse existing vms just return without setup
if not self.config.reuse_existing_vm: if not self.config.reuse_existing_vm:
@ -212,8 +209,8 @@ class VmtpTest(object):
self.image_instance = self.comp.find_image(self.config.image_name) self.image_instance = self.comp.find_image(self.config.image_name)
if self.image_instance is None: if self.image_instance is None:
if self.config.vm_image_url != "": if self.config.vm_image_url != "":
print '%s: image for VM not found, trying to upload it ...' \ CONLOG.info('%s: image for VM not found, trying to upload it ...' %
% (self.config.image_name) (self.config.image_name))
keystone = keystoneclient.Client(**creds) keystone = keystoneclient.Client(**creds)
glance_endpoint = keystone.service_catalog.url_for( glance_endpoint = keystone.service_catalog.url_for(
service_type='image', endpoint_type='publicURL') service_type='image', endpoint_type='publicURL')
@ -228,24 +225,24 @@ class VmtpTest(object):
self.image_uploaded = True self.image_uploaded = True
else: else:
# Exit the pogram # Exit the pogram
print '%s: image to launch VM not found. ABORTING.' \ CONLOG.error('%s: image to launch VM not found. ABORTING.' %
% (self.config.image_name) (self.config.image_name))
sys.exit(1) sys.exit(1)
self.assert_true(self.image_instance) self.assert_true(self.image_instance)
print 'Found image %s to launch VM, will continue' % (self.config.image_name) CONLOG.info('Found image %s to launch VM, will continue' % (self.config.image_name))
self.flavor_type = self.comp.find_flavor(self.config.flavor_type) self.flavor_type = self.comp.find_flavor(self.config.flavor_type)
self.net = network.Network(neutron, self.config) self.net = network.Network(neutron, self.config)
self.rescol.add_property('l2agent_type', self.net.l2agent_type) self.rescol.add_property('l2agent_type', self.net.l2agent_type)
print "OpenStack agent: " + self.net.l2agent_type CONLOG.info("OpenStack agent: " + self.net.l2agent_type)
try: try:
network_type = self.net.vm_int_net[0]['provider:network_type'] network_type = self.net.vm_int_net[0]['provider:network_type']
print "OpenStack network type: " + network_type CONLOG.info("OpenStack network type: " + network_type)
self.rescol.add_property('encapsulation', network_type) self.rescol.add_property('encapsulation', network_type)
except KeyError as exp: except KeyError as exp:
network_type = 'Unknown' network_type = 'Unknown'
print "Provider network type not found: ", str(exp) CONLOG.info("Provider network type not found: ", str(exp))
# Create a new security group for the test # Create a new security group for the test
self.sec_group = self.comp.security_group_create() self.sec_group = self.comp.security_group_create()
@ -323,6 +320,7 @@ class VmtpTest(object):
bidirectional=True) bidirectional=True)
if res: if res:
self.rescol.add_flow_result(res) self.rescol.add_flow_result(res)
CONLOG.info(self.rescol.ppr.pformat(res))
client.dispose() client.dispose()
def add_location(self, label): def add_location(self, label):
@ -358,11 +356,12 @@ class VmtpTest(object):
results_list = perf_output['results'] results_list = perf_output['results']
for res_dict in results_list: for res_dict in results_list:
if 'error' in res_dict: if 'error' in res_dict:
print('Stopping execution on error, cleanup all VMs/networks manually') CONLOG.error('Stopping execution on error, cleanup all VMs/networks manually')
self.rescol.pprint(perf_output) CONLOG.info(self.rescol.ppr.pformat(perf_output))
sys.exit(2) sys.exit(2)
self.rescol.add_flow_result(perf_output) self.rescol.add_flow_result(perf_output)
CONLOG.info(self.rescol.ppr.pformat(perf_output))
def measure_vm_flows(self): def measure_vm_flows(self):
# scenarios need to be tested for both inter and intra node # scenarios need to be tested for both inter and intra node
@ -398,7 +397,7 @@ class VmtpTest(object):
''' '''
Clean up the floating ip and VMs Clean up the floating ip and VMs
''' '''
print '---- Cleanup ----' CONLOG.info('Cleaning up...')
if self.server: if self.server:
self.server.dispose() self.server.dispose()
if self.client: if self.client:
@ -414,7 +413,7 @@ class VmtpTest(object):
self.comp.security_group_delete(self.sec_group) self.comp.security_group_delete(self.sec_group)
except ClientException: except ClientException:
# May throw novaclient.exceptions.BadRequest if in use # May throw novaclient.exceptions.BadRequest if in use
print('Security group in use: not deleted') CONLOG.warning('Security group in use: not deleted')
if self.image_uploaded and self.config.delete_image_after_run: if self.image_uploaded and self.config.delete_image_after_run:
self.comp.delete_image(self.glance_client, self.config.image_name) self.comp.delete_image(self.glance_client, self.config.image_name)
@ -427,12 +426,11 @@ class VmtpTest(object):
except KeyboardInterrupt: except KeyboardInterrupt:
traceback.format_exc() traceback.format_exc()
except (VmtpException, sshutils.SSHError, ClientException, Exception): except (VmtpException, sshutils.SSHError, ClientException, Exception):
print 'print_exc:' CONLOG.error(traceback.print_exc())
traceback.print_exc()
error_flag = True error_flag = True
if self.config.stop_on_error and error_flag: if self.config.stop_on_error and error_flag:
print('Stopping execution on error, cleanup all VMs/networks manually') CONLOG.error('Stopping execution on error, cleanup all VMs/networks manually')
sys.exit(2) sys.exit(2)
else: else:
self.teardown() self.teardown()
@ -460,7 +458,7 @@ def test_native_tp(nhosts, ifname, config):
# use the IP address configured on given interface # use the IP address configured on given interface
server_ip = server.get_interface_ip(ifname) server_ip = server.get_interface_ip(ifname)
if not server_ip: if not server_ip:
print('Error: cannot get IP address for interface ' + ifname) CONLOG.error('Cannot get IP address for interface ' + ifname)
else: else:
server.display('Clients will use server IP address %s (%s)' % server.display('Clients will use server IP address %s (%s)' %
(server_ip, ifname)) (server_ip, ifname))
@ -494,10 +492,10 @@ def test_native_tp(nhosts, ifname, config):
def get_controller_info(ssh_access, net, res_col, retry_count): def get_controller_info(ssh_access, net, res_col, retry_count):
if not ssh_access: if not ssh_access:
return return
print 'Fetching OpenStack deployment details...' CONLOG.info('Fetching OpenStack deployment details...')
sshcon = sshutils.SSH(ssh_access, connect_retry_count=retry_count) sshcon = sshutils.SSH(ssh_access, connect_retry_count=retry_count)
if sshcon is None: if sshcon is None:
print 'ERROR: Cannot connect to the controller node' CONLOG.error('Cannot connect to the controller node')
return return
res = {} res = {}
res['distro'] = sshcon.get_host_os_version() res['distro'] = sshcon.get_host_os_version()
@ -512,7 +510,7 @@ def get_controller_info(ssh_access, net, res_col, retry_count):
net.internal_iface_dict) net.internal_iface_dict)
res['l2agent_version'] = sshcon.get_l2agent_version(l2type) res['l2agent_version'] = sshcon.get_l2agent_version(l2type)
# print results # print results
res_col.pprint(res) CONLOG.info(res_col.ppr.pformat(res))
res_col.add_properties(res) res_col.add_properties(res)
def gen_report_data(proto, result): def gen_report_data(proto, result):
@ -632,13 +630,15 @@ def print_report(results):
for row in table: for row in table:
ptable.add_row(row) ptable.add_row(row)
print "\nSummary of results" summary = "Summary of results\n"
print "==================" summary += "==================\n"
print "Total Scenarios: %d" % (len(table) - 1) summary += "Total Scenarios: %d\n" % (len(table) - 1)
print "Passed Scenarios: %d [%.2f%%]" % (cnt_passed, passed_rate) summary += "Passed Scenarios: %d [%.2f%%]\n" % (cnt_passed, passed_rate)
print "Failed Scenarios: %d [%.2f%%]" % (cnt_failed, failed_rate) summary += "Failed Scenarios: %d [%.2f%%]\n" % (cnt_failed, failed_rate)
print "Skipped Scenarios: %d" % (cnt_skipped) summary += "Skipped Scenarios: %d\n" % (cnt_skipped)
print ptable summary += str(ptable)
CONLOG.info(summary)
def normalize_paths(cfg): def normalize_paths(cfg):
''' '''
@ -666,7 +666,7 @@ def get_ssh_access(opt_name, opt_value, config):
host_access.private_key_file = config.private_key_file host_access.private_key_file = config.private_key_file
host_access.public_key_file = config.public_key_file host_access.public_key_file = config.public_key_file
if host_access.error: if host_access.error:
print'Error for --' + (opt_name + ':' + host_access.error) CONLOG.error('Error for --' + (opt_name + ':' + host_access.error))
sys.exit(2) sys.exit(2)
return host_access return host_access
@ -768,7 +768,6 @@ def parse_opts_from_cli():
'(implies --protocols M[...], --tp-tool nuttcp )', '(implies --protocols M[...], --tp-tool nuttcp )',
metavar='<multicast_address>') metavar='<multicast_address>')
parser.add_argument('--bandwidth', dest='vm_bandwidth', parser.add_argument('--bandwidth', dest='vm_bandwidth',
action='store', action='store',
default=0, default=0,
@ -844,6 +843,11 @@ def parse_opts_from_cli():
help='The test description to be stored in JSON or MongoDB', help='The test description to be stored in JSON or MongoDB',
metavar='<test_description>') metavar='<test_description>')
parser.add_argument('--log-file', '--logfile', dest='logfile',
action='store',
help='Filename for saving VMTP logs',
metavar='<log_file>')
return parser.parse_known_args()[0] return parser.parse_known_args()[0]
def merge_opts_to_configs(opts): def merge_opts_to_configs(opts):
@ -876,15 +880,15 @@ def merge_opts_to_configs(opts):
config.same_network_only = opts.same_network_only config.same_network_only = opts.same_network_only
if config.public_key_file and not os.path.isfile(config.public_key_file): if config.public_key_file and not os.path.isfile(config.public_key_file):
print('Warning: invalid public_key_file:' + config.public_key_file) CONLOG.warning('Invalid public_key_file:' + config.public_key_file)
config.public_key_file = None config.public_key_file = None
if config.private_key_file and not os.path.isfile(config.private_key_file): if config.private_key_file and not os.path.isfile(config.private_key_file):
print('Warning: invalid private_key_file:' + config.private_key_file) CONLOG.warning('Invalid private_key_file:' + config.private_key_file)
config.private_key_file = None config.private_key_file = None
# direct: use SR-IOV ports for all the test VMs # direct: use SR-IOV ports for all the test VMs
if opts.vnic_type not in [None, 'direct', 'macvtap', 'normal']: if opts.vnic_type not in [None, 'direct', 'macvtap', 'normal']:
print('Invalid vnic-type: ' + opts.vnic_type) CONLOG.error('Invalid vnic-type: ' + opts.vnic_type)
sys.exit(1) sys.exit(1)
config.vnic_type = opts.vnic_type config.vnic_type = opts.vnic_type
config.hypervisors = opts.hypervisors config.hypervisors = opts.hypervisors
@ -933,8 +937,8 @@ def merge_opts_to_configs(opts):
raise ValueError raise ValueError
val = int(opts.vm_bandwidth[0:-1]) val = int(opts.vm_bandwidth[0:-1])
except ValueError: except ValueError:
print 'Invalid --bandwidth parameter. A valid input must '\ CONLOG.error('Invalid --bandwidth parameter. A valid input must '
'specify only one unit (K|M|G).' 'specify only one unit (K|M|G).')
sys.exit(1) sys.exit(1)
config.vm_bandwidth = int(val * (10 ** (ex_unit * 3))) config.vm_bandwidth = int(val * (10 ** (ex_unit * 3)))
@ -946,8 +950,8 @@ def merge_opts_to_configs(opts):
for i in xrange(len(config.tcp_pkt_sizes)): for i in xrange(len(config.tcp_pkt_sizes)):
config.tcp_pkt_sizes[i] = int(config.tcp_pkt_sizes[i]) config.tcp_pkt_sizes[i] = int(config.tcp_pkt_sizes[i])
except ValueError: except ValueError:
print 'Invalid --tcpbuf parameter. A valid input must be '\ CONLOG.error('Invalid --tcpbuf parameter. A valid input must be '
'integers seperated by comma.' 'integers seperated by comma.')
sys.exit(1) sys.exit(1)
if opts.udp_pkt_sizes: if opts.udp_pkt_sizes:
@ -956,8 +960,8 @@ def merge_opts_to_configs(opts):
for i in xrange(len(config.udp_pkt_sizes)): for i in xrange(len(config.udp_pkt_sizes)):
config.udp_pkt_sizes[i] = int(config.udp_pkt_sizes[i]) config.udp_pkt_sizes[i] = int(config.udp_pkt_sizes[i])
except ValueError: except ValueError:
print 'Invalid --udpbuf parameter. A valid input must be '\ CONLOG.error('Invalid --udpbuf parameter. A valid input must be '
'integers seperated by comma.' 'integers seperated by comma.')
sys.exit(1) sys.exit(1)
if opts.reuse_network_name: if opts.reuse_network_name:
@ -983,12 +987,12 @@ def merge_opts_to_configs(opts):
if mobj: if mobj:
config.gmond_svr_ip = mobj.group(1) config.gmond_svr_ip = mobj.group(1)
config.gmond_svr_port = mobj.group(2) config.gmond_svr_port = mobj.group(2)
print "Ganglia monitoring enabled (%s:%s)" % \ CONLOG.info("Ganglia monitoring enabled (%s:%s)" %
(config.gmond_svr_ip, config.gmond_svr_port) (config.gmond_svr_ip, config.gmond_svr_port))
config.time = 30 config.time = 30
else: else:
print 'Invalid --monitor syntax: ' + opts.monitor CONLOG.warning('Invalid --monitor syntax: ' + opts.monitor)
################################################### ###################################################
# Once we parse the config files, normalize # Once we parse the config files, normalize
@ -1013,7 +1017,7 @@ def merge_opts_to_configs(opts):
elif opts.tp_tool.lower() == 'iperf': elif opts.tp_tool.lower() == 'iperf':
config.tp_tool = iperf_tool.IperfTool config.tp_tool = iperf_tool.IperfTool
else: else:
print 'Invalid transport tool: ' + opts.tp_tool CONLOG.warning('Invalid transport tool: ' + opts.tp_tool)
sys.exit(1) sys.exit(1)
else: else:
config.tp_tool = None config.tp_tool = None
@ -1063,12 +1067,13 @@ def run_vmtp(opts):
for item in native_tp_results: for item in native_tp_results:
rescol.add_flow_result(item) rescol.add_flow_result(item)
CONLOG.info(rescol.ppr.pformat(item))
# Parse the credentials of the OpenStack cloud, and run the benchmarking # Parse the credentials of the OpenStack cloud, and run the benchmarking
cred = credentials.Credentials(opts.rc, opts.passwd, opts.no_env) cred = credentials.Credentials(opts.rc, opts.passwd, opts.no_env)
if cred.rc_auth_url: if cred.rc_auth_url:
if config.debug: if config.debug:
print 'Using ' + cred.rc_auth_url CONLOG.info('Using ' + cred.rc_auth_url)
vmtp_instance = VmtpTest(config, cred, rescol) vmtp_instance = VmtpTest(config, cred, rescol)
vmtp_instance.run() vmtp_instance.run()
vmtp_net = vmtp_instance.net vmtp_net = vmtp_instance.net
@ -1103,8 +1108,8 @@ def run_vmtp(opts):
return rescol.results return rescol.results
def main(): def main():
logging.basicConfig()
opts = parse_opts_from_cli() opts = parse_opts_from_cli()
log.setup('vmtp', debug=opts.debug, logfile=opts.logfile)
run_vmtp(opts) run_vmtp(opts)
if __name__ == '__main__': if __name__ == '__main__':