From: Sage Weil <sage@redhat.com>
Date: Fri, 14 Jul 2017 16:37:02 +0000 (-0400)
Subject: test/mon/osd-crush: remove xml osd-crush-tree.rng test
X-Git-Tag: v12.1.2~150^2~29
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5b1e859efde282db1e6e6e9ae3c34f93a1963d98;p=ceph-ci.git

test/mon/osd-crush: remove xml osd-crush-tree.rng test

I don't know how to generate or update this, and am not *that* interested
in learning more xml.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/test/mon/osd-crush-tree.rng b/src/test/mon/osd-crush-tree.rng
deleted file mode 100644
index 14ea5f35a01..00000000000
--- a/src/test/mon/osd-crush-tree.rng
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-  <start>
-    <ref name="crush_map_roots"/>
-  </start>
-  <define name="item">
-    <choice>
-      <ref name="bucket"/>
-      <ref name="device"/>
-    </choice>
-  </define>
-  <define name="device">
-    <element name="device">
-      <element name="id">
-        <text/>
-      </element>
-      <element name="device_class">
-        <text/>
-      </element>
-      <element name="name">
-        <text/>
-      </element>
-      <element name="type">
-        <text/>
-      </element>
-      <element name="type_id">
-        <text/>
-      </element>
-      <element name="crush_weight">
-        <text/>
-      </element>
-      <element name="depth">
-        <text/>
-      </element>
-    </element>
-  </define>
-  <define name="bucket">
-    <element name="bucket">
-      <element name="id">
-        <text/>
-      </element>
-      <element name="device_class">
-        <text/>
-      </element>
-      <element name="name">
-        <text/>
-      </element>
-      <element name="type">
-        <text/>
-      </element>
-      <element name="type_id">
-        <text/>
-      </element>
-      <element name="items">
-        <zeroOrMore>
-          <ref name="item"/>
-        </zeroOrMore>
-      </element>
-    </element>
-  </define>
-  <define name="crush_map_roots">
-    <element name="crush_map_roots">
-      <oneOrMore>
-        <ref name="bucket"/>
-      </oneOrMore>
-    </element>
-  </define>
-</grammar>
diff --git a/src/test/mon/osd-crush.sh b/src/test/mon/osd-crush.sh
index 68d90ca9d2e..aa8d5167062 100755
--- a/src/test/mon/osd-crush.sh
+++ b/src/test/mon/osd-crush.sh
@@ -222,14 +222,6 @@ function TEST_crush_reject_empty() {
         ceph osd setcrushmap -i $empty_map.map || return 1
 }
 
-function TEST_crush_tree() {
-    local dir=$1
-    run_mon $dir a || return 1
-
-    ceph osd crush tree --format=xml | \
-        $XMLSTARLET val -e -r $CEPH_ROOT/src/test/mon/osd-crush-tree.rng - || return 1
-}
-
 main osd-crush "$@"
 
 # Local Variables: