diff options
| author |   Denes Nemeth <denes.nemeth@nokia.com> | 2018-09-18 09:04:50 +0200 |
|---|---|---|
| committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-10-19 11:49:07 +0200 |
| commit | c47f40b7c53cd564a401ecf7f56c8fc21dd47738 (patch) | |
| tree | 69ed1ac2f123e314d54af035fa962aac7eab8055 /nokiav2/driver/src | |
| parent | 9ad9dd37710f457614ccc060c6263a5919a6489b (diff) | |
Fix driver startup in OOM
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-1159
Change-Id: Ibefd567b0f29d84e5d3c5f7cfd7dd5f77fb4dc2b
Diffstat (limited to 'nokiav2/driver/src')
3 files changed, 13 insertions, 5 deletions
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 ## |