aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstark, steven <steven.stark@att.com>2020-05-04 09:03:09 -0700
committerstark, steven <steven.stark@att.com>2020-05-04 09:11:18 -0700
commit2e4cee67a18ed93d3f042b3f064db28374081d9e (patch)
tree8b15420ad27a480ba7b7977c9d19c0782a3e35ea
parent647da36b8da91d085e5d0f4c5c8427430ef496b0 (diff)
[VVP] fixes for vvp test-engine6.0.0-ONAPfrankfurt
update license in setup.py. update config.yaml to use same user, now that SDC has been updated. add logic for OS X /tmp directory Issue-ID: VVP-417 Signed-off-by: stark, steven <steven.stark@att.com> Change-Id: Ibeb48208da9e39614c1c41499c87b06943855e96
-rw-r--r--onap-client/setup.py5
-rw-r--r--ovp_testsuite/config.yaml11
-rwxr-xr-xovp_testsuite/instantiate-k8s.sh4
3 files changed, 11 insertions, 9 deletions
diff --git a/onap-client/setup.py b/onap-client/setup.py
index 7806e3b..1b11e55 100644
--- a/onap-client/setup.py
+++ b/onap-client/setup.py
@@ -47,7 +47,7 @@ for file in os.listdir("etc/payloads"):
setuptools.setup(
name="onap-client",
- version="0.3.0",
+ version="0.3.1",
author="Steven Stark",
author_email="steven.stark@att.com",
description="Python API wrapper for ONAP applications",
@@ -56,9 +56,10 @@ setuptools.setup(
packages=setuptools.find_packages(),
classifiers=[
"Programming Language :: Python :: 3",
- "License :: OSI Approved :: MIT License",
+ "License :: OSI Approved :: Apache Software License",
"Operating System :: OS Independent",
],
+ license='Apache License, Version 2.0',
python_requires=">=3.6",
scripts=["bin/onap-client"],
data_files=datafiles,
diff --git a/ovp_testsuite/config.yaml b/ovp_testsuite/config.yaml
index e525ecb..47dfb40 100644
--- a/ovp_testsuite/config.yaml
+++ b/ovp_testsuite/config.yaml
@@ -5,9 +5,9 @@ onap_client:
SDC_HC_ENDPOINT: https://sdc-fe:9443
SDC_BE_ONBOARD_ENDPOINT: https://sdc-onboarding-be:8445
SDC_DESIGNER_USER_ID: cs0008
- SDC_TESTER_USER_ID: jm0007
- SDC_OPS_USER_ID: op0001
- SDC_GOVERNOR_USER_ID: gv0001
+ SDC_TESTER_USER_ID: cs0008
+ SDC_OPS_USER_ID: cs0008
+ SDC_GOVERNOR_USER_ID: cs0008
SDC_DESIGNER_PASSWORD: demo123456!
GLOBAL_SDC_USERNAME: beep
GLOBAL_SDC_PASSWORD: boop
@@ -22,10 +22,7 @@ onap_client:
SDC_FE_CATALOG_RESOURCES_PATH: /sdc1/feProxy/rest/v1/catalog/resources
ABSTRACT_NODE_PREFIX: abstract_
SERVICE_DISTRIBUTION:
- - "request_service_certification"
- - "start_service_certification"
- - "finish_service_certification"
- - "approve_service_certification"
+ - finish_service_certification
POLL_INTERVAL: 30
aai:
AAI_BE_ENDPOINT: https://aai:8443
diff --git a/ovp_testsuite/instantiate-k8s.sh b/ovp_testsuite/instantiate-k8s.sh
index 99c19f6..681ae92 100755
--- a/ovp_testsuite/instantiate-k8s.sh
+++ b/ovp_testsuite/instantiate-k8s.sh
@@ -43,6 +43,10 @@ OUTPUT_DIR=/tmp/OVP-$RANDOM_STRING
PODNAME="ovp-test"
CONFIGMAP="ovp-test-suite-vol"
+if [[ "$OSTYPE" == "darwin"* ]]; then
+ OUTPUT_DIR=/private/tmp/OVP-$RANDOM_STRING
+fi
+
function tar_output() {
OUTPUT=$1
set +x