diff options
Diffstat (limited to 'aai-schema')
4 files changed, 37 insertions, 37 deletions
diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 4c8797f..5686d89 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,11 +27,11 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.0.7-SNAPSHOT</version> + <version>1.5.1-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> - <version>1.0.7-SNAPSHOT</version> + <version>1.5.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_v16.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd index d557026..991c5cf 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v16.xsd @@ -4025,7 +4025,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 sp-partner",indexedProps="sp-partner-id,url,callsource",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sp-partner",indexedProps="sp-partner-id,url,callsource,model-invariant-id,model-version-id",nameProps="sp-partner-id",searchable="sp-partner-id",uniqueProps="sp-partner-id",container="sp-partners",namespace="business",uriTemplate="/business/sp-partners/sp-partner/{sp-partner-id}",requiredProps="sp-partner-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5119,7 +5119,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="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status,model-invariant-id,model-version-id",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network",uriTemplate="/network/vpn-bindings/vpn-binding/{vpn-id}",requiredProps="vpn-id,vpn-name")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -8750,7 +8750,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 a connectivity",indexedProps="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network",requiredProps="connectivity-id",uriTemplate="/network/connectivities/connectivity/{connectivity-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status,model-invariant-id,model-version-id",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network",requiredProps="connectivity-id",uriTemplate="/network/connectivities/connectivity/{connectivity-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9204,7 +9204,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 a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network",requiredProps="site-resource-id",uriTemplate="/network/site-resources/site-resource/{site-resource-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a site-resource",indexedProps="site-resource-id,site-resource-name,type,role,generated-site-id,operational-status,model-invariant-id,model-version-id",nameProps="site-resource-name",searchable="site-resource-id",uniqueProps="site-resource-id",container="site-resources",namespace="network",requiredProps="site-resource-id",uriTemplate="/network/site-resources/site-resource/{site-resource-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9312,7 +9312,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 sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network",requiredProps="sdwan-vpn-id",uriTemplate="/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an sdwan-vpn",indexedProps="sdwan-vpn-id,sdwan-vpn-name,vxlan-id,topology,operational-status,model-invariant-id,model-version-id",nameProps="sdwan-vpn-name",searchable="sdwan-vpn-id",uniqueProps="sdwan-vpn-id",container="sdwan-vpns",namespace="network",requiredProps="sdwan-vpn-id",uriTemplate="/network/sdwan-vpns/sdwan-vpn/{sdwan-vpn-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9420,7 +9420,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 a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network",requiredProps="device-id",uriTemplate="/network/devices/device/{device-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status,model-invariant-id,model-version-id",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network",requiredProps="device-id",uriTemplate="/network/devices/device/{device-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9563,7 +9563,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 a wan-port-config",indexedProps="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network",requiredProps="wan-port-config-id",uriTemplate="/network/wan-port-configs/wan-port-config/{wan-port-config-id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status,model-invariant-id,model-version-id",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network",requiredProps="wan-port-config-id",uriTemplate="/network/wan-port-configs/wan-port-config/{wan-port-config-id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json index 68f2986..90c6af3 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_ccvpn_v15.json @@ -80,7 +80,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -103,7 +103,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "!${direction}", + "delete-other-v": "NONE", "prevent-delete": "${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -209,7 +209,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", @@ -224,7 +224,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -235,7 +235,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -247,7 +247,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -259,7 +259,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -271,7 +271,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -283,7 +283,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -295,7 +295,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -307,7 +307,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -319,7 +319,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -331,7 +331,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -343,7 +343,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json index 485bd66..0de9bee 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_ccvpn_v16.json @@ -80,7 +80,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -103,7 +103,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "!${direction}", + "delete-other-v": "NONE", "prevent-delete": "${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -257,7 +257,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", @@ -272,7 +272,7 @@ "multiplicity": "ONE2MANY", "contains-other-v": "${direction}", "delete-other-v": "${direction}", - "prevent-delete": "!${direction}", + "prevent-delete": "NONE", "default": "true", "description":"For CCVPN Usecase" }, @@ -283,7 +283,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -295,7 +295,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -307,7 +307,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -319,7 +319,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -331,7 +331,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -343,7 +343,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -355,7 +355,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -367,7 +367,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -379,7 +379,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" @@ -391,7 +391,7 @@ "direction": "OUT", "multiplicity": "MANY2MANY", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "!${direction}", "default": "true", "description":"For CCVPN Usecase" |