From 77b67133577c4decf7c4826edcc04edcde135df6 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Thu, 1 Mar 2018 10:10:24 +0100 Subject: Fix artifact deployment to nexus Change-Id: Ib63a97cd93989ec1e94e968f4d044f4499fc8f4c Signed-off-by: Denes Nemeth Issue-ID: VFC-728 --- nokiav2/driver/pom.xml | 10 ++++----- .../vnfm/svnfm/nokia/onap/core/MsbApiProvider.java | 3 ++- .../vfc/TestVfcExternalSystemInfoProvider.java | 4 ++-- .../driver/vnfm/svnfm/nokia/vnfm/TestBase.java | 2 +- .../unittests/TestCbamCatalogManager.sample.csar | Bin 1479 -> 2321 bytes nokiav2/driverwar/pom.xml | 25 +++++++++++++++------ 6 files changed, 28 insertions(+), 16 deletions(-) (limited to 'nokiav2') diff --git a/nokiav2/driver/pom.xml b/nokiav2/driver/pom.xml index e770f3e4..46dfe936 100644 --- a/nokiav2/driver/pom.xml +++ b/nokiav2/driver/pom.xml @@ -52,10 +52,10 @@ com.google.guava guava - 20.0 - + 24.0-jre + org.yaml snakeyaml 1.19 @@ -96,9 +96,9 @@ 1.2.0 - org.onap.aai - rest-client - 1.2.0 + org.onap.aai + rest-client + 1.2.0 diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/MsbApiProvider.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/MsbApiProvider.java index b6f4644a..b652b59c 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/MsbApiProvider.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/MsbApiProvider.java @@ -59,8 +59,9 @@ public class MsbApiProvider extends IpMappingProvider { */ public String getMicroServiceUrl(String name, String version) { MicroServiceFullInfo microServiceFullInfo = getMicroServiceInfo(name, version); - String protocol = "http://"; //FIXME the enable_ssl field should be used, but it is not available in SDK String ipAnPort = getNodeIpAnPort(microServiceFullInfo); + //FIXME the enable_ssl field should be used, but it is not available in SDK depends on MSB-151 jira issue + String protocol = (ipAnPort.endsWith(":8443") || ipAnPort.endsWith(":443")) ? "https://" : "http://"; //the field name in A&AI is misleading the URL is relative path postfixed to http(s)://ip:port String fullUrl = protocol + ipAnPort + microServiceFullInfo.getUrl(); return fullUrl; diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/TestVfcExternalSystemInfoProvider.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/TestVfcExternalSystemInfoProvider.java index 1081b93c..aec53e10 100644 --- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/TestVfcExternalSystemInfoProvider.java +++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/vfc/TestVfcExternalSystemInfoProvider.java @@ -63,8 +63,8 @@ public class TestVfcExternalSystemInfoProvider extends TestBase { vfcExternalSystemInfoProvider.getVimInfo(VIM_ID); fail(); } catch (Exception e) { - assertEquals("Unable to query VIM from VF-C with myVimId identifier", e.getMessage()); - verify(logger).error("Unable to query VIM from VF-C with myVimId identifier", expectedException); + assertEquals("Unable to query VIM from VF-C with " + VIM_ID +" identifier", e.getMessage()); + verify(logger).error("Unable to query VIM from VF-C with " + VIM_ID+" identifier", expectedException); } } diff --git a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestBase.java b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestBase.java index be3ea0eb..99e95b4c 100644 --- a/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestBase.java +++ b/nokiav2/driver/src/test/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/vnfm/TestBase.java @@ -66,7 +66,7 @@ public class TestBase { public static final String VNF_ID = "myVnfId"; public static final String VNFM_ID = "myVnfmId"; public static final String ONAP_CSAR_ID = "myOnapCsarId"; - public static final String VIM_ID = "myVimId"; + public static final String VIM_ID = "myCloudOwnerId_myRegionName"; public static final String JOB_ID = "myJobId"; public static final String CBAM_VNFD_ID = "cbamVnfdId"; @Mock diff --git a/nokiav2/driver/src/test/resources/unittests/TestCbamCatalogManager.sample.csar b/nokiav2/driver/src/test/resources/unittests/TestCbamCatalogManager.sample.csar index 94f476f4..1a179166 100644 Binary files a/nokiav2/driver/src/test/resources/unittests/TestCbamCatalogManager.sample.csar and b/nokiav2/driver/src/test/resources/unittests/TestCbamCatalogManager.sample.csar differ diff --git a/nokiav2/driverwar/pom.xml b/nokiav2/driverwar/pom.xml index cb434678..a9a5c13c 100644 --- a/nokiav2/driverwar/pom.xml +++ b/nokiav2/driverwar/pom.xml @@ -23,11 +23,9 @@ vfc/nfvo/driver/vnfm/svnfm/nokiav2/driverwar svnfm vnfm driver - org.springframework.boot - spring-boot-starter-parent - 1.5.9.RELEASE - - + org.onap.vfc.nfvo.driver.vnfm.svnfm.nokiav2 + vfc-nfvo-driver-vnfm-svnfm-nokiav2 + 1.1.0-SNAPSHOT UTF-8 @@ -43,15 +41,28 @@ org.springframework.boot spring-boot-starter-web - 1.5.9.RELEASE + 1.5.10.RELEASE + + org.apache.maven.plugins + maven-war-plugin + + false + + + org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.NokiaSvnfmApplication + true + + + + org.springframework.boot spring-boot-maven-plugin - 1.5.7.RELEASE + 1.5.10.RELEASE org.onap.vfc.nfvo.driver.vnfm.svnfm.nokia.NokiaSvnfmApplication ZIP -- cgit