diff options
| author |   stark, steven <steven.stark@att.com> | 2020-05-19 09:52:46 -0700 |
|---|---|---|
| committer | stark, steven <steven.stark@att.com> | 2020-05-19 09:59:16 -0700 |
| commit | d481ad9918d383c82335e52db4a360964194ef5d (patch) | |
| tree | f3174fa5bc95e340b908e3c854edf1af2e8119c9 /onap-client/etc | |
| parent | e4fca937cc6104ff56c52f720d26552febe44bee (diff) | |
[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
Diffstat (limited to 'onap-client/etc')
| -rw-r--r-- | onap-client/etc/config.example.yaml | 1 | ||||
| -rw-r--r-- | onap-client/etc/payloads/catalog_resource.jinja | 20 |
2 files changed, 3 insertions, 18 deletions
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": {}, |