summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKeong Lim <keong.lim@huawei.com>2018-09-19 16:11:27 +1000
committerKeong Lim <keong.lim@huawei.com>2018-09-19 16:14:06 +1000
commit1df206c251de52d8e6bf145fddb0b8a6c082105d (patch)
treec18bfb3b3ab037c20a529026e7c1f1159208dad4
parent20bc1683e3935ccaae2d4452e62cf9179fbce24a (diff)
AAI-1639 Update wan-port-config to support IPv4/v6
Issue-ID: AAI-1639 Update wan-port-config with ipv4-address, ipv6-address, provider-ipv4-address and provider-ipv6-address. For compatibility, keep ip-address and provider-ip-address as previously published, but plan to deprecate and remove them. Change-Id: Id96f90bb4034b8cb0c17f13a601ec881a67e9cf2 Signed-off-by: Keong Lim <keong.lim@huawei.com>
-rw-r--r--aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd30
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml22
2 files changed, 50 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 2d817f99..2ffbf47e 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
@@ -9285,7 +9285,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 wan-port-config",indexedProps="wan-port-config-id,wan-port-config-name,device-id,ip-address,port-type,port-number,device-port-id,wan-port-id,operational-status",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network")</annox:annotate>
+ <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a wan-port-config",indexedProps="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status",nameProps="wan-port-config-name",searchable="wan-port-config-id",uniqueProps="wan-port-config-id",container="wan-port-configs",namespace="network")</annox:annotate>
</xs:appinfo>
</xs:annotation>
<xs:sequence>
@@ -9324,6 +9324,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="ipv4-address" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv4-address of this wan-port-config.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="ipv6-address" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv6-address of this wan-port-config.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="provider-ip-address" type="xs:string" minOccurs="0">
<xs:annotation>
<xs:appinfo>
@@ -9331,6 +9345,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
</xs:appinfo>
</xs:annotation>
</xs:element>
+ <xs:element name="provider-ipv4-address" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ipv4-address of this wan-port-config.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
+ <xs:element name="provider-ipv6-address" type="xs:string" minOccurs="0">
+ <xs:annotation>
+ <xs:appinfo>
+ <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the provider-ipv6-address of this wan-port-config.")</annox:annotate>
+ </xs:appinfo>
+ </xs:annotation>
+ </xs:element>
<xs:element name="input-bandwidth" 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 f2387947..2b698e28 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
@@ -8143,11 +8143,31 @@
<xml-property name="description" value="Store the ip-address of this wan-port-config." />
</xml-properties>
</xml-element>
+ <xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Store the ipv4-address of this wan-port-config." />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Store the ipv6-address of this wan-port-config." />
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="providerIpAddress" name="provider-ip-address" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Store the provider-ip-address of this wan-port-config." />
</xml-properties>
</xml-element>
+ <xml-element java-attribute="providerIpv4Address" name="provider-ipv4-address" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Store the provider-ipv4-address of this wan-port-config." />
+ </xml-properties>
+ </xml-element>
+ <xml-element java-attribute="providerIpv6Address" name="provider-ipv6-address" type="java.lang.String">
+ <xml-properties>
+ <xml-property name="description" value="Store the provider-ipv6-address of this wan-port-config." />
+ </xml-properties>
+ </xml-element>
<xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
<xml-properties>
<xml-property name="description" value="Store the input-bandwidth of this wan-port-config." />
@@ -8229,7 +8249,7 @@
</java-attributes>
<xml-properties>
<xml-property name="description" value="Instance of a wan-port-config" />
- <xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,port-type,port-number,device-port-id,wan-port-id,operational-status" />
+ <xml-property name="indexedProps" value="wan-port-config-id,wan-port-config-name,device-id,ip-address,ipv4-address,ipv6-address,port-type,port-number,device-port-id,wan-port-id,operational-status" />
<xml-property name="nameProps" value="wan-port-config-name" />
<xml-property name="searchable" value="wan-port-config-id" />
<xml-property name="uniqueProps" value="wan-port-config-id" />