Merge "Add missing parameters"

2 files changed, 177 insertions, 109 deletions

diff --git a/kubernetes/clamp/resources/config/logback.xml b/kubernetes/clamp/resources/config/logback.xml
index 03551fe241..551ed34ee4 100644
--- a/kubernetes/clamp/resources/config/logback.xml
+++ b/kubernetes/clamp/resources/config/logback.xml
@@ -17,66 +17,97 @@
 <included>
 	<jmxConfigurator />
 	<!-- Example evaluator filter applied against console appender -->
-<property name="p_tim" value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}"/>
-		<property name="p_lvl" value="%level"/>
-		<property name="p_log" value="%logger"/>
-		<property name="p_mdc" value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}"/>
-		<property name="p_msg" value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-		<property name="p_exc" value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-		<property name="p_mak" value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}"/>
-		<property name="p_thr" value="%thread"/>
-		<property name="defaultPattern" value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n"/>
-		<property name="debugPattern" value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|${p_exc}|%msg%n"/>
+	<property
+		name="p_tim"
+		value="%d{&quot;yyyy-MM-dd'T'HH:mm:ss.SSSXXX&quot;, UTC}" />
+	<property
+		name="p_lvl"
+		value="%level" />
+	<property
+		name="p_log"
+		value="%logger" />
+	<property
+		name="p_mdc"
+		value="%replace(%replace(%mdc){'\t','\\\\t'}){'\n', '\\\\n'}" />
+	<property
+		name="p_msg"
+		value="%replace(%replace(%msg){'\t', '\\\\t'}){'\n','\\\\n'}" />
+	<property
+		name="p_exc"
+		value="%replace(%replace(%rootException){'\t', '\\\\t'}){'\n','\\\\n'}" />
+	<property
+		name="p_mak"
+		value="%replace(%replace(%marker){'\t', '\\\\t'}){'\n','\\\\n'}" />
+	<property
+		name="p_thr"
+		value="%thread" />
+	<property
+		name="defaultPattern"
+		value="%nopexception${p_tim}\t${p_thr}\t${p_lvl}\t${p_log}\t${p_mdc}\t${p_msg}\t${p_exc}\t${p_mak}\t%n" />
+	<property
+		name="debugPattern"
+		value="%nopexception${p_tim}|${p_lvl}|${p_mdc}|${p_exc}|%msg%n" />
 
-		<!-- Example evaluator filter applied against console appender -->
-		<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-						<level>INFO</level>
-				</filter>
-				<encoder>
-					<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n</pattern>
-				</encoder>
-		</appender>
+	<!-- Example evaluator filter applied against console appender -->
+	<appender
+		name="STDOUT"
+		class="ch.qos.logback.core.ConsoleAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+			</pattern>
+		</encoder>
+	</appender>
 
-		<appender name="ERROR"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-						<level>INFO</level>
-				</filter>
-				<file>${logDirectory}/error2.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>${defaultPattern}</pattern>
-				</encoder>
-				<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-					<fileNamePattern>${outputDirectory}/clamp/error.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
-					<maxFileSize>50MB</maxFileSize>
-					<maxHistory>30</maxHistory>
-					<totalSizeCap>10GB</totalSizeCap>
-				</rollingPolicy>
-				<triggeringPolicy
-						class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-						<maxFileSize>10MB</maxFileSize>
-				</triggeringPolicy>
-		</appender>
+	<appender
+		name="ERROR"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+			<level>INFO</level>
+		</filter>
+		<file>${logDirectory}/error.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>${defaultPattern}</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${outputDirectory}/clamp/error.%d{yyyy-MM-dd}.%i.log.zip
+			</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+			<totalSizeCap>10GB</totalSizeCap>
+		</rollingPolicy>
+		<triggeringPolicy
+			class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+			<maxFileSize>10MB</maxFileSize>
+		</triggeringPolicy>
+	</appender>
 
-		<appender name="DEBUG"
-				class="ch.qos.logback.core.rolling.RollingFileAppender">
-				<file>${logDirectory}/debug.log</file>
-				<append>true</append>
-				<encoder>
-						<pattern>${debugPattern}</pattern>
-				</encoder>
-				<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-					<fileNamePattern>${outputDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip</fileNamePattern>
-					<maxFileSize>50MB</maxFileSize>
-					<maxHistory>30</maxHistory>
-					<totalSizeCap>10GB</totalSizeCap>
-				</rollingPolicy>
-		</appender>
+	<appender
+		name="DEBUG"
+		class="ch.qos.logback.core.rolling.RollingFileAppender">
+		<file>${logDirectory}/debug.log</file>
+		<append>true</append>
+		<encoder>
+			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
+			</pattern>
+		</encoder>
+		<rollingPolicy
+			class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+			<fileNamePattern>${outputDirectory}/clamp/debug.%d{yyyy-MM-dd}.%i.log.zip
+			</fileNamePattern>
+			<maxFileSize>50MB</maxFileSize>
+			<maxHistory>30</maxHistory>
+			<totalSizeCap>10GB</totalSizeCap>
+		</rollingPolicy>
+	</appender>
 
 
-	<appender name="AUDIT"
+	<appender
+		name="AUDIT"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${logDirectory}/audit.log</file>
 		<append>true</append>
@@ -95,13 +126,15 @@
 			<maxFileSize>10MB</maxFileSize>
 		</triggeringPolicy>
 	</appender>
-	<appender name="asyncEELFAudit"
+	<appender
+		name="asyncEELFAudit"
 		class="ch.qos.logback.classic.AsyncAppender">
 		<queueSize>256</queueSize>
 		<appender-ref ref="AUDIT" />
 	</appender>
 
-	<appender name="METRIC"
+	<appender
+		name="METRIC"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${logDirectory}/metric.log</file>
 		<append>true</append>
@@ -120,14 +153,16 @@
 			<maxFileSize>10MB</maxFileSize>
 		</triggeringPolicy>
 	</appender>
-	<appender name="asyncEELFMetrics"
+	<appender
+		name="asyncEELFMetrics"
 		class="ch.qos.logback.classic.AsyncAppender">
 		<queueSize>256</queueSize>
 		<appender-ref ref="METRIC" />
 	</appender>
 
 	<!-- SECURITY related loggers -->
-	<appender name="SECURITY"
+	<appender
+		name="SECURITY"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<file>${logDirectory}/security.log</file>
 		<append>true</append>
@@ -146,55 +181,15 @@
 			<maxFileSize>10MB</maxFileSize>
 		</triggeringPolicy>
 	</appender>
-	<appender name="asyncEELFSecurity"
+	<appender
+		name="asyncEELFSecurity"
 		class="ch.qos.logback.classic.AsyncAppender">
 		<queueSize>256</queueSize>
 		<appender-ref ref="SECURITY" />
 	</appender>
-	<!-- AAF related loggers -->
-	<logger name="org.onap.aaf" level="INFO" additivity="true">
-		<appender-ref ref="DEBUG" />
-	</logger>
-	<logger name="org.apache.catalina.core" level="INFO"
-		additivity="true">
-		<appender-ref ref="DEBUG" />
-	</logger>
-	<!-- CLDS related loggers -->
-	<logger name="org.onap.clamp.clds" level="INFO"
-		additivity="true">
-		<appender-ref ref="ERROR" />
-	</logger>
-
-	<!-- CLDS related loggers -->
-	<logger name="com.att.eelf.error" level="OFF" additivity="true">
-		<appender-ref ref="ERROR" />
-	</logger>
-	<!-- EELF related loggers -->
-	<logger name="com.att.eelf.audit" level="INFO"
-		additivity="false">
-		<appender-ref ref="asyncEELFAudit" />
-	</logger>
-	<logger name="com.att.eelf.metrics" level="DEBUG"
-		additivity="false">
-		<appender-ref ref="asyncEELFMetrics" />
-	</logger>
-	<logger name="com.att.eelf.security" level="DEBUG"
-		additivity="false">
-		<appender-ref ref="asyncEELFSecurity" />
-	</logger>
-
-	<!-- Spring related loggers -->
-	<logger name="org.springframework" level="DEBUG" />
-
-	<!-- Other Loggers that may help troubleshoot -->
-	<logger name="org.apache" level="DEBUG" />
-
-	<!-- logback internals logging -->
-	<logger name="ch.qos.logback.classic" level="INFO" />
-	<logger name="ch.qos.logback.core" level="INFO" />
-
 	<!-- logback jms appenders & loggers definition starts here -->
-	<appender name="auditLogs"
+	<appender
+		name="auditLogs"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 		</filter>
@@ -214,7 +209,8 @@
 			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
 		</encoder>
 	</appender>
-	<appender name="perfLogs"
+	<appender
+		name="perfLogs"
 		class="ch.qos.logback.core.rolling.RollingFileAppender">
 		<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
 		</filter>
@@ -234,14 +230,81 @@
 			<pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
 		</encoder>
 	</appender>
-	<logger name="AuditRecord" level="INFO" additivity="FALSE">
+
+	<logger
+		name="org.onap.aaf"
+		level="DEBUG">
+		<appender-ref ref="DEBUG" />
+	</logger>
+	<logger
+		name="org.apache"
+		level="DEBUG">
+		<appender-ref ref="DEBUG" />
+	</logger>
+	<!-- Spring related loggers -->
+	<logger
+		name="org.springframework"
+		level="DEBUG">
+		<appender-ref ref="DEBUG" />
+	</logger>
+
+	<!-- CLDS related loggers -->
+	<logger
+		name="org.onap.clamp"
+		level="DEBUG">
+		<appender-ref ref="ERROR" />
+		<appender-ref ref="DEBUG" />
+	</logger>
+
+	<!-- CLDS related loggers -->
+	<logger
+		name="com.att.eelf.error"
+		level="OFF">
+		<appender-ref ref="ERROR" />
+	</logger>
+	<!-- EELF related loggers -->
+	<logger
+		name="com.att.eelf.audit"
+		level="INFO"
+		additivity="false">
+		<appender-ref ref="asyncEELFAudit" />
+	</logger>
+	<logger
+		name="com.att.eelf.metrics"
+		level="DEBUG"
+		additivity="false">
+		<appender-ref ref="asyncEELFMetrics" />
+	</logger>
+	<logger
+		name="com.att.eelf.security"
+		level="DEBUG"
+		additivity="false">
+		<appender-ref ref="asyncEELFSecurity" />
+	</logger>
+
+	<!-- logback internals logging -->
+	<logger
+		name="ch.qos.logback.classic"
+		level="INFO" />
+	<logger
+		name="ch.qos.logback.core"
+		level="INFO" />
+	<logger
+		name="AuditRecord"
+		level="INFO"
+		additivity="false">
 		<appender-ref ref="auditLogs" />
 	</logger>
-	<logger name="AuditRecord_DirectCall" level="INFO"
-		additivity="FALSE">
+	<logger
+		name="AuditRecord_DirectCall"
+		level="INFO"
+		additivity="false">
 		<appender-ref ref="auditLogs" />
 	</logger>
-	<logger name="PerfTrackerRecord" level="INFO" additivity="FALSE">
+	<logger
+		name="PerfTrackerRecord"
+		level="INFO"
+		additivity="false">
 		<appender-ref ref="perfLogs" />
 	</logger>
 	<!-- logback jms appenders & loggers definition ends here -->
@@ -251,4 +314,3 @@
 		<appender-ref ref="STDOUT" />
 	</root>
 </included>
-
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 77dabccf70..9d5fb05daf 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -56,6 +56,12 @@ config:
         "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json",
         "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080",
         "clamp.config.dcae.dispatcher.url": "https://deployment-handler.{{ include "common.namespace" . }}:8443",
+        "clamp.config.policy.api.url": "http4://policy-api.{{ include "common.namespace" . }}:6969",
+        "clamp.config.policy.api.userName": "healthcheck",
+        "clamp.config.policy.api.password": "zb!XztG34",
+        "clamp.config.policy.pap.url": "http4://policy-pap.{{ include "common.namespace" . }}:6969",
+        "clamp.config.policy.pap.userName": "healthcheck",
+        "clamp.config.policy.pap.password": "zb!XztG34",
         "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
         "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:8081/pdp/ , testpdp, alpha123",
         "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:9091/pap/ , testpap, alpha123",