From 44f0f8f2c3615b19b2c254fc3e2509116433e18a Mon Sep 17 00:00:00 2001
From: Andrew Gauld <ag1282@att.com>
Date: Wed, 21 Feb 2018 12:43:06 -0500
Subject: Fixes for SONAR code coverage results

Change-Id: I2e3e548db393f85bae14b1fb4d5c867fe2d557ce
Issue-ID: DCAEGEN2-355
Signed-off-by: Andrew Gauld <ag1282@att.com>
---
 onap-dcae-cbs-docker-client/pom.xml | 8 +-------
 onap-dcae-dcaepolicy-lib/pom.xml    | 2 ++
 onap-dcae-dcaepolicy-lib/tox.ini    | 2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/onap-dcae-cbs-docker-client/pom.xml b/onap-dcae-cbs-docker-client/pom.xml
index bbbdc12..d006a29 100644
--- a/onap-dcae-cbs-docker-client/pom.xml
+++ b/onap-dcae-cbs-docker-client/pom.xml
@@ -34,19 +34,13 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <!-- Sonar -->
-    <sonar.skip>false</sonar.skip>
     <sonar.sources>.</sonar.sources>
     <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-    <!-- 
-         <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
-         see https://docs.sonarqube.org/display/PLUG/Python+Coverage+Results+Import
-         Ant pattern describing the path to coverage reports, relative to projects root. Leave unset to use the default ("coverage-reports/coverage-*.xml").
-    -->
+    <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
     <sonar.language>py</sonar.language>
     <sonar.pluginName>Python</sonar.pluginName>
     <sonar.inclusions>**/*.py</sonar.inclusions>
     <sonar.exclusions>tests/*,setup.py</sonar.exclusions>
-    <sonar.host.url>http://135.205.228.63:9000</sonar.host.url>
   </properties>
   <build>
     <finalName>${project.artifactId}-${project.version}</finalName>
diff --git a/onap-dcae-dcaepolicy-lib/pom.xml b/onap-dcae-dcaepolicy-lib/pom.xml
index b3c230e..03ceb8f 100644
--- a/onap-dcae-dcaepolicy-lib/pom.xml
+++ b/onap-dcae-dcaepolicy-lib/pom.xml
@@ -38,6 +38,8 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
     <!-- sonar.host.url>http://localhost:9000</sonar.host.url -->
     <!-- below are language dependent -->
     <!-- for Python -->
+    <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
+    <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
     <sonar.language>py</sonar.language>
     <sonar.pluginName>Python</sonar.pluginName>
     <sonar.inclusions>**/*.py</sonar.inclusions>
diff --git a/onap-dcae-dcaepolicy-lib/tox.ini b/onap-dcae-dcaepolicy-lib/tox.ini
index 4b0573e..4ef8593 100644
--- a/onap-dcae-dcaepolicy-lib/tox.ini
+++ b/onap-dcae-dcaepolicy-lib/tox.ini
@@ -13,5 +13,5 @@ setenv =
     PYTHONPATH={toxinidir}
 commands=
     -mkdir {toxinidir}/logs
-    pytest --junitxml xunit-reports/xunit-result-onap_dcae_dcaepolicy_lib.xml --cov onap_dcae_dcaepolicy_lib --cov-report xml
+    pytest --junitxml xunit-results.xml --cov onap_dcae_dcaepolicy_lib --cov-report xml
     coverage xml
-- 
cgit 1.2.3-korg