slapos/slap: Split code into multiple meaningfull files before refactor

slapos/slap/exception.py

+# -*- coding: utf-8 -*-
+# vim: set et sts=2:
+##############################################################################
+#
+# Copyright (c) 2010, 2011, 2012 Vifib SARL and Contributors.
+# All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public License
+# as published by the Free Software Foundation; either version 2.1
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from zope.interface import implementer
+from .interface import slap as interface
+
+"""Exposed exceptions"""
+@implementer(interface.IResourceNotReady)
+class ResourceNotReady(Exception):
+  pass
+
+@implementer(interface.IServerError)
+class ServerError(Exception):
+  pass
+
+@implementer(interface.INotFoundError)
+class NotFoundError(Exception):
+  pass
+
+class AuthenticationError(Exception):
+  pass
+
+@implementer(interface.IConnectionError)
+class ConnectionError(Exception):
+  pass
+

slapos/slap/util.py

 from lxml import etree
+from six.moves.urllib import parse
+import netaddr
 
 def xml2dict(xml):
   result_dict = {}
@@ -14,3 +16,25 @@ def xml2dict(xml):
           value = element.text
         result_dict[key] = value
   return result_dict
+
+def _addIpv6Brackets(url):
+  # if master_url contains an ipv6 without bracket, add it
+  # Note that this is mostly to limit specific issues with
+  # backward compatiblity, not to ensure generic detection.
+  api_scheme, api_netloc, api_path, api_query, api_fragment = parse.urlsplit(url)
+  try:
+    ip = netaddr.IPAddress(api_netloc)
+    port = None
+  except netaddr.AddrFormatError:
+    try:
+      ip = netaddr.IPAddress(':'.join(api_netloc.split(':')[:-1]))
+      port = api_netloc.split(':')[-1]
+    except netaddr.AddrFormatError:
+      ip = port = None
+  if ip and ip.version == 6:
+    api_netloc = '[%s]' % ip
+    if port:
+      api_netloc = '%s:%s' % (api_netloc, port)
+    url = parse.urlunsplit((api_scheme, api_netloc, api_path, api_query, api_fragment))
+  return url
+