From 798a8ab276fb816c3d9cfa5ba0a8ed55a3ed6cd2 Mon Sep 17 00:00:00 2001

From: Ivan Devat <idevat@redhat.com>

Date: Mon, 29 Aug 2016 15:14:25 +0200

Subject: [PATCH] squash bz1308514 Wider support for booth configura

50fb38db5e26 append a new line at the end of the booth config

a03b98c0f9e1 add bash completion for booth

52b97fa9ef32 clean up ip resource if creating booth res. fails

3d0e698a83fc fix allow force remove multiple booth resources

1ac88efab2cd refactor booth remove

6b41c5cc1661 add booth restart command

706c6f32f172 fix usage: ticket grant/revoke not for arbitrator

26fa2a241227 complete man (stayed behind usage)

75f8da852641 modify exchange format of booth config

ffe6ec7ea8d2 show all booth config lines including unsupported

8722fb7ede2e add support for options during add booth ticket

50eb49a4350b fix naming of booth reportes and report codes according to convetions

6dfb7c82d802 simplify booth config distribution reports

116a7a311cd7 fix adding node to cluster when booth is not installed

23abb122e2d1 fix getting a list of existing booth config files

ebd9fc496e24 display booth config as it is (plain, not parsed)

0183814dd57a add ability to display booth config from a remote node

---

 pcs/booth.py                                |   6 +-

 pcs/cli/booth/command.py                    |  72 ++++++++++--------

 pcs/cli/booth/test/test_command.py          |  21 ++++--

 pcs/cli/common/lib_wrapper.py               |   3 +-

 pcs/common/report_codes.py                  |   9 +--

 pcs/lib/booth/config_exchange.py            |  47 ++++--------

 pcs/lib/booth/config_files.py               |  15 +++-

 pcs/lib/booth/config_parser.py              |   3 +-

 pcs/lib/booth/config_structure.py           |  35 ++++++++-

 pcs/lib/booth/reports.py                    |  97 +++++++++++++-----------

 pcs/lib/booth/resource.py                   |  49 ++++--------

 pcs/lib/booth/sync.py                       |  12 +--

 pcs/lib/booth/test/test_config_exchange.py  |  56 ++++++--------

 pcs/lib/booth/test/test_config_files.py     |  32 ++++++--

 pcs/lib/booth/test/test_config_parser.py    |   2 +

 pcs/lib/booth/test/test_config_structure.py |  66 ++++++++++++++++-

 pcs/lib/booth/test/test_resource.py         | 111 ++++++++++++----------------

 pcs/lib/booth/test/test_sync.py             |  56 +++++++-------

 pcs/lib/commands/booth.py                   |  88 ++++++++++++++--------

 pcs/lib/commands/test/test_booth.py         |  50 +++++++------

 pcs/pcs.8                                   |  11 ++-

 pcs/test/test_booth.py                      |  77 +++++++++++++++++--

 pcs/usage.py                                |  13 +++-

 23 files changed, 564 insertions(+), 367 deletions(-)

diff --git a/pcs/booth.py b/pcs/booth.py

index 764dcd8..5ec41bf 100644

--- a/pcs/booth.py

+++ b/pcs/booth.py

@@ -12,7 +12,7 @@ from pcs import utils

 from pcs.cli.booth import command

 from pcs.cli.common.errors import CmdLineInputError

 from pcs.lib.errors import LibraryError

-from pcs.resource import resource_create, resource_remove

+from pcs.resource import resource_create, resource_remove, resource_restart

 def booth_cmd(lib, argv, modifiers):

@@ -47,13 +47,15 @@ def booth_cmd(lib, argv, modifiers):

             else:

                 raise CmdLineInputError()

         elif sub_cmd == "create":

-            command.get_create_in_cluster(resource_create)(

+            command.get_create_in_cluster(resource_create, resource_remove)(

                 lib, argv_next, modifiers

             )

         elif sub_cmd == "remove":

             command.get_remove_from_cluster(resource_remove)(

                 lib, argv_next, modifiers

             )

+        elif sub_cmd == "restart":

+            command.get_restart(resource_restart)(lib, argv_next, modifiers)

         elif sub_cmd == "sync":

             command.sync(lib, argv_next, modifiers)

         elif sub_cmd == "pull":

diff --git a/pcs/cli/booth/command.py b/pcs/cli/booth/command.py

index bea6582..0b71a01 100644

--- a/pcs/cli/booth/command.py

+++ b/pcs/cli/booth/command.py

@@ -6,7 +6,7 @@ from __future__ import (

 )

 from pcs.cli.common.errors import CmdLineInputError

-from pcs.cli.common.parse_args import group_by_keywords

+from pcs.cli.common.parse_args import group_by_keywords, prepare_options

 DEFAULT_BOOTH_NAME = "booth"

@@ -18,15 +18,25 @@ def config_setup(lib, arg_list, modifiers):

     """

     create booth config

     """

-    booth_configuration = group_by_keywords(

+    peers = group_by_keywords(

         arg_list,

         set(["sites", "arbitrators"]),

         keyword_repeat_allowed=False

     )

-    if "sites" not in booth_configuration or not booth_configuration["sites"]:

+    if "sites" not in peers or not peers["sites"]:

         raise CmdLineInputError()

-    lib.booth.config_setup(booth_configuration, modifiers["force"])

+    booth_config = []

+    for site in peers["sites"]:

+        booth_config.append({"key": "site", "value": site, "details": []})

+    for arbitrator in peers["arbitrators"]:

+        booth_config.append({

+            "key": "arbitrator",

+            "value": arbitrator,

+            "details": [],

+        })

+

+    lib.booth.config_setup(booth_config, modifiers["force"])

 def config_destroy(lib, arg_list, modifiers):

     """

@@ -41,36 +51,20 @@ def config_show(lib, arg_list, modifiers):

     """

     print booth config

     """

-    booth_configuration = lib.booth.config_show()

-    authfile_lines = []

-    if booth_configuration["authfile"]:

-        authfile_lines.append(

-            "authfile = {0}".format(booth_configuration["authfile"])

-        )

+    if len(arg_list) > 1:

+        raise CmdLineInputError()

+    node = None if not arg_list else arg_list[0]

+

+    print(lib.booth.config_text(DEFAULT_BOOTH_NAME, node), end="")

-    line_list = (

-        ["site = {0}".format(site) for site in booth_configuration["sites"]]

-        +

-        [

-            "arbitrator = {0}".format(arbitrator)

-            for arbitrator in booth_configuration["arbitrators"]

-        ]

-        + authfile_lines +

-        [

-            'ticket = "{0}"'.format(ticket)

-            for ticket in booth_configuration["tickets"]

-        ]

-    )

-    for line in line_list:

-        print(line)

 def config_ticket_add(lib, arg_list, modifiers):

     """

     add ticket to current configuration

     """

-    if len(arg_list) != 1:

+    if not arg_list:

         raise CmdLineInputError

-    lib.booth.config_ticket_add(arg_list[0])

+    lib.booth.config_ticket_add(arg_list[0], prepare_options(arg_list[1:]))

 def config_ticket_remove(lib, arg_list, modifiers):

     """

@@ -96,7 +90,7 @@ def ticket_revoke(lib, arg_list, modifiers):

 def ticket_grant(lib, arg_list, modifiers):

     ticket_operation(lib.booth.ticket_grant, arg_list, modifiers)

-def get_create_in_cluster(resource_create):

+def get_create_in_cluster(resource_create, resource_remove):

     #TODO resource_remove is provisional hack until resources are not moved to

     #lib

     def create_in_cluster(lib, arg_list, modifiers):

@@ -108,6 +102,7 @@ def get_create_in_cluster(resource_create):

             __get_name(modifiers),

             ip,

             resource_create,

+            resource_remove,

         )

     return create_in_cluster

@@ -118,10 +113,28 @@ def get_remove_from_cluster(resource_remove):

         if arg_list:

             raise CmdLineInputError()

-        lib.booth.remove_from_cluster(__get_name(modifiers), resource_remove)

+        lib.booth.remove_from_cluster(

+            __get_name(modifiers),

+            resource_remove,

+            modifiers["force"],

+        )

     return remove_from_cluster

+def get_restart(resource_restart):

+    #TODO resource_restart is provisional hack until resources are not moved to

+    #lib

+    def restart(lib, arg_list, modifiers):

+        if arg_list:

+            raise CmdLineInputError()

+

+        lib.booth.restart(

+            __get_name(modifiers),

+            resource_restart,

+            modifiers["force"],

+        )

+

+    return restart

 def sync(lib, arg_list, modifiers):

     if arg_list:

@@ -175,3 +188,4 @@ def status(lib, arg_list, modifiers):

     if booth_status.get("status"):

         print("DAEMON STATUS:")

         print(booth_status["status"])

+

diff --git a/pcs/cli/booth/test/test_command.py b/pcs/cli/booth/test/test_command.py

index 00216f2..019a74f 100644

--- a/pcs/cli/booth/test/test_command.py

+++ b/pcs/cli/booth/test/test_command.py

@@ -28,10 +28,12 @@ class ConfigSetupTest(TestCase):

             }

         )

         lib.booth.config_setup.assert_called_once_with(

-            {

-                "sites": ["1.1.1.1", "2.2.2.2", "4.4.4.4"],

-                "arbitrators": ["3.3.3.3"],

-            },

+            [

+                {"key": "site", "value": "1.1.1.1", "details": []},

+                {"key": "site", "value": "2.2.2.2", "details": []},

+                {"key": "site", "value": "4.4.4.4", "details": []},

+                {"key": "arbitrator", "value": "3.3.3.3", "details": []},

+            ],

             False

         )

@@ -40,5 +42,12 @@ class ConfigTicketAddTest(TestCase):

         lib = mock.MagicMock()

         lib.booth = mock.MagicMock()

         lib.booth.config_ticket_add = mock.MagicMock()

-        command.config_ticket_add(lib, arg_list=["TICKET_A"], modifiers={})

-        lib.booth.config_ticket_add.assert_called_once_with("TICKET_A")

+        command.config_ticket_add(

+            lib,

+            arg_list=["TICKET_A", "timeout=10"],

+            modifiers={}

+        )

+        lib.booth.config_ticket_add.assert_called_once_with(

+            "TICKET_A",

+            {"timeout": "10"},

+        )

diff --git a/pcs/cli/common/lib_wrapper.py b/pcs/cli/common/lib_wrapper.py

index c836575..94a1311 100644

--- a/pcs/cli/common/lib_wrapper.py

+++ b/pcs/cli/common/lib_wrapper.py

@@ -209,11 +209,12 @@ def load_module(env, middleware_factory, name):

             {

                 "config_setup": booth.config_setup,

                 "config_destroy": booth.config_destroy,

-                "config_show": booth.config_show,

+                "config_text": booth.config_text,

                 "config_ticket_add": booth.config_ticket_add,

                 "config_ticket_remove": booth.config_ticket_remove,

                 "create_in_cluster": booth.create_in_cluster,

                 "remove_from_cluster": booth.remove_from_cluster,

+                "restart": booth.restart,

                 "config_sync": booth.config_sync,

                 "enable": booth.enable_booth,

                 "disable": booth.disable_booth,

diff --git a/pcs/common/report_codes.py b/pcs/common/report_codes.py

index 672c2e3..5e46a1f 100644

--- a/pcs/common/report_codes.py

+++ b/pcs/common/report_codes.py

@@ -29,16 +29,15 @@ BOOTH_ADDRESS_DUPLICATION = "BOOTH_ADDRESS_DUPLICATION"

 BOOTH_ALREADY_IN_CIB = "BOOTH_ALREADY_IN_CIB"

 BOOTH_CANNOT_DETERMINE_LOCAL_SITE_IP = "BOOTH_CANNOT_DETERMINE_LOCAL_SITE_IP"

 BOOTH_CANNOT_IDENTIFY_KEYFILE = "BOOTH_CANNOT_IDENTIFY_KEYFILE"

+BOOTH_CONFIG_ACCEPTED_BY_NODE = "BOOTH_CONFIG_ACCEPTED_BY_NODE"

+BOOTH_CONFIG_DISTRIBUTION_NODE_ERROR = "BOOTH_CONFIG_DISTRIBUTION_NODE_ERROR"

+BOOTH_CONFIG_DISTRIBUTION_STARTED = "BOOTH_CONFIG_DISTRIBUTION_STARTED"

 BOOTH_CONFIG_FILE_ALREADY_EXISTS = "BOOTH_CONFIG_FILE_ALREADY_EXISTS"

 BOOTH_CONFIG_IO_ERROR = "BOOTH_CONFIG_IO_ERROR"

 BOOTH_CONFIG_IS_USED = "BOOTH_CONFIG_IS_USED"

 BOOTH_CONFIG_READ_ERROR = "BOOTH_CONFIG_READ_ERROR"

-BOOTH_CONFIG_WRITE_ERROR = "BOOTH_CONFIG_WRITE_ERROR"

 BOOTH_CONFIG_UNEXPECTED_LINES = "BOOTH_CONFIG_UNEXPECTED_LINES"

-BOOTH_CONFIGS_SAVED_ON_NODE = "BOOTH_CONFIGS_SAVED_ON_NODE"

-BOOTH_CONFIGS_SAVING_ON_NODE = "BOOTH_CONFIGS_SAVING_ON_NODE"

 BOOTH_DAEMON_STATUS_ERROR = "BOOTH_DAEMON_STATUS_ERROR"

-BOOTH_DISTRIBUTING_CONFIG = "BOOTH_DISTRIBUTING_CONFIG"

 BOOTH_EVEN_PEERS_NUM = "BOOTH_EVEN_PEERS_NUM"

 BOOTH_FETCHING_CONFIG_FROM_NODE = "BOOTH_FETCHING_CONFIG_FROM_NODE"

 BOOTH_INVALID_CONFIG_NAME = "BOOTH_INVALID_CONFIG_NAME"

@@ -50,8 +49,8 @@ BOOTH_PEERS_STATUS_ERROR = "BOOTH_PEERS_STATUS_ERROR"

 BOOTH_SKIPPING_CONFIG = "BOOTH_SKIPPING_CONFIG"

 BOOTH_TICKET_DOES_NOT_EXIST = "BOOTH_TICKET_DOES_NOT_EXIST"

 BOOTH_TICKET_DUPLICATE = "BOOTH_TICKET_DUPLICATE"

-BOOTH_TICKET_OPERATION_FAILED = "BOOTH_TICKET_OPERATION_FAILED"

 BOOTH_TICKET_NAME_INVALID = "BOOTH_TICKET_NAME_INVALID"

+BOOTH_TICKET_OPERATION_FAILED = "BOOTH_TICKET_OPERATION_FAILED"

 BOOTH_TICKET_STATUS_ERROR = "BOOTH_TICKET_STATUS_ERROR"

 BOOTH_UNSUPORTED_FILE_LOCATION = "BOOTH_UNSUPORTED_FILE_LOCATION"

 CIB_ALERT_NOT_FOUND = "CIB_ALERT_NOT_FOUND"

diff --git a/pcs/lib/booth/config_exchange.py b/pcs/lib/booth/config_exchange.py

index e0569ba..377af1d 100644

--- a/pcs/lib/booth/config_exchange.py

+++ b/pcs/lib/booth/config_exchange.py

@@ -6,38 +6,23 @@ from __future__ import (

 )

 from pcs.lib.booth.config_structure import ConfigItem

-EXCHANGE_PRIMITIVES = ["authfile"]

-EXCHANGE_LISTS = [

-    ("site", "sites"),

-    ("arbitrator", "arbitrators"),

-    ("ticket", "tickets"),

-]

-

-

 def to_exchange_format(booth_configuration):

-    exchange_lists = dict(EXCHANGE_LISTS)

-    exchange = dict(

-        (exchange_key, []) for exchange_key in exchange_lists.values()

-    )

-

-    for key, value, _ in booth_configuration:

-        if key in exchange_lists:

-            exchange[exchange_lists[key]].append(value)

-        if key in EXCHANGE_PRIMITIVES:

-            exchange[key] = value

-

-    return exchange

+    return [

+        {

+            "key": item.key,

+            "value": item.value,

+            "details": to_exchange_format(item.details),

+        }

+        for item in booth_configuration

+    ]

 def from_exchange_format(exchange_format):

-    booth_config = []

-    for key in EXCHANGE_PRIMITIVES:

-        if key in exchange_format:

-            booth_config.append(ConfigItem(key, exchange_format[key]))

-

-    for key, exchange_key in EXCHANGE_LISTS:

-        booth_config.extend([

-            ConfigItem(key, value)

-            for value in exchange_format.get(exchange_key, [])

-        ])

-    return booth_config

+    return [

+        ConfigItem(

+            item["key"],

+            item["value"],

+            from_exchange_format(item["details"]),

+        )

+        for item in exchange_format

+    ]

diff --git a/pcs/lib/booth/config_files.py b/pcs/lib/booth/config_files.py

index aaad951..7b91379 100644

--- a/pcs/lib/booth/config_files.py

+++ b/pcs/lib/booth/config_files.py

@@ -24,10 +24,17 @@ def get_all_configs_file_names():

     Returns list of all file names ending with '.conf' in booth configuration

     directory.

     """

+    if not os.path.isdir(BOOTH_CONFIG_DIR):

+        return []

     return [

-        file_name for file_name in os.listdir(BOOTH_CONFIG_DIR)

-        if os.path.isfile(file_name) and file_name.endswith(".conf") and

-        len(file_name) > len(".conf")

+        file_name

+        for file_name in os.listdir(BOOTH_CONFIG_DIR)

+        if

+            file_name.endswith(".conf")

+            and

+            len(file_name) > len(".conf")

+            and

+            os.path.isfile(os.path.join(BOOTH_CONFIG_DIR, file_name))

     ]

@@ -55,7 +62,7 @@ def read_configs(reporter, skip_wrong_config=False):

         try:

             output[file_name] = _read_config(file_name)

         except EnvironmentError:

-            report_list.append(reports.booth_config_unable_to_read(

+            report_list.append(reports.booth_config_read_error(

                 file_name,

                 (

                     ReportItemSeverity.WARNING if skip_wrong_config

diff --git a/pcs/lib/booth/config_parser.py b/pcs/lib/booth/config_parser.py

index 62d2203..bdc79fd 100644

--- a/pcs/lib/booth/config_parser.py

+++ b/pcs/lib/booth/config_parser.py

@@ -23,7 +23,8 @@ def parse(content):

         )

 def build(config_line_list):

-    return "\n".join(build_to_lines(config_line_list))

+    newline = [""]

+    return "\n".join(build_to_lines(config_line_list) + newline)

 def build_to_lines(config_line_list, deep=0):

     line_list = []

diff --git a/pcs/lib/booth/config_structure.py b/pcs/lib/booth/config_structure.py

index c92f718..8977b7a 100644

--- a/pcs/lib/booth/config_structure.py

+++ b/pcs/lib/booth/config_structure.py

@@ -7,6 +7,7 @@ from __future__ import (

 import re

+import pcs.lib.reports as common_reports

 from pcs.lib.booth import reports

 from pcs.lib.errors import LibraryError

 from collections import namedtuple

@@ -66,6 +67,15 @@ def validate_peers(site_list, arbitrator_list):

     if report:

         raise LibraryError(*report)

+def take_peers(booth_configuration):

+    return (

+        pick_list_by_key(booth_configuration, "site"),

+        pick_list_by_key(booth_configuration, "arbitrator"),

+    )

+

+def pick_list_by_key(booth_configuration, key):

+    return [item.value for item in booth_configuration if item.key == key]

+

 def remove_ticket(booth_configuration, ticket_name):

     validate_ticket_exists(booth_configuration, ticket_name)

     return [

@@ -73,11 +83,14 @@ def remove_ticket(booth_configuration, ticket_name):

         if config_item.key != "ticket" or config_item.value != ticket_name

     ]

-def add_ticket(booth_configuration, ticket_name):

+def add_ticket(booth_configuration, ticket_name, options):

     validate_ticket_name(ticket_name)

     validate_ticket_unique(booth_configuration, ticket_name)

+    validate_ticket_options(options)

     return booth_configuration + [

-        ConfigItem("ticket", ticket_name)

+        ConfigItem("ticket", ticket_name, [

+            ConfigItem(key, value) for key, value in options.items()

+        ])

     ]

 def validate_ticket_exists(booth_configuration, ticket_name):

@@ -88,6 +101,24 @@ def validate_ticket_unique(booth_configuration, ticket_name):

     if ticket_exists(booth_configuration, ticket_name):

         raise LibraryError(reports.booth_ticket_duplicate(ticket_name))

+def validate_ticket_options(options):

+    reports = []

+    for key in sorted(options):

+        if key in GLOBAL_KEYS:

+            reports.append(

+                common_reports.invalid_option(key, TICKET_KEYS, "booth ticket")

+            )

+

+        if not options[key].strip():

+            reports.append(common_reports.invalid_option_value(

+                key,

+                options[key],

+                "no-empty",

+            ))

+

+    if reports:

+        raise LibraryError(*reports)

+

 def ticket_exists(booth_configuration, ticket_name):

     return any(

         value for key, value, _ in booth_configuration

diff --git a/pcs/lib/booth/reports.py b/pcs/lib/booth/reports.py

index 8a804e0..6aa9d3d 100644

--- a/pcs/lib/booth/reports.py

+++ b/pcs/lib/booth/reports.py

@@ -197,22 +197,17 @@ def booth_multiple_times_in_cib(

     )

-def booth_distributing_config(name=None):

+def booth_config_distribution_started():

     """

-    Sending booth config to all nodes in cluster.

-

-    name -- name of booth instance

+    booth configuration is about to be sent to nodes

     """

     return ReportItem.info(

-        report_codes.BOOTH_DISTRIBUTING_CONFIG,

-        "Sending booth config{0} to all cluster nodes.".format(

-            " ({name})" if name and name != "booth" else ""

-        ),

-        info={"name": name}

+        report_codes.BOOTH_CONFIG_DISTRIBUTION_STARTED,

+        "Sending booth configuration to cluster nodes..."

     )

-def booth_config_saved(node=None, name_list=None):

+def booth_config_accepted_by_node(node=None, name_list=None):

     """

     Booth config has been saved on specified node.

@@ -229,7 +224,7 @@ def booth_config_saved(node=None, name_list=None):

         msg = "Booth config saved."

         name = None

     return ReportItem.info(

-        report_codes.BOOTH_CONFIGS_SAVED_ON_NODE,

+        report_codes.BOOTH_CONFIG_ACCEPTED_BY_NODE,

         msg if node is None else "{node}: " + msg,

         info={

             "node": node,

@@ -239,30 +234,7 @@ def booth_config_saved(node=None, name_list=None):

     )

-def booth_config_unable_to_read(

-    name, severity=ReportItemSeverity.ERROR, forceable=None

-):

-    """

-    Unable to read from specified booth instance config.

-

-    name -- name of booth instance

-    severity -- severity of report item

-    forceable -- is this report item forceable? by what category?

-    """

-    if name and name != "booth":

-        msg = "Unable to read booth config ({name})."

-    else:

-        msg = "Unable to read booth config."

-    return ReportItem(

-        report_codes.BOOTH_CONFIG_READ_ERROR,

-        severity,

-        msg,

-        info={"name": name},

-        forceable=forceable

-    )

-

-

-def booth_config_not_saved(node, reason, name=None):

+def booth_config_distribution_node_error(node, reason, name=None):

     """

     Saving booth config failed on specified node.

@@ -275,7 +247,7 @@ def booth_config_not_saved(node, reason, name=None):

     else:

         msg = "Unable to save booth config on node '{node}': {reason}"

     return ReportItem.error(

-        report_codes.BOOTH_CONFIG_WRITE_ERROR,

+        report_codes.BOOTH_CONFIG_DISTRIBUTION_NODE_ERROR,

         msg,

         info={

             "node": node,

@@ -285,20 +257,36 @@ def booth_config_not_saved(node, reason, name=None):

     )

-def booth_sending_local_configs_to_node(node):

+def booth_config_read_error(

+    name, severity=ReportItemSeverity.ERROR, forceable=None

+):

     """

-    Sending all local booth configs to node

+    Unable to read from specified booth instance config.

-    node -- node name

+    name -- name of booth instance

+    severity -- severity of report item

+    forceable -- is this report item forceable? by what category?

     """

-    return ReportItem.info(

-        report_codes.BOOTH_CONFIGS_SAVING_ON_NODE,

-        "{node}: Saving booth config(s)...",

-        info={"node": node}

+    if name and name != "booth":

+        msg = "Unable to read booth config ({name})."

+    else:

+        msg = "Unable to read booth config."

+    return ReportItem(

+        report_codes.BOOTH_CONFIG_READ_ERROR,

+        severity,

+        msg,

+        info={"name": name},

+        forceable=forceable

     )

-def booth_fetching_config_from_node(node, config=None):

+def booth_fetching_config_from_node_started(node, config=None):

+    """

+    fetching of booth config from specified node started

+

+    node -- node from which config is fetching

+    config -- config name

+    """

     if config or config == 'booth':

         msg = "Fetching booth config from node '{node}'..."

     else:

@@ -314,6 +302,12 @@ def booth_fetching_config_from_node(node, config=None):

 def booth_unsupported_file_location(file):

+    """

+    location of booth configuration file (config, authfile) file is not

+    supported (not in /etc/booth/)

+

+    file -- file path

+    """

     return ReportItem.warning(

         report_codes.BOOTH_UNSUPORTED_FILE_LOCATION,

         "skipping file {file}: unsupported file location",

@@ -322,6 +316,11 @@ def booth_unsupported_file_location(file):

 def booth_daemon_status_error(reason):

+    """

+    Unable to get status of booth daemon because of error.

+

+    reason -- reason

+    """

     return ReportItem.error(

         report_codes.BOOTH_DAEMON_STATUS_ERROR,

         "unable to get status of booth daemon: {reason}",

@@ -330,6 +329,11 @@ def booth_daemon_status_error(reason):

 def booth_tickets_status_error(reason=None):

+    """

+    Unable to get status of booth tickets because of error.

+

+    reason -- reason

+    """

     return ReportItem.error(

         report_codes.BOOTH_TICKET_STATUS_ERROR,

         "unable to get status of booth tickets",

@@ -340,6 +344,11 @@ def booth_tickets_status_error(reason=None):

 def booth_peers_status_error(reason=None):

+    """

+    Unable to get status of booth peers because of error.

+

+    reason -- reason

+    """

     return ReportItem.error(

         report_codes.BOOTH_PEERS_STATUS_ERROR,

         "unable to get status of booth peers",

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

index e793713..a4b7b1e 100644

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

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

@@ -8,18 +8,12 @@ from __future__ import (

 from pcs.lib.cib.tools import find_unique_id

-class BoothNotFoundInCib(Exception):

-    pass

-

-class BoothMultipleOccurenceFoundInCib(Exception):

-    pass

-

 def create_resource_id(resources_section, name, suffix):

     return find_unique_id(

         resources_section.getroottree(), "booth-{0}-{1}".format(name, suffix)

     )

-def get_creator(resource_create):

+def get_creator(resource_create, resource_remove=None):

     #TODO resource_create  is provisional hack until resources are not moved to

     #lib

     def create_booth_in_cluster(ip, booth_config_file_path, create_id):

@@ -36,15 +30,18 @@ def get_creator(resource_create):

             clone_opts=[],

             group=group_id,

         )

-        resource_create(

-            ra_id=booth_id,

-            ra_type="ocf:pacemaker:booth-site",

-            ra_values=["config={0}".format(booth_config_file_path)],

-            op_values=[],

-            meta_values=[],

-            clone_opts=[],

-            group=group_id,

-        )

+        try:

+            resource_create(

+                ra_id=booth_id,

+                ra_type="ocf:pacemaker:booth-site",

+                ra_values=["config={0}".format(booth_config_file_path)],

+                op_values=[],

+                meta_values=[],

+                clone_opts=[],

+                group=group_id,