Commit 4e1ba863 authored by Rafael Monnerat's avatar Rafael Monnerat

Follow up change on slapos.libnetworkcache

parent ea6c7286
from setuptools import setup, find_packages from setuptools import setup, find_packages
version = '0.1.1' version = '0.1.2'
name = 'slapos.package' name = 'slapos.package'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
...@@ -20,7 +20,7 @@ setup(name=name, ...@@ -20,7 +20,7 @@ setup(name=name,
packages=find_packages(), packages=find_packages(),
include_package_data=True, include_package_data=True,
install_requires=[ install_requires=[
'slapos.libnetworkcache', 'slapos.libnetworkcache>=0.14.1',
'iniparse', 'iniparse',
], ],
zip_safe=False, zip_safe=False,
......
...@@ -36,9 +36,34 @@ import tempfile ...@@ -36,9 +36,34 @@ import tempfile
import datetime import datetime
from slapos.networkcachehelper import helper_download_network_cached_to_file from slapos.networkcachehelper import helper_download_network_cached_to_file
from slapos.networkcachehelper import helper_upload_network_cached_from_file from slapos.networkcachehelper import NetworkcacheClient
def helper_upload_network_cached_from_file(dir_url, cache_url,
path, directory_key, metadata_dict,
signature_private_key_file, shacache_cert_file, shacache_key_file,
shadir_cert_file, shadir_key_file):
"""
Upload an existing file, using a file_descriptor.
"""
file_descriptor = open(path, 'r')
if not (dir_url and cache_url):
return False
# backward compatibility
metadata_dict.setdefault('file', 'notused')
metadata_dict.setdefault('urlmd5', 'notused')
# convert '' into None in order to call nc nicely
with NetworkcacheClient(cache_url, dir_url,
signature_private_key_file=signature_private_key_file or None,
shacache_cert_file=shacache_cert_file or None,
shacache_key_file=shacache_key_file or None,
shadir_cert_file=shadir_cert_file or None,
shadir_key_file=shadir_key_file or None,
) as nc:
return nc.upload(file_descriptor, directory_key, **metadata_dict)
class NetworkCache: class NetworkCache:
def __init__(self, configuration_path): def __init__(self, configuration_path):
if not os.path.exists(configuration_path): if not os.path.exists(configuration_path):
......
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