summaryrefslogtreecommitdiffstats
path: root/aai-schema
diff options
context:
space:
mode:
Diffstat (limited to 'aai-schema')
-rw-r--r--aai-schema/.classpath26
-rw-r--r--aai-schema/pom.xml4
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd2
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd4
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json24
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json24
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml6
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml10
8 files changed, 61 insertions, 39 deletions
diff --git a/aai-schema/.classpath b/aai-schema/.classpath
deleted file mode 100644
index 8c0f651e..00000000
--- a/aai-schema/.classpath
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" output="target/classes" path="src/main/java">
- <attributes>
- <attribute name="optional" value="true"/>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="src" path="target/generated-sources"/>
- <classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry exported="true" kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
- <attributes>
- <attribute name="maven.pomderived" value="true"/>
- </attributes>
- </classpathentry>
- <classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml
index e949d236..d364d224 100644
--- a/aai-schema/pom.xml
+++ b/aai-schema/pom.xml
@@ -27,11 +27,11 @@
<parent>
<groupId>org.onap.aai.aai-common</groupId>
<artifactId>aai-common</artifactId>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
</parent>
<artifactId>aai-schema</artifactId>
<name>aai-schema</name>
- <version>1.4.0-SNAPSHOT</version>
+ <version>1.4.1-SNAPSHOT</version>
<properties>
<onap.nexus.url>https://nexus.onap.org</onap.nexus.url>
<!-- Start of Default ONAP Schema Properties -->
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index 1261cf49..4fb1ae1c 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -7755,7 +7755,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
index 545efe03..b6cf1a30 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v15.xsd
@@ -7906,7 +7906,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,description,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,description,instance-group-type")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General mechanism for grouping instances",nameProps="description,instance-group-name",uniqueProps="id",searchable="id,description",indexedProps="id,type,sub-type,model-invariant-id,model-version-id",container="instance-groups",namespace="network",uriTemplate="/network/instance-groups/instance-group/{id}",requiredProps="id,instance-group-type")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9762,7 +9762,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<xs:complexType>
<xs:annotation>
<xs:appinfo>
- <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Internal map to define some reserved properties of a vertex",uniqueProps="aai-unique-key,aai-uri,aai-uuid",indexedProps="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index 9db424d5..2eed8007 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -613,6 +613,30 @@
"description":""
},
{
+ "from": "generic-vnf",
+ "to": "cloud-region",
+ "label": "org.onap.relationships.inventory.LocatedIn",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
+ {
+ "from": "generic-vnf",
+ "to": "tenant",
+ "label": "org.onap.relationships.inventory.BelongsTo",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
+ {
"from": "lag-interface",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.BelongsTo",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
index a0dbf258..1f6829c5 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -565,6 +565,30 @@
"description":""
},
{
+ "from": "generic-vnf",
+ "to": "cloud-region",
+ "label": "org.onap.relationships.inventory.LocatedIn",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
+ {
+ "from": "generic-vnf",
+ "to": "tenant",
+ "label": "org.onap.relationships.inventory.BelongsTo",
+ "direction": "OUT",
+ "multiplicity": "MANY2ONE",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":""
+ },
+ {
"from": "vnfc",
"to": "generic-vnf",
"label": "org.onap.relationships.inventory.BelongsTo",
diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index 05decfb9..2f729cb4 100644
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -6318,7 +6318,7 @@
<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+ <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
</xml-properties>
@@ -6353,11 +6353,11 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
- <xml-property name="requiredProps" value="id,description,instance-group-type"/>
+ <xml-property name="requiredProps" value="id,instance-group-type"/>
</xml-properties>
</java-type>
diff --git a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
index 644fc9fa..ce7f2d52 100644
--- a/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v15/aai_oxm_v15.xml
@@ -5704,8 +5704,8 @@
<java-type name="ReservedPropNames">
<xml-properties>
<xml-property name="description" value="Internal map to define some reserved properties of a vertex"/>
- <xml-property name="uniqueProps" value="aai-unique-key"/>
- <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri"/>
+ <xml-property name="uniqueProps" value="aai-unique-key,aai-uri,aai-uuid"/>
+ <xml-property name="indexedProps" value="aai-unique-key,source-of-truth,aai-node-type,aai-uri,aai-uuid"/>
</xml-properties>
<xml-root-element name="reserved-prop-names"/>
<java-attributes>
@@ -6396,7 +6396,7 @@
<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="description" name="description" required="true" type="java.lang.String">
+ <xml-element java-attribute="description" name="description" required="false" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Descriptive text to help identify the usage of this instance-group"/>
</xml-properties>
@@ -6431,11 +6431,11 @@
<xml-property name="nameProps" value="description,instance-group-name"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="searchable" value="id,description"/>
- <xml-property name="indexedProps" value="id,description,type,sub-type,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,type,sub-type,model-invariant-id,model-version-id"/>
<xml-property name="container" value="instance-groups"/>
<xml-property name="namespace" value="network"/>
<xml-property name="uriTemplate" value="/network/instance-groups/instance-group/{id}"/>
- <xml-property name="requiredProps" value="id,description,instance-group-type"/>
+ <xml-property name="requiredProps" value="id,instance-group-type"/>
</xml-properties>
</java-type>