summaryrefslogtreecommitdiffstats
path: root/pomba/network-discovery/src
diff options
context:
space:
mode:
authorTait,Trevor(rt0435) <rtait@amdocs.com>2018-09-18 13:43:20 -0400
committerTait,Trevor(rt0435) <rtait@amdocs.com>2018-09-18 13:43:55 -0400
commit01f3ecda24e893d5799c382f1daaccf439eb745b (patch)
treeb1a266245d14b6bd955a8f00f34cb3461749acf9 /pomba/network-discovery/src
parent940b4b29e875133cabdb4a805a1ac72ec29a9e8d (diff)
Remove credentials data
Issue-ID: SDNC-458 Service Decomposition and Network Discovery Microservice have sensitive keystore/certificate/password data in their configuration files that needs to be removed. In order for Network Discovery Microservice JUNIT to execute a dummy Enricher REST client client-cert-onap.p12 was added to src/test/resources. This is the ONAP certificate that will be used when the ONAP Enricher is available, then it will be copied to config/auth. Change-Id: I3aac665815757f9a31bbe0b4020f44cd3fe1eb12 Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>
Diffstat (limited to 'pomba/network-discovery/src')
-rw-r--r--pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/EnricherConfiguration.java6
-rw-r--r--pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java2
-rw-r--r--pomba/network-discovery/src/test/resources/client-cert-onap.p12bin0 -> 2556 bytes
3 files changed, 5 insertions, 3 deletions
diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/EnricherConfiguration.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/EnricherConfiguration.java
index 9d28322..62ea3f7 100644
--- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/EnricherConfiguration.java
+++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/EnricherConfiguration.java
@@ -33,13 +33,13 @@ public class EnricherConfiguration {
@Autowired
private Environment env;
- @Value("${enricher.url}")
+ @Value("${enricher.url:https://localhost:9505}")
private String url;
- @Value("${enricher.keyStorePath}")
+ @Value("${enricher.keyStorePath:config/auth/client-cert-onap.p12}")
private String keyStorePath;
- @Value("${enricher.keyStorePassword:OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o}")
+ @Value("${enricher.keyStorePassword:OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10}")
private String keyStorePassword;
@Value("${enricher.connectionTimeout:5000}")
diff --git a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java
index 943bf7d..1829e6e 100644
--- a/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java
+++ b/pomba/network-discovery/src/test/java/org/onap/sdnc/apps/pomba/networkdiscovery/unittest/service/NetworkDiscoveryTest.java
@@ -74,6 +74,8 @@ import org.springframework.test.context.web.WebAppConfiguration;
@WebAppConfiguration
@SpringBootTest
@TestPropertySource(properties = { "enricher.url=http://localhost:9505",
+ "enricher.keyStorePath=src/test/resources/client-cert-onap.p12",
+ "enricher.keyStorePassword=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10",
"basicAuth.username=admin",
"basicAuth.password=OBF:1u2a1toa1w8v1tok1u30" })
public class NetworkDiscoveryTest {
diff --git a/pomba/network-discovery/src/test/resources/client-cert-onap.p12 b/pomba/network-discovery/src/test/resources/client-cert-onap.p12
new file mode 100644
index 0000000..dbf4fca
--- /dev/null
+++ b/pomba/network-discovery/src/test/resources/client-cert-onap.p12
Binary files differ