Merge "vnfapi yang model change"
authorDan Timoney <dt5972@att.com>
Fri, 16 Mar 2018 19:15:16 +0000 (19:15 +0000)
committerGerrit Code Review <gerrit@onap.org>
Fri, 16 Mar 2018 19:15:16 +0000 (19:15 +0000)
30 files changed:
generic-resource-api/features/features-generic-resource-api/pom.xml [new file with mode: 0644]
generic-resource-api/features/pom.xml
generic-resource-api/features/sdnc-generic-resource-api/pom.xml [new file with mode: 0644]
generic-resource-api/features/src/main/resources/features.xml [deleted file]
generic-resource-api/installer/pom.xml
generic-resource-api/installer/src/main/resources/scripts/install-feature.sh
generic-resource-api/model/pom.xml
generic-resource-api/pom.xml
generic-resource-api/provider/pom.xml
generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang [deleted file]
pom.xml
version.properties
vnfapi/features/features-vnfapi/pom.xml [new file with mode: 0644]
vnfapi/features/pom.xml
vnfapi/features/sdnc-vnfapi/pom.xml [new file with mode: 0644]
vnfapi/features/src/main/resources/features.xml [deleted file]
vnfapi/installer/pom.xml
vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
vnfapi/model/pom.xml
vnfapi/pom.xml
vnfapi/provider/pom.xml
vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java
vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java
vnftools/features/features-vnftools/pom.xml [new file with mode: 0644]
vnftools/features/pom.xml
vnftools/features/sdnc-vnftools/pom.xml [new file with mode: 0644]
vnftools/features/src/main/resources/features.xml [deleted file]
vnftools/installer/pom.xml
vnftools/pom.xml
vnftools/provider/pom.xml

diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml
new file mode 100644 (file)
index 0000000..0275b59
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>feature-repo-parent</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.sdnc.northbound</groupId>
+       <artifactId>features-generic-resource-api</artifactId>
+       <version>1.3.1-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>sdnc-generic-resource-api</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
+</project>
index 8b3e0e4..7c83e30 100644 (file)
@@ -1,96 +1,23 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <artifactId>generic-resource-api</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
 
+    <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>generic-resource-api-features</artifactId>
-    <packaging>jar</packaging>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>generic-resource-api-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>generic-resource-api-provider</artifactId>
-        </dependency>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.features.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency><!-- Required for launching the feature tests -->
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <version>${odl.commons.opendaylight.version}</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <version>${odl.yangtools.version}</version>
-            <type>xml</type>
-            <classifier>features</classifier>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
-
-    <build>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>sdnc-generic-resource-api</module>
+        <module>features-generic-resource-api</module>
+    </modules>
 </project>
diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml
new file mode 100644 (file)
index 0000000..817145d
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-generic-resource-api</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>generic-resource-api-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>generic-resource-api-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/generic-resource-api/features/src/main/resources/features.xml b/generic-resource-api/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 219c721..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<features name="generic-resource-api-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <feature name='sdnc-generic-resource-api' description="sdnc-generic-resource-api" version='${project.version}'>
-        <feature>odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <!-- It is assumed that applications are installed on BVC, which installs bvc-core including MD-SAL etc.
-             Do not list those features out here as that will tie your implementation to a specific version
-             of MD-SAL / BVC and force updates to your application for every upgrade of BVC core platform.-->
-        <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api-model/${project.version}</bundle>
-        <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api-provider/${project.version}</bundle>
-    </feature>
-
-</features>
index e3ca5eb..ea8967e 100755 (executable)
@@ -1,20 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
        <modelVersion>4.0.0</modelVersion>
+
        <parent>
-               <artifactId>generic-resource-api</artifactId>
-               <groupId>org.onap.sdnc.northbound</groupId>
-               <version>1.3.0-SNAPSHOT</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath />
        </parent>
+
+       <groupId>org.onap.sdnc.northbound</groupId>
        <artifactId>generic-resource-api-installer</artifactId>
-       <name>Generic Resource API  - Karaf  Installer</name>
+       <version>1.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
+       <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
+
        <properties>
                <application.name>sdnc-generic-resource-api</application.name>
-               <features.boot>sdnc-generic-resource-api</features.boot>
-               <features.repositories>mvn:org.onap.sdnc.northbound/generic-resource-api-features/${project.version}/xml/features</features.repositories>
+               <features.boot>${application.name}</features.boot>
+               <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
 
                <dependency>
                        <groupId>org.onap.sdnc.northbound</groupId>
-                       <artifactId>generic-resource-api-features</artifactId>
+                       <artifactId>${application.name}</artifactId>
                        <version>${project.version}</version>
-                       <classifier>features</classifier>
                        <type>xml</type>
+                       <classifier>features</classifier>
                        <exclusions>
                                <exclusion>
                                        <groupId>*</groupId>
                                                        <useRepositoryLayout>true</useRepositoryLayout>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
-                                                       <includeGroupIds>org.onap.sdnc</includeGroupIds>
-                                                       <excludeArtifactIds>sli-common,sli-provider,dblib-common,dblib-provider</excludeArtifactIds>
+                                                       <includeGroupIds>org.onap.sdnc.northbound</includeGroupIds>
                                                        <scope>provided</scope>
                                                </configuration>
                                        </execution>
 
                </plugins>
        </build>
-
 </project>
index 6e8620e..d5f620f 100644 (file)
@@ -10,9 +10,9 @@
 # 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.
@@ -23,7 +23,6 @@
 
 ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
 ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
-ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
 INSTALLERDIR=$(dirname $0)
 
 REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
@@ -36,5 +35,5 @@ else
        exit 1
 fi
 
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
-${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
+${ODL_KARAF_CLIENT} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} feature:install ${features.boot}
index 7a14032..c47c915 100644 (file)
 <?xml version='1.0' encoding='UTF-8'?>
 <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">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.sdnc.northbound</groupId>
-               <artifactId>generic-resource-api</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
-       <artifactId>generic-resource-api-model</artifactId>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-model</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.opendaylight.mdsal</groupId>
-                       <artifactId>yang-binding</artifactId>
-                       <version>${odl.mdsal.yang.binding.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>yang-common</artifactId>
-                       <version>${odl.yangtools.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-inet-types</artifactId>
-                       <version>${odl.ietf-inet-types.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.mdsal.model</groupId>
-                       <artifactId>ietf-yang-types</artifactId>
-                       <version>${odl.ietf-yang-types.version}</version>
-               </dependency>
-       </dependencies>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
-       <build>
-
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Import-Package>*</Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.opendaylight.yangtools</groupId>
-                               <artifactId>yang-maven-plugin</artifactId>
-                <version>${odl.yangtools.yang.maven.plugin.version}</version>
-                               <dependencies>
-                                       <dependency>
-                                               <groupId>org.opendaylight.mdsal</groupId>
-                                               <artifactId>maven-sal-api-gen-plugin</artifactId>
-                                               <version>${odl.sal.api.gen.plugin.version}</version>
-                                               <type>jar</type>
-                                       </dependency>
-                                       <dependency>
-                                               <groupId>org.opendaylight.netconf</groupId>
-                                               <artifactId>sal-rest-docgen-maven</artifactId>
-                                               <version>${odl.restconf.version}</version>
-                                               <type>jar</type>
-                                       </dependency>
-                               </dependencies>
-                               <executions>
-                                       <execution>
-                                               <goals>
-                                                       <goal>generate-sources</goal>
-                                               </goals>
-                                               <configuration>
-                                                       <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                                                       <codeGenerators>
-                                                               <generator>
-                                                                       <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                                                       <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                                               </generator>
-                                                               <generator>
-                                                                       <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                                                       <outputBaseDir>target/swagger</outputBaseDir>
-                                                               </generator>
-                                                       </codeGenerators>
-                                                       <inspectDependencies>true</inspectDependencies>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>exec-maven-plugin</artifactId>
-                                <version>1.2.1</version>
-                                <executions>
-                                        <execution>
-                                                <configuration>
-                                                        <executable>python</executable>
-                                                        <arguments>
-                                                                <argument>scripts/python/yang2props.py</argument>
-                                                                <argument>src/main/yang/GENERIC-RESOURCE-API.yang</argument>
-                                                                <argument>target/generic-resource-api.properties</argument>
-                                                        </arguments>
-                                                </configuration>
-                                                <id>generation</id>
-                                                <phase>generate-resources</phase>
-                                                <goals>
-                                                        <goal>exec</goal>
-                                                </goals>
-                                        </execution>
-                                </executions>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>build-helper-maven-plugin</artifactId>
-                                <executions>
-                                        <execution>
-                                                <id>attach-artifacts</id>
-                                                <goals>
-                                                        <goal>attach-artifact</goal>
-                                                </goals>
-                                                <phase>package</phase>
-                                                <configuration>
-                                                        <artifacts>
-                                                                <artifact>
-                                                                        <file>${project.build.directory}/generic-resource-api.properties</file>
-                                                                        <type>properties</type>
-                                                                        <classifier>generic-resource-api</classifier>
-                                                                </artifact>
-                                                        </artifacts>
-                                                </configuration>
-                                        </execution>
-                                </executions>
-                        </plugin>
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-inet-types</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.mdsal.model</groupId>
+            <artifactId>ietf-yang-types</artifactId>
+        </dependency>
+    </dependencies>
 
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>exec-maven-plugin</artifactId>
+                <version>1.2.1</version>
+                <executions>
+                    <execution>
+                        <configuration>
+                            <executable>python</executable>
+                            <arguments>
+                                <argument>scripts/python/yang2props.py</argument>
+                                <argument>src/main/yang/GENERIC-RESOURCE-API.yang</argument>
+                                <argument>target/generic-resource-api.properties</argument>
+                            </arguments>
+                        </configuration>
+                        <id>generation</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>exec</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
-        <pluginManagement>
-            <plugins>
-                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
-                <plugin>
-                    <groupId>org.eclipse.m2e</groupId>
-                    <artifactId>lifecycle-mapping</artifactId>
-                    <version>1.0.0</version>
-                    <configuration>
-                        <lifecycleMappingMetadata>
-                            <pluginExecutions>
-                                <pluginExecution>
-                                    <pluginExecutionFilter>
-                                        <groupId>
-                                            org.codehaus.mojo
-                                        </groupId>
-                                        <artifactId>
-                                            exec-maven-plugin
-                                        </artifactId>
-                                        <versionRange>
-                                            [1.2.1,)
-                                        </versionRange>
-                                        <goals>
-                                            <goal>exec</goal>
-                                        </goals>
-                                    </pluginExecutionFilter>
-                                    <action>
-                                        <ignore />
-                                    </action>
-                                </pluginExecution>
-                            </pluginExecutions>
-                        </lifecycleMappingMetadata>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-       </build>
+    </build>
 </project>
index 7696de8..fc43e7d 100644 (file)
@@ -3,46 +3,23 @@
        <modelVersion>4.0.0</modelVersion>
 
        <parent>
-               <groupId>org.onap.sdnc.northbound</groupId>
-               <artifactId>sdnc-northbound</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath />
        </parent>
 
        <groupId>org.onap.sdnc.northbound</groupId>
        <artifactId>generic-resource-api</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
-    <properties>
-        <feature-name>generic-resource-api</feature-name>
-    </properties>
+       <name>sdnc-northbound :: generic-resource-api</name>
+
        <modules>
                <module>model</module>
         <module>provider</module>
                <module>features</module>
                <module>installer</module>
        </modules>
-
-
-       <dependencyManagement>
-               <dependencies>
-                       <dependency>
-                               <groupId>org.onap.sdnc.northbound</groupId>
-                               <artifactId>generic-resource-api-features</artifactId>
-                               <version>${project.version}</version>
-                               <type>xml</type>
-                               <classifier>features</classifier>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.sdnc.northbound</groupId>
-                               <artifactId>generic-resource-api-model</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-                       <dependency>
-                               <groupId>org.onap.sdnc.northbound</groupId>
-                               <artifactId>generic-resource-api-provider</artifactId>
-                               <version>${project.version}</version>
-                       </dependency>
-               </dependencies>
-       </dependencyManagement>
 </project>
index 4d82ec9..df15737 100644 (file)
 <?xml version='1.0' encoding='UTF-8'?>
 <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">
-       <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-       <parent>
-               <groupId>org.onap.sdnc.northbound</groupId>
-               <artifactId>generic-resource-api</artifactId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
 
-       <artifactId>generic-resource-api-provider</artifactId>
-       <packaging>bundle</packaging>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>generic-resource-api-provider</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>bundle</packaging>
 
-       <dependencies>
-               <dependency>
-                       <groupId>org.onap.sdnc.northbound</groupId>
-                       <artifactId>generic-resource-api-model</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>config-api</artifactId>
-                       <version>${odl.controller.config.api.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-config</artifactId>
-                       <version>${odl.mdsal.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-api</artifactId>
-                       <version>${odl.mdsal.version}</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-common-util</artifactId>
-                       <version>${odl.mdsal.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-test-model</artifactId>
-                       <version>${odl.mdsal.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.netconf</groupId>
-                       <artifactId>sal-rest-connector</artifactId>
-                       <version>${odl.mdsal.version}</version>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-broker-impl</artifactId>
-                       <version>${odl.mdsal.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>sal-binding-broker-impl</artifactId>
-                       <version>${odl.mdsal.version}</version>
-                       <type>test-jar</type>
-                       <classifier>tests</classifier>
-                       <scope>test</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.apache.commons</groupId>
-                       <artifactId>commons-lang3</artifactId>
-               </dependency>
+    <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
 
+    <dependencies>
+        <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>generic-resource-api-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
         </dependency>
 
-               <dependency>
-                       <groupId>junit</groupId>
-                       <artifactId>junit</artifactId>
-                       <version>${junit.version}</version>
-                       <scope>test</scope>
-               </dependency>
-               <dependency>
-                       <groupId>org.mockito</groupId>
-                       <artifactId>mockito-core</artifactId>
-                       <version>${mockito.version}</version>
-                       <scope>test</scope>
-               </dependency>
-       </dependencies>
-
-       <build>
-           <plugins>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-config</artifactId>
+        </dependency>
 
-                       <plugin>
-                               <groupId>org.apache.felix</groupId>
-                               <artifactId>maven-bundle-plugin</artifactId>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <instructions>
-                                               <Export-Package>!*</Export-Package>
-                                               <Import-Package>*</Import-Package>
-                                       </instructions>
-                               </configuration>
-                       </plugin>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-api</artifactId>
+        </dependency>
 
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-common-util</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-test-model</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.netconf</groupId>
+            <artifactId>sal-rest-connector</artifactId>
+            <scope>test</scope>
+        </dependency>
 
-               </plugins>
-       </build>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>sal-binding-broker-impl</artifactId>
+            <type>test-jar</type>
+            <classifier>tests</classifier>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
 </project>
diff --git a/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang b/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang
deleted file mode 100644 (file)
index b2ce7f2..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-module GENERIC-RESOURCE-API-provider-impl {
-
-    yang-version 1;
-    namespace "org:onap:sdnc:northbound:GENERIC-RESOURCE-API:provider:impl";
-    prefix "GENERIC-RESOURCE-API-provider-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
-    import opendaylight-sal-binding-broker-impl {
-        prefix binding-impl;
-        revision-date 2013-10-28;
-    }
-
-     description
-        "This module contains the base YANG definitions for
-        GENERIC-RESOURCE-API-provider impl implementation.";
-
-    revision "2017-08-24" {
-        description
-            "ONAP Amsterdam version.";
-    }
-
-    // This is the definition of the service implementation as a module identity.
-    identity GENERIC-RESOURCE-API-provider-impl {
-            base config:module-type;
-
-            // Specifies the prefix for generated java classes.
-            config:java-name-prefix GENERIC-RESOURCE-APIProvider;
-    }
-
-    // Augments the 'configuration' choice node under modules/module.
-    // We consume the three main services, RPCs, DataStore, and Notifications
-    augment "/config:modules/config:module/config:configuration" {
-        case GENERIC-RESOURCE-API-provider-impl {
-            when "/config:modules/config:module/config:type = 'GENERIC-RESOURCE-API-provider-impl'";
-
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity mdsal:binding-rpc-registry;
-                    }
-                }
-            }
-
-            container notification-publish-adapter {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-impl:binding-new-notification-publish-service;
-                    }
-                }
-            }
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity mdsal:binding-async-data-broker;
-                    }
-                }
-            }
-        }
-    }
-}
diff --git a/pom.xml b/pom.xml
index 247fd67..a635ee1 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,29 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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">
+       <modelVersion>4.0.0</modelVersion>
 
        <parent>
                <groupId>org.onap.ccsdk.parent</groupId>
-               <artifactId>odlparent-carbon-sr1</artifactId>
-               <version>0.1.0</version>
-
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath />
        </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <packaging>pom</packaging>
        <groupId>org.onap.sdnc.northbound</groupId>
        <artifactId>sdnc-northbound</artifactId>
+       <version>1.3.1-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
        <name>sdnc-northbound</name>
-       <url>https://wiki.onap.org</url>
        <description>The SDN-C Northbound APIs repo contains code for northbound API adaptors, typically MD-SAL applications</description>
+       <url>https://wiki.onap.org</url>
+       <organization>
+               <name>ONAP</name>
+       </organization>
 
-
-       <issueManagement>
-               <system>JIRA</system>
-               <url>https://jira.onap.org/</url>
-       </issueManagement>
-
+       <modules>
+               <module>generic-resource-api</module>
+               <module>vnfapi</module>
+               <module>vnftools</module>
+       </modules>
 
        <scm>
                <connection>scm:git:ssh://git@${onap.git.host}/sdnc-northbound.git</connection>
                <developerConnection>scm:git:ssh://${onap.git.host}:${onap.git.port}/${onap.git.project}/sdnc-northbound.git</developerConnection>
                <url>${onap.git.protocol}://${onap.git.host}/projects/${onap.git.project}/repos/sdnc-northbound/browse</url>
        </scm>
-
+       <issueManagement>
+               <system>JIRA</system>
+               <url>https://jira.onap.org/</url>
+       </issueManagement>
        <ciManagement>
                <system>Jenkins</system>
                <url>https://jenkins.onap.org/</url>
        </ciManagement>
-
        <distributionManagement>
                <site>
                        <id>sdnc-javadoc</id>
                        <url>dav:https://${onap.nexus.host}:${onap.nexus.port}/repository/sdn-c-javadoc/${project.artifactId}/${project.version}</url>
                </site>
        </distributionManagement>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-surefire-plugin</artifactId>
+                               <version>2.17</version>
+                               <configuration>
+                                       <skipTests>false</skipTests>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.sonatype.plugins</groupId>
+                               <artifactId>nexus-staging-maven-plugin</artifactId>
+                               <version>1.6.7</version>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
+                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
+                                       <serverId>${onap.nexus.staging.server-id}</serverId>
+                               </configuration>
+                       </plugin>
+               </plugins>
+       </build>
+
        <profiles>
                <profile>
                        <id>blackduck</id>
                </profile>
 
        </profiles>
-
-       <build>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <version>2.17</version>
-                               <configuration>
-                                       <skipTests>false</skipTests>
-                               </configuration>
-                       </plugin>
-                       <plugin>
-                               <groupId>org.sonatype.plugins</groupId>
-                               <artifactId>nexus-staging-maven-plugin</artifactId>
-                               <version>1.6.7</version>
-                               <extensions>true</extensions>
-                               <configuration>
-                                       <nexusUrl>https://${onap.nexus.host}</nexusUrl>
-                                       <stagingProfileId>${onap.nexus.staging.profile-id}</stagingProfileId>
-                                       <serverId>${onap.nexus.staging.server-id}</serverId>
-                               </configuration>
-                       </plugin>
-               </plugins>
-
-       </build>
-       <modules>
-               <module>generic-resource-api</module>
-               <module>vnfapi</module>
-               <module>vnftools</module>
-       </modules>
-       <organization>
-               <name>ONAP</name>
-       </organization>
-       <version>1.3.0-SNAPSHOT</version>
-
-
 </project>
index 1dcc37c..9614fbf 100644 (file)
@@ -5,7 +5,7 @@
 
 release_name=1
 sprint_number=3
-feature_revision=0
+feature_revision=1
 
 base_version=${release_name}.${sprint_number}.${feature_revision}
 
diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml
new file mode 100644 (file)
index 0000000..cd116c9
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>feature-repo-parent</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.sdnc.northbound</groupId>
+       <artifactId>features-vnfapi</artifactId>
+       <version>1.3.1-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>sdnc-vnfapi</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
+</project>
index f8e7891..72ae9fc 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>vnfapi</artifactId>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
-    <artifactId>vnfapi-features</artifactId>
-
-    <packaging>jar</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>vnfapi-model</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>vnfapi-provider</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>features-mdsal</artifactId>
-            <version>${odl.mdsal.features.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
 
-            <scope>runtime</scope>
-        </dependency>
-
-
-
-        <!-- dependency for opendaylight-karaf-empty for use by testing -->
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>opendaylight-karaf-empty</artifactId>
-            <version>${odl.karaf.empty.distro.version}</version>
-            <type>zip</type>
-        </dependency>
-
-
-        <dependency>
-            <!-- Required for launching the feature tests-->
-            <groupId>org.opendaylight.odlparent</groupId>
-            <artifactId>features-test</artifactId>
-            <scope>test</scope>
-            <version>${odl.commons.opendaylight.version}</version>
-        </dependency>
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>vnfapi-features</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>features-yangtools</artifactId>
-            <version>${odl.yangtools.version}</version>
-            <classifier>features</classifier>
-            <type>xml</type>
-            <scope>runtime</scope>
-        </dependency>
-    </dependencies>
+    <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
 
-    <build>
-        <resources>
-            <resource>
-                <filtering>true</filtering>
-                <directory>src/main/resources</directory>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-resources-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>filter</id>
-                        <goals>
-                            <goal>resources</goal>
-                        </goals>
-                        <phase>generate-resources</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <!--
-            <plugin>
-                launches the feature test, which validates that your karaf feature can
-                     be installed inside of a karaf container. It doesn't validate that your
-                     functionality works correctly, just that you have all of the dependent
-                     bundles defined correctly.
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.16</version>
-                <configuration>
-                    <systemPropertyVariables>
-                        <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-                        <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                        <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
-                    </systemPropertyVariables>
-                    <dependenciesToScan>
-                        <dependency>org.opendaylight.yangtools:features-test</dependency>
-                    </dependenciesToScan>
-                </configuration>
-            </plugin>
-            -->
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <phase>package</phase>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>${project.build.directory}/classes/${features.file}</file>
-                                    <type>xml</type>
-                                    <classifier>features</classifier>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
+    <modules>
+        <module>sdnc-vnfapi</module>
+        <module>features-vnfapi</module>
+    </modules>
 </project>
diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml
new file mode 100644 (file)
index 0000000..1220766
--- /dev/null
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-vnfapi</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vnfapi-model</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vnfapi-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/vnfapi/features/src/main/resources/features.xml b/vnfapi/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 2301d5a..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                                       reserved.
-  ================================================================================
-  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.
-  ============LICENSE_END=========================================================
-  -->
-
-
-<features name="sdnc-vnfapi-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.mdsal/features-mdsal/${odl.mdsal.features.version}/xml/features</repository>
-
-    <feature name='sdnc-vnfapi' description="sdnc-vnfapi" version='${project.version}'>
-        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <bundle>mvn:org.onap.sdnc.northbound/vnfapi-model/${project.version}</bundle>
-        <bundle>mvn:org.onap.sdnc.northbound/vnfapi-provider/${project.version}</bundle>
-    </feature>
-
-</features>
index a3fc635..2257be3 100755 (executable)
@@ -1,31 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>vnfapi</artifactId>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>vnfapi-installer</artifactId>
-    <name>VNF API  - Karaf  Installer</name>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
+    <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
+
     <properties>
         <application.name>sdnc-vnfapi</application.name>
-        <features.boot>sdnc-vnfapi</features.boot>
-        <features.repositories>mvn:org.onap.sdnc.northbound/vnfapi-features/${project.version}/xml/features</features.repositories>
+        <features.boot>${application.name}</features.boot>
+        <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
         <include.transitive.dependencies>false</include.transitive.dependencies>
     </properties>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
-            <artifactId>vnfapi-features</artifactId>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>${application.name}</artifactId>
             <version>${project.version}</version>
-            <classifier>features</classifier>
             <type>xml</type>
+            <classifier>features</classifier>
             <exclusions>
                 <exclusion>
                     <groupId>*</groupId>
@@ -35,7 +40,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.onap.sdnc.northbound</groupId>
+            <groupId>${project.groupId}</groupId>
             <artifactId>vnfapi-provider</artifactId>
             <version>${project.version}</version>
         </dependency>
                             <useRepositoryLayout>true</useRepositoryLayout>
                             <addParentPoms>false</addParentPoms>
                             <copyPom>false</copyPom>
-                            <includeGroupIds>org.onap.sdnc</includeGroupIds>
-                            <excludeArtifactIds>sli-common,sli-provider,dblib-common,dblib-provider</excludeArtifactIds>
+                            <includeGroupIds>org.onap.sdnc.northbound</includeGroupIds>
                             <scope>provided</scope>
                         </configuration>
                     </execution>
 
         </plugins>
     </build>
-
 </project>
index 0612e6e..bfb308e 100644 (file)
         </fileSet>
     </fileSets>
 
-    <files>
-    <file>
-        <source>../model/target/vnfapi.properties</source>
-        <destName>./configuration/vnfapi.properties</destName>
 
-    </file>
-    </files>
 
 </assembly>
index da38b46..2a134d3 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>vnfapi</artifactId>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>vnfapi-model</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
-    <build>
+    <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
 
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Import-Package>*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>${odl.yangtools.yang.maven.plugin.version}</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>org.opendaylight.mdsal</groupId>
-                        <artifactId>maven-sal-api-gen-plugin</artifactId>
-                        <version>${odl.sal.api.gen.plugin.version}</version>
-                        <type>jar</type>
-                    </dependency>
-                   <dependency>
-                       <groupId>org.opendaylight.netconf</groupId>
-                       <artifactId>sal-rest-docgen-maven</artifactId>
-                       <version>${odl.restconf.version}</version>
-                       <type>jar</type>
-                   </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
-                                    <outputBaseDir>${salGeneratorPath}</outputBaseDir>
-                                </generator>
-                               <generator>
-                                       <codeGeneratorClass>org.opendaylight.netconf.sal.rest.doc.maven.StaticDocGenerator</codeGeneratorClass>
-                                       <outputBaseDir>target/swagger</outputBaseDir>
-                               </generator>
-                            </codeGenerators>
-                            <inspectDependencies>true</inspectDependencies>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>exec-maven-plugin</artifactId>
-                                <version>1.2.1</version>
-                                <executions>
-                                        <execution>
-                                                <configuration>
-                                                        <executable>python</executable>
-                                                        <arguments>
-                                                                <argument>scripts/python/yang2props.py</argument>
-                                                                <argument>src/main/yang/VNF-API.yang</argument>
-                                                                <argument>target/vnfapi.properties</argument>
-                                                        </arguments>
-                                                </configuration>
-                                                <id>generation</id>
-                                                <phase>generate-resources</phase>
-                                                <goals>
-                                                        <goal>exec</goal>
-                                                </goals>
-                                        </execution>
-                                </executions>
-                        </plugin>
-                        <plugin>
-                                <groupId>org.codehaus.mojo</groupId>
-                                <artifactId>build-helper-maven-plugin</artifactId>
-                                <executions>
-                                        <execution>
-                                                <id>attach-artifacts</id>
-                                                <goals>
-                                                        <goal>attach-artifact</goal>
-                                                </goals>
-                                                <phase>package</phase>
-                                                <configuration>
-                                                        <artifacts>
-                                                                <artifact>
-                                                                        <file>${project.build.directory}/vnfapi.properties</file>
-                                                                        <type>properties</type>
-                                                                        <classifier>vnfapi</classifier>
-                                                                </artifact>
-                                                        </artifacts>
-                                                </configuration>
-                                        </execution>
-                                </executions>
-                        </plugin>
-
-        </plugins>
-    </build>
     <dependencies>
-        <dependency>
-            <groupId>org.opendaylight.mdsal</groupId>
-            <artifactId>yang-binding</artifactId>
-            <version>${odl.mdsal.yang.binding.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.yangtools</groupId>
-            <artifactId>yang-common</artifactId>
-            <version>${odl.yangtools.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-inet-types</artifactId>
-            <version>${odl.ietf-inet-types.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.mdsal.model</groupId>
             <artifactId>ietf-yang-types</artifactId>
-            <version>${odl.ietf-yang-types.version}</version>
         </dependency>
     </dependencies>
 </project>
index 17403b0..e6de738 100644 (file)
@@ -1,58 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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">
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <artifactId>sdnc-northbound</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
 
-    <packaging>pom</packaging>
     <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>vnfapi</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
-
-    <properties>
-        <feature-name>vnfapi</feature-name>
-    </properties>
-
-    <dependencyManagement>
-
-        <dependencies>
-            <dependency>
-                <groupId>org.onap.sdnc.northbound</groupId>
-                <artifactId>vnfapi-features</artifactId>
-                <classifier>features</classifier>
-                <type>xml</type>
-                <version>${project.version}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.onap.sdnc.northbound</groupId>
-                <artifactId>vnfapi-model</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.sdnc.northbound</groupId>
-                <artifactId>vnfapi-provider</artifactId>
-                <version>${project.version}</version>
-                <classifier>config</classifier>
-                <type>xml</type>
-            </dependency>
-            <dependency>
-                <groupId>org.onap.sdnc.northbound</groupId>
-                <artifactId>vnfapi-provider</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-        </dependencies>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
 
-    </dependencyManagement>
+    <name>sdnc-northbound :: vnfapi</name>
 
-  <modules>
-    <module>model</module>
-    <module>features</module>
-    <module>provider</module>
-    <module>installer</module>
-  </modules>
+    <modules>
+        <module>model</module>
+        <module>features</module>
+        <module>provider</module>
+        <module>installer</module>
+    </modules>
 </project>
index 35021ad..5f3bb25 100644 (file)
@@ -1,89 +1,67 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <artifactId>vnfapi</artifactId>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>vnfapi-provider</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Export-Package>org.opendaylight.controller.config.yang.config.vnfapi_provider.impl</Export-Package>
-                        <Import-Package>*</Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
 
-        </plugins>
-    </build>
+    <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
 
     <dependencies>
         <dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>vnfapi-model</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>config-api</artifactId>
-            <version>${odl.controller.config.api.version}</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-config</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-api</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>
-            <version>${odl.mdsal.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-test-model</artifactId>
-            <version>${odl.mdsal.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.netconf</groupId>
             <artifactId>sal-rest-connector</artifactId>
-            <version>${odl.mdsal.version}</version>
             <scope>test</scope>
         </dependency>
 
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${odl.mdsal.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-binding-broker-impl</artifactId>
-            <version>${odl.mdsal.version}</version>
             <type>test-jar</type>
             <classifier>tests</classifier>
             <scope>test</scope>
@@ -93,7 +71,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
index 42d0241..1a05d2d 100644 (file)
@@ -195,7 +195,7 @@ public class VnfApiProvider implements AutoCloseable, VNFAPIService, DataChangeL
     private static final String INVALID_INPUT_VNF_INSTANCE_STR = "invalid input, null or empty vnf-instance-id";
 
     private VNFSDNSvcLogicServiceClient svcLogicClient;
-    
+
     public VnfApiProvider(DataBroker dataBroker2, NotificationPublishService notificationPublishService,
         RpcProviderRegistry rpcProviderRegistry, VNFSDNSvcLogicServiceClient client) {
         log.info("Creating provider for " + APP_NAME);
index d8cea30..72c0c9d 100644 (file)
@@ -109,6 +109,7 @@ class VnfApiProviderDataBrokerTestCustomizer  extends ConcurrentDataBrokerTestCu
     ExceptionThrowerConfigurator exceptionThrowerConfigurator;
 
     public VnfApiProviderDataBrokerTestCustomizer(ExceptionThrowerConfigurator exceptionThrowerConfigurator) {
+        super(false);
         this.exceptionThrowerConfigurator = exceptionThrowerConfigurator;
     }
 
diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml
new file mode 100644 (file)
index 0000000..2540cf3
--- /dev/null
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>feature-repo-parent</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
+               <relativePath/>
+       </parent>
+
+       <groupId>org.onap.sdnc.northbound</groupId>
+       <artifactId>features-vnftools</artifactId>
+       <version>1.3.1-SNAPSHOT</version>
+       <packaging>feature</packaging>
+
+       <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+
+       <dependencies>
+               <dependency>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>sdnc-vnftools</artifactId>
+                       <version>${project.version}</version>
+                       <type>xml</type>
+                       <classifier>features</classifier>
+               </dependency>
+
+       </dependencies>
+</project>
index e16e2db..64bd18f 100644 (file)
 <?xml version="1.0" encoding="UTF-8"?>
 <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">
-       <modelVersion>4.0.0</modelVersion>
-       <parent>
-               <artifactId>vnftools</artifactId>
-               <groupId>org.onap.sdnc.northbound</groupId>
-               <version>1.3.0-SNAPSHOT</version>
-       </parent>
-       <artifactId>vnftools-features</artifactId>
-       <name>VNF tools Plugin - Features</name>
-
-       <packaging>jar</packaging>
-
-       <dependencies>
-
-
-               <dependency>
-                       <groupId>org.onap.sdnc.northbound</groupId>
-                       <artifactId>vnftools-provider</artifactId>
-                       <version>${project.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>commons-lang</groupId>
-                       <artifactId>commons-lang</artifactId>
-                       <version>2.6</version>
-                       <scope>compile</scope>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.mdsal</groupId>
-                       <artifactId>features-mdsal</artifactId>
-                       <version>${odl.mdsal.features.version}</version>
-                       <classifier>features</classifier>
-                       <type>xml</type>
-
-                       <scope>runtime</scope>
-               </dependency>
-
-
-               <!-- dependency for opendaylight-karaf-empty for use by testing -->
-               <dependency>
-                       <groupId>org.opendaylight.controller</groupId>
-                       <artifactId>opendaylight-karaf-empty</artifactId>
-                       <version>${odl.karaf.empty.distro.version}</version>
-                       <type>zip</type>
-               </dependency>
-
-
-               <dependency>
-                       <!-- Required for launching the feature tests -->
-                       <groupId>org.opendaylight.odlparent</groupId>
-                       <artifactId>features-test</artifactId>
-                       <scope>test</scope>
-                       <version>${odl.commons.opendaylight.version}</version>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.opendaylight.yangtools</groupId>
-                       <artifactId>features-yangtools</artifactId>
-                       <version>${odl.yangtools.version}</version>
-                       <classifier>features</classifier>
-                       <type>xml</type>
-                       <scope>runtime</scope>
-               </dependency>
-       </dependencies>
-
-       <build>
-               <resources>
-                       <resource>
-                               <filtering>true</filtering>
-                               <directory>src/main/resources</directory>
-                       </resource>
-               </resources>
-               <plugins>
-                       <plugin>
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-resources-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>filter</id>
-                                               <goals>
-                                                       <goal>resources</goal>
-                                               </goals>
-                                               <phase>generate-resources</phase>
-                                       </execution>
-                               </executions>
-                       </plugin>
-                                       <!-- launches the feature test, which validates that your karaf feature
-                                       can be installed inside of a karaf container. It doesn't validate that your
-                                       functionality works correctly, just that you have all of the dependent bundles
-                                       defined correctly.
-                       <plugin>
-
-                               <groupId>org.apache.maven.plugins</groupId>
-                               <artifactId>maven-surefire-plugin</artifactId>
-                               <version>2.16</version>
-                               <configuration>
-                                       <systemPropertyVariables>
-                                               <karaf.distro.groupId>org.opendaylight.controller</karaf.distro.groupId>
-                                               <karaf.distro.artifactId>opendaylight-karaf-empty</karaf.distro.artifactId>
-                                               <karaf.distro.version>${odl.karaf.empty.distro.version}</karaf.distro.version>
-                                       </systemPropertyVariables>
-                                       <dependenciesToScan>
-                                               <dependency>org.opendaylight.yangtools:features-test</dependency>
-                                       </dependenciesToScan>
-                               </configuration>
-                       </plugin>
-                       -->
-                       <plugin>
-                               <groupId>org.codehaus.mojo</groupId>
-                               <artifactId>build-helper-maven-plugin</artifactId>
-                               <executions>
-                                       <execution>
-                                               <id>attach-artifacts</id>
-                                               <goals>
-                                                       <goal>attach-artifact</goal>
-                                               </goals>
-                                               <phase>package</phase>
-                                               <configuration>
-                                                       <artifacts>
-                                                               <artifact>
-                                                                       <file>${project.build.directory}/classes/${features.file}</file>
-                                                                       <type>xml</type>
-                                                                       <classifier>features</classifier>
-                                                               </artifact>
-                                                       </artifacts>
-                                               </configuration>
-                                       </execution>
-                               </executions>
-                       </plugin>
-               </plugins>
-       </build>
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>odlparent-lite</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>vnftools-features</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>pom</packaging>
+
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+
+    <modules>
+        <module>sdnc-vnftools</module>
+        <module>features-vnftools</module>
+    </modules>
 </project>
diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml
new file mode 100644 (file)
index 0000000..9eb11c3
--- /dev/null
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>single-feature-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
+    </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
+    <artifactId>sdnc-vnftools</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
+    <packaging>feature</packaging>
+
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.opendaylight.controller</groupId>
+            <artifactId>odl-mdsal-broker</artifactId>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>ccsdk-sli</artifactId>
+            <version>${ccsdk.sli.core.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>vnftools-provider</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+    </dependencies>
+</project>
diff --git a/vnftools/features/src/main/resources/features.xml b/vnftools/features/src/main/resources/features.xml
deleted file mode 100644 (file)
index 742efb4..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ============LICENSE_START=======================================================
-  openECOMP : SDN-C
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights
-                                                       reserved.
-  ================================================================================
-  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.
-  ============LICENSE_END=========================================================
-  -->
-
-
-<features name="sdnc-vnftools-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
-
-    <repository>mvn:org.opendaylight.controller/features-mdsal/${odl.mdsal.version}/xml/features</repository>
-
-
-    <feature name='sdnc-vnftools' description="sdnc-vnftools" version='${project.version}'>
-        <!-- Most applications will have a dependency on the ODL MD-SAL Broker -->
-        <feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
-        <feature>sdnc-sli</feature>
-        <bundle>mvn:org.onap.sdnc.northbound/vnftools-provider/${project.version}</bundle>
-    </feature>
-
-</features>
index 134fb1f..659a97c 100755 (executable)
@@ -1,31 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
        <modelVersion>4.0.0</modelVersion>
+
        <parent>
-               <artifactId>vnftools</artifactId>
-               <groupId>org.onap.sdnc.northbound</groupId>
-               <version>1.3.0-SNAPSHOT</version>
+               <groupId>org.onap.ccsdk.parent</groupId>
+               <artifactId>odlparent-lite</artifactId>
+               <version>1.0.1-SNAPSHOT</version>
        </parent>
+
+       <groupId>org.onap.sdnc.northbound</groupId>
        <artifactId>vnftools-installer</artifactId>
-       <name>VNF Tools Plugin  - Karaf  Installer</name>
+       <version>1.3.1-SNAPSHOT</version>
        <packaging>pom</packaging>
 
+       <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+
        <properties>
                <application.name>sdnc-vnftools</application.name>
-               <features.boot>sdnc-vnftools</features.boot>
-               <features.repositories>mvn:org.onap.sdnc.northbound/vnftools-features/${project.version}/xml/features</features.repositories>
+               <features.boot>${application.name}</features.boot>
+               <features.repositories>mvn:org.onap.sdnc.northbound/${application.name}/${project.version}/xml/features</features.repositories>
                <include.transitive.dependencies>false</include.transitive.dependencies>
        </properties>
 
        <dependencies>
 
                <dependency>
-                       <groupId>org.onap.sdnc.northbound</groupId>
-                       <artifactId>vnftools-features</artifactId>
+                       <groupId>${project.groupId}</groupId>
+                       <artifactId>${application.name}</artifactId>
                        <version>${project.version}</version>
-                       <classifier>features</classifier>
                        <type>xml</type>
+                       <classifier>features</classifier>
                        <exclusions>
                                <exclusion>
                                        <groupId>*</groupId>
                                                        <useRepositoryLayout>true</useRepositoryLayout>
                                                        <addParentPoms>false</addParentPoms>
                                                        <copyPom>false</copyPom>
-                                                       <includeGroupIds>org.onap.sdnc</includeGroupIds>
-                                                       <excludeArtifactIds>sli-common,sli-provider,dblib-common,dblib-provider,sliPluginUtils-provider</excludeArtifactIds>
+                                                       <includeGroupIds>org.onap.sdnc.northbound</includeGroupIds>
                                                        <scope>provided</scope>
                                                </configuration>
                                        </execution>
 
                </plugins>
        </build>
-
 </project>
index 1e58c72..ebdee6a 100644 (file)
@@ -1,34 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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/maven-v4_0_0.xsd">
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
        <parent>
                <groupId>org.onap.sdnc.northbound</groupId>
                <artifactId>sdnc-northbound</artifactId>
                <version>1.3.0-SNAPSHOT</version>
        </parent>
 
-       <modelVersion>4.0.0</modelVersion>
-       <packaging>pom</packaging>
        <groupId>org.onap.sdnc.northbound</groupId>
        <artifactId>vnftools</artifactId>
-
-       <properties>
-               <feature-name>vnftools</feature-name>
-       </properties>
+       <version>1.3.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
 
        <name>VNF Tools Plugin</name>
        <description>Provides execute nodes to Directed Graphs that use the VNF Module.</description>
 
-       <version>1.3.0-SNAPSHOT</version>
+       <modules>
+    <module>provider</module>
+    <module>features</module>
+    <module>installer</module>
+  </modules>
 
-        <dependencyManagement>
+       <properties>
+               <feature-name>vnftools</feature-name>
+       </properties>
+
+       <dependencyManagement>
 
                 <dependencies>
                         <dependency>
                                 <groupId>org.onap.sdnc.northbound</groupId>
                                 <artifactId>vnftools-features</artifactId>
-                                <classifier>features</classifier>
-                                <type>xml</type>
                                 <version>${project.version}</version>
+                                <type>xml</type>
+                                <classifier>features</classifier>
                         </dependency>
 
                         <dependency>
 
 
         </dependencyManagement>
-
-  <modules>
-    <module>provider</module>
-    <module>features</module>
-    <module>installer</module>
-  </modules>
 </project>
index 29ca719..99d0d14 100644 (file)
@@ -1,89 +1,52 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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">
     <modelVersion>4.0.0</modelVersion>
+
     <parent>
-        <groupId>org.onap.sdnc.northbound</groupId>
-        <artifactId>vnftools</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <groupId>org.onap.ccsdk.parent</groupId>
+        <artifactId>binding-parent</artifactId>
+        <version>1.0.1-SNAPSHOT</version>
+        <relativePath />
     </parent>
+
+    <groupId>org.onap.sdnc.northbound</groupId>
     <artifactId>vnftools-provider</artifactId>
+    <version>1.3.1-SNAPSHOT</version>
     <packaging>bundle</packaging>
-    <name>VNF Tools Plugin - Provider</name>
-    <url>http://maven.apache.org</url>
+
+    <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
+
     <dependencies>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>${mockito.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-common</artifactId>
-            <version>${sdnctl.sli.version}</version>
-            <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sli-provider</artifactId>
-            <version>${sdnctl.sli.version}</version>
-            <scope>compile</scope>
-        </dependency>
-        <dependency>
-            <groupId>equinoxSDK381</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-            <version>${equinox.osgi.version}</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
-            <version>${slf4j.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>jcl-over-slf4j</artifactId>
-            <version>${slf4j.version}</version>
-        </dependency>
-
         <dependency>
             <groupId>org.onap.ccsdk.sli.core</groupId>
             <artifactId>sliPluginUtils-provider</artifactId>
-            <version>${sdnctl.slipluginutils.version}</version>
-            <type>jar</type>
-            <scope>compile</scope>
+            <version>${ccsdk.sli.core.version}</version>
         </dependency>
     </dependencies>
-
-    <build>
-        <plugins>
-
-
-            <plugin>
-                <groupId>org.apache.felix</groupId>
-                <artifactId>maven-bundle-plugin</artifactId>
-                <version>${bundle.plugin.version}</version>
-                <extensions>true</extensions>
-                <configuration>
-                    <instructions>
-                        <Bundle-SymbolicName>org.onap.sdnc.vnftools</Bundle-SymbolicName>
-                        <Export-Package>org.onap.sdnc.vnftools.*</Export-Package>
-                        <Import-Package>org.onap.sdnc.*,org.onap.ccsdk.*,org.osgi.framework.*,org.slf4j.*,java.net.*,org.apache.commons.*</Import-Package>
-                        <Embed-Dependency>*;scope=compile|runtime;artifactId=!sli-common|org.eclipse.osgi|mysql-connector-java|slf4j-api|jcl-over-slf4j|xml-apis|InetAddress|commons-lang3</Embed-Dependency>
-                        <Embed-Transitive>true</Embed-Transitive>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-
-    </build>
 </project>