diff options
author | 2018-05-18 15:23:12 +0100 | |
---|---|---|
committer | 2018-05-27 23:13:27 +0300 | |
commit | cb72310ab92091c47502f7e3c1bf2162884dca83 (patch) | |
tree | cfd6fbf0abf585c35f16dd72380a703cbdc13e8b /catalog-be/src/main/resources/import/tosca/nfv-types | |
parent | a4d6b57e6b8babca1007680fa51fa38f2eccf536 (diff) |
R2 model updates
All model verification changes and updated in single patch.
Change-Id: Ie794dc141400490bf1a858a8d6c9d1c45e5b9443
Issue-ID: SDC-1253
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-be/src/main/resources/import/tosca/nfv-types')
18 files changed, 300 insertions, 178 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.json b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.json new file mode 100644 index 0000000000..18622eee61 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.json @@ -0,0 +1,15 @@ +{ + "payloadName": "Cp.yml", + "contactId": "jh0003", + "name": "Cp", + "description": "Cp", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["Cp"] +}
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.yml new file mode 100644 index 0000000000..9cee00aaa9 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.yml @@ -0,0 +1,31 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.Cp: + derived_from: tosca.nodes.Root + properties: + layer_protocol: + type: list + entry_schema: + type: string + constraints: + - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ] + required: true + role: #Name in ETSI NFV IFA011 v0.7.3 cpRole + type: string + constraints: + - valid_values: [ root, leaf ] + required: false + description: + type: string + required: false + protocol_data: + type: list + entry_schema: + type: tosca.datatypes.nfv.CpProtocolData + required: true + trunk_mode: + type: boolean + required: true + allowed_address_data: # Aligned with ONAP R2 Im.not defined in IFA011 v2.4.1 and SOL001 v0.6.0. + type: tosca.datatypes.nfv.AddressData #In the IM, it is a array, but here it is not a array. TBD. + required: false diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip Binary files differnew file mode 100644 index 0000000000..ac7e5e83a8 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/Cp/Cp.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.json b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.json new file mode 100644 index 0000000000..5f3baba868 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.json @@ -0,0 +1,15 @@ +{ + "payloadName": "VNF.yml", + "contactId": "jh0003", + "name": "VNF", + "description": "VNF", + "resourceIconPath": "compute", + "resourceType": "VFC", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VNF"] +}
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml new file mode 100644 index 0000000000..f0800a8de3 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.yml @@ -0,0 +1,65 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VNF: + derived_from: tosca.nodes.Root + properties: + descriptor_id: # instead of vnfd_id + type: string # GUID + required: true + descriptor_version: # instead of vnfd_version + type: string + required: true + provider: # instead of vnf_provider + type: string + required: true + product_name: # instead of vnf_product_name + type: string + required: true + software_version: # instead of vnf_software_version + type: string + required: true + product_info_name: # instead of vnf_product_info_name + type: string + required: false + product_info_description: # instead of vnf_product_info_description + type: string + required: false + vnfm_info: + type: list + entry_schema: + type: string + required: true + localization_languages: + type: list + entry_schema: + type: string + required: false + default_localization_language: + type: string + required: false + configurable_properties: + type: tosca.datatypes.nfv.VnfConfigurableProperties + required: false +# modifiable_attributes: +# type: tosca.datatypes.nfv.VnfInfoModifiableAttributes +# required: false # true in IFA011, but all of members are false. Align with the IM, it is false + flavour_id: + type: string + required: true + flavour_description: + type: string + required: true + capabilities: + # monitoring_parameter: + # modelled as ad hoc capabilities in the VNF node template + requirements: + - virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + node: tosca.nodes.nfv.VnfVirtualLink + occurrences: + - 0 + - UNBOUNDED + interfaces: + Nfv: + type: tosca.interfaces.node.lifecycle.Standard diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip Binary files differnew file mode 100644 index 0000000000..1c3b7a8b4f --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/VNF/VNF.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml index a1c4b486b6..37e4c5edb1 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.yml @@ -1,96 +1,65 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: - tosca.nodes.nfv.VDU.Compute: - derived_from: tosca.nodes.Root - properties: - configurable_properties: - type: map - required: true - status: SUPPORTED - entry_schema: - type: tosca.datatypes.nfv.VnfcConfigurableProperties - name: - type: string - required: true - status: SUPPORTED - nfvi_constraints: - type: list - required: false - status: SUPPORTED - entry_schema: + tosca.nodes.nfv.Vdu.Compute: + derived_from: tosca.nodes.Root + properties: + name: type: string - descrption: - type: string - required: true - status: SUPPORTED - boot_order: - type: list - required: false - status: SUPPORTED - entry_schema: + required: true + description: type: string - attributes: - private_address: - type: string - status: SUPPORTED - public_address: - type: string - status: SUPPORTED - networks: - type: string - status: SUPPORTED - ports: - type: string - status: SUPPORTED - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - occurrences: - - 0 - - UNBOUNDED - - virtual_storage: - capability: tosca.capabilities.nfv.VirtualStorage - occurrences: - - 0 - - UNBOUNDED - capabilities: - scalable: - type: tosca.capabilities.Scalable - occurrences: - - 1 - - UNBOUNDED - virtual_compute: - type: tosca.capabilities.nfv.VirtualCompute - occurrences: - - 1 - - UNBOUNDED - endpoint: - type: tosca.capabilities.Endpoint.Admin - occurrences: - - 1 - - UNBOUNDED - os: - type: tosca.capabilities.OperatingSystem - occurrences: - - 1 - - UNBOUNDED - virtual_binding: - type: tosca.capabilities.nfv.VirtualBindable - occurrences: - - 1 - - UNBOUNDED - host: - type: tosca.capabilities.Container - occurrences: - - 1 - - UNBOUNDED - binding: - type: tosca.capabilities.network.Bindable - occurrences: - - 1 - - UNBOUNDED - monitoring_parameter: - type: tosca.capabilities.nfv.Metric - occurrences: - - 1 - - UNBOUNDED
\ No newline at end of file + required: true + boot_order: + type: map + entry_schema: + type: string + required: false + nfvi_constraints: + type: map # Align with IM, it shoul be a array of KeyValuePair/NameValuePair + entry_schema: + type: string + required: false + configurable_properties: + type: map #In the IM, the multipilicity of VnfcConfigurableProperties is 1, not a map. + entry_schema: + type: tosca.datatypes.nfv.VnfcConfigurableProperties + required: true + vdu_profile: + type: tosca.datatypes.nfv.VduProfile + required: true + inject_files: # Used for vCPE usecase Aligned with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v0.6.0. + type: tosca.datatypes.nfv.injectFile + required: false #Aligned with ONAP R2 IM. it should be false. + meta_data: #metadata attached to the VM or container + type: map + entry_schema: + type: string + required: false + user_data: #cloudinit userdata script support + type: string + required: false + capabilities: + virtual_compute: + type: tosca.capabilities.nfv.VirtualCompute + virtual_binding: + type: tosca.capabilities.nfv.VirtualBindable + occurrences: + - 1 + - UNBOUNDED + monitoring_parameter: + type: tosca.capabilities.nfv.Metric + occurrences: + - 0 + - UNBOUNDED + requirements: + - virtual_storage: + capability: tosca.capabilities.nfv.VirtualStorage + relationship: tosca.relationships.nfv.Vdu.AttachedTo + node: tosca.nodes.nfv.VDU.VirtualStorage + occurences: + - 0 + - UNBOUNDED + artifacts: + - sw_image: + file: + type: tosca.artifacts.nfv.SwImage
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip Binary files differindex 311062658f..e8d3d303be 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCompute/vduCompute.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.json index f8d2254472..aec330495d 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.json +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.json @@ -1,8 +1,8 @@ { - "payloadName": "vduCpd.yml", + "payloadName": "vduCp.yml", "contactId": "jh0003", - "name": "VDU Cpd", - "description": "VDU Cpd", + "name": "VDU Cp", + "description": "VDU Cp", "resourceIconPath": "port", "resourceType": "CP", "categories": [{ @@ -11,5 +11,5 @@ "name": "Network Elements" }] }], - "tags": ["VDU Cpd"] + "tags": ["VDU Cp"] }
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml new file mode 100644 index 0000000000..1c461681a2 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.yml @@ -0,0 +1,39 @@ +#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!! +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VduCp: + derived_from: tosca.nodes.nfv.Cp + properties: + bitrate_requirement: + type: integer + required: false + vnic_name: # Aligned with ONAP R2 Im.not defined in IFA011 v2.4.1 and SOL001 v0.6.0. + type: string + required: false + vnic_order: # Aligned with ONAP R2 Im. not defined in IFA011 v2.4.1 and SOL001 v0.6.0. + type: integer + required: false + vnic_type: # Aligned with ONAP R2 Im. not defined in IFA011 v2.4.1 and SOL001 v0.6.0 + type: string + constraints: + - valid_values: [normal, macvtap, direct, baremetal, direct-physical, virtio-forwarder] + required: false + virtual_network_interface_requirements: + type: list + entry_schema: + type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements + required: false + # order: #there is no this attribute in IM. + # type: integer + # required: false + # constraints: + # - greater_or_equal: 0 + requirements: + - virtual_link: + capability: tosca.capabilities.nfv.VirtualLinkable + relationship: tosca.relationships.nfv.VirtualLinksTo + node: tosca.nodes.nfv.VnfVirtualLink + - virtual_binding: + capability: tosca.capabilities.nfv.VirtualBindable + relationship: tosca.relationships.nfv.VirtualBindsTo + node: tosca.nodes.nfv.Vdu.Compute diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip Binary files differnew file mode 100644 index 0000000000..c5a43abf5b --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCp/vduCp.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml deleted file mode 100644 index 673e923182..0000000000 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.yml +++ /dev/null @@ -1,57 +0,0 @@ -#NOT SPEC COMPLAINT!!!!!!!!!!!!!!!!!!!!!! -tosca_definitions_version: tosca_simple_yaml_1_0_0 -node_types: - tosca.nodes.nfv.VduCpd: - derived_from: tosca.nodes.Root - properties: - virtual_network_interface_requirements: - type: list - required: false - status: SUPPORTED - entry_schema: - type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements - role: - type: string - required: false - status: SUPPORTED - constraints: - - valid_values: - - root - - leaf - bitrate_requirement: - type: integer - required: false - status: SUPPORTED - description: - type: string - required: false - status: SUPPORTED - layer_protocol: - type: string - required: true - status: SUPPORTED - constraints: - - valid_values: - - ethernet - - mpls - - odu2 - - ipv4 - - ipv6 - - pseudo_wire - address_data: - type: list - required: false - status: SUPPORTED - entry_schema: - type: tosca.datatype.nfv.AddressData - requirements: - - virtual_binding: - capability: tosca.capabilities.nfv.VirtualBindable - occurrences: - - 0 - - UNBOUNDED - - virtual_link: - capability: tosca.capabilities.nfv.VirtualLinkable - occurrences: - - 0 - - UNBOUNDED
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip Binary files differdeleted file mode 100644 index e1bb32dd23..0000000000 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduCpd/vduCpd.zip +++ /dev/null diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml index 5d22e1e6d4..12fb306c16 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.yml @@ -1,27 +1,30 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0 node_types: - tosca.nodes.nfv.VDU.VirtualStorage: - derived_from: tosca.nodes.Root - properties: - id: - type: string - required: true - status: SUPPORTED - size_of_storage: - type: string - required: true - status: SUPPORTED - rdma_enabled: - type: boolean - required: false - status: SUPPORTED - type_of_storage: - type: string - required: true - status: SUPPORTED - capabilities: - virtual_storage: - type: tosca.capabilities.nfv.VirtualStorage - occurrences: - - 1 - - UNBOUNDED + tosca.nodes.nfv.Vdu.VirtualStorage: + derived_from: tosca.nodes.Root + properties: + #id: + # node name + type_of_storage: + type: string + constraints: + - valid_values: [volume, object, root, block] + required: true + size_of_storage: + type: scalar-unit.size + required: true + vdu_storage_requirements: + type: map + entry_schema: + type: string + required: false + rdma_enabled: + type: boolean + required: false + capabilities: + virtual_storage: + type: tosca.capabilities.nfv.VirtualStorage + artifacts: + - sw_image: + file: + type: tosca.artifacts.Deployment.Image diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip Binary files differindex fb92ab45d9..49849c9f28 100644 --- a/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vduVirtualStorage/vduVirtualStorage.zip diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.json b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.json new file mode 100644 index 0000000000..95a899191a --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.json @@ -0,0 +1,15 @@ +{ + "payloadName": "vnfVirtualLink.yml", + "contactId": "jh0003", + "name": "VnfVirtualLink", + "description": "VnfVirtualLink", + "resourceIconPath": "network", + "resourceType": "VL", + "categories": [{ + "name": "Generic", + "subcategories": [{ + "name": "Infrastructure" + }] + }], + "tags": ["VnfVirtualLink"] +}
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.yml b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.yml new file mode 100644 index 0000000000..dae0162435 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.yml @@ -0,0 +1,27 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + tosca.nodes.nfv.VnfVirtualLink: + derived_from: tosca.nodes.Root + properties: + connectivity_type: + type: tosca.datatypes.nfv.ConnectivityType + required: true + description: + type: string + required: false + test_access: + type: list + entry_schema: + type: string + required: false + vl_profile: + type: tosca.datatypes.nfv.VlProfile + required: true + capabilities: + monitoring_parameter: # this is not a very clear data structure enough to be coded, suggest to be annotated. + type: tosca.capabilities.nfv.Metric + occurrences: + - 0 + - UNBOUNDED + virtual_linkable: + type: tosca.capabilities.nfv.VirtualLinkable
\ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip Binary files differnew file mode 100644 index 0000000000..1860e64639 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/nfv-types/vnfVirtualLink/vnfVirtualLink.zip |