Add orchestration type

add orchestration type to model-ver object (it's needed to display
type in VID UI)

Issue-ID: AAI-2594
Signed-off-by: wsliwka <wojciech.sliwka@nokia.com>
Change-Id: Icd229d299f5ea94575afcf2a0af40b3408858e03

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd
index 97a0748..d981db9 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v17.xsd
@@ -4495,7 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
+          <xs:element name="orchestration-type" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                  <xs:appinfo>
+                      <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate>
+                  </xs:appinfo>
+              </xs:annotation>
+          </xs:element>
+          <xs:element ref="tns:model-elements" minOccurs="0"/>
         <xs:element ref="tns:metadata" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd
index 7b499fa..8577a93 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v18.xsd
@@ -4495,7 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
+          <xs:element name="orchestration-type" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                  <xs:appinfo>
+                      <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate>
+                  </xs:appinfo>
+              </xs:annotation>
+          </xs:element>
+          <xs:element ref="tns:model-elements" minOccurs="0"/>
         <xs:element ref="tns:metadata" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
index 72402f9..36b5c5f 100644 (file)
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v19.xsd
@@ -4495,7 +4495,14 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element ref="tns:model-elements" minOccurs="0"/>
+          <xs:element name="orchestration-type" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                  <xs:appinfo>
+                      <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Orchestration type of this model.")</annox:annotate>
+                  </xs:appinfo>
+              </xs:annotation>
+          </xs:element>
+          <xs:element ref="tns:model-elements" minOccurs="0"/>
         <xs:element ref="tns:metadata" minOccurs="0"/>
         <xs:element ref="tns:relationship-list" minOccurs="0"/>
       </xs:sequence>

diff --git a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml
index 7604237..c5ac8b5 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v17/aai_oxm_v17.xml
@@ -5894,6 +5894,12 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="orchestrationType" name="orchestration-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration type of this model."/>
+                    </xml-properties>
+                </xml-element>
+
                 <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v17.ModelElements"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v17.Metadata"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v17.RelationshipList"/>

diff --git a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
index 27c37b7..855248c 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v18/aai_oxm_v18.xml
@@ -5894,6 +5894,12 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="orchestrationType" name="orchestration-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration type of this model."/>
+                    </xml-properties>
+                </xml-element>
+
                 <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v18.ModelElements"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v18.Metadata"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v18.RelationshipList"/>

diff --git a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
index 154bb11..030bc67 100644 (file)
--- a/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v19/aai_oxm_v19.xml
@@ -5899,6 +5899,12 @@
                         <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
                     </xml-properties>
                 </xml-element>
+                <xml-element java-attribute="orchestrationType" name="orchestration-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Orchestration type of this model."/>
+                    </xml-properties>
+                </xml-element>
+
                 <xml-element java-attribute="modelElements" name="model-elements" type="inventory.aai.onap.org.v19.ModelElements"/>
                 <xml-element java-attribute="metadata" name="metadata" type="inventory.aai.onap.org.v19.Metadata"/>
                 <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v19.RelationshipList"/>