summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGitelman, Tal (tg851x) <tg851x@intl.att.com>2018-03-12 18:33:32 +0200
committerMichael Lando <ml636r@att.com>2018-03-12 17:31:28 +0000
commit184a534c48377f89b0ac6ae6c3aacd7ed2d4f340 (patch)
tree2bd7356c259ebfa6e5786aabd61c760de145e4dd
parent146bb551e62c96de668b576142d7407ab2a5fa64 (diff)
Normative alignemet
Change-Id: I4ec063f938f9bde2f5727c338177e6d99ef5bc9a Issue-ID: SDC-1104 Signed-off-by: Gitelman, Tal (tg851x) <tg851x@intl.att.com>
-rw-r--r--catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml12
-rw-r--r--catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zipbin1109 -> 1102 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.yml1
-rw-r--r--catalog-be/src/main/resources/import/tosca/data-types/dataTypes.zipbin6315 -> 6300 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/group-types/groupTypes.yml24
-rw-r--r--catalog-be/src/main/resources/import/tosca/group-types/groupTypes.zipbin1356 -> 1319 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml10
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.zipbin678 -> 278 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zipbin567 -> 554 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/policy-types/policyTypes.zipbin905 -> 905 bytes
10 files changed, 13 insertions, 34 deletions
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 519d1ee695..6e8b4487a5 100644
--- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
+++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.yml
@@ -11,12 +11,6 @@ services:
VoIP_Call_Control:
name: "VoIP Call Control"
icons: ['call_controll']
- E2E_Service:
- name: "E2E Service"
- icons: ['network_l_1-3']
- Network_Service:
- name: "Network Service"
- icons: ['network_l_1-3']
resources:
NetworkLayer23:
name: "Network L2-3"
@@ -87,9 +81,6 @@ resources:
Rules:
name: "Rules"
icons: ['networkrules','securityrules']
- NetworkService:
- name: "Network Service"
- icons: ['network']
NetworkConnectivity:
name: "Network Connectivity"
subcategories:
@@ -135,6 +126,9 @@ resources:
Template:
name: "Template"
subcategories:
+ BaseMonitoringTemplate:
+ name: "Base Monitoring Template"
+ icons: ['monitoring_template']
MonitoringTemplate:
name: "Monitoring Template"
icons: ['monitoring_template']
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 de33b5bf89..a139e43aa7 100644
--- a/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.zip
+++ b/catalog-be/src/main/resources/import/tosca/categories/categoryTypes.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 493f399453..282595dcab 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
@@ -866,7 +866,6 @@ org.openecomp.datatypes.Root:
properties:
supplemental_data:
type: map
- required: true
entry_schema:
description: >
A placeholder for missing properties that would be included in future ecomp model versions.
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 75f9f73a35..401bb7f43b 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 9711bfdebe..394ffb1f6e 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
@@ -86,21 +86,11 @@ org.openecomp.groups.NetworkCollection:
derived_from: tosca.groups.Root
description: groups l3-networks in network collection
properties:
- network_collection_type:
+ network_collection_function:
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:
+ description: network collection function
+ network_collection_description:
type: string
required: true
description: network collection description, free format text
@@ -108,18 +98,18 @@ org.openecomp.groups.VfcInstanceGroup:
derived_from: tosca.groups.Root
description: groups VFCs with same parent port role
properties:
- vfc_instance_group_role:
+ vfc_instance_group_function:
type: string
required: true
- description: role of this VFC group
+ description: function 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:
+ network_collection_function:
type: string
required: true
- description: network collection role assigned to this group
+ description: network collection function assigned to this group
subinterface_role:
type: string
required: true
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 71a4af957a..3a26c09f43 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.yml b/catalog-be/src/main/resources/import/tosca/heat-types/Generic_CR/Generic_CR.yml
index 941bc451da..85cff11c2a 100644
--- 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
@@ -3,13 +3,9 @@ node_types:
org.openecomp.resource.abstract.nodes.CR:
derived_from: tosca.nodes.Root
properties:
- nf_function:
+ cr_function:
type: string
- nf_role:
+ cr_role:
type: string
- nf_naming_code:
+ cr_type:
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
index 5ea130c95e..c5dc361e07 100644
--- 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
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip
index e1b5be9f2f..e1bb32dd23 100644
--- a/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip
+++ b/catalog-be/src/main/resources/import/tosca/onap-types/vduCpd/vduCpd.zip
Binary files differ
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 fbc09f2e0c..29dd88e4b3 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