diff options
Diffstat (limited to 'aai-schema/src/main')
13 files changed, 22 insertions, 18 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd index b9c70964..c3034615 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v10.xsd @@ -3963,7 +3963,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(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd index edef5ed7..4b97632d 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v11.xsd @@ -4788,7 +4788,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(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd index 8dc219e2..5e9dcf70 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v12.xsd @@ -4990,7 +4990,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(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd index 812672f2..b6ccc0fb 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v13.xsd @@ -4969,7 +4969,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(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> 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 78d24f8d..363e9887 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 @@ -5323,7 +5323,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(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(dependentOn="port-group",indexedProps="cvlan-tag",container="cvlan-tags",uriTemplate="/cvlan-tags/cvlan-tag/{cvlan-tag}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json index 1b6d9405..62b6c52e 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json @@ -197,7 +197,7 @@ "to": "service-instance", "label": "org.onap.relationships.inventory.PartOf", "direction": "OUT", - "multiplicity": "ONE2MANY", + "multiplicity": "MANY2MANY", "contains-other-v": "NONE", "delete-other-v": "NONE", "prevent-delete": "NONE", 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 e6904a73..fe258453 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 @@ -1987,8 +1987,8 @@ "direction": "OUT", "multiplicity": "ONE2MANY", "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "${direction}", + "delete-other-v": "${direction}", + "prevent-delete": "NONE", "default": "true", "description":"" }, diff --git a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml index e22bd094..cc143c8a 100644 --- a/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml +++ b/aai-schema/src/main/resources/onap/oxm/v10/aai_oxm_v10.xml @@ -3098,7 +3098,7 @@ <xml-property name="dependentOn" value="port-group"/> <xml-property name="indexedProps" value="cvlan-tag"/> <xml-property name="container" value="cvlan-tags"/> - <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/> + <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/> </xml-properties> </java-type> diff --git a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml index 92a09877..ce6f17a0 100644 --- a/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml +++ b/aai-schema/src/main/resources/onap/oxm/v11/aai_oxm_v11.xml @@ -3735,7 +3735,7 @@ <xml-property name="dependentOn" value="port-group"/> <xml-property name="indexedProps" value="cvlan-tag"/> <xml-property name="container" value="cvlan-tags"/> - <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/> + <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/> </xml-properties> </java-type> diff --git a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml index e04c471a..5d43d434 100644 --- a/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml +++ b/aai-schema/src/main/resources/onap/oxm/v12/aai_oxm_v12.xml @@ -3841,7 +3841,7 @@ <xml-property name="dependentOn" value="port-group"/> <xml-property name="indexedProps" value="cvlan-tag"/> <xml-property name="container" value="cvlan-tags"/> - <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/> + <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/> </xml-properties> </java-type> diff --git a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml index 08fdb7ad..fb072fca 100644 --- a/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml +++ b/aai-schema/src/main/resources/onap/oxm/v13/aai_oxm_v13.xml @@ -3822,7 +3822,7 @@ <xml-property name="dependentOn" value="port-group"/> <xml-property name="indexedProps" value="cvlan-tag"/> <xml-property name="container" value="cvlan-tags"/> - <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/> + <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/> </xml-properties> </java-type> 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 e61ad597..8b044f7b 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 @@ -4002,7 +4002,7 @@ <xml-property name="dependentOn" value="port-group"/> <xml-property name="indexedProps" value="cvlan-tag"/> <xml-property name="container" value="cvlan-tags"/> - <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag-cvlan-tag}"/> + <xml-property name="uriTemplate" value="/cvlan-tags/cvlan-tag/{cvlan-tag}"/> </xml-properties> </java-type> diff --git a/aai-schema/src/main/xjb/bindings-onap.xjb b/aai-schema/src/main/xjb/bindings-onap.xjb index 85713f2e..f5579b81 100644 --- a/aai-schema/src/main/xjb/bindings-onap.xjb +++ b/aai-schema/src/main/xjb/bindings-onap.xjb @@ -2,7 +2,11 @@ <jaxb:bindings version="2.1" xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - xmlns:xs="http://www.w3.org/2001/XMLSchema"> + xmlns:xs="http://www.w3.org/2001/XMLSchema" + xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"> + <jaxb:globalBindings> + <xjc:serializable uid="14"/> + </jaxb:globalBindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v8"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v8"/> @@ -16,7 +20,7 @@ <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v10"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v10"/> - </jaxb:schemaBindings> + </jaxb:schemaBindings> </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.openecomp.aai.inventory/v11"> <jaxb:schemaBindings> @@ -26,7 +30,7 @@ <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v12"> <jaxb:schemaBindings> <jaxb:package name="org.onap.aai.domain.yang.v12"/> - </jaxb:schemaBindings> + </jaxb:schemaBindings> </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v13"> <jaxb:schemaBindings> @@ -35,7 +39,7 @@ </jaxb:bindings> <jaxb:bindings scd="x-schema::a" xmlns:a="http://org.onap.aai.inventory/v14"> <jaxb:schemaBindings> - <jaxb:package name="org.onap.aai.domain.yang"/> - </jaxb:schemaBindings> + <jaxb:package name="org.onap.aai.domain.yang"/> + </jaxb:schemaBindings> </jaxb:bindings> </jaxb:bindings> |