From: hyu2010 <henry.yu1@huawei.com>
Date: Thu, 27 Aug 2020 20:31:29 +0000 (-0400)
Subject: Add network-resource-type to network-resource
X-Git-Tag: 1.7.7~3^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=87391a0f8382a83a8a33f218c64115b9f3230588;p=aai%2Fschema-service.git

Add network-resource-type to network-resource

(1) For E2E network slicing usecase, UUI needs to determine the network
topology type, e.g., Ethernet or OTN, based on a network-resource. So,
network-resource-type attribute is added to network-resource.

(2) Specify endpoint-id as the required attribute of endpoint

Issue-ID: AAI-2920
Signed-off-by: hyu2010 <henry.yu1@huawei.com>
Change-Id: I020bdfce34a8d86c5be50110a7e7905ee3fefdbc
---

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
index fbce150..4026bac 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v20.xsd
@@ -4263,7 +4263,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
-    <xs:element name="ip-address">
+  <xs:element name="ip-address">
     <xs:complexType>
       <xs:annotation>
         <xs:appinfo>
@@ -4339,7 +4339,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="Endpoint object.",uniqueProps="endpoint-id",indexedProps="endpoint-id",container="endpoints",uriTemplate="/endpoints/endpoint/{endpoint-id}",searcheable="endpoint-id")</annox:annotate>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Endpoint object.",uniqueProps="endpoint-id",indexedProps="endpoint-id",container="endpoints",uriTemplate="/endpoints/endpoint/{endpoint-id}",searcheable="endpoint-id",requiredProps="endpoint-id")</annox:annotate>
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
@@ -10154,6 +10154,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="network-resource-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of a network topology, e.g., Ethernet, OTN, WSON.")</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/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
index 1d36c7c..121897f 100644
--- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
@@ -8437,6 +8437,11 @@
 						<xml-property name="description" value="Store the id of the te-topo of this network-resource."/>
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="networkResourceType" name="network-resource-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Type of a network topology, e.g., Ethernet, OTN, WSON."/>
+					</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."/>
@@ -10037,6 +10042,7 @@
                 <xml-property name="container" value="endpoints"/>
                 <xml-property name="uriTemplate" value="/endpoints/endpoint/{endpoint-id}"/>
                 <xml-property name="searcheable" value="endpoint-id"/>
+                <xml-property name="requiredProps" value="endpoint-id"/>
             </xml-properties>
     </java-type>
     <java-type name="Endpoints">