aboutsummaryrefslogtreecommitdiffstats
path: root/bpmn/MSOInfrastructureBPMN/src/main/groovy
diff options
context:
space:
mode:
authorChuanyu Chen <chenchuanyu@huawei.com>2018-04-22 06:22:31 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-22 06:22:31 +0000
commitf39f72df5f0953cfb681c86767d4cee773938004 (patch)
tree6f1dfa996bafe538b199f8ce48aa2a4d82727759 /bpmn/MSOInfrastructureBPMN/src/main/groovy
parent54c41267ed3bf769b00875128fa5a9021411e1c1 (diff)
parentfaac8220ef71d68ac87706e521f11f445dcb2e4c (diff)
Merge "UpdateAAI lost serviceInstVersion and modeluuid"
Diffstat (limited to 'bpmn/MSOInfrastructureBPMN/src/main/groovy')
-rw-r--r--bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy20
1 files changed, 11 insertions, 9 deletions
diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
index 38fb22572d..f29db9252f 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoUpdateE2EServiceInstance.groovy
@@ -126,7 +126,11 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
// user params
String uuiRequest = execution.getVariable("uuiRequest")
- utils.log("INFO","uuiRequest: " + uuiRequest, isDebugEnabled)
+ // target model uuid
+ String modelUuid = jsonUtil.getJsonValue(uuiRequest, "service.serviceUuid")
+ execution.setVariable("modelUuid", modelUuid)
+
+ utils.log("INFO","modelUuid: " + modelUuid, isDebugEnabled)
} catch (BpmnError e) {
throw e;
@@ -204,13 +208,11 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
execution.setVariable("operationType", "create")
- def hasResourcetoAdd = false
+ execution.setVariable("hasResourcetoAdd", false)
List<Resource> addResourceList = execution.getVariable("addResourceList")
if(addResourceList != null && !addResourceList.isEmpty()) {
- hasResourcetoAdd = true
+ execution.setVariable("hasResourcetoAdd", true)
}
- execution.setVariable("hasResourcetoAdd", hasResourcetoAdd)
-
utils.log("INFO"," *** Exit preProcessForAddResource *** ", isDebugEnabled)
}
@@ -230,12 +232,11 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
execution.setVariable("operationType", "delete")
- def hasResourcetoDelete = false
+ execution.setVariable("hasResourcetoDelete", false)
List<Resource> delResourceList = execution.getVariable("delResourceList")
if(delResourceList != null && !delResourceList.isEmpty()) {
- hasResourcetoDelete = true
- }
- execution.setVariable("hasResourcetoDelete", hasResourcetoDelete)
+ execution.setVariable("hasResourcetoDelete", true)
+ }
execution.setVariable("resourceInstanceIDs", execution.getVariable("serviceRelationShip"))
@@ -317,6 +318,7 @@ public class DoUpdateE2EServiceInstance extends AbstractServiceTaskProcessor {
String namespace = aaiUriUtil.getNamespaceFromUri(aai_uri)
utils.log("INFO","namespace: " + namespace, isDebugEnabled)
+ //update target model to aai
String serviceInstanceData =
"""<service-instance xmlns=\"${namespace}\">
<model-version-id">${modelUuid}</model-version-id>
n { color: #008800; font-weight: bold } /* Keyword.Namespace */ .highlight .kp { color: #008800 } /* Keyword.Pseudo */ .highlight .kr { color: #008800; font-weight: bold } /* Keyword.Reserved */ .highlight .kt { color: #888888; font-weight: bold } /* Keyword.Type */ .highlight .m { color: #0000DD; font-weight: bold } /* Literal.Number */ .highlight .s { color: #dd2200; background-color: #fff0f0 } /* Literal.String */ .highlight .na { color: #336699 } /* Name.Attribute */ .highlight .nb { color: #003388 } /* Name.Builtin */ .highlight .nc { color: #bb0066; font-weight: bold } /* Name.Class */ .highlight .no { color: #003366; font-weight: bold } /* Name.Constant */ .highlight .nd { color: #555555 } /* Name.Decorator */ .highlight .ne { color: #bb0066; font-weight: bold } /* Name.Exception */ .highlight .nf { color: #0066bb; font-weight: bold } /* Name.Function */ .highlight .nl { color: #336699; font-style: italic } /* Name.Label */ .highlight .nn { color: #bb0066; font-weight: bold } /* Name.Namespace */ .highlight .py { color: #336699; font-weight: bold } /* Name.Property */ .highlight .nt { color: #bb0066; font-weight: bold } /* Name.Tag */ .highlight .nv { color: #336699 } /* Name.Variable */ .highlight .ow { color: #008800 } /* Operator.Word */ .highlight .w { color: #bbbbbb } /* Text.Whitespace */ .highlight .mb { color: #0000DD; font-weight: bold } /* Literal.Number.Bin */ .highlight .mf { color: #0000DD; font-weight: bold } /* Literal.Number.Float */ .highlight .mh { color: #0000DD; font-weight: bold } /* Literal.Number.Hex */ .highlight .mi { color: #0000DD; font-weight: bold } /* Literal.Number.Integer */ .highlight .mo { color: #0000DD; font-weight: bold } /* Literal.Number.Oct */ .highlight .sa { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Affix */ .highlight .sb { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Backtick */ .highlight .sc { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Char */ .highlight .dl { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Delimiter */ .highlight .sd { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Doc */ .highlight .s2 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Double */ .highlight .se { color: #0044dd; background-color: #fff0f0 } /* Literal.String.Escape */ .highlight .sh { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Heredoc */ .highlight .si { color: #3333bb; background-color: #fff0f0 } /* Literal.String.Interpol */ .highlight .sx { color: #22bb22; background-color: #f0fff0 } /* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */
<!--

    ============LICENSE_START=======================================================
    org.onap.aai
    ================================================================================
    Copyright © 2017 AT&T Intellectual Property. All rights reserved.
    ================================================================================
    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=========================================================

    ECOMP is a trademark and service mark of AT&T Intellectual Property.

-->
<configuration scan="true" scanPeriod="60 seconds" debug="false">
    <statusListener class="ch.qos.logback.core.status.NopStatusListener"/>

    <property resource="application.properties"/>

    <property name="namespace" value="aai-schema-service"/>

    <property name="AJSC_HOME" value="${AJSC_HOME:-.}"/>
    <property name="logDirectory" value="${AJSC_HOME}/logs"/>
    <property name="eelfLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
    <property name="eelfAuditLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
    <property name="eelfMetricLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{targetVirtualEntity}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
    <!--  <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n|\r\n', '^'}|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/> -->
    <property name="eelfErrorLogPattern" value="%ecompStartTime|%X{requestId}|%-10t|%ecompServiceName|%X{partnerName}|%X{targetEntity}|%X{targetServiceName}|%ecompErrorCategory|%ecompResponseCode|%ecompResponseDescription|co=%X{component}:%replace(%replace(%m){'\\|', '!'}){'\r|\n', '^'}%n"/>
    <property name="eelfTransLogPattern" value="%ecompStartTime|%date{yyyy-MM-dd'T'HH:mm:ss.SSSZ, UTC}|%X{requestId}|%X{serviceInstanceId}|%-10t|%X{serverName}|%ecompServiceName|%X{partnerName}|%ecompStatusCode|%X{responseCode}|%replace(%replace(%X{responseDescription}){'\\|', '!'}){'\r|\n', '^'}|%X{instanceUUID}|%level|%X{severity}|%X{serverIpAddress}|%ecompElapsedTime|%X{server}|%X{clientIpAddress}|%eelfClassOfCaller|%X{unused}|%X{processKey}|%X{customField1}|%X{customField2}|%X{customField3}|%X{customField4}|co=%X{partnerName}:%m%n"/>

    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter"/>
    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter"/>
    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter"/>
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
            <pattern>
                %clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}
            </pattern>
        </encoder>
    </appender>

    <appender name="SANE" class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${logDirectory}/rest/sane.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/rest/sane.log.%d{yyyy-MM-dd}</fileNamePattern>
        </rollingPolicy>
        <encoder>
            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{1024} - %msg%n
            </pattern>
        </encoder>
    </appender>

    <appender name="asyncSANE" class="ch.qos.logback.classic.AsyncAppender">
        <queueSize>1000</queueSize>
        <includeCallerData>true</includeCallerData>
        <appender-ref ref="SANE"/>
    </appender>

    <appender name="METRIC"
              class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>INFO</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
        <file>${logDirectory}/rest/metrics.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/rest/metrics.log.%d{yyyy-MM-dd}
            </fileNamePattern>
        </rollingPolicy>
        <encoder class="org.onap.aai.logging.EcompEncoder">
            <pattern>${eelfMetricLogPattern}</pattern>
        </encoder>
    </appender>
    <appender name="asyncMETRIC" class="ch.qos.logback.classic.AsyncAppender">
        <queueSize>1000</queueSize>
        <includeCallerData>true</includeCallerData>
        <appender-ref ref="METRIC"/>
    </appender>

    <appender name="DEBUG"
              class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>DEBUG</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
        <file>${logDirectory}/rest/debug.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/rest/debug.log.%d{yyyy-MM-dd}
            </fileNamePattern>
        </rollingPolicy>
        <encoder class="org.onap.aai.logging.EcompEncoder">
            <pattern>${eelfLogPattern}</pattern>
        </encoder>
    </appender>

    <appender name="asyncDEBUG" class="ch.qos.logback.classic.AsyncAppender">
        <queueSize>1000</queueSize>
        <includeCallerData>true</includeCallerData>
        <appender-ref ref="DEBUG"/>
    </appender>

    <appender name="ERROR"
              class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>WARN</level>
        </filter>
        <file>${logDirectory}/rest/error.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/rest/error.log.%d{yyyy-MM-dd}
            </fileNamePattern>
        </rollingPolicy>
        <encoder class="org.onap.aai.logging.EcompEncoder">
            <pattern>${eelfErrorLogPattern}</pattern>
        </encoder>
    </appender>

    <appender name="asyncERROR" class="ch.qos.logback.classic.AsyncAppender">
        <queueSize>1000</queueSize>
        <includeCallerData>true</includeCallerData>
        <appender-ref ref="ERROR"/>
    </appender>

    <appender name="AUDIT"
              class="ch.qos.logback.core.rolling.RollingFileAppender">
        <file>${logDirectory}/rest/audit.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/rest/audit.log.%d{yyyy-MM-dd}
            </fileNamePattern>
        </rollingPolicy>
        <encoder class="org.onap.aai.logging.EcompEncoder">
            <pattern>${eelfAuditLogPattern}</pattern>
        </encoder>
    </appender>

    <appender name="asyncAUDIT" class="ch.qos.logback.classic.AsyncAppender">
        <queueSize>1000</queueSize>
        <includeCallerData>true</includeCallerData>
        <appender-ref ref="AUDIT"/>
    </appender>

    <appender name="translog"
              class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.LevelFilter">
            <level>DEBUG</level>
            <onMatch>ACCEPT</onMatch>
            <onMismatch>DENY</onMismatch>
        </filter>
        <file>${logDirectory}/rest/translog.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/rest/translog.log.%d{yyyy-MM-dd}
            </fileNamePattern>
        </rollingPolicy>
        <encoder class="org.onap.aai.logging.EcompEncoder">
            <pattern>${eelfTransLogPattern}</pattern>
        </encoder>
    </appender>

    <appender name="asynctranslog" class="ch.qos.logback.classic.AsyncAppender">
        <queueSize>1000</queueSize>
        <includeCallerData>true</includeCallerData>
        <appender-ref ref="translog"/>
    </appender>

    <appender name="external"
              class="ch.qos.logback.core.rolling.RollingFileAppender">
        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
            <level>WARN</level>
        </filter>
        <file>${logDirectory}/external/external.log</file>
        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
            <fileNamePattern>${logDirectory}/external/external.log.%d{yyyy-MM-dd}
            </fileNamePattern>
        </rollingPolicy>
        <encoder class="org.onap.aai.logging.EcompEncoder">
            <pattern>${eelfLogPattern}</pattern>
        </encoder>
    </appender>
    <logger name="org.onap.aai" level="DEBUG" additivity="false">
        <appender-ref ref="asyncDEBUG"/>
        <appender-ref ref="asyncERROR"/>
        <appender-ref ref="asyncMETRIC"/>
        <appender-ref ref="asyncSANE"/>
        <appender-ref ref="STDOUT"/>
    </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"/>
    <logger name="com.jayway.jsonpath" level="WARN"/>

    <!-- AJSC related loggers (DME2 Registration, csi logging, restlet, servlet
        logging) -->
    <logger name="org.codehaus.groovy" level="WARN"/>
    <logger name="com.netflix.loadbalancer" level="WARN"/>

    <logger name="org.apache.zookeeper" level="OFF"/>

    <!-- Other Loggers that may help troubleshoot -->
    <logger name="net.sf" 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"/>

    <logger name="org.hibernate.validator" level="WARN"/>
    <logger name="org.hibernate" level="WARN"/>
    <logger name="org.hibernate.ejb" level="OFF"/>

    <!-- logback internals logging -->
    <logger name="ch.qos.logback.classic" level="WARN"/>
    <logger name="ch.qos.logback.core" level="WARN"/>

    <logger name="org.eclipse.jetty" level="WARN"/>

    <logger name="org.onap.aai.schemaservice.interceptors.post" level="DEBUG"
            additivity="false">
        <appender-ref ref="asynctranslog"/>
    </logger>

    <logger name="org.onap.aai.schemaservice.interceptors.pre.SetLoggingContext" level="DEBUG">
        <appender-ref ref="asyncAUDIT"/>
    </logger>

    <logger name="org.onap.aai.schemaservice.interceptors.post.ResetLoggingContext" level="DEBUG">
        <appender-ref ref="asyncAUDIT"/>
    </logger>

    <logger name="org.apache" level="OFF"/>
    <logger name="org.zookeeper" level="OFF"/>
    <logger name="org.janusgraph" level="WARN"/>
    <logger name="com.att.aft.dme2" level="WARN"/>

    <!-- ============================================================================ -->
    <!-- General EELF logger -->
    <!-- ============================================================================ -->
    <logger name="com.att.eelf" level="WARN" additivity="false">
        <appender-ref ref="asyncDEBUG"/>
        <appender-ref ref="asyncERROR"/>
        <appender-ref ref="asyncMETRIC"/>
    </logger>

    <root level="DEBUG">
        <appender-ref ref="external"/>
        <appender-ref ref="STDOUT"/>
    </root>
</configuration>