summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/resources/import/tosca/heat-types
diff options
context:
space:
mode:
Diffstat (limited to 'catalog-be/src/main/resources/import/tosca/heat-types')
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.yml1
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.yml17
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zipbin0 -> 381 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.yml8
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zipbin0 -> 369 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.json20
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.json15
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml70
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zipbin0 -> 756 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml3
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.yml1
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zipbin683 -> 321 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extNeutronCP/extNeutronCP.yml1
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml67
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zipbin0 -> 737 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.yml10
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zipbin0 -> 359 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zipbin3932 -> 1999 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml5
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zipbin714 -> 358 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml1
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/portMirroring/portMirroring.zipbin711 -> 366 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/portMirroringByPolicy/portMirroringByPolicy.zipbin909 -> 532 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/serviceProxy/serviceProxy.zipbin557 -> 239 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.json15
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.yml45
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zipbin0 -> 1010 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zipbin759 -> 404 bytes
33 files changed, 382 insertions, 2 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.yml
index 902cf0c0c8..3652ae4e12 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_Service/Generic_Service.yml
@@ -2,4 +2,3 @@ tosca_definitions_version: tosca_simple_yaml_1_0_0
node_types:
org.openecomp.resource.abstract.nodes.service:
derived_from: tosca.nodes.Root
- \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.json b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.json
new file mode 100644
index 0000000000..157b62a3e2
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VLANNetworkReceptor/VLANNetworkReceptor.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "VLANNetworkReceptor.yml",
+ "contactId": "jh0003",
+ "name": "VLAN Network Receptor Configuration",
+ "description": "VLAN network receptor configuration object",
+ "resourceIconPath": "pmc",
+ "resourceType": "Configuration",
+ "categories": [
+ {
+ "name": "Configuration",
+ "subcategories": [
+ {
+ "name": "Configuration"
+ }
+ ]
+ }
+],
+ "tags": [
+ "VLAN Network Receptor Configuration"
+ ]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.json b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.json
new file mode 100644
index 0000000000..ab28d03072
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "VRFEntry.yml",
+ "contactId": "jh0003",
+ "name": "VRF Entry Configuration",
+ "description": "VRF Entry configuration object",
+ "resourceIconPath": "pmc",
+ "resourceType": "Configuration",
+ "categories": [
+ {
+ "name": "Configuration",
+ "subcategories": [
+ {
+ "name": "Configuration"
+ }
+ ]
+ }
+],
+ "tags": [
+ "VRF Entry Configuration"
+ ]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.yml b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.yml
new file mode 100644
index 0000000000..7cba5a84d7
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.yml
@@ -0,0 +1,17 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.nodes.VRFEntry:
+ derived_from: tosca.nodes.Root
+ requirements:
+ - routing_configuration_internal:
+ occurrences:
+ - 1
+ - UNBOUNDED
+ capability: org.openecomp.capabilities.RoutingConfiguration
+ relationship: org.openecomp.relationships.RoutesTo
+ - routing_configuration_external:
+ occurrences:
+ - 1
+ - UNBOUNDED
+ capability: org.openecomp.capabilities.RoutingConfiguration
+ relationship: org.openecomp.relationships.RoutesTo
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zip
new file mode 100644
index 0000000000..fa6312e7f6
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VRFEntry/VRFEntry.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.json b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.json
new file mode 100644
index 0000000000..2d3f5412e1
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "VRFObject.yml",
+ "contactId": "jh0003",
+ "name": "VRF Object Configuration",
+ "description": "VRF Object configuration object",
+ "resourceIconPath": "pmc",
+ "resourceType": "Configuration",
+ "categories": [
+ {
+ "name": "Configuration",
+ "subcategories": [
+ {
+ "name": "Configuration"
+ }
+ ]
+ }
+],
+ "tags": [
+ "VRF Object Configuration"
+ ]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.yml b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.yml
new file mode 100644
index 0000000000..28f1d5287b
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.yml
@@ -0,0 +1,8 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.nodes.VRFObject:
+ derived_from: tosca.nodes.Root
+ description: provides capability to connect WAN Transport Service Proxy to VRF Entry
+ capabilities:
+ routing_configuration_external:
+ type: org.openecomp.capabilities.RoutingConfiguration \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zip b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zip
new file mode 100644
index 0000000000..23287d625c
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/VRFObject/VRFObject.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.json b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.json
new file mode 100644
index 0000000000..ea56a6b12d
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/configuration/configuration.json
@@ -0,0 +1,20 @@
+{
+ "payloadName": "configuration.yml",
+ "contactId": "jh0003",
+ "name": "Configuration",
+ "description": "Root Configuration.",
+ "resourceIconPath": "defaulticon",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Abstract"
+ }
+ ]
+ }
+ ],
+ "tags": [
+ "Configuration"
+ ]
+ } \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.json b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.json
new file mode 100644
index 0000000000..d6139b3c8a
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "contrailV2VLANSubInterfaceV2.yml",
+ "contactId": "jh0003",
+ "name": "contrailV2VLANSubInterfaceV2",
+ "description": "VLAN sub-Interface is a logical port which must be binded to a port. Regular port may have 1…N VLAN Interfaces.It can connect to its own network (regardless of the network the parent port can connect)",
+ "resourceIconPath": "network",
+ "resourceType": "CP",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Network Elements"
+ }]
+ }],
+ "tags": ["contrailV2VLANSubInterfaceV2"]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml
new file mode 100644
index 0000000000..a9a89e84bc
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.yml
@@ -0,0 +1,70 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface:
+ derived_from: org.openecomp.resource.cp.nodes.network.v2.SubInterface
+ properties:
+ virtual_machine_interface_refs:
+ description: List of virtual machine interface.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ name:
+ description: Virtual Machine Sub Interface VLAN name
+ type: string
+ status: SUPPORTED
+ required: false
+ virtual_network_refs:
+ description: List of virtual networks.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ virtual_machine_interface_properties:
+ description: virtual machine interface properties.
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.Properties
+ status: SUPPORTED
+ required: false
+ virtual_machine_interface_allowed_address_pairs:
+ description: Virtual Machine Sub Interface allowed address pairs.
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+ status: SUPPORTED
+ required: false
+ virtual_machine_interface_mac_addresses:
+ description: List of mac addresses.
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.MacAddress
+ status: SUPPORTED
+ required: false
+ security_group_refs:
+ description: List of security groups.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ port_tuple_refs:
+ description: List of port tuples.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ attributes:
+ fq_name:
+ description: The FQ name of the Virtual Network.
+ type: string
+ status: SUPPORTED
+ show:
+ description: All attributes.
+ type: string
+ status: SUPPORTED
+ requirements:
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ node: org.openecomp.resource.cp.nodes.network.Port
+ relationship: tosca.relationships.network.BindsTo
+ occurrences:
+ - 1
+ - 1 \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zip b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zip
new file mode 100644
index 0000000000..cc65bf9f53
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VLANSubInterfaceV2/contrailV2VLANSubInterfaceV2.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml
index a2179079b1..69e15ff488 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/contrailV2VirtualMachineInterface/contrailV2VirtualMachineInterface.yml
@@ -62,4 +62,5 @@ node_types:
- 0
- UNBOUNDED
valid_source_types:
- - org.openecomp.resources.cp.nodes.heat.network.contrailV2.VLANSubInterface \ No newline at end of file
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.yml b/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.yml
index 79876881cd..21241369c7 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.yml
@@ -1,4 +1,5 @@
tosca_definitions_version: tosca_simple_yaml_1_0_0
+
node_types:
org.openecomp.resource.vl.ELine:
derived_from: org.openecomp.resource.vl.VL
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip b/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip
index 8ba7cbceac..ea770f5042 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/eline/eline.zip
Binary files differ
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
index 35306f5b49..ad946fc8bd 100644
--- 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
@@ -135,6 +135,7 @@ node_types:
type: tosca.capabilities.network.Bindable
valid_source_types:
- org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
occurrences:
- 0
- UNBOUNDED \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.json b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.json
new file mode 100644
index 0000000000..1e4e15fbe9
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "extVirtualMachineInterfaceCP.yml",
+ "contactId": "jh0003",
+ "name": "extVirtualMachineInterfaceCP",
+ "description": "External port for virtual machine interface",
+ "resourceIconPath": "network",
+ "resourceType": "CP",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Network Elements"
+ }
+ ]
+ }
+ ],
+ "tags": [
+ "extVirtualMachineInterfaceCP"
+ ]
+}
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml
new file mode 100644
index 0000000000..6816e7b299
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.yml
@@ -0,0 +1,67 @@
+
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.cp.v2.extVirtualMachineInterfaceCP:
+ derived_from: org.openecomp.resource.cp.v2.extCP
+ properties:
+ name:
+ description: Virtual Machine Interface name
+ type: string
+ status: SUPPORTED
+ required: false
+ security_group_refs:
+ description: List of security groups.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ virtual_network_refs:
+ description: List of virtual networks.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ virtual_machine_interface_properties:
+ description: virtual machine interface properties.
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.interface.Properties
+ status: SUPPORTED
+ required: false
+ port_tuple_refs:
+ description: List of port tuples.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ virtual_machine_interface_mac_addresses:
+ description: List of mac addresses.
+ type: list
+ status: SUPPORTED
+ entry_schema:
+ type: string
+ required: false
+ virtual_machine_interface_allowed_address_pairs:
+ description: Virtual Machine Interface allowed address pairs.
+ type: org.openecomp.datatypes.heat.contrailV2.virtual.machine.subInterface.AddressPairs
+ status: SUPPORTED
+ required: false
+ attributes:
+ fq_name:
+ description: The FQ name of the Virtual Network.
+ type: string
+ status: SUPPORTED
+ show:
+ description: All attributes.
+ type: string
+ status: SUPPORTED
+ capabilities:
+ binding:
+ type: tosca.capabilities.network.Bindable
+ occurrences:
+ - 0
+ - UNBOUNDED
+ valid_source_types:
+ - org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zip b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zip
new file mode 100644
index 0000000000..4edd5b3314
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/extVirtualMachineInterfaceCP/extVirtualMachineInterfaceCP.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.json b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.json
new file mode 100644
index 0000000000..ee48a778a1
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "fabricConfiguration.yml",
+ "contactId": "jh0003",
+ "name": "Fabric Configuration",
+ "description": "A fabric Configuration object",
+ "resourceIconPath": "pmc",
+ "resourceType": "Configuration",
+ "categories": [
+ {
+ "name": "Configuration",
+ "subcategories": [
+ {
+ "name": "Configuration"
+ }
+ ]
+ }
+ ],
+ "tags": [
+ "Fabric Configuration"
+ ]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.yml b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.yml
new file mode 100644
index 0000000000..18658b916b
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.yml
@@ -0,0 +1,10 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.nodes.FabricConfiguration:
+ derived_from: org.openecomp.nodes.Configuration
+ requirements:
+ - fabric_configuration_monitoring:
+ capability: org.openecomp.capabilities.FabricConfiguration
+ occurrences:
+ - 1
+ - UNBOUNDED \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zip
new file mode 100644
index 0000000000..15088d9091
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/fabricConfiguration/fabricConfiguration.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip
index 23a471f246..a04df59514 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalCompute/globalCompute.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
index 791a0b9a3b..c0fd672ee9 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml
@@ -35,6 +35,11 @@ node_types:
type: org.openecomp.datatypes.Naming
subnetpoolid:
type: string
+ subinterface_indicator:
+ description: identifies if Port is having Sub Interface
+ type: boolean
+ required: false
+ default: false
capabilities:
network.incoming.packets.rate:
type: org.openecomp.capabilities.metric.Ceilometer
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip b/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip
index d73488d0c0..9edb9f53c0 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/multiFlavorVFC/multiFlavorVFC.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml
index 34a74eb4c4..0f6fcb371c 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/neutronPort/neutronPort.yml
@@ -131,6 +131,7 @@ node_types:
type: tosca.capabilities.network.Bindable
valid_source_types:
- org.openecomp.resource.cp.nodes.heat.network.contrailV2.VLANSubInterface
+ - org.openecomp.resource.cp.nodes.heat.network.v2.contrailV2.VLANSubInterface
occurrences:
- 0
- UNBOUNDED \ 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
index cbed61fcf5..ca5650b8c9 100644
--- 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
Binary files differ
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
index a11e4f7842..7a4ce51cfb 100644
--- 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
Binary files differ
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
index 9f0b60d1df..55ffe94d99 100644
--- 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
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.json b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.json
new file mode 100644
index 0000000000..2b7d98c171
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.json
@@ -0,0 +1,15 @@
+{
+ "payloadName": "subInterfaceV2.yml",
+ "contactId": "jh0003",
+ "name": "subInterfaceV2",
+ "description": "VLAN sub-Interface is a logical port which must be binded to a port. Regular port may have 1…N VLAN Interfaces.It can connect to its own network (regardless of the network the parent port can connect)",
+ "resourceIconPath": "network",
+ "resourceType": "CP",
+ "categories": [{
+ "name": "Generic",
+ "subcategories": [{
+ "name": "Network Elements"
+ }]
+ }],
+ "tags": ["subInterfaceV2"]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.yml b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.yml
new file mode 100644
index 0000000000..7c19089242
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.yml
@@ -0,0 +1,45 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.cp.nodes.network.v2.SubInterface:
+ derived_from: tosca.nodes.Root
+ properties:
+ ip_address:
+ description: Allow the user to set a fixed IP address. Note that this address is a request to the provider which they will attempt to fulfill but may not be able to dependent on the network the port is associated with.
+ type: string
+ required: false
+ order:
+ description: 'The order of the NIC on the compute instance (e.g. eth2). Note:
+ when binding more than one port to a single compute (aka multi vNICs) and
+ ordering is desired, it is *mandatory* that all ports will be set with an
+ order value and. The order values must represent a positive, arithmetic
+ progression that starts with 0 (e.g. 0, 1, 2, ..., n).'
+ type: integer
+ default: 0
+ required: false
+ constraints:
+ - greater_or_equal: 0
+ is_default:
+ description: Set is_default=true to apply a default gateway route on the running compute instance to the associated network gateway. Only one port that is associated to single compute node can set as default=true.
+ type: boolean
+ default: false
+ required: false
+ ip_range_start:
+ description: Defines the starting IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network.
+ type: string
+ required: false
+ ip_range_end:
+ description: Defines the ending IP of a range to be allocated for the compute instances that are associated by this Port. Without setting this property the IP allocation is done from the entire CIDR block of the network.
+ type: string
+ required: false
+ attributes:
+ ip_address:
+ description: The IP address would be assigned to the associated compute instance.
+ type: string
+ requirements:
+ - subinterface_link:
+ capability: tosca.capabilities.network.Linkable
+ relationship: tosca.relationships.network.LinksTo
+ - binding:
+ capability: tosca.capabilities.network.Bindable
+ relationship: tosca.relationships.network.BindsTo
+
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zip b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zip
new file mode 100644
index 0000000000..fc34ec54ff
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/subInterfaceV2/subInterfaceV2.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip b/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip
index 03a7d535f2..eb763dadf4 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/vnfConfiguration/vnfConfiguration.zip
Binary files differ