diff options
| -rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v23.xsd | 67 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v23/aai_oxm_v23.xml | 127 |
2 files changed, 151 insertions, 43 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v23.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v23.xsd index 882a9f3..2e5a067 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v23.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v23.xsd @@ -8874,7 +8874,49 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="operational-status" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status of this vpn service.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="admin-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the admin-status of this vpn service.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="protection-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the protection-type of this vpn service.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="slice-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ID of the transport slice to which this vpn service may belong.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="switching-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of multiplexing used for this vpn service.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="src-tpn" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store source tributary port number of the underlay OTN tunnel supporting this vpn service.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="dst-tpn" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store destination tributary port number of the underlay OTN tunnel supporting this vpn service.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> @@ -15556,7 +15598,28 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:element name="operational-status" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> - <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status of this connectivity.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="admin-status" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the admin-status of this connectivity.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="protection-type" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the protection-type of this connectivity.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="slice-id" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ID of the transport slice to which this connectivity may belong.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> diff --git a/aai-schema/src/main/resources/onap/oxm/v23/aai_oxm_v23.xml b/aai-schema/src/main/resources/onap/oxm/v23/aai_oxm_v23.xml index ca06b81..d7ba2be 100644 --- a/aai-schema/src/main/resources/onap/oxm/v23/aai_oxm_v23.xml +++ b/aai-schema/src/main/resources/onap/oxm/v23/aai_oxm_v23.xml @@ -5878,46 +5878,76 @@ <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network."/> </xml-properties> </xml-element> - <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the access provider of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the access client of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the access topology of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="srcAccessNodeId" name="src-access-node-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the src-access-node of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="srcAccessLtpId" name="src-access-ltp-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the src-access-ltp of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="dstAccessNodeId" name="dst-access-node-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the dst-access-node of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="dstAccessLtpId" name="dst-access-ltp-id" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the id of the dst-access-ltp of this vpn."/> - </xml-properties> - </xml-element> - <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> - <xml-properties> - <xml-property name="description" value="Store the operational-status for this object."/> - </xml-properties> - </xml-element> + <xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access provider of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access client of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the access topology of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="srcAccessNodeId" name="src-access-node-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the src-access-node of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="srcAccessLtpId" name="src-access-ltp-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the src-access-ltp of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="dstAccessNodeId" name="dst-access-node-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the dst-access-node of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="dstAccessLtpId" name="dst-access-ltp-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the id of the dst-access-ltp of this vpn."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the operational-status of this vpn service."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the admin-status of this vpn service."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="protectionType" name="protection-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the protection-type of this vpn service."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="sliceId" name="slice-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the ID of the transport slice to which this vpn service may belong."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="switchingType" name="switching-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the type of multiplexing used for this vpn service."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="srcTpn" name="src-tpn" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store source tributary port number of the underlay OTN tunnel realizing this vpn service."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="dstTpn" name="dst-tpn" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store destination tributary port number of the underlay OTN tunnel realizing this vpn service."/> + </xml-properties> + </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Store the model-customization-id for this object."/> @@ -12628,7 +12658,22 @@ </xml-element> <xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String"> <xml-properties> - <xml-property name="description" value="Store the operational-status for this object."/> + <xml-property name="description" value="Store the operational-status of this connectivity."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="adminStatus" name="admin-status" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the admin-status of this connectivity."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="protectionType" name="protection-type" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the protection-type of this connectivity."/> + </xml-properties> + </xml-element> + <xml-element java-attribute="sliceId" name="slice-id" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the ID of the transport slice to which this connectivity may belong."/> </xml-properties> </xml-element> <xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String"> |