From 51d50f0ef642e0f996a1c8b8d2ef4838bdfec892 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Sun, 10 Dec 2017 18:55:03 +0200 Subject: Final commit to master merge from Change-Id: Ib464f9a8828437c86fe6def8af238aaf83473507 Issue-ID: SDC-714 Signed-off-by: Tal Gitelman --- .../tosca/capability-types/capabilityTypes.yml | 5 + .../tosca/capability-types/capabilityTypes.zip | Bin 1598 -> 1676 bytes .../import/tosca/categories/categoryTypes.yml | 9 ++ .../import/tosca/categories/categoryTypes.zip | Bin 1079 -> 1109 bytes .../import/tosca/data-types/dataTypes.yml | 17 +++ .../import/tosca/data-types/dataTypes.zip | Bin 6242 -> 6601 bytes .../tosca/heat-types/Generic_VF/Generic_VF.yml | 5 +- .../tosca/heat-types/Generic_VF/Generic_VF.zip | Bin 436 -> 460 bytes .../heat-types/extContrailCP/extContrailCP.json | 21 ++++ .../heat-types/extContrailCP/extContrailCP.yml | 59 +++++++++ .../heat-types/extContrailCP/extContrailCP.zip | Bin 0 -> 665 bytes .../import/tosca/heat-types/extCp2/extCp2.json | 21 ++++ .../import/tosca/heat-types/extCp2/extCp2.yml | 8 ++ .../import/tosca/heat-types/extCp2/extCp2.zip | Bin 0 -> 347 bytes .../heat-types/extNeutronCP/extNeutronCP.json | 21 ++++ .../tosca/heat-types/extNeutronCP/extNeutronCP.yml | 140 +++++++++++++++++++++ .../tosca/heat-types/extNeutronCP/extNeutronCP.zip | Bin 0 -> 1193 bytes .../import/tosca/heat-types/extVl/extVl.yml | 2 +- .../import/tosca/heat-types/extVl/extVl.zip | Bin 767 -> 762 bytes .../heat-types/portMirroring/portMirroring.json | 21 ++++ .../heat-types/portMirroring/portMirroring.yml | 11 ++ .../heat-types/portMirroring/portMirroring.zip | Bin 0 -> 711 bytes .../portMirroringByPolicy.json | 21 ++++ .../portMirroringByPolicy.yml | 26 ++++ .../portMirroringByPolicy.zip | Bin 0 -> 909 bytes .../heat-types/serviceProxy/serviceProxy.json | 21 ++++ .../tosca/heat-types/serviceProxy/serviceProxy.yml | 4 + .../tosca/heat-types/serviceProxy/serviceProxy.zip | Bin 0 -> 557 bytes 28 files changed, 409 insertions(+), 3 deletions(-) create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.json create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.yml create mode 100644 catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip (limited to 'catalog-be/src/main/resources/import') diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml index 45c2b812cf..4e25d735d0 100644 --- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml @@ -27,6 +27,11 @@ tosca.capabilities.Container: required: false constraints: - greater_or_equal: 0 MB +org.openecomp.capabilities.PortMirroring: + derived_from: tosca.capabilities.Root + properties: + connection_point: + type: org.openecomp.datatypes.PortMirroringConnectionPointDescription tosca.capabilities.Endpoint: derived_from: tosca.capabilities.Root properties: diff --git a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip index 268287a39d..84871d6a07 100644 Binary files a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip and b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml index 5a0c7a4dc1..519d1ee695 100644 --- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml +++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml @@ -99,6 +99,12 @@ resources: VirtualLinks: name: "Virtual Links" icons: ['vl'] + Configuration: + name: "Configuration" + subcategories: + Configuraion: + name: "Configuration" + icons: ['pmc'] DcaeComponent: name: "DCAE Component" subcategories: @@ -123,6 +129,9 @@ resources: Policy: name: "Policy" icons: ['dcae_policy'] + MachineLearning: + name: "Machine Learning" + icons: ['dcae_machineLearning'] Template: name: "Template" subcategories: diff --git a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip index 314a12ea55..de33b5bf89 100644 Binary files a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip and b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip differ 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 43debe6291..449842c2f4 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 @@ -55,6 +55,18 @@ tosca.datatypes.Credential: type: string required: false +org.openecomp.datatypes.PortMirroringConnectionPointDescription: + derived_from: tosca.datatypes.Root + properties: + nf_type: + type: string + nfc_type: + type: string + network_role: + type: string + pps_capacity: + type: string + tosca.datatypes.TimeInterval: derived_from: tosca.datatypes.Root properties: @@ -348,6 +360,11 @@ org.openecomp.datatypes.heat.neutron.port.FixedIps: description: IP address desired in the subnet for this port required: false status: SUPPORTED + subnet_id: + type: string + description: Subnet in which to allocate the IP address for this port + required: false + status: SUPPORTED org.openecomp.datatypes.heat.FileInfo: derived_from: tosca.datatypes.Root 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 506a58f4b1..1f79bf2c2d 100644 Binary files a/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip and b/catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml index 6618650ef3..667ed7484b 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.yml @@ -23,5 +23,6 @@ node_types: type: integer max_instances: type: integer - - \ No newline at end of file + multi_stage_design: + type: boolean + default: false \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip index d564813e2f..85adfbc2a1 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.json b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.json new file mode 100644 index 0000000000..dd7b9769ee --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.json @@ -0,0 +1,21 @@ +{ + "payloadName": "extContrailCP.yml", + "contactId": "DS200P", + "name": "extContrailCP", + "description": "The AT&T Connection Point base type all other CP derive from", + "resourceIconPath": "network", + "resourceType": "CP", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Network Elements" + } + ] + } +], + "tags": [ + "extContrailCP" + ] +} diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml new file mode 100644 index 0000000000..e97c7ae674 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.yml @@ -0,0 +1,59 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.cp.v2.extContrailCP: + derived_from: org.openecomp.resource.cp.v2.extCP + properties: + # copied from the org.openecomp.resource.cp.nodes.heat.network.contrail.Port type + static_routes: + type: list + description: An ordered list of static routes to be added to this interface + required: false + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.contrail.port.StaticRoute + virtual_network: + type: string + description: Virtual Network for this interface + required: true + status: SUPPORTED + static_route: + type: boolean + description: Static route enabled + required: false + default: false + status: SUPPORTED + allowed_address_pairs: + type: list + description: List of allowed address pair for this interface + required: false + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.contrail.AddressPair + shared_ip: + type: boolean + description: Shared ip enabled + required: false + default: false + status: SUPPORTED + ip_address: + type: string + description: IP for this interface + required: false + status: SUPPORTED + interface_type: + type: string + description: Interface type + required: true + status: SUPPORTED + constraints: + - valid_values: + - management + - left + - right + - other + attributes: + # copied from the org.openecomp.resource.cp.nodes.heat.network.contrail.Port type + fq_name: + type: string + description: fq_name + status: SUPPORTED diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip new file mode 100644 index 0000000000..dddadde1ad Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/extContrailCP/extContrailCP.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json new file mode 100644 index 0000000000..ff55d80135 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.json @@ -0,0 +1,21 @@ +{ + "payloadName": "extCP.yml", + "contactId": "DS200P", + "name": "ExtCP2", + "description": "The AT&T Connection Point base type all other CP derive from", + "resourceIconPath": "network", + "resourceType": "CP", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Network Elements" + } + ] + } +], + "tags": [ + "ExtCP2" + ] +} diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml new file mode 100644 index 0000000000..beae41d5ca --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.yml @@ -0,0 +1,8 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.cp.v2.extCP: + derived_from: org.openecomp.resource.cp.nodes.network.Port + description: The SDC External Connection Point base type + capabilities: + port_mirroring: + type: org.openecomp.capabilities.PortMirroring \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip new file mode 100644 index 0000000000..81a9259e6d Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/extCp2/extCp2.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.json b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.json new file mode 100644 index 0000000000..84cc8779c7 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.json @@ -0,0 +1,21 @@ +{ + "payloadName": "extNeutronCP.yml", + "contactId": "DS200P", + "name": "extNeutronCP", + "description": "The AT&T Connection Point base type all other CP derive from", + "resourceIconPath": "network", + "resourceType": "CP", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Network Elements" + } + ] + } +], + "tags": [ + "extNeutronCP" + ] +} diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml new file mode 100644 index 0000000000..35306f5b49 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml @@ -0,0 +1,140 @@ + +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.resource.cp.v2.extNeutronCP: + derived_from: org.openecomp.resource.cp.v2.extCP + properties: + # copied from the org.openecomp.resource.cp.nodes.heat.network.neutron.Port type + port_security_enabled: + type: boolean + description: Flag to enable/disable port security on the network + required: false + status: SUPPORTED + device_id: + type: string + description: Device ID of this port + required: false + status: SUPPORTED + qos_policy: + type: string + description: The name or ID of QoS policy to attach to this network + required: false + status: SUPPORTED + allowed_address_pairs: + type: list + description: Additional MAC/IP address pairs allowed to pass through the port + required: false + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.network.AddressPair + binding:vnic_type: + type: string + description: The vnic type to be bound on the neutron port + required: false + status: SUPPORTED + constraints: + - valid_values: + - macvtap + - direct + - normal + value_specs: + type: map + description: Extra parameters to include in the request + required: false + default: { + } + status: SUPPORTED + entry_schema: + type: string + device_owner: + type: string + description: Name of the network owning the port + required: false + status: SUPPORTED + network: + type: string + description: Network this port belongs to + required: false + status: SUPPORTED + replacement_policy: + type: string + description: Policy on how to respond to a stack-update for this resource + required: false + default: AUTO + status: SUPPORTED + constraints: + - valid_values: + - REPLACE_ALWAYS + - AUTO + security_groups: + type: list + description: List of security group names or IDs + required: false + status: SUPPORTED + entry_schema: + type: string + fixed_ips: + type: list + description: Desired IPs for this port + required: false + status: SUPPORTED + entry_schema: + type: org.openecomp.datatypes.heat.neutron.port.FixedIps + mac_address: + type: string + description: MAC address to give to this port + required: false + status: SUPPORTED + admin_state_up: + type: boolean + description: A boolean value specifying the administrative status of the network + required: false + default: true + status: SUPPORTED + name: + type: string + description: A symbolic name for this port + required: false + status: SUPPORTED + attributes: + # copied from the org.openecomp.resource.cp.nodes.heat.network.neutron.Port type + tenant_id: + type: string + description: Tenant owning the port + status: SUPPORTED + network_id: + type: string + description: Unique identifier for the network owning the port + status: SUPPORTED + qos_policy_id: + type: string + description: The QoS policy ID attached to this network + status: SUPPORTED + show: + type: string + description: Detailed information about resource + status: SUPPORTED + subnets: + type: list + description: Subnets of this network + status: SUPPORTED + entry_schema: + type: string + status: + type: string + description: The status of the network + status: SUPPORTED + capabilities: + # copied from the org.openecomp.resource.cp.nodes.heat.network.neutron.Port type + attachment: + type: tosca.capabilities.Attachment + occurrences: + - 1 + - UNBOUNDED + binding: + type: tosca.capabilities.network.Bindable + valid_source_types: + - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface + occurrences: + - 0 + - UNBOUNDED \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip new file mode 100644 index 0000000000..02b62a69da Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.yml index 3973598acd..53b453c67d 100644 --- a/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.yml +++ b/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.yml @@ -10,7 +10,7 @@ node_types: description: ECOMP supported network types. network_role: type: string - required: ture + required: true description: > Unique label that defines the role that this network performs. example: vce oam network, vnat sr-iov1 network diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip index 80b1e1a1dd..f69e5b40fb 100644 Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.json b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.json new file mode 100644 index 0000000000..8d809ba354 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.json @@ -0,0 +1,21 @@ +{ + "payloadName": "portMirroring.yml", + "contactId": "jh0003", + "name": "Port Mirroring Configuration", + "description": "A port mirroring configuration object", + "resourceIconPath": "pmc", + "resourceType": "Configuration", + "categories": [ + { + "name": "Configuration", + "subcategories": [ + { + "name": "Configuration" + } + ] + } +], + "tags": [ + "Port Mirroring Configuration" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.yml b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.yml new file mode 100644 index 0000000000..125bccce06 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.yml @@ -0,0 +1,11 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.nodes.PortMirroringConfiguration: + derived_from: tosca.nodes.Root + requirements: + - source: + capability: org.openecomp.capabilities.PortMirroring + occurrences: [1,UNBOUNDED] + - collector: + capability: org.openecomp.capabilities.PortMirroring + occurrences: [1,1] \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip new file mode 100644 index 0000000000..cbed61fcf5 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.json b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.json new file mode 100644 index 0000000000..a27717fe5b --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.json @@ -0,0 +1,21 @@ +{ + "payloadName": "portMirroringByPolicy.yml", + "contactId": "jh0003", + "name": "Port Mirroring Configuration By Policy", + "description": "A port mirroring configuration by policy object", + "resourceIconPath": "pmc", + "resourceType": "Configuration", + "categories": [ + { + "name": "Configuration", + "subcategories": [ + { + "name": "Configuration" + } + ] + } +], + "tags": [ + "Port Mirroring Configuration By Policy" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.yml b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.yml new file mode 100644 index 0000000000..0da5f689b4 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.yml @@ -0,0 +1,26 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.nodes.PortMirroringConfigurationByPolicy: + derived_from: tosca.nodes.Root + properties: + collector_node: + type: string + description: The name of the Collector Proxy + required: true + policy_name: + type: string + description: The name of the policy for selection of the collector interfaces + required: true + equip_model: + type: string + description: The name of the equipment type of the collector, i.e. Cisco 4500x + required: true + equip_vendor: + type: string + description: The name of the equipment vendor of the collector, i.e. Cisco + required: true + requirements: + - source: + capability: org.openecomp.capabilities.PortMirroring + occurrences: [1,UNBOUNDED] + diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip new file mode 100644 index 0000000000..a11e4f7842 Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zip differ diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.json b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.json new file mode 100644 index 0000000000..c34625a3c9 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.json @@ -0,0 +1,21 @@ +{ + "payloadName": "serviceProxy.yml", + "contactId": "jh0003", + "name": "serviceProxy", + "description": "Represents a proxy to a service VFC.", + "resourceIconPath": "defaulticon", + "resourceType": "ServiceProxy", + "categories": [ + { + "name": "Generic", + "subcategories": [ + { + "name": "Abstract" + } + ] + } +], + "tags": [ + "serviceProxy" + ] +} \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.yml b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.yml new file mode 100644 index 0000000000..cf7ec5af10 --- /dev/null +++ b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.yml @@ -0,0 +1,4 @@ +tosca_definitions_version: tosca_simple_yaml_1_0_0 +node_types: + org.openecomp.nodes.ServiceProxy: + derived_from: tosca.nodes.Root \ No newline at end of file diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip new file mode 100644 index 0000000000..9f0b60d1df Binary files /dev/null and b/catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zip differ -- cgit 1.2.3-korg