diff options
Diffstat (limited to 'tosca/vCPE')
| -rw-r--r-- | tosca/vCPE/Definitions/onap_dm.yaml | 24 | ||||
| -rw-r--r-- | tosca/vCPE/infra/MainServiceTemplate.yaml | 3 | ||||
| -rw-r--r-- | tosca/vCPE/infra/MainServiceTemplate_sriov.yaml | 1 | ||||
| -rw-r--r-- | tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml | 99 | ||||
| -rw-r--r-- | tosca/vCPE/vgmux/MainServiceTemplate.yaml | 1 | ||||
| -rw-r--r-- | tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml | 1 |
6 files changed, 62 insertions, 67 deletions
diff --git a/tosca/vCPE/Definitions/onap_dm.yaml b/tosca/vCPE/Definitions/onap_dm.yaml index 80d1153d..c2e93957 100644 --- a/tosca/vCPE/Definitions/onap_dm.yaml +++ b/tosca/vCPE/Definitions/onap_dm.yaml @@ -233,7 +233,7 @@ data_types: type: tosca.datatypes.nfv.LogicalNodeData description: references (couples) the CP with any logical node I/O requirements (for network devices) that may have been created. Linking these attributes is necessary so that so that I/O requirements that need to be articulated at the logical node level can be associated with the network interface requirements associated with the CP. required: false - + tosca.datatypes.nfv.injectFile: #used for vCPE usecase derived_from: tosca.datatypes.Root properties: @@ -477,10 +477,10 @@ data_types: required: false constraints: - greater_than: 0 - segmentation_id: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 + segmentation_id: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 type: integer required: false - physical_network: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 + physical_network: #Introduced from Beijing release, only used for vCPE usecase, outside the scope of SOL001 v2.5.1 type: string required: false tosca.datatypes.nfv.L3ProtocolData: @@ -539,7 +539,7 @@ data_types: type: tosca.datatypes.nfv.L3ProtocolData description: Specifies the L3 protocol data for this virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L3 protocol and shall be absent otherwise. required: false - + tosca.datatypes.nfv.VlProfile: derived_from: tosca.datatypes.Root description: Describes additional instantiation data for a given VL used in a specific VNF deployment flavour. @@ -854,7 +854,7 @@ data_types: description: Configuration parameters for the OperateVnf operation required: false change_ext_connectivity: - type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration + type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation required: false tosca.datatypes.nfv.CpProtocolData: @@ -1006,7 +1006,7 @@ data_types: required: true checksum: type: string - description: Checksum of the software image file + description: Checksum of the software image file required: true container_format: type: string @@ -1022,7 +1022,7 @@ data_types: - valid_values: [ aki, ami, ari, iso, qcow2, raw, vdi, vhd, vhdx, vmdk ] min_disk: type: scalar-unit.size # Number - description: The minimal disk size requirement for this software image + description: The minimal disk size requirement for this software image required: true min_ram: type: scalar-unit.size # Number @@ -1161,7 +1161,7 @@ interface_types: node_types: tosca.nodes.nfv.Vdu.Compute: derived_from: tosca.nodes.Root - description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC + description: Describes the virtual compute part of a VDU which is a construct supporting the description of the deployment and operational behavior of a VNFC properties: name: type: string @@ -1274,7 +1274,7 @@ node_types: description: Defines the capabilities of virtual_storage. tosca.nodes.nfv.Cp: derived_from: tosca.nodes.Root - description: Provides information regarding the purpose of the connection point + description: Provides information regarding the purpose of the connection point properties: layer_protocols: type: list @@ -1531,7 +1531,7 @@ policy_types: required: false # required if multiple entries in levels tosca.policies.nfv.VduInstantiationLevels: derived_from: tosca.policies.Root - description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1] + description: The VduInstantiationLevels type is a policy type representing all the instantiation levels of resources to be instantiated within a deployment flavour in term of the number of VNFC instances to be created from each vdu.Compute. as defined in ETSI GS NFV-IFA 011 [1] properties: levels: type: map # key: levelId @@ -1542,7 +1542,7 @@ policy_types: targets: [ tosca.nodes.nfv.Vdu.Compute ] tosca.policies.nfv.VirtualLinkInstantiationLevels: derived_from: tosca.policies.Root - description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1]. + description: The VirtualLinkInstantiationLevels type is a policy type representing all the instantiation levels of virtual link resources to be instantiated within a deployment flavour as defined in ETSI GS NFV-IFA 011 [1]. properties: levels: type: map # key: levelId @@ -1680,7 +1680,7 @@ policy_types: targets: [ tosca.nodes.nfv.VduCp, tosca.nodes.nfv.VnfExtCp ] tosca.policies.nfv.SupportedVnfInterface: derived_from: tosca.policies.Root - description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces + description: this policy type represents interfaces produced by a VNF, the details to access them and the applicable connection points to use to access these interfaces properties: interface_name: type: string diff --git a/tosca/vCPE/infra/MainServiceTemplate.yaml b/tosca/vCPE/infra/MainServiceTemplate.yaml index 7b44e835..0a3b1782 100644 --- a/tosca/vCPE/infra/MainServiceTemplate.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate.yaml @@ -46,7 +46,7 @@ topology_template: default: 10.0.11.1 mr_ip_port: type: string - description: IP port of the Message Router that for vDHCP configuration + description: IP port of the Message Router that for vDHCP configuration default: "3904" dcae_collector_ip: type: string @@ -735,4 +735,3 @@ topology_template: #file: { get_input: vcpe_image_name } 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 ca343334..1f35769d 100644 --- a/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/infra/MainServiceTemplate_sriov.yaml @@ -734,4 +734,3 @@ topology_template: #file: { get_input: vcpe_image_name } file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage - diff --git a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml index ddd8432c..de9eaebf 100644 --- a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml +++ b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml @@ -43,7 +43,7 @@ topology_template: description: The CIDR of the vCPE public vaaa_private_ip_0: type: string - description: Private IP address that is assigned to the vAAA to communicate with the vCPE components + description: Private IP address that is assigned to the vAAA to communicate with the vCPE components vaaa_private_ip_1: type: string description: Private IP address that is assigned to the vAAA to communicate with ONAP components @@ -61,7 +61,7 @@ topology_template: description: Private IP address that is assigned to the vDHCP to communicate with ONAP components vweb_private_ip_0: type: string - description: Private IP address that is assigned to the vWEB to communicate with the vGWs + description: Private IP address that is assigned to the vWEB to communicate with the vGWs vweb_private_ip_1: type: string description: Private IP address that is assigned to the vWEB to communicate with ONAP components @@ -76,7 +76,7 @@ topology_template: description: Name of the vDHCP vweb_name_0: type: string - description: Name of the vWEB + description: Name of the vWEB vnf_id: type: string description: The VNF ID is provided by ONAP @@ -110,7 +110,7 @@ topology_template: cloud_env: type: string - + ################## # # # NODE TEMPLATES # @@ -134,7 +134,7 @@ topology_template: use_external_resource: true resource_id: { get_input: onap_private_net_id } multivim_config: { get_input: multivim_config } - + onap_private_subnet: type: onap.multivim.nodes.Subnet properties: @@ -207,22 +207,22 @@ topology_template: userdata: { concat: [ "#!/bin/bash\n", "mkdir /opt/config\n", - "echo ",{ get_input: dcae_collector_ip}," > /opt/config/dcae_collector_ip.txt\n", - "echo ",{ get_input: dcae_collector_port}," > /opt/config/dcae_collector_port.txt\n", - "echo ",{ get_input: vaaa_private_ip_0}," > /opt/config/cpe_signal_net_ipaddr.txt\n", - "echo ",{ get_input: vaaa_private_ip_1}," > /opt/config/oam_ipaddr.txt\n", - "echo ",{ get_input: onap_private_net_cidr}," > /opt/config/oam_cidr.txt\n", - "echo ",{ get_input: cpe_signal_net_cidr}," > /opt/config/cpe_signal_net_cidr.txt\n", - "echo ",{ get_input: repo_url_blob}," > /opt/config/repo_url_blob.txt\n", - "echo ",{ get_input: repo_url_artifacts}," > /opt/config/repo_url_artifacts.txt\n", - "echo ",{ get_input: demo_artifacts_version}," > /opt/config/demo_artifacts_version.txt\n", - "echo ",{ get_input: install_script_version}," > /opt/config/install_script_version.txt\n", - "echo ",{ get_input: cloud_env}," > /opt/config/cloud_env.txt\n", - "curl -k ",{get_input: repo_url_blob},"/org.onap.demo/vnfs/vcpe/",{get_input: install_script_version},"/v_aaa_install.sh -o /opt/v_aaa_install.sh\n", + "echo ", { get_input: dcae_collector_ip}, " > /opt/config/dcae_collector_ip.txt\n", + "echo ", { get_input: dcae_collector_port}, " > /opt/config/dcae_collector_port.txt\n", + "echo ", { get_input: vaaa_private_ip_0}, " > /opt/config/cpe_signal_net_ipaddr.txt\n", + "echo ", { get_input: vaaa_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n", + "echo ", { get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n", + "echo ", { get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n", + "echo ", { get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n", + "echo ", { get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n", + "echo ", { get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n", + "echo ", { get_input: install_script_version}, " > /opt/config/install_script_version.txt\n", + "echo ", { get_input: cloud_env}, " > /opt/config/cloud_env.txt\n", + "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_aaa_install.sh -o /opt/v_aaa_install.sh\n", "cd /opt\n", "chmod +x v_aaa_install.sh\n", "./v_aaa_install.sh\n" - ] + ] } requirements: - key_pair: my_keypair @@ -259,22 +259,22 @@ topology_template: userdata: { concat: [ "#!/bin/bash\n", "mkdir /opt/config\n", - "echo ",{get_input: vdns_private_ip_1}," > /opt/config/oam_ipaddr.txt\n", - "echo ",{get_input: vdns_private_ip_0}," > /opt/config/cpe_public_net_ipaddr.txt\n", - "echo ",{get_input: onap_private_net_cidr}," > /opt/config/oam_cidr.txt\n", - "echo ",{get_input: cpe_public_net_cidr}," > /opt/config/cpe_public_net_cidr.txt\n", - "echo ",{get_input: repo_url_blob}," > /opt/config/repo_url_blob.txt\n", - "echo ",{get_input: repo_url_artifacts}," > /opt/config/repo_url_artifacts.txt\n", - "echo ",{get_input: demo_artifacts_version}," > /opt/config/demo_artifacts_version.txt\n", - "echo ",{get_input: install_script_version}," > /opt/config/install_script_version.txt\n", - "echo ",{get_input: cloud_env}," > /opt/config/cloud_env.txt\n", - "curl -k ",{get_input: repo_url_blob},"/org.onap.demo/vnfs/vcpe/",{get_input: install_script_version},"/v_dns_install.sh -o /opt/v_dns_install.sh\n", + "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n", + "echo ", {get_input: vdns_private_ip_0}, " > /opt/config/cpe_public_net_ipaddr.txt\n", + "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n", + "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n", + "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n", + "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n", + "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n", + "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n", + "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n", + "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dns_install.sh -o /opt/v_dns_install.sh\n", "cd /opt\n", "chmod +x v_dns_install.sh\n", "./v_dns_install.sh\n" ] } - requirements: + requirements: - port: vdns_private_0_port - port: vdns_private_1_port @@ -309,16 +309,16 @@ topology_template: userdata: { concat: [ "#!/bin/bash\n", "mkdir /opt/config\n", - "echo ",{get_input: vdns_private_ip_1}," > /opt/config/oam_ipaddr.txt\n", - "echo ",{get_input: vdhcp_private_ip_0}," > /opt/config/cpe_signal_ipaddr.txt\n", - "echo ",{get_input: onap_private_net_cidr}," > /opt/config/oam_cidr.txt\n", - "echo ",{get_input: cpe_signal_net_cidr}," > /opt/config/cpe_signal_net_cidr.txt\n", - "echo ",{get_input: repo_url_blob}," > /opt/config/repo_url_blob.txt\n", - "echo ",{get_input: repo_url_artifacts}," > /opt/config/repo_url_artifacts.txt\n", - "echo ",{get_input: demo_artifacts_version}," > /opt/config/demo_artifacts_version.txt\n", - "echo ",{get_input: install_script_version}," > /opt/config/install_script_version.txt\n", - "echo ",{get_input: cloud_env}," > /opt/config/cloud_env.txt\n", - "curl -k ",{get_input: repo_url_blob},"/org.onap.demo/vnfs/vcpe/",{get_input: install_script_version},"/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n", + "echo ", {get_input: vdns_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n", + "echo ", {get_input: vdhcp_private_ip_0}, " > /opt/config/cpe_signal_ipaddr.txt\n", + "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n", + "echo ", {get_input: cpe_signal_net_cidr}, " > /opt/config/cpe_signal_net_cidr.txt\n", + "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n", + "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n", + "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n", + "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n", + "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n", + "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_dhcp_install.sh -o /opt/v_dhcp_install.sh\n", "cd /opt\n", "chmod +x v_dhcp_install.sh\n", "./v_dhcp_install.sh\n" @@ -361,16 +361,16 @@ topology_template: userdata: { concat: [ "#!/bin/bash\n", "mkdir /opt/config\n", - "echo ",{get_input: vweb_private_ip_1}," > /opt/config/oam_ipaddr.txt\n", - "echo ",{get_input: vweb_private_ip_0}," > /opt/config/cpe_public_ipaddr.txt\n", - "echo ",{get_input: onap_private_net_cidr}," > /opt/config/oam_cidr.txt\n", - "echo ",{get_input: cpe_public_net_cidr}," > /opt/config/cpe_public_net_cidr.txt\n", - "echo ",{get_input: repo_url_blob}," > /opt/config/repo_url_blob.txt\n", - "echo ",{get_input: repo_url_artifacts}," > /opt/config/repo_url_artifacts.txt\n", - "echo ",{get_input: demo_artifacts_version}," > /opt/config/demo_artifacts_version.txt\n", - "echo ",{get_input: install_script_version}," > /opt/config/install_script_version.txt\n", - "echo ",{get_input: cloud_env}," > /opt/config/cloud_env.txt\n", - "curl -k ",{get_input: repo_url_blob},"/org.onap.demo/vnfs/vcpe/",{get_input: install_script_version},"/v_web_install.sh -o /opt/v_web_install.sh\n", + "echo ", {get_input: vweb_private_ip_1}, " > /opt/config/oam_ipaddr.txt\n", + "echo ", {get_input: vweb_private_ip_0}, " > /opt/config/cpe_public_ipaddr.txt\n", + "echo ", {get_input: onap_private_net_cidr}, " > /opt/config/oam_cidr.txt\n", + "echo ", {get_input: cpe_public_net_cidr}, " > /opt/config/cpe_public_net_cidr.txt\n", + "echo ", {get_input: repo_url_blob}, " > /opt/config/repo_url_blob.txt\n", + "echo ", {get_input: repo_url_artifacts}, " > /opt/config/repo_url_artifacts.txt\n", + "echo ", {get_input: demo_artifacts_version}, " > /opt/config/demo_artifacts_version.txt\n", + "echo ", {get_input: install_script_version}, " > /opt/config/install_script_version.txt\n", + "echo ", {get_input: cloud_env}, " > /opt/config/cloud_env.txt\n", + "curl -k ", {get_input: repo_url_blob}, "/org.onap.demo/vnfs/vcpe/", {get_input: install_script_version}, "/v_web_install.sh -o /opt/v_web_install.sh\n", "cd /opt\n", "chmod +x v_web_install.sh\n", "./v_web_install.sh\n" @@ -380,4 +380,3 @@ topology_template: - key_pair: my_keypair - port: vweb_private_0_port - port: vweb_private_1_port - diff --git a/tosca/vCPE/vgmux/MainServiceTemplate.yaml b/tosca/vCPE/vgmux/MainServiceTemplate.yaml index dd3e8f29..fb1e6082 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate.yaml @@ -359,4 +359,3 @@ topology_template: #file: { get_input: vcpe_image_name } 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 d197fb93..f8a3a404 100644 --- a/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml +++ b/tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml @@ -373,4 +373,3 @@ topology_template: #file: { get_input: vcpe_image_name } file: ../Artifacts/Deployment/OTHER/image type: tosca.artifacts.nfv.SwImage - |