You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ariatosca.apache.org by AviaE <gi...@git.apache.org> on 2017/06/05 22:35:18 UTC
[GitHub] incubator-ariatosca pull request #147: ARIA 275 Update nfv profile to csd04
GitHub user AviaE opened a pull request:
https://github.com/apache/incubator-ariatosca/pull/147
ARIA 275 Update nfv profile to csd04
You can merge this pull request into a Git repository by running:
$ git pull https://github.com/apache/incubator-ariatosca ARIA-275-update-NFV-profile-to-csd04
Alternatively you can review and apply these changes as the patch at:
https://github.com/apache/incubator-ariatosca/pull/147.patch
To close this pull request, make a commit to your master/trunk branch
with (at least) the following in the commit message:
This closes #147
----
commit 5660d5181d4db234d0c5aa79b2ff6ce965fd1a3a
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-04T19:11:10Z
Fixed WD03, Rev01 (2016-7-29)
Also fixed a typo that repeated itself.
commit caa535e515c7e1e27c32be6e3341f0e3c0163284
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T13:21:19Z
Fixed WD04, Rev02 (2016-9-6) and WD04, Rev03 (2016-11-7)
commit 7d5a157361bfe52b73141c3b3bda256dc626311e
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T13:36:52Z
Fixed WD04, Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)
commit bd577f5935760f77b546c0bb2f4a9c436e3dc183
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T21:30:13Z
Add tosca.nodes.nfv.VDU.Compute and tosca.nodes.nfv.VDU.VirtualStorage
commit 49373efa0361e4354f64ffd08a84adab76f73e04
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T21:39:54Z
Add tosca.capabilites.nfv.VirtualCompute
commit fba9d3123621af808c885091dcd32dbddae6248b
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T21:45:31Z
Remove tosca.nodes.nfv.FP, as it does not appear in csd04
commit 636244cac33590baf17edf1efa6e6b1de4f5168e
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T21:50:47Z
Removed the virtual link (VL) node types, as they do not appear in csd04
commit 1d855472b9181a86b92aafa7ccbd899660c2a269
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T22:05:13Z
remove two relationship types
- tosca.relationships.nfv.ForwardsTo
- tosca.relationships.nfv.VirtualLinksTo
They are not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
The second relationship was a part of the NSD model.
The first relationship was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.
commit d42ebb1c13fffa35e69a6b34ccd7605c267db8b3
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T22:26:08Z
Remove two capability types
- tosca.capabilities.nfv.Forwarder
- tosca.capabilities.nfv.VirtualLinkable
They are not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
The second capability was a part of the NSD model.
The first capability was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.
commit ee2a16e61446ac3f61f7679181d3ef6f55b98fd9
Author: Avia Efrat <av...@gigaspaces.com>
Date: 2017-06-05T22:30:48Z
Remove tosca.groups.nfv.VNFFG
It is not present in csd04.
The changelog at the end of csd04 states:
"Deleted NSD related content, v1.0 will only cover VNFD model."
tosca.groups.nfv.VNFFG was a part of the VNFFGD model, which probably
also got deleted, since it is not the VNFD model.
----
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-ariatosca pull request #147: ARIA-275 Update nfv profile to csd04
Posted by asfgit <gi...@git.apache.org>.
Github user asfgit closed the pull request at:
https://github.com/apache/incubator-ariatosca/pull/147
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---
[GitHub] incubator-ariatosca pull request #147: ARIA-275 Update nfv profile to csd04
Posted by AviaE <gi...@git.apache.org>.
Github user AviaE commented on a diff in the pull request:
https://github.com/apache/incubator-ariatosca/pull/147#discussion_r121486606
--- Diff: extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml ---
@@ -83,100 +86,37 @@ node_types:
type: tosca.datatypes.network.PortInfo
status: deprecated
capabilities:
- # ARIA NOTE: I commented out the virtual_storage capability as tosca.capabilities.nfv.VirtualStorage
- # does not exist in csd04. csd04 even states:
- # "Editor Note: Need to create tosca.capabilities.nfv.VirtualStorage capability type."
virtual_compute:
- description: Describes virtual compute resources capabilities.
+ description: >-
+ Describes virtual compute resources capabilities.
type: tosca.capabilities.nfv.VirtualCompute
virtual_binding:
- description: Defines ability of VirtualBindable
+ description: >-
+ Defines ability of VirtualBindable.
type: tosca.capabilities.nfv.VirtualBindable
-
- # ARIA NOTE: the "monitoring_parameter" capability is already commented out in the spec, and
- # is copied here verbatim from section [5.9.2.5 Definition].
- # However, in section [5.9.2.4 Capabilities], the type of this capability is
- # tosca.capabilities.nfv.Metric, and it also has a description.
- # In addition, the spec might be wrong here regarding the name of this capability, since a
- # very similar capability exists in section [5.9.6 tosca.nodes.nfv.VnfVirtualLinkDesc] and is
- # named "monitoring_parameters" (as opposed to "monitoring_parameter" in here)
-
- #monitoring_parameter:
- # modeled as ad hoc (named) capabilities in VDU node template
- # for example:
- #capabilities:
- # cpu_load: tosca.capabilities.nfv.Metric
- # memory_usage: tosca.capabilities.nfv.Metric
-
- # ARIA NOTE: The capabilities 'host', 'endpoint', 'os', 'scalable', 'binding' are only
- # described in section [5.9.2.5 Definition], but are not mentioned in section
- # [5.9.2.4 Capabilities] they are inherited from tosca.nodes.Compute.
-
- host: #Editor note: FFS. How this capabilities should be used in NFV Profile
- type: tosca.capabilities.Container
- valid_source_types: [tosca.nodes.SoftwareComponent]
- occurrences: [ 0, UNBOUNDED ]
- endpoint:
- # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one.
- # In addition, I commented out the 'occurrences' field since its value is not valid. I'm
- # guessing it was just csd04's way of saying that this requirement is deprecated. But I'm not
- # sure if this is the best way to do it.
- type: tosca.capabilities.Endpoint.Admin
- # occurrences: [ 0, 0 ]
- os:
- # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one.
- # In addition I commented out the 'occurrences' field since its value is not valid. I'm
- # guessing it was just csd04's way of saying that this requirement is deprecated. But I'm not
- # sure if this is the best way to do it.
- type: tosca.capabilities.OperatingSystem
- # occurrences: [ 0, 0 ]
- scalable: #Editor note: FFS. How this capabilities should be used in NFV Profile
- type: tosca.capabilities.Scalable
- binding:
- # ARIA NOTE: lacks type in contrast with the TOSCA spec, so I added one.
- type: tosca.capabilities.network.Bindable
- occurrences: [ 0, UNBOUNDED ]
- requirements:
- # ARIA NOTE: I commented out the virtual_storage requirement as both
- # tosca.capabilities.nfv.VirtualStorage and tosca.relationships.nfv.VDU.AttachedTo
- # do not exist in csd04.
-# - virtual_storage:
-# capability: tosca.capabilities.nfv.VirtualStorage
-# relationship: tosca.relationships.nfv.VDU.AttachedTo
-# node: tosca.nodes.nfv.VDU.VirtualStorage
-# occurrences: [ 0, UNBOUNDED ]
- - local_storage: #For NFV Profile, this requirement is deprecated.
- # ARIA NOTE: I added 'capability', 'node' and 'relationship' fields to to this requirement
- # to make it valid TOSCA, even though it is 'deprecated' according to csd04.
- # In Addition, I commented out the 'occurrences' field since its value is not valid. I'm
- # guessing it was just csd04's way of saying that this requirement is deprecated. But I'm
- # not sure if this is the best way to do it.
- capability: tosca.capabilities.Attachment
- node: tosca.nodes.BlockStorage
- relationship: tosca.relationships.AttachesTo
- # occurrences: [ 0,0 ]
+ monitoring_parameter:
+ # ARIA NOTE: commented out in 5.9.2.5
+ description: >-
+ Monitoring parameter, which can be tracked for a VNFC based on this VDU. Examples include:
+ memory-consumption, CPU-utilisation, bandwidth-consumption, VNFC downtime, etc.
+ type: tosca.capabilities.nfv.Metric
+ #requirements:
+ # ARIA NOTE: virtual_storage is TBD
+
+ # ARIA NOTE: csd04 attempts to deprecate the inherited local_storage requirement, but this
+ # is not possible in TOSCA
artifacts:
- # ARIA NOTE: in csd04 the artifacts are described as a list, but in TOSCA they are defined as a
- # map
sw_image:
description: >-
Describes the software image which is directly loaded on the virtualization container
realizing this virtual storage.
file: # ARIA NOTE: missing value even though it is required in TOSCA
--- End diff --
change to `file: ''`
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastructure@apache.org or file a JIRA ticket
with INFRA.
---