diff options
| author |   James Forsyth <jf2512@att.com> | 2020-05-06 13:08:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-06 13:08:15 +0000 |
| commit | 5eb5e14d2f0e6dd57c3c1a562fd8d10cdc2294d1 (patch) | |
| tree | 1bf9fd7617d4224f2abce223f8197057cce569bf /aai-schema | |
| parent | fdbcaf6e50a68d8a16166c2e40fb95d981e54bb6 (diff) | |
| parent | fff079b903dad1c1606792bebcfaf1570e30c2a8 (diff) | |
Merge "SOTN-NNI integration test issue fixed"
Diffstat (limited to 'aai-schema')
| -rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd | 6 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd index de0859b..c7f0a29 100644 --- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd +++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd @@ -10711,7 +10711,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" <xs:complexType> <xs:annotation> <xs:appinfo> - <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of an User network interface",indexedProps="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id",searchable="id",uniqueProps="id",container="unis",namespace="network",requiredProps="id",uriTemplate="/network/unis/uni/{id}")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -10722,14 +10722,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="tpId" type="xs:string" minOccurs="0"> + <xs:element name="tp-id" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Termination point ID.")</annox:annotate> </xs:appinfo> </xs:annotation> </xs:element> - <xs:element name="cVLAN" type="xs:string" minOccurs="0"> + <xs:element name="cvlan" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The cvlan for the site used for ethernet type connectivity.")</annox:annotate> diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml index 613264c..8a3dc17 100644 --- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml +++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml @@ -9000,12 +9000,12 @@ <xml-property name="description" value="Id that identifies the UNI"/> </xml-properties> </xml-element> - <xml-element java-attribute="tpId" name="tpId" type="java.lang.String"> + <xml-element java-attribute="tpId" name="tp-id" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Termination point ID."/> </xml-properties> </xml-element> - <xml-element java-attribute="cVLAN" name="cVLAN" type="java.lang.String"> + <xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String"> <xml-properties> <xml-property name="description" value="The cvlan for the site used for ethernet type connectivity."/> </xml-properties> @@ -9051,7 +9051,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Instance of an User network interface"/> - <xml-property name="indexedProps" value="id,tpId,cVLAN,operational-status,model-invariant-id,model-version-id"/> + <xml-property name="indexedProps" value="id,tp-id,cvlan,operational-status,model-invariant-id,model-version-id"/> <xml-property name="searchable" value="id"/> <xml-property name="uniqueProps" value="id"/> <xml-property name="container" value="unis"/> |