Update pnp schema to right file

Issue-ID: AAI-1551
Change-Id: I2bcad1f60beae9ac192f5c2f3d11119272cae94a
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

3 files changed, 95 insertions, 77 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 2ffbf47e..78d24f8d 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
@@ -7103,6 +7103,43 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="software-version">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Software Version",indexedProps="softwareVersionId,isActiveSwVer",dependentOn="pnf",container="pnf")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="software-version-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Identifier of the software version")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="is-active-sw-ver" type="xs:boolean" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(defaultValue="false",description="used to indicate whether or not this software-version is the active one (activeSw = true)")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="software-versions">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of software versions.")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:software-version" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="pnf">
     <xs:complexType>
       <xs:annotation>
@@ -7307,6 +7344,21 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="pnf-ipv4-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="pnf-ipv6-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:software-versions" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
         <xs:element ref="tns:p-interfaces" minOccurs="0"/>
         <xs:element ref="tns:lag-interfaces" minOccurs="0"/>
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 2b698e28..e61ad597 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
@@ -5208,6 +5208,17 @@
                         <xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="pnfIpv4Address" name="pnf-ipv4-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="pnfIpv6Address" name="pnf-ipv6-address" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at." />
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v14.SoftwareVersions" />
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList"/>
                 <xml-element java-attribute="pInterfaces" name="p-interfaces" type="inventory.aai.onap.org.v14.PInterfaces"/>
                 <xml-element java-attribute="lagInterfaces" name="lag-interfaces" type="inventory.aai.onap.org.v14.LagInterfaces"/>
@@ -5222,6 +5233,38 @@
                 <xml-property name="uriTemplate" value="/network/pnfs/pnf/{pnf-name}"/>
             </xml-properties>
         </java-type>
+        <java-type name="SoftwareVersions">
+            <xml-properties>
+                <xml-property name="description" value="Collection of software versions." />
+            </xml-properties>
+            <xml-root-element name="software-versions" />
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v14.SoftwareVersion" />
+            </java-attributes>
+        </java-type>
+
+        <java-type name="SoftwareVersion">
+            <xml-root-element name="software-version" />
+            <java-attributes>
+                <xml-element java-attribute="softwareVersionId" name="software-version-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifier of the software version" />
+                    </xml-properties>
+                </xml-element>
+                <xml-element default-value="false" java-attribute="isActiveSwVer" name="is-active-sw-ver" required="true" type="java.lang.Boolean">
+                    <xml-properties>
+                        <xml-property name="defaultValue" value="false"/>
+                        <xml-property name="description" value="used to indicate whether or not this software-version is the active one (activeSw = true)" />
+                    </xml-properties>
+                </xml-element>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="Software Version" />
+                <xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer" />
+                <xml-property name="dependentOn" value="pnf" />
+                <xml-property name="container" value="pnf" />
+            </xml-properties>
+        </java-type>
 
         <java-type name="PhysicalLinks">
             <xml-properties>
diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_pnp_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_pnp_oxm_v14.xml
deleted file mode 100644
index 11563c56..00000000
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_pnp_oxm_v14.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
-  ============LICENSE_START=======================================================
-  org.onap.aai
-  ================================================================================
-  Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-  Copyright (C) 2018 Huawei Technologies (Australia) Pty Ltd. All rights reserved.
-  ================================================================================
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-  
-       http://www.apache.org/licenses/LICENSE-2.0
-  
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  ============LICENSE_END=========================================================
-  -->
-
-<xml-bindings xmlns="http://www.eclipse.org/eclipselink/xsds/persistence/oxm" package-name="inventory.aai.onap.org.v14" xml-mapping-metadata-complete="true">
-	<xml-schema element-form-default="QUALIFIED">
-		<xml-ns namespace-uri="http://org.onap.aai.inventory/v14" />
-	</xml-schema>
-	<java-types>
-		<java-type name="Pnf">
-			<xml-root-element name="pnf" />
-			<java-attributes>
-				<xml-element java-attribute="pnfIpv4Address" name="pnf-ipv4-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This is the IP address (IPv4) for the PNF itself. This is the IPv4 address that the PNF iself can be accessed at." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="pnfIpv6Address" name="pnf-ipv6-address" type="java.lang.String">
-					<xml-properties>
-						<xml-property name="description" value="This is the IP address (IPv6) for the PNF itself. This is the IPv6 address that the PNF iself can be accessed at." />
-					</xml-properties>
-				</xml-element>
-				<xml-element java-attribute="softwareVersions" name="software-versions" type="inventory.aai.onap.org.v14.SoftwareVersions" />
-			</java-attributes>
-		</java-type>
-		<java-type name="SoftwareVersions">
-			<xml-properties>
-				<xml-property name="description" value="Collection of software versions." />
-			</xml-properties>
-			<xml-root-element name="software-versions" />
-			<java-attributes>
-				<xml-element container-type="java.util.ArrayList" java-attribute="softwareVersion" name="software-version" type="inventory.aai.onap.org.v14.SoftwareVersion" />
-			</java-attributes>
-		</java-type>
-
-		<java-type name="SoftwareVersion">
-			<xml-root-element name="software-version" />
-			<java-attributes>
-				<xml-element java-attribute="softwareVersionId" name="software-version-id" required="true" type="java.lang.String" xml-key="true">
-					<xml-properties>
-						<xml-property name="description" value="Identifier of the software version" />
-					</xml-properties>
-				</xml-element>
-				<xml-element default-value="false" java-attribute="isActiveSwVer" name="is-active-sw-ver" required="true" type="java.lang.Boolean">
-					<xml-properties>
-						<xml-property name="defaultValue" value="false"/>
-						<xml-property name="description" value="used to indicate whether or not this software-version is the active one (activeSw = true)" />
-					</xml-properties>
-				</xml-element>
-			</java-attributes>
-			<xml-properties>
-				<xml-property name="description" value="Software Version" />
-				<xml-property name="indexedProps" value="softwareVersionId,isActiveSwVer" />
-				<xml-property name="dependentOn" value="pnf" />
-				<xml-property name="container" value="pnf" />
-			</xml-properties>
-		</java-type>
-	</java-types>
-</xml-bindings>