summaryrefslogtreecommitdiffstats
path: root/pomba
diff options
context:
space:
mode:
Diffstat (limited to 'pomba')
-rw-r--r--pomba/network-discovery/config/application.properties7
-rw-r--r--pomba/network-discovery/config/auth/enricher-client-cert.p12bin2605 -> 0 bytes
-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
-rw-r--r--pomba/service-decomposition/config/application.properties5
-rw-r--r--pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java15
7 files changed, 5 insertions, 30 deletions
diff --git a/pomba/network-discovery/config/application.properties b/pomba/network-discovery/config/application.properties
index 563f726..6dba59d 100644
--- a/pomba/network-discovery/config/application.properties
+++ b/pomba/network-discovery/config/application.properties
@@ -22,13 +22,6 @@ server.context_parameters.p-name=value #context parameter with p-name as key and
basicAuth.username=admin
basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
-# A&AI Enircher REST Client Configuration
-enricher.url=https://d2enrichment:9505
-enricher.connectionTimeout=5000
-enricher.readTimeout=60000
-enricher.keyStorePath=config/auth/enricher-client-cert.p12
-enricher.keyStorePassword=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-
enricher.types = vserver, l3-network
enricher.type.vserver.url = /enricher/v11/cloud-infrastructure/vservers/vserver/{0}?sot=!aai
enricher.type.l3-network.url = /enricher/v11/network/l3-networks/l3-network/{0}?sot=!aai
diff --git a/pomba/network-discovery/config/auth/enricher-client-cert.p12 b/pomba/network-discovery/config/auth/enricher-client-cert.p12
deleted file mode 100644
index 12e0ae9..0000000
--- a/pomba/network-discovery/config/auth/enricher-client-cert.p12
+++ /dev/null
Binary files differ
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
diff --git a/pomba/service-decomposition/config/application.properties b/pomba/service-decomposition/config/application.properties
index 3c7a37d..fbe20ee 100644
--- a/pomba/service-decomposition/config/application.properties
+++ b/pomba/service-decomposition/config/application.properties
@@ -22,11 +22,6 @@ basicAuth.password=OBF:1u2a1toa1w8v1tok1u30
aai.host=135.63.125.59
aai.port=8443
aai.httpProtocol=http
-aai.trustStorePath=tomcat_keystore
-aai.keyStorePath=aai-client-cert.p12
-aai.keyStorePassword=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-aai.keyManagerFactoryAlgorithm=SunX509
-aai.keyStoreType=PKCS12
aai.securityProtocol=TLS
aai.connectionTimeout=5000
aai.readTimeout=1000
diff --git a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java
index ba0b730..41451a1 100644
--- a/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java
+++ b/pomba/service-decomposition/src/main/java/org/onap/sdnc/apps/pomba/servicedecomposition/AAIConfiguration.java
@@ -33,21 +33,6 @@ public class AAIConfiguration {
@Value("${aai.httpProtocol}")
private String httpProtocol;
- @Value("${aai.trustStorePath}")
- private String trustStorePath;
-
- @Value("${aai.keyStorePath}")
- private String keyStorePath;
-
- @Value("${aai.keyStorePassword}")
- private String keyStorePassword;
-
- @Value("${aai.keyManagerFactoryAlgorithm}")
- private String keyManagerFactoryAlgorithm;
-
- @Value("${aai.keyStoreType}")
- private String keyStoreType;
-
@Value("${aai.securityProtocol}")
private String securityProtocol;