diff options
author | Yan Yang <yangyanyj@chinamobile.com> | 2018-06-01 05:34:57 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-06-01 05:34:57 +0000 |
commit | 394f9fb263549bd55cba099199c02e6ad9b17a3e (patch) | |
tree | 6fb1ac8feea7294914c6b87e17636c45ebedbf13 /nokiav2/driver/src/test/resources/unittests | |
parent | 3ec51cb825272e0ef32c0e7cb197bfc7f1519b97 (diff) | |
parent | d4ee0c786ca2cc27b35fdfaa7d9d53718fa0bd20 (diff) |
Merge "Fix template generation for R2"
Diffstat (limited to 'nokiav2/driver/src/test/resources/unittests')
4 files changed, 5 insertions, 2 deletions
diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip Binary files differindex ac555dff..fe996956 100644 --- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip +++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip.vnfd b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip.vnfd index 3c121386..af4a530a 100644 --- a/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip.vnfd +++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/cbam.package.zip.vnfd @@ -15,3 +15,8 @@ topology_template: Basic: instantiate: terminate: + capabilities: + deployment_flavour: + properties: + flavour_id: myFlavorId + description: myFlavorDescription diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.cbam.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.cbam.yaml index 3870605f..c893b930 100644 --- a/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.cbam.yaml +++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.cbam.yaml @@ -67,7 +67,6 @@ topology_template: properties: connectivity_type: layer_protocol: ipv4 - flow_pattern: mesh description: myDescription icpWithOutEcp: diff --git a/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.onap.v2.yaml b/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.onap.v2.yaml index fe0ccf4c..ba1c8fa8 100644 --- a/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.onap.v2.yaml +++ b/nokiav2/driver/src/test/resources/unittests/packageconverter/nodes.vnfd.onap.v2.yaml @@ -77,7 +77,6 @@ topology_template: properties: connectivity_type: layer_protocol: [ ipv4 ] - flow_pattern: mesh vl_profile: max_bit_rate_requirements: root: 2147483647 |