diff options
15 files changed, 159 insertions, 399 deletions
diff --git a/tosca/vCPE/Artifacts/keys/authorized_keys b/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys index 444ca79c..444ca79c 100644 --- a/tosca/vCPE/Artifacts/keys/authorized_keys +++ b/tosca/vCPE/Artifacts/Deployment/Other/authorized_keys diff --git a/tosca/vCPE/Artifacts/keys/id_rsa b/tosca/vCPE/Artifacts/Deployment/Other/id_rsa index 60597577..60597577 100644 --- a/tosca/vCPE/Artifacts/keys/id_rsa +++ b/tosca/vCPE/Artifacts/Deployment/Other/id_rsa diff --git a/tosca/vCPE/Artifacts/keys/id_rsa.pub b/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub index 444ca79c..444ca79c 100644 --- a/tosca/vCPE/Artifacts/keys/id_rsa.pub +++ b/tosca/vCPE/Artifacts/Deployment/Other/id_rsa.pub diff --git a/tosca/vCPE/Artifacts/Deployment/Other/image b/tosca/vCPE/Artifacts/Deployment/Other/image new file mode 100644 index 00000000..f31d15df --- /dev/null +++ b/tosca/vCPE/Artifacts/Deployment/Other/image @@ -0,0 +1 @@ +ubuntu_16.04 diff --git a/tosca/vCPE/Artifacts/images/ubuntu_16.04 b/tosca/vCPE/Artifacts/images/ubuntu_16.04 deleted file mode 100644 index e69de29b..00000000 --- a/tosca/vCPE/Artifacts/images/ubuntu_16.04 +++ /dev/null diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml index 0aca66a6..728cb21a 100644 --- a/tosca/vCPE/infra/MainServiceTemplate.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate.yaml @@ -8,42 +8,6 @@ description: vCPE_infra imports: - onap_dm.yaml -node_types: - onap.vcpe_infra: - derived_from: tosca.nodes.nfv.VNF - properties: - descriptor_id: - type: string - constraints: [ valid_values: [ b1bb0ce7-1111-4fa7-95ed-4840d70a1177 ] ] - default: b1bb0ce7-1111-4fa7-95ed-4840d70a1177 - provider: - type: string - constraints: [ valid_values: [ onap ] ] - default: onap - product_name: - type: string - constraints: [ valid_values: [ vcpe_infra ] ] - default: vcpe_infra - 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: @@ -185,6 +149,19 @@ topology_template: default: vCPE_Intrastructure node_templates: + LLU_VNF: + type: tosca.nodes.nfv.VNF + properties: + descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177 + provider: onap + product_name: vcpe_infra + 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 @@ -322,7 +299,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 } @@ -382,7 +359,7 @@ 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 # vdns related @@ -450,7 +427,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 } @@ -506,7 +483,7 @@ 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 # vdhcp related @@ -574,7 +551,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #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 } @@ -634,7 +611,7 @@ 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 # vweb related @@ -702,7 +679,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 } @@ -758,6 +735,6 @@ 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 diff --git a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml index 05c7258c..b362d4c2 100644 --- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml @@ -8,43 +8,6 @@ description: vCPE_infra imports: - onap_dm.yaml -node_types: - onap.vcpe_infra: - derived_from: tosca.nodes.nfv.VNF - properties: - descriptor_id: - type: string - constraints: [ valid_values: [ b1bb0ce7-1111-4fa7-95ed-4840d70a1177 ] ] - default: b1bb0ce7-1111-4fa7-95ed-4840d70a1177 - provider: - type: string - constraints: [ valid_values: [ onap ] ] - default: onap - product_name: - type: string - constraints: [ valid_values: [ vcpe_infra ] ] - default: vcpe_infra - 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_infra @@ -185,6 +148,19 @@ topology_template: default: vCPE_Intrastructure node_templates: + LLU_VNF: + type: tosca.nodes.nfv.VNF + properties: + descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177 + provider: onap + product_name: vcpe_infra + 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 @@ -322,7 +298,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 } @@ -382,7 +358,7 @@ 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 # vdns related @@ -450,7 +426,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 } @@ -506,7 +482,7 @@ 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 # vdhcp related @@ -574,7 +550,7 @@ topology_template: max_number_of_instances: 1 watchdog: none inject_files: #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 } @@ -634,7 +610,7 @@ 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 # vweb related @@ -702,7 +678,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 } @@ -758,6 +734,6 @@ 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 diff --git a/tosca/vCPE/vbng/MainServiceTemplate.yaml b/tosca/vCPE/vbng/MainServiceTemplate.yaml index a4e54bda..a4666149 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 @@ -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 @@ -357,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 } @@ -432,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 diff --git a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml index 61ca67ce..cc81addf 100644 --- a/tosca/vCPE/vbng/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbng/MainServiceTemplate_sriov.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 @@ -153,6 +116,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 @@ -367,7 +343,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 } @@ -442,5 +418,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 diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml index ffeceaac..3f132b2b 100644 --- a/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml +++ b/tosca/vCPE/vbrgemu/MainServiceTemplate.yaml @@ -8,43 +8,6 @@ description: vCPE_vbrgemu imports: - onap_dm.yaml -node_types: - onap.vcpe_vbrgemu: - derived_from: tosca.nodes.nfv.VNF - properties: - descriptor_id: - type: string - constraints: [ valid_values: [ b1bb0ce7-4444-4fa7-95ed-4840d70a1177 ] ] - default: b1bb0ce7-4444-4fa7-95ed-4840d70a1177 - provider: - type: string - constraints: [ valid_values: [ onap ] ] - default: onap - product_name: - type: string - constraints: [ valid_values: [ vcpe_vbrgemu ] ] - default: vcpe_vbrgemu - 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_vbrgemu @@ -122,6 +85,19 @@ topology_template: default: auto node_templates: + LLU_VNF: + type: tosca.nodes.nfv.VNF + properties: + descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177 + provider: onap + product_name: vcpe_vbrgemu + 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 @@ -230,7 +206,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 } @@ -286,5 +262,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 diff --git a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml index 29498e65..241ace07 100644 --- a/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vbrgemu/MainServiceTemplate_sriov.yaml @@ -8,43 +8,6 @@ description: vCPE_vbrgemu imports: - onap_dm.yaml -node_types: - onap.vcpe_vbrgemu: - derived_from: tosca.nodes.nfv.VNF - properties: - descriptor_id: - type: string - constraints: [ valid_values: [ b1bb0ce7-4444-4fa7-95ed-4840d70a1177 ] ] - default: b1bb0ce7-4444-4fa7-95ed-4840d70a1177 - provider: - type: string - constraints: [ valid_values: [ onap ] ] - default: onap - product_name: - type: string - constraints: [ valid_values: [ vcpe_vbrgemu ] ] - default: vcpe_vbrgemu - 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_vbrgemu @@ -120,6 +83,18 @@ topology_template: default: auto node_templates: + LLU_VNF: + type: tosca.nodes.nfv.VNF + properties: + descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177 + provider: onap + product_name: vcpe_vbrgemu + 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 @@ -290,5 +265,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 diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml index 0d1b8aa5..b028db5f 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml @@ -8,43 +8,6 @@ description: vCPE_vgmux imports: - onap_dm.yaml -node_types: - onap.vcpe_vgmux: - derived_from: tosca.nodes.nfv.VNF - properties: - descriptor_id: - type: string - constraints: [ valid_values: [ b1bb0ce7-3333-4fa7-95ed-4840d70a1177 ] ] - default: b1bb0ce7-3333-4fa7-95ed-4840d70a1177 - provider: - type: string - constraints: [ valid_values: [ onap ] ] - default: onap - product_name: - type: string - constraints: [ valid_values: [ vcpe_vgmux ] ] - default: vcpe_vgmux - 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_vgmux @@ -143,6 +106,19 @@ topology_template: default: openstack node_templates: + LLU_VNF: + type: tosca.nodes.nfv.VNF + properties: + descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177 + provider: onap + product_name: vcpe_vgmux + 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 @@ -310,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 } @@ -376,6 +352,6 @@ 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 diff --git a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml index 78f24927..392f1051 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml @@ -8,42 +8,6 @@ description: vCPE_vgmux imports: - onap_dm.yaml -node_types: - onap.vcpe_vgmux: - derived_from: tosca.nodes.nfv.VNF - properties: - descriptor_id: - type: string - constraints: [ valid_values: [ b1bb0ce7-3333-4fa7-95ed-4840d70a1177 ] ] - default: b1bb0ce7-3333-4fa7-95ed-4840d70a1177 - provider: - type: string - constraints: [ valid_values: [ onap ] ] - default: onap - product_name: - type: string - constraints: [ valid_values: [ vcpe_vgmux ] ] - default: vcpe_vgmux - 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: @@ -141,6 +105,19 @@ topology_template: default: openstack node_templates: + LLU_VNF: + type: tosca.nodes.nfv.VNF + properties: + descriptor_id: b1bb0ce7-2222-4fa7-95ed-4840d70a1177 + provider: onap + product_name: vcpe_vgmux + 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 @@ -320,7 +297,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 } @@ -386,6 +363,6 @@ 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 diff --git a/tosca/vCPE/vgw/MainServiceTemplate.yaml b/tosca/vCPE/vgw/MainServiceTemplate.yaml index f36574d4..4925f388 100644 --- a/tosca/vCPE/vgw/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgw/MainServiceTemplate.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 @@ -147,6 +110,19 @@ 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 @@ -308,7 +284,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 } @@ -373,5 +349,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 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 |