Merge branch 'master' into develop-yxu

CHANGES.txt

 Changes
 =======
 
-0.26 (Unreleased)
+0.27 (Unreleased)
+-----------------
+
+ * No change yet.
+
+0.26 (2012-07-05)
 -----------------
 
  * slapformat: no_bridge option becomes 'not create_tap'.
    create_tap is true by default. So a bridge is used and tap will be created by
    default. [Cedric de Saint Martin]
- * Add delay for slapformat [Cedric Le Ninivin]
+ * Add delay for slapformat. [Cedric Le Ninivin]
  * If no software_type is given, is default one (i.e fix "error 500" when
    requesting new instance). [Cedric de Saint Martin]
  * slapgrid: promise based software release, new api to fetch full computer
-   information from server [Yingjie Xu]
+   information from server. [Yingjie Xu]
  * slapproxy: new api to mock full computer information [Yingjie Xu]
- * slapgrid: minor fix randomise delay feature [Yingjie Xu]
+ * slapgrid: minor fix randomise delay feature. [Yingjie Xu]
  * slapgrid: optimise slapgrid-cp, run slapgrid-cp only if there is an update
-   on server side [Yingjie Xu]
+   on server side. [Yingjie Xu]
+ * libslap: Allow accessing ServerError. [Vincent Pelletier]
 
 0.25 (2012-05-16)
 -----------------

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '0.26-dev'
+version = '0.27-dev'
 name = 'slapos.core'
 long_description = open("README.txt").read() + "\n" + \
     open("CHANGES.txt").read() + "\n"

slapos/grid/networkcache.py

@@ -12,15 +12,8 @@
 #
 ##############################################################################
 
-
-import hashlib
-import os
-import posixpath
-import re
 import shutil
-import urlparse
 import traceback
-import utils
 import json
 import platform
 

slapos/grid/slapgrid.py

@@ -48,7 +48,6 @@ from utils import setRunning
 from utils import setFinished
 from utils import getSoftwareUrlHash
 from slapos import slap
-from slapos.slap import NotFoundError
 from slapos.slap.slap import ServerError
 from utils import dropPrivileges
 from utils import SlapPopen
@@ -57,7 +56,6 @@ import tempfile
 from time import strftime
 import StringIO
 from lxml import etree
-from time import sleep
 from random import random
 
 from slapos.slap.slap import NotFoundError
@@ -721,12 +719,13 @@ class Slapgrid(object):
         usage_string = StringIO.StringIO(computer_partition_usage.usage)
         root = etree.parse(usage_string)
       except UnicodeError:
-        logger.info("Failed to read %s." % (computer_partition_usage.usage))
-        logger.error(UnicodeError)
+        self.logger.info("Failed to read %s." % (
+            computer_partition_usage.usage))
+        self.logger.error(UnicodeError)
         raise "Failed to read %s." % (computer_partition_usage.usage)
       except (etree.XMLSyntaxError, etree.DocumentInvalid) as e:
-        logger.info("Failed to parse %s." % (usage_string))
-        logger.error(e)
+        self.logger.info("Failed to parse %s." % (usage_string))
+        self.logger.error(e)
         raise _formatXMLError(e)
       except Exception:
         raise "Failed to generate XML report."

slapos/slap/slap.py

@@ -27,7 +27,7 @@
 ##############################################################################
 __all__ = ["slap", "ComputerPartition", "Computer", "SoftwareRelease",
            "Supply", "OpenOrder", "NotFoundError", "Unauthorized",
-           "ResourceNotReady"]
+           "ResourceNotReady", "ServerError"]
 
 from interface import slap as interface
 from xml_marshaller import xml_marshaller