<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.sdnc.northbound</groupId>
<artifactId>features-sdnc-northbound</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: features :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>sdnc-northbound-features-installer</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: features :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>sdnc-northbound-feature-aggregator</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: features</name>
<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.sdnc.northbound</groupId>
<artifactId>sdnc-northbound-all</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: features :: ${project.artifactId}</name>
<packaging>jar</packaging>
<groupId>org.onap.sdnc.northbound</groupId>
<artifactId>generic-resource-api-client</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<name>sdnc-northbound :: generic-resource-api:: ${project.artifactId}</name>
<url>http://wiki.onap.org</url>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>client-parent</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<dependencies>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
<configuration>
- <includeGroupIds>org.opendaylight.mdsal.model, org.onap.sdnc.northbound</includeGroupIds>
+ <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound</includeGroupIds>
</configuration>
</plugin>
<plugin>
<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.sdnc.northbound</groupId>
<artifactId>features-generic-resource-api</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>generic-resource-api-features</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>sdnc-generic-resource-api</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>generic-resource-api-installer</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>generic-resource-api-model</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
<dependencies>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types-2013-07-15</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types-20130715</artifactId>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991</artifactId>
</dependency>
+
+
</dependencies>
<build>
<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.sdnc.northbound</groupId>
<artifactId>generic-resource-api</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: generic-resource-api</name>
<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.sdnc.northbound</groupId>
<artifactId>generic-resource-api-provider</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
</dependencies>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<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="svcLogicService"
+ interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
+
+ <bean id="client" class="org.onap.sdnc.northbound.GenericResourceApiSvcLogicServiceClient">
+ <argument ref="svcLogicService" />
+ </bean>
+
+ <reference id="dataBroker"
+ interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+ odl:type="default" />
+
+ <reference id="notificationService"
+ interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+ odl:type="default" />
+
+ <reference id="rpcRegistry"
+ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
+ odl:type="default" />
+
+ <bean id="provider" class="org.onap.sdnc.northbound.GenericResourceApiProvider">
+ <argument ref="dataBroker" />
+ <argument ref="notificationService" />
+ <argument ref="rpcRegistry" />
+ <argument ref="client" />
+ </bean>
+
+ <odl:rpc-implementation ref="provider"/>
+
+</blueprint>
\ No newline at end of file
@Test
public void should_fail_when_client_execution_failed() throws Exception {
+
svcClient.mockHasGraph(true);
svcClient.mockExecute(new RuntimeException("test exception"));
, input
, RpcResult::getResult
);
-
+
assertEquals("500", output.getResponseCode());
assertEquals("test exception", output.getResponseMessage());
assertEquals("Y", output.getAckFinalIndicator());
, RpcResult::getResult
);
- assertEquals("500", output.getResponseCode());
+ assertEquals("200", output.getResponseCode());
assertEquals("Y", output.getAckFinalIndicator());
}
<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.sdnc.northbound</groupId>
<artifactId>sdnc-northbound</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound</name>
# because they are used in Jenkins, whose plug-in doesn't support
release_name=1
-sprint_number=6
-feature_revision=2
+sprint_number=7
+feature_revision=0
base_version=${release_name}.${sprint_number}.${feature_revision}
<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.sdnc.northbound</groupId>
<artifactId>features-vnfapi</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>vnfapi-features</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>sdnc-vnfapi</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>vnfapi-installer</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>vnfapi-model</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
<dependencies>
<dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-inet-types-2013-07-15</artifactId>
- </dependency>
- <dependency>
- <groupId>org.opendaylight.mdsal.model</groupId>
- <artifactId>ietf-yang-types-20130715</artifactId>
+ <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
+ <artifactId>rfc6991</artifactId>
</dependency>
+
+
</dependencies>
</project>
<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.sdnc.northbound</groupId>
<artifactId>vnfapi</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: vnfapi</name>
<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.sdnc.northbound</groupId>
<artifactId>vnfapi-provider</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name>
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-core</artifactId>
+ <version>1.10.19</version>
<scope>test</scope>
</dependency>
<dependency>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<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="svcLogicService"
+ interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" />
+
+ <bean id="client" class="org.onap.sdnc.vnfapi.VNFSDNSvcLogicServiceClient">
+ <argument ref="svcLogicService" />
+ </bean>
+
+ <reference id="dataBroker"
+ interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
+ odl:type="default" />
+
+ <reference id="notificationService"
+ interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService"
+ odl:type="default" />
+
+ <reference id="rpcRegistry"
+ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"
+ odl:type="default" />
+
+ <bean id="provider" class="org.onap.sdnc.vnfapi.VnfApiProvider">
+ <argument ref="dataBroker" />
+ <argument ref="notificationService" />
+ <argument ref="rpcRegistry" />
+ <argument ref="client" />
+ </bean>
+
+ <odl:rpc-implementation ref="provider"/>
+
+</blueprint>
\ No newline at end of file
<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.sdnc.northbound</groupId>
<artifactId>features-vnftools</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>vnftools-features</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
<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.sdnc.northbound</groupId>
<artifactId>sdnc-vnftools</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>feature</packaging>
<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.northbound</groupId>
<artifactId>vnftools-installer</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
<parent>
<groupId>org.onap.ccsdk.parent</groupId>
<artifactId>odlparent-lite</artifactId>
- <version>1.3.3-SNAPSHOT</version>
+ <version>1.4.0-SNAPSHOT</version>
</parent>
<groupId>org.onap.sdnc.northbound</groupId>
<artifactId>vnftools</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>VNF Tools Plugin</name>
<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.sdnc.northbound</groupId>
<artifactId>vnftools-provider</artifactId>
- <version>1.6.2-SNAPSHOT</version>
+ <version>1.7.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>sdnc-northbound :: vnftools :: ${project.artifactId}</name>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+
+ <bean id="vnftools" class="org.onap.sdnc.vnftools.VnfTools" />
+ <service ref="vnftools" interface="org.onap.sdnc.vnftools.VnfTools" />
+
+</blueprint>
\ No newline at end of file