summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--newton/pom.xml4
-rw-r--r--newton/tox.ini4
-rw-r--r--ocata/pom.xml2
-rw-r--r--windriver/pom.xml2
-rw-r--r--windriver/requirements.txt2
-rw-r--r--windriver/titanium_cloud/middleware.py65
-rw-r--r--windriver/titanium_cloud/pub/config/log.yml8
-rw-r--r--windriver/titanium_cloud/settings.py1
8 files changed, 77 insertions, 11 deletions
diff --git a/newton/pom.xml b/newton/pom.xml
index 4f16383f..1fda1076 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -36,7 +36,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<nexusproxy>https://nexus.onap.org</nexusproxy>
- <sonar.sources>.</sonar.sources>
+ <sonar.sources>.,../share</sonar.sources>
<sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
<sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
<sonar.language>py</sonar.language>
@@ -52,7 +52,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+ <executable>${project.basedir}/mvn-phase-script.sh</executable>
<environmentVariables>
<!-- make mvn properties as env for our script -->
<MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
diff --git a/newton/tox.ini b/newton/tox.ini
index e3334cf1..ec17886d 100644
--- a/newton/tox.ini
+++ b/newton/tox.ini
@@ -16,12 +16,12 @@ setenv =
deps = -r{toxinidir}/requirements.txt
commands =
coverage run --branch manage.py test newton
- coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --fail-under=30
+ coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py" --fail-under=30
[testenv:pep8]
deps=flake8
commands=flake8
[testenv:cov]
-commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*, *site-packages*"
+commands = coverage xml --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py, *site-packages*"
diff --git a/ocata/pom.xml b/ocata/pom.xml
index bf90f6e1..29032167 100644
--- a/ocata/pom.xml
+++ b/ocata/pom.xml
@@ -49,7 +49,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+ <executable>${project.basedir}/mvn-phase-script.sh</executable>
<environmentVariables>
<!-- make mvn properties as env for our script -->
<MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
diff --git a/windriver/pom.xml b/windriver/pom.xml
index 2c08bdad..0b216c59 100644
--- a/windriver/pom.xml
+++ b/windriver/pom.xml
@@ -49,7 +49,7 @@
<artifactId>exec-maven-plugin</artifactId>
<version>1.2.1</version>
<configuration>
- <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+ <executable>${project.basedir}/mvn-phase-script.sh</executable>
<environmentVariables>
<!-- make mvn properties as env for our script -->
<MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
diff --git a/windriver/requirements.txt b/windriver/requirements.txt
index c3576f5d..3d769c15 100644
--- a/windriver/requirements.txt
+++ b/windriver/requirements.txt
@@ -20,5 +20,5 @@ mock==2.0.0
unittest_xml_reporting==1.12.0
# for onap logging
-onappylog>=1.0.5
+onappylog>=1.0.6
diff --git a/windriver/titanium_cloud/middleware.py b/windriver/titanium_cloud/middleware.py
new file mode 100644
index 00000000..cae9e9b1
--- /dev/null
+++ b/windriver/titanium_cloud/middleware.py
@@ -0,0 +1,65 @@
+# Copyright (c) 2017-2018 Wind River Systems, Inc.
+#
+# 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 uuid
+from django.conf import settings
+from onaplogging.mdcContext import MDC
+
+FORWARDED_FOR_FIELDS = ["HTTP_X_FORWARDED_FOR", "HTTP_X_FORWARDED_HOST",
+ "HTTP_X_FORWARDED_SERVER"]
+
+class LogContextMiddleware(object):
+
+ # the last IP behind multiple proxies, if no exist proxies
+ # get local host ip.
+ def _getLastIp(self, request):
+
+ ip = ""
+ try:
+ for field in FORWARDED_FOR_FIELDS:
+ if field in request.META:
+ if ',' in request.META[field]:
+ parts = request.META[field].split(',')
+ ip = parts[-1].strip().split(":")[0]
+ else:
+ ip = request.META[field].split(":")[0]
+
+ if ip == "":
+ ip = request.META.get("HTTP_HOST").split(":")[0]
+
+ except Exception:
+ pass
+
+ return ip
+
+
+ def process_request(self, request):
+ # fetch propageted Id from other component. if do not fetch id,
+ # generate one.
+ ReqeustID = request.META.get("HTTP_X_TRANSACTIONID", None)
+ if ReqeustID is None:
+ ReqeustID = uuid.uuid3(uuid.NAMESPACE_URL, settings.MULTIVIM_VERSION)
+ MDC.put("requestID", ReqeustID)
+ # generate the reqeust id
+ InvocationID = uuid.uuid3(uuid.NAMESPACE_DNS, settings.MULTIVIM_VERSION)
+ MDC.put("invocationID", InvocationID)
+ MDC.put("serviceName", settings.MULTIVIM_VERSION)
+ MDC.put("serviceIP", self._getLastIp(request))
+ return None
+
+ def process_response(self, request, response):
+
+ MDC.clear()
+ return response
+
diff --git a/windriver/titanium_cloud/pub/config/log.yml b/windriver/titanium_cloud/pub/config/log.yml
index 7dab297b..95e1945a 100644
--- a/windriver/titanium_cloud/pub/config/log.yml
+++ b/windriver/titanium_cloud/pub/config/log.yml
@@ -20,14 +20,14 @@ handlers:
class: "logging.handlers.RotatingFileHandler"
filename: "/var/log/onap/multicloud/openstack/windriver/titanium_cloud.log"
formatter: "mdcFormat"
- maxBytes: 1024*1024*50
+ maxBytes: 52428800
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/windriver/titanium_cloud/settings.py b/windriver/titanium_cloud/settings.py
index 88bba77d..27d44a52 100644
--- a/windriver/titanium_cloud/settings.py
+++ b/windriver/titanium_cloud/settings.py
@@ -56,6 +56,7 @@ MIDDLEWARE_CLASSES = [
'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
+ 'titanium_cloud.middleware.LogContextMiddleware',
]
ROOT_URLCONF = 'titanium_cloud.urls'