From ae3435418f0af6e5f22f463871aa90a5c5b2d15f Mon Sep 17 00:00:00 2001

From: Tomas Jelinek <tojeline@redhat.com>

Date: Fri, 4 Feb 2022 16:23:18 +0100

Subject: [PATCH 1/3] process invalid OCF agents as if they complied with OCF

 1.0

---

 pcs/common/reports/codes.py                   |   4 +-

 pcs/common/reports/messages.py                |  13 +-

 pcs/lib/commands/resource.py                  |   3 +-

 pcs/lib/commands/resource_agent.py            |   4 +-

 pcs/lib/commands/stonith.py                   |   3 +-

 pcs/lib/resource_agent/__init__.py            |   1 -

 pcs/lib/resource_agent/error.py               |  14 --

 pcs/lib/resource_agent/facade.py              |  37 ++-

 pcs/lib/resource_agent/xml.py                 |  15 +-

 .../tier0/common/reports/test_messages.py     |  18 +-

 .../tier0/lib/resource_agent/test_facade.py   |  47 ++++

 pcs_test/tier0/lib/resource_agent/test_xml.py | 226 ++++++++----------

 12 files changed, 201 insertions(+), 184 deletions(-)

diff --git a/pcs/common/reports/codes.py b/pcs/common/reports/codes.py

index 3e0512d9..e8dee00f 100644

--- a/pcs/common/reports/codes.py

+++ b/pcs/common/reports/codes.py

@@ -36,8 +36,8 @@ ADD_REMOVE_CANNOT_SPECIFY_ADJACENT_ITEM_WITHOUT_ITEMS_TO_ADD = M(

     "ADD_REMOVE_CANNOT_SPECIFY_ADJACENT_ITEM_WITHOUT_ITEMS_TO_ADD"

 )

 AGENT_GENERIC_ERROR = M("AGENT_GENERIC_ERROR")

-AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION = M(

-    "AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION"

+AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION_ASSUMED_VERSION = M(

+    "AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION_ASSUMED_VERSION"

 )

 AGENT_NAME_GUESS_FOUND_MORE_THAN_ONE = M("AGENT_NAME_GUESS_FOUND_MORE_THAN_ONE")

 AGENT_NAME_GUESS_FOUND_NONE = M("AGENT_NAME_GUESS_FOUND_NONE")

diff --git a/pcs/common/reports/messages.py b/pcs/common/reports/messages.py

index 9d665e73..7df1e1eb 100644

--- a/pcs/common/reports/messages.py

+++ b/pcs/common/reports/messages.py

@@ -3789,9 +3789,9 @@ class AgentNameGuessFoundNone(ReportItemMessage):

 @dataclass(frozen=True)

-class AgentImplementsUnsupportedOcfVersion(ReportItemMessage):

+class AgentImplementsUnsupportedOcfVersionAssumedVersion(ReportItemMessage):

     """

-    Specified agent implements OCF version not supported by pcs

+    Specified agent implements OCF version not supported by pcs, assumed OCF 1.0

     agent -- name of the agent

     ocf_version -- OCF version implemented by the agent

@@ -3801,7 +3801,8 @@ class AgentImplementsUnsupportedOcfVersion(ReportItemMessage):

     agent: str

     ocf_version: str

     supported_versions: List[str]

-    _code = codes.AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION

+    assumed_version: str

+    _code = codes.AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION_ASSUMED_VERSION

     @property

     def message(self) -> str:

@@ -3809,9 +3810,9 @@ class AgentImplementsUnsupportedOcfVersion(ReportItemMessage):

         _is = format_plural(self.supported_versions, "is")

         _version_list = format_list(self.supported_versions)

         return (

-            f"Unable to process agent '{self.agent}' as it implements "

-            f"unsupported OCF version '{self.ocf_version}', supported "

-            f"{_version} {_is}: {_version_list}"

+            f"Agent '{self.agent}' implements unsupported OCF version "

+            f"'{self.ocf_version}', supported {_version} {_is}: "

+            f"{_version_list}; assumed version '{self.assumed_version}'"

         )

diff --git a/pcs/lib/commands/resource.py b/pcs/lib/commands/resource.py

index 82ce73e0..c4b6252c 100644

--- a/pcs/lib/commands/resource.py

+++ b/pcs/lib/commands/resource.py

@@ -84,7 +84,6 @@ from pcs.lib.resource_agent import (

     ResourceAgentName,

     split_resource_agent_name,

     UnableToGetAgentMetadata,

-    UnsupportedOcfVersion,

 )

 from pcs.lib.tools import get_tmp_cib

 from pcs.lib.validate import ValueTimeInterval

@@ -162,7 +161,7 @@ def _get_agent_facade(

             else find_one_resource_agent_by_type(runner, report_processor, name)

         )

         return factory.facade_from_parsed_name(split_name)

-    except (UnableToGetAgentMetadata, UnsupportedOcfVersion) as e:

+    except UnableToGetAgentMetadata as e:

         if allow_absent_agent:

             report_processor.report(

                 resource_agent_error_to_report_item(

diff --git a/pcs/lib/commands/resource_agent.py b/pcs/lib/commands/resource_agent.py

index e6167b13..4a1831c0 100644

--- a/pcs/lib/commands/resource_agent.py

+++ b/pcs/lib/commands/resource_agent.py

@@ -139,7 +139,9 @@ def _complete_agent_list(

         try:

             split_name = split_resource_agent_name(name)

             metadata = (

-                agent_factory.facade_from_parsed_name(split_name).metadata

+                agent_factory.facade_from_parsed_name(

+                    split_name, report_warnings=False

+                ).metadata

                 if describe

                 else name_to_void_metadata(split_name)

             )

diff --git a/pcs/lib/commands/stonith.py b/pcs/lib/commands/stonith.py

index 093f5be9..2aa299d7 100644

--- a/pcs/lib/commands/stonith.py

+++ b/pcs/lib/commands/stonith.py

@@ -45,7 +45,6 @@ from pcs.lib.resource_agent import (

     ResourceAgentFacadeFactory,

     ResourceAgentName,

     UnableToGetAgentMetadata,

-    UnsupportedOcfVersion,

 )

 from pcs.lib.validate import validate_add_remove_items

 from pcs.lib.xml_tools import get_root

@@ -62,7 +61,7 @@ def _get_agent_facade(

             raise InvalidResourceAgentName(name)

         full_name = ResourceAgentName("stonith", None, name)

         return factory.facade_from_parsed_name(full_name)

-    except (UnableToGetAgentMetadata, UnsupportedOcfVersion) as e:

+    except UnableToGetAgentMetadata as e:

         if allow_absent_agent:

             report_processor.report(

                 resource_agent_error_to_report_item(

diff --git a/pcs/lib/resource_agent/__init__.py b/pcs/lib/resource_agent/__init__.py

index 4548017f..c6086331 100644

--- a/pcs/lib/resource_agent/__init__.py

+++ b/pcs/lib/resource_agent/__init__.py

@@ -10,7 +10,6 @@ from .error import (

     ResourceAgentError,

     resource_agent_error_to_report_item,

     UnableToGetAgentMetadata,

-    UnsupportedOcfVersion,

 )

 from .facade import ResourceAgentFacade, ResourceAgentFacadeFactory

 from .list import (

diff --git a/pcs/lib/resource_agent/error.py b/pcs/lib/resource_agent/error.py

index d4178333..f1dd7f3d 100644

--- a/pcs/lib/resource_agent/error.py

+++ b/pcs/lib/resource_agent/error.py

@@ -2,8 +2,6 @@ from typing import Iterable

 from pcs.common import reports

-from . import const

-

 class ResourceAgentError(Exception):

     def __init__(self, agent_name: str):

@@ -37,12 +35,6 @@ class UnableToGetAgentMetadata(ResourceAgentError):

         self.message = message

-class UnsupportedOcfVersion(ResourceAgentError):

-    def __init__(self, agent_name: str, ocf_version: str):

-        super().__init__(agent_name)

-        self.ocf_version = ocf_version

-

-

 def resource_agent_error_to_report_item(

     e: ResourceAgentError,

     severity: reports.ReportItemSeverity = reports.ReportItemSeverity.error(),

@@ -69,10 +61,4 @@ def resource_agent_error_to_report_item(

         message = reports.messages.UnableToGetAgentMetadata(

             e.agent_name, e.message

         )

-    elif isinstance(e, UnsupportedOcfVersion):

-        message = reports.messages.AgentImplementsUnsupportedOcfVersion(

-            e.agent_name,

-            e.ocf_version,

-            sorted(const.SUPPORTED_OCF_VERSIONS),

-        )

     return reports.ReportItem(severity, message)

diff --git a/pcs/lib/resource_agent/facade.py b/pcs/lib/resource_agent/facade.py

index 4dbb59b8..dea59a1a 100644

--- a/pcs/lib/resource_agent/facade.py

+++ b/pcs/lib/resource_agent/facade.py

@@ -188,18 +188,32 @@ class ResourceAgentFacadeFactory:

         self._fenced_metadata = None

     def facade_from_parsed_name(

-        self, name: ResourceAgentName

+        self, name: ResourceAgentName, report_warnings=True

     ) -> ResourceAgentFacade:

         """

         Create ResourceAgentFacade based on specified agent name

         name -- agent name to get a facade for

         """

-        return self._facade_from_metadata(

-            ocf_version_to_ocf_unified(

-                parse_metadata(name, load_metadata(self._runner, name))

-            )

+        metadata, raw_ocf_version = parse_metadata(

+            name,

+            load_metadata(self._runner, name),

         )

+        if (

+            report_warnings

+            and raw_ocf_version not in const.SUPPORTED_OCF_VERSIONS

+        ):

+            self._report_processor.report(

+                reports.ReportItem.warning(

+                    reports.messages.AgentImplementsUnsupportedOcfVersionAssumedVersion(

+                        name.full_name,

+                        raw_ocf_version,

+                        sorted(const.SUPPORTED_OCF_VERSIONS),

+                        const.OCF_1_0,

+                    )

+                )

+            )

+        return self._facade_from_metadata(ocf_version_to_ocf_unified(metadata))

     def void_facade_from_parsed_name(

         self, name: ResourceAgentName

@@ -232,15 +246,12 @@ class ResourceAgentFacadeFactory:

                 const.FAKE_AGENT_STANDARD, None, const.PACEMAKER_FENCED

             )

             try:

+                metadata, _ = parse_metadata(

+                    agent_name,

+                    load_fake_agent_metadata(self._runner, agent_name.type),

+                )

                 self._fenced_metadata = ocf_unified_to_pcs(

-                    ocf_version_to_ocf_unified(

-                        parse_metadata(

-                            agent_name,

-                            load_fake_agent_metadata(

-                                self._runner, agent_name.type

-                            ),

-                        )

-                    )

+                    ocf_version_to_ocf_unified(metadata)

                 )

             except ResourceAgentError as e:

                 # If pcs is unable to load fenced metadata, cache an empty

diff --git a/pcs/lib/resource_agent/xml.py b/pcs/lib/resource_agent/xml.py

index 82f8fbfa..1ba97216 100644

--- a/pcs/lib/resource_agent/xml.py

+++ b/pcs/lib/resource_agent/xml.py

@@ -8,7 +8,7 @@ from pcs.common.tools import xml_fromstring

 from pcs.lib.external import CommandRunner

 from . import const

-from .error import UnableToGetAgentMetadata, UnsupportedOcfVersion

+from .error import UnableToGetAgentMetadata

 from .types import (

     FakeAgentName,

     ResourceAgentActionOcf1_0,

@@ -137,8 +137,11 @@ def load_fake_agent_metadata(

 def parse_metadata(

-    name: ResourceAgentName, metadata: _Element

-) -> Union[ResourceAgentMetadataOcf1_0, ResourceAgentMetadataOcf1_1]:

+    name: ResourceAgentName,

+    metadata: _Element,

+) -> Tuple[

+    Union[ResourceAgentMetadataOcf1_0, ResourceAgentMetadataOcf1_1], str

+]:

     """

     Parse XML metadata to a dataclass

@@ -146,11 +149,9 @@ def parse_metadata(

     metadata -- metadata XML document

     """

     ocf_version = _get_ocf_version(metadata)

-    if ocf_version == const.OCF_1_0:

-        return _parse_agent_1_0(name, metadata)

     if ocf_version == const.OCF_1_1:

-        return _parse_agent_1_1(name, metadata)

-    raise UnsupportedOcfVersion(name.full_name, ocf_version)

+        return _parse_agent_1_1(name, metadata), ocf_version

+    return _parse_agent_1_0(name, metadata), ocf_version

 def _parse_agent_1_0(

diff --git a/pcs_test/tier0/common/reports/test_messages.py b/pcs_test/tier0/common/reports/test_messages.py

index 4a7b4945..b885a9eb 100644

--- a/pcs_test/tier0/common/reports/test_messages.py

+++ b/pcs_test/tier0/common/reports/test_messages.py

@@ -2833,22 +2833,22 @@ class AgentNameGuessFoundNone(NameBuildTest):

         )

-class AgentImplementsUnsupportedOcfVersion(NameBuildTest):

+class AgentImplementsUnsupportedOcfVersionAssumedVersion(NameBuildTest):

     def test_singular(self):

         self.assert_message_from_report(

-            "Unable to process agent 'agent-name' as it implements unsupported "

-            "OCF version 'ocf-2.3', supported version is: 'v1'",

-            reports.AgentImplementsUnsupportedOcfVersion(

-                "agent-name", "ocf-2.3", ["v1"]

+            "Agent 'agent-name' implements unsupported OCF version 'ocf-2.3', "

+            "supported version is: 'v1'; assumed version 'v1'",

+            reports.AgentImplementsUnsupportedOcfVersionAssumedVersion(

+                "agent-name", "ocf-2.3", ["v1"], "v1"

             ),

         )

     def test_plural(self):

         self.assert_message_from_report(

-            "Unable to process agent 'agent-name' as it implements unsupported "

-            "OCF version 'ocf-2.3', supported versions are: 'v1', 'v2', 'v3'",

-            reports.AgentImplementsUnsupportedOcfVersion(

-                "agent-name", "ocf-2.3", ["v1", "v2", "v3"]

+            "Agent 'agent-name' implements unsupported OCF version 'ocf-2.3', "

+            "supported versions are: 'v1', 'v2', 'v3'; assumed version 'v1'",

+            reports.AgentImplementsUnsupportedOcfVersionAssumedVersion(

+                "agent-name", "ocf-2.3", ["v1", "v2", "v3"], "v1"

             ),

         )

diff --git a/pcs_test/tier0/lib/resource_agent/test_facade.py b/pcs_test/tier0/lib/resource_agent/test_facade.py

index 654eb35e..f6a9899c 100644

--- a/pcs_test/tier0/lib/resource_agent/test_facade.py

+++ b/pcs_test/tier0/lib/resource_agent/test_facade.py

@@ -92,6 +92,14 @@ class ResourceAgentFacadeFactory(TestCase):

             </parameters>

         </resource-agent>

     """

+    _fixture_agent_bad_version_xml = """

+        <resource-agent name="agent">

+            <version>0.1.2</version>

+            <parameters>

+                <parameter name="agent-param"/>

+            </parameters>

+        </resource-agent>

+    """

     _fixture_fenced_xml = """

         <resource-agent name="pacemaker-fenced">

             <parameters>

@@ -125,6 +133,45 @@ class ResourceAgentFacadeFactory(TestCase):

         self.assertEqual(facade.metadata.name, name)

         self.assertTrue(facade.metadata.agent_exists)

+    def test_facade_bad_ocf_version(self):

+        name = ra.ResourceAgentName("service", None, "daemon")

+        self.config.runner.pcmk.load_agent(

+            agent_name="service:daemon",

+            stdout=self._fixture_agent_bad_version_xml,

+        )

+

+        env = self.env_assist.get_env()

+        facade = ra.ResourceAgentFacadeFactory(

+            env.cmd_runner(), env.report_processor

+        ).facade_from_parsed_name(name)

+        self.assertEqual(facade.metadata.name, name)

+        self.assertTrue(facade.metadata.agent_exists)

+        self.env_assist.assert_reports(

+            [

+                fixture.warn(

+                    reports.codes.AGENT_IMPLEMENTS_UNSUPPORTED_OCF_VERSION_ASSUMED_VERSION,

+                    agent=name.full_name,

+                    ocf_version="0.1.2",

+                    supported_versions=sorted(ra.const.SUPPORTED_OCF_VERSIONS),

+                    assumed_version=ra.const.OCF_1_0,

+                )

+            ]

+        )

+

+    def test_facade_bad_ocf_version_disabled_warning(self):

+        name = ra.ResourceAgentName("service", None, "daemon")

+        self.config.runner.pcmk.load_agent(

+            agent_name="service:daemon",

+            stdout=self._fixture_agent_bad_version_xml,

+        )

+

+        env = self.env_assist.get_env()

+        facade = ra.ResourceAgentFacadeFactory(

+            env.cmd_runner(), env.report_processor

+        ).facade_from_parsed_name(name, report_warnings=False)

+        self.assertEqual(facade.metadata.name, name)

+        self.assertTrue(facade.metadata.agent_exists)

+

     def test_facade_missing_agent(self):

         name = ra.ResourceAgentName("service", None, "daemon")

         self.config.runner.pcmk.load_agent(

diff --git a/pcs_test/tier0/lib/resource_agent/test_xml.py b/pcs_test/tier0/lib/resource_agent/test_xml.py

index c4176f32..26bbbb7d 100644

--- a/pcs_test/tier0/lib/resource_agent/test_xml.py

+++ b/pcs_test/tier0/lib/resource_agent/test_xml.py

@@ -351,6 +351,7 @@ class LoadFakeAgentMetadata(TestCase):

 class ParseOcfToolsMixin:

     agent_name = ra.ResourceAgentName("ocf", "pacemaker", "Dummy")

     ocf_version = None

+    parsed_ocf_version = None

     def parse(self, xml, agent_name=None):

         agent_name = agent_name or self.agent_name

@@ -383,19 +384,17 @@ class ParseOcfToolsMixin:

             version_el.text = ocf_version

         return etree_to_str(dom)

-

-class ParseOcfGeneric(ParseOcfToolsMixin, TestCase):

-    def test_unsupported_ocf_version(self):

-        with self.assertRaises(ra.UnsupportedOcfVersion) as cm:

-            self.parse(self.xml("""<resource-agent/>""", ocf_version="1.2"))

-        self.assertEqual(cm.exception.agent_name, self.agent_name.full_name)

-        self.assertEqual(cm.exception.ocf_version, "1.2")

+    def assert_parse_result(self, xml, metadata):

+        self.assertEqual(

+            self.parse(xml),

+            (metadata, self.parsed_ocf_version or self.ocf_version),

+        )

 class ParseOcf10BaseMixin(ParseOcfToolsMixin):

     def test_empty_agent(self):

-        self.assertEqual(

-            self.parse(self.xml("""<resource-agent/>""")),

+        self.assert_parse_result(

+            self.xml("""<resource-agent/>"""),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

                 shortdesc=None,

@@ -406,16 +405,14 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_element(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <shortdesc>This is a shortdesc</shortdesc>

                             <longdesc>This is a longdesc</longdesc>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -427,16 +424,14 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_element_empty(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <longdesc/>

                             <shortdesc/>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -448,15 +443,13 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_attribute(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent shortdesc="This is a shortdesc">

                             <longdesc></longdesc>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -468,13 +461,11 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_attribute_empty(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent shortdesc=""/>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -486,15 +477,13 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_element_and_attribute(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent shortdesc="shortdesc attribute">

                             <shortdesc>shortdesc element</shortdesc>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -506,15 +495,13 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_element_empty_and_attribute(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent shortdesc="shortdesc attribute">

                             <shortdesc></shortdesc>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -526,15 +513,13 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_desc_element_empty_and_attribute_empty(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent shortdesc="">

                             <shortdesc></shortdesc>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -546,15 +531,13 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_parameters_empty_list(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <parameters/>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -581,17 +564,15 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

             )

     def test_parameters_minimal(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <parameters>

                                 <parameter name="a_parameter"/>

                             </parameters>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -616,10 +597,9 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_parameters_all_settings(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <parameters>

@@ -632,7 +612,6 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

                             </parameters>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -657,10 +636,9 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_parameters_content(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <parameters>

                                 <parameter name="with_type">

@@ -676,7 +654,6 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

                             </parameters>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -713,15 +690,13 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

         )

     def test_actions_empty_list(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <actions/>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -748,10 +723,9 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

             )

     def test_actions_multiple(self):

-        self.assertEqual(

-            self.parse(

-                self.xml(

-                    """

+        self.assert_parse_result(

+            self.xml(

+                """

                         <resource-agent>

                             <actions>

                                 <action name="minimal"/>

@@ -764,7 +738,6 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

                             </actions>

                         </resource-agent>

                     """

-                )

             ),

             ResourceAgentMetadataOcf1_0(

                 self.agent_name,

@@ -808,7 +781,26 @@ class ParseOcf10BaseMixin(ParseOcfToolsMixin):

 class ParseOcf10NoVersion(ParseOcf10BaseMixin, TestCase):

-    pass

+    parsed_ocf_version = "1.0"

+

+

+class ParseOcf10UnsupportedVersion(ParseOcf10BaseMixin, TestCase):

+    ocf_version = "0.1.2"

+

+    # These tests test that pcs raises an error if an agent doesn't conform to

+    # OCF schema. There is, however, no validation against OCF schema for

+    # agents with unsupported OCF version. That means no error message, pcs

+    # tries to process the agent and crashes. However bad that sounds, it's

+    # indended as that's how pcs behaved before OCF 1.1 was implemented.

+    # There's therefore no point in running these tests.

+

+    def test_parameters_empty_parameter(self):

+        # parameters must have at least 'name' attribute

+        pass

+

+    def test_actions_empty_action(self):

+        # actions must have at least 'name' attribute

+        pass

 class ParseOcf10ExplicitVersion(ParseOcf10BaseMixin, TestCase):

@@ -819,8 +811,8 @@ class ParseOcf11(ParseOcfToolsMixin, TestCase):

     ocf_version = "1.1"

     def test_empty_agent(self):

-        self.assertEqual(

-            self.parse(self.xml("""<resource-agent/>""")),

+        self.assert_parse_result(

+            self.xml("""<resource-agent/>"""),