diff options
Diffstat (limited to 'newton')
| -rw-r--r-- | newton/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | newton/docker/build_image.sh | 4 | ||||
| -rw-r--r-- | newton/newton/pub/config/log.yml | 7 | ||||
| -rw-r--r-- | newton/newton/registration/views/registration.py | 1 | ||||
| -rw-r--r-- | newton/newton/settings.py | 2 | ||||
| -rw-r--r-- | newton/pom.xml | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/newton/docker/Dockerfile b/newton/docker/Dockerfile index fb624cd4..83610a4f 100644 --- a/newton/docker/Dockerfile +++ b/newton/docker/Dockerfile @@ -10,7 +10,7 @@ ENV MSB_ADDR "127.0.0.1" ENV MSB_PORT "80" ENV AAI_ADDR "aai.api.simpledemo.openecomp.org" ENV AAI_PORT "8443" -ENV AAI_SCHEMA_VERSION "v11" +ENV AAI_SCHEMA_VERSION "v13" ENV AAI_USERNAME "AAI" ENV AAI_PASSWORD "AAI" diff --git a/newton/docker/build_image.sh b/newton/docker/build_image.sh index 203283d1..7b8401eb 100644 --- a/newton/docker/build_image.sh +++ b/newton/docker/build_image.sh @@ -6,8 +6,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.0.0-SNAPSHOT" -STAGING="1.0.0-STAGING" +VERSION="1.1.2-SNAPSHOT" +STAGING="1.1.2-STAGING" PROJECT="multicloud" IMAGE="openstack-newton" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/newton/newton/pub/config/log.yml b/newton/newton/pub/config/log.yml index 452d3b61..6e8ac2ed 100644 --- a/newton/newton/pub/config/log.yml +++ b/newton/newton/pub/config/log.yml @@ -24,11 +24,10 @@ handlers: backupCount: 10 formatters: standard: - format: "%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:%(message)s" + format: "%(asctime)s|||||%(name)s||%(thread)||%(funcName)s||%(levelname)s||%(message)s" mdcFormat: - format: "%(asctime)s:[%(name)s]:[%(filename)s]-[%(lineno)d] [%(levelname)s]:[%(mdc)s]: %(message)s" - mdcfmt: "{requestID}" + format: "%(asctime)s|||||%(name)s||%(thread)s||%(funcName)s||%(levelname)s||%(message)s||||%(mdc)s \t" + mdcfmt: "{requestID} {invocationID} {serviceName} {serviceIP}" datefmt: "%Y-%m-%d %H:%M:%S" (): onaplogging.mdcformatter.MDCFormatter - diff --git a/newton/newton/registration/views/registration.py b/newton/newton/registration/views/registration.py index cc97e048..9f28cdff 100644 --- a/newton/newton/registration/views/registration.py +++ b/newton/newton/registration/views/registration.py @@ -15,6 +15,7 @@ import logging import json import uuid +import traceback from django.conf import settings from keystoneauth1.exceptions import HttpError diff --git a/newton/newton/settings.py b/newton/newton/settings.py index bb7bd042..a3fb9b41 100644 --- a/newton/newton/settings.py +++ b/newton/newton/settings.py @@ -107,7 +107,7 @@ MULTICLOUD_PREFIX = "http://%s:%s/api/multicloud-newton/v0" % ( AAI_ADDR = os.environ.get('AAI_ADDR', "aai.api.simpledemo.openecomp.org") AAI_PORT = os.environ.get('AAI_PORT', "8443") AAI_SERVICE_URL = 'https://%s:%s/aai' % (AAI_ADDR, AAI_PORT) -AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v11") +AAI_SCHEMA_VERSION = os.environ.get('AAI_SCHEMA_VERSION', "v13") AAI_USERNAME = os.environ.get('AAI_USERNAME', "AAI") AAI_PASSWORD = os.environ.get('AAI_PASSWORD', "AAI") diff --git a/newton/pom.xml b/newton/pom.xml index 1fda1076..1d23ad16 100644 --- a/newton/pom.xml +++ b/newton/pom.xml @@ -27,7 +27,7 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.multicloud.openstack</groupId> <artifactId>multicloud-openstack-newton</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.2-SNAPSHOT</version> <packaging>pom</packaging> <name>multicloud/openstack/newton</name> <description>multicloud for openstack newton</description> |