Adding upstream version 2.1.6.upstream/2.1.6

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

9 files changed, 127 insertions, 0 deletions

diff --git a/xml/test-2-leave/010-clu-props-can.ref b/xml/test-2-leave/010-clu-props-can.ref
new file mode 100644
index 0000000..afa924d
--- /dev/null
+++ b/xml/test-2-leave/010-clu-props-can.ref
@@ -0,0 +1,14 @@
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cluster-opts">
+        <nvpair id="cluster-opts-stonith_enabled" name="stonith-enabled" value="off"/>
+      </cluster_property_set>
+      <cluster_property_set id-ref="cluster-opts"/>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/test-2-leave/010-clu-props-can.ref.err b/xml/test-2-leave/010-clu-props-can.ref.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xml/test-2-leave/010-clu-props-can.ref.err
diff --git a/xml/test-2-leave/010-clu-props-can.xml b/xml/test-2-leave/010-clu-props-can.xml
new file mode 100644
index 0000000..cd82fa8
--- /dev/null
+++ b/xml/test-2-leave/010-clu-props-can.xml
@@ -0,0 +1,16 @@
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cluster-opts">
+        <nvpair id="cluster-opts-stonith_enabled" name="stonith-enabled" value="off"/>
+      </cluster_property_set>
+      <cluster_property_set id="_cibtr-2_cluster-opts">
+        <nvpair id="__cibtr-2_cluster-opts__cluster-opts-stonith_enabled" name="stonith-enabled" value="off"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/test-2-leave/011-clu-props-cannot.ref b/xml/test-2-leave/011-clu-props-cannot.ref
new file mode 100644
index 0000000..c129f57
--- /dev/null
+++ b/xml/test-2-leave/011-clu-props-cannot.ref
@@ -0,0 +1,16 @@
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cluster-opts">
+        <nvpair id="cluster-opts-stonith_enabled" name="stonith-enabled" value="off"/>
+      </cluster_property_set>
+      <cluster_property_set id="_cibtr-2_cluster-opts">
+        <nvpair id="__cibtr-2_cluster-opts__cluster-opts-stonith_enabled" name="stonith-enabled" value="on"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/test-2-leave/011-clu-props-cannot.ref.err b/xml/test-2-leave/011-clu-props-cannot.ref.err
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/xml/test-2-leave/011-clu-props-cannot.ref.err
diff --git a/xml/test-2-leave/011-clu-props-cannot.xml b/xml/test-2-leave/011-clu-props-cannot.xml
new file mode 100644
index 0000000..c129f57
--- /dev/null
+++ b/xml/test-2-leave/011-clu-props-cannot.xml
@@ -0,0 +1,16 @@
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config>
+      <cluster_property_set id="cluster-opts">
+        <nvpair id="cluster-opts-stonith_enabled" name="stonith-enabled" value="off"/>
+      </cluster_property_set>
+      <cluster_property_set id="_cibtr-2_cluster-opts">
+        <nvpair id="__cibtr-2_cluster-opts__cluster-opts-stonith_enabled" name="stonith-enabled" value="on"/>
+      </cluster_property_set>
+    </crm_config>
+    <nodes/>
+    <resources/>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref
new file mode 100644
index 0000000..93ac06f
--- /dev/null
+++ b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref
@@ -0,0 +1,32 @@
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config/>
+    <nodes>
+
+      <node id="virt-063" uname="virt-063"/>
+      <node id="virt-064" uname="virt-064"/>
+      <node id="virt-069" uname="virt-069"/>
+
+    </nodes>
+    <resources>
+
+      <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
+        <operations>
+          <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
+          <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
+          <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
+        </operations>
+        <instance_attributes id="mySmartFuse-params">
+          <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
+        </instance_attributes>
+	<!-- a bit hairy but valid -->
+        <instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
+          <nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
+        </instance_attributes>
+      </primitive>
+
+    </resources>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>
diff --git a/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err
new file mode 100644
index 0000000..70adf27
--- /dev/null
+++ b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.ref.err
@@ -0,0 +1 @@
+DEBUG: instance_attributes: original element pointed to with @id-ref (mySmartFuse-outputpower-instanceparams) disappeared during upgrade
diff --git a/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.xml b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.xml
new file mode 100644
index 0000000..93ac06f
--- /dev/null
+++ b/xml/test-2-leave/021-instance_atributes-rsc-nonbijective.xml
@@ -0,0 +1,32 @@
+<cib validate-with="pacemaker-3.0" admin_epoch="0" epoch="0" num_updates="0">
+  <configuration>
+    <crm_config/>
+    <nodes>
+
+      <node id="virt-063" uname="virt-063"/>
+      <node id="virt-064" uname="virt-064"/>
+      <node id="virt-069" uname="virt-069"/>
+
+    </nodes>
+    <resources>
+
+      <primitive id="mySmartFuse" class="ocf" provider="experiment" type="SmartFuse">
+        <operations>
+          <op id="mySmartFuse-start" name="start" interval="0" timeout="40s"/>
+          <op id="mySmartFuse-monitor-inputpower" name="monitor" interval="30s"/>
+          <op id="mySmartFuse-monitor-outputpower" name="monitor" interval="2s"/>
+        </operations>
+        <instance_attributes id="mySmartFuse-params">
+          <nvpair id="mySmartFuse-params-ip" name="ip" value="192.0.2.10"/>
+        </instance_attributes>
+	<!-- a bit hairy but valid -->
+        <instance_attributes id="_cibtr-2_mySmartFuse-outputpower-instanceparams">
+          <nvpair id="__cibtr-2_mySmartFuse-outputpower-instanceparams__mySmartFuse-outputpower-requires" name="requires" value="outputpower"/>
+        </instance_attributes>
+      </primitive>
+
+    </resources>
+    <constraints/>
+  </configuration>
+  <status/>
+</cib>