From bd36f4badbaa5dd1b76996a3e1f73cf4dcfeda01 Mon Sep 17 00:00:00 2001
From: MichaelMorris <michael.morris@est.tech>
Date: Fri, 21 Aug 2020 17:51:13 +0100
Subject: Adding ETSI NS types

Change-Id: I22f644a6b02f4f05ddc951af899463df9b11b7db
Issue-ID: SDC-2618
Signed-off-by: MichaelMorris <michael.morris@est.tech>
---
 .../resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json    | 6 ++++--
 .../resources/scripts/sdcBePy/tosca/models/normativeTypesList.py    | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'catalog-be/src/main/resources/scripts')

diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json
index cbe581acd2..0c363b01ea 100644
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/data/onapTypesToUpgrade.json
@@ -1,9 +1,11 @@
 {
   "nfv": [
-    "allottedResource"
+    "allottedResource",
+    "NS",
+    "NsVirtualLink"
   ],
   "onap": [
   ],
   "sol":[
   ]
-}
\ No newline at end of file
+}
diff --git a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py
index 1ec08c97bf..46b8d9b5bc 100644
--- a/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py
+++ b/catalog-be/src/main/resources/scripts/sdcBePy/tosca/models/normativeTypesList.py
@@ -90,7 +90,9 @@ def get_nfv(base_file_location="/"):
                                    "extZteCP",
                                    "extZteVDU",
                                    "extZteVL",
+                                   "NS",
                                    "NSD",
+                                   "NsVirtualLink",
                                    "VDU",
                                    "vduCompute",
                                    "Cp",
-- 
cgit 1.2.3-korg