Check in Service Topology OXM changes

Issue-ID: AAI-549
Change-Id: I7683e088a755ba91c1532b1a4c081b56e29698ea
Signed-off-by: ur326r <ur326r@att.com>
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

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 78f918e..7ea1320 100644 (file)
--- 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>
@@ -6491,6 +6498,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="pnf-name2-source" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -7177,17 +7191,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 79bbdf8..07cec83 100644 (file)
--- a/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v12.xml
@@ -1950,6 +1950,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" />
@@ -2888,14 +2893,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">
@@ -4710,6 +4715,11 @@
                                                <xml-property name="description" value="name of Physical Network Function." />
                                        </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="pnfName2Source" name="pnf-name2-source" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="source of name2" />