ONAP normative fixes

Change-Id: I9474ce0537ba478fb7c2e4f838d2a07760efe3f6
Issue-ID: SDC-410
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

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 68b87fd..958806a 100644 (file)
--- 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 55a836f..e60fcbc 100644 (file)
Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/overlayTunnel/overlayTunnel.zip 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 10e2d4c..6107261 100644 (file)
--- 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 639e1e5..1e22852 100644 (file)
--- 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 0a4f88b..4a0bce0 100644 (file)
Binary files a/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip and b/catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.zip differ