12:51 p.m.
This commit separates the SlaveMachineParser class to its separate
module as it is not related to parsing recipes.
Signed-off-by: Radek Pazdera <rpazdera(a)redhat.com>
---
lnst/Controller/NetTestParse.py | 94 ---------------------------
lnst/Controller/SlaveMachineParse.py | 115 ++++++++++++++++++++++++++++++++++
lnst/Controller/SlavePool.py | 2 +-
3 files changed, 116 insertions(+), 95 deletions(-)
create mode 100644 lnst/Controller/SlaveMachineParse.py
diff --git a/lnst/Controller/NetTestParse.py b/lnst/Controller/NetTestParse.py
index ed4a72e..dab542a 100644
--- a/lnst/Controller/NetTestParse.py
+++ b/lnst/Controller/NetTestParse.py
@@ -239,100 +239,6 @@ class RequirementsParse(LnstParser):
dev["hwaddr"] =
normalize_hwaddr(dev["params"]["hwaddr"])
-class SlaveMachineParse(LnstParser):
- _machine_id = None
- _machine = None
-
- def set_machine(self, machine_id, machine):
- self._machine_id = machine_id
- self._machine = machine
-
- def parse(self, node):
- scheme = {"params": self._params,
- "netdevices": self._netdevices}
- params = {"target": self._machine["params"]}
- self._process_child_nodes(node, scheme, params)
-
- self._machine["params"]["skip_cleanup"] = False
- mandatory_params = ["hostname"]
- for mandatory in mandatory_params:
- if mandatory not in self._machine["params"]:
- msg = "Missing required parameter '%s'" % mandatory
- raise XmlProcessingError(msg, node)
-
- def _params(self, node, params):
- subparser = ParamsParse(self)
- subparser.set_params_dict(params["target"])
- subparser.parse(node)
-
- def _netdevices(self, node, params):
- scheme = {"netdevice": self._netdevice,
- "libvirt_create": self._libvirt_create}
-
- new_params = {"create": None}
- self._process_child_nodes(node, scheme, new_params)
-
- def _libvirt_create(self, node, params):
- scheme = {"netdevice": self._netdevice}
-
- new_params = {"create": "libvirt"}
- self._process_child_nodes(node, scheme, new_params)
-
- def _netdevice(self, node, params):
- machine = self._machine
- phys_id = self._get_attribute(node, "phys_id")
-
- dev = machine["netdevices"][phys_id] = {}
- dev["create"] = params["create"]
- dev["network"] = self._get_attribute(node, "network")
- dev["params"] = {}
-
- # parse device parameters
- scheme = {"params": self._params}
- params = {"target": dev["params"]}
- self._process_child_nodes(node, scheme, params)
-
- if "type" in dev["params"]:
- dev["type"] = dev["params"]["type"]
- else:
- msg = "Missing required parameter 'type'"
- raise XmlProcessingError(msg, node)
-
- # hwaddr parameter is optional for dynamic devices,
- # but it is required by non-dynamic devices
- if dev["create"] and "hwaddr" in dev["params"]:
- dev["hwaddr"] =
normalize_hwaddr(dev["params"]["hwaddr"])
- else:
- if "hwaddr" in dev["params"]:
- dev["hwaddr"] =
normalize_hwaddr(dev["params"]["hwaddr"])
- else:
- msg = "Missing required parameter 'hwaddr'"
- raise XmlProcessingError(msg, node)
-
- # name parameter is only valid when the device is not dynamic
- if "name" in dev["params"]:
- if dev["create"]:
- msg = "'name' parameter is not valid with dynamic
devices"
- raise XmlProcessingError(msg, node)
- else:
- dev["name"] = dev["params"]["name"]
-
- # bridge parameter is valid only when the device is dynamic
- if "libvirt_bridge" in dev["params"]:
- if dev["create"] == "libvirt":
- dev["libvirt_bridge"] =
dev["params"]["libvirt_bridge"]
- else:
- msg = "'libvirt_bridge' parameter is not valid with" \
- "dynamic devices"
- raise XmlProcessingError(msg, node)
-
- try:
- self._trigger_event("netdevice_ready",
- {"machine_id": self._machine_id, "dev_id":
phys_id})
- except Exception as exc:
- logging.error(XmlProcessingError(str(exc), node))
- raise
-
class NetConfigParse(LnstParser):
_machine_id = None
_machine = None
diff --git a/lnst/Controller/SlaveMachineParse.py b/lnst/Controller/SlaveMachineParse.py
new file mode 100644
index 0000000..d1de806
--- /dev/null
+++ b/lnst/Controller/SlaveMachineParse.py
@@ -0,0 +1,115 @@
+"""
+This module defines SlaveMachineParse class useful to parse XML machine
+descriptions for the slave pool
+
+Copyright 2013 Red Hat, Inc.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+rpazdera(a)redhat.com (Radek Pazdera)
+"""
+
+import logging
+import os
+import re
+from lnst.Common.XmlProcessing import LnstParser
+from lnst.Common.XmlProcessing import XmlDomTreeInit
+from lnst.Common.XmlProcessing import XmlProcessingError
+from lnst.Common.NetUtils import normalize_hwaddr
+from lnst.Controller.NetTestParse import ParamsParse
+
+class SlaveMachineParse(LnstParser):
+ _machine_id = None
+ _machine = None
+
+ def set_machine(self, machine_id, machine):
+ self._machine_id = machine_id
+ self._machine = machine
+
+ def parse(self, node):
+ scheme = {"params": self._params,
+ "netdevices": self._netdevices}
+ params = {"target": self._machine["params"]}
+ self._process_child_nodes(node, scheme, params)
+
+ self._machine["params"]["skip_cleanup"] = False
+ mandatory_params = ["hostname"]
+ for mandatory in mandatory_params:
+ if mandatory not in self._machine["params"]:
+ msg = "Missing required parameter '%s'" % mandatory
+ raise XmlProcessingError(msg, node)
+
+ def _params(self, node, params):
+ subparser = ParamsParse(self)
+ subparser.set_params_dict(params["target"])
+ subparser.parse(node)
+
+ def _netdevices(self, node, params):
+ scheme = {"netdevice": self._netdevice,
+ "libvirt_create": self._libvirt_create}
+
+ new_params = {"create": None}
+ self._process_child_nodes(node, scheme, new_params)
+
+ def _libvirt_create(self, node, params):
+ scheme = {"netdevice": self._netdevice}
+
+ new_params = {"create": "libvirt"}
+ self._process_child_nodes(node, scheme, new_params)
+
+ def _netdevice(self, node, params):
+ machine = self._machine
+ phys_id = self._get_attribute(node, "phys_id")
+
+ dev = machine["netdevices"][phys_id] = {}
+ dev["create"] = params["create"]
+ dev["network"] = self._get_attribute(node, "network")
+ dev["params"] = {}
+
+ # parse device parameters
+ scheme = {"params": self._params}
+ params = {"target": dev["params"]}
+ self._process_child_nodes(node, scheme, params)
+
+ if "type" in dev["params"]:
+ dev["type"] = dev["params"]["type"]
+ else:
+ msg = "Missing required parameter 'type'"
+ raise XmlProcessingError(msg, node)
+
+ # hwaddr parameter is optional for dynamic devices,
+ # but it is required by non-dynamic devices
+ if dev["create"] and "hwaddr" in dev["params"]:
+ dev["hwaddr"] =
normalize_hwaddr(dev["params"]["hwaddr"])
+ else:
+ if "hwaddr" in dev["params"]:
+ dev["hwaddr"] =
normalize_hwaddr(dev["params"]["hwaddr"])
+ else:
+ msg = "Missing required parameter 'hwaddr'"
+ raise XmlProcessingError(msg, node)
+
+ # name parameter is only valid when the device is not dynamic
+ if "name" in dev["params"]:
+ if dev["create"]:
+ msg = "'name' parameter is not valid with dynamic
devices"
+ raise XmlProcessingError(msg, node)
+ else:
+ dev["name"] = dev["params"]["name"]
+
+ # bridge parameter is valid only when the device is dynamic
+ if "libvirt_bridge" in dev["params"]:
+ if dev["create"] == "libvirt":
+ dev["libvirt_bridge"] =
dev["params"]["libvirt_bridge"]
+ else:
+ msg = "'libvirt_bridge' parameter is not valid with" \
+ "dynamic devices"
+ raise XmlProcessingError(msg, node)
+
+ try:
+ self._trigger_event("netdevice_ready",
+ {"machine_id": self._machine_id, "dev_id":
phys_id})
+ except Exception as exc:
+ logging.error(XmlProcessingError(str(exc), node))
+ raise
diff --git a/lnst/Controller/SlavePool.py b/lnst/Controller/SlavePool.py
index c98bb24..d884c05 100644
--- a/lnst/Controller/SlavePool.py
+++ b/lnst/Controller/SlavePool.py
@@ -20,7 +20,7 @@ import copy
from xml.dom import minidom
from lnst.Common.XmlProcessing import XmlDomTreeInit
from lnst.Common.NetUtils import test_tcp_connection
-from lnst.Controller.NetTestParse import SlaveMachineParse
+from lnst.Controller.SlaveMachineParse import SlaveMachineParse
class SlavePool:
"""
--
1.7.7.6