You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ha...@apache.org on 2018/05/08 10:04:14 UTC
[ambari] branch trunk updated: AMBARI-23784 Update
upgrade-config.xsd to support new conditional statements for insert
operation (dgrinenko)
This is an automated email from the ASF dual-hosted git repository.
hapylestat pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
The following commit(s) were added to refs/heads/trunk by this push:
new 3304b8d AMBARI-23784 Update upgrade-config.xsd to support new conditional statements for insert operation (dgrinenko)
3304b8d is described below
commit 3304b8df9b7a19a628f57eb5c67b2d1dbc42e578
Author: Dmitry Grinenko <ha...@gmail.com>
AuthorDate: Tue May 8 08:26:26 2018 +0300
AMBARI-23784 Update upgrade-config.xsd to support new conditional statements for insert operation (dgrinenko)
---
.../upgrade/ConfigUpgradeChangeDefinition.java | 3 +++
.../src/main/resources/upgrade-config.xsd | 23 +++++++++++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
index 92c74c2..23c3dfd 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/state/stack/upgrade/ConfigUpgradeChangeDefinition.java
@@ -78,6 +78,9 @@ import com.google.common.base.MoreObjects;
* }
* </pre>
*
+ *
+ *
+ * WARNING! After adding/updating classes below, please don't forget to update 'upgrade-config.xsd' respectively
*/
@XmlRootElement
@XmlAccessorType(XmlAccessType.FIELD)
diff --git a/ambari-server/src/main/resources/upgrade-config.xsd b/ambari-server/src/main/resources/upgrade-config.xsd
index c927df2..06e1694 100644
--- a/ambari-server/src/main/resources/upgrade-config.xsd
+++ b/ambari-server/src/main/resources/upgrade-config.xsd
@@ -38,6 +38,13 @@
</xs:restriction>
</xs:simpleType>
+ <xs:simpleType name="if-value-match-type">
+ <xs:restriction base="xs:string">
+ <xs:enumeration value="partial"/>
+ <xs:enumeration value="exact" />
+ </xs:restriction>
+ </xs:simpleType>
+
<xs:simpleType name="transfer-operation-coerce-type">
<xs:restriction base="xs:string">
<xs:enumeration value="yaml-array"/>
@@ -72,6 +79,8 @@
<xs:attribute name="if-type" use="optional" type="xs:string"/>
<xs:attribute name="if-value" use="optional" type="xs:string"/>
<xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/>
+ <xs:attribute name="if-value-match-type" use="optional" type="if-value-match-type"/>
+ <xs:attribute name="if-value-not-matched" use="optional" type="xs:boolean"/>
<xs:attribute name="mask" use="optional" type="xs:boolean"/>
</xs:complexType>
</xs:element>
@@ -83,6 +92,8 @@
<xs:attribute name="if-type" use="optional" type="xs:string"/>
<xs:attribute name="if-value" use="optional" type="xs:string"/>
<xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/>
+ <xs:attribute name="if-value-match-type" use="optional" type="if-value-match-type"/>
+ <xs:attribute name="if-value-not-matched" use="optional" type="xs:boolean"/>
<xs:attribute name="mask" use="optional" type="xs:boolean"/>
</xs:complexType>
</xs:element>
@@ -95,6 +106,8 @@
<xs:attribute name="if-type" use="optional" type="xs:string"/>
<xs:attribute name="if-value" use="optional" type="xs:string"/>
<xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/>
+ <xs:attribute name="if-value-match-type" use="optional" type="if-value-match-type"/>
+ <xs:attribute name="if-value-not-matched" use="optional" type="xs:boolean"/>
<xs:attribute name="mask" use="optional" type="xs:boolean"/>
</xs:complexType>
</xs:element>
@@ -108,6 +121,8 @@
<xs:attribute name="if-type" use="optional" type="xs:string"/>
<xs:attribute name="if-value" use="optional" type="xs:string"/>
<xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/>
+ <xs:attribute name="if-value-match-type" use="optional" type="if-value-match-type"/>
+ <xs:attribute name="if-value-not-matched" use="optional" type="xs:boolean"/>
<xs:attribute name="mask" use="optional" type="xs:boolean"/>
</xs:complexType>
</xs:element>
@@ -117,7 +132,13 @@
<xs:attribute name="value" use="required" type="xs:string"/>
<xs:attribute name="insert-type" use="required" type="insertion-type"/>
<xs:attribute name="newline-before" use="optional" type="xs:boolean"/>
- <xs:attribute name="newline-after" use="optional" type="xs:boolean"/>
+ <xs:attribute name="newline-after" use="optional" type="xs:boolean"/>
+ <xs:attribute name="if-key" use="optional" type="xs:string"/>
+ <xs:attribute name="if-type" use="optional" type="xs:string"/>
+ <xs:attribute name="if-value" use="optional" type="xs:string"/>
+ <xs:attribute name="if-key-state" use="optional" type="set-if-key-state-type"/>
+ <xs:attribute name="if-value-match-type" use="optional" type="if-value-match-type"/>
+ <xs:attribute name="if-value-not-matched" use="optional" type="xs:boolean"/>
</xs:complexType>
</xs:element>
</xs:choice>
--
To stop receiving notification emails like this one, please contact
hapylestat@apache.org.