Commit 87dc2525 authored by Romain Courteaud's avatar Romain Courteaud

revert libslap changes

parent 6c0bd7dc
...@@ -38,7 +38,7 @@ def ComputeNodeConsumptionTioXMLFile_parseXml(self, REQUEST=None): ...@@ -38,7 +38,7 @@ def ComputeNodeConsumptionTioXMLFile_parseXml(self, REQUEST=None):
compute_node_consumption_model = \ compute_node_consumption_model = \
pkg_resources.resource_string( pkg_resources.resource_string(
'slapos.slap', 'doc/compute_node_consumption.xsd') 'slapos.slap', 'doc/computer_consumption.xsd')
# Validate against the xsd # Validate against the xsd
xsd_model = StringIO.StringIO(compute_node_consumption_model) xsd_model = StringIO.StringIO(compute_node_consumption_model)
......
...@@ -746,7 +746,7 @@ class SlapTool(BaseTool): ...@@ -746,7 +746,7 @@ class SlapTool(BaseTool):
compute_node_consumption_model = \ compute_node_consumption_model = \
pkg_resources.resource_string( pkg_resources.resource_string(
'slapos.slap', 'slapos.slap',
'doc/compute_node_consumption.xsd') 'doc/computer_consumption.xsd')
if self._validateXML(use_string, compute_node_consumption_model): if self._validateXML(use_string, compute_node_consumption_model):
compute_node = self._getComputeNodeDocument(compute_node_id) compute_node = self._getComputeNodeDocument(compute_node_id)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment