aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2017-10-02 13:31:11 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-02 13:31:11 +0000
commitf67d9d698bd51141fafc493dde3c9801b1d7e348 (patch)
tree9dc778b241313080ce8d5d3c480df214b32f5379
parenta6df5af913e3fded906a66bce70db74d71ca0b0d (diff)
parent275c6b6fbde4fb4e964cef2bf1b370d6c3daf9d0 (diff)
Merge "ONAP normative fixes" into release-1.1.0
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml10
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zipbin1132 -> 1128 bytes
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json32
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml4
-rw-r--r--catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zipbin1164 -> 1181 bytes
5 files changed, 27 insertions, 19 deletions
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
index 68b87fd3c2..958806a097 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.yml
@@ -5,11 +5,11 @@ description: overlay L3 vpn type definitions
# overlay tunnel type definitions
# *****************************************************************************
-#metadata:
-# id: : overlayTunnelDefinition
-# version: 0.1
-# vendor: ONAP
-# template_author: ONAP
+metadata:
+ id: overlayTunnelDefinition
+ version: 0.1
+ vendor: ONAP
+ template_author: ONAP
# *****************************************************************************
# node types
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
index 55a836ff4c..e60fcbc0a6 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip
Binary files differ
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
index 10e2d4c155..6107261dd9 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json
@@ -1,15 +1,21 @@
{
- "payloadName": "underlayVpn.yml",
- "contactId": "jh0003",
- "name": "VL UNDERLAYVPN",
- "description": "The node represents a underlay vpn entity",
- "resourceIconPath": "network",
- "resourceType": "VL",
- "categories": [{
- "name": "Generic",
- "subcategories": [{
- "name": "Virtual Links"
- }]
- }],
- "tags": ["VL UNDERLAYVPN"]
+ "payloadName": "underlayVpn.yml",
+ "contactId": "jh0003",
+ "name": "VL UNDERLAYVPN",
+ "description": "The node represents a underlay vpn entity",
+ "resourceIconPath": "network",
+ "resourceType": "VL",
+ "categories": [
+ {
+ "name": "Generic",
+ "subcategories": [
+ {
+ "name": "Virtual Links"
+ }
+ ]
+ }
+ ],
+ "tags": [
+ "VL UNDERLAYVPN"
+ ]
}
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
index 639e1e5d91..1e22852c75 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.yml
@@ -1,9 +1,11 @@
tosca_definitions_version: tosca_simple_yaml_1_0
+description: underlay L3 vpn type definitions
# *****************************************************************************
# underlay vpn type definitions
# *****************************************************************************
metadata:
+ id: underlayVpnDefinition
version: 0.1
vendor: ONAP
template_author: ONAP
@@ -19,7 +21,7 @@ node_types:
# *****************************************************************************
org.openecomp.resource.vl.underlayvpn:
derived_from: tosca.nodes.Root
- description: undelay vpn type definitions
+ description: undelay vpn type definitions
properties:
id:
type: string
diff --git a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
index 0a4f88bd32..4a0bce00f7 100644
--- a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
+++ b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip
Binary files differ