Fix Tosca csar with error variable

[demo.git] / tosca / vCPE / vbng / MainServiceTemplate.yaml

diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml
index b192bd6..a4e54bd 100644 (file)
--- a/tosca/vCPE/vbng/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate.yaml
@@ -291,8 +291,7 @@ topology_template:
             support_mandatory: true
             # TODO HPA
             network_interface_requirements:
-              #dataProcessingAccelerationLibrary: dpdk_2.2
-              interfaceType: virtio
+              dataProcessingAccelerationLibrary: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "DPDK"}'
       requirements:
         - virtual_binding: VDU_vbng_0
         - virtual_link: VL_brgemu_bng_private_net
@@ -334,8 +333,7 @@ topology_template:
             support_mandatory: true
             # TODO HPA
             network_interface_requirements:
-              #dataProcessingAccelerationLibrary: dpdk_2.2
-              interfaceType: virtio
+              dataProcessingAccelerationLibrary: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "DPDK"}'
       requirements:
         - virtual_binding: VDU_vbng_0
         - virtual_link: VL_bng_gmux_private_net
@@ -369,7 +367,7 @@ topology_template:
           cpe_signal_net_ipaddr: { get_input: vbng_private_ip_2 }
           bng_gmux_net_ipaddr: { get_input: vbng_private_ip_3 }
           oam_ipaddr: { get_input: vbng_private_ip_1 }
-          oam_cidr: { get_input: oam_private_net_cidr }
+          oam_cidr: { get_input: onap_private_net_cidr }
           bng_gmux_cidr: { get_input: bng_gmux_private_net_cidr }
           cpe_signal_cidr: { get_input: cpe_signal_private_net_cidr }
           brgemu_bng_cidr: { get_input: brgemu_bng_private_net_cidr }
@@ -377,7 +375,7 @@ topology_template:
           dcae_collector_port: { get_input: dcae_collector_port }
           demo_artifacts_version: { get_input: demo_artifacts_version }
           install_script_version: { get_input: install_script_version }
-          sdnc_ip: { get_input: sdnc_ip }
+          sdnc_ip: { get_input: sdnc_ip_addr }
           cloud_env: { get_input: cloud_env }
           nexus_artifact_repo: { get_input: nexus_artifact_repo }
         user_data: |
@@ -424,8 +422,8 @@ topology_template:
               virtual_mem_size: 4096 MB
               # HPA requirements
               vdu_memory_requirements:
-                memoryPageSize: '{"schema-version": "0", "schema-location": "", "platform-id": "generic", "mandatory": true, "configuration-value": "2 MB"}'
-                numberOfPages: '{"schema-version": "0","schema-location": "","platform-id": "generic","mandatory": true,"configuration-value": 1024}'
+                memoryPageSize: '{"schemaVersion": "0", "schemaSelector": "", "hardwarePlatform": "generic", "mandatory": "true", "configurationValue": "2 MB"}'
+                numberOfPages: '{"schemaVersion": "0","schemaSelector": "","hardwarePlatform": "generic","mandatory": "true", "configurationValue": "1024"}'
             virtual_cpu:
               num_virtual_cpu: 2
               cpu_architecture: generic