summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/resources/import
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-03-04 14:53:33 +0200
committerMichael Lando <ml636r@att.com>2018-03-07 13:19:05 +0000
commita5445100050e49e83f73424198d73cd72d672a4d (patch)
treecacf4df817df31be23e4e790d1dda857bdae061e /catalog-be/src/main/resources/import
parent51157f92c21976cba4914c378aaa3cba49826931 (diff)
Sync Integ to Master
Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/resources/import')
-rw-r--r--catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.yml12
-rw-r--r--catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zipbin1676 -> 1735 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml3
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zipbin6601 -> 6315 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml59
-rw-r--r--catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zipbin1088 -> 1356 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml15
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zipbin0 -> 678 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_VF/Generic_VF.zipbin460 -> 462 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/extVl/extVl.zipbin762 -> 767 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.json21
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml24
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zipbin0 -> 509 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.yml2
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zipbin1245 -> 1183 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml35
-rw-r--r--catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zipbin673 -> 905 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml5
-rw-r--r--catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zipbin1396 -> 1421 bytes
20 files changed, 183 insertions, 14 deletions
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 4e25d735d0..50f74f8853 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
@@ -122,6 +122,8 @@ tosca.capabilities.Scalable:
type: integer
tosca.capabilities.network.Bindable:
derived_from: tosca.capabilities.Node
+
+
tosca.capabilities.Container.Docker:
derived_from: tosca.capabilities.Container
properties:
@@ -207,6 +209,16 @@ org.openecomp.capabilities.metric.SnmpTrap:
description: Object Id of the metric
required: true
status: SUPPORTED
+org.openecomp.capabilities.Forwarder:
+ derived_from: tosca.capabilities.Root
+org.openecomp.capabilities.VLANAssignment:
+ derived_from: tosca.capabilities.Root
+ description: ability to expose routing information of the internal network
+ properties:
+ vfc_instance_group_reference:
+ type: string
+ description: Ability to recognize capability per vfc instance group on vnf instance
+ required: true
#ONAP types
tosca.capabilities.nfv.VirtualStorage:
derived_from: tosca.capabilities.Root
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 84871d6a07..6c443c9662 100644
--- a/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/capability-types/capabilityTypes.zip
Binary files 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 449842c2f4..493f399453 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
@@ -1257,6 +1257,7 @@ 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:
@@ -1271,7 +1272,7 @@ org.openecomp.datatypes.ImageInfo:
type: string
required: false
default: md5
-#onap
+#ONAP types
tosca.datatypes.nfv.VnfcConfigurableProperties:
derived_from: tosca.datatypes.Root
properties:
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 1f79bf2c2d..75f9f73a35 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
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
index ce457e4add..9711bfdebe 100644
--- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml
@@ -1,3 +1,8 @@
+tosca.groups.Root:
+ description: The TOSCA Group Type all other TOSCA Group Types derive from
+ interfaces:
+ Standard:
+ type: tosca.interfaces.node.lifecycle.Standard
org.openecomp.groups.heat.HeatStack:
derived_from: tosca.groups.Root
description: Grouped all heat resources which are in the same heat stack
@@ -77,9 +82,51 @@ org.openecomp.groups.VfModule:
required: false
description: >
Identifies the set of VM types and their count included in the VF-Module
-tosca.groups.Root:
- description: The TOSCA Group Type all other TOSCA Group Types derive from
- interfaces:
- Standard:
- type: tosca.interfaces.node.lifecycle.Standard
-
+org.openecomp.groups.NetworkCollection:
+ derived_from: tosca.groups.Root
+ description: groups l3-networks in network collection
+ properties:
+ network_collection_type:
+ type: string
+ required: true
+ description: network collection type, defined with default value
+ default: l3-network
+ network_collection_subtype:
+ type: string
+ required: true
+ description: network collection subtype, defined with default value
+ default: sub-interface
+ network_collection_role:
+ type: string
+ required: true
+ description: network collection role
+ network_collection_description:
+ type: string
+ required: true
+ description: network collection description, free format text
+org.openecomp.groups.VfcInstanceGroup:
+ derived_from: tosca.groups.Root
+ description: groups VFCs with same parent port role
+ properties:
+ vfc_instance_group_role:
+ type: string
+ required: true
+ description: role of this VFC group
+ vfc_parent_port_role:
+ type: string
+ required: true
+ description: common role of parent ports of VFCs in this group
+ network_collection_role:
+ type: string
+ required: true
+ description: network collection role assigned to this group
+ subinterface_role:
+ type: string
+ required: true
+ description: common role of subinterfaces of VFCs in this group, criteria the group is created
+ capabilities:
+ vlan_assignment:
+ type: org.openecomp.capabilities.VLANAssignment
+ properties:
+ vfc_instance_group_reference:
+ type: string \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip
index 7acd7a6b45..71a4af957a 100644
--- a/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.json b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.json
new file mode 100644
index 0000000000..4245f4dab1
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "Generic_CR.yml",
+ "contactId": "jh0003",
+ "name": "Generic_CR",
+ "description": "Represents a generic CR.",
+ "resourceIconPath": "defaulticon",
+ "resourceType": "ABSTRACT",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Abstract"
+ }
+ ]
+ }
+],
+ "tags": [
+ "Generic_CR"
+ ]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml
new file mode 100644
index 0000000000..941bc451da
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml
@@ -0,0 +1,15 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.resource.abstract.nodes.CR:
+ derived_from: tosca.nodes.Root
+ properties:
+ nf_function:
+ type: string
+ nf_role:
+ type: string
+ nf_naming_code:
+ type: string
+ nf_type:
+ type: string
+ nf_naming:
+ type: org.openecomp.datatypes.Naming
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip
new file mode 100644
index 0000000000..5ea130c95e
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zip
Binary files differ
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 85adfbc2a1..d20e69e8d6 100644
--- 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
Binary files differ
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 f69e5b40fb..48ebb1f610 100644
--- 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
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.json b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.json
new file mode 100644
index 0000000000..5b426db133
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.json
@@ -0,0 +1,21 @@
+{
+ "payloadName": "forwardingPath.yml",
+ "contactId": "jh0003",
+ "name": "Forwarding Path",
+ "description": "Forwarding Path configuration object",
+ "resourceIconPath": "defaulticon",
+ "resourceType": "ABSTRACT",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Abstract"
+ }
+ ]
+ }
+ ],
+ "tags": [
+ "Forwarding Path"
+ ]
+} \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml
new file mode 100644
index 0000000000..fe1be7f1f2
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.yml
@@ -0,0 +1,24 @@
+tosca_definitions_version: tosca_simple_yaml_1_0_0
+node_types:
+ org.openecomp.nodes.ForwardingPath:
+ derived_from: tosca.nodes.Root
+ properties:
+ target_range:
+ type: list
+ required: true
+ status: SUPPORTED
+ entry_schema:
+ description: Identifier of the reciever port of the VNF or the service
+ type: integer
+ protocol:
+ type: string
+ description: protocol type that runs on the link
+ required: true
+ status: SUPPORTED
+ requirements:
+ - forwarder:
+ capability: org.openecomp.capabilities.Forwarder
+ relationship: org.openecomp.relationships.ForwardsTo
+ occurrences:
+ - 0
+ - UNBOUNDED \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zip b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.zip
new file mode 100644
index 0000000000..7135677bf1
--- /dev/null
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/forwardingPath/forwardingPath.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 89ee9f81f0..791a0b9a3b 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
@@ -73,6 +73,8 @@ node_types:
occurrences:
- 1
- UNBOUNDED
+ forwarder:
+ type: org.openecomp.capabilities.Forwarder
network.outgoing.bytes:
type: org.openecomp.capabilities.metric.Ceilometer
description: A node type that includes the Metric capability indicates that it can be monitored using ceilometer.
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip
index 8a23aa77c2..efeafe824e 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/globalPort/globalPort.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
index ceb22da2af..57f4b45abe 100644
--- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.yml
@@ -13,7 +13,7 @@ tosca.policies.Performance:
derived_from: tosca.policies.Root
description: The TOSCA Policy Type definition that is used to declare performance requirements for TOSCA nodes or groups of nodes.
org.openecomp.policies.placement.Antilocate:
- derived_from: tosca.policy.placement
+ derived_from: tosca.policies.Placement
description: My placement policy for separation based upon container type value
properties:
name:
@@ -32,7 +32,7 @@ org.openecomp.policies.placement.Antilocate:
- region
- compute
org.openecomp.policies.placement.Colocate:
- derived_from: tosca.policy.placement
+ derived_from: tosca.policies.Placement
description: Keep associated nodes (groups of nodes) based upon affinity value
properties:
name:
@@ -51,7 +51,7 @@ org.openecomp.policies.placement.Colocate:
- region
- compute
org.openecomp.policies.placement.valet.Diversity:
- derived_from: tosca.policy.placement
+ derived_from: tosca.policies.Placement
description: Valet Diversity
properties:
level:
@@ -65,7 +65,7 @@ org.openecomp.policies.placement.valet.Diversity:
- host
- rack
org.openecomp.policies.placement.valet.Exclusivity:
- derived_from: tosca.policy.placement
+ derived_from: tosca.policies.Placement
description: Valet Exclusivity
properties:
level:
@@ -79,7 +79,7 @@ org.openecomp.policies.placement.valet.Exclusivity:
- host
- rack
org.openecomp.policies.placement.valet.Affinity:
- derived_from: tosca.policy.placement
+ derived_from: tosca.policies.Placement
description: Valet Affinity
properties:
level:
@@ -91,4 +91,27 @@ org.openecomp.policies.placement.valet.Affinity:
constraints:
- valid_values:
- host
- - rack \ No newline at end of file
+ - rack
+org.openecomp.policies.scaling.Fixed:
+ derived_from: tosca.policies.Scaling
+ properties:
+ quantity:
+ description: the exact number of instances to keep up
+ type: integer
+ required: true
+org.openecomp.policies.External:
+ derived_from: tosca.policies.Root
+ description: externally managed policy (for example, type="network assignment", source="Policy Manager", name="route target")
+ properties:
+ source:
+ type: string
+ description: The name of the server that exposes the policy with predefined type and name.
+ required: false
+ type:
+ type: string
+ description: The type (category) of the policy same as it is defined in the source.
+ required: false
+ name:
+ type: string
+ description: The name of the policy, that related to specific type, same as it is defined in the source.
+ required: false
diff --git a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip
index 5ed696e4a9..fbc09f2e0c 100644
--- a/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
index 5fb5390721..36325ba8e6 100644
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.yml
@@ -108,4 +108,7 @@
description: The relative location (e.g., path on the file system), which provides the root location to address an attached node.
type: string
status: SUPPORTED
- required: false \ No newline at end of file
+ required: false
+ org.openecomp.relationships.ForwardsTo:
+ derived_from: tosca.relationships.Root
+ valid_target_types: [org.openecomp.capabilities.Forwarder] \ No newline at end of file
diff --git a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip
index dbb1ca02f2..d8eb62d4d3 100644
--- a/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/relationship-types/relationshipTypes.zip
Binary files differ