summaryrefslogtreecommitdiffstats
path: root/netbox-client
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-07-03 14:30:56 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-08-15 12:34:47 -0400
commitdbbd392fdc622c85958598213b2f423848666af6 (patch)
tree642353493d0d25438015ce26acf6f317d2ddf72b /netbox-client
parentc490056ee0100fa54c2d52dc1db600b0f1d0fce6 (diff)
Code changes for OpenDaylight Neon
Updated code for OpenDaylight Neon, using conversion script in ccsdk/parent/tools. Change-Id: Ic91cff9ee50102b8af1a73f829908de82995b2ef Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'netbox-client')
-rw-r--r--netbox-client/features/ccsdk-netbox-client/pom.xml17
-rwxr-xr-xnetbox-client/features/features-netbox-client/pom.xml4
-rwxr-xr-xnetbox-client/features/pom.xml4
-rwxr-xr-xnetbox-client/installer/pom.xml4
-rw-r--r--netbox-client/pom.xml4
-rw-r--r--netbox-client/provider/pom.xml11
-rw-r--r--netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml37
7 files changed, 63 insertions, 18 deletions
diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml
index c9d105b9e..eee799198 100644
--- a/netbox-client/features/ccsdk-netbox-client/pom.xml
+++ b/netbox-client/features/ccsdk-netbox-client/pom.xml
@@ -20,38 +20,47 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>single-feature-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>ccsdk-netbox-client</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
+
<properties>
<ccsdk.sli.adaptors.version>${project.version}</ccsdk.sli.adaptors.version>
</properties>
+
<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>
- <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>ccsdk-dblib</artifactId>
<version>${ccsdk.sli.core.version}</version>
<type>xml</type>
<classifier>features</classifier>
- <scope>provided</scope>
</dependency>
+
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>netbox-client-provider</artifactId>
diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml
index 556a8579f..b1195eba2 100755
--- a/netbox-client/features/features-netbox-client/pom.xml
+++ b/netbox-client/features/features-netbox-client/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>feature-repo-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>features-netbox-client</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
diff --git a/netbox-client/features/pom.xml b/netbox-client/features/pom.xml
index b3740b3c3..3556a4c5e 100755
--- a/netbox-client/features/pom.xml
+++ b/netbox-client/features/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>netbox-client-features</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml
index aab9b076a..ac85879b9 100755
--- a/netbox-client/installer/pom.xml
+++ b/netbox-client/installer/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>netbox-client-installer</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId}</name>
diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml
index c22560a0d..c1b4e3e71 100644
--- a/netbox-client/pom.xml
+++ b/netbox-client/pom.xml
@@ -20,13 +20,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>netbox-client</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>ccsdk-sli-adaptors :: netbox-client</name>
diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml
index c6237d38b..cbc698b6a 100644
--- a/netbox-client/provider/pom.xml
+++ b/netbox-client/provider/pom.xml
@@ -19,13 +19,13 @@
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>binding-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
<relativePath/>
</parent>
<groupId>org.onap.ccsdk.sli.adaptors</groupId>
<artifactId>netbox-client-provider</artifactId>
- <version>0.5.2-SNAPSHOT</version>
+ <version>0.6.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<modelVersion>4.0.0</modelVersion>
@@ -71,13 +71,13 @@
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sli-common</artifactId>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.onap.ccsdk.sli.core</groupId>
<artifactId>sliPluginUtils-provider</artifactId>
<version>${project.version}</version>
- <scope>provided</scope>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
@@ -101,13 +101,12 @@
<dependency>
<groupId>com.github.tomakehurst</groupId>
<artifactId>wiremock</artifactId>
+ <version>2.23.2</version>
<scope>test</scope>
</dependency>
- <!-- Need to override ODL version of jetty-server to get test to compile -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-server</artifactId>
- <version>9.3.1.v20150714</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml b/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
new file mode 100644
index 000000000..b667dcba5
--- /dev/null
+++ b/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Copyright (C) 2018 AT&T, Bell Canada
+
+ 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.
+ -->
+<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
+ odl:use-default-for-reference-types="true">
+
+ <reference id="dbLibService"
+ interface="org.onap.ccsdk.sli.core.dblib.DbLibService"/>
+
+ <bean id="netboxProperty" class="org.onap.ccsdk.sli.adaptors.netbox.property.NetboxProperties"/>
+ <bean id="httpClient" class="org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxHttpClient" destroy-method="close">
+ <argument ref="netboxProperty"/>
+ </bean>
+
+ <bean id="netboxClient" class="org.onap.ccsdk.sli.adaptors.netbox.impl.NetboxClientImpl">
+ <argument ref="httpClient"/>
+ <argument ref="dbLibService"/>
+ </bean>
+
+ <service ref="netboxClient"
+ interface="org.onap.ccsdk.sli.adaptors.netbox.api.NetboxClient"
+ odl:type="default"/>
+
+</blueprint>