add submodule support in framework

    support multi broker and fix sonar.sh issue
    . add a new module of artifact broker
    . update framework pom.xml to support submodules
    . update the multivim broker to align with the case
      like subplugins under openstack
    . remove the duplicated sonar.sh

Change-Id: Ie41dc07aed9e015208e79aadff204747269af638
Issue-ID: MULTICLOUD-532
Signed-off-by: liboNet <libo.zhu@intel.com>

diff --git a/artifactbroker/README.md b/artifactbroker/README.md
new file mode 100644 (file)
index 0000000..6274024
--- /dev/null
+++ b/artifactbroker/README.md
@@ -0,0 +1,13 @@
+# Copyright (c) 2017 Wind River Systems, Inc.
+# Copyright (c) 2017-2018 VMware, 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.
+
+# Micro service of broker for multiple VIM instance drivers.

diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml
new file mode 100644 (file)
index 0000000..a49dbc4
--- /dev/null
+++ b/artifactbroker/pom.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<!--
+ Copyright (c) 2017 Wind River Systems, Inc.
+ Copyright (c) 2017-2018 VMware, 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.
+-->
+<project 
+    xmlns="http://maven.apache.org/POM/4.0.0" 
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <groupId>org.onap.multicloud.framework</groupId>
+        <artifactId>multicloud-framework</artifactId>
+        <version>1.3.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.onap.multicloud.framework.broker</groupId>
+    <artifactId>multicloud-framework-artifact-broker</artifactId>
+    <version>1.3.0-SNAPSHOT</version>
+    <packaging>pom</packaging>
+    <name>multicloud-framework-artifact-broker</name>
+    <description>artifact  broker</description>
+    <properties>
+        <encoding>UTF-8</encoding>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
+        <nexusproxy>https://nexus.onap.org</nexusproxy>
+    </properties>
+</project>

diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml
index ef627af..d9da20a 100644 (file)
--- a/multivimbroker/pom.xml
+++ b/multivimbroker/pom.xml
@@ -34,25 +34,76 @@
         <nexusproxy>https://nexus.onap.org</nexusproxy>
     </properties>
     <build>
+      <pluginManagement>
         <plugins>
             <plugin>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <configuration>
-                    <appendAssemblyId>false</appendAssemblyId>
-                    <descriptors>
-                        <descriptor>assembly.xml</descriptor>
-                    </descriptors>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                    </execution>
-                </executions>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.1.1</version>
+              <configuration>
+                <executable>${project.basedir}/sonar.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.1.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>
+                <appendAssemblyId>false</appendAssemblyId>
+                <descriptors>
+                    <descriptor>assembly.xml</descriptor>
+                </descriptors>
+            </configuration>
+            <executions>
+               <execution>
+                   <id>make-assembly</id>
+                   <phase>package</phase>
+                   <goals>
+                       <goal>single</goal>
+                   </goals>
+               </execution>
+            </executions>
+        </plugin>
+      </plugins>
     </build>
 </project>

diff --git a/multivimbroker/sonar.sh b/multivimbroker/sonar.sh
index e173d1f..41cc450 100755 (executable)
--- a/multivimbroker/sonar.sh
+++ b/multivimbroker/sonar.sh
@@ -56,7 +56,7 @@ run_tox_test()
     pip install --upgrade pip
     pip install --upgrade tox argparse
     pip freeze
-    cd multivimbroker
+    cd ${CURDIR}
     tox -e cover
     deactivate
     cd ..

diff --git a/pom.xml b/pom.xml
index 51e32db..866ab9b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -27,7 +27,7 @@
     <version>1.3.0-SNAPSHOT</version>
     <packaging>pom</packaging>
     <name>multicloud-framework</name>
-    <description>multivim broker</description>
+    <description>multicloud broker</description>
     <properties>
         <sonar.sourceEncoding>UTF-8</sonar.sourceEncoding>
         <sonar.sources>.</sonar.sources>
@@ -38,58 +38,9 @@
         <sonar.inclusions>**/*.py</sonar.inclusions>
         <sonar.exclusions>tests/*,setup.py</sonar.exclusions>
     </properties>
-    <build>
-      <pluginManagement>
-        <plugins>
-            <plugin>
-              <groupId>org.codehaus.mojo</groupId>
-              <artifactId>exec-maven-plugin</artifactId>
-              <version>1.1.1</version>
-              <configuration>
-                <executable>${session.executionRootDirectory}/sonar.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.1.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>
-        </plugins>
-    </build></project>
+    <modules>
+        <module>multivimbroker</module>
+        <module>artifactbroker</module>
+     </modules>
+
+</project>

diff --git a/sonar.sh b/sonar.sh
deleted file mode 100755 (executable)
index d23d18d..0000000
--- a/sonar.sh
+++ /dev/null
@@ -1,82 +0,0 @@
-#!/bin/bash
-# Copyright 2018 VMware Corporation.
-#
-# 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
-  CURDIR=$(pwd)
-  TOXINIS=$(find . -name "tox.ini")
-  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 multivimbroker
-    tox -e cover
-    tox -e rstcheck
-    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
-