Merge "[AAI-134] Removed duplicate invStatus"

diff --combined aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
index 7d4e976,c739121..d9ae0c8
--- 1/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
--- 2/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
+++ b/aai-schema/src/main/resources/oxm/aai_oxm_v11.xml
@@@ -1702,11 -1702,6 +1702,6 @@@
                                                <xml-property name="description" value="inventory status" />
                                        </xml-properties>
                                </xml-element>
-                               <xml-element java-attribute="invStatus" name="inv-status" type="java.lang.String">
-                                       <xml-properties>
-                                               <xml-property name="description" value="inventory status" />
-                                       </xml-properties>
-                               </xml-element>
                                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v11.RelationshipList" />
                                <xml-element java-attribute="sriovPfs" name="sriov-pfs" type="inventory.aai.onap.org.v11.SriovPfs" />
                                <xml-element java-attribute="lInterfaces" name="l-interfaces" type="inventory.aai.onap.org.v11.LInterfaces" />
@@@ -2777,16 -2772,6 +2772,16 @@@
                                                <xml-property name="description" value="Type of the vpn, should be taken from enumerated/valid values" />
                                        </xml-properties>
                                </xml-element>
 +                              <xml-element java-attribute="vpnRegion" name="vpn-region" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="region of customer vpn" />
 +                                      </xml-properties>
 +                              </xml-element>
 +                              <xml-element java-attribute="customerVpnId" name="customer-vpn-id" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="id for this customer vpn" />
 +                                      </xml-properties>
 +                              </xml-element>
                                <xml-element java-attribute="routeDistinguisher" name="route-distinguisher" type="java.lang.String">
                                        <xml-properties>
                                                <xml-property name="description" value="Used to distinguish the distinct VPN routes of separate customers who connect to the provider in an MPLS network." />
@@@ -4517,7 -4502,7 +4512,7 @@@
                                </xml-element>
                                <xml-element java-attribute="ikev1Encryption" name="ikev1-encryption" type="java.lang.String">
                                        <xml-properties>
 -                                              <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
 +                                              <xml-property name="description" value="Encyption values like 3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ikev1DhGroup" name="ikev1-dh-group" type="java.lang.String">
@@@ -4547,7 -4532,7 +4542,7 @@@
                                </xml-element>
                                <xml-element java-attribute="ipsecEncryption" name="ipsec-encryption" type="java.lang.String">
                                        <xml-properties>
 -                                              <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc, aes-192-cbc, aes-265-cbc" />
 +                                              <xml-property name="description" value="3des-cbc, des-cbc, aes-128-cbc,?aes-192-cbc, aes-265-cbc" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="ipsecSaLifetime" name="ipsec-sa-lifetime" type="java.lang.String">
@@@ -5269,23 -5254,6 +5264,23 @@@
                <java-type name="InstanceGroup">
                        <xml-root-element name="instance-group" />
                        <java-attributes>
 +                              <xml-element java-attribute="instanceGroupRole" name="instance-group-role" required="false" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="role of the instance group." />
 +                                      </xml-properties>
 +                              </xml-element>
 +
 +                              <xml-element java-attribute="modelInvariantId" name="model-invariant-id" required="false" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="ASDC model id for this resource or service model." />
 +                                      </xml-properties>
 +                              </xml-element>
 +
 +                              <xml-element java-attribute="modelVersionId" name="model-version-id" required="false" type="java.lang.String">
 +                                      <xml-properties>
 +                                              <xml-property name="description" value="ASDC model version uid for this resource model." />
 +                                      </xml-properties>
 +                              </xml-element>
                                <xml-element java-attribute="id" name="id" required="true" type="java.lang.String" xml-key="true">
                                        <xml-properties>
                                                <xml-property name="description" value="Instance Group ID, UUID assigned to this instance." />
@@@ -5626,7 -5594,7 +5621,7 @@@
                                </xml-element>
                                <xml-element java-attribute="designType" name="design-type" required="true" type="java.lang.String">
                                        <xml-properties>
 -                                              <xml-property name="description" value="Design of zone [Medium/Large…]" />
 +                                              <xml-property name="description" value="Design of zone [Medium/Large?]" />
                                        </xml-properties>
                                </xml-element>
                                <xml-element java-attribute="zoneContext" name="zone-context" required="true" type="java.lang.String">