aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Forsyth <jf2512@att.com>2020-04-22 21:11:01 +0000
committerGerrit Code Review <gerrit@onap.org>2020-04-22 21:11:01 +0000
commit9e1af3806e6a4a8379075b32b8e3ca54291b9192 (patch)
tree4f682ab923a6dc1bcd1b6bff4a38aca5e870dd5f
parent057bbe97cb127d05878372d97892f27bef462587 (diff)
parent90904124f3b392d3bb9b7cdd1a611bbc54f654b3 (diff)
Merge "sotn nni integration test issue fix"
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd18
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json98
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml17
3 files changed, 81 insertions, 52 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
index b07c1e1..de0859b 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
@@ -10582,7 +10582,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="Instance of an te-link-attribute",indexedProps="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an label restriction",indexedProps="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="label-restrictions",namespace="network",requiredProps="id",uriTemplate="/network/label-restrictions/label-restriction/{id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -10798,7 +10798,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="Instance of an te-link-attribute",indexedProps="id,linkProtectionType,accessType,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an te-link-attribute",indexedProps="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="te-link-attributes",namespace="network",requiredProps="id",uriTemplate="/network/te-link-attributes/te-link-attribute/{id}")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -10809,13 +10809,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
- <xs:element name="is-abstract" type="xs:boolean" minOccurs="0">
- <xs:annotation>
- <xs:appinfo>
- <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native")</annox:annotate>
- </xs:appinfo>
- </xs:annotation>
- </xs:element>
<xs:element name="link-protection-type" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -10851,6 +10844,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="is-abstract" type="xs:boolean" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicate wheather link is abstract or native")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="selflink" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json
index 5856f20..396d970 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_ccvpn_v19.json
@@ -216,6 +216,30 @@
"default": "true",
"description":"For CCVPN Usecase"
},
+ {
+ "from": "connectivity",
+ "to": "generic-vnf",
+ "label": "org.onap.relationships.inventory.PartOf",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"For CCVPN Usecase"
+ },
+ {
+ "from": "uni",
+ "to": "generic-vnf",
+ "label": "org.onap.relationships.inventory.PartOf",
+ "direction": "OUT",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "NONE",
+ "prevent-delete": "NONE",
+ "default": "true",
+ "description":"For CCVPN Usecase"
+ },
{
"from": "site-resource",
"to": "generic-vnf",
@@ -401,84 +425,88 @@
"to": "pnf",
"label": "tosca.relationships.network.BindsTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "!${direction}",
- "delete-other-v": "NONE",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "!${direction}",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
},
{
"from": "p-interface",
"to": "tunnel-termination-point",
"label": "tosca.relationships.network.BindsTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "${direction}",
- "delete-other-v": "NONE",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "!${direction}",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
},
{
"from": "p-interface",
"to": "interlayer-attachment",
- "label": "tosca.relationships.network.BindsTo",
+ "label": "tosca.relationships.network.LinksTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "${direction}",
- "delete-other-v": "NONE",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "!${direction}",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
+
},
{
"from": "tunnel-termination-point",
"to": "interlayer-attachment",
- "label": "tosca.relationships.network.BindsTo",
+ "label": "tosca.relationships.network.LinksTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "${direction}",
- "delete-other-v": "NONE",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "!${direction}",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
+
},
{
- "from": "p-interface",
- "to": "uni",
- "label": "tosca.relationships.network.BindsTo",
+ "from": "uni",
+ "to": "p-interface",
+ "label": "org.onap.relationships.inventory.PartOf",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "${direction}",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
"delete-other-v": "NONE",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
},
{
"from": "logical-link",
"to": "te-link-attribute",
- "label": "tosca.relationships.network.BindsTo",
+ "label": "tosca.relationships.network.LinksTo",
"direction": "OUT",
- "multiplicity": "ONE2ONE",
- "contains-other-v": "${direction}",
- "delete-other-v": "NONE",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "!${direction}",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
+
},
{
"from": "label-restriction",
- "to": "te-link-attributes",
- "label": "tosca.relationships.network.BindsTo",
+ "to": "te-link-attribute",
+ "label": "tosca.relationships.network.LinksTo",
"direction": "OUT",
- "multiplicity": "MANY2ONE",
- "contains-other-v": "${direction}",
- "delete-other-v": "NONE",
+ "multiplicity": "MANY2MANY",
+ "contains-other-v": "NONE",
+ "delete-other-v": "!${direction}",
"prevent-delete": "NONE",
"default": "true",
- "description":""
+ "description":"For CCVPN Usecase"
+
},
{
"from": "bandwidth-attribute",
diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index e0ca8f9..613264c 100644
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -9148,11 +9148,6 @@
<xml-property name="description" value="Id that identifies the TE link attribute"/>
</xml-properties>
</xml-element>
- <xml-element java-attribute="isAbstract" name="is-abstract" type="java.lang.Boolean">
- <xml-properties>
- <xml-property name="description" value="Indicate wheather link is abstract or native"/>
- </xml-properties>
- </xml-element>
<xml-element java-attribute="linkProtectionType" name="link-protection-type" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Indicate desired protection type of the link e.g, unprotected, shared or 1+1"/>
@@ -9178,6 +9173,12 @@
<xml-property name="description" value="The value of available bandwidth."/>
</xml-properties>
</xml-element>
+ <xml-element java-attribute="isAbstract" name="is-abstract" type="java.lang.Boolean">
+ <xml-properties>
+ <xml-property name="description" value="Indicate wheather link is abstract or native"/>
+ </xml-properties>
+ </xml-element>
+
<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Store the link to get more information for this object."/>
@@ -9219,7 +9220,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Instance of an te-link-attribute"/>
- <xml-property name="indexedProps" value="id,linkProtectionType,accessType,operational-status,model-invariant-id,model-version-id"/>
+ <xml-property name="indexedProps" value="id,link-protection-type,access-type,operational-status,model-invariant-id,model-version-id"/>
<xml-property name="searchable" value="id"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="container" value="te-link-attributes"/>
@@ -9326,8 +9327,8 @@
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/>
</java-attributes>
<xml-properties>
- <xml-property name="description" value="Instance of an te-link-attribute"/>
- <xml-property name="indexedProps" value="id,labelStart,labelEnd,rangeBitmap,operational-status,model-invariant-id,model-version-id"/>
+ <xml-property name="description" value="Instance of an label restriction"/>
+ <xml-property name="indexedProps" value="id,label-start,label-end,range-bitmap,operational-status,model-invariant-id,model-version-id"/>
<xml-property name="searchable" value="id"/>
<xml-property name="uniqueProps" value="id"/>
<xml-property name="container" value="label-restrictions"/>