diff options
| -rw-r--r-- | aai-annotations/pom.xml | 2 | ||||
| -rw-r--r-- | aai-queries/pom.xml | 2 | ||||
| -rw-r--r-- | aai-schema-gen/pom.xml | 2 | ||||
| -rw-r--r-- | aai-schema-service/pom.xml | 2 | ||||
| -rw-r--r-- | aai-schema/pom.xml | 2 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd | 648 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd | 691 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json | 14 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json | 14 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml | 105 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml | 105 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | version.properties | 2 |
13 files changed, 550 insertions, 1041 deletions
diff --git a/aai-annotations/pom.xml b/aai-annotations/pom.xml index 887b634..55806e5 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.8-SNAPSHOT</version> + <version>1.7.9-SNAPSHOT</version> </parent> <artifactId>aai-annotations</artifactId> <name>aai-annotations</name> diff --git a/aai-queries/pom.xml b/aai-queries/pom.xml index 185ace3..51f8590 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.8-SNAPSHOT</version> + <version>1.7.9-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 134ee9e..b19e545 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.8-SNAPSHOT</version> + <version>1.7.9-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 1d4441b..b0f7f75 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.8-SNAPSHOT</version> + <version>1.7.9-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 4169a9d..1957c0f 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.8-SNAPSHOT</version> + <version>1.7.9-SNAPSHOT</version> </parent> <artifactId>aai-schema</artifactId> <name>aai-schema</name> 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 23430d2..78fc166 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 @@ -3824,266 +3824,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="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> @@ -4219,8 +3959,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:annotation> </xs:element> <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/> - <xs:element ref="tns:logical-links" minOccurs="0"/> - <xs:element ref="tns:network-policies" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> </xs:complexType> @@ -4673,131 +4411,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="ip-address"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <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> - <xs:element name="ip-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ip-address-end" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IP address end range.")</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="IP version, either 4 or 6.")</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 IP address, eg., Reserved, Static, DHCP.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="assignment" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="assignment.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operator" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operator to apply to the port (greater than, less than, etc).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="length" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip-address prefix length, 32 for single address.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="ip-address-list"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="List of IP addresses.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:ip-address" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="endpoint"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Endpoint object.",uniqueProps="endpoint-id",indexedProps="endpoint-id",container="endpoints",uriTemplate="/endpoints/endpoint/{endpoint-id}",searcheable="endpoint-id",requiredProps="endpoint-id")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <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 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 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 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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:ip-address-list" minOccurs="0"/> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="endpoints"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Endpoint objects.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:endpoint" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="service-instance"> <xs:complexType> <xs:annotation> @@ -4994,7 +4607,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <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> @@ -5977,6 +5589,177 @@ 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> @@ -7605,6 +7388,95 @@ 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 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="vf-module"> <xs:complexType> <xs:annotation> diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd index 941d7ef..b571bb0 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v21.xsd @@ -4520,287 +4520,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-function,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 name="link-description" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A description for the logical-link.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="segment-id" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A segment-id assigned to the logical-link (ex, esi for ethernet segments).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="link-function" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The function performed by this logical link")</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> @@ -4936,8 +4655,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:annotation> </xs:element> <xs:element ref="tns:tunnel-xconnects" minOccurs="0"/> - <xs:element ref="tns:logical-links" minOccurs="0"/> - <xs:element ref="tns:network-policies" minOccurs="0"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> </xs:sequence> </xs:complexType> @@ -5390,131 +5107,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:sequence> </xs:complexType> </xs:element> - <xs:element name="ip-address"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <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> - <xs:element name="ip-address" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="IP address.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="ip-address-end" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="IP address end range.")</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="IP version, either 4 or 6.")</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 IP address, eg., Reserved, Static, DHCP.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="assignment" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="assignment.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="operator" type="xs:string" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operator to apply to the port (greater than, less than, etc).")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element name="length" type="xs:int" minOccurs="0"> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="ip-address prefix length, 32 for single address.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="ip-address-list"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="List of IP addresses.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:ip-address" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="endpoint"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Endpoint object.",uniqueProps="endpoint-id",indexedProps="endpoint-id",container="endpoints",uriTemplate="/endpoints/endpoint/{endpoint-id}",searcheable="endpoint-id",requiredProps="endpoint-id")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <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 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 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 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.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - </xs:element> - <xs:element ref="tns:ip-address-list" minOccurs="0"/> - <xs:element ref="tns:relationship-list" minOccurs="0"/> - </xs:sequence> - </xs:complexType> - </xs:element> - <xs:element name="endpoints"> - <xs:complexType> - <xs:annotation> - <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Endpoint objects.")</annox:annotate> - </xs:appinfo> - </xs:annotation> - <xs:sequence> - <xs:element ref="tns:endpoint" minOccurs="0" maxOccurs="5000"/> - </xs:sequence> - </xs:complexType> - </xs:element> <xs:element name="service-instance"> <xs:complexType> <xs:annotation> @@ -5739,7 +5331,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <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> @@ -6743,6 +6334,198 @@ 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-function,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 name="link-description" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A description for the logical-link.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="segment-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="A segment-id assigned to the logical-link (ex, esi for ethernet segments).")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="link-function" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The function performed by this logical link")</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> @@ -8289,7 +8072,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:annotation> </xs:element> <xs:element ref="tns:host-routes" minOccurs="0"/> - <xs:element ref="tns:ip-address-list" minOccurs="0" maxOccurs="5000"/> <xs:element ref="tns:relationship-list" minOccurs="0"/> <xs:element ref="tns:bgp-neighbors" minOccurs="0"/> </xs:sequence> @@ -8671,6 +8453,95 @@ 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 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="vf-module"> <xs:complexType> <xs:annotation> diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json index 475abbe..883c6ef 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_ccvpn_v20.json @@ -544,18 +544,6 @@ "prevent-delete": "NONE", "default": "true", "description":"For MDONS usecase" - }, - { - "from": "endpoint", - "to": "p-interface", - "label": "tosca.relationships.network.LinksTo", - "direction": "OUT", - "multiplicity": "ONE2ONE", - "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "NONE", - "default": "true", - "description":"For CCVPN Transport Slicing usecase" - } + } ] } diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json index 475abbe..883c6ef 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_ccvpn_v21.json @@ -544,18 +544,6 @@ "prevent-delete": "NONE", "default": "true", "description":"For MDONS usecase" - }, - { - "from": "endpoint", - "to": "p-interface", - "label": "tosca.relationships.network.LinksTo", - "direction": "OUT", - "multiplicity": "ONE2ONE", - "contains-other-v": "NONE", - "delete-other-v": "NONE", - "prevent-delete": "NONE", - "default": "true", - "description":"For CCVPN Transport Slicing usecase" - } + } ] } 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 d289ac7..42ed39d 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 @@ -3379,7 +3379,6 @@ <xml-element java-attribute="communicationServiceProfiles" name="communication-service-profiles" type="inventory.aai.onap.org.v20.CommunicationServiceProfiles"/> <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="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."/> @@ -7060,8 +7059,6 @@ </xml-properties> </xml-element> <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v20.TunnelXconnects"/> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v20.LogicalLinks"/> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v20.NetworkPolicies"/> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> </java-attributes> @@ -10089,108 +10086,6 @@ <xml-property name="searcheable" value="profile-id"/> </xml-properties> </java-type> - <java-type name="IpAddress"> - <xml-root-element name="ip-address"/> - <java-attributes> - <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String" xml-key="true" > - <xml-properties> - <xml-property name="description" value="IP address."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipAddressEnd" name="ip-address-end" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IP address end range."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IP version, either 4 or 6."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="type" name="type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of IP address, eg., Reserved, Static, DHCP."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="assignment" name="assignment" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="assignment."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="operator" name="operator" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="length" name="length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="ip-address prefix length, 32 for single address."/> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="IP address."/> - <xml-property name="uniqueProps" value="ip-address"/> - <xml-property name="indexedProps" value="ip-address"/> - <xml-property name="container" value="ip-address-list"/> - <xml-property name="uriTemplate" value="/ip-address-list/ip-address/{ip-address}"/> - <xml-property name="searcheable" value="ip-address"/> - </xml-properties> - </java-type> - <java-type name="IpAddressList"> - <xml-properties> - <xml-property name="description" value="List of IP addresses."/> - </xml-properties> - <xml-root-element name="ip-address-list"/> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipAddress" name="ip-address" type="inventory.aai.onap.org.v20.IpAddress"/> - </java-attributes> - </java-type> - <java-type name="Endpoint"> - <xml-root-element name="endpoint"/> - <java-attributes> - <xml-element java-attribute="endpointId" name="endpoint-id" required="true" type="java.lang.String" xml-key="true" > - <xml-properties> - <xml-property name="description" value="ID of an endpoint."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="endpointName" name="endpoint-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of an endpoint."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="endpointType" name="endpoint-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of an endpoint."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="logicalInterfaceId" name="logical-interface-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Identity of a logical interface, e.g., VLAN ID."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v20.IpAddressList"/> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v20.RelationshipList"/> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Endpoint object."/> - <xml-property name="uniqueProps" value="endpoint-id"/> - <xml-property name="indexedProps" value="endpoint-id"/> - <xml-property name="container" value="endpoints"/> - <xml-property name="uriTemplate" value="/endpoints/endpoint/{endpoint-id}"/> - <xml-property name="searcheable" value="endpoint-id"/> - <xml-property name="requiredProps" value="endpoint-id"/> - </xml-properties> - </java-type> - <java-type name="Endpoints"> - <xml-properties> - <xml-property name="description" value="Collection of Endpoint objects."/> - </xml-properties> - <xml-root-element name="endpoints"/> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="endpoint" name="endpoint" type="inventory.aai.onap.org.v20.Endpoint"/> - </java-attributes> - </java-type> </java-types> </xml-bindings> diff --git a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml index ae3761e..44825f2 100644 --- a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml +++ b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml @@ -3950,7 +3950,6 @@ <xml-element java-attribute="communicationServiceProfiles" name="communication-service-profiles" type="inventory.aai.onap.org.v21.CommunicationServiceProfiles"/> <xml-element java-attribute="serviceProfiles" name="service-profiles" type="inventory.aai.onap.org.v21.ServiceProfiles"/> <xml-element java-attribute="sliceProfiles" name="slice-profiles" type="inventory.aai.onap.org.v21.SliceProfiles"/> - <xml-element java-attribute="endpoints" name="endpoints" type="inventory.aai.onap.org.v21.Endpoints"/> <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."/> @@ -8140,8 +8139,6 @@ </xml-properties> </xml-element> <xml-element java-attribute="tunnelXconnects" name="tunnel-xconnects" type="inventory.aai.onap.org.v21.TunnelXconnects"/> - <xml-element java-attribute="logicalLinks" name="logical-links" type="inventory.aai.onap.org.v21.LogicalLinks"/> - <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v21.NetworkPolicies"/> <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> </java-attributes> @@ -12563,108 +12560,6 @@ <xml-property name="searcheable" value="profile-id"/> </xml-properties> </java-type> - <java-type name="IpAddress"> - <xml-root-element name="ip-address"/> - <java-attributes> - <xml-element java-attribute="ipAddress" name="ip-address" required="true" type="java.lang.String" xml-key="true" > - <xml-properties> - <xml-property name="description" value="IP address."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipAddressEnd" name="ip-address-end" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IP address end range."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipVersion" name="ip-version" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="IP version, either 4 or 6."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="type" name="type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of IP address, eg., Reserved, Static, DHCP."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="assignment" name="assignment" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="assignment."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="operator" name="operator" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Operator to apply to the port (greater than, less than, etc)."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="length" name="length" type="java.lang.Integer"> - <xml-properties> - <xml-property name="description" value="ip-address prefix length, 32 for single address."/> - </xml-properties> - </xml-element> - </java-attributes> - <xml-properties> - <xml-property name="description" value="IP address."/> - <xml-property name="uniqueProps" value="ip-address"/> - <xml-property name="indexedProps" value="ip-address"/> - <xml-property name="container" value="ip-address-list"/> - <xml-property name="uriTemplate" value="/ip-address-list/ip-address/{ip-address}"/> - <xml-property name="searcheable" value="ip-address"/> - </xml-properties> - </java-type> - <java-type name="IpAddressList"> - <xml-properties> - <xml-property name="description" value="List of IP addresses."/> - </xml-properties> - <xml-root-element name="ip-address-list"/> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="ipAddress" name="ip-address" type="inventory.aai.onap.org.v21.IpAddress"/> - </java-attributes> - </java-type> - <java-type name="Endpoint"> - <xml-root-element name="endpoint"/> - <java-attributes> - <xml-element java-attribute="endpointId" name="endpoint-id" required="true" type="java.lang.String" xml-key="true" > - <xml-properties> - <xml-property name="description" value="ID of an endpoint."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="endpointName" name="endpoint-name" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Name of an endpoint."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="endpointType" name="endpoint-type" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Type of an endpoint."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="logicalInterfaceId" name="logical-interface-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Identity of a logical interface, e.g., VLAN ID."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v21.IpAddressList"/> - <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/> - </java-attributes> - <xml-properties> - <xml-property name="description" value="Endpoint object."/> - <xml-property name="uniqueProps" value="endpoint-id"/> - <xml-property name="indexedProps" value="endpoint-id"/> - <xml-property name="container" value="endpoints"/> - <xml-property name="uriTemplate" value="/endpoints/endpoint/{endpoint-id}"/> - <xml-property name="searcheable" value="endpoint-id"/> - <xml-property name="requiredProps" value="endpoint-id"/> - </xml-properties> - </java-type> - <java-type name="Endpoints"> - <xml-properties> - <xml-property name="description" value="Collection of Endpoint objects."/> - </xml-properties> - <xml-root-element name="endpoints"/> - <java-attributes> - <xml-element container-type="java.util.ArrayList" java-attribute="endpoint" name="endpoint" type="inventory.aai.onap.org.v21.Endpoint"/> - </java-attributes> - </java-type> </java-types> </xml-bindings> @@ -30,7 +30,7 @@ </parent> <groupId>org.onap.aai.schema-service</groupId> <artifactId>schema-service</artifactId> - <version>1.7.8-SNAPSHOT</version> + <version>1.7.9-SNAPSHOT</version> <name>aai-schema-service</name> <packaging>pom</packaging> <modules> diff --git a/version.properties b/version.properties index 7b60f8d..c936f1d 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=8 +patch_version=9 base_version=${major_version}.${minor_version}.${patch_version} # Release must be completed with GIT information # in Jenkins |