openstack
/
murano-dashboard
Code Issues Proposed changes

Rename `log` to `LOG` in all muranodashboard 

Change-Id: Ia4b502bba1edbab54880d91ed5fa78d4055b3cd4
This commit is contained in:
Timur Sufiev 2014-04-07 17:41:13 +04:00
parent 48de49c987
commit aa76d373eb
9 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
muranodashboard/dynamic_ui/fields.py
View File

@ -34,7 +34,7 @@ from django.template.loader import render_to_string
from muranoclient.common import exceptions as muranoclient_exc
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
def with_request(func):
@ -48,13 +48,13 @@ def with_request(func):
kwargs[key] = value
if initial_request:
log.debug("Using 'request' value from initial dictionary")
LOG.debug("Using 'request' value from initial dictionary")
func(self, initial_request, **kwargs)
elif request:
log.debug("Using direct 'request' value")
LOG.debug("Using direct 'request' value")
func(self, request, **kwargs)
else:
log.error("No 'request' value passed neither via initial "
LOG.error("No 'request' value passed neither via initial "
"dictionary, nor directly")
raise forms.ValidationError("Can't get a request information")
return update
@ -101,7 +101,7 @@ def get_murano_images(request):
# public filter removed
images, _more = glance.image_list_detailed(request)
except:
log.error("Error to request image list from glance ")
LOG.error("Error to request image list from glance ")
exceptions.handle(request, _("Unable to retrieve public images."))
murano_images = []
for image in images:
@ -110,7 +110,7 @@ def get_murano_images(request):
try:
murano_metadata = json.loads(murano_property)
except ValueError:
log.warning("JSON in image metadata is not valid. "
LOG.warning("JSON in image metadata is not valid. "
"Check it in glance.")
messages.error(request, _("Invalid murano image metadata"))
else:
@ -566,7 +566,7 @@ class ClusterIPField(CharField):
try:
ip_info = novaclient(request).fixed_ips.get(ip)
except exceptions.UNAUTHORIZED:
log.error("Error to get information about IP address"
LOG.error("Error to get information about IP address"
" using novaclient")
exceptions.handle(
request, _("Unable to retrieve information "
@ -574,7 +574,7 @@ class ClusterIPField(CharField):
ignore=True)
except exceptions.NOT_FOUND:
msg = "Could not found fixed ips for ip %s" % (ip,)
log.error(msg)
LOG.error(msg)
exceptions.handle(
request, _(msg),
ignore=True)

6
muranodashboard/dynamic_ui/forms.py
View File

@ -23,7 +23,7 @@ import muranodashboard.dynamic_ui.helpers as helpers
import yaql
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
class AnyFieldDict(collections.defaultdict):
@ -166,7 +166,7 @@ class UpdatableFieldsForm(forms.Form):
class ServiceConfigurationForm(UpdatableFieldsForm):
def __init__(self, *args, **kwargs):
log.info("Creating form {0}".format(self.__class__.__name__))
LOG.info("Creating form {0}".format(self.__class__.__name__))
super(ServiceConfigurationForm, self).__init__(*args, **kwargs)
self.attribute_mappings = {}
self.context = helpers.create_yaql_context()
@ -210,7 +210,7 @@ class ServiceConfigurationForm(UpdatableFieldsForm):
value = field.postclean(self, cleaned_data)
if value:
cleaned_data[name] = value
log.debug("Update cleaned data in postclean method")
LOG.debug("Update cleaned data in postclean method")
self.service.update_cleaned_data(cleaned_data, form=self)
return cleaned_data

6
muranodashboard/dynamic_ui/services.py
View File

@ -26,13 +26,13 @@ from django.utils.translation import ugettext_lazy as _
from muranodashboard.environments.consts import CACHE_DIR
from muranodashboard.dynamic_ui import version
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
if not os.path.exists(CACHE_DIR):
os.mkdir(CACHE_DIR)
log.info('Creating cache directory located at {dir}'.format(dir=CACHE_DIR))
log.info('Using cache directory located at {dir}'.format(dir=CACHE_DIR))
LOG.info('Creating cache directory located at {dir}'.format(dir=CACHE_DIR))
LOG.info('Using cache directory located at {dir}'.format(dir=CACHE_DIR))
class Service(object):

56
muranodashboard/environments/api.py
View File

@ -26,7 +26,7 @@ from .network import get_network_params
from muranodashboard.environments import format
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
def get_endpoint(request):
@ -38,7 +38,7 @@ def get_endpoint(request):
endpoint = url_for(request, 'murano')
except ServiceCatalogException:
endpoint = 'http://localhost:8082'
log.warning('Murano API location could not be found in Service '
LOG.warning('Murano API location could not be found in Service '
'Catalog, using default: {0}'.format(endpoint))
return endpoint
@ -48,7 +48,7 @@ def muranoclient(request):
insecure = getattr(settings, 'MURANO_API_INSECURE', False)
token_id = request.user.token.id
log.debug('Murano::Client <Url: {0}, '
LOG.debug('Murano::Client <Url: {0}, '
'TokenId: {1}>'.format(endpoint, token_id))
return client.Client(
@ -58,7 +58,7 @@ def muranoclient(request):
def get_status_messages_for_service(request, service_id, environment_id):
deployments = muranoclient(request).deployments. \
list(environment_id)
log.debug('Deployment::List {0}'.format(deployments))
LOG.debug('Deployment::List {0}'.format(deployments))
result = '\n'
#TODO: Add updated time to logs
@ -126,21 +126,21 @@ class Session(object):
muranoclient(request).sessions.get(environment_id, id)
except HTTPForbidden:
del sessions[environment_id]
log.debug("The environment is deploying by other user."
LOG.debug("The environment is deploying by other user."
"Creating a new session "
"for the environment {0}".format(environment_id))
return create_session(request, environment_id)
else:
if session_data.state == "deployed":
del sessions[environment_id]
log.debug("The existent session has status 'deployed'."
LOG.debug("The existent session has status 'deployed'."
" Creating a new session "
"for the environment {0}".format(environment_id))
return create_session(request, environment_id)
else:
log.debug("Creating a new session")
LOG.debug("Creating a new session")
return create_session(request, environment_id)
log.debug("Found active session "
LOG.debug("Found active session "
"for the environment {0}".format(environment_id))
return id
@ -159,17 +159,17 @@ class Session(object):
session_id = sessions[environment_id] \
if environment_id in sessions else None
if session_id:
log.debug("Using session_id {0} for the environment {1}".format(
LOG.debug("Using session_id {0} for the environment {1}".format(
session_id, environment_id))
else:
log.debug("Session for the environment {0} not found".format(
LOG.debug("Session for the environment {0} not found".format(
environment_id))
return session_id
def environments_list(request):
environments = muranoclient(request).environments.list()
log.debug('Environment::List {0}'.format(environments))
LOG.debug('Environment::List {0}'.format(environments))
for index, env in enumerate(environments):
environments[index].has_services = False
environment = environment_get(request, env.id)
@ -188,29 +188,29 @@ def environment_create(request, parameters):
#name is required param
body['name'] = parameters['name']
env = muranoclient(request).environments.create(body)
log.debug('Environment::Create {0}'.format(env))
LOG.debug('Environment::Create {0}'.format(env))
return env
def environment_delete(request, environment_id):
log.debug('Environment::Delete <Id: {0}>'.format(environment_id))
LOG.debug('Environment::Delete <Id: {0}>'.format(environment_id))
return muranoclient(request).environments.delete(environment_id)
def environment_get(request, environment_id):
session_id = Session.get(request, environment_id)
log.debug('Environment::Get <Id: {0}, SessionId: {1}>'.
LOG.debug('Environment::Get <Id: {0}, SessionId: {1}>'.
format(environment_id, session_id))
env = muranoclient(request).environments.get(environment_id, session_id)
log.debug('Environment::Get {0}'.format(env))
LOG.debug('Environment::Get {0}'.format(env))
return env
def environment_deploy(request, environment_id):
session_id = Session.get(request, environment_id)
log.debug('Session::Get <Id: {0}>'.format(session_id))
LOG.debug('Session::Get <Id: {0}>'.format(session_id))
env = muranoclient(request).sessions.deploy(environment_id, session_id)
log.debug('Environment::Deploy <EnvId: {0}, SessionId: {1}>'
LOG.debug('Environment::Deploy <EnvId: {0}, SessionId: {1}>'
''.format(environment_id, session_id))
return env
@ -258,7 +258,7 @@ def services_list(request, environment_id):
service_data['operation_updated'] = time
services.append(service_data)
log.debug('Service::List')
LOG.debug('Service::List')
return [bunch.bunchify(service) for service in services]
@ -269,7 +269,7 @@ def app_id_by_fqn(request, fqn):
def service_list_by_id(request, environment_id, app_id):
services = services_list(request, environment_id)
log.debug('Service::Instances::List')
LOG.debug('Service::Instances::List')
return [service for service in services if service['app_id'] == app_id]
@ -277,7 +277,7 @@ def service_create(request, environment_id, parameters):
# we should be able to delete session
# if we what add new services to this environment
session_id = Session.get_or_create_or_delete(request, environment_id)
log.debug('Service::Create {0}'.format(parameters['app_id']))
LOG.debug('Service::Create {0}'.format(parameters['app_id']))
return muranoclient(request).services.post(environment_id,
path='/',
data=parameters,
@ -285,7 +285,7 @@ def service_create(request, environment_id, parameters):
def service_delete(request, environment_id, service_id):
log.debug('Service::Delete <SrvId: {0}>'.format(service_id))
LOG.debug('Service::Delete <SrvId: {0}>'.format(service_id))
session_id = Session.get_or_create_or_delete(request, environment_id)
return muranoclient(request).services.delete(environment_id,
'/' + service_id,
@ -294,14 +294,14 @@ def service_delete(request, environment_id, service_id):
def service_get(request, environment_id, service_id):
services = services_list(request, environment_id)
log.debug("Return service detail for a specified id")
LOG.debug("Return service detail for a specified id")
for service in services:
if service.id == service_id:
return service
def deployments_list(request, environment_id):
log.debug('Deployments::List')
LOG.debug('Deployments::List')
deployments = muranoclient(request).deployments.list(environment_id)
for deployment in deployments:
if deployment.started:
@ -309,21 +309,21 @@ def deployments_list(request, environment_id):
if deployment.finished:
deployment.finished = deployment.finished.replace('T', ' ')
log.debug('Environment::List {0}'.format(deployments))
LOG.debug('Environment::List {0}'.format(deployments))
return deployments
def deployment_reports(request, environment_id, deployment_id):
log.debug('Deployment::Reports::List')
LOG.debug('Deployment::Reports::List')
reports = muranoclient(request).deployments.reports(environment_id,
deployment_id)
log.debug('Deployment::Reports::List {0}'.format(reports))
LOG.debug('Deployment::Reports::List {0}'.format(reports))
return reports
def get_deployment_start(request, environment_id, deployment_id):
deployments = muranoclient(request).deployments.list(environment_id)
log.debug('Get deployment start time')
LOG.debug('Get deployment start time')
for deployment in deployments:
if deployment.id == deployment_id:
return deployment.started.replace('T', ' ')
@ -332,7 +332,7 @@ def get_deployment_start(request, environment_id, deployment_id):
def get_deployment_descr(request, environment_id, deployment_id):
deployments = muranoclient(request).deployments.list(environment_id)
log.debug('Get deployment description')
LOG.debug('Get deployment description')
for deployment in deployments:
if deployment.id == deployment_id:
descr = deployment.description

2
muranodashboard/environments/forms.py
View File

@ -18,7 +18,7 @@ from django import forms
from django.utils.translation import ugettext_lazy as _
from muranodashboard.dynamic_ui.fields import get_murano_images, \
ImageChoiceField
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
def filter_service_by_image_type(service, request):

4
muranodashboard/environments/network.py
View File

@ -20,7 +20,7 @@ from netaddr.strategy import ipv4
from neutronclient.v2_0 import client as neutronclient
import logging
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
class NeutronSubnetGetter(object):
@ -138,5 +138,5 @@ def get_network_params(request):
'cidr': existing_subnet,
'routerId': getter.get_router_id()}}
else:
log.error('Cannot get subnet')
LOG.error('Cannot get subnet')
return {'networking': {'topology': network_topology}}

6
muranodashboard/environments/workflows.py
View File

@ -23,7 +23,7 @@ from horizon import workflows
from muranodashboard.environments import api
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
class SelectProjectUserAction(workflows.Action):
@ -89,7 +89,7 @@ class CreateEnvironment(workflows.Workflow):
return True
except Exception:
name = self.context.get('name', 'noname')
log.error("Unable to create environment {0}".format(name))
LOG.error("Unable to create environment {0}".format(name))
exceptions.handle(request)
return False
@ -104,7 +104,7 @@ class UpdateEnvironmentInfoAction(workflows.Action):
data['name'])
except Exception:
exceptions.handle(request, ignore=True)
log.error("Unable to update environment name with ud={0}".format(
LOG.error("Unable to update environment name with ud={0}".format(
data['environment_id'],
))
return False

8
muranodashboard/images/forms.py
View File

@ -21,7 +21,7 @@ from horizon.forms import SelfHandlingForm
from horizon import messages, exceptions
from openstack_dashboard.api import glance
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
def filter_murano_images(images, request=None):
@ -33,7 +33,7 @@ def filter_murano_images(images, request=None):
metadata = json.loads(metadata)
except ValueError:
msg = _('Invalid metadata for image: {0}'.format(image.id))
log.warn(msg)
LOG.warn(msg)
if request:
exceptions.handle(request, msg)
else:
@ -63,7 +63,7 @@ class MarkImageForm(SelfHandlingForm):
try:
images, _more = glance.image_list_detailed(request)
except Exception:
log.error('Failed to request image list from Glance')
LOG.error('Failed to request image list from Glance')
exceptions.handle(request, _('Unable to retrieve list of images'))
self.fields['image'].choices = [(i.id, i.name) for i in images]
@ -71,7 +71,7 @@ class MarkImageForm(SelfHandlingForm):
[image.title for image in filter_murano_images(images)]
def handle(self, request, data):
log.debug('Marking image with specified metadata: {0}'.format(data))
LOG.debug('Marking image with specified metadata: {0}'.format(data))
image_id = data['image']
properties = {

12
muranodashboard/packages/forms.py
View File

@ -22,7 +22,7 @@ from horizon import messages
from muranoclient.common.exceptions import HTTPException
from muranodashboard.environments import api
log = logging.getLogger(__name__)
LOG = logging.getLogger(__name__)
MAX_FILE_SIZE_SPEC = (5 * 1024 * 1024, '5', _('MB'))
@ -56,19 +56,19 @@ class UploadPackageForm(SelfHandlingForm):
if package.size > max_size:
msg = _('It is restricted to upload files larger than '
'{0}{1}.'.format(size_in_units, unit_spec))
log.error(msg)
LOG.error(msg)
raise forms.ValidationError(msg)
return package
def handle(self, request, data):
log.debug('Uploading package {0}'.format(data))
LOG.debug('Uploading package {0}'.format(data))
try:
data, files = split_post_data(data)
result = api.muranoclient(request).packages.create(data, files)
messages.success(request, _('Package uploaded.'))
return result
except HTTPException:
log.exception(_('Uploading package failed'))
LOG.exception(_('Uploading package failed'))
redirect = reverse('horizon:murano:packages:index')
exceptions.handle(request,
_('Unable to upload package'),
@ -106,14 +106,14 @@ class ModifyPackageForm(SelfHandlingForm):
def handle(self, request, data):
app_id = self.initial.get('app_id')
log.debug('Updating package {0} with {1}'.format(app_id, data))
LOG.debug('Updating package {0} with {1}'.format(app_id, data))
try:
data['tags'] = [t.strip() for t in data['tags'].split(',')]
result = api.muranoclient(request).packages.update(app_id, data)
messages.success(request, _('Package modified.'))
return result
except HTTPException:
log.exception(_('Modifying package failed'))
LOG.exception(_('Modifying package failed'))
redirect = reverse('horizon:murano:packages:index')
exceptions.handle(request,
_('Unable to modify package'),