R2 model updates
[sdc.git] / catalog-be / src / main / resources / import / tosca / data-types / dataTypes.yml
index 282595d..e8c27c2 100644 (file)
@@ -34,7 +34,6 @@ scalar-unit.time:
 scalar-unit.frequency:
   derived_from: scalar-unit
 
-  
 tosca.datatypes.Credential: 
   derived_from: tosca.datatypes.Root
   properties: 
@@ -218,8 +217,7 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: map
       description: Extra parameters to include in the request
       required: false
-      default: {
-        }
+      default: {}
       status: SUPPORTED
       entry_schema:
         type: string
@@ -239,8 +237,7 @@ org.openecomp.datatypes.heat.network.neutron.Subnet:
       type: list
       description: A specified set of DNS name servers to be used
       required: false
-      default: [
-        ]
+      default: []
       status: SUPPORTED
       entry_schema:
         type: string     
@@ -330,8 +327,7 @@ org.openecomp.datatypes.heat.novaServer.network.PortExtraProperties:
       type: map
       description: Extra parameters to include in the request
       required: false
-      default: {
-        }
+      default: {}
       status: SUPPORTED
       entry_schema:
         type: string
@@ -503,8 +499,7 @@ org.openecomp.datatypes.heat.network.neutron.SecurityRules.Rule:
           - IPv6
       port_range_max:
         type: integer
-        description: 'The maximum port number in the range that is matched by the
-          security group rule. '
+        description: 'The maximum port number in the range that is matched by the security group rule. '
         required: false
         status: SUPPORTED
         constraints:
@@ -1312,6 +1307,11 @@ tosca.datatypes.nfv.VirtualMemory:
       virtual_mem_oversubscription_policy:
         type: string
         required: false
+      vdu_memory_requirements:
+        type: map
+        entry_schema:
+          type: string
+        required: false
       numa_enabled:
         type: boolean
         required: false
@@ -1343,9 +1343,22 @@ tosca.datatypes.nfv.VirtualCpu:
     virtual_cpu_oversubscription_policy:
       type: string
       required: false
+    vdu_cpu_requirements:
+      type: map
+      entry_schema:
+        type: string
+      required: false
     virtual_cpu_pinning:
       type: tosca.datatypes.nfv.VirtualCpuPinning
       required: false
+tosca.datatypes.nfv.LogicalNodeData:
+  derived_from: tosca.datatypes.Root
+  properties:
+    logical_node_requirements:
+      type: map # not defined in SOL001 v.6.0
+      entry_schema:
+        type: string
+      required: false
 tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
   derived_from: tosca.datatypes.Root
   properties:  
@@ -1358,15 +1371,29 @@ tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
     support_mandatory:
       type: boolean
       required: true
-    requirement:
-      type: string      # not specified
+    network_interface_requirements:
+      type: map
+      entry_schema:
+        type: string
       required: true
-tosca.datatypes.nfv.L2AddressData:
+    nic_io_requirements:
+      type: tosca.datatypes.nfv.LogicalNodeData
+      required: false
+tosca.datatypes.nfv.injectFile: #used for vCPE usecase
   derived_from: tosca.datatypes.Root
   properties: 
-    address: 
+    source_path:
       type: string
-      required: false
+      required: true
+    dest_path:
+      type: string
+      required: true
+tosca.datatypes.nfv.L2AddressData:
+  derived_from: tosca.datatypes.Root
+  properties: 
+    mac_address_assignment: 
+      type: boolean
+      required: true
 tosca.datatypes.nfv.L3AddressData:
   derived_from: tosca.datatypes.Root
   properties: 
@@ -1384,13 +1411,16 @@ tosca.datatypes.nfv.L3AddressData:
     number_of_ip_address:
       type: integer
       required: false
-tosca.datatype.nfv.AddressData: 
+    fixed_ip_address: #used for vCPE usecase
+      type: list
+      entry_schema:
+        type: string
+      required: false
+tosca.datatypes.nfv.AddressData:
   properties: 
     address_type: 
       constraints: 
-      - valid_values: 
-        - mac_address
-        - ip_address
+      - valid_values: [mac_address, ip_address]
       type: string
     l2_address_data: 
       required: false
@@ -1405,10 +1435,12 @@ tosca.datatypes.nfv.ConnectivityType:
       type: string
       required: true
       constraints:
-        - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]   
+        - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire]
     flow_pattern: 
       type: string
       required: false
+      constraints: # not defined in IFA011 v2.4.1 and SOL001 v.6.0
+        - valid_values: [Line, Tree, Mesh]
 tosca.datatypes.nfv.VlFlavour:
   derived_from: tosca.datatypes.Root
   properties:
@@ -1473,4 +1505,233 @@ tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule:
       required: false
     affinity_antiaffinity: 
       type: string
-      required: false
\ No newline at end of file
+      required: false
+tosca.datatypes.nfv.VduProfile:
+  derived_from: tosca.datatypes.Root
+  properties:
+    min_number_of_instances:
+      type: integer
+      required: true
+    max_number_of_instances:
+      type: integer
+      required: true
+    #localAffinityOrAntiAffinityRule:  # not defined in SOL001 v.6.0
+    #  type: tosca.datatypes.nfv.LocalAffinityOrAntiAffinityRule
+    #  required: true
+    #affinityOrAntiAffinityGroupId: # not defined in SOL001 v.6.0
+    #  type: string
+    #  required: true
+    watchdog: #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: true
+    vmBootUpTimeOut: #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: integer
+      required: optional
+tosca.datatypes.nfv.LinkBitRateRequirements:
+  derived_from: tosca.datatypes.Root
+  properties:
+    root:
+      type: integer
+      required: true
+    leaf:
+      type: integer
+      required: true
+tosca.datatypes.nfv.Qos:
+  derived_from: tosca.datatypes.Root
+  properties:
+    latency:
+      type: integer #Number [ms]
+      required: true
+    packet_delay_variation:
+      type: integer #Number [ms]
+      required: true
+    packet_loss_ratio:
+      type: float #Number [0 ..1]
+      required: false
+tosca.datatypes.nfv.VlProfile:
+  derived_from: tosca.datatypes.Root
+  properties:
+    max_bit_rate_requirements:
+      type: tosca.datatypes.nfv.LinkBitRateRequirements
+      required: true
+    min_bit_rate_requirements:
+      type: tosca.datatypes.nfv.LinkBitRateRequirements
+      required: true
+    qos:
+      type: tosca.datatypes.nfv.Qos
+      required: false
+    initiationParameters: #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: map
+      entry_schema:
+        type: string
+      required: false
+    cidr: #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+    networkName:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+    startIp:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+    endIp:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+    gatewayIp:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+    segmentationId:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: integer
+      required: false
+    physicalNetwork:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+    networkType:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: string
+      required: false
+      constraints:
+        - valid_values: [VLAN, VXLAN]
+    dhcpEnabled:  # not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: boolean
+      required: false
+    vlanTransparent:  #Align with ONAP R2 IM. not defined in IFA011 v2.4.1 and SOL001 v.6.0
+      type: boolean
+      required: false
+tosca.datatypes.nfv.VduLevel:
+  derived_from: tosca.datatypes.Root
+  properties:
+    number_of_instances:
+      type: integer
+      required: true
+tosca.datatypes.nfv.ScaleInfo:
+  derived_from: tosca.datatypes.Root
+  properties:
+    scaleLevel:
+      type: integer
+      required: true
+tosca.datatypes.nfv.ScaleAspect:
+  derived_from: tosca.datatypes.Root
+  properties:
+    name:
+      type: string
+      required: true
+    description:
+      type: string
+      required: true
+    associated_group:
+      type: string #Identifier
+      required: false
+    max_scale_level:
+      type: integer #PositiveInteger
+      required: true
+tosca.datatypes.nfv.InstantiationLevel:
+  derived_from: tosca.datatypes.Root
+  properties:
+    description:
+      type: string
+      required: true
+    vdu_levels:
+      type: map # key: vduId
+      required: true
+      entry_schema:
+        type: tosca.datatypes.nfv.VduLevel
+    scale_info:
+      type: map # key: aspectId
+      required: false
+      entry_schema:
+        type: tosca.datatypes.nfv.ScaleInfo
+#tosca.datatypes.nfv.VnfInstantiateOperationConfiguration:
+#  derived_from: tosca.datatypes.Root
+  #properties:
+    #parameters:
+       #modeled as part of operation parameter list
+tosca.datatypes.nfv.VnfScaleOperationConfiguration:
+  derived_from: tosca.datatypes.Root
+  properties:
+    #parameters:
+       #modeled as part of the operation parameter list
+    scaling_by_more_than_one_step_supported:
+      type: boolean
+tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration:
+  derived_from: tosca.datatypes.Root
+  properties:
+    #parameters:
+      #modeled as part of the operation parameter list
+    arbitrary_target_levels_supported:
+      type: boolean
+tosca.datatypes.nfv.VnfHealOperationConfiguration:
+  derived_from: tosca.datatypes.Root
+  properties:
+    #parameters:
+       #modeled as part of the operation parameter list
+    causes:
+      type: list
+      entry_schema:
+        type: string
+tosca.datatypes.nfv.VnfTerminateOperationConfiguration:
+  derived_from: tosca.datatypes.Root
+  properties:
+    min_graceful_termination_timeout:
+      type: integer
+    max_recommended_graceful_termination_timeout:
+      type: integer
+tosca.datatypes.nfv.VnfOperateOperationConfiguration:
+  derived_from: tosca.datatypes.Root
+  properties:
+    min_graceful_termination_timeout:
+      type: integer
+    max_recommended_graceful_termination_timeout:
+      type: integer    
+tosca.datatypes.nfv.VnfLcmOperationsConfiguration:
+  derived_from: tosca.datatypes.Root
+  properties:
+#    instantiate:
+#      type: tosca.datatypes.nfv.VnfInstantiateOperationConfiguration
+    scale:
+      type: tosca.datatypes.nfv.VnfScaleOperationConfiguration
+    scale_to_level:
+      type: tosca.datatypes.nfv.VnfScaleToLevelOperationConfiguration
+    heal:
+      type: tosca.datatypes.nfv.VnfHealOperationConfiguration
+    terminate:
+      type: tosca.datatypes.nfv.VnfTerminateOperationConfiguration
+    operate:
+      type: tosca.datatypes.nfv.VnfOperateOperationConfiguration
+tosca.datatypes.nfv.CpProtocolData:
+  derived_from: tosca.datatypes.Root
+  properties:
+    asscociated_layer_protocol:
+      type: string
+      constraints:
+        - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo-wire ]
+      required: true
+    address_data:
+      type: tosca.datatypes.nfv.AddressData
+      required: false
+#tosca.datatypes.nfv.VnfAdditionalConfigurableProperties:
+#  derived_from: tosca.datatypes.Root
+tosca.datatypes.nfv.VnfConfigurableProperties:
+  derived_from: tosca.datatypes.Root
+  properties:
+    is_autoscale_enabled:
+      type: boolean
+      required: false
+    is_autoheal_enabled:
+      type: boolean
+      required: false
+#    additional_configurable_properties:
+#      type: tosca.datatypes.nfv.VnfAdditionalConfigurableProperties
+#      required: false
+#tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions:
+#  derived_from: tosca.datatypes.Root
+#tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata:
+#  derived_from: tosca.datatypes.Root
+#tosca.datatypes.nfv.VnfInfoModifiableAttributes:
+#  derived_from: tosca.datatypes.Root
+#  properties:
+#    extensions:
+#      type: tosca.datatypes.nfv.VnfInfoModifiableAttributesExtensions
+#      required: false
+#    metadata:
+#      type: tosca.datatypes.nfv.VnfInfoModifiableAttributesMetadata
+#      required: false