From 2e16e1717f3a8f2cf49f8de11cae911f5d091146 Mon Sep 17 00:00:00 2001 From: Keong Lim Date: Mon, 13 Aug 2018 13:53:21 +1000 Subject: AAI-1461 -1464 Update vpn-binding/pnf for CCVPN Issue-ID: AAI-1461 Add properties to vpn-binding: access-provider-id, access-client-id, access-topology-id, src-access-node-id, src-access-ltp-id, dst-access-node-id, dst-access-ltp-id, operational-status, model-customization-id, model-version-id, model-invariant-id Make ids and operational-status indexed. Add CCVPN EdgeRules for vpn-binding to p-interface. Accidentally squashed in second commit for: Issue-ID: AAI-1464 Add properties to pnf schema: admin-status, operational-status, model-customization-id, model-version-id, model-invariant-id Make these properties indexed as well: admin-status, operational-status Change-Id: I30b75262d3e01cfae2cf77d9be9da26a56a049ed Signed-off-by: Keong Lim --- .../resources/onap/aai_schema/aai_schema_v14.xsd | 102 ++++++++++++++++++++- .../dbedgerules/v14/DbEdgeRules_ccvpn_v14.json | 13 ++- .../main/resources/onap/oxm/v14/aai_oxm_v14.xml | 74 ++++++++++++++- 3 files changed, 184 insertions(+), 5 deletions(-) diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd index b4d4b829..42dcde89 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd @@ -4809,7 +4809,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network") + @org.onap.aai.annotations.Metadata(description="VPN binding",nameProps="vpn-name,vpn-type",indexedProps="vpn-name,vpn-id,vpn-type,access-provider-id,access-client-id,access-topology-id,src-access-node-id,src-access-ltp-id,dst-access-node-id,dst-access-ltp-id,operational-status",searchable="vpn-id,vpn-name",uniqueProps="vpn-id",container="vpn-bindings",namespace="network") @@ -4862,6 +4862,83 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the access client of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the src-access-node of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the src-access-ltp of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-node of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the id of the dst-access-ltp of this vpn.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-version-id for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-invariant-id for this object.") + + + @@ -6726,7 +6803,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" - @org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network") + @org.onap.aai.annotations.Metadata(description="PNF represents a physical network function. typically equipment used in the D1 world. in 1607, this will be populated by SDN-C to represent a premises router that a uCPE connects to. But this can be used to represent any physical device that is not an AIC node or uCPE.",indexedProps="pnf-name,orchestration-status,inv-status,operational-status,admin-status",searchable="pnf-name",uniqueProps="pnf-name",container="pnfs",namespace="network") @@ -6891,6 +6968,27 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" + + + + @org.onap.aai.annotations.Metadata(description="admin Status of this PNF") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.") + + + + + + + @org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.") + + + diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json index 1c88b043..cb1e0e66 100644 --- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json +++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json @@ -1,5 +1,16 @@ { "rules": [ - + { + "from": "vpn-binding", + "to": "p-interface", + "label": "org.onap.relationships.inventory.BindsTo", + "direction": "OUT", + "multiplicity": "ONE2MANY", + "contains-other-v": "NONE", + "delete-other-v": "NONE", + "prevent-delete": "NONE", + "default": "true", + "description":"For CCVPN Usecase" + } ] } diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml index 12f49df9..d92f3c9a 100644 --- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml +++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml @@ -3461,6 +3461,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -3476,7 +3531,7 @@ - + @@ -4953,6 +5008,21 @@ + + + + + + + + + + + + + + + @@ -4976,7 +5046,7 @@ - + -- cgit 1.2.3-korg