Fix Tosca csar with error variable

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

diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
index a895b57..ffeceaa 100644 (file)
--- a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
@@ -112,7 +112,7 @@ topology_template:
       type: string
       description: cloud environment(openstack or rackspace)
       default: openstack
-    sdnc_ip:
+    sdnc_ip_addr:
       type: string
       description: SDNC ip address used to set NAT
       default: 10.0.7.1
@@ -206,8 +206,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_vbrgemu_0
         - virtual_link: VL_vbrgemu_bng_private_net
@@ -239,7 +238,7 @@ topology_template:
           vbrgemu_bng_private_net_cidr: { get_input: vbrgemu_bng_private_net_cidr }
           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: |
@@ -277,8 +276,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