From c47f40b7c53cd564a401ecf7f56c8fc21dd47738 Mon Sep 17 00:00:00 2001 From: Denes Nemeth Date: Tue, 18 Sep 2018 09:04:50 +0200 Subject: Fix driver startup in OOM Signed-off-by: Denes Nemeth Issue-ID: VFC-1159 Change-Id: Ibefd567b0f29d84e5d3c5f7cfd7dd5f77fb4dc2b --- nokiav2/deployment/src/main/resources/application.properties | 7 ++++++- nokiav2/deployment/src/main/resources/docker-entrypoint.sh | 1 + .../vnfm/svnfm/nokia/onap/core/SelfRegistrationManager.java | 2 +- nokiav2/driver/src/test/resources/application-direct.properties | 8 ++++++-- nokiav2/driver/src/test/resources/application.properties | 8 ++++++-- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/nokiav2/deployment/src/main/resources/application.properties b/nokiav2/deployment/src/main/resources/application.properties index 299213d4..85da61f1 100644 --- a/nokiav2/deployment/src/main/resources/application.properties +++ b/nokiav2/deployment/src/main/resources/application.properties @@ -37,6 +37,8 @@ vnfmId=5e65fe25-bdad-46dc-bba8-b7878fcee264 ############################################################################### # The TCP port of the server server.port=8089 +# The port on which the service is visible from external systems +externalPort=8089 # the base path of the server server.context-path= # the IP address to which the erver binds to @@ -52,7 +54,10 @@ skipCertificateVerification=true # the collection of trusted certificates for SSL on CBAM LCN, LCM and authorization interface # in PEM format encoded in BASE64 to a single line trustedCertificates= - +#skip LCN subscription from VNFM +skipLcnSubscription=false +#skip self registration in MSB +skipSelfRegistration=false ############################################################################### # Configuration parameters for direct integration ############################################################################### diff --git a/nokiav2/deployment/src/main/resources/docker-entrypoint.sh b/nokiav2/deployment/src/main/resources/docker-entrypoint.sh index 79ccd05b..20fa5a5e 100755 --- a/nokiav2/deployment/src/main/resources/docker-entrypoint.sh +++ b/nokiav2/deployment/src/main/resources/docker-entrypoint.sh @@ -50,6 +50,7 @@ function configure(){ if [ ! -z "$CONFIGURE" ] ; then switchLine driverMsbExternalIp $EXTERNAL_IP switchLine driverVnfmExternalIp $EXTERNAL_IP + switchLine externalPort $EXTERNAL_PORT switchLine messageBusIp $MSB_IP switchLine vnfmId $VNFM_ID switchLine ipMap $IP_MAP diff --git a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/SelfRegistrationManager.java b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/SelfRegistrationManager.java index 1319405e..6b713872 100644 --- a/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/SelfRegistrationManager.java +++ b/nokiav2/driver/src/main/java/org/onap/vfc/nfvo/driver/vnfm/svnfm/nokia/onap/core/SelfRegistrationManager.java @@ -57,7 +57,7 @@ public class SelfRegistrationManager { private String driverMsbExternalIp; @Value("${driverVnfmExternalIp}") private String driverVnfmExternalIp; - @Value("${server.port}") + @Value("${externalPort}") private String driverPort; @Value("${skipLcnSubscription}") private boolean skipLcnSubscription; diff --git a/nokiav2/driver/src/test/resources/application-direct.properties b/nokiav2/driver/src/test/resources/application-direct.properties index 9134f642..32afbc23 100644 --- a/nokiav2/driver/src/test/resources/application-direct.properties +++ b/nokiav2/driver/src/test/resources/application-direct.properties @@ -19,6 +19,8 @@ server.error.whitelabel.enabled=false ############################################################################### # The TCP port of the server server.port=8089 +# The port on which the service is visible from external systems +externalPort=8089 # the base path of the server server.servlet.context-path= # the IP address to which the server binds to @@ -40,6 +42,10 @@ skipCertificateVerification=true trustedCertificates= # the identifier of the VNFM in A&AI core system registry vnfmId=7c267318-2a6a-4d47-b039-a7cce5fea38b +#skip LCN subscription from VNFM +skipLcnSubscription=false +#skip self registration in MSB +skipSelfRegistration=false ############################################################################### # Configuration parameters for direct integration ############################################################################### @@ -61,8 +67,6 @@ sdcPassword=SDC ############################################################################### # End of mandatory properties for driver # ############################################################################### -skipLcnSubscription=true -skipSelfRegistration=true ipMap=10.0.14.1->msb.api.simpledemo.onap.org,172.17.0.15->msb.api.simpledemo.onap.org,10.0.1.1->aai.api.simpledemo.onap.org vnfmInfoCacheEvictionInMs=600000 ## for logging begin ## diff --git a/nokiav2/driver/src/test/resources/application.properties b/nokiav2/driver/src/test/resources/application.properties index 29da7577..afa307c7 100644 --- a/nokiav2/driver/src/test/resources/application.properties +++ b/nokiav2/driver/src/test/resources/application.properties @@ -19,6 +19,8 @@ server.error.whitelabel.enabled=false ############################################################################### # The TCP port of the server server.port=8089 +# The port on which the service is visible from external systems +externalPort=8089 # the base path of the server server.servlet.context-path= # the IP address to which the server binds to @@ -40,6 +42,10 @@ skipCertificateVerification=true trustedCertificates= # the identifier of the VNFM in A&AI core system registry vnfmId=53fbba58-464e-4cc4-8d33-aaaf072f0a27 +#skip LCN subscription from VNFM +skipLcnSubscription=false +#skip self registration in MSB +skipSelfRegistration=false ############################################################################### # Configuration parameters for direct integration ############################################################################### @@ -61,8 +67,6 @@ sdcPassword=SDC ############################################################################### # End of mandatory properties for driver # ############################################################################### -skipLcnSubscription=false -skipSelfRegistration=false spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.security.oauth2.OAuth2AutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration vnfmInfoCacheEvictionInMs=600000 ## for logging begin ## -- cgit 1.2.3-korg