From 3bb5d93b80fbb364e0ccb60bda85d46bac08afa2 Mon Sep 17 00:00:00 2001 From: Adam Spiers Date: Fri, 21 Mar 2014 17:25:59 +0000 Subject: [PATCH] add FIXMEs for full grammar parsing @tserong will probably have to fix these if he wants to incorporate this class hierarchy into Hawk ;-) But of course we'd first need to split it off into a separate gem (which should be easy - I've deliberately kept the code fairly cleanly separated). --- libraries/pacemaker/constraint/colocation.rb | 3 +++ libraries/pacemaker/resource/clone.rb | 2 ++ libraries/pacemaker/resource/group.rb | 2 ++ 3 files changed, 7 insertions(+) diff --git a/libraries/pacemaker/constraint/colocation.rb b/libraries/pacemaker/constraint/colocation.rb index 080df05..44b78f7 100644 --- a/libraries/pacemaker/constraint/colocation.rb +++ b/libraries/pacemaker/constraint/colocation.rb @@ -11,6 +11,9 @@ class Pacemaker::Constraint::Colocation < Pacemaker::Constraint end def parse_definition + # FIXME: this is incomplete. It probably doesn't handle resource + # sets correctly, and certainly doesn't handle node attributes. + # See the crm(8) man page for the official BNF grammar. unless definition =~ /^#{self.class::TYPE} (\S+) (\d+|[-+]?inf): (.+?)\s*$/ raise Pacemaker::CIBObject::DefinitionParseError, \ "Couldn't parse definition '#{definition}'" diff --git a/libraries/pacemaker/resource/clone.rb b/libraries/pacemaker/resource/clone.rb index c7145d9..54fc945 100644 --- a/libraries/pacemaker/resource/clone.rb +++ b/libraries/pacemaker/resource/clone.rb @@ -7,6 +7,8 @@ class Pacemaker::Resource::Clone < Pacemaker::Resource include Pacemaker::Mixins::Resource::Meta + # FIXME: need to handle params as well as meta + attr_accessor :rsc def self.attrs_to_copy_from_chef diff --git a/libraries/pacemaker/resource/group.rb b/libraries/pacemaker/resource/group.rb index a4f579f..be72e19 100644 --- a/libraries/pacemaker/resource/group.rb +++ b/libraries/pacemaker/resource/group.rb @@ -7,6 +7,8 @@ class Pacemaker::Resource::Group < Pacemaker::Resource include Pacemaker::Mixins::Resource::Meta + # FIXME: need to handle params as well as meta + attr_accessor :members def self.attrs_to_copy_from_chef