From 2d9495c243a92854d22ed2f7ec4301e3435d9817 Mon Sep 17 00:00:00 2001 From: "Kajur, Harish (vk250x)" Date: Tue, 1 Sep 2020 08:56:59 -0400 Subject: [PATCH] Add support for vlan range and vlan tag Also sync up the older versions to match internal Issue-ID: AAI-3127 Change-Id: I7cfcf576ae151b6bad7a08f7d18f0e48db8d667b Signed-off-by: Kajur, Harish (vk250x) --- aai-annotations/pom.xml | 2 +- aai-queries/pom.xml | 2 +- aai-schema-gen/pom.xml | 2 +- aai-schema-service/pom.xml | 2 +- aai-schema/pom.xml | 2 +- .../resources/onap/aai_schema/aai_schema_v15.xsd | 41 +- .../resources/onap/aai_schema/aai_schema_v16.xsd | 41 +- .../resources/onap/aai_schema/aai_schema_v17.xsd | 41 +- .../resources/onap/aai_schema/aai_schema_v18.xsd | 41 +- .../resources/onap/aai_schema/aai_schema_v19.xsd | 41 +- .../resources/onap/aai_schema/aai_schema_v20.xsd | 1038 ++++++++++++-------- .../onap/dbedgerules/v15/DbEdgeRules_v15.json | 66 ++ .../onap/dbedgerules/v16/DbEdgeRules_v16.json | 67 +- .../onap/dbedgerules/v17/DbEdgeRules_v17.json | 66 ++ .../onap/dbedgerules/v18/DbEdgeRules_v18.json | 66 ++ .../onap/dbedgerules/v19/DbEdgeRules_v19.json | 66 ++ .../onap/dbedgerules/v20/DbEdgeRules_v20.json | 160 ++- .../main/resources/onap/oxm/v15/aai_oxm_v15.xml | 61 +- .../main/resources/onap/oxm/v16/aai_oxm_v16.xml | 63 +- .../main/resources/onap/oxm/v17/aai_oxm_v17.xml | 65 +- .../main/resources/onap/oxm/v18/aai_oxm_v18.xml | 62 +- .../main/resources/onap/oxm/v19/aai_oxm_v19.xml | 62 +- .../main/resources/onap/oxm/v20/aai_oxm_v20.xml | 239 ++++- pom.xml | 2 +- version.properties | 2 +- 25 files changed, 1675 insertions(+), 625 deletions(-) diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index cb628f5..01a6c24 100644 --- a/aai-annotations/pom.xml +++ b/aai-annotations/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.6-SNAPSHOT + 1.7.7-SNAPSHOT aai-annotations aai-annotations diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml index fd86f98..0e44039 100644 --- a/aai-queries/pom.xml +++ b/aai-queries/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.6-SNAPSHOT + 1.7.7-SNAPSHOT aai-queries aai-queries diff --git a/aai-schema-gen/pom.xml b/aai-schema-gen/pom.xml index 948c94e..0f4acdd 100644 --- a/aai-schema-gen/pom.xml +++ b/aai-schema-gen/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.6-SNAPSHOT + 1.7.7-SNAPSHOT aai-schema-gen aai-schema-gen diff --git a/aai-schema-service/pom.xml b/aai-schema-service/pom.xml index 6abe3be..f7d8e51 100644 --- a/aai-schema-service/pom.xml +++ b/aai-schema-service/pom.xml @@ -26,7 +26,7 @@ org.onap.aai.schema-service schema-service - 1.7.6-SNAPSHOT + 1.7.7-SNAPSHOT org.onap.aai.schema-service aai-schema-service diff --git a/aai-schema/pom.xml b/aai-schema/pom.xml index 3339f10..18d32a5 100644 --- a/aai-schema/pom.xml +++ b/aai-schema/pom.xml @@ -27,7 +27,7 @@ org.onap.aai.schema-service schema-service - 1.7.6-SNAPSHOT + 1.7.7-SNAPSHOT aai-schema aai-schema 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 a501935..fc66002 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 @@ -6132,11 +6132,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version") + @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="agg-route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{agg-route-id}",requiredProps="agg-route-id,network-start-address,cidr-mask,ip-version") - + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance") @@ -8614,42 +8614,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}") + @org.onap.aai.annotations.Metadata(description="vlan tag information",container="vlan-tags",dependentOn="vlan-range",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}",requiredProps="vlan-tag-id,vlan-tag-role,is-private") - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag") + @org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id") - @org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)") + @org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN inner id") + @org.onap.aai.annotations.Metadata(description="Inner VLAN tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN outer id") + @org.onap.aai.annotations.Metadata(description="Outer VLAN tag") - @org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?") + @org.onap.aai.annotations.Metadata(description="is private flag.") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN tag Type") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN Tag Function") + + + + + + + @org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag") 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 2e9e2bd..6eaa6d9 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 @@ -6193,11 +6193,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version") + @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="agg-route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{agg-route-id}",requiredProps="agg-route-id,network-start-address,cidr-mask,ip-version") - + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance") @@ -8689,42 +8689,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}") + @org.onap.aai.annotations.Metadata(description="vlan tag information",container="vlan-tags",dependentOn="vlan-range",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}",requiredProps="vlan-tag-id,vlan-tag-role,is-private") - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag") + @org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id") - @org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)") + @org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN inner id") + @org.onap.aai.annotations.Metadata(description="Inner VLAN tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN outer id") + @org.onap.aai.annotations.Metadata(description="Outer VLAN tag") - @org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?") + @org.onap.aai.annotations.Metadata(description="is private flag.") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN tag Type") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN Tag Function") + + + + + + + @org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd index 023579d..fd65b36 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd @@ -6200,11 +6200,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version") + @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="agg-route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{agg-route-id}",requiredProps="agg-route-id,network-start-address,cidr-mask,ip-version") - + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance") @@ -8696,42 +8696,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}") + @org.onap.aai.annotations.Metadata(description="vlan tag information",container="vlan-tags",dependentOn="vlan-range",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}",requiredProps="vlan-tag-id,vlan-tag-role,is-private") - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag") + @org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id") - @org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)") + @org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN inner id") + @org.onap.aai.annotations.Metadata(description="Inner VLAN tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN outer id") + @org.onap.aai.annotations.Metadata(description="Outer VLAN tag") - @org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?") + @org.onap.aai.annotations.Metadata(description="is private flag.") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN tag Type") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN Tag Function") + + + + + + + @org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd index 9410a91..246f515 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd @@ -6207,11 +6207,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version") + @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="agg-route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{agg-route-id}",requiredProps="agg-route-id,network-start-address,cidr-mask,ip-version") - + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance") @@ -8745,42 +8745,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}") + @org.onap.aai.annotations.Metadata(description="vlan tag information",container="vlan-tags",dependentOn="vlan-range",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}",requiredProps="vlan-tag-id,vlan-tag-role,is-private") - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag") + @org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id") - @org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)") + @org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN inner id") + @org.onap.aai.annotations.Metadata(description="Inner VLAN tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN outer id") + @org.onap.aai.annotations.Metadata(description="Outer VLAN tag") - @org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?") + @org.onap.aai.annotations.Metadata(description="is private flag.") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN tag Type") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN Tag Function") + + + + + + + @org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag") 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 dd33b5d..77a7dac 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 @@ -6856,11 +6856,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version") + @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="agg-route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{agg-route-id}",requiredProps="agg-route-id,network-start-address,cidr-mask,ip-version") - + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance") @@ -9408,42 +9408,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}") + @org.onap.aai.annotations.Metadata(description="vlan tag information",container="vlan-tags",dependentOn="vlan-range",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}",requiredProps="vlan-tag-id,vlan-tag-role,is-private") - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag") + @org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id") - @org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)") + @org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN inner id") + @org.onap.aai.annotations.Metadata(description="Inner VLAN tag") - + - @org.onap.aai.annotations.Metadata(description="VLAN outer id") + @org.onap.aai.annotations.Metadata(description="Outer VLAN tag") - @org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?") + @org.onap.aai.annotations.Metadata(description="is private flag.") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN tag Type") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN Tag Function") + + + + + + + @org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag") diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd index 4026bac..6d9aae1 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd @@ -841,7 +841,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered") + @org.onap.aai.annotations.Metadata(description="Definition of vlan",indexedProps="vlan-interface,vlan-id-inner,vpn-key,orchestration-status,prov-status",dependentOn="l-interface",container="vlans",uriTemplate="/vlans/vlan/{vlan-interface}",requiredProps="vlan-interface,in-maint,is-ip-unnumbered,is-private") @@ -1237,7 +1237,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2,operational-status",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled") + @org.onap.aai.annotations.Metadata(description="Virtual Servers, aka virtual machine or VM.",nameProps="vserver-name",indexedProps="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2",searchable="vserver-id,vserver-name,vserver-name2,operational-status",dependentOn="tenant",container="vservers",uriTemplate="/vservers/vserver/{vserver-id}",requiredProps="vserver-id,vserver-name,vserver-selflink,in-maint,is-closed-loop-disabled") @@ -1567,7 +1567,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Cloud Region Flavor name") + @org.onap.aai.annotations.Metadata(description="Flavor name") @@ -2098,6 +2098,148 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="vlan tag information",container="vlan-tags",dependentOn="vlan-range",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}",requiredProps="vlan-tag-id,vlan-tag-role,is-private") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id") + + + + + + + @org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag") + + + + + + + @org.onap.aai.annotations.Metadata(description="Inner VLAN tag") + + + + + + + @org.onap.aai.annotations.Metadata(description="Outer VLAN tag") + + + + + + + @org.onap.aai.annotations.Metadata(description="is private flag.") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN tag Type") + + + + + + + @org.onap.aai.annotations.Metadata(description="VLAN Tag Function") + + + + + + + @org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Vlan Tags Assigned out of a Vlan Range") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Definition of vlan range",indexedProps="vlan-range-id,vlan-type",dependentOn="cloud-region",container="vlan-ranges",uriTemplate="/vlan-ranges/vlan-range/{vlan-range-id}",searchable="vlan-range-id",requiredProps="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="vlan id in range UUID.") + + + + + + + @org.onap.aai.annotations.Metadata(description="vlan id in range lower") + + + + + + + @org.onap.aai.annotations.Metadata(description="vlan id in range upper") + + + + + + + @org.onap.aai.annotations.Metadata(description="vlan type") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + + + + @@ -2387,6 +2529,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + @@ -2902,6 +3045,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Minimum links in service before a LAG should be taken out of service") + + + @@ -2956,7 +3106,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2",indexedProps="hostname,pserver-id,pserver-name2,inv-status,prov-status,ptnii-equip-name",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint") + @org.onap.aai.annotations.Metadata(description="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver.",nameProps="pserver-name2,fqdn",indexedProps="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name",searchable="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status",uniqueProps="hostname",container="pservers",namespace="cloud-infrastructure",uriTemplate="/cloud-infrastructure/pservers/pserver/{hostname}",requiredProps="hostname,in-maint") @@ -3619,42 +3769,307 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets") - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id") - - - - + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of resource instances used to connect a variety of disparate inventory widgets") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Represents the specifics of a tunnel cross connect piece of a resource that gets separately allotted",uniqueProps="id",indexedProps="id",dependentOn="allotted-resource",container="tunnel-xconnects",uriTemplate="/tunnel-xconnects/tunnel-xconnect/{id}",requiredProps="id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Concurrency value") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-type,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ") + + + + + + + @org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc") + + + + + + + @org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed") + + + + + + + @org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed") + + + + + + + @org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed") + + + + + + + @org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link") + + + + + + + @org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack") + + + + + + + @org.onap.aai.annotations.Metadata(description="For example, static or BGP") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") + + + + + + + @org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).") + + + + + + + @org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Circuit id") + + + + + + + @org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of logical connections") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance") + + + + + + + @org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy") + + + + + + + @org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Name of the policy") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type of the policy") + + + + + + + @org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="jitter") + + + + - @org.onap.aai.annotations.Metadata(isKey=true,description="Allotted Resource id UUID assigned to this instance.") + @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") - + - @org.onap.aai.annotations.Metadata(description="Concurrency value") + @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.") @@ -3662,15 +4077,10 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - - - @org.onap.aai.annotations.Metadata(description="This object is used to store the specific tunnel cross connect aspects of an allotted resource") - - - + @@ -4184,17 +4594,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - + - @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.") + @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") - + - @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") + @org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.") @@ -4267,7 +4677,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Ip address object.",uniqueProps="ip-address",indexedProps="ip-address",container="ip-address-list",uriTemplate="/endpoints/endpoint/{endpoint-id}/ip-address-list/ip-address/{ip-address}",searcheable="endpoint-id") + @org.onap.aai.annotations.Metadata(description="IP address.",uniqueProps="ip-address",indexedProps="ip-address",container="ip-address-list",uriTemplate="/endpoints/endpoint/{endpoint-id}/ip-address-list/ip-address/{ip-address}",searcheable="ip-address") @@ -4295,7 +4705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="reserved, static, dhcp.") + @org.onap.aai.annotations.Metadata(description="Type of IP address, eg., Reserved, Static, DHCP.") @@ -4346,32 +4756,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(isKey=true,description="ID of endpoint.") + @org.onap.aai.annotations.Metadata(isKey=true,description="ID of an endpoint.") - @org.onap.aai.annotations.Metadata(description="Name of endpoint.") + @org.onap.aai.annotations.Metadata(description="Name of an endpoint.") - @org.onap.aai.annotations.Metadata(description="Type of endpoint.") + @org.onap.aai.annotations.Metadata(description="Type of an endpoint.") - @org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID, MPLS label.") + @org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID.") - + @@ -4380,7 +4790,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Collection of endpoints.") + @org.onap.aai.annotations.Metadata(description="Collection of Endpoint objects.") @@ -4571,13 +4981,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - - - @@ -4585,6 +4988,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + + + @@ -5167,7 +5577,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",dependentOn="model-element,model-constraint",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type") + @org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="constrained-element-set-uuid",indexedProps="constrained-element-set-uuid",allowDirectRead="true",allowDirectWrite="false",dependentOn="model-constraint,model-element",container="constrained-element-sets",uriTemplate="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}",requiredProps="constrained-element-set-uuid,constraint-type,check-type") @@ -5197,7 +5607,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",dependentOn="model-element,",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace") + @org.onap.aai.annotations.Metadata(description="This is how we would capture constraints defining allowed sets of elements.",uniqueProps="model-constraint-uuid",indexedProps="model-constraint-uuid",allowDirectRead="true",allowDirectWrite="false",dependentOn="model-element",container="model-constraints",uriTemplate="/model-constraints/model-constraint/{model-constraint-uuid}",requiredProps="model-constraint-uuid,constrained-element-set-uuid-to-replace") @@ -5231,7 +5641,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",dependentOn="model-element,element-choice-set,model-ver",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality") + @org.onap.aai.annotations.Metadata(description="Defines how other models combine to make up a higher-level model.",uniqueProps="model-element-uuid",indexedProps="model-element-uuid",allowDirectRead="true",dependentOn="element-choice-set,model-element,model-ver",allowDirectWrite="false",container="model-elements",uriTemplate="/model-elements/model-element/{model-element-uuid}",requiredProps="model-element-uuid,new-data-del-flag,cardinality") @@ -5332,6 +5742,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="The CDS blue print name associated with the resource.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The version of the CDS blue print.") + + + @@ -5374,6 +5798,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Role of the model,e.g.,NST,NSST,CST,etc") + + + @@ -5525,195 +5956,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Namespace for objects managed by ASDC") - - - - - - - - - - - - - - - - @org.onap.aai.annotations.Metadata(description="Logical links generally connect l-interfaces but are used to express logical connectivity between two points",indexedProps="link-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,link-id,prov-status,circuit-id,link-type,purpose,operational-status",uniqueProps="link-id",container="logical-links",namespace="network",searchable="link-name",uriTemplate="/network/logical-links/logical-link/{link-name}",requiredProps="link-name,in-maint,link-type") - - - - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ") - - - - - - - @org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this object is in maintenance mode (maintenance mode = true). This field (in conjunction with prov-status) is used to suppress alarms and vSCL on VNFs/VMs.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc") - - - - - - - @org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed") - - - - - - - @org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - - - - - - @org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed") - - - - - - - @org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link") - - - - - - - @org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack") - - - - - - - @org.onap.aai.annotations.Metadata(description="For example, static or BGP") - - - - - - - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - @org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local") - - - - - - - @org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}") - - - - - - - @org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.") - - - - - - - @org.onap.aai.annotations.Metadata(description="the ASDC data dictionary version of the widget model.This maps directly to the A&AI version of the widget.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).") - - - - - - - @org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Circuit id") - - - - - - - @org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing") - - - - + + - + - @org.onap.aai.annotations.Metadata(description="Collection of logical connections") + @org.onap.aai.annotations.Metadata(description="Namespace for objects managed by ASDC") - + + + + + @@ -6704,7 +6964,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,in-maint,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}") + @org.onap.aai.annotations.Metadata(indexedProps="vnfc-name,prov-status,nfc-function,nfc-naming-code,ipaddress-v4-oam-vip,is-closed-loop-disabled,group-notation,model-invariant-id,model-version-id,orchestration-status",searchable="vnfc-name",container="vnfcs",namespace="network",uriTemplate="/network/vnfcs/vnfc/{vnfc-name}") @@ -7072,11 +7332,11 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{route-id}",requiredProps="route-id,network-start-address,cidr-mask,ip-version") + @org.onap.aai.annotations.Metadata(description="Aggregate route configs are used on the D2 IPE’s for the Voice services. In 1902, SDNC will create aggregate-route objects and write them to A&AI. ",uniqueProps="agg-route-id",container="aggregate-routes",dependentOn="l3-network",uriTemplate="/aggregate-routes/aggregate-route/{agg-route-id}",requiredProps="agg-route-id,network-start-address,cidr-mask,ip-version") - + @org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance") @@ -7345,95 +7605,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(nameProps="network-policy-fqdn",indexedProps="network-policy-id,network-policy-fqdn",searchable="network-policy-id,network-policy-fqdn",uniqueProps="network-policy-id",container="network-policies",namespace="network",uriTemplate="/network/network-policies/network-policy/{network-policy-id}") - - - - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance") - - - - - - - @org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy") - - - - - - - @org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance") - - - - - - - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Name of the policy.") - - - - - - - @org.onap.aai.annotations.Metadata(description="Type of the policy.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance.") - - - - - - - @org.onap.aai.annotations.Metadata(description="jitter") - - - - - - - @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") - - - - - - - @org.onap.aai.annotations.Metadata(description="The reliability requirement for a transport slice network, expressed as a percentage.") - - - - - - - - - - - - - - @@ -7581,7 +7752,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,in-maint,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role,nm-profile-name,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled") + @org.onap.aai.annotations.Metadata(description="General purpose VNF",nameProps="vnf-name",indexedProps="is-closed-loop-disabled,vnf-name2,vnf-type,heat-stack-id,vnf-name,vnf-id,regional-resource-zone,prov-status,service-id,model-invariant-id,model-version-id,widget-model-id,widget-model-version,nf-type,nf-function,nf-naming-code,nf-role,nm-profile-name,orchestration-status",searchable="vnf-id,vnf-name,vnf-name2,operational-status",uniqueProps="vnf-id",container="generic-vnfs",namespace="network",extendsFrom="vnf",containsSuggestibleProps="true",suggestionAliases="VNFs",uriTemplate="/network/generic-vnfs/generic-vnf/{vnf-id}",requiredProps="vnf-id,vnf-type,in-maint,is-closed-loop-disabled") @@ -8274,6 +8445,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Bridge domain group name") + + + @@ -9669,67 +9847,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - - - - - @org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}") - - - - - - - @org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag") - - - - - - - @org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)") - - - - - - - @org.onap.aai.annotations.Metadata(description="VLAN inner id") - - - - - - - @org.onap.aai.annotations.Metadata(description="VLAN outer id") - - - - - - - @org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?") - - - - - - - @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") - - - - - - - - - - - - - - @@ -10783,6 +10900,67 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="A fully qualified domain name (FQDN) is the complete domain name for a specific computer, or host, on the internet.",requiredProps="fqdn,dns-domain",indexedProps="fqdn",namespace="network",container="fqdns",uriTemplate="/network/fqdns/fqdn/{fqdn}") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Fully qualified domain name.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used to categorize this object in conjunction with role & function. The most generic category.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used to categorize this object in conjunction with type & function.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used to categorize this object in conjunction with type & role. The most specific category.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Domain name.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + + + @@ -10821,6 +10999,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + @@ -10928,6 +11107,72 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + @org.onap.aai.annotations.Metadata(description="Profiles store the information (ex, credential-profile) and have a relationship to (ex, pnf)",uniqueProps="profile-name",container="profiles",namespace="common",nameProps="profile-name,profile-type",uriTemplate="/common/profiles/profile/{profile-name}",requiredProps="profile-name") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)") + + + + + + + @org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Descriptive subtype.") + + + + + + + @org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details") + + + + + + + @org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of profiles") + + + + + + + @@ -10937,6 +11182,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + 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 2d448aa..34dc328 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 @@ -3166,6 +3166,72 @@ "prevent-delete": "NONE", "default": "true", "description":"" + },{ + "from": "vlan-tag", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan-tag belongs to a vlan-range." + },{ + "from": "l3-network", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A l3-network Uses vlan-tag." + },{ + "from": "l-interface", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"An sub-interface that uses a vlan-tag." + },{ + "from": "vlan-range", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan range belongs to a cloud-region." + },{ + "from": "owning-entity", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"An owning-entity uses a vlan-range." + },{ + "from": "line-of-business", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A line-of uses a vlan-range" } ] diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json index 2d448aa..7c905db 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json @@ -3166,7 +3166,72 @@ "prevent-delete": "NONE", "default": "true", "description":"" + },{ + "from": "vlan-tag", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan-tag belongs to a vlan-range." + },{ + "from": "l3-network", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A l3-network Uses vlan-tag." + },{ + "from": "l-interface", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"An sub-interface that uses a vlan-tag." + },{ + "from": "vlan-range", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan range belongs to a cloud-region." + },{ + "from": "owning-entity", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"An owning-entity uses a vlan-range." + },{ + "from": "line-of-business", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A line-of uses a vlan-range" } - ] } diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json b/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json index 2d448aa..34dc328 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json @@ -3166,6 +3166,72 @@ "prevent-delete": "NONE", "default": "true", "description":"" + },{ + "from": "vlan-tag", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan-tag belongs to a vlan-range." + },{ + "from": "l3-network", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A l3-network Uses vlan-tag." + },{ + "from": "l-interface", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"An sub-interface that uses a vlan-tag." + },{ + "from": "vlan-range", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan range belongs to a cloud-region." + },{ + "from": "owning-entity", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"An owning-entity uses a vlan-range." + },{ + "from": "line-of-business", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A line-of uses a vlan-range" } ] diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json b/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json index 61c6887..1f33c7b 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json @@ -3188,6 +3188,72 @@ "prevent-delete": "NONE", "default": "true", "description":"" + },{ + "from": "vlan-tag", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan-tag belongs to a vlan-range." + },{ + "from": "l3-network", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A l3-network Uses vlan-tag." + },{ + "from": "l-interface", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"An sub-interface that uses a vlan-tag." + },{ + "from": "vlan-range", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan range belongs to a cloud-region." + },{ + "from": "owning-entity", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"An owning-entity uses a vlan-range." + },{ + "from": "line-of-business", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A line-of uses a vlan-range" } ] } diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json index 4c74bb0..575c853 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json @@ -3261,6 +3261,72 @@ "prevent-delete": "NONE", "default": "true", "description":"" + },{ + "from": "vlan-tag", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan-tag belongs to a vlan-range." + },{ + "from": "l3-network", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A l3-network Uses vlan-tag." + },{ + "from": "l-interface", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"An sub-interface that uses a vlan-tag." + },{ + "from": "vlan-range", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan range belongs to a cloud-region." + },{ + "from": "owning-entity", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"An owning-entity uses a vlan-range." + },{ + "from": "line-of-business", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A line-of uses a vlan-range" } ] } diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json index 5067fd3..ee10797 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json @@ -288,6 +288,18 @@ "default": "true", "description":"" }, + { + "from": "line-of-business", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, { "from": "volume-group", "to": "cloud-region", @@ -329,9 +341,9 @@ "to": "allotted-resource", "label": "org.onap.relationships.inventory.Uses", "direction": "OUT", - "multiplicity": "ONE2ONE", + "multiplicity": "MANY2ONE", "contains-other-v": "NONE", - "delete-other-v": "${direction}", + "delete-other-v": "NONE", "prevent-delete": "NONE", "default": "true", "description":"" @@ -3277,6 +3289,18 @@ "default": "true", "description":"" }, + { + "from": "configuration", + "to": "lag-interface", + "label": "org.onap.relationships.inventory.AppliesTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"" + }, { "from": "communication-service-profile", "to": "service-instance", @@ -3359,6 +3383,138 @@ "prevent-delete": "NONE", "default": "true", "description":"" + },{ + "from": "vlan-tag", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan-tag belongs to a vlan-range." + },{ + "from": "l3-network", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A l3-network Uses vlan-tag." + },{ + "from": "l-interface", + "to": "vlan-tag", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "!${direction}", + "default": "true", + "description":"An sub-interface that uses a vlan-tag." + },{ + "from": "vlan-range", + "to": "cloud-region", + "label": "org.onap.relationships.inventory.BelongsTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "!${direction}", + "delete-other-v": "!${direction}", + "prevent-delete": "NONE", + "default": "true", + "description":"A vlan range belongs to a cloud-region." + },{ + "from": "owning-entity", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"An owning-entity uses a vlan-range." + },{ + "from": "line-of-business", + "to": "vlan-range", + "label": "org.onap.relationships.inventory.Uses", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"A line-of uses a vlan-range" + },{ + "from": "fqdn", + "to": "l3-interface-ipv4-address-list", + "label": "org.onap.relationships.inventory.network.AppliesTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "The fqdn that applies to a l3-interface-ipv4-address-list." + },{ + "from": "fqdn", + "to": "l3-interface-ipv6-address-list", + "label": "org.onap.relationships.inventory.network.AppliesTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "The fqdn that applies to a l3-interface-ipv6-address-list." + },{ + "from": "fqdn", + "to": "vip-ipv4-address-list", + "label": "org.onap.relationships.inventory.network.AppliesTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "The fqdn that applies to a vip-ipv4-address-list." + },{ + "from": "fqdn", + "to": "vip-ipv6-address-list", + "label": "org.onap.relationships.inventory.network.AppliesTo", + "direction": "OUT", + "multiplicity": "ONE2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "The fqdn that applies to a vip-ipv6-address-list." + },{ + "from": "fqdn", + "to": "generic-vnf", + "label": "org.onap.relationships.inventory.network.AppliesTo", + "direction": "OUT", + "multiplicity": "MANY2ONE", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "The fqdn that applies to a generic-vnf." + },{ + "from": "fqdn", + "to": "fqdn", + "label": "org.onap.relationships.inventory.network.AppliesTo", + "direction": "OUT", + "multiplicity": "MANY2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description": "The dns cname record that applies to an A-record (ipv4) and/or quad-A-record (ipv6)." } ] 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 1be48d1..7f5d8fb 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 @@ -7503,28 +7503,42 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + @@ -7535,10 +7549,11 @@ - + - + + @@ -8621,40 +8636,40 @@ - + - + - + - + - + - - + + - - - + + + - - + + diff --git a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml index 795770b..122f8f9 100644 --- a/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml +++ b/aai-schema/src/main/resources/onap/oxm/v16/aai_oxm_v16.xml @@ -7570,28 +7570,42 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + @@ -7602,10 +7616,11 @@ - + - + + @@ -8684,44 +8699,44 @@ - + - + - + - + - + - + - - + + - - - + + + - - + + diff --git a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml index ef4b0c2..49e25e7 100644 --- a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml +++ b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml @@ -7647,28 +7647,42 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + @@ -7679,10 +7693,11 @@ - + - + + @@ -8761,46 +8776,46 @@ - + - + - + - + - + - + - - + + - - - + + + - - + + - + diff --git a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml index a770ba3..14b5463 100644 --- a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml +++ b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml @@ -7690,28 +7690,42 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + @@ -7722,10 +7736,11 @@ - + - + + @@ -8808,42 +8823,41 @@ - + - + - + - + - + - - + + - - - + + + - - + + - 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 825fab5..34b7289 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 @@ -7931,28 +7931,42 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + @@ -7963,10 +7977,11 @@ - + - + + @@ -9513,46 +9528,47 @@ - + - + - + - + - + - + - - + + - - + + - - + + + diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml index 121897f..c14a833 100644 --- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml +++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml @@ -742,6 +742,7 @@ + @@ -759,6 +760,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1192,7 +1245,7 @@ - + @@ -1552,7 +1605,7 @@ - + @@ -1568,7 +1621,7 @@ - + @@ -1686,7 +1739,7 @@ - + @@ -2239,8 +2292,8 @@ - - + + @@ -2403,7 +2456,7 @@ - + @@ -2615,6 +2668,11 @@ + + + + + @@ -2675,6 +2733,11 @@ + + + + + @@ -3300,11 +3363,16 @@ - - - - - + + + + + + + + + + @@ -3312,11 +3380,6 @@ - - - - - @@ -3525,14 +3588,15 @@ - - - - - - - - + + + + + + + + + @@ -4107,7 +4171,7 @@ - + @@ -4330,7 +4394,8 @@ - + @@ -4412,7 +4477,8 @@ - + @@ -4543,7 +4609,7 @@ - + @@ -4723,7 +4789,8 @@ - + @@ -5269,7 +5336,7 @@ - + @@ -6248,7 +6315,7 @@ - + @@ -6306,7 +6373,7 @@ - + @@ -6342,7 +6409,7 @@ - + @@ -7886,6 +7953,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -7929,6 +8050,9 @@ + + + @@ -7940,28 +8064,42 @@ - + - + - + - + - + - + - + - - + + + + + + + + + + + + + + + + @@ -7972,10 +8110,11 @@ - + - + + @@ -9571,7 +9710,7 @@ - + @@ -9584,7 +9723,7 @@ - + @@ -9613,11 +9752,11 @@ - + - - + + diff --git a/pom.xml b/pom.xml index b331842..d13bb1b 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.onap.aai.schema-service schema-service - 1.7.6-SNAPSHOT + 1.7.7-SNAPSHOT aai-schema-service pom diff --git a/version.properties b/version.properties index e6de6e1..317226d 100644 --- a/version.properties +++ b/version.properties @@ -4,7 +4,7 @@ # because they are used in Jenkins, whose plug-in doesn't support major_version=1 minor_version=7 -patch_version=6 +patch_version=7 base_version=${major_version}.${minor_version}.${patch_version} # Release must be completed with GIT information # in Jenkins -- 2.16.6