python-common, orch: Move ServiceSpec tests to python-common

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/src/pybind/mgr/tests/test_orchestrator.py b/src/pybind/mgr/tests/test_orchestrator.py
index 6e2fbaa45938163b559b8864c0b4b1d4c9f98234..f627e070aa142ff563a703b5f0186ee0003f5bf5 100644 (file)
--- a/src/pybind/mgr/tests/test_orchestrator.py
+++ b/src/pybind/mgr/tests/test_orchestrator.py
@@ -1,64 +1,13 @@
 from __future__ import absolute_import
-import json
 
 from tests import mock
 
 import pytest
 
 from ceph.deployment import inventory
-from orchestrator import raise_if_exception, RGWSpec, Completion, ProgressReference, \
-    servicespec_validate_add
-from orchestrator import InventoryHost, ServiceDescription, DaemonDescription
+from orchestrator import raise_if_exception, Completion, ProgressReference
+from orchestrator import InventoryHost, DaemonDescription
 from orchestrator import OrchestratorValidationError
-from orchestrator import HostPlacementSpec, PlacementSpec
-
-
-@pytest.mark.parametrize("test_input,expected, require_network",
-                         [("myhost", ('myhost', '', ''), False),
-                          ("myhost=sname", ('myhost', '', 'sname'), False),
-                          ("myhost:10.1.1.10", ('myhost', '10.1.1.10', ''), True),
-                          ("myhost:10.1.1.10=sname", ('myhost', '10.1.1.10', 'sname'), True),
-                          ("myhost:10.1.1.0/32", ('myhost', '10.1.1.0/32', ''), True),
-                          ("myhost:10.1.1.0/32=sname", ('myhost', '10.1.1.0/32', 'sname'), True),
-                          ("myhost:[v1:10.1.1.10:6789]", ('myhost', '[v1:10.1.1.10:6789]', ''), True),
-                          ("myhost:[v1:10.1.1.10:6789]=sname", ('myhost', '[v1:10.1.1.10:6789]', 'sname'), True),
-                          ("myhost:[v1:10.1.1.10:6789,v2:10.1.1.11:3000]", ('myhost', '[v1:10.1.1.10:6789,v2:10.1.1.11:3000]', ''), True),
-                          ("myhost:[v1:10.1.1.10:6789,v2:10.1.1.11:3000]=sname", ('myhost', '[v1:10.1.1.10:6789,v2:10.1.1.11:3000]', 'sname'), True),
-                          ])
-def test_parse_host_placement_specs(test_input, expected, require_network):
-    ret = HostPlacementSpec.parse(test_input, require_network=require_network)
-    assert ret == expected
-    assert str(ret) == test_input
-
-@pytest.mark.parametrize(
-    "test_input,expected",
-    [
-        ('', "PlacementSpec()"),
-        ("count:2", "PlacementSpec(count:2)"),
-        ("3", "PlacementSpec(count:3)"),
-        ("host1 host2", "PlacementSpec(host1,host2)"),
-        ("host1=a host2=b", "PlacementSpec(host1=a,host2=b)"),
-        ("host1:1.2.3.4=a host2:1.2.3.5=b", "PlacementSpec(host1:1.2.3.4=a,host2:1.2.3.5=b)"),
-        ('2 host1 host2', "PlacementSpec(count:2 host1,host2)"),
-        ('label:foo', "PlacementSpec(label:foo)"),
-        ('3 label:foo', "PlacementSpec(count:3 label:foo)"),
-        ('*', 'PlacementSpec(all:true)'),
-    ])
-def test_parse_placement_specs(test_input, expected):
-    ret = PlacementSpec.from_string(test_input)
-    assert str(ret) == expected
-
-@pytest.mark.parametrize("test_input",
-                         # wrong subnet
-                         [("myhost:1.1.1.1/24"),
-                          # wrong ip format
-                          ("myhost:1"),
-                          # empty string
-                          ("myhost=1"),
-                          ])
-def test_parse_host_placement_specs_raises(test_input):
-    with pytest.raises(ValueError):
-        ret = HostPlacementSpec.parse(test_input)
 
 
 def _test_resource(data, resource_class, extra=None):
@@ -116,20 +65,6 @@ def test_raise():
         raise_if_exception(c)
 
 
-def test_rgwspec():
-    """
-    {
-        "rgw_zone": "zonename",
-        "service_type": "rgw",
-        "rgw_frontend_port": 8080,
-        "rgw_realm": "realm"
-    }
-    """
-    example = json.loads(test_rgwspec.__doc__.strip())
-    spec = RGWSpec.from_json(example)
-    assert servicespec_validate_add(spec) is None
-
-
 def test_promise():
     p = Completion(value=3)
     p.finalize()

diff --git a/src/python-common/ceph/tests/test_service_spec.py b/src/python-common/ceph/tests/test_service_spec.py
new file mode 100644 (file)
index 0000000..be33fd2
--- /dev/null
+++ b/src/python-common/ceph/tests/test_service_spec.py
@@ -0,0 +1,68 @@
+import json
+
+import pytest
+
+from ceph.deployment.service_spec import HostPlacementSpec, PlacementSpec, RGWSpec, \
+    servicespec_validate_add
+
+
+@pytest.mark.parametrize("test_input,expected, require_network",
+                         [("myhost", ('myhost', '', ''), False),
+                          ("myhost=sname", ('myhost', '', 'sname'), False),
+                          ("myhost:10.1.1.10", ('myhost', '10.1.1.10', ''), True),
+                          ("myhost:10.1.1.10=sname", ('myhost', '10.1.1.10', 'sname'), True),
+                          ("myhost:10.1.1.0/32", ('myhost', '10.1.1.0/32', ''), True),
+                          ("myhost:10.1.1.0/32=sname", ('myhost', '10.1.1.0/32', 'sname'), True),
+                          ("myhost:[v1:10.1.1.10:6789]", ('myhost', '[v1:10.1.1.10:6789]', ''), True),
+                          ("myhost:[v1:10.1.1.10:6789]=sname", ('myhost', '[v1:10.1.1.10:6789]', 'sname'), True),
+                          ("myhost:[v1:10.1.1.10:6789,v2:10.1.1.11:3000]", ('myhost', '[v1:10.1.1.10:6789,v2:10.1.1.11:3000]', ''), True),
+                          ("myhost:[v1:10.1.1.10:6789,v2:10.1.1.11:3000]=sname", ('myhost', '[v1:10.1.1.10:6789,v2:10.1.1.11:3000]', 'sname'), True),
+                          ])
+def test_parse_host_placement_specs(test_input, expected, require_network):
+    ret = HostPlacementSpec.parse(test_input, require_network=require_network)
+    assert ret == expected
+    assert str(ret) == test_input
+
+@pytest.mark.parametrize(
+    "test_input,expected",
+    [
+        ('', "PlacementSpec()"),
+        ("count:2", "PlacementSpec(count:2)"),
+        ("3", "PlacementSpec(count:3)"),
+        ("host1 host2", "PlacementSpec(host1,host2)"),
+        ("host1=a host2=b", "PlacementSpec(host1=a,host2=b)"),
+        ("host1:1.2.3.4=a host2:1.2.3.5=b", "PlacementSpec(host1:1.2.3.4=a,host2:1.2.3.5=b)"),
+        ('2 host1 host2', "PlacementSpec(count:2 host1,host2)"),
+        ('label:foo', "PlacementSpec(label:foo)"),
+        ('3 label:foo', "PlacementSpec(count:3 label:foo)"),
+        ('*', 'PlacementSpec(all:true)'),
+    ])
+def test_parse_placement_specs(test_input, expected):
+    ret = PlacementSpec.from_string(test_input)
+    assert str(ret) == expected
+
+@pytest.mark.parametrize("test_input",
+                         # wrong subnet
+                         [("myhost:1.1.1.1/24"),
+                          # wrong ip format
+                          ("myhost:1"),
+                          # empty string
+                          ("myhost=1"),
+                          ])
+def test_parse_host_placement_specs_raises(test_input):
+    with pytest.raises(ValueError):
+        ret = HostPlacementSpec.parse(test_input)
+
+
+def test_rgwspec():
+    """
+    {
+        "rgw_zone": "zonename",
+        "service_type": "rgw",
+        "rgw_frontend_port": 8080,
+        "rgw_realm": "realm"
+    }
+    """
+    example = json.loads(test_rgwspec.__doc__.strip())
+    spec = RGWSpec.from_json(example)
+    assert servicespec_validate_add(spec) is None
\ No newline at end of file