diff options
| author |   Michael Lando <ml636r@att.com> | 2017-07-17 21:12:03 +0300 |
|---|---|---|
| committer | Michael Lando <ml636r@att.com> | 2017-07-17 21:12:03 +0300 |
| commit | 75aacbbe1acf78fa53378f07f0a8c7769449a17e (patch) | |
| tree | 68a9799eb8f4704dd9a3d513401df9bb11af7739 /catalog-be/src/main/resources/scripts/import | |
| parent | dec02e7cc74e1c401be51bd9d266575e1e008f5f (diff) | |
[SDC] rebase 1710 code
Change-Id: I532ed68979fee7840ea8a5395e7e965b155fb9f9
Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'catalog-be/src/main/resources/scripts/import')
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py | 7 | ||||
| -rw-r--r-- | catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py | 5 |
2 files changed, 9 insertions, 3 deletions
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 f65aefacf1..e7eaa8610b 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/importHeatTypes.py @@ -37,7 +37,8 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "eline", "abstractSubstitute", "Generic_VFC", - "Generic_VF", + "Generic_VF", + "Generic_PNF", "Generic_Service", "contrailNetworkRules", "contrailPort", @@ -48,7 +49,9 @@ def importHeatTypes(beHost, bePort, adminUser, fileDir, updateversion): "contrailCompute", "contrailV2VirtualMachineInterface", "subInterface", - "contrailV2VLANSubInterface" + "contrailV2VLANSubInterface", + "multiFlavorVFC", + "vnfConfiguration" ] responseCodes = [200, 201] diff --git a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py index 7c0746fb55..7315ec0635 100644 --- a/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py +++ b/catalog-be/src/main/resources/scripts/import/tosca/upgradeHeatTypes1707.py @@ -26,7 +26,8 @@ def upgradeHeatTypes1707(beHost, bePort, adminUser, fileDir, updateversion): "extVl", "extCp", "Generic_VFC", - "Generic_VF", + "Generic_VF", + "Generic_PNF", "Generic_Service", "globalPort", "globalNetwork", @@ -37,6 +38,8 @@ def upgradeHeatTypes1707(beHost, bePort, adminUser, fileDir, updateversion): "contrailVirtualNetwork", "neutronNet", "neutronPort", + "multiFlavorVFC", + "vnfConfiguration" ] responseCodes = [200, 201] |