diff options
Diffstat (limited to 'aai-schema/src')
| -rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v30.xsd | 8 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v30/aai_oxm_v30.xml | 34 |
2 files changed, 21 insertions, 21 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v30.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v30.xsd index 204e43e..c0c53ed 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v30.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v30.xsd @@ -7380,11 +7380,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="Max Number of UEs info of slice profile",indexedProps="max-number-of-UEs-id,data-owner,data-source,data-source-version",uniqueProps="max-number-of-UEs-id",container="max-number-of-ues/",uriTemplate="/max-number-of-ues/max-number-of-ue/{max-number-of-UEs-id}",requiredProps="max-number-of-UEs-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Max Number of UEs info of slice profile",indexedProps="max-number-of-ues-id,data-owner,data-source,data-source-version",uniqueProps="max-number-of-ues-id",container="max-number-of-ues",uriTemplate="/max-number-of-ues/max-number-of-ue/{max-number-of-ues-id}",requiredProps="max-number-of-ues-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> - <xs:element name="max-number-of-UEs-id" type="xs:string" minOccurs="0"> + <xs:element name="max-number-of-ues-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique ID for the object.")</annox:annotate> @@ -8305,7 +8305,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="Geo-Coordinate info of slice profile",indexedProps="geo-coordinate-id,data-owner,data-source,data-source-version",uniqueProps="geo-coordinate-id",container="geo-points",uriTemplate="/geo-points/geo-coordinate/{geo-coordinate-id}",requiredProps="geo-coordinate-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Geo-Coordinate info of slice profile",indexedProps="geo-coordinate-id,data-owner,data-source,data-source-version",uniqueProps="geo-coordinate-id",container="geo-points",uriTemplate="/coverage-area/geo-area/{geo-area-id}/geo-points/geo-coordinate/{geo-coordinate-id}",requiredProps="geo-coordinate-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -8385,7 +8385,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="Geo-Coordinate info of slice profile",indexedProps="area-geo-coordinate-id,data-owner,data-source,data-source-version",uniqueProps="area-geo-coordinate-id",container="convex-geo-polygon/",uriTemplate="/convex-geo-polygon/area-geo-coordinate/{area-geo-coordinate-id}",requiredProps="area-geo-coordinate-id")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Geo-Coordinate info of slice profile",indexedProps="area-geo-coordinate-id,data-owner,data-source,data-source-version",uniqueProps="area-geo-coordinate-id",container="convex-geo-polygon",uriTemplate="/coverage-area/geo-area/{geo-area-id}/convex-geo-polygon/area-geo-coordinate/{area-geo-coordinate-id}",requiredProps="area-geo-coordinate-id")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> diff --git a/aai-schema/src/main/resources/onap/oxm/v30/aai_oxm_v30.xml b/aai-schema/src/main/resources/onap/oxm/v30/aai_oxm_v30.xml index 6ad93cd..717f4cc 100644 --- a/aai-schema/src/main/resources/onap/oxm/v30/aai_oxm_v30.xml +++ b/aai-schema/src/main/resources/onap/oxm/v30/aai_oxm_v30.xml @@ -16230,7 +16230,7 @@ <xml-property name="description" value="Specifies the maximum UL PDCP data volume supported by the network slice instance.The unit is MByte/day."/> </xml-properties> </xml-element> - <xml-element java-attribute="coverageArea" name="coverage-area" type="inventory.aai.onap.org.v30.GeoAreas"> + <xml-element java-attribute="coverageArea" name="coverage-area" type="inventory.aai.onap.org.v30.CoverageArea"> <xml-properties> <xml-property name="description" value="This attribute can be used as an alternative to coverage-area-TA-list when the coverage area is not specified as a list of TAs, but as a custom object (JSON string)."/> </xml-properties> @@ -16456,7 +16456,7 @@ <xml-property name="requiredProps" value="term-density-id"/> </xml-properties> </java-type> - <java-type name="GeoAreas"> + <java-type name="CoverageArea"> <xml-properties> <xml-property name="description" value="Collection of GeoArea objects."/> </xml-properties> @@ -16473,12 +16473,12 @@ <xml-property name="description" value="Unique ID for the object."/> </xml-properties> </xml-element> - <xml-element java-attribute="geoPoints" name="geo-points" required="true" type="inventory.aai.onap.org.v30.GeoCoordinates"> + <xml-element java-attribute="geoPoints" name="geo-points" required="true" type="inventory.aai.onap.org.v30.GeoPoints"> <xml-properties> <xml-property name="description" value="Geo Point info of the object."/> </xml-properties> </xml-element> - <xml-element java-attribute="convexGeoPolygon" name="convex-geo-polygon" required="true" type="inventory.aai.onap.org.v30.AreaGeoCoordinates"> + <xml-element java-attribute="convexGeoPolygon" name="convex-geo-polygon" required="true" type="inventory.aai.onap.org.v30.ConvexGeoPolygon"> <xml-properties> <xml-property name="description" value="Convex Geo Polygon Info of the object."/> </xml-properties> @@ -16515,7 +16515,7 @@ <xml-property name="requiredProps" value="geo-area-id"/> </xml-properties> </java-type> - <java-type name="GeoCoordinates"> + <java-type name="GeoPoints"> <xml-properties> <xml-property name="description" value="Collection of GeoCoordinate objects."/> </xml-properties> @@ -16575,17 +16575,17 @@ <xml-property name="indexedProps" value="geo-coordinate-id,data-owner,data-source,data-source-version"/> <xml-property name="uniqueProps" value="geo-coordinate-id"/> <xml-property name="container" value="geo-points"/> - <xml-property name="uriTemplate" value="/geo-points/geo-coordinate/{geo-coordinate-id}"/> + <xml-property name="uriTemplate" value="/coverage-area/geo-area/{geo-area-id}/geo-points/geo-coordinate/{geo-coordinate-id}"/> <xml-property name="requiredProps" value="geo-coordinate-id"/> </xml-properties> </java-type> - <java-type name="AreaGeoCoordinates"> + <java-type name="ConvexGeoPolygon"> <xml-properties> <xml-property name="description" value="Collection of GeoArea objects."/> </xml-properties> <xml-root-element name="convex-geo-polygon"/> <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="areagGeoCoordinate" name="area-geo-coordinate" type="inventory.aai.onap.org.v30.AreaGeoCoordinate"/> + <xml-element container-type="java.util.ArrayList" java-attribute="areaGeoCoordinate" name="area-geo-coordinate" type="inventory.aai.onap.org.v30.AreaGeoCoordinate"/> </java-attributes> </java-type> <java-type name="AreaGeoCoordinate"> @@ -16596,7 +16596,7 @@ <xml-property name="description" value="Unique ID for the object."/> </xml-properties> </xml-element> - <xml-element java-attribute="geoPoints" name="geo-points" required="true" type="inventory.aai.onap.org.v30.GeoCoordinates"> + <xml-element java-attribute="geoPoints" name="geo-points" required="true" type="inventory.aai.onap.org.v30.GeoPoints"> <xml-properties> <xml-property name="description" value="Unique ID for the object."/> </xml-properties> @@ -16628,8 +16628,8 @@ <xml-property name="description" value="Geo-Coordinate info of slice profile"/> <xml-property name="indexedProps" value="area-geo-coordinate-id,data-owner,data-source,data-source-version"/> <xml-property name="uniqueProps" value="area-geo-coordinate-id"/> - <xml-property name="container" value="convex-geo-polygon/"/> - <xml-property name="uriTemplate" value="/convex-geo-polygon/area-geo-coordinate/{area-geo-coordinate-id}"/> + <xml-property name="container" value="convex-geo-polygon"/> + <xml-property name="uriTemplate" value="/coverage-area/geo-area/{geo-area-id}/convex-geo-polygon/area-geo-coordinate/{area-geo-coordinate-id}"/> <xml-property name="requiredProps" value="area-geo-coordinate-id"/> </xml-properties> </java-type> @@ -16645,7 +16645,7 @@ <java-type name="MaxNumberOfUe"> <xml-root-element name="max-number-of-ue"/> <java-attributes> - <xml-element java-attribute="maxNumberOfUEsId" name="max-number-of-UEs-id" required="true" type="java.lang.String" xml-key="true"> + <xml-element java-attribute="maxNumberOfUesId" name="max-number-of-ues-id" required="true" type="java.lang.String" xml-key="true"> <xml-properties> <xml-property name="description" value="Unique ID for the object."/> </xml-properties> @@ -16685,11 +16685,11 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Max Number of UEs info of slice profile"/> - <xml-property name="indexedProps" value="max-number-of-UEs-id,data-owner,data-source,data-source-version"/> - <xml-property name="uniqueProps" value="max-number-of-UEs-id"/> - <xml-property name="container" value="max-number-of-ues/"/> - <xml-property name="uriTemplate" value="/max-number-of-ues/max-number-of-ue/{max-number-of-UEs-id}"/> - <xml-property name="requiredProps" value="max-number-of-UEs-id"/> + <xml-property name="indexedProps" value="max-number-of-ues-id,data-owner,data-source,data-source-version"/> + <xml-property name="uniqueProps" value="max-number-of-ues-id"/> + <xml-property name="container" value="max-number-of-ues"/> + <xml-property name="uriTemplate" value="/max-number-of-ues/max-number-of-ue/{max-number-of-ues-id}"/> + <xml-property name="requiredProps" value="max-number-of-ues-id"/> </xml-properties> </java-type> <java-type name="Synchronicities"> |