summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xkubernetes/pomba/charts/pomba-contextaggregator/values.yaml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties13
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml2
-rw-r--r--kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml6
4 files changed, 18 insertions, 5 deletions
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
index 92d1b0d2a5..072357fddf 100755
--- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
+++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml
@@ -43,7 +43,7 @@ config:
networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder
networkdiscoveryCtxBuilderUsername: admin
networkdiscoveryCtxBuilderPassword: admin
- ctxBuilderExternalPort: 9350
+ ctxBuilderExternalPort: 9530
# default number of instances
replicaCount: 1
diff --git a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
index 9246aca537..c4c00d3509 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
+++ b/kubernetes/pomba/charts/pomba-networkdiscovery/resources/config/application.properties
@@ -46,3 +46,16 @@ 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
+# Mapping from Enricher Attribute name to POMBA Attribute name in the format
+# <Enricher Attribute Name>:<Pomba Attribute Name>; and separated by semicolon ";"
+# for example,
+# vserser-id:id;
+# means Attribute name "vserver-id" from Enricher will be converted to "id" in POMBA.
+enricher.attributeNameMappingList=Id:id;id:id;vserver-id:id;name:name;locked:inMaintenance; \
+ hostname:hostName;status:status;vm_state:vmState;vm-state:vmState;admin_state_up:adminState; \
+ favor.disk:flavorDisk;flavor.ephemeral:flavorEphemoral;flavor.extra_specs.hw.cpu_model:flavorHwCpuModel; \
+ flavor.extra_specs.hw.cpu_policy:flavorHwCpuPolicy;flavor.extra_specs.hw.mem_page_size:flavorHwMemPageSize; \
+ flavor.original_name:flavorOriginalName;flavor.ram:flavorRam;flavor.swap:flavorSwag;flavorvcpus:flavorVcpus; \
+ image.id:imageId;hostId:hostId;host:host;host_status:hostStatus;security_group.name:securityGroupName; \
+ serverName:serverName;metadata.myservername:otherServerName;shared:sharedNetwork;subnets:subnets; \
+ userId:userId;tenant_id:tenantId
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml
index b33093054a..79c5f0bfb3 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/logback.xml
@@ -1,6 +1,6 @@
<configuration scan="true" scanPeriod="10 seconds" debug="false">
<jmxConfigurator />
- <property resource="application.properties" />
+ <property file="/opt/app/config/application.properties" />
<property name="logDirectory" value="/var/log/onap/pomba-networkdiscoveryctxbuilder" />
<!-- Example evaluator filter applied against console appender -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml
index 2b9d290502..2394ef1960 100644
--- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml
+++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/values.yaml
@@ -35,7 +35,7 @@ debugEnabled: false
config:
# Network Discovery Context Builder REST Service
networkDiscoveryCtxBuilderHttpProtocol: http
- networkDiscoveryCtxBuilderPort: 8080
+ networkDiscoveryCtxBuilderPort: 9530
networkDiscoveryCtxBuilderUserId: admin
networkDiscoveryCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30
networkDiscoveryCtxBuilderResourceList: vnfcs,vservers,l3-networks
@@ -43,7 +43,7 @@ config:
# Service Decomposition REST Client Configuration
serviceDecompositionHttpProtocol: http
serviceDecompositionServiceName: pomba-servicedecomposition
- serviceDecompositionPort: 8080
+ serviceDecompositionPort: 9532
serviceDecompositionInstancePath: /service-decomposition/service/context
#Basic Authorization Client credentials for Service Decomposition REST service
serviceDecompositionUserId: admin
@@ -51,7 +51,7 @@ config:
# Network Discovery Micro Service REST Client Configuration
networkDiscoveryServiceName: pomba-networkdiscovery
- networkDiscoveryPort: 8080
+ networkDiscoveryPort: 9531
networkDiscoveryHttpProtocol: http
networkDiscoveryPath: /network-discovery/v1/network/resource
# Wait for Network Discovery MicroService response in milliseconds