Webseal Simulator Default files refactoring

Change-Id: I3c71a49ed376bfaacf75aa81f5609b2e9f8cab34
Issue-ID: SDC-154
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

diff --git a/.gitignore b/.gitignore
index 46fad4b..5cf5bb2 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -158,3 +158,5 @@ common/openecomp-sdc-artifact-generator-lib/openecomp-sdc-artifact-generator-cor
 /sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/ecomp-error-configuration.yaml
 /sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/error-configuration.yaml
 /sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/files/default/logback.xml
+
+/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml

diff --git a/utils/webseal-simulator/pom.xml b/utils/webseal-simulator/pom.xml
index 443b967..7bee699 100644 (file)
--- a/utils/webseal-simulator/pom.xml
+++ b/utils/webseal-simulator/pom.xml
@@ -163,7 +163,6 @@
                                                                                <resource>
                                                                                        <directory>${basedir}/src/main/resources</directory>
                                                                                        <includes>
-                                                                                               <include>webseal.conf</include>
                                                                                                <include>logback.xml</include>
                                                                                        </includes>
                                                                                </resource>

diff --git a/utils/webseal-simulator/scripts/simulator_docker_run.sh b/utils/webseal-simulator/scripts/simulator_docker_run.sh
index bc8cdca..c7ded8d 100644 (file)
--- a/utils/webseal-simulator/scripts/simulator_docker_run.sh
+++ b/utils/webseal-simulator/scripts/simulator_docker_run.sh
@@ -71,7 +71,7 @@ echo "${PREFIX}"
 dir_perms
 
 # SDC-Simulator
-docker run --detach --name sdc-simulator --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 256m --memory-swap=256m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/WS/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 8285:8080 ${PREFIX}/sdc-simulator:${RELEASE}
+docker run --detach --name sdc-sim --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env http_proxy=${http_proxy} --env https_proxy=${https_proxy} --env no_proxy=${no_proxy} --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --memory 256m --memory-swap=256m --ulimit nofile=4096:100000 --volume /etc/localtime:/etc/localtime:ro --volume /data/logs/WS/:/var/lib/jetty/logs --volume /data/environments:/root/chef-solo/environments --publish 8285:8080 ${PREFIX}/sdc-simulator:${RELEASE}
 
 
 if [ $? -ne 0 ]; then

diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml
deleted file mode 100644 (file)
index ba16783..0000000
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/logback.xml
+++ /dev/null
@@ -1,328 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<configuration scan="true" scanPeriod="5 seconds">
-
-       <property scope="system" name="ECOMP-component-name" value="SDC" />
-       <property scope="system" name="ECOMP-subcomponent-name" value="SDC-BE" />
-       <property file="${config.home}/catalog-be/configuration.yaml" />
-       <property scope="context" name="enable-all-log" value="false" />
-
-       <!-- value used by pattern field list (| - is inter-field separator, || - unavailable or not applicable field value) (m - mandatory, o- optional)-->
-       <!--timestamp(m)| requestID(m)| serviceInstanceID(o)| threadID(m)| physicalServerName(o)| serviceName(m)| userID(m)| logLevel(m)| severity(o)| serverIpAddress(m)| serverName(m)| clientIpAddress(o)| className(m)| timer(o)| detailedMessage(o)-->
-       <property name="default-log-pattern"
-                         value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{BeginTimestamp}|%X{EndTimestamp}|%X{uuid}|%X{serviceInstanceID}|%thread|%X{ServerName}|%X{ServiceName}|${ECOMP-subcomponent-name}|%X{userId}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%level|%X{alarmSeverity}|%X{localAddr}|%X{ElapsedTime}|${beFqdn}|%X{remoteAddr}|%logger{35}|%X{timer}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
-
-       <property name="asdc-debug-log-pattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg %n"/>
-
-       <!-- All log -->
-       <if condition='property("enable-all-log").equalsIgnoreCase("true")'>
-               <then>
-                       <appender name="ALL_ROLLING"
-                               class="ch.qos.logback.core.rolling.RollingFileAppender">
-                               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log
-                               </file>
-
-                               <rollingPolicy
-                                       class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                                       <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i
-                                       </fileNamePattern>
-                                       <minIndex>1</minIndex>
-                                       <maxIndex>10</maxIndex>
-                               </rollingPolicy>
-
-                               <triggeringPolicy
-                                       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                                       <maxFileSize>20MB</maxFileSize>
-                               </triggeringPolicy>
-                               <encoder>
-                                       <pattern>${default-log-pattern}</pattern>
-                               </encoder>
-                       </appender>
-                       
-                       <appender name="ASYNC_ALL" class="ch.qos.logback.classic.AsyncAppender">
-                               <appender-ref ref="ALL_ROLLING" />
-                       </appender>
-               </then>
-       </if>
-
-       <!-- Error log -->
-       <appender name="ERROR_ROLLING"
-               class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/error.log
-               </file>
-
-               <!-- Audit messages filter - deny audit messages -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                               <marker>AUDIT_MARKER</marker>
-                       </evaluator>
-                       <onMismatch>NEUTRAL</onMismatch>
-                       <onMatch>DENY</onMatch>
-               </filter>
-
-               <!-- Transaction messages filter - deny Transaction messages -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                               <marker>TRANSACTION_MARKER</marker>
-                       </evaluator>
-                       <onMismatch>NEUTRAL</onMismatch>
-                       <onMatch>DENY</onMatch>
-               </filter>
-
-               <!-- 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>
-
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/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>${default-log-pattern}</pattern>
-               </encoder>
-       </appender>
-
-       <!-- Debug log -->
-       <appender name="DEBUG_ROLLING"
-               class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug.log
-               </file>
-
-               <!-- No need to deny audit messages - they are INFO only, will be denied 
-                       anyway -->
-               <!-- Transaction messages filter - deny Transaction messages, there are 
-                       some DEBUG level messages among them -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                               <marker>TRANSACTION_MARKER</marker>
-                       </evaluator>
-                       <onMismatch>NEUTRAL</onMismatch>
-                       <onMatch>DENY</onMatch>
-               </filter>
-
-               <!-- accept DEBUG and TRACE level -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                               <expression>
-                                       e.level.toInt() &lt;= DEBUG.toInt()
-                               </expression>
-                       </evaluator>
-                       <OnMismatch>DENY</OnMismatch>
-                       <!--<OnMatch>NEUTRAL</OnMatch>-->
-                       <OnMatch>ACCEPT</OnMatch>
-               </filter>
-
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/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>${default-log-pattern}</pattern>
-               </encoder>
-       </appender>
-
-
-       <!-- ASDC debug by package-->
-       <appender name="PACKAGE_DEBUG_ROLLING"
-                         class="ch.qos.logback.core.rolling.RollingFileAppender">
-               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug_by_package.log
-               </file>
-
-               <!-- No need to deny audit messages - they are INFO only, will be denied
-                       anyway -->
-               <!-- Transaction messages filter - deny Transaction messages, there are
-                       some DEBUG level messages among them -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                               <marker>TRANSACTION_MARKER</marker>
-                       </evaluator>
-                       <onMismatch>NEUTRAL</onMismatch>
-                       <onMatch>DENY</onMatch>
-               </filter>
-
-               <!-- accept DEBUG and TRACE level -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.GEventEvaluator">
-                               <expression>
-                                       e.level.toInt() &lt;= DEBUG.toInt()
-                               </expression>
-                       </evaluator>
-                       <OnMismatch>DENY</OnMismatch>
-                       <OnMatch>NEUTRAL</OnMatch>
-               </filter>
-
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/debug_by_package.log.%i
-                       </fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>10</maxIndex>
-               </rollingPolicy>
-
-               <triggeringPolicy
-                               class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>20MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>${asdc-debug-log-pattern}</pattern>
-               </encoder>
-       </appender>
-
-       <!-- Audit log -->
-       <appender name="AUDIT_ROLLING"
-               class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/audit.log
-               </file>
-
-               <!-- Audit messages filter - accept audit messages -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                               <marker>AUDIT_MARKER</marker>
-                               <marker>AUDIT</marker>
-                       </evaluator>
-                       <onMismatch>DENY</onMismatch>
-                       <onMatch>ACCEPT</onMatch>
-               </filter>
-
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/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>${default-log-pattern}</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Metrics log -->
-       <appender name="METRICS_ROLLING"
-               class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/metrics.log
-               </file>
-
-               <!-- Metric messages filter - accept metric messages -->
-               <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.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/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>${default-log-pattern}</pattern>
-               </encoder>
-       </appender>
-
-       <!-- SdncTransaction log -->
-       <appender name="TRANSACTION_ROLLING"
-               class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-               <file>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log
-               </file>
-
-               <!-- Transaction messages filter - accept audit messages -->
-               <filter class="ch.qos.logback.core.filter.EvaluatorFilter">
-                       <evaluator class="ch.qos.logback.classic.boolex.OnMarkerEvaluator">
-                               <marker>TRANSACTION_MARKER</marker>
-                       </evaluator>
-                       <onMismatch>DENY</onMismatch>
-                       <onMatch>ACCEPT</onMatch>
-               </filter>
-
-               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                       <fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/transaction.log.%i
-                       </fileNamePattern>
-                       <minIndex>1</minIndex>
-                       <maxIndex>10</maxIndex>
-               </rollingPolicy>
-
-               <triggeringPolicy
-                       class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                       <maxFileSize>20MB</maxFileSize>
-               </triggeringPolicy>
-               <encoder>
-                       <pattern>${default-log-pattern}</pattern>
-               </encoder>
-       </appender>
-       
-       <!-- Asynchronicity Configurations -->
-       <appender name="ASYNC_DEBUG" class="ch.qos.logback.classic.AsyncAppender">
-             <appender-ref ref="DEBUG_ROLLING" />
-       </appender>
-
-       <appender name="ASYNC_TRANSACTION" class="ch.qos.logback.classic.AsyncAppender">
-             <appender-ref ref="TRANSACTION_ROLLING" />
-       </appender>
-       
-       <appender name="ASYNC_ERROR" class="ch.qos.logback.classic.AsyncAppender">
-             <appender-ref ref="ERROR_ROLLING" />
-       </appender>
-
-       <!-- <appender name="DISPATCHER" class="ch.qos.logback.classic.sift.SiftingAppender">
-               <discriminator class="org.openecomp.core.logging.logback.EventTypeDiscriminator"/>
-               <sift>
-                       <appender name="Audit" class="ch.qos.logback.core.rolling.RollingFileAppender">
-                               <file>${logDirectory}/audit.log</file>
-                               <rollingPolicy class="ch.qos.logback.core.rolling.FixedWindowRollingPolicy">
-                                       <fileNamePattern>${logDirectory}/audit.%i.log.zip</fileNamePattern>
-                                       <minIndex>1</minIndex>
-                                       <maxIndex>9</maxIndex>
-                               </rollingPolicy>
-                               <triggeringPolicy class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
-                                       <maxFileSize>5MB</maxFileSize>
-                               </triggeringPolicy>
-                               <encoder>
-                                       <pattern>${default-log-pattern}</pattern>
-                               </encoder>
-                       </appender>
-               </sift>
-       </appender>-->
-
-       <root level="INFO">
-               <appender-ref ref="ASYNC_ERROR" />
-               <appender-ref ref="ASYNC_DEBUG" />
-               <appender-ref ref="AUDIT_ROLLING" />
-               <appender-ref ref="ASYNC_TRANSACTION" />
-               <appender-ref ref="METRICS_ROLLING" />
-               <if condition='property("enable-all-log").equalsIgnoreCase("true")'>
-                       <then>
-                               <appender-ref ref="ALL_ROLLING" />
-                       </then>
-               </if>
-       </root>
-
-       <logger name="org.openecomp.sdc" level="INFO" />
-</configuration>
\ No newline at end of file

diff --git a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/webseal.conf b/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/webseal.conf
deleted file mode 100644 (file)
index 25952fd..0000000
--- a/utils/webseal-simulator/sdc-simulator/chef-repo/cookbooks/sdc-simulator/files/default/webseal.conf
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-       webseal {
-               fe="http://10.0.2.15:8181"
-               users = [
-                       {
-                               userId="cs0008"
-                               password="123123a"
-                               firstName="Carlos"
-                               lastName="Santana"
-                               role="Designer"
-                               email="csantana@sdc.com"                        
-                       },              
-                       {
-                               userId="op0001"
-                               password="123123a"
-                               firstName="Aretha"
-                               lastName="Franklin"
-                               role="Ops"
-                               email="afranklin@sdc.com"                       
-                       },
-                       {
-                               userId="jh0003"
-                               password="123123a"
-                               firstName="Jimmy"
-                               lastName="Hendrix"
-                               role="Admin"
-                               email="admin@sdc.com"
-                       },
-                       {
-                               userId="jm0007"
-                               password="123123a"
-                               firstName="Johnny"
-                               lastName="Depp"
-                               role="Tester"
-                               email="tester@sdc.com"
-                       },
-                       {
-                               userId="gv0001"
-                               password="123123a"
-                               firstName="David"
-                               lastName="Shadmi"
-                               role="Governor"
-                               email="governor@sdc.com"
-                       }
-               ]
-       }
-       
-}
-

diff --git a/utils/webseal-simulator/src/main/resources/logback.xml b/utils/webseal-simulator/src/main/resources/logback.xml
index 58fab30..540645f 100644 (file)
--- a/utils/webseal-simulator/src/main/resources/logback.xml
+++ b/utils/webseal-simulator/src/main/resources/logback.xml
@@ -1,4 +1,3 @@
-<!-- only one line, shut up logback ! -->
 <configuration >
     <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
         <encoder>