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>
---
 .../aai-spike/resources/config/spike-beans.xml     | 62 ----------------------
 1 file changed, 62 deletions(-)
 delete mode 100644 kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml

(limited to 'kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml')

diff --git a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml b/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
deleted file mode 100644
index 50be8cb0f8..0000000000
--- a/kubernetes/aai/charts/aai-spike/resources/config/spike-beans.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<!--
-    ============LICENSE_START=======================================================
-    org.onap.aai
-    ================================================================================
-    Copyright © 2018 AT&T Intellectual Property. All rights reserved.
-    Copyright © 2018 Amdocs
-    ================================================================================
-    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.
-    ============LICENSE_END=========================================================
--->
-<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="eventConsumer" class="org.onap.aai.event.client.DMaaPEventConsumer">
-      <constructor-arg name="host" value="message-router.{{.Release.Namespace}}:{{.Values.event.port.dmaap}}" />
-      <constructor-arg name="topic" value="{{.Values.event.consumer.topic}}" />
-      <constructor-arg name="username" value="" />
-      <constructor-arg name="password" value="" />
-      <constructor-arg name="consumerGroup" value="spike" />
-      <constructor-arg name="consumerId" value="spike" />
-      <constructor-arg name="timeoutMs" value="1000" />
-      <constructor-arg name="messageLimit" value="100" />
-      <constructor-arg name="transportType" value="HTTPAUTH" />
-      <constructor-arg name="protocol" value="{{.Values.event.protocol}}" />
-      <constructor-arg name="filter"><null /></constructor-arg>
-   </bean>
-
-    <bean id="eventPublisher" 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>
-
-   <bean id="spikeService" class="org.onap.aai.spike.service.SpikeService" init-method="startup">
-      <constructor-arg ref="eventConsumer" />
-      <constructor-arg ref="eventPublisher" />
-   </bean>
-
-</beans>
-- 
cgit 1.2.3-korg