diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2019-11-29 12:58:35 +0800 |
---|---|---|
committer | Lianhao Lu <lianhao.lu@intel.com> | 2019-11-29 12:58:35 +0800 |
commit | bb1373afb3144be5f8590c0e5c0b0b04c54afc14 (patch) | |
tree | bc6e3229540b90ae3683dd4c8fec04107aca77c6 /tests/packager/test_manifest.py | |
parent | 41778272aa04db6357734618d052f263c1953953 (diff) |
Support vnf_release_date_time in manifest
SOL004 v2.6.1 changes the manifest metadata key name from
'vnf_release_data_time' in v2.4.1 to 'vnf_release_date_time'. Support
the new chagnes while keeping backward compatibile with v2.4.1.
Change-Id: I205285f05963dc4d60d6867866b5b2fe114d8da3
Issue-ID: VNFSDK-420
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Diffstat (limited to 'tests/packager/test_manifest.py')
-rw-r--r-- | tests/packager/test_manifest.py | 30 |
1 files changed, 26 insertions, 4 deletions
diff --git a/tests/packager/test_manifest.py b/tests/packager/test_manifest.py index 9a0a5d5..7fa3474 100644 --- a/tests/packager/test_manifest.py +++ b/tests/packager/test_manifest.py @@ -24,9 +24,16 @@ METADATA = '\n'.join(["metadata:", "vnf_product_name: test", "vnf_provider_id: test", "vnf_package_version:1.0", - "vnf_release_data_time: 2017-09-15T15:00:10+08:00", + "vnf_release_date_time: 2017-09-15T15:00:10+08:00", ]) +METADATA_241 = '\n'.join(["metadata:", + "vnf_product_name: test", + "vnf_provider_id: test", + "vnf_package_version: 1.0", + "vnf_release_data_time: 2017-09-15T15:00:10+08:00", + ]) + METADATA_MISSING_KEY = '\n'.join(["metadata:", "vnf_product_name: test", "vnf_provider_id: test", @@ -61,7 +68,7 @@ CMS = '\n'.join(['-----BEGIN CMS-----', FILE_SOURCE_ONLY = '\n'.join(['Source: source1', 'Source: source2', - ]) + ]) NON_MANO_ARTIFACTS = '\n'.join(['non_mano_artifact_sets:', 'foo_bar:', @@ -69,7 +76,7 @@ NON_MANO_ARTIFACTS = '\n'.join(['non_mano_artifact_sets:', 'prv.happy-nfv.cool:', 'Source: happy/cool/123.html', 'Source: happy/cool/cool.json', - ]) + ]) def test_metadata(tmpdir): @@ -80,7 +87,22 @@ def test_metadata(tmpdir): assert m.metadata['vnf_product_name'] == 'test' assert m.metadata['vnf_provider_id'] == 'test' assert m.metadata['vnf_package_version'] == '1.0' - assert m.metadata['vnf_release_data_time'] == '2017-09-15T15:00:10+08:00' + assert m.metadata['vnf_release_date_time'] == '2017-09-15T15:00:10+08:00' + + +def test_metadata_241(tmpdir): + # metadata for SOL004 v2.4.1 + p = tmpdir.mkdir('csar').join('test.mf') + p.write(METADATA_241) + + m = manifest.Manifest(p.dirname, 'test.mf') + assert m.metadata['vnf_product_name'] == 'test' + assert m.metadata['vnf_provider_id'] == 'test' + assert m.metadata['vnf_package_version'] == '1.0' + assert m.metadata['vnf_release_date_time'] == '2017-09-15T15:00:10+08:00' + + m241 = manifest.Manifest(p.dirname, 'test.mf', sol241=True) + assert METADATA_241 in m241.return_as_string() def test_metadata_missing_key(tmpdir): |