diff options
| author |   Michael Lando <ml636r@att.com> | 2017-10-04 08:46:39 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-10-04 08:46:39 +0000 |
| commit | 51e8fb68f82c59d75cd992a257d733fc2fd8672c (patch) | |
| tree | 77a0220ddf26a91d399bfb802d3a3f69a09421bd /catalog-be | |
| parent | 0a9b03130f15613a5aba83757c08e3814cf2d532 (diff) | |
| parent | edfe0df7d276c81a977d4f5699a683ab535d6618 (diff) | |
Merge "ONAP normative fixes"
Diffstat (limited to 'catalog-be')
| -rw-r--r-- | catalog-be/src/main/resources/import/tosca/heat-types/underlayVpn/underlayVpn.json | 2 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py | 6 |
2 files changed, 4 insertions, 4 deletions
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] |