ariatosca-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [03/10] incubator-ariatosca git commit: Fixed WD04, Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)
Date Mon, 05 Jun 2017 22:33:11 GMT
Fixed WD04, Rev04 (2016-11-14) and WD04, Rev05 (2017-1-17)


Project: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/commit/7d5a1573
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/tree/7d5a1573
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/diff/7d5a1573

Branch: refs/heads/ARIA-275-update-NFV-profile-to-csd04
Commit: 7d5a157361bfe52b73141c3b3bda256dc626311e
Parents: caa535e
Author: Avia Efrat <avia@gigaspaces.com>
Authored: Mon Jun 5 16:36:52 2017 +0300
Committer: Avia Efrat <avia@gigaspaces.com>
Committed: Mon Jun 5 17:09:19 2017 +0300

----------------------------------------------------------------------
 .../tosca-simple-nfv-1.0/capabilities.yaml      |  45 --------
 .../profiles/tosca-simple-nfv-1.0/data.yaml     |  75 -------------
 .../profiles/tosca-simple-nfv-1.0/nodes.yaml    | 112 +------------------
 3 files changed, 5 insertions(+), 227 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7d5a1573/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
index 6bc6b67..375ba13 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/capabilities.yaml
@@ -15,51 +15,6 @@
 
 capability_types:
 
-  tosca.capabilities.Compute.Container.Architecture:
-    _extensions:
-      shorthand_name: Compute.Container.Architecture
-      type_qualified_name: tosca:Compute.Container.Architecture
-      specification: tosca-simple-nfv-1.0
-      specification_section: 8.2.1
-      specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#DEFN_TYPE_CAPABILITIES_CONTAINER'
-    description: >-
-      Enhance compute architecture capability that needs to be typically use for performance
sensitive NFV workloads.
-    derived_from: tosca.capabilities.Container
-    properties:
-      mem_page_size:
-        description: >-
-          Describe page size of the VM:
-  
-          * small page size is typically 4KB
-          * large page size is typically 2MB
-          * any page size maps to system default
-          * custom MB value: sets TLB size to this specific value
-        type: string
-        # ARIA NOTE: seems wrong in the spec
-        #constraints:
-        #  - [ normal, huge ]
-      cpu_allocation:
-        description: >-
-          Describes CPU allocation requirements like dedicated CPUs (cpu pinning), socket
count, thread count, etc.
-        type: tosca.datatypes.compute.Container.Architecture.CPUAllocation
-        required: false
-      numa_node_count:
-        description: >-
-          Specifies the symmetric count of NUMA nodes to expose to the VM. vCPU and Memory
equally split across this number of
-          NUMA.
-  
-          NOTE: the map of numa_nodes should not be specified.
-        type: integer
-        required: false 
-      numa_nodes:
-        description: >-
-          Asymmetric allocation of vCPU and Memory across the specific NUMA nodes (CPU sockets
and memory banks).
-  
-          NOTE: symmetric numa_node_count should not be specified.
-        type: map
-        entry_schema: tosca.datatypes.compute.Container.Architecture.NUMA
-        required: false
-
   tosca.capabilities.nfv.VirtualBindable:
     _extensions:
       shorthand_name: VirtualBindable

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7d5a1573/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
index f6a07ef..cf35cba 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/data.yaml
@@ -303,78 +303,3 @@ data_types:
         entry_schema:
           type: string
         required: false
-
-  tosca.datatypes.compute.Container.Architecture.CPUAllocation:
-    _extensions:
-      shorthand_name: Container.Architecture.CPUAllocation # seems to be a mistake in the
spec; the norm is to add a "Container.Architecture." prefix
-      type_qualified_name: tosca:Container.Architecture.CPUAllocation
-      specification: tosca-simple-nfv-1.0
-      specification_section: 8.3.1
-    description: >-
-      Granular CPU allocation requirements for NFV workloads.
-    derived_from: tosca.datatypes.Root
-    properties:
-      cpu_affinity:
-        description: >-
-          Describes whether vCPU need to be pinned to dedicated CPU core or shared dynamically.
-        type: string
-        constraints:
-          - valid_values: [ shared, dedicated ]
-        required: false
-      thread_allocation:
-        description: >-
-          Describe thread allocation requirement.
-        type: string
-        constraints:
-          - valid_values: [ avoid, isolate, separate, prefer ]
-        required: false
-      socket_count:
-        description: >-
-          Number of CPU sockets.
-        type: integer
-        required: false
-      core_count:
-        description: >-
-          Number of cores per socket.
-        type: integer
-        required: false
-      thread_count:
-        description: >-
-          Number of threads per core.
-        type: integer
-        required: false
-
-  tosca.datatypes.compute.Container.Architecture.NUMA:
-    _extensions:
-      shorthand_name: Container.Architecture.NUMA # ARIA NOTE: seems to be a mistake in the
spec; the norm is to add a "Container.Architecture." prefix
-      type_qualified_name: tosca:Container.Architecture.NUMA
-      specification: tosca-simple-nfv-1.0
-      specification_section: 8.3.2
-      specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc447714697'
-    description: >-
-      Granular Non-Uniform Memory Access (NUMA) topology requirements for NFV workloads.
-    derived_from: tosca.datatypes.Root
-    properties:
-      id:
-        description: >-
-          CPU socket identifier.
-        type: integer
-        constraints:
-          - greater_or_equal: 0
-        required: false
-      vcpus:
-        description: >-
-          List of specific host cpu numbers within a NUMA socket complex.
-  
-          TODO: need a new base type, with non-overlapping, positive value validation (exclusivity),
-        type: map
-        entry_schema:
-          type: integer
-        required: false
-      mem_size:
-        description: >-
-          Size of memory allocated from this NUMA memory bank.
-        type: scalar-unit.size
-        constraints:
-          - greater_or_equal: 0 MB
-        required: false

http://git-wip-us.apache.org/repos/asf/incubator-ariatosca/blob/7d5a1573/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
----------------------------------------------------------------------
diff --git a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
index e8ab50f..d0ccadd 100644
--- a/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
+++ b/extensions/aria_extension_tosca/profiles/tosca-simple-nfv-1.0/nodes.yaml
@@ -15,36 +15,6 @@
 
 node_types:
 
-  tosca.nodes.nfv.VNF:
-    _extensions:
-      shorthand_name: VNF # ARIA NOTE: omitted in the spec
-      type_qualified_name: tosca:VNF
-      specification: tosca-simple-nfv-1.0
-      specification_section: 8.5.1
-      specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc379455076'
-    description: >-
-      The NFV VNF Node Type represents a Virtual Network Function as defined by [ETSI GS
NFV-MAN 001 v1.1.1]. It is the default
-      type that all other VNF Node Types derive from. This allows for all VNF nodes to have
a consistent set of features for
-      modeling and management (e.g., consistent definitions for requirements, capabilities
and lifecycle interfaces).
-    derived_from: tosca.nodes.Root
-    properties:
-      id:
-        description: >-
-          ID of this VNF.
-        type: string
-      vendor:
-        description: >-
-          Name of the vendor who generate this VNF.
-        type: string
-      version:
-        description: >-
-          Version of the software for this VNF.
-        type: string
-    requirements:
-      - virtual_link:
-          capability: tosca.capabilities.nfv.VirtualLinkable
-          relationship: tosca.relationships.nfv.VirtualLinksTo
-
   tosca.nodes.nfv.Cpd:
     _extensions:
       shorthand_name: Cpd
@@ -123,7 +93,11 @@ node_types:
           description: Describe the requirement for binding with VDU
           capability: tosca.capabilities.nfv.VirtualBindable
           relationship: tosca.relationships.nfv.VirtualBindsTo
-          node: tosca.nodes.nfv.VDU
+          node: tosca.nodes.nfv.VDU.Compute
+          # ARIA NOTE: the spec states "node: tosca.nodes.nfv.VDU", but this is probably
a mistake
+          # as tosca.nodes.nfv.VDU was removed, and replaced with tosca.nodes.nfv.VDU.Compute
and
+          # tosca.nodes.nfv.VDU.VirtualStorage. I choose to use tosca.nodes.nfv.VDU.Compute,
but it
+          # can be changed upon discussion.
 
   VnfVirtualLinkDesc:
     _extensions:
@@ -173,62 +147,6 @@ node_types:
       # monitoring_parameters:
         # modeled as ad hoc (named) capabilities in node template
 
-#  tosca.nodes.nfv.VDU:
-#    _extensions:
-#      shorthand_name: VDU
-#      type_qualified_name: tosca:VDU
-#      specification: tosca-simple-nfv-1.0
-#      specification_section: 8.5.2
-#      specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290242'
-#    description: >-
-#      The NFV vdu node type represents a logical vdu entity as defined by [ETSI GS NFV-MAN
001 v1.1.1].
-#    derived_from: tosca.nodes.Root
-#    capabilities:
-#      nfv_compute:
-#        type: tosca.capabilities.Compute.Container.Architecture
-#      virtual_binding:
-#        type: tosca.capabilities.nfv.VirtualBindable
-#      monitoring_parameter:
-#        type: tosca.capabilities.nfv.Metric
-
-#  tosca.nodes.nfv.CP:
-#    _extensions:
-#      shorthand_name: CP
-#      type_qualified_name: tosca:CP
-#      specification: tosca-simple-nfv-1.0
-#      specification_section: 8.5.3
-#      specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290245'
-#    description: >-
-#      The NFV CP node represents a logical connection point entity as defined by [ETSI GS
NFV-MAN 001 v1.1.1]. A connection point
-#      may be, for example, a virtual port, a virtual NIC address, a physical port, a physical
NIC address or the endpoint of an IP
-#      VPN enabling network connectivity. It is assumed that each type of connection point
will be modeled using subtypes of the CP
-#      type.
-#    derived_from: tosca.nodes.network.Port
-#    properties:
-#      type:
-#        description: >-
-#          This may be, for example, a virtual port, a virtual NIC address, a SR-IOV port,
a physical port, a physical NIC address
-#          or the endpoint of an IP VPN enabling network connectivity.
-#        type: string
-#      anti_spoofing_protection:
-#        description: >-
-#          Indicates of whether anti-spoofing rule need to be enabled for this vNIC. This
is applicable only when CP type is virtual
-#          NIC (vPort).
-#        type: boolean
-#        required: false
-#    attributes:
-#      address:
-#        description: >-
-#          The actual virtual NIC address that is been assigned when instantiating the connection
point.
-#        type: string
-#    requirements:
-#      - virtual_link:
-#          capability: tosca.capabilities.nfv.VirtualLinkable
-#          relationship: tosca.relationships.nfv.VirtualLinksTo
-#      - virtual_binding:
-#          capability: tosca.capabilities.nfv.VirtualBindable
-#          relationship: tosca.relationships.nfv.VirtualBindsTo
-
   tosca.nodes.nfv.FP:
     _extensions:
       shorthand_name: FP # ARIA NOTE: the spec must be mistaken here, says "VL"
@@ -253,26 +171,6 @@ node_types:
   # Virtual link
   #
 
-#  tosca.nodes.nfv.VL:
-#    _extensions:
-#      shorthand_name: VL
-#      type_qualified_name: tosca:VL
-#      specification: tosca-simple-nfv-1.0
-#      specification_section: 9.1
-#      specification_url: 'http://docs.oasis-open.org/tosca/tosca-nfv/v1.0/csd03/tosca-nfv-v1.0-csd03.html#_Toc419290251'
-#    description: >-
-#      The NFV VL node type represents a logical virtual link entity as defined by [ETSI
GS NFV-MAN 001 v1.1.1]. It is the default
-#      type from which all other virtual link types derive.
-#    derived_from: tosca.nodes.network.Network
-#    properties:
-#      vendor:
-#        description: >-
-#          Vendor generating this VLD.
-#        type: string
-#    capabilities:
-#      virtual_linkable:
-#        type: tosca.capabilities.nfv.VirtualLinkable
-
   tosca.nodes.nfv.VL.ELine:
     _extensions:
       shorthand_name: VL.ELine # ARIA NOTE: omitted in the spec


Mime
View raw message