From: Lianhao Lu <lianhao.lu@intel.com>
Date: Thu, 20 Sep 2018 01:37:10 +0000 (+0800)
Subject: Adapt to latest HPA schema change
X-Git-Tag: 1.3.0~31
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=commitdiff_plain;h=714334d05a3ce47075a4b17a59daa0a7443b95f4

Adapt to latest HPA schema change

There are some HPA schema changes at
https://wiki.onap.org/pages/viewpage.action?pageId=28377430 which we
need to adapt to accrodingly.

Change-Id: I84b758ac5b6841b2706df0a21f6da097acc0d896
Issue-ID: INT-536
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
---

diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml
index b192bd69..6764e054 100644
--- 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
@@ -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
diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
index a895b571..cb0686e4 100644
--- a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml
@@ -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
@@ -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
diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml
index b6515872..ee1c350e 100644
--- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml
@@ -262,8 +262,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_vgmux_0
         - virtual_link: VL_bng_gmux_private_net
@@ -287,8 +286,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_vgmux_0
         - virtual_link: VL_mux_gw_private_net
@@ -368,8 +366,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
diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml
index 420dc933..96d7f65c 100644
--- 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
@@ -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