Nitrogen port : sdnc-northbound

Update sdnc/northbound to OpenDaylight Nitrogen release.

Change-Id: I6e299418a7ab441899b78b5d3df5f8ee96829222
Issue-ID: SDNC-269
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>

11 files changed, 141 insertions, 376 deletions

diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml
new file mode 100644
index 00000000..cd116c96
--- /dev/null
+++ b/vnfapi/features/features-vnfapi/pom.xml
@@ -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>
diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml
index f8e78914..72ae9fc3 100644
--- a/vnfapi/features/pom.xml
+++ b/vnfapi/features/pom.xml
@@ -1,131 +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">
     <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
index 00000000..1220766b
--- /dev/null
+++ b/vnfapi/features/sdnc-vnfapi/pom.xml
@@ -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
index 2301d5a9..00000000
--- a/vnfapi/features/src/main/resources/features.xml
+++ /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>
diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml
index a3fc6350..2257be33 100755
--- a/vnfapi/installer/pom.xml
+++ b/vnfapi/installer/pom.xml
@@ -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>
@@ -100,8 +105,7 @@
                             <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>
@@ -136,5 +140,4 @@
 
         </plugins>
     </build>
-
 </project>
diff --git a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
index 0612e6ed..bfb308e2 100644
--- a/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
+++ b/vnfapi/installer/src/assembly/assemble_mvnrepo_zip.xml
@@ -42,12 +42,6 @@
         </fileSet>
     </fileSets>
 
-    <files>
-    <file>
-        <source>../model/target/vnfapi.properties</source>
-        <destName>./configuration/vnfapi.properties</destName>
 
-    </file>
-    </files>
 
 </assembly>
diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml
index da38b467..2a134d32 100644
--- a/vnfapi/model/pom.xml
+++ b/vnfapi/model/pom.xml
@@ -1,134 +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>
-        <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>
diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml
index 17403b05..e6de738d 100644
--- a/vnfapi/pom.xml
+++ b/vnfapi/pom.xml
@@ -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>
diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml
index 35021adb..5f3bb253 100644
--- a/vnfapi/provider/pom.xml
+++ b/vnfapi/provider/pom.xml
@@ -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>
diff --git a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java
index 42d02419..1a05d2db 100644
--- a/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java
+++ b/vnfapi/provider/src/main/java/org/onap/sdnc/vnfapi/VnfApiProvider.java
@@ -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);
diff --git a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java
index d8cea301..72c0c9d5 100644
--- a/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java
+++ b/vnfapi/provider/src/test/java/org/onap/sdnc/vnfapi/VnfInstanceTopologyOperationTest.java
@@ -109,6 +109,7 @@ class VnfApiProviderDataBrokerTestCustomizer  extends ConcurrentDataBrokerTestCu
     ExceptionThrowerConfigurator exceptionThrowerConfigurator;
 
     public VnfApiProviderDataBrokerTestCustomizer(ExceptionThrowerConfigurator exceptionThrowerConfigurator) {
+        super(false);
         this.exceptionThrowerConfigurator = exceptionThrowerConfigurator;
     }