diff options
author | 2021-01-13 10:28:31 -0500 | |
---|---|---|
committer | 2021-01-13 13:23:29 -0500 | |
commit | a040eac14a18d96df4dc4729df506ce993cad090 (patch) | |
tree | 2bb5f9903de6af51a8dac3201486493a59976694 | |
parent | baa1386596be363e7b15bccbe852dfe82119d551 (diff) |
Pushing v22 schema to onap
Making changes to DbEdgeRules_v22 and aai_oxm_v22 to update with approved changes
Issue-ID: AAI-3196
Change-Id: I1d896060abdd55fa315f4eb7e1589cbcbd2a5b67
Signed-off-by: Alpert, Matthew (ma1944) <ma1944@att.com>
-rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json | 524 | ||||
-rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml | 2598 |
2 files changed, 2959 insertions, 163 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json b/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json index 1e748e2..9018996 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v22/DbEdgeRules_v22.json @@ -938,6 +938,18 @@ }, { "from": "service-instance", + "to": "l3-network", + "label": "org.onap.relationships.inventory.ComposedOf", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, + { + "from": "service-instance", "to": "p-interface", "label": "org.onap.relationships.inventory.ComposedOf", "direction": "OUT", @@ -1922,7 +1934,7 @@ "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description": "" + "description":"service-instance BelongsTo service-subscription" }, { "from": "class-of-service", @@ -2787,8 +2799,8 @@ "prevent-delete": "NONE", "default": "true", "description": "" - }, - { + }, + { "from": "allotted-resource", "to": "model-ver", "label": "org.onap.relationships.inventory.IsA", @@ -2799,8 +2811,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "!${direction}", "private": "true" - }, - { + }, + { "from": "configuration", "to": "model-ver", "label": "org.onap.relationships.inventory.IsA", @@ -2817,7 +2829,7 @@ "to": "model-ver", "label": "org.onap.relationships.inventory.IsA", "direction": "OUT", - "multiplicity": "MANY2ONE", + "multiplicity": "MANY2ONE", "contains-other-v": "NONE", "delete-other-v": "NONE", "SVC-INFRA": "NONE", @@ -4720,7 +4732,8 @@ "delete-other-v": "!${direction}", "prevent-delete": "NONE", "default": "true", - "description": "" + "description": "", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "network-range", @@ -4958,7 +4971,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", - "description": "A pnf uses policies" + "description": "A pnf uses policies", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "pnf", @@ -4996,7 +5010,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A policy applies to an address family." + "description": "A policy applies to an address family.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "policy", @@ -5034,7 +5049,8 @@ "delete-other-v": "NONE", "prevent-delete": "NONE", "default": "true", - "description": "The policy associated to an instance-group" + "description": "The policy associated to an instance-group", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "policy", @@ -5060,7 +5076,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", - "description": "The policy applies to an l-interface." + "description": "The policy applies to an l-interface.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "policy", @@ -5086,7 +5103,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies." + "description": "This edge allows for QOS policy to vlan-tag relationship. For a given policy get all vlan tags as well as for a given vlan-tag get all the policies.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "policy", @@ -5112,7 +5130,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "NONE", "default": "true", - "description": "" + "description": "", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "port-list", @@ -5293,7 +5312,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A profile (set of characteristics) applies to the lag-interface." + "description": "A profile (set of characteristics) applies to the lag-interface.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "profile", @@ -5306,7 +5326,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A profile (set of characteristics) applies to the l-interface." + "description": "A profile (set of characteristics) applies to the l-interface.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "profile", @@ -5358,7 +5379,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A profile (set of characteristics) applies to the p-interface." + "description": "A profile (set of characteristics) applies to the p-interface.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "profile", @@ -5384,7 +5406,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A profile (set of characteristics) applies to the pnf." + "description": "A profile (set of characteristics) applies to the pnf.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "profile", @@ -5397,7 +5420,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A profile (set of characteristics) applies to the policy." + "description": "A profile (set of characteristics) applies to the policy.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "profile", @@ -5488,7 +5512,8 @@ "SVC-INFRA": "NONE", "prevent-delete": "${direction}", "default": "true", - "description": "A profile (set of characteristics) applies to the vrf." + "description": "A profile (set of characteristics) applies to the vrf.", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "pserver", @@ -5736,7 +5761,8 @@ "delete-other-v": "NONE", "prevent-delete": "NONE", "default": "true", - "description": "The profile associated to a sw-component" + "description": "The profile associated to a sw-component", + "relationship-properties": ["data-owner","data-source","data-source-version"] }, { "from": "validation-audit", @@ -5859,7 +5885,461 @@ "prevent-delete": "NONE", "default": "true", "description": "" - } - + }, + { + "from": "selector-list", + "to": "object-group", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "SVC-INFRA": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "" + }, + { + "from": "zone", + "to": "endpoint", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "SV
}
<?xml version="1.0" encoding="utf-8"?>
<!--
# Copyright © 2018 Amdocs, Bell Canada, AT&T, ZTE
# 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="3 seconds">
<property name="logDir" value="/var/log/onap" />
<property name="componentName" scope="system" value="sdc"></property>
<property name="subComponentName" scope="system" value="sdc-be"></property>
<property name="logDirectory" value="${logDir}/${componentName}/${subComponentName}" />
<property file="${config.home}/catalog-be/configuration.yaml" />
<property name="enable-all-log" scope="context" value="false" />
<!-- log file names -->
<property name="errorLogName" value="error" />
<property name="metricsLogName" value="metrics" />
<property name="auditLogName" value="audit" />
<property name="debugLogName" value="debug" />
<property name="transactionLogName" value="transaction" />
<property name="allLogName" value="all" />
<property name="queueSize" value="256" />
<property name="maxFileSize" value="50MB" />
<property name="maxHistory" value="30" />
<property name="totalSizeCap" value="10GB" />
<property name="pattern" value="%d{"yyyy-MM-dd'T'HH:mm:ss.SSSXXX", UTC}\t[%thread]\t%-5level\t%logger{36}\t%replace(%replace(%replace(%mdc){'\t','\\\\t'}){', ','\t'}){'\n', '\\\\n'}\t%replace(%replace(%msg){'\n', '\\\\n'}){'\t','\\\\t'}%n" />
<!-- All log -->
<if condition='property("enable-all-log").equalsIgnoreCase("true")'>
<then>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ALL_ROLLING">
<file>${logDirectory}/${allLogName}.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${allLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${maxFileSize}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>${pattern}</pattern>
</encoder>
</appender>
<appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ALL">
<appender-ref ref="ALL_ROLLING" />
</appender>
</then>
</if>
<!-- Error log -->
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="ERROR_ROLLING">
<file>${logDirectory}/${errorLogName}.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.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${errorLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${maxFileSize}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>${pattern}</pattern>
</encoder>
</appender>
<!-- Debug log -->
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="DEBUG_ROLLING">
<file>${logDirectory}/${debugLogName}.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() <= DEBUG.toInt()</expression>
</evaluator>
<OnMismatch>DENY</OnMismatch>
<OnMatch>NEUTRAL</OnMatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${debugLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${maxFileSize}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>${pattern}</pattern>
</encoder>
</appender>
<!-- Audit log -->
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT_ROLLING">
<file>${logDirectory}/${auditLogName}.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>
</evaluator>
<onMismatch>DENY</onMismatch>
<onMatch>ACCEPT</onMatch>
</filter>
<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${auditLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${maxFileSize}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>${pattern}</pattern>
</encoder>
</appender>
<!-- SdncTransaction log -->
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="TRANSACTION_ROLLING">
<file>${logDirectory}/${transactionLogName}.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.TimeBasedRollingPolicy">
<fileNamePattern>${logDirectory}/${transactionLogName}.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
<maxFileSize>${maxFileSize}</maxFileSize>
</timeBasedFileNamingAndTriggeringPolicy>
<maxHistory>${maxHistory}</maxHistory>
<totalSizeCap>${totalSizeCap}</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>${pattern}</pattern>
</encoder>
</appender>
<!-- Asynchronicity Configurations -->
<appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_DEBUG">
<queueSize>${queueSize}</queueSize>
<appender-ref ref="DEBUG_ROLLING" />
</appender>
<appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_TRANSACTION">
<queueSize>${queueSize}</queueSize>
<appender-ref ref="TRANSACTION_ROLLING" />
</appender>
<appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_ERROR">
<queueSize>${queueSize}</queueSize>
<appender-ref ref="ERROR_ROLLING" />
</appender>
<appender class="ch.qos.logback.classic.AsyncAppender" name="ASYNC_AUDIT">
<queueSize>${queueSize}</queueSize>
<appender-ref ref="AUDIT_ROLLING" />
</appender>
<root level="INFO">
<appender-ref ref="ASYNC_ERROR" />
<appender-ref ref="ASYNC_DEBUG" />
<appender-ref ref="ASYNC_AUDIT" />
<appender-ref ref="ASYNC_TRANSACTION" />
<if condition='property("enable-all-log").equalsIgnoreCase("true")'>
<then>
<appender-ref ref="ALL_ROLLING" />
</then>
</if>
</root>
<logger level="INFO" name="org.openecomp.sdc" />
</configuration>
|