diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2018-03-26 13:35:22 +0800 |
---|---|---|
committer | Lianhao Lu <lianhao.lu@intel.com> | 2018-03-26 13:37:37 +0800 |
commit | cd02d1f9b64957a63ad4b16bac639116975edb22 (patch) | |
tree | 1615d4af58dbe0354649e146e6dd3431977899d0 /tests | |
parent | 432bca4baa6d704301b0c6e24026018212ecc368 (diff) |
Added file digest computation
Support to compute file digest and save it to manifest file. Also extend
the manifest file module to be able to write content into temporary
file.
Change-Id: If1f3f42799eb527bdeac418d1a40aa203641f628
Issue-ID: VNFSDK-174
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/packager/test_csar.py (renamed from tests/packager/test_package.py) | 25 | ||||
-rw-r--r-- | tests/resources/csar/test_entry.mf | 4 |
2 files changed, 25 insertions, 4 deletions
diff --git a/tests/packager/test_package.py b/tests/packager/test_csar.py index 662d004..fcf034e 100644 --- a/tests/packager/test_package.py +++ b/tests/packager/test_csar.py @@ -27,7 +27,7 @@ CSAR_ENTRY_FILE = 'test_entry.yaml' CSAR_OUTPUT_FILE = 'output.csar' Args = collections.namedtuple('Args', - ['source', 'entry', 'manifest', 'history', 'tests', 'licenses']) + ['source', 'entry', 'manifest', 'history', 'tests', 'licenses', 'digest']) ARGS_MANIFEST = { 'source': CSAR_RESOURCE_DIR, @@ -36,8 +36,20 @@ ARGS_MANIFEST = { 'history': 'ChangeLog.txt', 'tests': 'Tests', 'licenses': 'Licenses', + 'digest': None } +ARGS_MANIFEST_DIGEST = { + 'source': CSAR_RESOURCE_DIR, + 'entry': CSAR_ENTRY_FILE, + 'manifest': 'test_entry.mf', + 'history': 'ChangeLog.txt', + 'tests': 'Tests', + 'licenses': 'Licenses', + 'digest': 'sha256' + } + + ARGS_NO_MANIFEST = { 'source': CSAR_RESOURCE_DIR, 'entry': CSAR_ENTRY_FILE, @@ -45,6 +57,7 @@ ARGS_NO_MANIFEST = { 'history': None, 'tests': None, 'licenses': None, + 'digest': None, } @@ -55,7 +68,7 @@ def csar_write_test(args): csar.write(args.source, args.entry, csar_target_dir + '/' + CSAR_OUTPUT_FILE, logging, args) csar.read(csar_target_dir + '/' + CSAR_OUTPUT_FILE, csar_extract_dir, logging) assert filecmp.cmp(args.source + '/' + args.entry, csar_extract_dir + '/' + args.entry) - if(args.manifest): + if(args.manifest and not args.digest): assert filecmp.cmp(args.source + '/' + args.manifest, csar_extract_dir + '/' + args.manifest) if(args.history): @@ -76,3 +89,11 @@ def test_CSARWrite_manifest(): if not os.path.exists(license_path): os.makedirs(license_path) csar_write_test(Args(**ARGS_MANIFEST)) + + +def test_CSARWrite_manifest_digest(): + # Because git can not store emptry directory, we need to create manually here + license_path = ARGS_MANIFEST['source'] + '/' + ARGS_MANIFEST['licenses'] + if not os.path.exists(license_path): + os.makedirs(license_path) + csar_write_test(Args(**ARGS_MANIFEST_DIGEST)) diff --git a/tests/resources/csar/test_entry.mf b/tests/resources/csar/test_entry.mf index 710d1a2..4441457 100644 --- a/tests/resources/csar/test_entry.mf +++ b/tests/resources/csar/test_entry.mf @@ -1,5 +1,5 @@ metadata: vnf_product_name: test vnf_provider_id: test -vnf_pacakage_version: 1.0 -vnf_release_date_time: 2017.09.15T15:00+8:00 +vnf_package_version: 1.0 +vnf_release_data_time: 2017-09-15T15:00:03+08:00 |