From 58b88df91a91393b1bb2200a82093ed5601cc46a Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Fri, 16 Aug 2019 10:10:33 -0400 Subject: [PATCH] Code changes for Neon Code changes for Neon port Change-Id: I4dea521cabdf79e5dcefc7fa079516e2215337a4 Issue-ID: SDNC-850 Signed-off-by: Timoney, Dan (dt5972) --- features/features-sdnc-northbound/pom.xml | 4 +-- features/installer/pom.xml | 4 +-- features/pom.xml | 4 +-- features/sdnc-northbound-all/pom.xml | 4 +-- generic-resource-api/client/pom.xml | 6 ++-- .../features/features-generic-resource-api/pom.xml | 4 +-- generic-resource-api/features/pom.xml | 4 +-- .../features/sdnc-generic-resource-api/pom.xml | 4 +-- generic-resource-api/installer/pom.xml | 4 +-- generic-resource-api/model/pom.xml | 14 ++++----- generic-resource-api/pom.xml | 4 +-- generic-resource-api/provider/pom.xml | 5 ++-- .../blueprint/generic-resource-api-blueprint.xml | 34 ++++++++++++++++++++++ .../ServiceTopologyOperationRPCTest.java | 5 ++-- pom.xml | 4 +-- version.properties | 4 +-- vnfapi/features/features-vnfapi/pom.xml | 4 +-- vnfapi/features/pom.xml | 4 +-- vnfapi/features/sdnc-vnfapi/pom.xml | 4 +-- vnfapi/installer/pom.xml | 4 +-- vnfapi/model/pom.xml | 14 ++++----- vnfapi/pom.xml | 4 +-- vnfapi/provider/pom.xml | 5 ++-- .../OSGI-INF/blueprint/vnfapi-blueprint.xml | 34 ++++++++++++++++++++++ vnftools/features/features-vnftools/pom.xml | 4 +-- vnftools/features/pom.xml | 4 +-- vnftools/features/sdnc-vnftools/pom.xml | 4 +-- vnftools/installer/pom.xml | 4 +-- vnftools/pom.xml | 4 +-- vnftools/provider/pom.xml | 4 +-- .../OSGI-INF/blueprint/vnftools-blueprint.xml | 10 +++++++ 31 files changed, 146 insertions(+), 69 deletions(-) create mode 100644 generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml create mode 100644 vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml create mode 100644 vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml index e25b0bb2..3d0dacab 100644 --- a/features/features-sdnc-northbound/pom.xml +++ b/features/features-sdnc-northbound/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound features-sdnc-northbound - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index c19b316d..e524308d 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-features-installer - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index 0908f46f..55e44779 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-feature-aggregator - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: features diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml index db8a60b1..4d37f4bc 100644 --- a/features/sdnc-northbound-all/pom.xml +++ b/features/sdnc-northbound-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound-all - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: features :: ${project.artifactId} diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index 09e6d245..d19e229c 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -6,7 +6,7 @@ jar org.onap.sdnc.northbound generic-resource-api-client - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT sdnc-northbound :: generic-resource-api:: ${project.artifactId} http://wiki.onap.org @@ -15,7 +15,7 @@ org.onap.ccsdk.parent client-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -38,7 +38,7 @@ org.apache.maven.plugins maven-dependency-plugin - org.opendaylight.mdsal.model, org.onap.sdnc.northbound + org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml index d3752234..dc578548 100644 --- a/generic-resource-api/features/features-generic-resource-api/pom.xml +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound features-generic-resource-api - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 23965789..961670d4 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-features - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml index 5a4eea97..d47e06db 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-generic-resource-api - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index a7c8b369..e8825334 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-installer - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: generic-resource-api :: ${project.artifactId} diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 789c20b3..85710c20 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,26 +5,24 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-model - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT bundle sdnc-northbound :: generic-resource-api :: ${project.artifactId} - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index deff8241..3b2ce9a2 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: generic-resource-api diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 2a6d50e4..9283f506 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound generic-resource-api-provider - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT bundle sdnc-northbound :: generic-resource-api :: ${project.artifactId} @@ -82,6 +82,7 @@ org.mockito mockito-core + 1.10.19 test diff --git a/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml b/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml new file mode 100644 index 00000000..80d35574 --- /dev/null +++ b/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java index bbd0afdf..cce03cc2 100644 --- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java +++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java @@ -146,6 +146,7 @@ public class ServiceTopologyOperationRPCTest extends GenericResourceApiProviderT @Test public void should_fail_when_client_execution_failed() throws Exception { + svcClient.mockHasGraph(true); svcClient.mockExecute(new RuntimeException("test exception")); @@ -157,7 +158,7 @@ public class ServiceTopologyOperationRPCTest extends GenericResourceApiProviderT , input , RpcResult::getResult ); - + assertEquals("500", output.getResponseCode()); assertEquals("test exception", output.getResponseMessage()); assertEquals("Y", output.getAckFinalIndicator()); @@ -202,7 +203,7 @@ public class ServiceTopologyOperationRPCTest extends GenericResourceApiProviderT , RpcResult::getResult ); - assertEquals("500", output.getResponseCode()); + assertEquals("200", output.getResponseCode()); assertEquals("Y", output.getAckFinalIndicator()); } diff --git a/pom.xml b/pom.xml index 19ecbc93..a559ad0b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-northbound - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound diff --git a/version.properties b/version.properties index 6d9189d0..ab6936a8 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # 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} diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml index e8a8a5c3..8c00092c 100644 --- a/vnfapi/features/features-vnfapi/pom.xml +++ b/vnfapi/features/features-vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound features-vnfapi - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 48c8bf05..67153bbe 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-features - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml index 23c3d019..b7c180ae 100644 --- a/vnfapi/features/sdnc-vnfapi/pom.xml +++ b/vnfapi/features/sdnc-vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-vnfapi - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index 1f4b9788..90906ad2 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-installer - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: vnfapi :: ${project.artifactId} diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 874ff7f7..687839fc 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -5,25 +5,23 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-model - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT bundle sdnc-northbound :: vnfapi :: ${project.artifactId} - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-yang-types-20130715 + org.opendaylight.mdsal.binding.model.ietf + rfc6991 + + diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 422d75fd..ad9dd063 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnfapi - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: vnfapi diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 0c69ea4f..726f2983 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnfapi-provider - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT bundle sdnc-northbound :: vnfapi :: ${project.artifactId} @@ -77,6 +77,7 @@ org.mockito mockito-core + 1.10.19 test diff --git a/vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml b/vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml new file mode 100644 index 00000000..1afd1a65 --- /dev/null +++ b/vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml index 90d9c142..27070036 100644 --- a/vnftools/features/features-vnftools/pom.xml +++ b/vnftools/features/features-vnftools/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound features-vnftools - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index 911d5310..5c64f8c6 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnftools-features - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml index 791661ce..f06fa9e1 100644 --- a/vnftools/features/sdnc-vnftools/pom.xml +++ b/vnftools/features/sdnc-vnftools/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound sdnc-vnftools - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT feature sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 21847bc8..e2456a4d 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnftools-installer - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 99f1903d..269c6aeb 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnftools - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT pom VNF Tools Plugin diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index 6bd110e3..918303ab 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.sdnc.northbound vnftools-provider - 1.6.2-SNAPSHOT + 1.7.0-SNAPSHOT bundle sdnc-northbound :: vnftools :: ${project.artifactId} diff --git a/vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml b/vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml new file mode 100644 index 00000000..d784db71 --- /dev/null +++ b/vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file -- 2.16.6