aboutsummaryrefslogtreecommitdiffstats
path: root/tosca
diff options
context:
space:
mode:
Diffstat (limited to 'tosca')
-rw-r--r--tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml60
-rw-r--r--tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml301
-rw-r--r--tosca/pNF/Definitions/pnf_main_descriptor.yaml6
-rw-r--r--tosca/pNF/Files/Events/MyPnf_Pnf_v1.yaml20
-rw-r--r--tosca/pNF/Files/Measurements/PM_Dictionary.yaml282
-rw-r--r--tosca/vCPE/Definitions/onap_dm.yaml24
-rw-r--r--tosca/vCPE/infra/MainServiceTemplate.yaml3
-rw-r--r--tosca/vCPE/infra/MainServiceTemplate_sriov.yaml1
-rw-r--r--tosca/vCPE/infra/base_vcpe_infra_rackspace_tosca.yaml99
-rw-r--r--tosca/vCPE/vgmux/MainServiceTemplate.yaml1
-rw-r--r--tosca/vCPE/vgmux/MainServiceTemplate_sriov.yaml1
11 files changed, 396 insertions, 402 deletions
diff --git a/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml b/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
index f05d273a..2eae43f8 100644
--- a/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
+++ b/tosca/pNF/Definitions/etsi_nfv_sol001_pnfd_2_5_1_types.yaml
@@ -4,19 +4,19 @@ description: ETSI NFV SOL 001 pnfd types definitions version 2.5.1
imports:
- etsi_nfv_sol001_vnfd_2_5_1_types.yaml
-data_types:
+data_types:
tosca.datatypes.nfv.L2AddressData:
derived_from: tosca.datatypes.Root
- description: Describes the information on the MAC addresses to be assigned to a connection point.
+ description: Describes the information on the MAC addresses to be assigned to a connection point.
properties:
mac_address_assignment:
type: boolean
description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility
- required: true
-
+ required: true
+
tosca.datatypes.nfv.L3AddressData:
derived_from: tosca.datatypes.Root
- description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP
+ description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP
properties:
ip_address_assignment:
type: boolean
@@ -24,7 +24,7 @@ data_types:
required: true
floating_ip_activated:
type: boolean
- description: Specifies if the floating IP scheme is activated on the Connection Point or not
+ description: Specifies if the floating IP scheme is activated on the Connection Point or not
required: true
ip_address_type:
type: string
@@ -34,14 +34,14 @@ data_types:
- valid_values: [ ipv4, ipv6 ]
number_of_ip_address:
type: integer
- description: Minimum number of IP addresses to be assigned
+ description: Minimum number of IP addresses to be assigned
required: false
constraints:
- greater_than: 0
tosca.datatypes.nfv.AddressData:
derived_from: tosca.datatypes.Root
- description: Describes information about the addressing scheme and parameters applicable to a CP
+ description: Describes information about the addressing scheme and parameters applicable to a CP
properties:
address_type:
type: string
@@ -55,9 +55,9 @@ data_types:
required: false
l3_address_data:
type: tosca.datatypes.nfv.L3AddressData
- description: Provides the information on the IP addresses to be assigned to a connection point
+ description: Provides the information on the IP addresses to be assigned to a connection point
required: false
-
+
tosca.datatypes.nfv.CpProtocolData:
derived_from: tosca.datatypes.Root
description: Describes and associates the protocol layer that a CP uses together with other protocol and connection point information
@@ -65,18 +65,18 @@ data_types:
associated_layer_protocol:
type: string
required: true
- description: One of the values of the property layer_protocols of the CP
+ description: One of the values of the property layer_protocols of the CP
constraints:
- valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
address_data:
type: list
description: Provides information on the addresses to be assigned to the CP
- entry_schema:
+ entry_schema:
type: tosca.datatypes.nfv.AddressData
-
+
tosca.datatypes.nfv.LocationInfo:
derived_from: tosca.datatypes.Root
- description: Represents geographical information on the location where a PNF is deployed.
+ description: Represents geographical information on the location where a PNF is deployed.
properties:
country_code:
type: string # two-letter ISO 3166 country code
@@ -91,7 +91,7 @@ data_types:
tosca.datatypes.nfv.CivicAddressElement:
derived_from: tosca.datatypes.Root
- description: Represents an element of a civic location as specified in IETF RFC 4776 [11].
+ description: Represents an element of a civic location as specified in IETF RFC 4776 [11].
properties:
ca_type:
type: string # RFC4776
@@ -106,21 +106,21 @@ capability_types:
tosca.capabilities.nfv.VirtualLinkable:
derived_from: tosca.capabilities.Node
description: A node type that includes the VirtualLinkable capability indicates that it can be pointed by tosca.relationships.nfv.VirtualLinksTo relationship type
-
+
relationship_types:
tosca.relationships.nfv.VirtualLinksTo:
derived_from: tosca.relationships.DependsOn
- description: Represents an association relationship between the VNF or PNF or Sap of a Nested NS and NsVirtualLink node types
- valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
-
+ description: Represents an association relationship between the VNF or PNF or Sap of a Nested NS and NsVirtualLink node types
+ valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
+
node_types:
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
- description: Identifies which protocol the connection point uses for connectivity purposes
+ description: Identifies which protocol the connection point uses for connectivity purposes
required: true
entry_schema:
type: string
@@ -128,17 +128,17 @@ node_types:
- valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
role: #Name in ETSI NFV IFA011 v0.7.3: cpRole
type: string
- description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS
+ description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS
required: false
constraints:
- valid_values: [ root, leaf ]
description:
type: string
- description: Provides human-readable information on the purpose of the connection point
+ description: Provides human-readable information on the purpose of the connection point
required: false
protocol:
type: list
- description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor
+ description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor
required: true
entry_schema:
type: tosca.datatypes.nfv.CpProtocolData
@@ -149,7 +149,7 @@ node_types:
tosca.nodes.nfv.PNF:
derived_from: tosca.nodes.Root
- properties:
+ properties:
descriptor_id: # instead of pnfd_id
type: string # GUID
required: true
@@ -168,7 +168,7 @@ node_types:
name:
type: string
required: true
- geographical_location_info:
+ geographical_location_info:
type: tosca.datatypes.nfv.LocationInfo
required: false
requirements:
@@ -184,9 +184,9 @@ node_types:
requirements:
- external_virtual_link:
capability: tosca.capabilities.nfv.VirtualLinkable
- relationship: tosca.relationships.nfv.VirtualLinksTo
-
-policy_types:
+ relationship: tosca.relationships.nfv.VirtualLinksTo
+
+policy_types:
tosca.policies.nfv.SecurityGroupRule:
derived_from: tosca.policies.Root
description: The SecurityGroupRule type is a policy type specified the matching criteria for the ingress and/or egress traffic to/from visited connection points as defined in ETSI GS NFV-IFA 011 [1].
@@ -232,4 +232,4 @@ policy_types:
- greater_or_equal: 0
- less_or_equal: 65535
default: 65535
- targets: [ tosca.nodes.nfv.PnfExtCp ]
+ targets: [ tosca.nodes.nfv.PnfExtCp ]
diff --git a/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml b/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
index 7d839121..c0ca061b 100644
--- a/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
+++ b/tosca/pNF/Definitions/etsi_nfv_sol001_vnfd_2_5_1_types.yaml
@@ -4,16 +4,16 @@ description: ETSI NFV SOL 001 vnfd types definitions version 2.5.1
data_types:
tosca.datatypes.nfv.L2AddressData:
derived_from: tosca.datatypes.Root
- description: Describes the information on the MAC addresses to be assigned to a connection point.
+ description: Describes the information on the MAC addresses to be assigned to a connection point.
properties:
mac_address_assignment:
type: boolean
description: Specifies if the address assignment is the responsibility of management and orchestration function or not. If it is set to True, it is the management and orchestration function responsibility
- required: true
-
+ required: true
+
tosca.datatypes.nfv.L3AddressData:
derived_from: tosca.datatypes.Root
- description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP
+ description: Provides information about Layer 3 level addressing scheme and parameters applicable to a CP
properties:
ip_address_assignment:
type: boolean
@@ -21,7 +21,7 @@ data_types:
required: true
floating_ip_activated:
type: boolean
- description: Specifies if the floating IP scheme is activated on the Connection Point or not
+ description: Specifies if the floating IP scheme is activated on the Connection Point or not
required: true
ip_address_type:
type: string
@@ -31,14 +31,14 @@ data_types:
- valid_values: [ ipv4, ipv6 ]
number_of_ip_address:
type: integer
- description: Minimum number of IP addresses to be assigned
+ description: Minimum number of IP addresses to be assigned
required: false
constraints:
- greater_than: 0
tosca.datatypes.nfv.AddressData:
derived_from: tosca.datatypes.Root
- description: Describes information about the addressing scheme and parameters applicable to a CP
+ description: Describes information about the addressing scheme and parameters applicable to a CP
properties:
address_type:
type: string
@@ -52,16 +52,16 @@ data_types:
required: false
l3_address_data:
type: tosca.datatypes.nfv.L3AddressData
- description: Provides the information on the IP addresses to be assigned to a connection point
+ description: Provides the information on the IP addresses to be assigned to a connection point
required: false
tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
derived_from: tosca.datatypes.Root
- description: Describes requirements on a virtual network interface
+ description: Describes requirements on a virtual network interface
properties:
name:
type: string
- description: Provides a human readable name for the requirement.
+ description: Provides a human readable name for the requirement.
required: false
description:
type: string
@@ -76,7 +76,7 @@ data_types:
description: The network interface requirements. A map of strings that contain a set of key-value pairs that describes the hardware platform specific network interface deployment requirements.
required: true
entry_schema:
- type: string
+ type: string
nic_io_requirements:
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.
@@ -84,7 +84,7 @@ data_types:
tosca.datatypes.nfv.ConnectivityType:
derived_from: tosca.datatypes.Root
- description: describes additional connectivity information of a virtualLink
+ description: describes additional connectivity information of a virtualLink
properties:
layer_protocols:
type: list
@@ -133,7 +133,7 @@ data_types:
description: supports the specification of requirements related to virtual memory of a virtual compute resource
properties:
virtual_mem_size:
- type: scalar-unit.size
+ type: scalar-unit.size
description: Amount of virtual memory.
required: true
virtual_mem_oversubscription_policy:
@@ -145,7 +145,7 @@ data_types:
description: The hardware platform specific VDU memory requirements. A map of strings that contains a set of key-value pairs that describes hardware platform specific VDU memory requirements.
required: false
entry_schema:
- type: string
+ type: string
numa_enabled:
type: boolean
description: It specifies the memory allocation to be cognisant of the relevant process/core allocation.
@@ -179,7 +179,7 @@ data_types:
description: The hardware platform specific VDU CPU requirements. A map of strings that contains a set of key-value pairs describing VDU CPU specific hardware platform requirements.
required: false
entry_schema:
- type: string
+ type: string
virtual_cpu_pinning:
type: tosca.datatypes.nfv.VirtualCpuPinning
description: The virtual CPU pinning configuration for the virtualised compute resource.
@@ -204,12 +204,12 @@ data_types:
tosca.datatypes.nfv.VnfcConfigurableProperties:
derived_from: tosca.datatypes.Root
- description: Defines the configurable properties of a VNFC
+ description: Defines the configurable properties of a VNFC
# properties:
# additional_vnfc_configurable_properties:
- # type: tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties
+ # type: tosca.datatypes.nfv.VnfcAdditionalConfigurableProperties
# description: Describes additional configuration for VNFC that
- # can be modified using the ModifyVnfInfo operation
+ # can be modified using the ModifyVnfInfo operation
# required: false
# derived types are expected to introduce
# additional_vnfc_configurable_properties with its type derived from
@@ -225,13 +225,13 @@ data_types:
properties:
min_number_of_instances:
type: integer
- description: Minimum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
+ description: Minimum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
required: true
constraints:
- greater_or_equal: 0
max_number_of_instances:
type: integer
- description: Maximum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
+ description: Maximum number of instances of the VNFC based on this Vdu.Compute that is permitted to exist for a particular VNF deployment flavour.
required: true
constraints:
- greater_or_equal: 0
@@ -302,7 +302,7 @@ data_types:
description: Specifies the maximum transmission unit (MTU) value for this L2 protocol.
required: false
constraints:
- - greater_than: 0
+ - greater_than: 0
tosca.datatypes.nfv.L3ProtocolData:
derived_from: tosca.datatypes.Root
@@ -321,7 +321,7 @@ data_types:
cidr:
type: string
description: Specifies the CIDR (Classless Inter-Domain Routing) of this L3 protocol. The value may be overridden at run-time.
- required: true
+ required: true
ip_allocation_pools:
type: list
description: Specifies the allocation pools with start and end IP addresses for this L3 protocol. The value may be overridden at run-time.
@@ -358,11 +358,11 @@ data_types:
tosca.datatypes.nfv.InstantiationLevel:
derived_from: tosca.datatypes.Root
- description: Describes the scale level for each aspect that corresponds to a given level of resources to be instantiated within a deployment flavour in term of the number VNFC instances
+ description: Describes the scale level for each aspect that corresponds to a given level of resources to be instantiated within a deployment flavour in term of the number VNFC instances
properties:
description:
type: string
- description: Human readable description of the level
+ description: Human readable description of the level
required: true
scale_info:
type: map # key: aspectId
@@ -373,50 +373,50 @@ data_types:
tosca.datatypes.nfv.VduLevel:
derived_from: tosca.datatypes.Root
- description: Indicates for a given Vdu.Compute in a given level the number of instances to deploy
+ description: Indicates for a given Vdu.Compute in a given level the number of instances to deploy
properties:
number_of_instances:
type: integer
- description: Number of instances of VNFC based on this VDU to deploy for this level.
+ description: Number of instances of VNFC based on this VDU to deploy for this level.
required: true
constraints:
- greater_or_equal: 0
tosca.datatypes.nfv.VnfLcmOperationsConfiguration:
derived_from: tosca.datatypes.Root
- description: Represents information to configure lifecycle management operations
+ description: Represents information to configure lifecycle management operations
properties:
instantiate:
type: tosca.datatypes.nfv.VnfInstantiateOperationConfiguration
- description: Configuration parameters for the InstantiateVnf operation
+ description: Configuration parameters for the InstantiateVnf operation
required: false
scale:
type: tosca.datatypes.nfv.VnfScaleOperationConfiguration
- description: Configuration parameters for the ScaleVnf operation
+ description: Configuration parameters for the ScaleVnf operation
required: false
scale_to_level:
type: tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration
- description: Configuration parameters for the ScaleVnfToLevel operation
+ description: Configuration parameters for the ScaleVnfToLevel operation
required: false
change_flavour:
type: tosca.datatypes.nfv.VnfChangeFlavourOperationConfiguration
- description: Configuration parameters for the changeVnfFlavourOpConfig operation
+ description: Configuration parameters for the changeVnfFlavourOpConfig operation
required: false
heal:
type: tosca.datatypes.nfv.VnfHealOperationConfiguration
- description: Configuration parameters for the HealVnf operation
+ description: Configuration parameters for the HealVnf operation
required: false
terminate:
type: tosca.datatypes.nfv.VnfTerminateOperationConfiguration
- description: Configuration parameters for the TerminateVnf operation
+ description: Configuration parameters for the TerminateVnf operation
required: false
operate:
type: tosca.datatypes.nfv.VnfOperateOperationConfiguration
- description: Configuration parameters for the OperateVnf operation
+ description: Configuration parameters for the OperateVnf operation
required: false
change_ext_connectivity:
- type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration
- description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation
+ type: tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration
+ description: Configuration parameters for the changeExtVnfConnectivityOpConfig operation
required: false
tosca.datatypes.nfv.VnfInstantiateOperationConfiguration:
@@ -425,7 +425,7 @@ data_types:
tosca.datatypes.nfv.VnfScaleOperationConfiguration:
derived_from: tosca.datatypes.Root
- description: Represents information that affect the invocation of the ScaleVnf operation
+ description: Represents information that affect the invocation of the ScaleVnf operation
properties:
scaling_by_more_than_one_step_supported:
type: boolean
@@ -444,22 +444,22 @@ data_types:
tosca.datatypes.nfv.VnfHealOperationConfiguration:
derived_from: tosca.datatypes.Root
- description: represents information that affect the invocation of the HealVnf operation
+ description: represents information that affect the invocation of the HealVnf operation
properties:
causes:
type: list
- description: Supported "cause" parameter values
+ description: Supported "cause" parameter values
required: false
entry_schema:
type: string
tosca.datatypes.nfv.VnfTerminateOperationConfiguration:
derived_from: tosca.datatypes.Root
- description: represents information that affect the invocation of the TerminateVnf
+ description: represents information that affect the invocation of the TerminateVnf
properties:
min_graceful_termination_timeout:
type: scalar-unit.time
- description: Minimum timeout value for graceful termination of a VNF instance
+ description: Minimum timeout value for graceful termination of a VNF instance
required: true
max_recommended_graceful_termination_timeout:
type: scalar-unit.time
@@ -468,11 +468,11 @@ data_types:
tosca.datatypes.nfv.VnfOperateOperationConfiguration:
derived_from: tosca.datatypes.Root
- description: represents information that affect the invocation of the OperateVnf operation
+ description: represents information that affect the invocation of the OperateVnf operation
properties:
min_graceful_stop_timeout:
type: scalar-unit.time
- description: Minimum timeout value for graceful stop of a VNF instance
+ description: Minimum timeout value for graceful stop of a VNF instance
required: true
max_recommended_graceful_stop_timeout:
type: scalar-unit.time
@@ -481,11 +481,11 @@ data_types:
tosca.datatypes.nfv.ScaleInfo:
derived_from: tosca.datatypes.Root
- description: Indicates for a given scaleAspect the corresponding scaleLevel
+ description: Indicates for a given scaleAspect the corresponding scaleLevel
properties:
scale_level:
type: integer
- description: The scale level for a particular aspect
+ description: The scale level for a particular aspect
required: true
constraints:
- greater_or_equal: 0
@@ -512,7 +512,7 @@ data_types:
tosca.datatypes.nfv.LinkBitrateRequirements:
derived_from: tosca.datatypes.Root
- description: describes the requirements in terms of bitrate for a virtual link
+ description: describes the requirements in terms of bitrate for a virtual link
properties:
root:
type: integer # in bits per second
@@ -529,23 +529,23 @@ data_types:
tosca.datatypes.nfv.Qos:
derived_from: tosca.datatypes.Root
- description: describes QoS data for a given VL used in a VNF deployment flavour
+ description: describes QoS data for a given VL used in a VNF deployment flavour
properties:
latency:
type: scalar-unit.time #Number
- description: Specifies the maximum latency
+ description: Specifies the maximum latency
required: true
- constraints:
+ constraints:
- greater_than: 0 s
packet_delay_variation:
type: scalar-unit.time #Number
- description: Specifies the maximum jitter
+ description: Specifies the maximum jitter
required: true
- constraints:
+ constraints:
- greater_or_equal: 0 s
packet_loss_ratio:
type: float
- description: Specifies the maximum packet loss ratio
+ description: Specifies the maximum packet loss ratio
required: false
constraints:
- in_range: [ 0.0, 1.0 ]
@@ -556,15 +556,15 @@ data_types:
properties:
is_autoscale_enabled:
type: boolean
- description: It permits to enable (TRUE)/disable (FALSE) the auto-scaling functionality. If the properties is not present for configuring, then VNF property is not supported
+ description: It permits to enable (TRUE)/disable (FALSE) the auto-scaling functionality. If the properties is not present for configuring, then VNF property is not supported
required: false
is_autoheal_enabled:
type: boolean
- description: It permits to enable (TRUE)/disable (FALSE) the auto-healing functionality. If the properties is not present for configuring, then VNF property is not supported
+ description: It permits to enable (TRUE)/disable (FALSE) the auto-healing functionality. If the properties is not present for configuring, then VNF property is not supported
required: false
# additional_configurable_properties:
# description: It provides VNF specific configurable properties that
- # can be modified using the ModifyVnfInfo operation
+ # can be modified using the ModifyVnfInfo operation
# required: false
# type: tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
# derived types are expected to introduce
@@ -572,30 +572,30 @@ data_types:
# tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
tosca.datatypes.nfv.VnfAdditionalConfigurableProperties:
- derived_from: tosca.datatypes.Root
+ derived_from: tosca.datatypes.Root
description: is an empty base type for deriving data types for describing additional configurable properties for a given VNF
tosca.datatypes.nfv.VnfInfoModifiableAttributes:
derived_from: tosca.datatypes.Root
- description: Describes VNF-specific extension and metadata for a given VNF
+ description: Describes VNF-specific extension and metadata for a given VNF
#properties:
#extensions:
#type: tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
- #description: "Extension" properties of VnfInfo that are writeable
+ #description: "Extension" properties of VnfInfo that are writeable
#required: false
# derived types are expected to introduce
# extensions with its type derived from
# tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
#metadata:
#type: tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
- #description: "Metadata" properties of VnfInfo that are writeable
+ #description: "Metadata" properties of VnfInfo that are writeable
#required: false
# derived types are expected to introduce
# metadata with its type derived from
# tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions:
- derived_from: tosca.datatypes.Root
+ derived_from: tosca.datatypes.Root
description: is an empty base type for deriving data types for describing VNF-specific extension
tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:
@@ -609,13 +609,13 @@ data_types:
associated_layer_protocol:
type: string
required: true
- description: One of the values of the property layer_protocols of the CP
+ description: One of the values of the property layer_protocols of the CP
constraints:
- valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
address_data:
type: list
description: Provides information on the addresses to be assigned to the CP
- entry_schema:
+ entry_schema:
type: tosca.datatypes.nfv.AddressData
required: false
@@ -632,51 +632,51 @@ data_types:
tosca.datatypes.nfv.SwImageData:
derived_from: tosca.datatypes.Root
- description: describes information related to a software image artifact
+ description: describes information related to a software image artifact
properties: # in SOL001 v0.8.0: "properties or metadata:"
name:
type: string
- description: Name of this software image
+ description: Name of this software image
required: true
version:
type: string
- description: Version of this software image
+ description: Version of this software image
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
- description: The container format describes the container file format in which software image is provided
+ description: The container format describes the container file format in which software image is provided
required: true
constraints:
- valid_values: [ aki, ami, ari, bare, docker, ova, ovf ]
disk_format:
type: string
- description: The disk format of a software image is the format of the underlying disk image
+ description: The disk format of a software image is the format of the underlying disk image
required: true
constraints:
- - valid_values: [ aki, ami, ari, iso, qcow2, raw, vdi, vhd, vhdx, vmdk ]
+ - 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
- description: The minimal RAM requirement for this software image
+ description: The minimal RAM requirement for this software image
required: false
size:
type: scalar-unit.size # Number
- description: The size of this software image
+ description: The size of this software image
required: true
operating_system:
type: string
- description: Identifies the operating system used in the software image
+ description: Identifies the operating system used in the software image
required: false
supported_virtualisation_environments:
type: list
- description: Identifies the virtualisation environments (e.g. hypervisor) compatible with this software image
+ description: Identifies the virtualisation environments (e.g. hypervisor) compatible with this software image
required: false
entry_schema:
type: string
@@ -692,12 +692,12 @@ data_types:
vdu_storage_requirements:
type: map
description: The hardware platform specific storage requirements. A map of strings that contains a set of key-value pairs that represents the hardware platform specific storage deployment requirements.
- required: false
+ required: false
entry_schema:
type: string
rdma_enabled:
type: boolean
- description: Indicates if the storage support RDMA
+ description: Indicates if the storage support RDMA
required: false
default: false
@@ -707,7 +707,7 @@ data_types:
properties:
max_size_of_storage:
type: scalar-unit.size
- description: Maximum size of virtualized storage resource
+ description: Maximum size of virtualized storage resource
required: false
tosca.datatypes.nfv.VirtualFileStorageData:
@@ -725,27 +725,27 @@ data_types:
tosca.datatypes.nfv.VirtualLinkBitrateLevel:
derived_from: tosca.datatypes.Root
- description: Describes bitrate requirements applicable to the virtual link instantiated from a particicular VnfVirtualLink
+ description: Describes bitrate requirements applicable to the virtual link instantiated from a particicular VnfVirtualLink
properties:
bitrate_requirements:
type: tosca.datatypes.nfv.LinkBitrateRequirements
- description: Virtual link bitrate requirements for an instantiation level or bitrate delta for a scaling step
+ description: Virtual link bitrate requirements for an instantiation level or bitrate delta for a scaling step
required: true
tosca.datatypes.nfv.VnfOperationAdditionalParameters:
derived_from: tosca.datatypes.Root
- description: Is an empty base type for deriving data type for describing VNF-specific parameters to be passed when invoking lifecycle management operations
+ description: Is an empty base type for deriving data type for describing VNF-specific parameters to be passed when invoking lifecycle management operations
#properties:
tosca.datatypes.nfv.VnfChangeFlavourOperationConfiguration:
derived_from: tosca.datatypes.Root
- description: represents information that affect the invocation of the ChangeVnfFlavour operation
+ description: represents information that affect the invocation of the ChangeVnfFlavour operation
#properties:
tosca.datatypes.nfv.VnfChangeExtConnectivityOperationConfiguration:
derived_from: tosca.datatypes.Root
- description: represents information that affect the invocation of the ChangeExtVnfConnectivity operation
- #properties:
+ description: represents information that affect the invocation of the ChangeExtVnfConnectivity operation
+ #properties:
tosca.datatypes.nfv.VnfMonitoringParameter:
derived_from: tosca.datatypes.Root
@@ -833,7 +833,7 @@ data_types:
type: string # shall comply with IETF RFC3986
description: scheme component of a URI.
required: true
- authority:
+ authority:
type: tosca.datatypes.nfv.UriAuthority
description: Authority component of a URI
required: false
@@ -891,11 +891,11 @@ data_types:
artifact_types:
tosca.artifacts.nfv.SwImage:
derived_from: tosca.artifacts.Deployment.Image
- description: describes the software image which is directly loaded on the virtualisation container realizing of the VDU or is to be loaded on a virtual storage resource.
+ description: describes the software image which is directly loaded on the virtualisation container realizing of the VDU or is to be loaded on a virtual storage resource.
tosca.artifacts.Implementation.nfv.Mistral:
derived_from: tosca.artifacts.Implementation
- description: artifacts for Mistral workflows
+ description: artifacts for Mistral workflows
mime_type: application/x-yaml
file_ext: [ yaml ]
@@ -910,61 +910,61 @@ capability_types:
tosca.capabilities.nfv.VirtualCompute:
derived_from: tosca.capabilities.Node
- description: Describes the capabilities related to virtual compute resources
+ description: Describes the capabilities related to virtual compute resources
properties:
logical_node:
type: map
- description: Describes the Logical Node requirements
+ description: Describes the Logical Node requirements
required: false
entry_schema:
type: tosca.datatypes.nfv.LogicalNodeData
requested_additional_capabilities:
type: map
- description: Describes additional capability for a particular VDU
+ description: Describes additional capability for a particular VDU
required: false
entry_schema:
type: tosca.datatypes.nfv.RequestedAdditionalCapability
compute_requirements:
type: map
- required: false
+ required: false
entry_schema:
type: string
virtual_memory:
type: tosca.datatypes.nfv.VirtualMemory
- description: Describes virtual memory of the virtualized compute
+ description: Describes virtual memory of the virtualized compute
required: true
virtual_cpu:
type: tosca.datatypes.nfv.VirtualCpu
- description: Describes virtual CPU(s) of the virtualized compute
+ description: Describes virtual CPU(s) of the virtualized compute
required: true
virtual_local_storage:
type: list
- description: A list of virtual system disks created and destroyed as part of the VM lifecycle
+ description: A list of virtual system disks created and destroyed as part of the VM lifecycle
required: false
entry_schema:
type: tosca.datatypes.nfv.VirtualBlockStorageData
- description: virtual system disk definition
+ description: virtual system disk definition
tosca.capabilities.nfv.VirtualStorage:
derived_from: tosca.capabilities.Root
description: Describes the attachment capabilities related to Vdu.Storage
-
+
relationship_types:
tosca.relationships.nfv.VirtualBindsTo:
derived_from: tosca.relationships.DependsOn
- description: Represents an association relationship between Vdu.Compute and VduCp node types
+ description: Represents an association relationship between Vdu.Compute and VduCp node types
valid_target_types: [ tosca.capabilities.nfv.VirtualBindable ]
tosca.relationships.nfv.VirtualLinksTo:
derived_from: tosca.relationships.DependsOn
- description: Represents an association relationship between the VduCp and VnfVirtualLink node types
+ description: Represents an association relationship between the VduCp and VnfVirtualLink node types
valid_target_types: [ tosca.capabilities.nfv.VirtualLinkable ]
tosca.relationships.nfv.AttachesTo:
derived_from: tosca.relationships.Root
description: Represents an association relationship between the Vdu.Compute and one of the node types, Vdu.VirtualBlockStorage, Vdu.VirtualObjectStorage or Vdu.VirtualFileStorage
valid_target_types: [ tosca.capabilities.nfv.VirtualStorage ]
-
+
interface_types:
tosca.interfaces.nfv.Vnflcm:
derived_from: tosca.interfaces.Root
@@ -976,7 +976,7 @@ interface_types:
# type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
# required: false
# derived types are expected to introduce additional_parameters with
- # its type derived from
+ # its type derived from
# tosca.datatypes.nfv.VnfOperationAdditionalParameters
instantiate_start:
description: Invoked before instantiate
@@ -1007,8 +1007,8 @@ interface_types:
# additional_parameters:
# type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
# required: false
- # derived types are expected to introduce additional_parameters with
- # its type derived from
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
# tosca.datatypes.nfv.VnfOperationAdditionalParameters
change_flavour_start:
description: Invoked before change_flavour
@@ -1020,8 +1020,8 @@ interface_types:
# additional_parameters:
# type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
# required: false
- # derived types are expected to introduce additional_parameters with
- # its type derived from
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
# tosca.datatypes.nfv.VnfOperationAdditionalParameters
change_external_connectivity_start:
description: Invoked before change_external_connectivity
@@ -1033,8 +1033,8 @@ interface_types:
# additional_parameters:
# type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
# required: false
- # derived types are expected to introduce additional_parameters with
- # its type derived from
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
# tosca.datatypes.nfv.VnfOperationAdditionalParameters
operate_start:
description: Invoked before operate
@@ -1046,8 +1046,8 @@ interface_types:
# additional_parameters:
# type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
# required: false
- # derived types are expected to introduce additional_parameters with
- # its type derived from
+ # derived types are expected to introduce additional_parameters with
+ # its type derived from
# tosca.datatypes.nfv.VnfOperationAdditionalParameters
heal_start:
description: Invoked before heal
@@ -1060,12 +1060,12 @@ interface_types:
# type: tosca.datatypes.nfv.VnfOperationAdditionalParameters
# required: false
# derived types are expected to introduce additional_parameters with
- # its type derived from
+ # its type derived from
# tosca.datatypes.nfv.VnfOperationAdditionalParameters
scale_start:
description: Invoked before scale
scale_end:
- description: Invoked after scale
+ description: Invoked after scale
scale_to_level:
description: Invoked upon receipt of a Scale VNF to Level request
# inputs:
@@ -1079,7 +1079,7 @@ interface_types:
description: Invoked before scale_to_level
scale_to_level_end:
description: Invoked after scale_to_level
-
+
node_types:
tosca.nodes.nfv.VNF:
derived_from: tosca.nodes.Root
@@ -1133,13 +1133,13 @@ node_types:
#type: tosca.datatypes.nfv.VnfConfigurableProperties
#description: Describes the configurable properties of the VNF
#required: false
- # derived types are expected to introduce configurable_properties
- # with its type derived from
+ # derived types are expected to introduce configurable_properties
+ # with its type derived from
# tosca.datatypes.nfv.VnfConfigurableProperties
#modifiable_attributes:
#type: tosca.datatypes.nfv.VnfInfoModifiableAttributes
#description: Describes the modifiable attributes of the VNF
- #required: false
+ #required: false
# derived types are expected to introduce modifiable_attributes
# with its type derived from
# tosca.datatypes.nfv.VnfInfoModifiableAttributes
@@ -1177,11 +1177,11 @@ node_types:
tosca.nodes.nfv.VnfExtCp:
derived_from: tosca.nodes.nfv.Cp
- description: Describes a logical external connection point, exposed by the VNF enabling connection with an external Virtual Link
+ description: Describes a logical external connection point, exposed by the VNF enabling connection with an external Virtual Link
properties:
virtual_network_interface_requirements:
type: list
- description: The actual virtual NIC requirements that is been assigned when instantiating the connection point
+ description: The actual virtual NIC requirements that is been assigned when instantiating the connection point
required: false
entry_schema:
type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
@@ -1195,25 +1195,25 @@ 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
- description: Human readable name of the VDU
+ description: Human readable name of the VDU
required: true
description:
type: string
- description: Human readable description of the VDU
+ description: Human readable description of the VDU
required: true
boot_order:
type: list # explicit index (boot index) not necessary, contrary to IFA011
- description: References a node template name from which a valid boot device is created
+ description: References a node template name from which a valid boot device is created
required: false
entry_schema:
type: string
nfvi_constraints:
type: list
- description: Describes constraints on the NFVI for the VNFC instance(s) created from this VDU
+ description: Describes constraints on the NFVI for the VNFC instance(s) created from this VDU
required: false
entry_schema:
type: string
@@ -1221,21 +1221,21 @@ node_types:
type: list
description: Describes monitoring parameters applicable to a VNFC instantiated from this VDU
required: false
- entry_schema:
+ entry_schema:
type: tosca.datatypes.nfv.VnfcMonitoringParameter
#configurable_properties:
#type: tosca.datatypes.nfv.VnfcConfigurableProperties
- #required: false
+ #required: false
# derived types are expected to introduce
# configurable_properties with its type derived from
# tosca.datatypes.nfv.VnfcConfigurableProperties
vdu_profile:
type: tosca.datatypes.nfv.VduProfile
- description: Defines additional instantiation data for the VDU.Compute node
+ description: Defines additional instantiation data for the VDU.Compute node
required: true
sw_image_data:
type: tosca.datatypes.nfv.SwImageData
- description: Defines information related to a SwImage artifact used by this Vdu.Compute node
+ description: Defines information related to a SwImage artifact used by this Vdu.Compute node
required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
boot_data:
type: string
@@ -1260,18 +1260,18 @@ node_types:
properties:
virtual_block_storage_data:
type: tosca.datatypes.nfv.VirtualBlockStorageData
- description: Describes the block storage characteristics.
+ description: Describes the block storage characteristics.
required: true
sw_image_data:
type: tosca.datatypes.nfv.SwImageData
- description: Defines information related to a SwImage artifact used by this Vdu.Compute node.
+ description: Defines information related to a SwImage artifact used by this Vdu.Compute node.
required: false # property is required when the node template has an associated artifact of type tosca.artifacts.nfv.SwImage and not required otherwise
capabilities:
virtual_storage:
type: tosca.capabilities.nfv.VirtualStorage
description: Defines the capabilities of virtual_storage.
- tosca.nodes.nfv.Vdu.VirtualObjectStorage:
+ 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
properties:
@@ -1284,7 +1284,7 @@ node_types:
type: tosca.capabilities.nfv.VirtualStorage
description: Defines the capabilities of virtual_storage.
- tosca.nodes.nfv.Vdu.VirtualFileStorage:
+ tosca.nodes.nfv.Vdu.VirtualFileStorage:
derived_from: tosca.nodes.Root
description: This node type describes the specifications of requirements related to virtual file storage resources
properties:
@@ -1304,11 +1304,11 @@ node_types:
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
- description: Identifies which protocol the connection point uses for connectivity purposes
+ description: Identifies which protocol the connection point uses for connectivity purposes
required: true
entry_schema:
type: string
@@ -1316,17 +1316,17 @@ node_types:
- valid_values: [ ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
role: #Name in ETSI NFV IFA011 v0.7.3: cpRole
type: string
- description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS
+ description: Identifies the role of the port in the context of the traffic flow patterns in the VNF or parent NS
required: false
constraints:
- valid_values: [ root, leaf ]
description:
type: string
- description: Provides human-readable information on the purpose of the connection point
+ description: Provides human-readable information on the purpose of the connection point
required: false
protocol:
type: list
- description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor
+ description: Provides information on the addresses to be assigned to the connection point(s) instantiated from this Connection Point Descriptor
required: false
entry_schema:
type: tosca.datatypes.nfv.CpProtocolData
@@ -1337,17 +1337,17 @@ node_types:
tosca.nodes.nfv.VduCp:
derived_from: tosca.nodes.nfv.Cp
- description: describes network connectivity between a VNFC instance based on this VDU and an internal VL
+ description: describes network connectivity between a VNFC instance based on this VDU and an internal VL
properties:
bitrate_requirement:
type: integer # in bits per second
- description: Bitrate requirement in bit per second on this connection point
+ description: Bitrate requirement in bit per second on this connection point
required: false
- constraints:
+ constraints:
- greater_or_equal: 0
virtual_network_interface_requirements:
type: list
- description: Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD
+ description: Specifies requirements on a virtual network interface realising the CPs instantiated from this CPD
required: false
entry_schema:
type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements
@@ -1357,7 +1357,7 @@ node_types:
required: false
constraints:
- greater_or_equal: 0
- vnic_type:
+ vnic_type:
type: string
description: Describes the type of the virtual network interface realizing the CPs instantiated from this CPD
required: false
@@ -1374,19 +1374,19 @@ node_types:
tosca.nodes.nfv.VnfVirtualLink:
derived_from: tosca.nodes.Root
- description: Describes the information about an internal VNF VL
+ 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
+ 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
+ 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
+ description: Test access facilities available on the VL
required: false
entry_schema:
type: string
@@ -1394,7 +1394,7 @@ node_types:
- valid_values: [ passive_monitoring, active_loopback ]
vl_profile:
type: tosca.datatypes.nfv.VlProfile
- description: Defines additional data for the VL
+ description: Defines additional data for the VL
required: true
monitoring_parameters:
type: list
@@ -1405,7 +1405,7 @@ node_types:
capabilities:
virtual_linkable:
type: tosca.capabilities.nfv.VirtualLinkable
-
+
group_types:
tosca.groups.nfv.PlacementGroup:
derived_from: tosca.groups.Root
@@ -1416,7 +1416,7 @@ group_types:
description: Human readable description of the group
required: true
members: [ tosca.nodes.nfv.Vdu.Compute, tosca.nodes.nfv.VnfVirtualLink ]
-
+
policy_types:
tosca.policies.nfv.InstantiationLevels:
derived_from: tosca.policies.Root
@@ -1435,7 +1435,7 @@ policy_types:
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
@@ -1447,7 +1447,7 @@ policy_types:
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
@@ -1589,11 +1589,11 @@ policy_types:
- greater_or_equal: 0
- less_or_equal: 65535
default: 65535
- targets: [ tosca.nodes.nfv.VduCp, tosca.nodes.nfv.VnfExtCp ]
+ 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
@@ -1604,6 +1604,5 @@ policy_types:
details:
type: tosca.datatypes.nfv.InterfaceDetails
description: Provide additional data to access the interface endpoint
- required: false
+ required: false
targets: [ tosca.nodes.nfv.VnfExtCp, tosca.nodes.nfv.VduCp ]
-
diff --git a/tosca/pNF/Definitions/pnf_main_descriptor.yaml b/tosca/pNF/Definitions/pnf_main_descriptor.yaml
index 400efea5..f0064dee 100644
--- a/tosca/pNF/Definitions/pnf_main_descriptor.yaml
+++ b/tosca/pNF/Definitions/pnf_main_descriptor.yaml
@@ -16,7 +16,7 @@ topology_template:
version: 1.0
descriptor_invariant_id: 1111-2222-ccaa-bbdd
name: Acme PNF
-
+
pnfExtCp_1:
type: tosca.nodes.nfv.PnfExtCp
properties:
@@ -24,5 +24,5 @@ topology_template:
layer_protocols: [ ipv4 ]
role: leaf
description: External connection point to access Acme myPnf
- requirements:
- - dependency: myPnf \ No newline at end of file
+ requirements:
+ - dependency: myPnf
diff --git a/tosca/pNF/Files/Events/MyPnf_Pnf_v1.yaml b/tosca/pNF/Files/Events/MyPnf_Pnf_v1.yaml
index 83f1d3e8..8d3002b3 100644
--- a/tosca/pNF/Files/Events/MyPnf_Pnf_v1.yaml
+++ b/tosca/pNF/Files/Events/MyPnf_Pnf_v1.yaml
@@ -1,10 +1,10 @@
---
event:
presence: required
- structure:
+ structure:
commonEventHeader:
presence: required
- structure:
+ structure:
domain: {presence: required, value: notification}
eventName: {presence: required, value: Noti_MyPnf-Acme_FileReady}
priority: {presence: required, value: Normal}
@@ -20,14 +20,14 @@ event:
lastEpochMicrosec: {presence: required}
notificationFields:
presence: required
- structure:
+ structure:
changeIdentifier: {presence: required, value: PM_MEAS_FILES}
changeType: {presence: required, value: fileReady}
notificationFieldsVersion: {presence: required, value: 2.0}
arrayOfNamedHashMap:
presence: required
array:
- - name: {presence: required}
+ - name: {presence: required}
hashMap: {presence: required, structure: {
keyValuePair: {presence: required, structure: {key: {presence: required, value: location}, value: {presence: required}}},
keyValuePair: {presence: required, structure: {key: {presence: required, value: compression}, value: {presence: required, value: gzip}}},
@@ -71,7 +71,7 @@ event:
event:
presence: required
action: [ any, any, null, null, null ]
- comment: "
+ comment: "
ALARM NAME: CertMAutomaticEnrollmentFailed,
ALARM DESCRIPTION: ‘See alarm OPI x/1111-ABC 123 4567/1 Uen’,
ALARM EFFECT: 'See alarm OPI x/2222-ABC 123 4567/1 Uen',
@@ -205,9 +205,9 @@ event:
eventSeverity: {presence: required}
vfStatus: {presence: required, value: Active}
alarmAdditionalInformation: {presence: required, structure: {
- keyValuePair: {presence: required, structure: {key: {presence: required, value: source},value: {presence: required}}},
- keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause},value: {presence: required, value: 'FileError'}}},
- keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText},value: {presence: optional}}},
- keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo},value: {presence: optional}}}}
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: source}, value: {presence: required}}},
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: probableCause}, value: {presence: required, value: 'FileError'}}},
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalText}, value: {presence: optional}}},
+ keyValuePair: {presence: required, structure: {key: {presence: required, value: additionalInfo}, value: {presence: optional}}}}
}
-... \ No newline at end of file
+...
diff --git a/tosca/pNF/Files/Measurements/PM_Dictionary.yaml b/tosca/pNF/Files/Measurements/PM_Dictionary.yaml
index 858951f7..d00a5330 100644
--- a/tosca/pNF/Files/Measurements/PM_Dictionary.yaml
+++ b/tosca/pNF/Files/Measurements/PM_Dictionary.yaml
@@ -39,148 +39,148 @@ pmDictionary:
vendor: Acme
pmDictionaryMeasurements:
- - measType: DRB.UEThpDl
- measDescription: Average DL UE throughput in gNB
- measCondition: See 3GPP TS 28.552
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: kbps
- measObjClass: NRCellDU
- measCollectionMethod: DER
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "Data Radio Bearer"
- measFamily: DRB
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true,
- "acmeParameter3": "acmeParameterValue3"}
-
- - measType: VS.ifInDiscards
- measDescription: The number of inbound packets which were chosen to be discarded
- measCondition: The number of inbound packets which were chosen to be
- discarded even though no errors had been detected to prevent
- their being deliverable to a higher-layer protocol. One
- possible reason for discarding such a packet could be to
- free up buffer space.
- Discontinuities in the value of this counter can occur at
- re-initialization of the management system, and at other
- times as indicated by the value of
- ifCounterDiscontinuityTime.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: DRB.UEThpDl
+ measDescription: Average DL UE throughput in gNB
+ measCondition: See 3GPP TS 28.552
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: kbps
+ measObjClass: NRCellDU
+ measCollectionMethod: DER
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "Data Radio Bearer"
+ measFamily: DRB
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true,
+ "acmeParameter3": "acmeParameterValue3"}
- - measType: VS.ifInErrors
- measDescription: Number of inbound packets that contained errors
- measCondition: For packet-oriented interfaces, the number of inbound
- packets that contained errors preventing them from being
- deliverable to a higher-layer protocol. For character-
- oriented or fixed-length interfaces, the number of inbound
- transmission units that contained errors preventing them
- from being deliverable to a higher-layer protocol.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: Gauge
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: VS.ifInDiscards
+ measDescription: The number of inbound packets which were chosen to be discarded
+ measCondition: The number of inbound packets which were chosen to be
+ discarded even though no errors had been detected to prevent
+ their being deliverable to a higher-layer protocol. One
+ possible reason for discarding such a packet could be to
+ free up buffer space.
+ Discontinuities in the value of this counter can occur at
+ re-initialization of the management system, and at other
+ times as indicated by the value of
+ ifCounterDiscontinuityTime.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true,
+ "acmeParameter3": "acmeParameterValue3"}
- - measType: VS.ifInUnknownProtos
- measDescription: Number of inbound packets received via an unknown or usupported protocol
- measCondition: For packet-oriented interfaces, the number of packets
- received via the interface which were discarded because of
- an unknown or unsupported protocol. For character-oriented
- or fixed-length interfaces that support protocol
- multiplexing the number of transmission units received via
- the interface which were discarded because of an unknown or
- unsupported protocol. For any interface that does not
- support protocol multiplexing, this counter will always be
- 0.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true}
+ - measType: VS.ifInErrors
+ measDescription: Number of inbound packets that contained errors
+ measCondition: For packet-oriented interfaces, the number of inbound
+ packets that contained errors preventing them from being
+ deliverable to a higher-layer protocol. For character-
+ oriented or fixed-length interfaces, the number of inbound
+ transmission units that contained errors preventing them
+ from being deliverable to a higher-layer protocol.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: Gauge
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter3": "acmeParameterValue3"}
- - measType: VS.ifHCInBroadcastPkts
- measDescription: Number of the broadcasted inbound packets delivered to the higher (sub-)layer
- measCondition: The number of packets, delivered by this sub-layer to a
- higher (sub-)layer, which were addressed to a broadcast
- address at this sub-layer. This object is a 64-bit version
- of ifInBroadcastPkts.
- Discontinuities in the value of this counter can occur at
- re-initialization of the management system, and at other
- times as indicated by the value of
- ifCounterDiscontinuityTime.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0}
+ - measType: VS.ifInUnknownProtos
+ measDescription: Number of inbound packets received via an unknown or usupported protocol
+ measCondition: For packet-oriented interfaces, the number of packets
+ received via the interface which were discarded because of
+ an unknown or unsupported protocol. For character-oriented
+ or fixed-length interfaces that support protocol
+ multiplexing the number of transmission units received via
+ the interface which were discarded because of an unknown or
+ unsupported protocol. For any interface that does not
+ support protocol multiplexing, this counter will always be
+ 0.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true}
- - measType: VS.ifHCOutBroadcastPkts
- measDescription: Number of the broadcasted outsbound packets delivered to the higher (sub-)layer
- measCondition: The total number of packets that higher-level protocols
- requested be transmitted, and which were addressed to a
- broadcast address at this sub-layer, including those that
- were discarded or not sent. This object is a 64-bit version
- of ifOutBroadcastPkts.
- Discontinuities in the value of this counter can occur at
- re-initialization of the management system, and at other
- times as indicated by the value of
- ifCounterDiscontinuityTime.
- measResultType: integer
- measResultRange: 0-4294967295
- measResultUnits: number
- measObjClass: EthernetPort
- measCollectionMethod: CC
- measLastChange: 1.0
- measChangeType: added
- measInfoId: "IP Management"
- measFamily: IP
- measAdditionalFields: {
- "measurementStatus": "USED",
- "initialValue": 0,
- "acmeParameter1": 0,
- "acmeParameter2": true,
- "acmeParameter3": "acmeParameterValue3"}
+ - measType: VS.ifHCInBroadcastPkts
+ measDescription: Number of the broadcasted inbound packets delivered to the higher (sub-)layer
+ measCondition: The number of packets, delivered by this sub-layer to a
+ higher (sub-)layer, which were addressed to a broadcast
+ address at this sub-layer. This object is a 64-bit version
+ of ifInBroadcastPkts.
+ Discontinuities in the value of this counter can occur at
+ re-initialization of the management system, and at other
+ times as indicated by the value of
+ ifCounterDiscontinuityTime.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0}
+
+ - measType: VS.ifHCOutBroadcastPkts
+ measDescription: Number of the broadcasted outsbound packets delivered to the higher (sub-)layer
+ measCondition: The total number of packets that higher-level protocols
+ requested be transmitted, and which were addressed to a
+ broadcast address at this sub-layer, including those that
+ were discarded or not sent. This object is a 64-bit version
+ of ifOutBroadcastPkts.
+ Discontinuities in the value of this counter can occur at
+ re-initialization of the management system, and at other
+ times as indicated by the value of
+ ifCounterDiscontinuityTime.
+ measResultType: integer
+ measResultRange: 0-4294967295
+ measResultUnits: number
+ measObjClass: EthernetPort
+ measCollectionMethod: CC
+ measLastChange: 1.0
+ measChangeType: added
+ measInfoId: "IP Management"
+ measFamily: IP
+ measAdditionalFields: {
+ "measurementStatus": "USED",
+ "initialValue": 0,
+ "acmeParameter1": 0,
+ "acmeParameter2": true,
+ "acmeParameter3": "acmeParameterValue3"}
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
-