diff options
Diffstat (limited to 'common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp')
4 files changed, 4 insertions, 813 deletions
diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml index 9f0977868e..18ea9bc3c6 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/capabilities.yml @@ -99,58 +99,8 @@ capability_types: type: string status: SUPPORTED - tosca.capabilities.nfv.VirtualLinkable: - derived_from: tosca.capabilities.Root - - tosca.capabilities.nfv.Metric: - derived_from: tosca.capabilities.Root - - tosca.capabilities.nfv.VirtualBindable: - derived_from: tosca.capabilities.Root - - tosca.capabilities.nfv.VirtualCompute: - derived_from: tosca.capabilities.Root - properties: - virtual_memory: - type: tosca.datatypes.nfv.VirtualMemory - requested_additional_capabilities: - entry_schema: - type: tosca.datatypes.nfv.RequestedAdditionalCapability - required: false - type: map - virtual_cpu: - type: tosca.datatypes.nfv.VirtualCpu - - - tosca.capabilities.nfv.VirtualStorage: - derived_from: tosca.capabilities.Root - - tosca.capabilities.nfv.Forwarder: - derived_from: tosca.capabilities.Root - org.openecomp.capabilities.Forwarder: derived_from: tosca.capabilities.Root - - tosca.capabilities.nfv.ext.Compute.Container.Architecture: - derived_from: tosca.capabilities.Root - properties: - num_cpus: - required: false - type: string - flavor_extra_specs: - entry_schema: - type: string - required: false - type: map - mem_size: - required: false - type: string - - tosca.capabilities.nfv.ext.ImageFile: - derived_from: tosca.capabilities.Root - - tosca.capabilities.nfv.ext.LocalAttachment: - derived_from: tosca.capabilities.Root # New capability types for Port Mirroring org.openecomp.capabilities.PortMirroring: derived_from: tosca.capabilities.Root diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml index c395675ddb..526a80113a 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/data.yml @@ -498,16 +498,16 @@ data_types: org.openecomp.datatypes.flavors.DeploymentFlavor: properties: sp_part_number: - type: string # under discussion; need confirmation + type: string description: Part number of the feature group associated with the deployment flavor vendor_info: - type: org.opencomp.datatypes.flavors.VendorInfo + type: org.openecomp.datatypes.flavors.VendorInfo description: Vendor information for the deployment flavor compute_flavor: - type: org.opencomp.datatypes.flavors.ComputeFlavor + type: org.openecomp.datatypes.flavors.ComputeFlavor description: Compute information for the deployment flavor license_flavor: - type: org.opencomp.datatypes.flavors.LicenseFlavor + type: org.openecomp.datatypes.flavors.LicenseFlavor description: License information for the deployment flavor required: false @@ -567,76 +567,6 @@ data_types: pps_capacity: type: string - tosca.datatypes.nfv.RequestedAdditionalCapability: - derived_from: tosca.datatypes.Root - properties: - 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: - virtual_mem_size: - type: string - required: true - virtual_mem_oversubscription_policy: - type: string - required: false - numa_enabled: - type: boolean - 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.VirtualCpuPinning: - derived_from: tosca.datatypes.Root - properties: - cpu_pinning_policy: - type: string - constraints: - - valid_values: [ static, dynamic ] - required: false - cpu_pinning_map: - type: map - entry_schema: - type: string - required: false - tosca.datatypes.nfv.VnfcConfigurableProperties: - properties: - additional_vnfc_configurable_properties: - entry_schema: - type: string - required: false - type: map tosca.datatypes.network.NetworkInfo: properties: network_id: @@ -669,122 +599,3 @@ data_types: port_id: required: false type: string - tosca.datatypes.nfv.L3AddressData: - properties: - number_of_ip_address: - required: false - type: integer - ip_address_assignment: - type: boolean - ip_address_type: - constraints: - - valid_values: - - ipv4 - - ipv6 - required: false - type: string - floating_ip_activated: - type: string - tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements: - properties: - name: - required: false - type: string - support_mandatory: - type: boolean - description: - required: false - type: string - requirement: - entry_schema: - type: string - type: map - 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.L2AddressData: {} - tosca.datatypes.nfv.ConnectivityType: - properties: - layer_protocol: - constraints: - - valid_values: - - ethernet - - mpls - - odu2 - - ipv4 - - ipv6 - - pseudo_wire - type: string - flow_pattern: - required: false - type: string - tosca.datatypes.nfv.ext.FloatingIP: - properties: - external_network: - required: false - type: string - ip_address: - required: false - type: string - tosca.datatypes.nfv.ext.AddressPairs: - properties: - ip: - required: false - type: string - mac: - required: false - type: string - tosca.datatypes.nfv.ext.InjectData: - properties: - file_name: - required: false - type: string - file_data: - required: false - type: string - tosca.datatypes.nfv.ext.zte.WatchDog: - properties: - enable_delay: - required: false - type: integer - action: - required: false - type: string - tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule: - properties: - scope: - required: false - type: string - affinity_antiaffinity: - required: false - type: string - tosca.datatypes.nfv.ext.LocationInfo: - properties: - availability_zone: - required: false - type: string - vimid: - required: false - type: integer - tenant: - required: false - type: string - tosca.datatypes.nfv.ext.HostRouteInfo: - properties: - destination: - required: false - type: string - nexthop: - required: false - type: string
\ No newline at end of file diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml index 04972ca017..e4fed62ea5 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/nodes.yml @@ -788,563 +788,6 @@ node_types: type: string description: fq_name status: SUPPORTED - tosca.nodes.nfv.NS.vEPC_NS: - derived_from: tosca.nodes.nfv.NS - properties: - vendor: - default: ChinaMobile - required: false - type: string - csarVersion: - default: v1.0 - required: false - type: string - name: - default: vEPC_NS - required: false - type: string - csarProvider: - default: ChinaMobile - required: false - type: string - id: - default: vEPC_NS - required: false - type: string - version: - default: v1.0 - required: false - type: string - csarType: - default: NSAR - required: false - type: string - requirements: - - virtualLink: - capability: tosca.capabilities.nfv.VirtualLinkable - occurrences: - - 0 - - UNBOUNDED - - tosca.nodes.nfv.NS.vIMS_NS: - derived_from: tosca.nodes.nfv.NS - properties: - vendor: - default: ChinaMobile - required: false - type: string - csarVersion: - default: v1.0 - required: false - type: string - name: - default: vIMS_NS - required: false - type: string - csarProvider: - default: ChinaMobile - required: false - type: string - id: - default: vIMS_NS - required: false - type: string - version: - default: v1.0 - required: false - type: string - csarType: - default: NSAR - required: false - type: string - requirements: - - virtualLink: - capability: tosca.capabilities.nfv.VirtualLinkable - occurrences: - - 0 - - UNBOUNDED - - tosca.nodes.nfv.NS: - derived_from: tosca.nodes.Root - properties: - vendor: - required: false - type: string - name: - required: false - type: string - id: - required: false - type: string - version: - required: false - type: string - requirements: - - virtualLink: - capability: tosca.capabilities.nfv.VirtualLinkable - occurrences: - - 0 - - UNBOUNDED - - tosca.nodes.nfv.VDU.Compute: - attributes: - private_address: - type: string - public_address: - type: string - networks: - type: string - ports: - type: string - capabilities: - scalable: - type: tosca.capabilities.Scalable - virtual_compute: - type: tosca.capabilities.nfv.VirtualCompute - endpoint: - type: tosca.capabilities.Endpoint.Admin - os: - type: tosca.capabilities.OperatingSystem - virtual_binding: - type: tosca.capabilities.nfv.VirtualBindable - host: - type: tosca.capabilities.Container - binding: - type: tosca.capabilities.network.Bindable - monitoring_parameter: - type: tosca.capabilities.nfv.Metric - derived_from: tosca.nodes.Root - properties: - configurable_properties: - entry_schema: - type: tosca.datatypes.nfv.VnfcConfigurableProperties - type: map - name: - type: string - nfvi_constraints: - entry_schema: - type: string - required: false - type: list - descrption: - type: string - boot_order: - entry_schema: - type: string - required: false - type: list - requirements: - - local_storage: - capability: tosca.capabilities.Attachment - occurrences: - - 0 - - UNBOUNDED - - virtual_storage: - capability: tosca.capabilities.nfv.VirtualStorage - occurrences: - - 0 - - UNBOUNDED - - tosca.nodes.nfv.VDU.VirtualStorage: - capabilities: - virtual_storage: - type: tosca.capabilities.nfv.VirtualStorage - derived_from: tosca.nodes.Root - properties: - id: - type: string - size_of_storage: - type: string - rdma_enabled: - required: false - type: boolean - type_of_storage: - type: string - - tosca.nodes.nfv.VduCpd: - derived_from: tosca.nodes.Root - properties: - virtual_network_interface_requirements: - entry_schema: - type: tosca.datatypes.nfv.VirtualNetworkInterfaceRequirements - required: false - type: list - role: - constraints: - - valid_values: - - root - - leaf - required: false - type: string - bitrate_requirement: - required: false - type: integer - description: - required: false - type: string - layer_protocol: - constraints: - - valid_values: - - ethernet - - mpls - - odu2 - - ipv4 - - ipv6 - - pseudo_wire - type: string - address_data: - entry_schema: - type: tosca.datatype.nfv.AddressData - required: false - type: list - requirements: - - virtual_binding: - capability: tosca.capabilities.nfv.VirtualBindable - occurrences: - - 0 - - UNBOUNDED - - virtual_link: - capability: tosca.capabilities.nfv.VirtualBindable - occurrences: - - 0 - - UNBOUNDED - tosca.nodes.nfv.ext.ImageFile: - capabilities: - guest_os: - type: tosca.capabilities.nfv.ext.GuestOs - image_fle: - type: tosca.capabilities.nfv.ext.ImageFile - derived_from: tosca.nodes.Root - properties: - file_url: - required: false - type: string - container_type: - required: false - type: string - name: - required: false - type: string - disk_format: - required: false - type: string - version: - required: false - type: string - tosca.nodes.nfv.ext.LocalStorage: - capabilities: - local_attachment: - type: tosca.capabilities.nfv.ext.LocalAttachment - derived_from: tosca.nodes.Root - properties: - size: - required: false - type: string - disk_type: - required: false - type: string - tosca.nodes.nfv.ext.zte.CP: - capabilities: - forwarder: - type: tosca.capabilities.nfv.Forwarder - derived_from: tosca.nodes.Root - properties: - guest_os_mtu: - required: false - type: integer - bandwidth: - required: false - type: integer - interface_name: - required: false - type: string - allowed_address_pairs: - entry_schema: - type: tosca.datatypes.nfv.ext.AddressPairs - required: false - type: list - ip_address: - required: false - type: string - bond: - required: false - type: string - proxiedVNFs: - entry_schema: - type: string - required: false - type: list - sfc_encapsulation: - required: false - type: string - floating_ip_address: - required: false - type: tosca.datatypes.nfv.ext.FloatingIP - service_ip_address: - required: false - type: string - mac_address: - required: false - type: string - proxiedVNFtype: - required: false - type: string - macbond: - required: false - type: string - vnic_type: - required: false - type: string - direction: - required: false - type: string - order: - required: false - type: integer - requirements: - - forwarder: - capability: tosca.capabilities.nfv.Forwarder - occurrences: - - 0 - - UNBOUNDED - - virtualbinding: - capability: tosca.capabilities.nfv.VirtualBindable - occurrences: - - 0 - - UNBOUNDED - - virtualLink: - capability: tosca.capabilities.nfv.VirtualBindable - occurrences: - - 0 - - UNBOUNDED - tosca.nodes.nfv.ext.zte.VDU: - capabilities: - scalable: - type: tosca.capabilities.Scalable - monitoring_parameter: - type: tosca.capabilities.nfv.Metric - nfv_compute: - type: tosca.capabilities.nfv.ext.Compute.Container.Architecture - virtualbinding: - type: tosca.capabilities.nfv.VirtualBindable - derived_from: tosca.nodes.Root - properties: - manual_scale_select_vim: - required: false - type: boolean - vdu_type: - required: false - type: string - watchdog: - required: false - type: tosca.datatypes.nfv.ext.zte.WatchDog - name: - required: false - type: string - local_affinity_antiaffinity_rule: - required: false - type: tosca.datatypes.nfv.ext.LocalAffinityOrAntiAffinityRule - support_scaling: - required: false - type: boolean - storage_policy: - required: false - type: string - key_vdu: - required: false - type: boolean - location_info: - required: false - type: tosca.datatypes.nfv.ext.LocationInfo - inject_data_list: - entry_schema: - type: tosca.datatypes.nfv.ext.InjectData - required: false - type: list - requirements: - - guest_os: - capability: tosca.capabilities.nfv.ext.GuestOs - occurrences: - - 0 - - UNBOUNDED - - local_storage: - capability: tosca.capabilities.nfv.ext.LocalAttachment - occurrences: - - 0 - - UNBOUNDED - - volume_storage: - capability: tosca.capabilities.Attachment - occurrences: - - 0 - - UNBOUNDED - - dependency: - capability: tosca.capabilities.Node - occurrences: - - 0 - - UNBOUNDED - tosca.nodes.nfv.ext.zte.VL: - capabilities: - virtual_linkable: - type: tosca.capabilities.nfv.VirtualLinkable - derived_from: tosca.nodes.Root - properties: - segmentation_id: - required: false - type: string - network_name: - required: false - type: string - is_predefined: - required: false - type: boolean - mtu: - required: false - type: integer - dns_nameservers: - entry_schema: - type: string - required: false - type: list - physical_network: - required: false - type: string - dhcp_enabled: - required: false - type: boolean - network_id: - required: false - type: string - host_routes: - entry_schema: - type: tosca.datatypes.nfv.ext.HostRouteInfo - required: false - type: list - ip_version: - required: false - type: integer - vendor: - required: false - type: string - name: - required: false - type: string - start_ip: - required: false - type: string - vlan_transparent: - required: false - type: boolean - cidr: - required: false - type: string - gateway_ip: - required: false - type: string - network_type: - required: false - type: string - end_ip: - required: false - type: string - location_info: - required: false - type: tosca.datatypes.nfv.ext.LocationInfo - tosca.nodes.nfv.ext.zte.VNF: - capabilities: - forwarder: - type: tosca.capabilities.nfv.Forwarder - derived_from: tosca.nodes.Root - properties: - request_reclassification: - required: false - type: boolean - domain_type: - required: false - type: string - nsh_aware: - required: false - type: boolean - plugin_info: - required: false - type: string - adjust_vnf_capacity: - required: false - type: boolean - vnfd_version: - required: false - type: string - vmnumber_overquota_alarm: - required: false - type: boolean - custom_properties: - entry_schema: - type: string - required: false - type: map - version: - required: false - type: string - cross_dc: - required: false - type: boolean - script_info: - required: false - type: string - vendor: - required: false - type: string - is_shared: - required: false - type: boolean - name: - required: false - type: string - vnf_extend_type: - required: false - type: string - id: - required: false - type: string - vnf_type: - required: false - type: string - is_sfc_proxy: - required: false - type: boolean - requirements: - - forwarder: - capability: tosca.capabilities.nfv.Forwarder - occurrences: - - 0 - - UNBOUNDED - - virtualLink: - capability: tosca.capabilities.nfv.VirtualLinkable - occurrences: - - 0 - - UNBOUNDED - - tosca.nodes.nfv.VnfVirtualLinkDesc: - capabilities: - monitoring_parameters: - type: tosca.capabilities.nfv.Metric - virtual_linkable: - type: tosca.capabilities.nfv.VirtualLinkable - derived_from: tosca.nodes.Root - properties: - vl_flavours: - entry_schema: - type: string - type: map - description: - required: false - type: string - test_access: - entry_schema: - type: string - required: false - type: list - connectivity_type: - type: tosca.datatypes.nfv.ConnectivityType org.openecomp.nodes.ForwardingPath: derived_from: tosca.nodes.Root diff --git a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml index 5a43b79350..902b3bb596 100644 --- a/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml +++ b/common/openecomp-tosca-datatype/src/main/resources/globalTypes/openecomp/relationships.yml @@ -53,19 +53,6 @@ relationship_types: type: string status: SUPPORTED required: false - - tosca.relationships.nfv.VDU.AttachedTo: - derived_from: tosca.relationships.Root - properties: - location: - required: false - type: string - - tosca.relationships.nfv.VirtualBindsTo: - derived_from: tosca.relationships.Root - - tosca.relationships.nfv.VirtualLinksTo: - derived_from: tosca.relationships.Root org.openecomp.relationships.ForwardsTo: derived_from: tosca.relationships.Root |