From 9ba71c985cec1844a2b1916e8f8643a77942bda6 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Tue, 3 Oct 2017 20:41:12 +0300 Subject: ONAP normative fixes Change-Id: I5d4417dbcbebb82ea5d30493bb27a27a5594e548 Issue-ID: SDC-410 Signed-off-by: Tal Gitelman --- .../resources/import/tosca/heat-types/underlayVpn/underlayVpn.json | 2 +- .../src/main/resources/scripts/import/tosca/importHeatTypes.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'catalog-be/src') 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 6107261dd9..1311fe9f32 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 @@ -7,7 +7,7 @@ "resourceType": "VL", "categories": [ { - "name": "Generic", + "name": "Network Connectivity", "subcategories": [ { "name": "Virtual Links" diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py index 3b4ed5463f..78b257d6f3 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py @@ -51,9 +51,9 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "subInterface", "contrailV2VLANSubInterface", "multiFlavorVFC", - "vnfConfiguration"#, - #"underlayVpn", - #"overlayTunnel" + "vnfConfiguration", + "underlayVpn", + "overlayTunnel" ] responseCodes = [200, 201] -- cgit 1.2.3-korg