diff options
| author |   Keong Lim <keong.lim@huawei.com> | 2018-09-19 15:39:31 +1000 |
|---|---|---|
| committer | Keong Lim <keong.lim@huawei.com> | 2018-09-19 15:39:31 +1000 |
| commit | 20bc1683e3935ccaae2d4452e62cf9179fbce24a (patch) | |
| tree | 2be7cfa2b28ffc9595228f6c0859ca3fe9aed06e /aai-schema/src | |
| parent | cd1cb5c7b928a6d0c68a180f9966eaffb66e643f (diff) | |
AAI-1638 Update device schema to support IPv4/IPv6
Issue-ID: AAI-1638
Update device with system-ipv4 and system-ipv6.
For compatibility, keep system-ip as previously published, but plan to
deprecate and remove it.
Change-Id: I740a58d4e4125983fc09af48bd0b4ba786af77f1
Signed-off-by: Keong Lim <keong.lim@huawei.com>
Diffstat (limited to 'aai-schema/src')
| -rw-r--r-- | aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd | 16 | ||||
| -rw-r--r-- | aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml | 12 |
2 files changed, 26 insertions, 2 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 ca53e881..2d817f99 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 @@ -9142,7 +9142,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 a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network")</annox:annotate> + <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a device",indexedProps="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status",nameProps="device-name",searchable="device-id",uniqueProps="device-id",container="devices",namespace="network")</annox:annotate> </xs:appinfo> </xs:annotation> <xs:sequence> @@ -9209,6 +9209,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" </xs:appinfo> </xs:annotation> </xs:element> + <xs:element name="system-ipv4" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ipv4 of this device.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> + <xs:element name="system-ipv6" type="xs:string" minOccurs="0"> + <xs:annotation> + <xs:appinfo> + <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the system-ipv6 of this device.")</annox:annotate> + </xs:appinfo> + </xs:annotation> + </xs:element> <xs:element name="selflink" type="xs:string" minOccurs="0"> <xs:annotation> <xs:appinfo> 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 73b6c008..f2387947 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 @@ -8055,6 +8055,16 @@ <xml-property name="description" value="Store the system-ip of this device." /> </xml-properties> </xml-element> + <xml-element java-attribute="systemIpv4" name="system-ipv4" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the system-ipv4 of this device." /> + </xml-properties> + </xml-element> + <xml-element java-attribute="systemIpv6" name="system-ipv6" type="java.lang.String"> + <xml-properties> + <xml-property name="description" value="Store the system-ipv6 of this device." /> + </xml-properties> + </xml-element> <xml-element java-attribute="selflink" name="selflink" type="java.lang.String"> <xml-properties> <xml-property name="description" value="Store the link to get more information for this object." /> @@ -8096,7 +8106,7 @@ </java-attributes> <xml-properties> <xml-property name="description" value="Instance of a device" /> - <xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,operational-status" /> + <xml-property name="indexedProps" value="device-id,device-name,esn,vendor,class,type,version,system-ip,system-ipv4,system-ipv6,operational-status" /> <xml-property name="nameProps" value="device-name" /> <xml-property name="searchable" value="device-id" /> <xml-property name="uniqueProps" value="device-id" /> |