commit 9323e210ab700bba7eaccf1dfd83e42190d9c88e Author: Ondrej Lichtner olichtne@redhat.com Date: Fri Oct 18 13:57:22 2013 +0200
move Xml* modules from Common/ to Controller/
These modules are only used by the controller so they should be placed in the Controller/ directory. We originally placed them in Common/ because we expected external tools to use them and have them dependent on the lnst-common package, however now it seems that having them dependent on the lnst-ctl package will be better. The reason behind it is that if you're working with recipes in an external tool you're probably also running lnst-ctl on the same machine.
Signed-off-by: Ondrej Lichtner olichtne@redhat.com Signed-off-by: Jiri Pirko jiri@resnulli.us
lnst/Controller/RecipeParser.py | 7 ++++--- lnst/Controller/SlaveMachineParser.py | 5 +++-- lnst/Controller/SlavePool.py | 2 +- lnst/{Common => Controller}/XmlParser.py | 4 ++-- lnst/{Common => Controller}/XmlProcessing.py | 0 lnst/{Common => Controller}/XmlTemplates.py | 2 +- 6 files changed, 11 insertions(+), 9 deletions(-) --- diff --git a/lnst/Controller/RecipeParser.py b/lnst/Controller/RecipeParser.py index 7833e7f..2e178e8 100644 --- a/lnst/Controller/RecipeParser.py +++ b/lnst/Controller/RecipeParser.py @@ -19,9 +19,10 @@ from lnst.Common.Config import lnst_config from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.Utils import bool_it from lnst.Common.RecipePath import RecipePath -from lnst.Common.XmlParser import XmlParser -from lnst.Common.XmlProcessing import XmlProcessingError, XmlData, XmlCollection -from lnst.Common.XmlTemplates import XmlTemplates, XmlTemplateError +from lnst.Controller.XmlParser import XmlParser +from lnst.Controller.XmlProcessing import XmlProcessingError, XmlData +from lnst.Controller.XmlProcessing import XmlCollection +from lnst.Controller.XmlTemplates import XmlTemplates, XmlTemplateError
class RecipeError(XmlProcessingError): pass diff --git a/lnst/Controller/SlaveMachineParser.py b/lnst/Controller/SlaveMachineParser.py index 686d570..1ec7ef7 100644 --- a/lnst/Controller/SlaveMachineParser.py +++ b/lnst/Controller/SlaveMachineParser.py @@ -15,8 +15,9 @@ import logging import os import re from lxml import etree -from lnst.Common.XmlParser import XmlParser -from lnst.Common.XmlProcessing import XmlProcessingError, XmlData, XmlCollection +from lnst.Controller.XmlParser import XmlParser +from lnst.Controller.XmlProcessing import XmlProcessingError, XmlData +from lnst.Controller.XmlProcessing import XmlCollection
class SlaveMachineError(XmlProcessingError): pass diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py index 4162e16..e7d4557 100644 --- a/lnst/Controller/SlavePool.py +++ b/lnst/Controller/SlavePool.py @@ -21,7 +21,7 @@ from xml.dom import minidom from lnst.Common.Config import lnst_config from lnst.Common.NetUtils import normalize_hwaddr from lnst.Common.NetUtils import test_tcp_connection -from lnst.Common.XmlProcessing import XmlProcessingError, XmlData +from lnst.Controller.XmlProcessing import XmlProcessingError, XmlData from lnst.Controller.Machine import Machine from lnst.Controller.SlaveMachineParser import SlaveMachineParser from lnst.Controller.SlaveMachineParser import SlaveMachineError diff --git a/lnst/Common/XmlParser.py b/lnst/Controller/XmlParser.py similarity index 97% rename from lnst/Common/XmlParser.py rename to lnst/Controller/XmlParser.py index 4cde0b4..32bbf2a 100644 --- a/lnst/Common/XmlParser.py +++ b/lnst/Controller/XmlParser.py @@ -17,8 +17,8 @@ import logging import copy from lxml import etree from lnst.Common.Config import lnst_config -from lnst.Common.XmlTemplates import XmlTemplates, XmlTemplateError -from lnst.Common.XmlProcessing import XmlProcessingError, XmlData +from lnst.Controller.XmlTemplates import XmlTemplates, XmlTemplateError +from lnst.Controller.XmlProcessing import XmlProcessingError, XmlData
class XmlParser(object): XINCLUDE_RE = r"{http://www.w3.org/[0-9]{4}/XInclude}include" diff --git a/lnst/Common/XmlProcessing.py b/lnst/Controller/XmlProcessing.py similarity index 100% rename from lnst/Common/XmlProcessing.py rename to lnst/Controller/XmlProcessing.py diff --git a/lnst/Common/XmlTemplates.py b/lnst/Controller/XmlTemplates.py similarity index 99% rename from lnst/Common/XmlTemplates.py rename to lnst/Controller/XmlTemplates.py index 1d7a9fd..b73b30d 100644 --- a/lnst/Common/XmlTemplates.py +++ b/lnst/Controller/XmlTemplates.py @@ -23,7 +23,7 @@ rpazdera@redhat.com (Radek Pazdera)
import re from lxml import etree -from lnst.Common.XmlProcessing import XmlTemplateString +from lnst.Controller.XmlProcessing import XmlTemplateString
class XmlTemplateError(Exception): pass
lnst-developers@lists.fedorahosted.org