diff options
Diffstat (limited to 'tosca/vCPE')
| -rw-r--r-- | tosca/vCPE/Definitions/onap_dm.yaml | 94 | ||||
| -rw-r--r-- | tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml | 140 |
2 files changed, 117 insertions, 117 deletions
diff --git a/tosca/vCPE/Definitions/onap_dm.yaml b/tosca/vCPE/Definitions/onap_dm.yaml index c2e93957..c047df88 100644 --- a/tosca/vCPE/Definitions/onap_dm.yaml +++ b/tosca/vCPE/Definitions/onap_dm.yaml @@ -526,19 +526,19 @@ data_types: description: describes one protocol layer and associated protocol data for a given virtual link used in a specific VNF deployment flavour properties: associated_layer_protocol: - type: string - description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property. - required: true - constraints: - - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] + type: string + description: Identifies one of the protocols a virtualLink gives access to (ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire) as specified by the connectivity_type property. + required: true + constraints: + - valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ] l2_protocol_data: - type: tosca.datatypes.nfv.L2ProtocolData - description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. - required: false + type: tosca.datatypes.nfv.L2ProtocolData + description: Specifies the L2 protocol data for a virtual link. Shall be present when the associatedLayerProtocol attribute indicates a L2 protocol and shall be absent otherwise. + required: false l3_protocol_data: - 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 + 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 @@ -767,7 +767,7 @@ data_types: description: Identifies a performance metric derived from those defined in ETSI GS NFV-IFA 027.The packetOutgoingVirtualLink and packetIncomingVirtualLink metrics shall be obtained by aggregation the PacketOutgoing and PacketIncoming measurements defined in clause 7.1 of GS NFV-IFA 027 of all virtual link ports attached to the virtual link to which the metrics apply. required: true constraints: - - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ] + - valid_values: [ packet_outgoing_virtual_link, packet_incoming_virtual_link ] collection_period: type: scalar-unit.time description: Describes the recommended periodicity at which to collect the performance information. @@ -1256,10 +1256,10 @@ node_types: type: tosca.capabilities.nfv.VirtualStorage description: Defines the capabilities of virtual_storage. requirements: - - virtual_link: - capability: tosca.capabilities.nfv.VirtualLinkable - relationship: tosca.relationships.nfv.VirtualLinksTo - #description: Describes the requirements for linking to virtual link + - virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + #description: Describes the requirements for linking to virtual link tosca.nodes.nfv.Vdu.VirtualObjectStorage: derived_from: tosca.nodes.Root description: This node type describes the specifications of requirements related to virtual object storage resources @@ -1347,38 +1347,38 @@ node_types: relationship: tosca.relationships.nfv.VirtualBindsTo node: tosca.nodes.nfv.Vdu.Compute tosca.nodes.nfv.VnfVirtualLink: - derived_from: tosca.nodes.Root - description: Describes the information about an internal VNF VL - properties: - connectivity_type: - type: tosca.datatypes.nfv.ConnectivityType - description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL - required: true - description: + derived_from: tosca.nodes.Root + description: Describes the information about an internal VNF VL + properties: + connectivity_type: + type: tosca.datatypes.nfv.ConnectivityType + description: Specifies the protocol exposed by the VL and the flow pattern supported by the VL + required: true + description: + type: string + description: Provides human-readable information on the purpose of the VL + required: false + test_access: + type: list + description: Test access facilities available on the VL + required: false + entry_schema: type: string - description: Provides human-readable information on the purpose of the VL - required: false - test_access: - type: list - description: Test access facilities available on the VL - required: false - entry_schema: - type: string - constraints: - - valid_values: [ passive_monitoring, active_loopback ] - vl_profile: - type: tosca.datatypes.nfv.VlProfile - description: Defines additional data for the VL - required: true - monitoring_parameters: - type: list - description: Describes monitoring parameters applicable to the VL - required: false - entry_schema: - type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter - capabilities: - virtual_linkable: - type: tosca.capabilities.nfv.VirtualLinkable + constraints: + - valid_values: [ passive_monitoring, active_loopback ] + vl_profile: + type: tosca.datatypes.nfv.VlProfile + description: Defines additional data for the VL + required: true + monitoring_parameters: + type: list + description: Describes monitoring parameters applicable to the VL + required: false + entry_schema: + type: tosca.datatypes.nfv.VirtualLinkMonitoringParameter + capabilities: + virtual_linkable: + type: tosca.capabilities.nfv.VirtualLinkable tosca.nodes.nfv.VNF: derived_from: tosca.nodes.Root description: The generic abstract type from which all VNF specific abstract node types shall be derived to form, together with other node types, the TOSCA service template(s) representing the VNFD diff --git a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml index de9eaebf..6555e920 100644 --- a/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml +++ b/tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml @@ -205,25 +205,25 @@ topology_template: server: metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }} 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", - "cd /opt\n", - "chmod +x v_aaa_install.sh\n", - "./v_aaa_install.sh\n" - ] - } + "#!/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", + "cd /opt\n", + "chmod +x v_aaa_install.sh\n", + "./v_aaa_install.sh\n" + ] + } requirements: - key_pair: my_keypair - port: vaaa_private_0_port @@ -257,23 +257,23 @@ topology_template: server: metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }} 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", - "cd /opt\n", - "chmod +x v_dns_install.sh\n", - "./v_dns_install.sh\n" - ] - } + "#!/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", + "cd /opt\n", + "chmod +x v_dns_install.sh\n", + "./v_dns_install.sh\n" + ] + } requirements: - port: vdns_private_0_port - port: vdns_private_1_port @@ -307,23 +307,23 @@ topology_template: server: metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }} 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", - "cd /opt\n", - "chmod +x v_dhcp_install.sh\n", - "./v_dhcp_install.sh\n" - ] - } + "#!/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", + "cd /opt\n", + "chmod +x v_dhcp_install.sh\n", + "./v_dhcp_install.sh\n" + ] + } requirements: - key_pair: my_keypair - port: vdhcp_private_0_port @@ -359,23 +359,23 @@ topology_template: server: metadata: {vnf_id: { get_input: vnf_id }, vf_module_id: { get_input: vf_module_id }} 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", - "cd /opt\n", - "chmod +x v_web_install.sh\n", - "./v_web_install.sh\n" - ] - } + "#!/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", + "cd /opt\n", + "chmod +x v_web_install.sh\n", + "./v_web_install.sh\n" + ] + } requirements: - key_pair: my_keypair - port: vweb_private_0_port |