Fix test-config for DR, Champ, and Gizmo

Issue-ID: AAI-1457

Change-Id: Iac4482831b4694e261d3bbf5562046d10d2d2224
Signed-off-by: sblimkie <steven.blimkie@amdocs.com>

11 files changed, 218 insertions, 12 deletions

diff --git a/champ-service/dynamic/conf/champ-beans.xml b/champ-service/dynamic/conf/champ-beans.xml
index 8abe258..c694694 100644
--- a/champ-service/dynamic/conf/champ-beans.xml
+++ b/champ-service/dynamic/conf/champ-beans.xml
@@ -51,7 +51,7 @@
 
     <!-- Janus Implementation -->
     <bean id="graphBuilder" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl$Builder">
-        <constructor-arg value="<%= @CHAMP_GRAPH_NAME %>"/>
+        <constructor-arg value="aaigraph"/>
         <constructor-arg ref="props"/>
     </bean>
     <bean id="graphImpl" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl">
@@ -77,4 +77,4 @@
         <constructor-arg name="champDataService" ref="champDataService"/>
         <constructor-arg name="champAsyncRequestProcessor" ref="champAsyncRequestProcessor"/>
     </bean>
-</beans>
\ No newline at end of file
+</beans>
diff --git a/champ-service/logging/logback.xml b/champ-service/logging/logback.xml
new file mode 100644
index 0000000..e2da8bc
--- /dev/null
+++ b/champ-service/logging/logback.xml
@@ -0,0 +1,179 @@
+<configuration scan="true" scanPeriod="3 seconds" debug="true">
+  <!-- Service-specific properties -->
+  <property name="componentName" value="AAI-CHAMP" />
+
+  <!-- directory path for logs -->
+  <property name="logDir" value="/var/log/onap" />
+  <property name="logDirectory" value="${logDir}/${componentName}" />
+    
+  <!--  default eelf log file names -->
+  <property name="generalLogName" value="error" />
+  <property name="metricsLogName" value="metrics" />
+  <property name="auditLogName" value="audit" />
+  <property name="debugLogName" value="debug" />
+    
+  <property name="errorLogPattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%mdc{RequestId}|%thread|Champ|%mdc{PartnerName}|%logger||%.-5level|%msg%n" />
+  <property name="auditMetricPattern" value="%m%n" />
+      
+  <!-- Example evaluator filter applied against console appender -->
+  <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
+    </encoder>
+  </appender>
+
+  <!-- ============================================================================ -->
+  <!-- EELF Appenders -->
+  <!-- ============================================================================ -->
+  
+  <appender name="EELF"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${generalLogName}.log</file>
+    <rollingPolicy
+        class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${generalLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELF" class="ch.qos.logback.classic.AsyncAppender">
+    <!-- deny all events with a level below INFO, that is TRACE and DEBUG -->
+    <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+      <level>INFO</level>
+    </filter>
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELF" />
+  </appender>
+
+  
+  <appender name="EELFAudit"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${auditLogName}.log</file>
+    <rollingPolicy
+        class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditMetricPattern}</pattern>
+    </encoder>
+  </appender>
+  <appender name="asyncEELFAudit" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFAudit" />
+  </appender>
+  
+  <appender name="EELFMetrics"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${metricsLogName}.log</file>
+    <rollingPolicy
+        class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${metricsLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${auditMetricPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  
+  <appender name="asyncEELFMetrics" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFMetrics"/>
+  </appender>
+  
+  <appender name="EELFDebug"
+            class="ch.qos.logback.core.rolling.RollingFileAppender">
+    <file>${logDirectory}/${debugLogName}.log</file>
+    <rollingPolicy
+        class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+      <fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.log.zip
+      </fileNamePattern>
+      <maxHistory>60</maxHistory>
+    </rollingPolicy>
+    <encoder>
+      <pattern>${errorLogPattern}</pattern>
+    </encoder>
+  </appender>
+  
+  <appender name="asyncEELFDebug" class="ch.qos.logback.classic.AsyncAppender">
+    <queueSize>256</queueSize>
+    <appender-ref ref="EELFDebug" />
+    <includeCallerData>false</includeCallerData>
+  </appender>
+  
+  
+  <!-- ============================================================================ -->
+  <!--  EELF loggers -->
+  <!-- ============================================================================ -->
+  <logger name="com.att.eelf" level="info" additivity="false">
+    <appender-ref ref="asyncEELF" />
+    <appender-ref ref="asyncEELFDebug" />
+  </logger>
+
+  <logger name="com.att.eelf.audit" level="info" additivity="false">
+    <appender-ref ref="asyncEELFAudit" />
+  </logger>
+  
+  <logger name="com.att.eelf.metrics" level="info" additivity="false">
+    <appender-ref ref="asyncEELFMetrics" />
+  </logger>
+  
+  <!-- Spring related loggers -->
+  <logger name="org.springframework" level="WARN" />
+  <logger name="org.springframework.beans" level="WARN" />
+  <logger name="org.springframework.web" level="WARN" />
+  <logger name="com.blog.spring.jms" level="WARN" />
+
+  <!-- AJSC Services (bootstrap services) -->
+  <logger name="ajsc" level="WARN" />
+  <logger name="ajsc.RouteMgmtService" level="WARN" />
+  <logger name="ajsc.ComputeService" level="WARN" />
+  <logger name="ajsc.VandelayService" level="WARN" />
+  <logger name="ajsc.FilePersistenceService" level="WARN" />
+  <logger name="ajsc.UserDefinedJarService" level="WARN" />
+  <logger name="ajsc.UserDefinedBeansDefService" level="WARN" />
+  <logger name="ajsc.LoggingConfigurationService" level="WARN" />
+  
+  <!-- AJSC related loggers -->
+  <logger name="ajsc.restlet" level="WARN" />
+  <logger name="ajsc.servlet" level="WARN" />
+  
+  <!-- General loggers -->
+  <logger name="com.att" level="INFO" />
+  <logger name="org.onap" level="INFO" />
+  <logger name="org.openecomp" level="INFO" />
+
+  <!-- Other Loggers that may help troubleshoot -->
+  <logger name="net.sf" level="WARN" />
+  <logger name="org.apache.commons.httpclient" level="WARN" />
+  <logger name="org.apache.commons" level="WARN" />
+  <logger name="org.apache.coyote" level="WARN" />
+  <logger name="org.apache.jasper" level="WARN" />
+
+  <!-- Camel Related Loggers (including restlet/servlet/jaxrs/cxf logging. 
+       May aid in troubleshooting) -->
+  <logger name="org.apache.camel" level="WARN" />
+  <logger name="org.apache.cxf" level="WARN" />
+  <logger name="org.apache.camel.processor.interceptor" level="WARN" />
+  <logger name="org.apache.cxf.jaxrs.interceptor" level="WARN" />
+  <logger name="org.apache.cxf.service" level="WARN" />
+  <logger name="org.restlet" level="WARN" />
+  <logger name="org.apache.camel.component.restlet" level="WARN" />
+
+  <!-- logback internals logging -->
+  <logger name="ch.qos.logback.classic" level="WARN" />
+  <logger name="ch.qos.logback.core" level="WARN" />
+
+  <root>
+    <appender-ref ref="asyncEELF" /> 
+    <!-- <appender-ref ref="asyncEELFDebug" /> -->
+  </root>
+  
+</configuration>
+
diff --git a/crud-service/appconfig/model/edge_properties_v10.json b/crud-service/appconfig/model/edge_properties_v10.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v10.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/appconfig/model/edge_properties_v13.json b/crud-service/appconfig/model/edge_properties_v13.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v13.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/appconfig/model/edge_properties_v7.json b/crud-service/appconfig/model/edge_properties_v7.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v7.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/appconfig/model/edge_properties_v8.json b/crud-service/appconfig/model/edge_properties_v8.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v8.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/appconfig/model/edge_properties_v9.json b/crud-service/appconfig/model/edge_properties_v9.json
new file mode 100644
index 0000000..8d00636
--- /dev/null
+++ b/crud-service/appconfig/model/edge_properties_v9.json
@@ -0,0 +1,6 @@
+{
+        "contains-other-v": "java.lang.String",
+        "delete-other-v": "java.lang.String",
+        "SVC-INFRA": "java.lang.String",
+        "prevent-delete": "java.lang.String"
+}
\ No newline at end of file
diff --git a/crud-service/appconfig/schemaIngest.properties b/crud-service/appconfig/schemaIngest.properties
new file mode 100644
index 0000000..716545c
--- /dev/null
+++ b/crud-service/appconfig/schemaIngest.properties
@@ -0,0 +1,5 @@
+schemaConfig=NA
+nodeDir=/opt/app/crud-api/bundleconfig/etc/oxm
+edgeDir=/opt/app/crud-api/bundleconfig/etc/dbedgerules
+edgePropsDir=/opt/app/crud-service/config/model
+
diff --git a/data-router/dynamic/conf/entity-event-policy.xml b/data-router/dynamic/conf/entity-event-policy.xml
index ccd6648..37bc21a 100755
--- a/data-router/dynamic/conf/entity-event-policy.xml
+++ b/data-router/dynamic/conf/entity-event-policy.xml
@@ -21,13 +21,4 @@
   <bean id="entityEventPolicy" class="org.onap.aai.datarouter.policy.EntityEventPolicy" init-method="startup" >
     <constructor-arg ref="eepConfig"/>
   </bean>
-  
-  <bean id="consumerBean" class="org.onap.aai.event.client.DMaaPEventConsumer" >
-    <constructor-arg name="host" value="mr.api.simpledemo.openecomp.org:3904" />
-    <constructor-arg name="topic" value="AAI-EVENT" />
-    <constructor-arg name="username" value="test" />
-    <constructor-arg name="password" value="test" />
-    <constructor-arg name="consumerGroup" value="datarouter" />
-    <constructor-arg name="consumerId" value="datarouter" />
-  </bean>
 </beans>
diff --git a/data-router/dynamic/routes/entity-event.route b/data-router/dynamic/routes/entity-event.route
index a7b38e3..7d2de39 100755
--- a/data-router/dynamic/routes/entity-event.route
+++ b/data-router/dynamic/routes/entity-event.route
@@ -1,4 +1,4 @@
 <route xmlns="http://camel.apache.org/schema/spring" trace="true">
-  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;consumer=#consumerBean"/>
+  <from uri="event-bus:mybus/?eventTopic=AAI-EVENT&amp;groupName=datarouter&amp;groupId=datarouter&amp;url=http://mr.api.simpledemo.openecomp.org:3904"/>
   <to uri="bean:entityEventPolicy?method=process"/>
 </route>
diff --git a/docker-compose-app.yml b/docker-compose-app.yml
index cd26407..102469b 100644
--- a/docker-compose-app.yml
+++ b/docker-compose-app.yml
@@ -168,6 +168,7 @@ services:
     hostname: champ-service
     volumes:
       - ${CHAMP_LOGS}:/logs
+      - /opt/test-config/champ-service/logging/logback.xml:/opt/app/champ-service/bundleconfig/etc/logback.xml
       - /opt/test-config/champ-service/appconfig:/opt/app/champ-service/config
       - /opt/test-config/champ-service/dynamic:/opt/app/champ-service/dynamic
     ports: