Fix Tosca csar with error variable

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

diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml
index 420dc93..f36574d 100644 (file)
--- a/tosca/vCPE/vgw/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate.yaml
@@ -266,8 +266,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_vgw_0
         - virtual_link: VL_mux_gw_private_net
@@ -316,7 +315,7 @@ topology_template:
           vf_module_id: { get_input: vf_module_id }
           mux_gw_private_net_ipaddr: { get_input: vgw_private_ip_0 }
           oam_ipaddr: { get_input: vgw_private_ip_1 }
-          oam_cidr: { get_input: oam_private_net_cidr }
+          oam_cidr: { get_input: onap_private_net_cidr }
           cpe_public_net_cidr: { get_input: cpe_public_net_cidr }
           mux_gw_private_net_cidr: { get_input: mux_gw_private_net_cidr }
           mux_ip_addr: { get_input: mux_ip_addr }
@@ -364,8 +363,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