diff options
author | Tait,Trevor(rt0435) <rtait@amdocs.com> | 2018-10-26 13:27:54 -0400 |
---|---|---|
committer | Leigh, Phillip (pl876u) <phillip.leigh@amdocs.com> | 2018-10-26 15:28:46 -0400 |
commit | f6a725a0b5b6864c09443e7f328927772a78ea05 (patch) | |
tree | 9a7aec7d4a93059e28ea1b15eee2576f1ad87c5a /src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java | |
parent | b5f75d3996fbfd270e301abbe38766a9f6cf3a40 (diff) |
SDNC context builder API Mapping Configuration
Issue-ID: LOG-421
Add code to use the VNF-API on SDNC where required.
This involves using the api-mapping logic to select the VNF-API over the
GNERIC-RESOURCES-API as well as adding the code to extract the
information required by the VNF-API from AAI and adding the code to
parse the VNF-API resonse into ModelContext.
Change-Id: I4447a14d7fa39b2c5d9b655c2b20e651e56d3d77
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>
Diffstat (limited to 'src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java')
-rw-r--r-- | src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java | 21 |
1 files changed, 19 insertions, 2 deletions
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java b/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java index 71c3502..7180c0b 100644 --- a/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java +++ b/src/main/java/org/onap/pomba/contextbuilder/sdnc/SdncConfiguration.java @@ -21,10 +21,10 @@ package org.onap.pomba.contextbuilder.sdnc; import java.util.Base64; import javax.ws.rs.ApplicationPath; import org.eclipse.jetty.util.security.Password; +import org.onap.aai.restclient.client.RestClient; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.stereotype.Component; -import org.onap.aai.restclient.client.RestClient; @Component @ApplicationPath("/") @@ -54,16 +54,24 @@ public class SdncConfiguration { @Value("${sdnc.genericResourcePath}") private String genericResourcePath; + @Value("${sdnc.vnfPath}") + private String vnfPath; + @Bean(name="sdncBaseUrl") public String getURL() { return httpProtocol + "://" + serviceName + ":" + servicePort; } @Bean(name="sdncGenericResourcePath") - public String getgenericResourcePath() { + public String getGenericResourcePath() { return genericResourcePath; } + @Bean(name="sdncVnfPath") + public String getVnfPath() { + return vnfPath; + } + @Bean(name = "sdncBasicAuthorization") public String getSdncBasicAuth() { String auth = this.user + ":"+ Password.deobfuscate(this.password); @@ -98,6 +106,10 @@ public class SdncConfiguration { @Value("${aai.customerQuery}") private String aaiCustomerQuery; + @Value("${aai.serviceInstancePath}") + private String serviceInstancePath; + + @Bean(name="aaiHttpBasicAuthorization") public String getHttpBasicAuth() { String auth = new String(this.aaiHttpUserId + ":" + Password.deobfuscate(this.aaiHttpPassword)); @@ -138,4 +150,9 @@ public class SdncConfiguration { return aaiCustomerQuery.trim(); } + @Bean(name="aaiServiceInstancePath") + public String getserviceInstancePathL() { + return serviceInstancePath; + } + } |