diff options
| -rw-r--r-- | .env | 1 | ||||
| -rw-r--r-- | src/main/java/org/onap/nbi/ServiceRegisterRunner.java | 5 | ||||
| -rw-r--r-- | src/main/resources/application.properties | 1 | ||||
| -rw-r--r-- | src/test/java/org/onap/nbi/apis/TestConfig.java | 29 | ||||
| -rw-r--r-- | src/test/resources/application.properties | 1 |
5 files changed, 8 insertions, 29 deletions
@@ -44,6 +44,7 @@ SO_HEADER_AUTHORIZATION= SO_API_ID=SO # MSB +MSB_ENABLED=true MSB_DISCOVERY_HOST=msb_discovery MSB_DISCOVERY_PORT=10081 MSB_SERVICE_HOST= diff --git a/src/main/java/org/onap/nbi/ServiceRegisterRunner.java b/src/main/java/org/onap/nbi/ServiceRegisterRunner.java index e8cca00..a30be98 100644 --- a/src/main/java/org/onap/nbi/ServiceRegisterRunner.java +++ b/src/main/java/org/onap/nbi/ServiceRegisterRunner.java @@ -37,6 +37,9 @@ import java.util.Set; public class ServiceRegisterRunner implements CommandLineRunner { private static final Logger logger = LoggerFactory.getLogger(ServiceRegisterRunner.class); + @Value("${msb.enabled}") + private boolean IS_ENABLED; + @Value("${msb.discovery.host}") private String DISCOVERY_HOST; @@ -72,6 +75,8 @@ public class ServiceRegisterRunner implements CommandLineRunner { @Override public void run(String... strings) throws Exception { + if (!IS_ENABLED) return; + MicroServiceInfo msinfo = new MicroServiceInfo(); msinfo.setServiceName(SERVICE_NAME); msinfo.setVersion(SERVICE_VERSION); diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index cc3a2b9..8c07ce0 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -50,6 +50,7 @@ so.owning.entity.name=OE-generic so.project.name=Project-generic # MSB +msb.enabled=true msb.discovery.host=msb_discovery msb.discovery.port=10081 msb.service.host= diff --git a/src/test/java/org/onap/nbi/apis/TestConfig.java b/src/test/java/org/onap/nbi/apis/TestConfig.java deleted file mode 100644 index a3afa1c..0000000 --- a/src/test/java/org/onap/nbi/apis/TestConfig.java +++ /dev/null @@ -1,29 +0,0 @@ -/** - * Copyright (c) 2018 Orange - * <p> - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * <p> - * http://www.apache.org/licenses/LICENSE-2.0 - * <p> - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.onap.nbi.apis; - -import org.onap.nbi.ServiceRegisterRunner; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.FilterType; - -@SpringBootApplication -// Exclude MSB register runner when running tests -@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = ServiceRegisterRunner.class)) -public class TestConfig { -} - diff --git a/src/test/resources/application.properties b/src/test/resources/application.properties index a297fbf..50e0527 100644 --- a/src/test/resources/application.properties +++ b/src/test/resources/application.properties @@ -50,6 +50,7 @@ so.owning.entity.name=OE-generic so.project.name=Project-generic # MSB +msb.enabled=false msb.discovery.host=msb_discovery msb.discovery.port=10081 msb.service.host= |