From daf0dfe8308a259d168734d3fe98212cadad1a9e Mon Sep 17 00:00:00 2001
From: priyanshu <pagarwal@amdocs.com>
Date: Mon, 28 May 2018 15:29:26 +0300
Subject: Activity Spec docker enhancements

Activity Spec Changes for docker in Kubernetes

Change-Id: I987fe097792ccd5d41a0ad811602dad72259d45f
Issue-ID: SDC-1048
Signed-off-by: priyanshu <pagarwal@amdocs.com>
---
 .../activity-spec-assembly/configuration.yaml      |   9 --
 .../activity-spec-assembly/logback.xml             | 173 ---------------------
 .../activity-spec-assembly/start.sh                |  11 --
 3 files changed, 193 deletions(-)
 delete mode 100644 services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml
 delete mode 100644 services/activity-spec/activity-spec-web/activity-spec-assembly/logback.xml
 delete mode 100644 services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh

(limited to 'services/activity-spec/activity-spec-web/activity-spec-assembly')

diff --git a/services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml b/services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml
deleted file mode 100644
index cc54430ba3..0000000000
--- a/services/activity-spec/activity-spec-web/activity-spec-assembly/configuration.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-cassandraConfig:
-    cassandraHosts: ['CASSANDRA_HOST']
-    reconnectTimeout : 30000
-    authenticate: false
-    username: asdc_user
-    password: Aa1234%^!
-    ssl: false
-    truststorePath : /path/path
-    truststorePassword : Aa123456
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/activity-spec-assembly/logback.xml b/services/activity-spec/activity-spec-web/activity-spec-assembly/logback.xml
deleted file mode 100644
index 949510aac9..0000000000
--- a/services/activity-spec/activity-spec-web/activity-spec-assembly/logback.xml
+++ /dev/null
@@ -1,173 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
-  ~ Copyright © 2016-2018 European Support Limited
-  ~
-  ~ 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="5 seconds">
-    <property scope="system" name="ONAP-component-name" value="activity-spec" />
-	  <property scope="system" name="ONAP-subcomponent-name" value="be" />
-    <property name="log.home" value="/var/log/ONAP" />
-    <property name="log.location" value="${log.home}/${ONAP-component-name}/${ONAP-subcomponent-name}"/>
-
-    <!-- Error log -->
-    <appender name="ERROR" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <file>${log.location}/error.log</file>
-
-        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
-            <level>INFO</level>
-        </filter>
-
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                <marker>AUDIT</marker>
-            </evaluator>
-            <onMismatch>NEUTRAL</onMismatch>
-            <onMatch>DENY</onMatch>
-        </filter>
-
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                <marker>METRICS</marker>
-            </evaluator>
-            <onMismatch>NEUTRAL</onMismatch>
-            <onMatch>DENY</onMatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${log.location}/error.log.%i
-            </fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>10</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy
-          class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>20MB</maxFileSize>
-        </triggeringPolicy>
-
-        <encoder>
-            <pattern>
-                %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%level||%X{ErrorCode}|%X{ErrorDescription}|%msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-
-    <appender name="DEBUG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <file>${log.location}/debug.log</file>
-
-        <filter class="ch.qos.logback.classic.filter.LevelFilter">
-            <level>DEBUG</level>
-            <onMatch>ACCEPT</onMatch>
-            <onMismatch>DENY</onMismatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${log.location}/debug.log.%i
-            </fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>10</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy
-          class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>20MB</maxFileSize>
-        </triggeringPolicy>
-
-        <encoder>
-            <pattern>
-                %d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <!-- Asynchronicity Configurations -->
-    <appender name="ASYNC_DEBUG" class="ch.qos.logback.classic.AsyncAppender">
-        <appender-ref ref="DEBUG" />
-    </appender>
-
-    <appender name="AUDIT" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <file>${log.location}/audit.log</file>
-
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                <marker>AUDIT</marker>
-            </evaluator>
-            <onMismatch>DENY</onMismatch>
-            <onMatch>ACCEPT</onMatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${log.location}/audit.log.%i
-            </fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>10</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy
-          class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>20MB</maxFileSize>
-        </triggeringPolicy>
-
-        <encoder>
-            <pattern>
-                %X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceId}|%level||%X{ServerIpAddress}|%X{ElapsedTime}|%X{Server}|%X{ClientIpAddress}||||||||%msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <appender name="METRICS" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <file>${log.location}/metrics.log</file>
-
-        <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-            <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                <marker>METRICS</marker>
-            </evaluator>
-            <onMismatch>DENY</onMismatch>
-            <onMatch>ACCEPT</onMatch>
-        </filter>
-
-        <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-            <fileNamePattern>${log.location}/metrics.log.%i
-            </fileNamePattern>
-            <minIndex>1</minIndex>
-            <maxIndex>10</maxIndex>
-        </rollingPolicy>
-
-        <triggeringPolicy
-          class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-            <maxFileSize>20MB</maxFileSize>
-        </triggeringPolicy>
-
-        <encoder>
-            <pattern>
-                %X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread||%X{ServiceName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceId}|%level||%X{ServerIpAddress}|%X{ElapsedTime}|%X{Server}|%X{ClientIpAddress}||||||||||%msg%n
-            </pattern>
-        </encoder>
-    </appender>
-
-    <root level="INFO">
-        <appender-ref ref="ERROR"/>
-        <appender-ref ref="ASYNC_DEBUG"/>
-        <appender-ref ref="AUDIT"/>
-        <appender-ref ref="METRICS"/>
-    </root>
-
-</configuration>
\ No newline at end of file
diff --git a/services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh b/services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh
deleted file mode 100644
index d4a02293d9..0000000000
--- a/services/activity-spec/activity-spec-web/activity-spec-assembly/start.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-if [[ -z "${CASSANDRA_HOST}" ]]; then
-	echo "CASSANDRA_HOST environment variable must be set"
-	exit 1
-fi
-
-#Replace 'CASSANDRA_HOST' in configuration.yaml with value of CASSANDRA_HOST environment variable
-sed -i "s/CASSANDRA_HOST/${CASSANDRA_HOST}/" configuration.yaml
-
-java -jar -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005 "$JETTY_HOME/start.jar" -Dconfiguration.yaml=configuration.yaml -Dlogback.configurationFile=${LOGBACK_FILE_DIR}/logback.xml
\ No newline at end of file
-- 
cgit 1.2.3-korg