From 7b7d2abafd64f73d49906e2116fec43ccd930246 Mon Sep 17 00:00:00 2001
From: Yun Huang <yun.huang@windriver.com>
Date: Wed, 14 Mar 2018 21:43:25 +0800
Subject: [PATCH] Fix sonar coverage issue for newton

Change-Id: I14d4b9063528e65e90efa2ea38e155d4b6c2761d
Issue-ID: MULTICLOUD-171
Signed-off-by: Yun Huang <yun.huang@windriver.com>
---
 newton/mvn-phase-script.sh | 83 ++++++++++++++++++++++++++++++++++++++++++++++
 newton/pom.xml             | 65 ++++++++++++++++++++++++++++++++++--
 newton/tox.ini             | 22 +++++++++---
 3 files changed, 162 insertions(+), 8 deletions(-)
 create mode 100755 newton/mvn-phase-script.sh

diff --git a/newton/mvn-phase-script.sh b/newton/mvn-phase-script.sh
new file mode 100755
index 00000000..ad1d6329
--- /dev/null
+++ b/newton/mvn-phase-script.sh
@@ -0,0 +1,83 @@
+#!/bin/bash
+# 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.
+
+
+set -e
+
+echo "running script: [$0] for module [$1] at stage [$2]"
+
+export SETTINGS_FILE=${SETTINGS_FILE:-$HOME/.m2/settings.xml}
+MVN_PROJECT_MODULEID="$1"
+MVN_PHASE="$2"
+
+
+FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}"
+if [ "$MVN_PROJECT_MODULEID" == "__" ]; then
+  MVN_PROJECT_MODULEID=""
+fi
+
+if [ -z "$WORKSPACE" ]; then
+    WORKSPACE=$(pwd)
+fi
+
+# mvn phase in life cycle
+MVN_PHASE="$2"
+
+
+echo "MVN_PROJECT_MODULEID is            [$MVN_PROJECT_MODULEID]"
+echo "MVN_PHASE is                       [$MVN_PHASE]"
+echo "MVN_PROJECT_GROUPID is             [$MVN_PROJECT_GROUPID]"
+echo "MVN_PROJECT_ARTIFACTID is          [$MVN_PROJECT_ARTIFACTID]"
+echo "MVN_PROJECT_VERSION is             [$MVN_PROJECT_VERSION]"
+
+run_tox_test()
+{
+  set -x
+  echo $PWD
+  CURDIR=$(pwd)
+  TOXINIS=$(find . -name "tox.ini")
+  cd ..
+  for TOXINI in "${TOXINIS[@]}"; do
+    DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev)
+    cd "${CURDIR}/${DIR}"
+    rm -rf ./venv-tox ./.tox
+    virtualenv ./venv-tox
+    source ./venv-tox/bin/activate
+    pip install --upgrade pip
+    pip install --upgrade tox argparse
+    pip freeze
+    cd ${CURDIR}
+    tox
+    deactivate
+    cd ..
+    rm -rf ./venv-tox ./.tox
+  done
+}
+
+
+case $MVN_PHASE in
+clean)
+  echo "==> clean phase script"
+  rm -rf ./venv-*
+  ;;
+test)
+  echo "==> test phase script"
+  run_tox_test
+  ;;
+*)
+  echo "==> unprocessed phase"
+  ;;
+esac
+
diff --git a/newton/pom.xml b/newton/pom.xml
index ba375609..8ba525e3 100644
--- a/newton/pom.xml
+++ b/newton/pom.xml
@@ -27,10 +27,18 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.onap.multicloud.openstack</groupId>
     <artifactId>multicloud-openstack-newton</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
+    <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud/openstack/newton</name>
     <description>multicloud for openstack newton</description>
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.multicloud.openstack</groupId>
+            <artifactId>multicloud-openstack-newton</artifactId>
+            <version>1.1.0</version>
+            <type>zip</type>
+        </dependency>
+    </dependencies>
     <properties>
         <encoding>UTF-8</encoding>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -42,10 +50,61 @@
         <sonar.language>py</sonar.language>
         <sonar.pluginName>Python</sonar.pluginName>
         <sonar.inclusions>**/*.py</sonar.inclusions>
-        <sonar.exclusions>tests/*,setup.py</sonar.exclusions>
+        <sonar.exclusions>**/venv-tox/**,**/.tox/**, **/tests/**,setup.py</sonar.exclusions>
     </properties>
     <build>
-      <plugins>
+      <pluginManagement>
+        <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.2.1</version>
+              <configuration>
+                <executable>${session.executionRootDirectory}/mvn-phase-script.sh</executable>
+                <environmentVariables>
+                  <!-- make mvn properties as env for our script -->
+                  <MVN_PROJECT_GROUPID>${project.groupId}</MVN_PROJECT_GROUPID>
+                  <MVN_PROJECT_ARTIFACTID>${project.artifactId}</MVN_PROJECT_ARTIFACTID>
+                  <MVN_PROJECT_VERSION>${project.version}</MVN_PROJECT_VERSION>
+                </environmentVariables>
+              </configuration>
+            </plugin>
+        </plugins>                                                                                                                                                         
+      </pluginManagement>                                                                                                                                                  
+        <plugins>                                                                                                                                                          
+        <plugin>                                                                                                                                                           
+            <groupId>org.codehaus.mojo</groupId>                                                                                                                           
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.2.1</version>                                                                                                                                       
+            <executions>                                                                                                                                                   
+              <execution>                                                                                                                                                  
+                <id>clean phase script</id>                                                                                                                                
+                <phase>clean</phase>                                                                                                                                       
+                <goals>                                                                                                                                                    
+                  <goal>exec</goal>                                                                                                                                        
+                </goals>                                                                                                                                                   
+                <configuration>                                                                                                                                            
+                  <arguments>                                                                                                                                              
+                    <argument>__</argument>                                                                                                                                
+                    <argument>clean</argument>                                                                                                                             
+                  </arguments>                                                                                                                                             
+                </configuration>                                                                                                                                           
+              </execution>                                                                                                                                                 
+              <execution>                                                                                                                                                  
+                <id>test script</id>                                                                                                                                       
+                <phase>test</phase>                                                                                                                                        
+                <goals>                                                                                                                                                    
+                  <goal>exec</goal>                                                                                                                                        
+                </goals>                                                                                                                                                   
+                <configuration>                                                                                                                                            
+                  <arguments>                                                                                                                                              
+                    <argument>__</argument>                                                                                                                                
+                    <argument>test</argument>                                                                                                                              
+                  </arguments>                                                                                                                                             
+                </configuration>                                                                                                                                           
+              </execution>                                                                                                                                                 
+            </executions>                                                                                                                                                  
+        </plugin>                 
         <plugin>
             <artifactId>maven-assembly-plugin</artifactId>
             <configuration>
diff --git a/newton/tox.ini b/newton/tox.ini
index 70ca1ae5..4be77268 100644
--- a/newton/tox.ini
+++ b/newton/tox.ini
@@ -1,15 +1,27 @@
 [tox]
-envlist = py27,py35
+envlist = py27,py35,cov
 skipsdist = true
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
 
+[flake8]
+ignore = E501,E722
+exclude = ./venv-tox,./.tox
+max-complexity = 27
+
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}/../share
 deps = -r{toxinidir}/requirements.txt
-commands = 
-    coverage run --branch manage.py test
-    coverage report --omit=".tox/*,*tests*,*__init__.py" --fail-under=30
-    coverage xml -i
+commands =
+    coverage run --branch manage.py test newton
+    coverage report --omit="./venv-tox/*,./.tox/*,*tests*,*__init__.py,*newton_base*,*common*" --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*"
+
-- 
2.16.6