Merge "Correct INFO.yaml to pass YAML Lint"

diff --git a/aai-traversal/appconfig/logback.xml b/aai-traversal/appconfig/logback.xml
index 31bfe10..57bb5f6 100644 (file)
--- a/aai-traversal/appconfig/logback.xml
+++ b/aai-traversal/appconfig/logback.xml
@@ -341,6 +341,16 @@
                        <pattern>"%d [%thread] %-5level %logger{1024} - %msg%n"</pattern>
                </encoder>
        </appender>
+       <appender name="miscLogs" class="ch.qos.logback.core.rolling.RollingFileAppender">
+                <file>${logDirectory}/misc/misc.log</file>
+                <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+                        <fileNamePattern>${logDirectory}/misc/misc.log.%d{yyyy-MM-dd}</fileNamePattern>
+                </rollingPolicy>
+                <encoder>
+                        <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n                                                              
+                        </pattern>
+               </encoder>
+        </appender>
        <logger name="AuditRecord" level="INFO" additivity="false">
                <appender-ref ref="auditLogs" />
        </logger>
@@ -350,6 +360,9 @@
        <logger name="PerfTrackerRecord" level="INFO" additivity="false">
                <appender-ref ref="perfLogs" />
        </logger>
+       <logger name="MiscRecord" level="INFO" additivity="false">
+                <appender-ref ref="miscLogs" />
+        </logger>
        <!-- logback jms appenders & loggers definition ends here -->
 
        <logger name="org.onap.aai.interceptors.post" level="DEBUG"

diff --git a/model-loader/appconfig/model-loader.properties b/model-loader/appconfig/model-loader.properties
index ee3ff7b..510cbe1 100644 (file)
--- a/model-loader/appconfig/model-loader.properties
+++ b/model-loader/appconfig/model-loader.properties
@@ -10,8 +10,8 @@ ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go
 ml.distribution.POLLING_INTERVAL=30\r
 ml.distribution.POLLING_TIMEOUT=20\r
 ml.distribution.USER=aai\r
-ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG\r
-ml.distribution.MSG_BUS_ADDRESSES=\r
+ml.distribution.ARTIFACT_TYPES=MODEL_QUERY_SPEC,TOSCA_CSAR\r
+ml.distribution.MSG_BUS_ADDRESSES=10.0.11.1\r
 \r
 # Model Loader AAI REST Client Configuration\r
 ml.aai.BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443\r
@@ -20,6 +20,9 @@ ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-q
 ml.aai.VNF_IMAGE_URL=/aai/v*/service-design-and-creation/vnf-images\r
 ml.aai.KEYSTORE_FILE=aai-os-cert.p12\r
 ml.aai.KEYSTORE_PASSWORD=OBF:1y0q1uvc1uum1uvg1pil1pjl1uuq1uvk1uuu1y10\r
+ml.aai.AUTH_USER=ModelLoader\r
+ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw\r
+\r
 \r
 # Model Loader Babel REST Client Configuration\r
 ml.babel.BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:9516\r