From 7a995eec49662d1965a9dc017c63c306cb21ae07 Mon Sep 17 00:00:00 2001
From: Venkata Harish K Kajur <vk250x@att.com>
Date: Fri, 8 Dec 2017 17:13:51 -0500
Subject: Add back the pserver self link and configuration

Issue-ID: AAI-554
Change-Id: Ia4269abfd673ab026921b683175d843443c738d5
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>
---
 .../main/resources/aai_schema/aai_schema_v12.xsd   | 42 +++++++++++-----------
 aai-schema/src/main/resources/oxm/aai_oxm_v12.xml  | 13 ++++---
 2 files changed, 30 insertions(+), 25 deletions(-)

(limited to 'aai-schema/src/main')

diff --git a/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd b/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd
index 5748c329..54e3bd7b 100644
--- a/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd
+++ b/aai-schema/src/main/resources/aai_schema/aai_schema_v12.xsd
@@ -2065,6 +2065,13 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="speed-value" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -2100,13 +2107,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
         <xs:element name="interface-type" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -2263,17 +2263,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
+        <xs:element name="ptnii-equip-name" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="PTNII name")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -6586,24 +6586,24 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="source of name2")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="URL to endpoint where AAI can get more details.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
+        <xs:element name="pnf-name2-source" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="source of name2")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="selflink" type="xs:string" minOccurs="0">
+        <xs:element name="pnf-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Node URL in CANOPI/MINT.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="id of pnf")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -7279,17 +7279,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         </xs:appinfo>
       </xs:annotation>
       <xs:sequence>
-        <xs:element name="management-option" type="xs:string" minOccurs="0">
+        <xs:element name="configuration-id" type="xs:string">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="configuration-id" type="xs:string">
+        <xs:element name="management-option" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="UUID assigned to configuration.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well.")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
diff --git a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
index 13363c50..fdd6cd67 100644
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@ -1956,6 +1956,11 @@
 						<xml-property name="description" value="Name that identifies the physical interface" />
 					</xml-properties>
 				</xml-element>
+				<xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="URL to endpoint where AAI can get more details." />
+					</xml-properties>
+				</xml-element>
 				<xml-element java-attribute="speedValue" name="speed-value" type="java.lang.String">
 					<xml-properties>
 						<xml-property name="description" value="Captures the numeric part of the speed" />
@@ -2894,14 +2899,14 @@
 		<java-type name="Configuration">
 			<xml-root-element name="configuration" />
 			<java-attributes>
-				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
+				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
 					<xml-properties>
-						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
+						<xml-property name="description" value="UUID assigned to configuration." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="configurationId" name="configuration-id" required="true" type="java.lang.String" xml-key="true">
+				<xml-element java-attribute="managementOption" name="management-option" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="UUID assigned to configuration." />
+						<xml-property name="description" value="Indicates the entity that will manage this feature. Could be an organization or the name of the application as well." />
 					</xml-properties>
 				</xml-element>
 				<xml-element java-attribute="configurationName" name="configuration-name" type="java.lang.String">
-- 
cgit 1.2.3-korg