X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=tosca%2FvCPE%2Fvbng%2FMainServiceTemplate.yaml;h=c18af9d55c49eebd17308f4de5d5533115ea2336;hb=167ba62076deec76e0364414153dd76d860049e3;hp=b192bd69ba8b92d0957105facf8afb98c661d545;hpb=5c52cfa2e1b6b5f29555d971bd3967804a127248;p=demo.git

diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml
index b192bd69..c18af9d5 100644
--- a/tosca/vCPE/vbng/MainServiceTemplate.yaml
+++ b/tosca/vCPE/vbng/MainServiceTemplate.yaml
@@ -8,43 +8,6 @@ description: vCPE_vbng
 imports:
   - onap_dm.yaml
 
-node_types:
-  onap.vcpe_vbng:
-    derived_from: tosca.nodes.nfv.VNF
-    properties:
-      descriptor_id:
-        type: string
-        constraints: [ valid_values: [ b1bb0ce7-5555-4fa7-95ed-4840d70a1177 ] ]
-        default: b1bb0ce7-5555-4fa7-95ed-4840d70a1177
-      provider:
-        type: string
-        constraints: [ valid_values: [ onap ] ]
-        default: onap
-      product_name:
-        type: string
-        constraints: [ valid_values: [ vcpe_vbng ] ]
-        default: vcpe_vbng
-      software_version:
-        type: string
-        constraints: [ valid_values: [ '1.0' ] ]
-        default: '1.0'
-      descriptor_version:
-        type: string
-        constraints: [ valid_values: [ '1.0' ] ]
-        default: '1.0'
-      flavour_id:
-        type: string
-        constraints: [ valid_values: [ simple ] ]  #only one and only allowed one DF in this example
-        default: simple
-      flavour_description:
-        type: string
-        default: simple
-      vnfm_info:
-        type: list
-        entry_schema:
-          type: string
-        default: ['gvnfm']
-
 topology_template:
 #  substitution_mappings:
 #    node_type: onap.vcpe_vbng
@@ -126,9 +89,9 @@ topology_template:
       description: dcae collector ip
       default: 10.0.4.102
     dcae_collector_port:
-      type: integer
+      type: string
       description: dcae collector port
-      default: 8080
+      default: "8080"
     pub_key:
       type: string
       description: ssh public key
@@ -155,6 +118,19 @@ topology_template:
       default: 10.0.7.1
 
   node_templates:
+    LLU_VNF:
+      type: tosca.nodes.nfv.VNF
+      properties:
+        descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+        provider: onap
+        product_name: vcpe_vbng
+        software_version: '1.0'
+        descriptor_version: '1.0'
+        flavour_id: simple
+        flavour_description: simple
+        vnfm_info: ['gvnfm']
+
+
     #onap public net
 #    VL_public:
 #      type: tosca.nodes.nfv.VnfVirtualLink
@@ -291,8 +267,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 +309,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
@@ -359,7 +333,7 @@ topology_template:
           max_number_of_instances: 1
           watchdog: none
         inject_files: #TODO SDC bug
-          source_path: ../Artifacts/keys/authorized_keys #SSH authorized_keys
+          source_path: ../Artifacts/Deployment/Other/authorized_keys #SSH authorized_keys
           dest_path: /home/ubuntu/.ssh/authorized_keys
         meta_data:
           vnf_id: { get_input: vnf_id }
@@ -369,7 +343,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 +351,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 +398,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
@@ -434,5 +408,5 @@ topology_template:
       artifacts:
         sw_image: #TODO need to put glance image name here
           #file: { get_input: vcpe_image_name }
-          file: ../Artifacts/images/ubuntu_16.04
+          file: ../Artifacts/Deployment/Other/image
           type: tosca.artifacts.nfv.SwImage