[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

1 files changed, 5 insertions, 6 deletions

diff --git a/onap-client/onap_client/sdnc/preload.py b/onap-client/onap_client/sdnc/preload.py
index 65c5e0c..a8e4a77 100644
--- a/onap-client/onap_client/sdnc/preload.py
+++ b/onap-client/onap_client/sdnc/preload.py
@@ -39,14 +39,11 @@ import json
 import tempfile
 
 from onap_client.resource import Resource
-from onap_client.client.clients import Client as SDNCClient
+from onap_client.client.clients import Client
 from onap_client.exceptions import ServiceInstanceNotFound, VNFInstanceNotFound
 from onap_client import so
 from onap_client.config import LOG as logger
 
-oc = SDNCClient()
-sdnc_client = oc.sdnc
-
 
 class Preload(Resource):
     resource_name = "PRELOAD"
@@ -143,10 +140,12 @@ class Preload(Resource):
 
 
 def create_preload(preload_path, api_type):
+    oc = Client()
+
     if api_type == "GR_API":
-        sdnc_client.operations.gr_api_preload(preload_path=preload_path)
+        oc.sdnc.operations.gr_api_preload(preload_path=preload_path)
     elif api_type == "VNF_API":
-        sdnc_client.operations.vnf_api_preload(preload_path=preload_path)
+        oc.sdnc.operations.vnf_api_preload(preload_path=preload_path)
 
 
 def update_preload_with_instance(