From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001
From: Michael Lando <ml636r@att.com>
Date: Sun, 29 Jul 2018 16:13:45 +0300
Subject: re base code

Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5
Issue-ID: SDC-1566
Signed-off-by: Michael Lando <ml636r@att.com>
---
 .../sdc-onboard-backend/attributes/default.rb      |  9 +++++
 .../recipes/ON_5_setup_configuration.rb            |  4 +--
 .../templates/default/configuration.yaml.erb       |  2 +-
 .../artifacts/logback.xml                          | 41 +++++++++++++---------
 4 files changed, 36 insertions(+), 20 deletions(-)

(limited to 'openecomp-be/dist')

diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb
index 47c3e2991a..cecc7ef5f4 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb
@@ -8,3 +8,12 @@ default['cassandra'][:truststore_password] = "Aa123456"
 default['jetty'][:keystore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok"
 default['jetty'][:keymanager_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok"
 default['jetty'][:truststore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok"
+default['VnfRepo']['vnfRepoPort'] = 8702
+default['VnfRepo']['vnfRepoHost'] = "192.168.50.5"
+
+#Cassandra
+default['cassandra']['datacenter_name'] = "DC-"
+default['cassandra']['cluster_name'] = "SDC-CS-"
+default['cassandra']['socket_read_timeout'] = 20000
+default['cassandra']['socket_connect_timeout'] = 20000
+default['cassandra']['titan_connection_timeout'] = 10000
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb
index 747c735b84..b729ae777c 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb
@@ -9,7 +9,7 @@ template "onboard-be-config" do
       :onboard_port           => node['ONBOARDING_BE'][:http_port],
       :ssl_port               => node['ONBOARDING_BE'][:https_port],
       :cassandra_ip           => node['Nodes']['CS'].join(",").gsub(/[|]/,''),
-      :DC_NAME                => node['cassandra'][:cluster_name]+node.chef_environment,
+      :DC_NAME                => node['cassandra']['datacenter_name']+node.chef_environment,
       :socket_connect_timeout => node['cassandra']['socket_connect_timeout'],
       :socket_read_timeout    => node['cassandra']['socket_read_timeout'],
       :cassandra_pwd          => node['cassandra'][:cassandra_password],
@@ -31,4 +31,4 @@ template "VnfrepoConfiguration" do
       :VNFREPO_IP   => node['VnfRepo']['vnfRepoHost'],
       :VNFREPO_PORT => node['VnfRepo']['vnfRepoPort']
    })
-end
\ No newline at end of file
+end
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb
index df1c7b516e..a2f0bbd3bf 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb
@@ -14,7 +14,7 @@ cassandraConfig:
     username: <%= @cassandra_usr %>
     password: <%= @cassandra_pwd %>
     ssl: <%= @cassandra_ssl_enabled %>
-    truststorePath: /config/truststore
+    truststorePath: /var/lib/jetty/etc/truststore
     truststorePassword: <%= @cassandra_truststore_password %>
 
 
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
index 0865b1b8c7..3ec6e45f3e 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/logback.xml
@@ -2,29 +2,36 @@
 <configuration scan="true" scanPeriod="5 seconds">
 
 	<property scope="system" name="ECOMP-component-name" value="SDC" />
-	<property scope="system" name="ECOMP-subcomponent-name" value="ONBOARD-BE" />
-	<property file="${config.home}/onboarding-be/configuration.yaml" />
-	<property scope="context" name="enable-all-log" value="false" />
+	<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="true" />
 
 	<!-- 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" />
+			  value="%date{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="auditLoggerPattern" value="%X{BeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}| ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+	<property name="error-log-pattern"
+			  value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%thread|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{ErrorCategory}|%X{ErrorCode}|%msg|%n" />
 
-	<property name="asdc-debug-log-pattern" value="%d{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg %n"/>
+	<property name="audit-log-pattern" value="%X{AuditBeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+
+	<property name="metric-log-pattern" value="%X{MetricBeginTimestamp}|%X{EndTimestamp}|%X{RequestId}|%X{ServiceInstanceId}|%thread|%X{VirtualServerName}|%X{ServiceName}|%X{PartnerName}|%X{TargetEntity}|%X{TargetServiceName}|%X{StatusCode}|%X{ResponseCode}|%X{ResponseDescription}|%X{InstanceUUID}|%.-5level|%X{AlertSeverity}|%X{ServerIPAddress}|%X{ElapsedTime}|%X{ServerFQDN}|%X{RemoteHost}|%X{ClassName}|%X{Unused}|%X{ProcessKey}|%X{CustomField1}|%X{CustomField2}|%X{CustomField3}|%X{CustomField4}|ActivityType=&lt;%M&gt;, Desc=&lt;%msg&gt;%n" />
+
+	<property name="debug-log-pattern" value="%date{yyyy-MM-dd'T'HH:mm:ss.SSSXXX}|%X{RequestId}|%msg|^\n%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>
+				<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>
+					<fileNamePattern>${log.home}/${ECOMP-component-name}/${ECOMP-subcomponent-name}/all.log.%i
+					</fileNamePattern>
 					<minIndex>1</minIndex>
 					<maxIndex>10</maxIndex>
 				</rollingPolicy>
@@ -37,7 +44,7 @@
 					<pattern>${default-log-pattern}</pattern>
 				</encoder>
 			</appender>
-			
+
 			<appender name="ASYNC_ALL" class="ch.qos.logback.classic.AsyncAppender">
 				<appender-ref ref="ALL_ROLLING" />
 			</appender>
@@ -85,7 +92,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${default-log-pattern}</pattern>
+			<pattern>${error-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -95,9 +102,9 @@
 		<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 
+		<!-- No need to deny audit messages - they are INFO only, will be denied
 			anyway -->
-		<!-- Transaction messages filter - deny Transaction messages, there are 
+		<!-- 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">
@@ -131,7 +138,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${default-log-pattern}</pattern>
+			<pattern>${debug-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -177,7 +184,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${asdc-debug-log-pattern}</pattern>
+			<pattern>${debug-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -210,7 +217,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${auditLoggerPattern}</pattern>
+			<pattern>${audit-log-pattern}</pattern>
 		</encoder>
 	</appender>
 	
@@ -242,7 +249,7 @@
 			<maxFileSize>20MB</maxFileSize>
 		</triggeringPolicy>
 		<encoder>
-			<pattern>${default-log-pattern}</pattern>
+			<pattern>${metric-log-pattern}</pattern>
 		</encoder>
 	</appender>
 
@@ -324,5 +331,5 @@
 		</if>
 	</root>
 
-	<logger name="org.openecomp.sdc" level="INFO" />
+	<logger name="org.openecomp.sdc" level="DEBUG" />
 </configuration>
\ No newline at end of file
-- 
cgit 1.2.3-korg