diff options
25 files changed, 1630 insertions, 580 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 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.6-SNAPSHOT</version> + <version>1.7.7-SNAPSHOT</version> </parent> <artifactId>aai-annotations</artifactId> <name>aai-annotations</name> 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 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.6-SNAPSHOT</version> + <version>1.7.7-SNAPSHOT</version> </parent> <artifactId>aai-queries</artifactId> <name>aai-queries</name> 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 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.6-SNAPSHOT</version> + <version>1.7.7-SNAPSHOT</version> </parent> <artifactId>aai-schema-gen</artifactId> <name>aai-schema-gen</name> 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 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.6-SNAPSHOT</version> + <version>1.7.7-SNAPSHOT</version> </parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>aai-schema-service</artifactId> 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 @@ <parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.6-SNAPSHOT</version> + <version>1.7.7-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="route-id" type="xs:string" minOccurs="0"> + <xs:element name="agg-route-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate> @@ -8614,42 +8614,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="is-private" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="is private flag.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN tag Type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN Tag Function")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="config-phase" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="route-id" type="xs:string" minOccurs="0"> + <xs:element name="agg-route-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate> @@ -8689,42 +8689,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="is-private" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="is private flag.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN tag Type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN Tag Function")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="config-phase" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="route-id" type="xs:string" minOccurs="0"> + <xs:element name="agg-route-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate> @@ -8696,42 +8696,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="is-private" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="is private flag.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN tag Type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN Tag Function")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="config-phase" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="route-id" type="xs:string" minOccurs="0"> + <xs:element name="agg-route-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate> @@ -8745,42 +8745,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="is-private" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="is private flag.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN tag Type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN Tag Function")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="config-phase" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="route-id" type="xs:string" minOccurs="0"> + <xs:element name="agg-route-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate> @@ -9408,42 +9408,63 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0"> + <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="is-private" type="xs:boolean" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="is private flag.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN tag Type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN Tag Function")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="config-phase" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> 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" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1237,7 +1237,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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -1567,7 +1567,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="flavor-name" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cloud Region Flavor name")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Flavor name")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -2098,6 +2098,148 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="vlan-tag"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Vlan Tag Id")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role assigned to this vlan-tag")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-id-inner" type="xs:unsignedInt" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Inner VLAN tag")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-id-outer" type="xs:unsignedInt" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Outer VLAN tag")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="is-private" type="xs:boolean" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="is private flag.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN tag Type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-tag-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN Tag Function")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="config-phase" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The config-phase associated with this vlan-tag")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="vlan-tags"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Vlan Tags Assigned out of a Vlan Range")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:vlan-tag" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="vlan-range"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="vlan-range-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="vlan id in range UUID.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-id-lower" type="xs:unsignedInt" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vlan id in range lower")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-id-upper" type="xs:unsignedInt" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vlan id in range upper")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="vlan-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="vlan type")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:vlan-tags" minOccurs="0"/> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="vlan-ranges"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:vlan-range" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="esr-system-info"> <xs:complexType> <xs:annotation> @@ -2387,6 +2529,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:relationship-list" minOccurs="0"/> <xs:element ref="tns:vip-ipv4-address-list" minOccurs="0" maxOccurs="5000"/> <xs:element ref="tns:vip-ipv6-address-list" minOccurs="0" maxOccurs="5000"/> + <xs:element ref="tns:vlan-ranges" minOccurs="0"/> <xs:element ref="tns:hpa-capabilities" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -2902,6 +3045,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="min-links" type="xs:int" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Minimum links in service before a LAG should be taken out of service")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element ref="tns:relationship-list" minOccurs="0"/> <xs:element ref="tns:l-interfaces" minOccurs="0"/> </xs:sequence> @@ -2956,7 +3106,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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -3674,6 +3824,266 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="logical-link"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="link-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@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.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="link-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="speed-value" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="speed-units" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="available-capacity" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="admin-state" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="ip-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="routing-protocol" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="model-version-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@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}")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="widget-model-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="widget-model-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@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.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="operational-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="prov-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="link-role" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="link-name2" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="link-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="circuit-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit id")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="purpose" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="logical-links"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="network-policy"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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}")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="network-policy-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the policy")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the policy")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="latency" type="xs:int" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@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.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="jitter" type="xs:int" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="max-bandwidth" type="xs:int" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="reliability" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="network-policies"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="allotted-resource"> <xs:complexType> <xs:annotation> @@ -4184,17 +4594,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="reliability" minOccurs="0"> + <xs:element name="max-bandwidth" type="xs:int" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="max-bandwidth" type="xs:int" minOccurs="0"> + <xs:element name="reliability" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for an network slice subnet instance, expressed as a percentage.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -4267,7 +4677,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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4295,7 +4705,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="reserved, static, dhcp.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of IP address, eg., Reserved, Static, DHCP.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -4346,32 +4756,32 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="endpoint-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="ID of endpoint.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="ID of an endpoint.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="endpoint-name" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of endpoint.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of an endpoint.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="endpoint-type" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of endpoint.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of an endpoint.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> <xs:element name="logical-interface-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID, MPLS label.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element ref="tns:ip-address-list" minOccurs="0"/> + <xs:element ref="tns:ip-address-list" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> </xs:complexType> @@ -4380,7 +4790,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="Collection of endpoints.")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Endpoint objects.")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -4571,13 +4981,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - <xs:element ref="tns:metadata" minOccurs="0"/> - <xs:element ref="tns:allotted-resources" minOccurs="0"/> - <xs:element ref="tns:communication-service-profiles" minOccurs="0"/> - <xs:element ref="tns:service-profiles" minOccurs="0"/> - <xs:element ref="tns:slice-profiles" minOccurs="0"/> - <xs:element ref="tns:endpoints" minOccurs="0"/> <xs:element name="service-function" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -4585,6 +4988,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + <xs:element ref="tns:metadata" minOccurs="0"/> + <xs:element ref="tns:allotted-resources" minOccurs="0"/> + <xs:element ref="tns:communication-service-profiles" minOccurs="0"/> + <xs:element ref="tns:service-profiles" minOccurs="0"/> + <xs:element ref="tns:slice-profiles" minOccurs="0"/> + <xs:element ref="tns:endpoints" minOccurs="0"/> <xs:element name="operational-status" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -5167,7 +5577,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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5197,7 +5607,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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5231,7 +5641,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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -5332,6 +5742,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="sdnc-model-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The CDS blue print name associated with the resource.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="sdnc-model-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The version of the CDS blue print.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="resource-version" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -5374,6 +5798,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="model-role" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Role of the model,e.g.,NST,NSST,CST,etc")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="resource-version" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> @@ -5546,177 +5977,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="logical-link"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@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")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="link-name" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="e.g., evc-name, or vnf-nameA_interface-nameA_vnf-nameZ_interface-nameZ")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="in-maint" type="xs:boolean" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="link-type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of logical link, e.g., evc")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="speed-value" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the numeric part of the speed")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="speed-units" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="available-capacity" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the units corresponding to the speed")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="admin-state" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Captures the administrative state of the link")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ip-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="v4, v6, or ds for dual stack")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="routing-protocol" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="For example, static or BGP")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-invariant-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@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")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="model-version-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@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}")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="widget-model-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC data dictionary widget model. This maps directly to the A&AI widget.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="widget-model-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operational-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of operational status of the logical link.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="prov-status" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Trigger for operational monitoring of this VNF by BAU Service Assurance systems.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="link-role" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indication of the network use of the logical link.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="link-name2" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Alias or alternate name (CLCI or D1 name).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="link-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="UUID of the logical-link, SDNC generates this.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="circuit-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Circuit id")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="purpose" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Reason for this entity, role it is playing")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="logical-links"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of logical connections")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:logical-link" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="class-of-service"> <xs:complexType> <xs:annotation> @@ -6704,7 +6964,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(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}")</annox:annotate> + <annox:annotate target="class">@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}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -7072,11 +7332,11 @@ 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="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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="route-id" type="xs:string" minOccurs="0"> + <xs:element name="agg-route-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of the aggregate-route instance")</annox:annotate> @@ -7345,95 +7605,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="network-policy"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@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}")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="network-policy-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID representing unique key to this instance")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="network-policy-fqdn" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Contrail FQDN for the policy")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="heat-stack-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ID for the openStack Heat instance")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="name" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of the policy.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="type" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of the policy.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="latency" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="jitter" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="jitter")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="max-bandwidth" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="reliability" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The reliability requirement for a transport slice network, expressed as a percentage.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="network-policies"> - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:network-policy" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="vf-module"> <xs:complexType> <xs:annotation> @@ -7581,7 +7752,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General 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")</annox:annotate> + <annox:annotate target="class">@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")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -8274,6 +8445,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="vrf-group-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Bridge domain group name")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element ref="tns:route-targets" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> @@ -9669,67 +9847,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="vlan-tag"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(namespace="network",container="vlan-tags",uniqueProps="vlan-tag-id",uriTemplate="/network/vlan-tags/vlan-tag/{vlan-tag-id}")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element name="vlan-tag-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID of the vlan-tag")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vlan-tag-role" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="purpose (l3-network to be connected to)")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vlan-id-inner" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN inner id")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="vlan-id-outer" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="VLAN outer id")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="is-private" type="xs:boolean" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="is VLAN private?")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="resource-version" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="vlan-tags"> - <xs:complexType> - <xs:sequence> - <xs:element ref="tns:vlan-tag" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="connectivity"> <xs:complexType> <xs:annotation> @@ -10783,6 +10900,67 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="fqdn"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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}")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="fqdn" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Fully qualified domain name.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="fqdn-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to categorize this object in conjunction with role & function. The most generic category.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="fqdn-role" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to categorize this object in conjunction with type & function.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="fqdn-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used to categorize this object in conjunction with type & role. The most specific category.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="dns-domain" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Domain name.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="fqdns"> + <xs:complexType> + <xs:sequence> + <xs:element ref="tns:fqdn" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="network"> <xs:complexType> <xs:annotation> @@ -10821,6 +10999,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element ref="tns:devices" minOccurs="0"/> <xs:element ref="tns:wan-port-configs" minOccurs="0"/> <xs:element ref="tns:ext-aai-networks" minOccurs="0"/> + <xs:element ref="tns:fqdns" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> @@ -10928,6 +11107,72 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> + <xs:element name="profile"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@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")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element name="profile-name" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Name of the profile")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="profile-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of profile (ex,network-power-profile)")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="profile-characteristics" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Set of characteristics of the profile.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="profile-subtype" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Descriptive subtype.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="profile-selflink" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="resource-version" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency. Must be empty on create, valid on update and delete.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element ref="tns:relationship-list" minOccurs="0"/> + </xs:sequence> + </xs:complexType> + </xs:element> + <xs:element name="profiles"> + <xs:complexType> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of profiles")</annox:annotate> + </xs:appinfo> + </xs:annotation> + <xs:sequence> + <xs:element ref="tns:profile" minOccurs="0" maxOccurs="5000"/> + </xs:sequence> + </xs:complexType> + </xs:element> <xs:element name="common"> <xs:complexType> <xs:annotation> @@ -10937,6 +11182,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:annotation> <xs:sequence> <xs:element ref="tns:contacts" minOccurs="0"/> + <xs:element ref="tns:profiles" minOccurs="0"/> </xs:sequence> </xs:complexType> </xs:element> 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 @@ -289,6 +289,18 @@ "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", "label": "org.onap.relationships.inventory.BelongsTo", @@ -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":"" @@ -3278,6 +3290,18 @@ "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", "label": "org.onap.relationships.inventory.BelongsTo", @@ -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 @@ <java-attributes> <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique ID of the vlan-tag"/> + <xml-property name="description" value="Vlan Tag Id"/> </xml-properties> </xml-element> <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="purpose (l3-network to be connected to)"/> + <xml-property name="description" value="Role assigned to this vlan-tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN inner id"/> + <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN outer id"/> + <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> + <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="is VLAN private?"/> + <xml-property name="description" value="is private flag."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN tag Type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN Tag Function"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The config-phase associated with this vlan-tag"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -7535,10 +7549,11 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> + <xml-property name="dependentOn" value="vlan-range"/> <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -8621,40 +8636,40 @@ <java-type name="AggregateRoute"> <xml-root-element name="aggregate-route"/> <java-attributes> - <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of the aggregate-route instance"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the forwarding-path"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CIDR-mask for aggregate route subnet"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v15.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="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. "/> - <xml-property name="uniqueProps" value="route-id"/> - <xml-property name="container" value="aggregate-routes"/> + <xml-property name="description" value="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. "/> + <xml-property name="uniqueProps" value="agg-route-id"/> + <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> - <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/> - <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> + <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> </xml-properties> </java-type> 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 @@ <java-attributes> <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique ID of the vlan-tag"/> + <xml-property name="description" value="Vlan Tag Id"/> </xml-properties> </xml-element> <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="purpose (l3-network to be connected to)"/> + <xml-property name="description" value="Role assigned to this vlan-tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN inner id"/> + <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN outer id"/> + <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> + <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="is VLAN private?"/> + <xml-property name="description" value="is private flag."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN tag Type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN Tag Function"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The config-phase associated with this vlan-tag"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -7602,10 +7616,11 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> + <xml-property name="dependentOn" value="vlan-range"/> <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -8684,44 +8699,44 @@ <xml-element container-type="java.util.ArrayList" java-attribute="aggregateRoute" name="aggregate-route" type="inventory.aai.onap.org.v16.AggregateRoute"/> </java-attributes> </java-type> - + <java-type name="AggregateRoute"> <xml-root-element name="aggregate-route"/> <java-attributes> - <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of the aggregate-route instance"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the forwarding-path"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CIDR-mask for aggregate route subnet"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v16.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="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. "/> - <xml-property name="uniqueProps" value="route-id"/> - <xml-property name="container" value="aggregate-routes"/> + <xml-property name="description" value="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. "/> + <xml-property name="uniqueProps" value="agg-route-id"/> + <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> - <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/> - <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> + <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> </xml-properties> </java-type> 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 @@ <java-attributes> <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique ID of the vlan-tag"/> + <xml-property name="description" value="Vlan Tag Id"/> </xml-properties> </xml-element> <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="purpose (l3-network to be connected to)"/> + <xml-property name="description" value="Role assigned to this vlan-tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN inner id"/> + <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN outer id"/> + <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> + <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="is VLAN private?"/> + <xml-property name="description" value="is private flag."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN tag Type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN Tag Function"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The config-phase associated with this vlan-tag"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -7679,10 +7693,11 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> + <xml-property name="dependentOn" value="vlan-range"/> <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -8761,46 +8776,46 @@ <xml-element container-type="java.util.ArrayList" java-attribute="aggregateRoute" name="aggregate-route" type="inventory.aai.onap.org.v17.AggregateRoute"/> </java-attributes> </java-type> - + <java-type name="AggregateRoute"> <xml-root-element name="aggregate-route"/> <java-attributes> - <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of the aggregate-route instance"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the forwarding-path"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CIDR-mask for aggregate route subnet"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="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. "/> - <xml-property name="uniqueProps" value="route-id"/> - <xml-property name="container" value="aggregate-routes"/> + <xml-property name="description" value="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. "/> + <xml-property name="uniqueProps" value="agg-route-id"/> + <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> - <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/> - <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> + <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> </xml-properties> </java-type> - + </java-types> </xml-bindings> 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 @@ <java-attributes> <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique ID of the vlan-tag"/> + <xml-property name="description" value="Vlan Tag Id"/> </xml-properties> </xml-element> <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="purpose (l3-network to be connected to)"/> + <xml-property name="description" value="Role assigned to this vlan-tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN inner id"/> + <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN outer id"/> + <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> + <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="is VLAN private?"/> + <xml-property name="description" value="is private flag."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN tag Type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN Tag Function"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The config-phase associated with this vlan-tag"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -7722,10 +7736,11 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> + <xml-property name="dependentOn" value="vlan-range"/> <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -8808,42 +8823,41 @@ <java-type name="AggregateRoute"> <xml-root-element name="aggregate-route"/> <java-attributes> - <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of the aggregate-route instance"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the forwarding-path"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CIDR-mask for aggregate route subnet"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="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. "/> - <xml-property name="uniqueProps" value="route-id"/> - <xml-property name="container" value="aggregate-routes"/> + <xml-property name="description" value="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. "/> + <xml-property name="uniqueProps" value="agg-route-id"/> + <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> - <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/> - <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> + <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> </xml-properties> </java-type> - </java-types> </xml-bindings> 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 @@ <java-attributes> <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique ID of the vlan-tag"/> + <xml-property name="description" value="Vlan Tag Id"/> </xml-properties> </xml-element> <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="purpose (l3-network to be connected to)"/> + <xml-property name="description" value="Role assigned to this vlan-tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN inner id"/> + <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN outer id"/> + <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> + <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="is VLAN private?"/> + <xml-property name="description" value="is private flag."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN tag Type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN Tag Function"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The config-phase associated with this vlan-tag"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -7963,10 +7977,11 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> + <xml-property name="dependentOn" value="vlan-range"/> <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -9513,46 +9528,47 @@ <xml-element container-type="java.util.ArrayList" java-attribute="aggregateRoute" name="aggregate-route" type="inventory.aai.onap.org.v19.AggregateRoute"/> </java-attributes> </java-type> - + <java-type name="AggregateRoute"> <xml-root-element name="aggregate-route"/> <java-attributes> - <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of the aggregate-route instance"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="networkStartAddress" name="network-start-address" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Name of the forwarding-path"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="cidrMask" name="cidr-mask" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="CIDR-mask for aggregate route subnet"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="ipVersion" name="ip-version" required="true" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Identifies is aggregate route is ipv4 or ipv6"/> </xml-properties> - </xml-element> + </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> - </xml-element> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="description" value="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. "/> - <xml-property name="uniqueProps" value="route-id"/> + <xml-property name="description" value="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. "/> + <xml-property name="uniqueProps" value="agg-route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> - <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/> - <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> + <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> </xml-properties> </java-type> + <java-type name="CommunicationServiceProfiles"> <xml-properties> <xml-property name="description" value="Collection of communication service profile."/> 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 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv4AddressList" name="vip-ipv4-address-list" type="inventory.aai.onap.org.v20.VipIpv4AddressList"/> <xml-element container-type="java.util.ArrayList" java-attribute="vipIpv6AddressList" name="vip-ipv6-address-list" type="inventory.aai.onap.org.v20.VipIpv6AddressList"/> + <xml-element java-attribute="vlanRanges" name="vlan-ranges" type="inventory.aai.onap.org.v20.VlanRanges"/> <xml-element java-attribute="hpaCapabilities" name="hpa-capabilities" type="inventory.aai.onap.org.v20.HpaCapabilities"> <xml-properties> <xml-property name="description" value="List of cloud-region specific HPA Capabilities"/> @@ -759,6 +760,58 @@ <xml-property name="requiredProps" value="cloud-owner,cloud-region-id,orchestration-disabled,in-maint"/> </xml-properties> </java-type> + + <java-type name="VlanRanges"> + <xml-root-element name="vlan-ranges"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="vlanRange" name="vlan-range" type="inventory.aai.onap.org.v20.VlanRange"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="VlanRange"> + <xml-root-element name="vlan-range"/> + <java-attributes> + <xml-element java-attribute="vlanRangeId" name="vlan-range-id" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="vlan id in range UUID."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdLower" name="vlan-id-lower" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range lower"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanIdUpper" name="vlan-id-upper" required="true" type="java.lang.Long"> + <xml-properties> + <xml-property name="description" value="vlan id in range upper"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanType" name="vlan-type" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="vlan type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v20.VlanTags"/> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="Definition of vlan range"/> + <xml-property name="indexedProps" value="vlan-range-id,vlan-type"/> + <xml-property name="dependentOn" value="cloud-region"/> + <xml-property name="container" value="vlan-ranges"/> + <xml-property name="uriTemplate" value="/vlan-ranges/vlan-range/{vlan-range-id}"/> + <xml-property name="searchable" value="vlan-range-id"/> + <xml-property name="requiredProps" value="vlan-range-id,vlan-id-lower,vlan-id-upper,vlan-type"/> + </xml-properties> + </java-type> + <java-type name="VolumeGroups"> <xml-properties> <xml-property name="description" value="Collection of persistent block-level storage."/> @@ -1192,7 +1245,7 @@ <xml-properties> <xml-property name="description" value="Virtual Servers, aka virtual machine or VM."/> <xml-property name="nameProps" value="vserver-name"/> - <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,in-maint,vserver-name2"/> + <xml-property name="indexedProps" value="is-closed-loop-disabled,prov-status,vserver-name,vserver-id,vserver-name2"/> <xml-property name="searchable" value="vserver-id,vserver-name,vserver-name2,operational-status"/> <xml-property name="dependentOn" value="tenant"/> <xml-property name="container" value="vservers"/> @@ -1552,7 +1605,7 @@ <xml-property name="description" value="Flag indicating the interface uses the IP Unnumbered configuration."/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" type="java.lang.Boolean"> + <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> <xml-property name="defaultValue" value="false"/> <xml-property name="description" value="Private VLAN indicator."/> @@ -1568,7 +1621,7 @@ <xml-property name="dependentOn" value="l-interface"/> <xml-property name="container" value="vlans"/> <xml-property name="uriTemplate" value="/vlans/vlan/{vlan-interface}"/> - <xml-property name="requiredProps" value="vlan-interface,in-maint,is-ip-unnumbered"/> + <xml-property name="requiredProps" value="vlan-interface,in-maint,is-ip-unnumbered,is-private"/> </xml-properties> </java-type> @@ -1686,7 +1739,7 @@ </xml-element> <xml-element java-attribute="flavorName" name="flavor-name" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Cloud Region Flavor name"/> + <xml-property name="description" value="Flavor name"/> </xml-properties> </xml-element> <xml-element java-attribute="flavorVcpus" name="flavor-vcpus" type="java.lang.Integer"> @@ -2239,8 +2292,8 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Compute host whose hostname must be unique and must exactly match what is sent as a relationship to a vserver."/> - <xml-property name="nameProps" value="pserver-name2"/> - <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,prov-status,ptnii-equip-name"/> + <xml-property name="nameProps" value="pserver-name2,fqdn"/> + <xml-property name="indexedProps" value="hostname,pserver-id,pserver-name2,inv-status,fqdn,prov-status,ptnii-equip-name"/> <xml-property name="searchable" value="hostname,pserver-name2,pserver-id,ipv4-oam-address,operational-status"/> <xml-property name="uniqueProps" value="hostname"/> <xml-property name="container" value="pservers"/> @@ -2403,7 +2456,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Physical interface (e.g., nic)"/> - <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/> + <xml-property name="indexedProps" value="interface-name,prov-status,network-ref,operational-status,interface-role,interface-name2"/> <xml-property name="nameProps" value="prov-status"/> <xml-property name="dependentOn" value="vpls-pe,pserver,pnf"/> <xml-property name="container" value="p-interfaces"/> @@ -2615,6 +2668,11 @@ <xml-property name="description" value="used to indicate whether or not this object is in maintenance mode (maintenance mode = true)"/> </xml-properties> </xml-element> + <xml-element java-attribute="minLinks" name="min-links" type="java.lang.Integer"> + <xml-properties> + <xml-property name="description" value="Minimum links in service before a LAG should be taken out of service"/> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v20.LInterfaces"/> </java-attributes> @@ -2675,6 +2733,11 @@ <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> </xml-properties> </xml-element> + <xml-element java-attribute="vrfGroupName" name="vrf-group-name" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Bridge domain group name"/> + </xml-properties> + </xml-element> <xml-element java-attribute="routeTargets" name="route-targets" type="inventory.aai.onap.org.v20.RouteTargets"/> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> </java-attributes> @@ -3300,11 +3363,16 @@ <xml-property name="description" value="Orchestration status of this service."/> </xml-properties> </xml-element> - <xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop."/> - </xml-properties> - </xml-element> + <xml-element java-attribute="inputParameters" name="input-parameters" required="false" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="String capturing request parameters from SO to pass to Closed Loop."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="serviceFunction" name="service-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="String capturing function of the service."/> + </xml-properties> + </xml-element> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v20.Metadata"/> <xml-element java-attribute="allottedResources" name="allotted-resources" type="inventory.aai.onap.org.v20.AllottedResources"/> @@ -3312,11 +3380,6 @@ <xml-element java-attribute="serviceProfiles" name="service-profiles" type="inventory.aai.onap.org.v20.ServiceProfiles"/> <xml-element java-attribute="sliceProfiles" name="slice-profiles" type="inventory.aai.onap.org.v20.SliceProfiles"/> <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v20.Endpoints"/> - <xml-element java-attribute="serviceFunction" name="service-function" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="String capturing function of the service."/> - </xml-properties> - </xml-element> <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Indicator for whether the resource is considered operational. Valid values are in-service-path and out-of-service-path."/> @@ -3525,14 +3588,15 @@ <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v20.ForwardingPaths"/> <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v20.Collections"/> <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v20.VlanTags"/> - <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v20.Connectivities"/> - <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v20.LanPortConfigs"/> - <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v20.NetworkResources"/> - <xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v20.SiteResources"/> - <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v20.SdwanVpns"/> - <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v20.Devices"/> - <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v20.WanPortConfigs"/> - <xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v20.ExtAaiNetworks"/> + <xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v20.Connectivities"/> + <xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v20.LanPortConfigs"/> + <xml-element java-attribute="networkResources" name="network-resources" type="inventory.aai.onap.org.v20.NetworkResources"/> + <xml-element java-attribute="siteResources" name="site-resources" type="inventory.aai.onap.org.v20.SiteResources"/> + <xml-element java-attribute="sdwanVpns" name="sdwan-vpns" type="inventory.aai.onap.org.v20.SdwanVpns"/> + <xml-element java-attribute="devices" name="devices" type="inventory.aai.onap.org.v20.Devices"/> + <xml-element java-attribute="wanPortConfigs" name="wan-port-configs" type="inventory.aai.onap.org.v20.WanPortConfigs"/> + <xml-element java-attribute="extAaiNetworks" name="ext-aai-networks" type="inventory.aai.onap.org.v20.ExtAaiNetworks"/> + <xml-element java-attribute="fqdns" name="fqdns" type="inventory.aai.onap.org.v20.Fqdns"/> </java-attributes> </java-type> <java-type name="Configurations"> @@ -4107,7 +4171,7 @@ <xml-properties> <xml-property name="description" value="VPN binding"/> <xml-property name="nameProps" value="vpn-name,vpn-type"/> - <xml-property name="indexedProps" value="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"/> + <xml-property name="indexedProps" value="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"/> <xml-property name="searchable" value="vpn-id,vpn-name"/> <xml-property name="uniqueProps" value="vpn-id"/> <xml-property name="container" value="vpn-bindings"/> @@ -4330,7 +4394,8 @@ <xml-properties> <xml-property name="description" value="Virtual Customer Edge Router, used specifically for Gamma. This object is deprecated."/> <xml-property name="nameProps" value="vnf-name"/> - <xml-property name="indexedProps" value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/> + <xml-property name="indexedProps" + value="vnf-name,vnf-name2,vnf-type,heat-stack-id,vnf-id,regional-resource-zone,vpe-id,prov-status,service-id,orchestration-status"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="vces"/> @@ -4412,7 +4477,8 @@ <xml-properties> <xml-property name="description" value="Used to capture the network interfaces of this VCE"/> <xml-property name="nameProps" value="port-group-name"/> - <xml-property name="indexedProps" value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/> + <xml-property name="indexedProps" + value="port-group-id,heat-stack-id,interface-id,switch-name,interface-role,orchestration-status"/> <xml-property name="dependentOn" value="vce"/> <xml-property name="container" value="port-groups"/> <xml-property name="uriTemplate" value="/port-groups/port-group/{interface-id}"/> @@ -4543,7 +4609,7 @@ <xml-element container-type="java.util.ArrayList" java-attribute="l3InterfaceIpv6AddressList" name="l3-interface-ipv6-address-list" type="inventory.aai.onap.org.v20.L3InterfaceIpv6AddressList"/> </java-attributes> <xml-properties> - <xml-property name="indexedProps" value="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"/> + <xml-property name="indexedProps" value="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"/> <xml-property name="searchable" value="vnfc-name"/> <xml-property name="container" value="vnfcs"/> <xml-property name="namespace" value="network"/> @@ -4723,7 +4789,8 @@ <xml-properties> <xml-property name="description" value="Generic network definition"/> <xml-property name="nameProps" value="network-name"/> - <xml-property name="indexedProps" value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> + <xml-property name="indexedProps" + value="heat-stack-id,service-id,network-id,network-name,model-invariant-id,model-version-id,widget-model-id,widget-model-version,contrail-network-fqdn,network-role,orchestration-status"/> <xml-property name="searchable" value="network-id,network-name"/> <xml-property name="uniqueProps" value="network-id"/> <xml-property name="container" value="l3-networks"/> @@ -5269,7 +5336,7 @@ <xml-properties> <xml-property name="description" value="General purpose VNF"/> <xml-property name="nameProps" value="vnf-name"/> - <xml-property name="indexedProps" value="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"/> + <xml-property name="indexedProps" value="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"/> <xml-property name="searchable" value="vnf-id,vnf-name,vnf-name2,operational-status"/> <xml-property name="uniqueProps" value="vnf-id"/> <xml-property name="container" value="generic-vnfs"/> @@ -6248,7 +6315,7 @@ <xml-property name="uniqueProps" value="model-element-uuid"/> <xml-property name="indexedProps" value="model-element-uuid"/> <xml-property name="allowDirectRead" value="true"/> - <xml-property name="dependentOn" value="model-element,element-choice-set,model-ver"/> + <xml-property name="dependentOn" value="element-choice-set,model-element,model-ver"/> <xml-property name="allowDirectWrite" value="false"/> <xml-property name="container" value="model-elements"/> <xml-property name="uriTemplate" value="/model-elements/model-element/{model-element-uuid}"/> @@ -6306,7 +6373,7 @@ <xml-property name="indexedProps" value="model-constraint-uuid"/> <xml-property name="allowDirectRead" value="true"/> <xml-property name="allowDirectWrite" value="false"/> - <xml-property name="dependentOn" value="model-element,"/> + <xml-property name="dependentOn" value="model-element"/> <xml-property name="container" value="model-constraints"/> <xml-property name="uriTemplate" value="/model-constraints/model-constraint/{model-constraint-uuid}"/> <xml-property name="requiredProps" value="model-constraint-uuid,constrained-element-set-uuid-to-replace"/> @@ -6342,7 +6409,7 @@ <xml-property name="indexedProps" value="constrained-element-set-uuid"/> <xml-property name="allowDirectRead" value="true"/> <xml-property name="allowDirectWrite" value="false"/> - <xml-property name="dependentOn" value="model-element,model-constraint"/> + <xml-property name="dependentOn" value="model-constraint,model-element"/> <xml-property name="container" value="constrained-element-sets"/> <xml-property name="uriTemplate" value="/constrained-element-sets/constrained-element-set/{constrained-element-set-uuid}"/> <xml-property name="requiredProps" value="constrained-element-set-uuid,constraint-type,check-type"/> @@ -7886,6 +7953,60 @@ </xml-properties> </java-type> + <java-type name="Fqdns"> + <xml-root-element name="fqdns"/> + <java-attributes> + <xml-element container-type="java.util.ArrayList" java-attribute="fqdn" name="fqdn" type="inventory.aai.onap.org.v20.Fqdn"/> + </java-attributes> + <xml-properties> + </xml-properties> + </java-type> + + <java-type name="Fqdn"> + <xml-root-element name="fqdn"/> + <java-attributes> + <xml-element java-attribute="fqdn" name="fqdn" required="true" type="java.lang.String" xml-key="true"> + <xml-properties> + <xml-property name="description" value="Fully qualified domain name."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="fqdnType" name="fqdn-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used to categorize this object in conjunction with role & function. The most generic category."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="fqdnRole" name="fqdn-role" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used to categorize this object in conjunction with type & function."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="fqdnFunction" name="fqdn-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used to categorize this object in conjunction with type & role. The most specific category."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="dnsDomain" name="dns-domain" required="true" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Domain name."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Used for optimistic concurrency. Must be empty on create, valid on update and delete."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> + </java-attributes> + <xml-properties> + <xml-property name="description" value="A fully qualified domain name (FQDN) is the complete domain name for a specific computer, or host, on the internet."/> + <xml-property name="requiredProps" value="fqdn,dns-domain"/> + <xml-property name="indexedProps" value="fqdn"/> + <xml-property name="namespace" value="network"/> + <xml-property name="container" value="fqdns"/> + <xml-property name="uriTemplate" value="/network/fqdns/fqdn/{fqdn}"/> + </xml-properties> + </java-type> + <java-type name="Cps"> <xml-properties> <xml-property name="description" value="Collection of connection points."/> @@ -7929,6 +8050,9 @@ </java-type> <java-type name="VlanTags"> + <xml-properties> + <xml-property name="description" value="Vlan Tags Assigned out of a Vlan Range"/> + </xml-properties> <xml-root-element name="vlan-tags"/> <java-attributes> <xml-element container-type="java.util.ArrayList" java-attribute="vlanTag" name="vlan-tag" type="inventory.aai.onap.org.v20.VlanTag"/> @@ -7940,28 +8064,42 @@ <java-attributes> <xml-element java-attribute="vlanTagId" name="vlan-tag-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> - <xml-property name="description" value="Unique ID of the vlan-tag"/> + <xml-property name="description" value="Vlan Tag Id"/> </xml-properties> </xml-element> <xml-element java-attribute="vlanTagRole" name="vlan-tag-role" required="true" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="purpose (l3-network to be connected to)"/> + <xml-property name="description" value="Role assigned to this vlan-tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdInner" name="vlan-id-inner" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN inner id"/> + <xml-property name="description" value="Inner VLAN tag"/> </xml-properties> </xml-element> - <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Integer"> + <xml-element java-attribute="vlanIdOuter" name="vlan-id-outer" required="true" type="java.lang.Long"> <xml-properties> - <xml-property name="description" value="VLAN outer id"/> + <xml-property name="description" value="Outer VLAN tag"/> </xml-properties> </xml-element> - <xml-element default-value="false" java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> + <xml-element java-attribute="isPrivate" name="is-private" required="true" type="java.lang.Boolean"> <xml-properties> - <xml-property name="defaultValue" value="false"/> - <xml-property name="description" value="is VLAN private?"/> + <xml-property name="description" value="is private flag."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagType" name="vlan-tag-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN tag Type"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="vlanTagFunction" name="vlan-tag-function" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="VLAN Tag Function"/> + </xml-properties> + </xml-element> + <xml-element java-attribute="configPhase" name="config-phase" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="The config-phase associated with this vlan-tag"/> </xml-properties> </xml-element> <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String"> @@ -7972,10 +8110,11 @@ <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> </java-attributes> <xml-properties> - <xml-property name="namespace" value="network"/> + <xml-property name="description" value="vlan tag information"/> <xml-property name="container" value="vlan-tags"/> - <xml-property name="uniqueProps" value="vlan-tag-id"/> + <xml-property name="dependentOn" value="vlan-range"/> <xml-property name="uriTemplate" value="/network/vlan-tags/vlan-tag/{vlan-tag-id}"/> + <xml-property name="requiredProps" value="vlan-tag-id,vlan-tag-role,is-private"/> </xml-properties> </java-type> @@ -9571,7 +9710,7 @@ </xml-properties> </java-type> - <java-type name="AggregateRoutes"> + <java-type name="AggregateRoutes"> <xml-properties> <xml-property name="description" value="Collection of aggregate routes."/> </xml-properties> @@ -9584,7 +9723,7 @@ <java-type name="AggregateRoute"> <xml-root-element name="aggregate-route"/> <java-attributes> - <xml-element java-attribute="routeId" name="route-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="aggRouteId" name="agg-route-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique id of the aggregate-route instance"/> </xml-properties> @@ -9613,11 +9752,11 @@ </java-attributes> <xml-properties> <xml-property name="description" value="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. "/> - <xml-property name="uniqueProps" value="route-id"/> + <xml-property name="uniqueProps" value="agg-route-id"/> <xml-property name="container" value="aggregate-routes"/> <xml-property name="dependentOn" value="l3-network"/> - <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{route-id}"/> - <xml-property name="requiredProps" value="route-id,network-start-address,cidr-mask,ip-version"/> + <xml-property name="uriTemplate" value="/aggregate-routes/aggregate-route/{agg-route-id}"/> + <xml-property name="requiredProps" value="agg-route-id,network-start-address,cidr-mask,ip-version"/> </xml-properties> </java-type> <java-type name="CommunicationServiceProfiles"> @@ -30,7 +30,7 @@ </parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.6-SNAPSHOT</version> + <version>1.7.7-SNAPSHOT</version> <name>aai-schema-service</name> <packaging>pom</packaging> <modules> 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 |