From ae19d5388cc309664463652ebb6e545adaa56ffe Mon Sep 17 00:00:00 2001
From: Harish Venkata Kajur <vk250x@att.com>
Date: Wed, 16 Dec 2020 21:05:21 +0530
Subject: Update to move attributes to tenant

Issue-ID: AAI-3200
Change-Id: I3fa07e3fe72bf68b7aa583036c78bb1ce598f861
Signed-off-by: Harish Venkata Kajur <vk250x@att.com>
---
 .../resources/onap/aai_schema/aai_schema_v22.xsd   | 28 +++++++++++-----------
 .../main/resources/onap/oxm/v22/aai_oxm_v22.xml    | 20 ++++++++--------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v22.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v22.xsd
index cccc584..9411a88 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v22.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v22.xsd
@@ -1665,6 +1665,20 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
+        <xs:element name="production-state" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Production state")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="support-model" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Support Model")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
         <xs:element name="resource-version" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
@@ -5264,20 +5278,6 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="production-state" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Production state")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
-        <xs:element name="support-model" type="xs:string" minOccurs="0">
-          <xs:annotation>
-            <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Support Model")</annox:annotate>
-            </xs:appinfo>
-          </xs:annotation>
-        </xs:element>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml b/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml
index 0fbdc8d..52e66b5 100644
--- a/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v22/aai_oxm_v22.xml
@@ -1337,6 +1337,16 @@
                         <xml-property name="description" value="tenant parent-id"/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="productionState" name="production-state" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Production state"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="supportModel" name="support-model" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Support Model"/>
+                    </xml-properties>
+                </xml-element> 
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
                     <xml-properties>
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
@@ -3956,16 +3966,6 @@
                     <xml-property name="suggestibleOnSearch" value="true"/>
                 </xml-properties>
             </xml-element>
-    <xml-element java-attribute="productionState" name="production-state" type="java.lang.String">
-        <xml-properties>
-            <xml-property name="description" value="Production state"/>
-        </xml-properties>
-    </xml-element>
-    <xml-element java-attribute="supportModel" name="support-model" type="java.lang.String">
-        <xml-properties>
-            <xml-property name="description" value="Support Model"/>
-        </xml-properties>
-    </xml-element> 
             </java-attributes>
             <xml-properties>
                 <xml-property name="description" value="Instance of a service"/>
-- 
cgit 1.2.3-korg