From f5914aabb906aeb9471eff8341f9979f5e35c21e Mon Sep 17 00:00:00 2001 From: Hesam Rahimi Date: Sun, 4 Aug 2019 22:40:09 +0000 Subject: AAI schema changes to support TN NSSI and transport endpoint. Issue-ID: AAI-2920 Signed-off-by: Hesam Rahimi Change-Id: Ic1e2e1561c4add226abc9d96ac6c623d5255106f --- .../resources/onap/aai_schema/aai_schema_v20.xsd | 177 +++++++++++++++++++++ .../dbedgerules/v20/DbEdgeRules_ccvpn_v20.json | 22 ++- .../main/resources/onap/oxm/v20/aai_oxm_v20.xml | 143 ++++++++++++++++- 3 files changed, 335 insertions(+), 7 deletions(-) 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 9831b7f..fbce150 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 @@ -3809,6 +3809,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + @@ -4189,6 +4191,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") + + + @@ -4253,6 +4262,131 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + + + @org.onap.aai.annotations.Metadata(description="Ip address object.",uniqueProps="ip-address",indexedProps="ip-address",container="ip-address-list",uriTemplate="/endpoints/endpoint/{endpoint-id}/ip-address-list/ip-address/{ip-address}",searcheable="endpoint-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="IP address.") + + + + + + + @org.onap.aai.annotations.Metadata(description="IP address end range.") + + + + + + + @org.onap.aai.annotations.Metadata(description="IP version, either 4 or 6.") + + + + + + + @org.onap.aai.annotations.Metadata(description="reserved, static, dhcp.") + + + + + + + @org.onap.aai.annotations.Metadata(description="assignment.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Operator to apply to the port (greater than, less than, etc).") + + + + + + + @org.onap.aai.annotations.Metadata(description="ip-address prefix length, 32 for single address.") + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="List of IP addresses.") + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Endpoint object.",uniqueProps="endpoint-id",indexedProps="endpoint-id",container="endpoints",uriTemplate="/endpoints/endpoint/{endpoint-id}",searcheable="endpoint-id") + + + + + + + @org.onap.aai.annotations.Metadata(isKey=true,description="ID of endpoint.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Name of endpoint.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type of endpoint.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Identity of a logical interface, e.g., VLAN ID, MPLS label.") + + + + + + + + + + + + + @org.onap.aai.annotations.Metadata(description="Collection of endpoints.") + + + + + + @@ -4443,6 +4577,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + @@ -7246,6 +7381,48 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Name of the policy.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Type of the policy.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The packet transmission latency (millisecond) through the Transport slice connections and is used to evaluate utilization performance of the end-to-end network slice instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="jitter") + + + + + + + @org.onap.aai.annotations.Metadata(description="The maximum bandwidth (mb) of the connection links in a transport slice instance.") + + + + + + + @org.onap.aai.annotations.Metadata(description="The reliability requirement for a transport slice network, expressed as a percentage.") + + + 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 f007e0a..475abbe 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 @@ -445,7 +445,7 @@ "default": "true", "description":"For CCVPN Usecase" }, - { + { "from": "p-interface", "to": "interlayer-attachment", "label": "tosca.relationships.network.LinksTo", @@ -458,7 +458,7 @@ "description":"For CCVPN Usecase" }, - { + { "from": "tunnel-termination-point", "to": "interlayer-attachment", "label": "tosca.relationships.network.LinksTo", @@ -483,7 +483,7 @@ "default": "true", "description":"For CCVPN Usecase" }, - { + { "from": "logical-link", "to": "te-link-attribute", "label": "tosca.relationships.network.LinksTo", @@ -496,7 +496,7 @@ "description":"For CCVPN Usecase" }, - { + { "from": "label-restriction", "to": "te-link-attribute", "label": "tosca.relationships.network.LinksTo", @@ -544,6 +544,18 @@ "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 5669464..8424058 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 @@ -3311,6 +3311,7 @@ + @@ -4760,6 +4761,36 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -6953,6 +6984,8 @@ + + @@ -9414,7 +9447,7 @@ - + @@ -9467,7 +9500,6 @@ - @@ -9523,6 +9555,7 @@ + @@ -9847,6 +9880,11 @@ + + + + + @@ -9899,6 +9937,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -- cgit 1.2.3-korg