add new global types

add global types needed for volte use case

Change-Id: I5613bbc942cb71f59168eee2a8386163a58446fe
Issue-ID: SDC-192
Signed-off-by: Michael Lando <ml636r@att.com>

2 files changed, 204 insertions, 4 deletions

diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
index ba7a7a0cfd..43debe6291 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml
@@ -849,7 +849,7 @@ org.openecomp.datatypes.Root:
   properties:
     supplemental_data:
       type: map
-      required: false
+      required: true
       entry_schema:
         description: > 
            A placeholder for missing properties that would be included in future ecomp model versions.
@@ -1240,9 +1240,6 @@ org.openecomp.datatypes.flavors.DeploymentFlavor:
       license_flavor:
         type: org.openecomp.datatypes.flavors.LicenseFlavor
         required: false
-
-
-
 org.openecomp.datatypes.ImageInfo:
   derived_from: tosca.datatypes.Root
   properties:
@@ -1257,3 +1254,206 @@ org.openecomp.datatypes.ImageInfo:
         type: string
         required: false
         default: md5
+#onap 
+tosca.datatypes.nfv.VnfcConfigurableProperties:
+  derived_from: tosca.datatypes.Root
+  properties:
+    additional_vnfc_configurable_properties:
+      type: map
+      entry_schema:
+        type: string
+      required: false
+tosca.datatypes.nfv.RequestedAdditionalCapability:
+  derived_from: tosca.datatypes.Root
+  properties:
+    #name:
+      # key of containing map
+    support_mandatory:
+      type: boolean
+      required: true
+    min_requested_additional_capability_version:
+      type: string
+      required: false
+    preferred_requested_additional_capability_version:
+      type: string
+      required: false
+    requested_additional_capability_name:
+      type: string
+      required: true
+    target_performance_parameters:
+      type: map
+      entry_schema:
+        type: string
+      required: true
+tosca.datatypes.nfv.VirtualMemory:
+    derived_from: tosca.datatypes.Root
+    properties:
+        # Number
+      virtual_mem_size:
+        type: scalar-unit.size
+        required: true
+      virtual_mem_oversubscription_policy:
+        type: string
+        required: false
+      numa_enabled:
+        type: boolean
+        required: false
+tosca.datatypes.nfv.VirtualCpuPinning:
+  derived_from: tosca.datatypes.Root
+  properties:
+    cpu_pinning_policy:
+      type: string # CpuPinningPolicy
+      constraints:
+        - valid_values: [ static, dynamic ]
+      required: false
+    cpu_pinning_map:
+      type: map
+      entry_schema:
+        type: string
+      required: false
+tosca.datatypes.nfv.VirtualCpu:
+  derived_from: tosca.datatypes.Root
+  properties:
+    cpu_architecture:
+      type: string
+      required: false
+    num_virtual_cpu:
+      type: integer
+      required: true
+    virtual_cpu_clock:
+      type: scalar-unit.frequency
+      required: false
+    virtual_cpu_oversubscription_policy:
+      type: string
+      required: false
+    virtual_cpu_pinning:
+      type: tosca.datatypes.nfv.VirtualCpuPinning
+      required: false
+tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements:
+  derived_from: tosca.datatypes.Root
+  properties:  
+    name: 
+      type: string
+      required: false    
+    description: 
+      type: string
+      required: false
+    support_mandatory:
+      type: boolean
+      required: true
+    requirement:
+      type: string      # not specified
+      required: true
+tosca.datatypes.nfv.L2AddressData:
+  derived_from: tosca.datatypes.Root
+  properties: 
+    address: 
+      type: string
+      required: false
+tosca.datatypes.nfv.L3AddressData:
+  derived_from: tosca.datatypes.Root
+  properties: 
+    ip_address_assignment: 
+      type: boolean
+      required: true
+    floating_ip_activated: 
+      type: boolean
+      required: true
+    ip_address_type:
+      type: string
+      required: false
+      constraints:
+        - valid_values: [ipv4, ipv6]
+    number_of_ip_address:
+      type: integer
+      required: false
+tosca.datatype.nfv.AddressData: 
+  properties: 
+    address_type: 
+      constraints: 
+      - valid_values: 
+        - mac_address
+        - ip_address
+      type: string
+    l2_address_data: 
+      required: false
+      type: tosca.datatypes.nfv.L2AddressData
+    l3_address_data: 
+      required: false
+      type: tosca.datatypes.nfv.L3AddressData
+tosca.datatypes.nfv.ConnectivityType:
+  derived_from: tosca.datatypes.Root
+  properties:  
+    layer_protocol: 
+      type: string
+      required: true
+      constraints:
+        - valid_values: [ethernet, mpls, odu2, ipv4, ipv6, pseudo_wire ]   
+    flow_pattern: 
+      type: string
+      required: false
+tosca.datatypes.nfv.VlFlavour:
+  derived_from: tosca.datatypes.Root
+  properties:
+    flavourId:
+      type: string
+tosca.datatypes.nfv.ext.AddressPairs: 
+  properties: 
+    ip: 
+      type: string
+      required: false
+    mac: 
+      type: string
+      required: false
+tosca.datatypes.nfv.ext.FloatingIP: 
+  properties: 
+    external_network: 
+      type: string
+      required: false
+    ip_address: 
+      type: string
+      required: false
+tosca.datatypes.nfv.ext.LocationInfo: 
+  properties: 
+    availability_zone: 
+      type: string
+      required: false
+    vimid: 
+      type: integer
+      required: false
+    tenant: 
+      type: string
+      required: false
+tosca.datatypes.nfv.ext.HostRouteInfo: 
+  properties: 
+    destination: 
+      type: string
+      required: false
+    nexthop: 
+      type: string
+      required: false
+      
+tosca.datatypes.nfv.ext.InjectData: 
+  properties: 
+    file_name: 
+      type: string
+      required: false
+    file_data: 
+      type: string
+      required: false
+tosca.datatypes.nfv.ext.zte.WatchDog: 
+  properties: 
+    enable_delay: 
+      type: integer
+      required: false
+    action: 
+      type: string
+      required: false
+tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule: 
+  properties: 
+    scope: 
+      type: string
+      required: false
+    affinity_antiaffinity: 
+      type: string
+      required: false
\ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
index c97ea2caa0..506a58f4b1 100644
--- a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip