[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

4 files changed, 193 insertions, 39 deletions

diff --git a/onap-client/onap_client/sdc/tests/test_license_model.py b/onap-client/onap_client/sdc/tests/test_license_model.py
index 459c2e0..8da7d07 100644
--- a/onap-client/onap_client/sdc/tests/test_license_model.py
+++ b/onap-client/onap_client/sdc/tests/test_license_model.py
@@ -38,13 +38,13 @@
 import responses
 from onap_client.client.clients import Client
 from onap_client.sdc.license_model import LicenseModel
-from onap_client.tests.utils import mockup_client, mockup_catalog_item
-
-license_model_client = Client().sdc.license_model
+from onap_client.tests.utils import mockup_catalog_item
 
 
 @responses.activate
 def test_license_model_create():
+    oc = Client()
+
     LICENSE_MODEL_ID = "license_model_id"
     LICENSE_MODEL_VERSION_ID = "license_model_version_id"
     FEATURE_GROUP_ID = "feature_group_id"
@@ -56,7 +56,7 @@ def test_license_model_create():
     DESCRIPTION = "description"
 
     mockup_catalog_item(
-        license_model_client.catalog_items["ADD_LICENSE_MODEL"],
+        oc.sdc.license_model.catalog_items["ADD_LICENSE_MODEL"],
         override_return_data={
             "itemId": LICENSE_MODEL_ID,
             "version": {"id": LICENSE_MODEL_VERSION_ID},
@@ -64,7 +64,7 @@ def test_license_model_create():
     )
 
     mockup_catalog_item(
-        license_model_client.catalog_items["ADD_KEY_GROUP"],
+        oc.sdc.license_model.catalog_items["ADD_KEY_GROUP"],
         override_return_data={"value": KEYGROUP_ID},
         override_uri_params={
             "license_model_id": LICENSE_MODEL_ID,
@@ -73,7 +73,7 @@ def test_license_model_create():
     )
 
     mockup_catalog_item(
-        license_model_client.catalog_items["ADD_ENTITLEMENT_POOL"],
+        oc.sdc.license_model.catalog_items["ADD_ENTITLEMENT_POOL"],
         override_return_data={"value": ENTITLEMENT_POOL_ID},
         override_uri_params={
             "license_model_id": LICENSE_MODEL_ID,
@@ -82,7 +82,7 @@ def test_license_model_create():
     )
 
     mockup_catalog_item(
-        license_model_client.catalog_items["ADD_FEATURE_GROUP"],
+        oc.sdc.license_model.catalog_items["ADD_FEATURE_GROUP"],
         override_return_data={"value": FEATURE_GROUP_ID},
         override_uri_params={
             "license_model_id": LICENSE_MODEL_ID,
@@ -91,7 +91,7 @@ def test_license_model_create():
     )
 
     mockup_catalog_item(
-        license_model_client.catalog_items["ADD_LICENSE_AGREEMENT"],
+        oc.sdc.license_model.catalog_items["ADD_LICENSE_AGREEMENT"],
         override_return_data={"value": LICENSE_AGREEMENT_ID},
         override_uri_params={
             "license_model_id": LICENSE_MODEL_ID,
@@ -101,7 +101,7 @@ def test_license_model_create():
 
     return_data = {"vendorName": VENDOR_NAME, "id": ID, "description": DESCRIPTION}
     mockup_catalog_item(
-        license_model_client.catalog_items["GET_LICENSE_MODEL"],
+        oc.sdc.license_model.catalog_items["GET_LICENSE_MODEL"],
         override_return_data=return_data,
         override_uri_params={
             "license_model_id": LICENSE_MODEL_ID,
@@ -109,8 +109,6 @@ def test_license_model_create():
         },
     )
 
-    mockup_client(license_model_client)
-
     lm = LicenseModel(
         VENDOR_NAME,
         "abc123",
diff --git a/onap-client/onap_client/sdc/tests/test_service.py b/onap-client/onap_client/sdc/tests/test_service.py
new file mode 100644
index 0000000..e4789a5
--- /dev/null
+++ b/onap-client/onap_client/sdc/tests/test_service.py
@@ -0,0 +1,132 @@
+# -*- coding: utf8 -*-
+# ============LICENSE_START=======================================================
+# org.onap.vvp/validation-scripts
+# ===================================================================
+# Copyright © 2020 AT&T Intellectual Property. All rights reserved.
+# ===================================================================
+#
+# Unless otherwise specified, all software contained herein is licensed
+# under the Apache License, Version 2.0 (the "License");
+# you may not use this software except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#             http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+#
+#
+# Unless otherwise specified, all documentation contained herein is licensed
+# under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+# you may not use this documentation except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#             https://creativecommons.org/licenses/by/4.0/
+#
+# Unless required by applicable law or agreed to in writing, documentation
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ============LICENSE_END============================================
+
+import responses
+
+from onap_client.tests.utils import mockup_catalog_item
+from onap_client.client.clients import Client
+from onap_client.sdc.service import Service
+
+
+@responses.activate
+def test_vnf_create():
+    oc = Client()
+
+    VNF_NAME = "vnf_name"
+    SERVICE_MODEL_ID = "service_model_id"
+    VNF_RESOURCE_ID = "vnf_resource_id"
+    SERVICE_NAME = "service_name"
+
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["GET_SERVICES"],
+        override_return_data={
+            "services": []
+        },
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["ADD_CATALOG_SERVICE"],
+        override_return_data={
+            "uniqueId": SERVICE_MODEL_ID
+        },
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["ADD_RESOURCE_INSTANCE"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+        override_return_data={
+            "uniqueId": VNF_RESOURCE_ID
+        },
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["CHECKIN_SERVICE"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["REQUEST_SERVICE_CERTIFICATION"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["START_SERVICE_CERTIFICATION"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["FINISH_SERVICE_CERTIFICATION"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+        override_return_data={"uniqueId": SERVICE_MODEL_ID}
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["APPROVE_SERVICE_CERTIFICATION"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["DISTRIBUTE_SDC_SERVICE"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+    )
+    mockup_catalog_item(
+        oc.sdc.service.catalog_items["GET_SDC_SERVICE"],
+        override_uri_params={"catalog_service_id": SERVICE_MODEL_ID},
+        override_return_data={
+            "uniqueId": SERVICE_MODEL_ID,
+        }
+    )
+
+    service = Service(
+        "A-la-carte",
+        SERVICE_NAME,
+        "cs0008",
+        "Network L1-3",
+        "robot",
+        "123456",
+        "General_Revenue-Bearing",
+        "true",
+        "This is a test",
+        "",
+        "",
+        "",
+        resources=[{
+            "resource_name": VNF_NAME,
+            "resource_id": VNF_RESOURCE_ID,
+            "catalog_resource_name": VNF_NAME,
+            "origin_type": "VF",
+            "properties": {}
+        }],
+        allow_update=False,
+        wait_for_distribution=False
+    )
+
+    service._submit()
+
+    assert service.service_name == SERVICE_NAME
diff --git a/onap-client/onap_client/sdc/tests/test_vnf.py b/onap-client/onap_client/sdc/tests/test_vnf.py
index 025a2d8..f72043e 100644
--- a/onap-client/onap_client/sdc/tests/test_vnf.py
+++ b/onap-client/onap_client/sdc/tests/test_vnf.py
@@ -36,7 +36,8 @@
 # ============LICENSE_END============================================
 
 import responses
-from onap_client.tests.utils import mockup_client, mockup_catalog_item
+
+from onap_client.tests.utils import mockup_catalog_item
 from onap_client.client.clients import Client
 from onap_client.sdc.vnf import VNF
 from onap_client.sdc.vnf import (
@@ -44,12 +45,11 @@ from onap_client.sdc.vnf import (
     network_role_property_for_instance,
 )
 
-vnf_client = Client().sdc.vnf
-vsp_client = Client().sdc.vsp
-
 
 @responses.activate
 def test_vnf_create():
+    oc = Client()
+
     SOFTWARE_PRODUCT_NAME = "software_product_name"
     SOFTWARE_PRODUCT_ID = "software_product_id"
     SOFTWARE_PRODUCT_VERSION_ID = "software_product_version_id"
@@ -68,13 +68,13 @@ def test_vnf_create():
         "name": VNF_NAME,
     }
     mockup_catalog_item(
-        vsp_client.catalog_items["GET_SOFTWARE_PRODUCTS"],
+        oc.sdc.vsp.catalog_items["GET_SOFTWARE_PRODUCTS"],
         override_return_data={
             "results": [{"name": SOFTWARE_PRODUCT_NAME, "id": SOFTWARE_PRODUCT_ID}]
         },
     )
     mockup_catalog_item(
-        vsp_client.catalog_items["GET_SOFTWARE_PRODUCT_VERSIONS"],
+        oc.sdc.vsp.catalog_items["GET_SOFTWARE_PRODUCT_VERSIONS"],
         override_return_data={
             "results": [
                 {"name": SOFTWARE_PRODUCT_NAME, "id": SOFTWARE_PRODUCT_VERSION_ID}
@@ -83,40 +83,66 @@ def test_vnf_create():
         override_uri_params={"software_product_id": SOFTWARE_PRODUCT_ID},
     )
     mockup_catalog_item(
-        vsp_client.catalog_items["GET_SOFTWARE_PRODUCT"],
-        override_return_data={"vendorName": "vendor_name"},
+        oc.sdc.vsp.catalog_items["GET_SOFTWARE_PRODUCT"],
+        override_return_data={
+            "vendorName": "vendor_name",
+            "category": "resourceNewCategory.application l4+",
+            "subCategory": "resourceNewCategory.application l4+.web server",
+        },
         override_uri_params={
             "software_product_id": SOFTWARE_PRODUCT_ID,
             "software_product_version_id": SOFTWARE_PRODUCT_VERSION_ID,
         },
     )
     mockup_catalog_item(
-        vnf_client.catalog_items["GET_RESOURCES"],
+        oc.sdc.vnf.catalog_items["GET_RESOURCES"],
         override_return_data={"resources": []},
     )
     mockup_catalog_item(
-        vnf_client.catalog_items["ADD_CATALOG_RESOURCE"],
+        oc.sdc.vnf.catalog_items["ADD_CATALOG_RESOURCE"],
         override_return_data=return_data,
     )
     mockup_catalog_item(
-        vnf_client.catalog_items["GET_CATALOG_RESOURCE"],
+        oc.sdc.vnf.catalog_items["GET_CATALOG_RESOURCE"],
         override_return_data=return_data,
         override_uri_params={"catalog_resource_id": CATALOG_RESOURCE_ID},
     )
     mockup_catalog_item(
-        vnf_client.catalog_items["CERTIFY_CATALOG_RESOURCE"],
+        oc.sdc.vnf.catalog_items["CERTIFY_CATALOG_RESOURCE"],
         override_return_data=return_data,
         override_uri_params={"catalog_resource_id": CATALOG_RESOURCE_ID},
     )
     mockup_catalog_item(
-        vnf_client.catalog_items["ADD_CATALOG_RESOURCE_PROPERTY"],
+        oc.sdc.vnf.catalog_items["ADD_CATALOG_RESOURCE_PROPERTY"],
         override_uri_params={
             "catalog_resource_id": CATALOG_RESOURCE_ID,
             "catalog_resource_instance_id": "instance_id1",
         },
     )
-
-    mockup_client(vnf_client)
+    mockup_catalog_item(
+        oc.sdc.catalog_items["GET_RESOURCE_CATEGORIES"],
+        override_return_data=[
+            {
+                "name": "Application L4+",
+                "normalizedName": "application l4+",
+                "uniqueId": "resourceNewCategory.application l4+",
+                "icons": False,
+                "subcategories": [
+                    {
+                        "name": "Call Control",
+                        "normalizedName": "call control",
+                        "uniqueId": "resourceNewCategory.application l4+.call control",
+                        "icons": ["call_controll"],
+                        "groupings": False,
+                        "version": False,
+                        "ownerId": False,
+                        "empty": False,
+                        "type": False
+                    }
+                ]
+            }
+        ],
+    )
 
     vnf = VNF(
         SOFTWARE_PRODUCT_NAME,
@@ -127,7 +153,7 @@ def test_vnf_create():
 
     vnf._submit()
 
-    assert "catalog_resource_name" in vnf.tosca
+    assert "componentInstancesInputs" in vnf.tosca
 
 
 def test_instance_ids_for_property():
diff --git a/onap-client/onap_client/sdc/tests/test_vsp.py b/onap-client/onap_client/sdc/tests/test_vsp.py
index 4d71a81..f14e16e 100644
--- a/onap-client/onap_client/sdc/tests/test_vsp.py
+++ b/onap-client/onap_client/sdc/tests/test_vsp.py
@@ -43,12 +43,11 @@ from os.path import dirname, abspath
 
 THIS_DIR = dirname(abspath(__file__))
 
-license_model_client = Client().sdc.license_model
-vsp_client = Client().sdc.vsp
-
 
 @responses.activate
 def test_vsp_create():
+    oc = Client()
+
     LICENSE_MODEL_ID = "license_model_id"
     LICENSE_MODEL_VERSION_ID = "license_model_version_id"
     FEATURE_GROUP_ID = "feature_group_id"
@@ -59,49 +58,48 @@ def test_vsp_create():
     VSP_NAME = "software_product_name"
 
     mockup_catalog_item(
-        license_model_client.catalog_items["GET_LICENSE_MODELS"],
+        oc.sdc.license_model.catalog_items["GET_LICENSE_MODELS"],
         override_return_data={
             "results": [{"name": LICENSE_MODEL_NAME, "id": LICENSE_MODEL_ID}]
         },
     )
     mockup_catalog_item(
-        license_model_client.catalog_items["GET_LICENSE_MODEL_VERSIONS"],
+        oc.sdc.license_model.catalog_items["GET_LICENSE_MODEL_VERSIONS"],
         override_return_data={
             "results": [{"name": LICENSE_MODEL_NAME, "id": LICENSE_MODEL_VERSION_ID}]
         },
     )
     mockup_catalog_item(
-        license_model_client.catalog_items["GET_LICENSE_MODEL_VERSION_ATTRIBUTE"],
+        oc.sdc.license_model.catalog_items["GET_LICENSE_MODEL_VERSION_ATTRIBUTE"],
         override_return_data={
             "results": [{"name": LICENSE_MODEL_NAME, "id": FEATURE_GROUP_ID}]
         },
         override_uri_params={"attribute": "feature-groups"},
     )
     mockup_catalog_item(
-        license_model_client.catalog_items["GET_LICENSE_MODEL_VERSION_ATTRIBUTE"],
+        oc.sdc.license_model.catalog_items["GET_LICENSE_MODEL_VERSION_ATTRIBUTE"],
         override_return_data={
             "results": [{"name": LICENSE_MODEL_NAME, "id": LICENSE_AGREEMENT_ID}]
         },
         override_uri_params={"attribute": "license-agreements"},
     )
-    mockup_client(license_model_client)
 
     mockup_catalog_item(
-        vsp_client.catalog_items["GET_SOFTWARE_PRODUCTS"],
+        oc.sdc.vsp.catalog_items["GET_SOFTWARE_PRODUCTS"],
         override_return_data={"results": []},
     )
     mockup_catalog_item(
-        vsp_client.catalog_items["ADD_SOFTWARE_PRODUCT"],
+        oc.sdc.vsp.catalog_items["ADD_SOFTWARE_PRODUCT"],
         override_return_data={
             "itemId": VSP_MODEL_ID,
             "version": {"id": VSP_MODEL_VERSION_ID},
         },
     )
     mockup_catalog_item(
-        vsp_client.catalog_items["GET_SOFTWARE_PRODUCT"],
+        oc.sdc.vsp.catalog_items["GET_SOFTWARE_PRODUCT"],
         override_return_data={"name": VSP_NAME},
     )
-    mockup_client(vsp_client)
+    mockup_client(oc.sdc.vsp)
 
     vsp = sdc.vsp.VSP(
         "vendor_name",