From d481ad9918d383c82335e52db4a360964194ef5d Mon Sep 17 00:00:00 2001
From: "stark, steven" <steven.stark@att.com>
Date: Tue, 19 May 2020 09:52:46 -0700
Subject: [VVP] Updates to VVP test-engine

Removing module level variables. These can cause import errors if certain modules are not imported "properly". Removing these lets developers import modules as-needed.

Add support for VNF category. The VNF category is looked up based on the category chosen by the VSP.

Increase test coverage.

Update ovp testsuite based on these changes.

Issue-ID: VVP-418
Signed-off-by: stark, steven <steven.stark@att.com>
Change-Id: I074375b8afae1adff60e0730d6f8a69d01cdd475
---
 onap-client/etc/config.example.yaml             |  1 +
 onap-client/etc/payloads/catalog_resource.jinja | 20 ++------------------
 2 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'onap-client/etc')

diff --git a/onap-client/etc/config.example.yaml b/onap-client/etc/config.example.yaml
index 2d903d8..b3a6575 100644
--- a/onap-client/etc/config.example.yaml
+++ b/onap-client/etc/config.example.yaml
@@ -53,6 +53,7 @@ onap_client:
     SDC_SCREEN_PATH: /sdc2/rest/v1/screen
     SDC_HEALTH_CHECK_PATH: /sdc1/rest/healthCheck
     SDC_CATALOG_SERVICES_PATH: /sdc2/rest/v1/catalog/services
+    SDC_RESOURCE_CATEGORIES_PATH: /sdc2/rest/v1/categories/resources
     SDC_VENDOR_SOFTWARE_PRODUCT_PATH: /onboarding-api/v1.0/vendor-software-products
     SDC_CATALOG_RESOURCES_PATH: /sdc2/rest/v1/catalog/resources
     SDC_VENDOR_LICENSE_MODEL_PATH: /onboarding-api/v1.0/vendor-license-models
diff --git a/onap-client/etc/payloads/catalog_resource.jinja b/onap-client/etc/payloads/catalog_resource.jinja
index b051bcb..b9647b8 100644
--- a/onap-client/etc/payloads/catalog_resource.jinja
+++ b/onap-client/etc/payloads/catalog_resource.jinja
@@ -1,24 +1,8 @@
 {
   "artifacts": {},
   "toscaArtifacts": {},
-  "contactId": "cs0008",
-  "categories": [
-    {
-      "name": "Generic",
-      "normalizedName": "generic",
-      "uniqueId": "resourceNewCategory.generic",
-      "subcategories": [
-        {
-          "name": "Abstract",
-          "normalizedName": "abstract",
-          "uniqueId": "resourceNewCategory.generic.abstract",
-          "icons": [
-            "database"
-          ]
-        }
-      ]
-    }
-  ],
+  "contactId": "{{contact_id}}",
+  "categories": {{categories|tojson(indent=4)}},
   "description": "vendor software product",
   "icon": "defaulticon",
   "componentInstancesProperties": {},
-- 
cgit 1.2.3-korg