Merge branch 'sysv-http' of https://github.com/nathanolla/bcfg2 into maint

4 files changed, 69 insertions, 4 deletions

diff --git a/doc/client/tools.txt b/doc/client/tools.txt
index 1dbb33b1a..ce8732454 100644
--- a/doc/client/tools.txt
+++ b/doc/client/tools.txt
@@ -154,7 +154,28 @@ Systemd service support.
 SYSV
 ----
 
-Handles System V Packaging format that is available on Solaris.
+Handles `System V Packaging <http://docs.oracle.com/cd/E19683-01/806-7008/index.html>`_ format that is available on Solaris.
+
+.. note::
+
+  If the Packages specified in the PackageList are datastream format packages distributed via HTTP, you must specify a simplename attribute.   Such packages will be downloaded and installed from a local path.
+
+  datastream format over HTTP:
+
+  .. code-block:: xml
+
+     <PackageList url='http://install/packages' type='sysv' priority='0'>
+         <Package name='SCbcfg2' version='1.3.4' simplename='bcfg-1.3.4-1' />
+     </PackageList>
+
+  File system format over NFS or local path:
+
+  .. code-block:: xml
+
+     <PackageList url='/mnt/install/packages' type='sysv' priority='0'>
+         <Package name='SCbcfg2' version='1.3.4' />
+     </PackageList>
+
 
 Upstart
 -------
diff --git a/doc/development/compat.txt b/doc/development/compat.txt
index f90274ce5..8700c46d3 100644
--- a/doc/development/compat.txt
+++ b/doc/development/compat.txt
@@ -60,6 +60,8 @@ behavior (e.g., :func:`input`) do not cause unexpected side-effects.
 +---------------------------------+--------------------------------------------------+---------------------------------------------------------+
 | urlparse                        | :func:`urlparse.urlparse`                        | :func:`urllib.parse.urlparse`                           |
 +---------------------------------+--------------------------------------------------+---------------------------------------------------------+
+| urlretrieve                     | :func:`urllib.urlretrieve`                       | :func:`urllib.request.urlretrieve`                      |
++---------------------------------+--------------------------------------------------+---------------------------------------------------------+
 | HTTPBasicAuthHandler            | :class:`urllib2.HTTPBasicAuthHandler`            | :class:`urllib.request.HTTPBasicAuthHandler`            |
 +---------------------------------+--------------------------------------------------+---------------------------------------------------------+
 | HTTPPasswordMgrWithDefaultRealm | :class:`urllib2.HTTPPasswordMgrWithDefaultRealm` | :class:`urllib.request.HTTPPasswordMgrWithDefaultRealm` |
diff --git a/src/lib/Bcfg2/Client/Tools/SYSV.py b/src/lib/Bcfg2/Client/Tools/SYSV.py
index aca7d593c..a29b49efa 100644
--- a/src/lib/Bcfg2/Client/Tools/SYSV.py
+++ b/src/lib/Bcfg2/Client/Tools/SYSV.py
@@ -4,6 +4,8 @@ import tempfile
 from Bcfg2.Compat import any  # pylint: disable=W0622
 import Bcfg2.Client.Tools
 import Bcfg2.Client.XML
+from Bcfg2.Compat import urlretrieve
+
 
 # pylint: disable=C0103
 noask = '''
@@ -37,6 +39,8 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
         # noaskfile needs to live beyond __init__ otherwise file is removed
         self.noaskfile = tempfile.NamedTemporaryFile()
         self.noaskname = self.noaskfile.name
+        # for any pkg files downloaded
+        self.tmpfiles = []
         try:
             self.noaskfile.write(noask)
             # flush admin file contents to disk
@@ -45,6 +49,42 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
                             self.pkgtool[1])
         except:  # pylint: disable=W0702
             self.pkgtool = (self.pkgtool[0] % "", self.pkgtool[1])
+        self.origpkgtool = self.pkgtool
+
+    def pkgmogrify(self, packages):
+        """ Take a list of pkg objects, check for a 'simplename' attribute.
+            If present, insert a _sysv_pkg_path attribute to the package and
+            download the datastream format SYSV package to a temporary file.
+        """
+        for pkg in packages:
+            if pkg.get('simplename'):
+                tmpfile = tempfile.NamedTemporaryFile()
+                self.tmpfiles.append(tmpfile)
+                self.logger.info("Downloading %s%s to %s" % (pkg.get('url'),
+                                 pkg.get('simplename'), tmpfile.name))
+                urlretrieve("%s/%s" % (pkg.get('url'), pkg.get('simplename')),
+                            tmpfile.name)
+                pkg.set('_sysv_pkg_path', tmpfile.name)
+
+    def _get_package_command(self, packages):
+        """Override the default _get_package_command, replacing the attribute
+           'url' if '_sysv_pkg_path' if necessary in the returned command
+           string
+        """
+        if hasattr(self, 'origpkgtool'):
+            if len(packages) == 1 and '_sysv_pkg_path' in packages[0].keys():
+                self.pkgtool = (self.pkgtool[0], ('%s %s',
+                                                  ['_sysv_pkg_path', 'name']))
+            else:
+                self.pkgtool = self.origpkgtool
+
+        pkgcmd = super(SYSV, self)._get_package_command(packages)
+        self.logger.debug("Calling install command: %s" % pkgcmd)
+        return pkgcmd
+
+    def Install(self, packages, states):
+        self.pkgmogrify(packages)
+        super(SYSV, self).Install(packages, states)
 
     def RefreshPackages(self):
         """Refresh memory hashes of packages."""
@@ -80,8 +120,8 @@ class SYSV(Bcfg2.Client.Tools.PkgTool):
                 self.logger.debug("Package %s not installed" %
                                   entry.get("name"))
         else:
-            if (self.setup['quick'] or
-                entry.attrib.get('verify', 'true') == 'false'):
+            if self.setup['quick'] or \
+               entry.attrib.get('verify', 'true') == 'false':
                 return True
             rv = self.cmd.run("/usr/sbin/pkgchk -n %s" % entry.get('name'))
             if rv.success:
diff --git a/src/lib/Bcfg2/Compat.py b/src/lib/Bcfg2/Compat.py
index 049236e03..b8a75a0c5 100644
--- a/src/lib/Bcfg2/Compat.py
+++ b/src/lib/Bcfg2/Compat.py
@@ -20,6 +20,7 @@ except ImportError:
 # urllib imports
 try:
     from urllib import quote_plus
+    from urllib import urlretrieve
     from urlparse import urljoin, urlparse
     from urllib2 import HTTPBasicAuthHandler, \
         HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \
@@ -27,7 +28,8 @@ try:
 except ImportError:
     from urllib.parse import urljoin, urlparse, quote_plus
     from urllib.request import HTTPBasicAuthHandler, \
-        HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, urlopen
+        HTTPPasswordMgrWithDefaultRealm, build_opener, install_opener, \
+        urlopen, urlretrieve
     from urllib.error import HTTPError, URLError
 
 try: