summaryrefslogtreecommitdiffstats
path: root/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
diff options
context:
space:
mode:
authorliboNet <libo.zhu@intel.com>2018-11-07 05:46:34 +0800
committerliboNet <libo.zhu@intel.com>2018-11-07 06:38:02 +0800
commit9f8da0915c260757e4bb051d0cf66a9337dfb892 (patch)
treec0863609aecec0e73100ae594cb5dbe1fd312c8a /tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
parent8d9ae22976d022e2da392ecb48e4c0c38eaa6d9f (diff)
update vCPE artifact layout and Template file
remove node_types's definition from MainserviceTemplate.yaml to make it acceptable by SDC SDC artifacts need to be put at the specfieid directory path based on SDC rule Change-Id: If3f625b40d2e445549ebacdd944605024a073007 Issue-ID: INT-711 Signed-off-by: liboNet <libo.zhu@intel.com>
Diffstat (limited to 'tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml')
-rw-r--r--tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml52
1 files changed, 13 insertions, 39 deletions
diff --git a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
index 4a3a3429..804e2c4b 100644
--- a/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
+++ b/tosca/vCPE/vgw/MainServiceTemplate_sriov.yaml
@@ -8,43 +8,6 @@ description: vCPE_vgw
imports:
- onap_dm.yaml
-node_types:
- onap.vcpe_vgw:
- derived_from: tosca.nodes.nfv.VNF
- properties:
- descriptor_id:
- type: string
- constraints: [ valid_values: [ b1bb0ce7-2222-4fa7-95ed-4840d70a1177 ] ]
- default: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
- provider:
- type: string
- constraints: [ valid_values: [ onap ] ]
- default: onap
- product_name:
- type: string
- constraints: [ valid_values: [ vcpe_vgw ] ]
- default: vcpe_vgw
- 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_vgw
@@ -145,6 +108,17 @@ topology_template:
default: vCPE_Customer_GW
node_templates:
+ LLU_VNF:
+ type: tosca.nodes.nfv.VNF
+ properties:
+ descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177
+ provider: onap
+ product_name: vcpe_vgw
+ 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
@@ -312,7 +286,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 }
@@ -377,5 +351,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