From 81d5b97aee7376d0c6412817fa0a00eb000f96c9 Mon Sep 17 00:00:00 2001
From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Fri, 26 Apr 2019 12:09:50 -0700
Subject: AAI HELM code transfer

- Remove kubernetes/aai code from OOM.
- Add oom/aai as submodule of OOM in kubernetes/aai
location.

Change-Id: I7741a0cd4b0ecef174569c9450b09f2f7c211f44
Issue-ID: CIMAN-250
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
---
 .../config/appconfig/auth/champ_policy.json        |  19 ---
 .../config/appconfig/auth/tomcat_keystore          | Bin 3429 -> 0 bytes
 .../config/appconfig/champ-api.properties          |  20 ---
 .../resources/config/dynamic/conf/champ-beans.xml  |  84 ----------
 .../aai-champ/resources/config/log/logback.xml     | 176 ---------------------
 5 files changed, 299 deletions(-)
 delete mode 100644 kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json
 delete mode 100644 kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
 delete mode 100644 kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties
 delete mode 100644 kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
 delete mode 100644 kubernetes/aai/charts/aai-champ/resources/config/log/logback.xml

(limited to 'kubernetes/aai/charts/aai-champ/resources/config')

diff --git a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json
deleted file mode 100644
index a059e86260..0000000000
--- a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/champ_policy.json
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-	"roles": [
-		{
-			"name": "admin",
-			"functions": [
-				{
-					"name": "search", "methods": [ { "name": "GET" },{ "name": "DELETE" }, { "name": "PUT" }, { "name": "POST" } ]
-				}
-			],
-
-			"users": [
-				{
-					"username": "CN=ONAP, OU=ONAP, O=ONAP, L=Ottawa, ST=Ontario, C=CA"
-				}
-			]
-		}
-	]
-}
-
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore
deleted file mode 100644
index c4c72718ff..0000000000
Binary files a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/auth/tomcat_keystore and /dev/null differ
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties b/kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties
deleted file mode 100644
index 0aba7979ad..0000000000
--- a/kubernetes/aai/charts/aai-champ/resources/config/appconfig/champ-api.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-keyName=aai-uuid
-sourceOfTruthName=source-of-truth
-createdTsName=aai-created-ts
-lastModTsName=aai-last-mod-ts
-collectionPropertiesKey=properties
-
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml b/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
deleted file mode 100644
index 3977a68834..0000000000
--- a/kubernetes/aai/charts/aai-champ/resources/config/dynamic/conf/champ-beans.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<!--
-# Copyright © 2018 Amdocs, Bell Canada, AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
--->
-
-<beans xmlns="http://www.springframework.org/schema/beans"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-xmlns:util="http://www.springframework.org/schema/util"
-xsi:schemaLocation="
-       http://www.springframework.org/schema/beans
-       http://www.springframework.org/schema/beans/spring-beans.xsd
-       http://www.springframework.org/schema/util
-       http://www.springframework.org/schema/util/spring-util.xsd
-       ">
-
-    <bean id="champEventPublisher" class="org.onap.aai.event.client.DMaaPEventPublisher" >
-        <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:{{.Values.event.port.dmaap}}" />
-        <constructor-arg name="topic" value="{{.Values.event.publisher.topic}}" />
-        <constructor-arg name="username" value="" />
-        <constructor-arg name="password" value="" />
-        <constructor-arg name="maxBatchSize" value="100" />
-        <constructor-arg name="maxAgeMs" value="250" />
-        <constructor-arg name="delayBetweenBatchesMs" value="50" />
-        <constructor-arg name="transportType" value="HTTPAUTH" />
-        <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
-        <constructor-arg name="contentType" value="application/json" />
-    </bean>
-
-    <!-- Graph Implementation Configuration-->
-    <util:map id="props" map-class="java.util.HashMap" key-type="java.lang.String" value-type="java.lang.Object">
-        <entry key="champcore.event.stream.buffer.capacity" value="50" value-type="java.lang.Integer"/>
-        <entry key="champcore.event.stream.publisher-pool-size" value="10" value-type="java.lang.Integer"/>
-        <entry key="champcore.event.stream.publisher" value-ref="champEventPublisher"/>
-
-        <entry key="graph.name" value="aaigraph"/>
-        <entry key="storage.backend" value="cassandra"/>
-        <entry key="storage.cassandra.read-consistency-level" value="LOCAL_QUORUM"/>
-        <entry key="storage.cassandra.write-consistency-level" value="LOCAL_QUORUM"/>
-        <entry key="storage.cassandra.replication-factor" value="{{ .Values.global.cassandra.replicas }}"/>
-        <entry key="storage.cassandra.replication-strategy-class" value="org.apache.cassandra.locator.SimpleStrategy"/>
-        <entry key="storage.hostname" value="{{ .Values.global.cassandra.serviceName }}"/>
-    </util:map>
-
-    <!-- Janus Implementation -->
-    <bean id="graphBuilder" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl$Builder">
-        <constructor-arg value="aaigraph"/>
-        <constructor-arg ref="props" />
-    </bean>
-
-    <bean id="graphImpl" class="org.onap.aai.champjanus.graph.impl.JanusChampGraphImpl">
-        <constructor-arg ref="graphBuilder" />
-    </bean>
-
-    <bean id="champUUIDService" class="org.onap.champ.service.ChampUUIDService" >
-        <constructor-arg name="graphImpl" ref="graphImpl" />
-    </bean>
-
-    <bean id="cache" class="org.onap.champ.service.ChampTransactionCache" >
-        <constructor-arg name="txTimeOutInSec" value="600" />
-        <constructor-arg name="graphImpl" ref="graphImpl" />
-    </bean>
-
-    <bean id="champDataService" class="org.onap.champ.service.ChampDataService" >
-        <constructor-arg name="champUUIDService" ref="champUUIDService" />
-        <constructor-arg name="graphImpl" ref="graphImpl" />
-        <constructor-arg name="cache" ref="cache" />
-    </bean>
-
-    <bean id="champRestService" class="org.onap.champ.ChampRESTAPI" >
-        <constructor-arg name="champDataService" ref="champDataService" />
-        <constructor-arg name="champAsyncRequestProcessor"><null/></constructor-arg>
-    </bean>
-</beans>
diff --git a/kubernetes/aai/charts/aai-champ/resources/config/log/logback.xml b/kubernetes/aai/charts/aai-champ/resources/config/log/logback.xml
deleted file mode 100644
index 67f6ac34f1..0000000000
--- a/kubernetes/aai/charts/aai-champ/resources/config/log/logback.xml
+++ /dev/null
@@ -1,176 +0,0 @@
-<!--
-Copyright © 2018 Amdocs, AT&T
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
--->
-
-<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" />
-
-  <!-- General loggers -->
-  <logger name="org.onap" level="WARN" />
-
-  <!-- Other Loggers that may help troubleshoot -->
-  <logger name="net.sf" level="WARN" />
-  <logger name="org.apache" 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>
\ No newline at end of file
-- 
cgit 1.2.3-korg