diff options
author | Denes Nemeth <denes.nemeth@nokia.com> | 2018-05-31 13:59:34 +0200 |
---|---|---|
committer | Denes Nemeth <denes.nemeth@nokia.com> | 2018-05-31 14:37:56 +0200 |
commit | d4ee0c786ca2cc27b35fdfaa7d9d53718fa0bd20 (patch) | |
tree | 02436311987bda3c499e923a2f75a02c3aaa7d03 /nokiav2/driver/src/test/resources | |
parent | ce16741b481dbaae3a3447f84efb2b4ce5dffc82 (diff) |
Fix template generation for R2
Change-Id: Ibf53ee4f203f248c930611812f3eb248e3023be8
Signed-off-by: Denes Nemeth <denes.nemeth@nokia.com>
Issue-ID: VFC-728
Diffstat (limited to 'nokiav2/driver/src/test/resources')
6 files changed, 5 insertions, 10 deletions
diff --git a/nokiav2/driver/src/test/resources/application-direct.properties b/nokiav2/driver/src/test/resources/application-direct.properties index 5702c913..b9c1c68c 100644 --- a/nokiav2/driver/src/test/resources/application-direct.properties +++ b/nokiav2/driver/src/test/resources/application-direct.properties @@ -13,9 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ############################################################################### - server.error.whitelabel.enabled=false - ############################################################################### # Beginning of mandatory properties # ############################################################################### @@ -42,7 +40,6 @@ skipCertificateVerification=true trustedCertificates= # the identifier of the VNFM in A&AI core system registry vnfmId=7c267318-2a6a-4d47-b039-a7cce5fea38b - ############################################################################### # Configuration parameters for direct integration ############################################################################### @@ -61,7 +58,6 @@ aaiPassword=AAI sdcUsername=SDC #The password to access SDC sdcPassword=SDC - ############################################################################### # End of mandatory properties for driver # ############################################################################### diff --git a/nokiav2/driver/src/test/resources/application.properties b/nokiav2/driver/src/test/resources/application.properties index af64fd95..d2732910 100644 --- a/nokiav2/driver/src/test/resources/application.properties +++ b/nokiav2/driver/src/test/resources/application.properties @@ -13,9 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. ############################################################################### - server.error.whitelabel.enabled=false - ############################################################################### # Beginning of mandatory properties # ############################################################################### @@ -42,7 +40,6 @@ skipCertificateVerification=true trustedCertificates= # the identifier of the VNFM in A&AI core system registry vnfmId=53fbba58-464e-4cc4-8d33-aaaf072f0a27 - ############################################################################### # Configuration parameters for direct integration ############################################################################### @@ -61,7 +58,6 @@ aaiPassword=AAI sdcUsername=SDC #The password to access SDC sdcPassword=SDC - ############################################################################### # End of mandatory properties for driver # ############################################################################### 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 |