From eb5a085568495aa851078fa9b2db1c663ab0e060 Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Mon, 16 Oct 2017 03:10:16 +0300 Subject: update normative types add NSD and genericNutronNet Change-Id: I78784273c019dfb8837223ba390b94c0cfc3f85d Issue-ID: SDC-410 Signed-off-by: Michael Lando --- .../scripts/import/tosca/importHeatTypes.py | 3 +- .../scripts/import/tosca/importOnapTypes.py | 3 +- .../scripts/import/tosca/typesToUpgrade.json | 49 ++++++++++++++++++++-- 3 files changed, 49 insertions(+), 6 deletions(-) (limited to 'catalog-be/src/main/resources/scripts') 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 78b257d6f3..c72c2c394f 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py @@ -53,7 +53,8 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "multiFlavorVFC", "vnfConfiguration", "underlayVpn", - "overlayTunnel" + "overlayTunnel", + "genericNeutronNet" ] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py index f91b64ed81..31c11c74bc 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importOnapTypes.py @@ -29,7 +29,8 @@ def importOnapTypes(beHost, bePort, adminUser, fileDir, updateversion): "vduCompute", "vduCpd", "vduVirtualStorage", - "vnfVirtualLinkDesc" + "vnfVirtualLinkDesc", + "NSD" ] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json index a6948f5da8..c518855860 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json +++ b/catalog-be/src/main/resources/scripts/import/tosca/typesToUpgrade.json @@ -1,13 +1,54 @@ { "heat": [ - "contrailPort", - "extCp", - "contrailV2VirtualMachineInterface", + "globalNetwork", + "globalPort", + "globalCompute", + "volume", + "cinderVolume", + "contrailVirtualNetwork", + "neutronNet", "neutronPort", + "novaServer", + "extVl", + "internalVl", + "extCp", + "vl", + "eline", + "abstractSubstitute", + "Generic_VFC", + "Generic_VF", "Generic_PNF", + "Generic_Service", + "contrailNetworkRules", + "contrailPort", + "contrailV2NetworkRules", + "contrailV2VirtualNetwork", + "securityRules", + "contrailAbstractSubstitute", + "contrailCompute", + "contrailV2VirtualMachineInterface", + "subInterface", + "contrailV2VLANSubInterface", "multiFlavorVFC", - "vnfConfiguration" + "vnfConfiguration", + "underlayVpn", + "overlayTunnel", + "genericNeutronNet" ], "normative": [ + "root", + "compute", + "softwareComponent", + "webServer", + "webApplication", + "DBMS", + "database", + "objectStorage", + "blockStorage", + "containerRuntime", + "containerApplication", + "loadBalancer", + "port", + "network" ] } \ No newline at end of file -- cgit 1.2.3-korg