summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorChayal, Avteet (ac229e) <ac229e@att.com>2018-10-12 23:50:28 +0000
committerVikas Varma <vv8305@att.com>2018-10-15 19:14:56 +0000
commit8d495104b8174cdc19b4bf27b98d9b4210fec01f (patch)
tree73a8cb7b4cbe2e98eb9dd5c81f30b25322c8a810 /test
parent7ffce767d85f8ff687c73771469ec2fbba86a4eb (diff)
Enabled CVS for the OSDF placement API
Enabled ONAP Common Versioning Strategy (CVS) for OSDF API Change-Id: I14ea90385b11c307b9e4f2fb7d245aff6e6d0978 Issue-ID: OPTFRA-376 Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
Diffstat (limited to 'test')
-rwxr-xr-xtest/config/osdf_config.yaml16
-rwxr-xr-xtest/functest/simulators/simulated-config/osdf_config.yaml14
2 files changed, 29 insertions, 1 deletions
diff --git a/test/config/osdf_config.yaml b/test/config/osdf_config.yaml
index 495feb1..bc64ffd 100755
--- a/test/config/osdf_config.yaml
+++ b/test/config/osdf_config.yaml
@@ -1,3 +1,15 @@
+placementVersioningEnabled: False
+
+# Placement API latest version numbers to be set in HTTP header
+placementMajorVersion: "1"
+placementMinorVersion: "0"
+placementPatchVersion: "0"
+
+# Placement API default version numbers to be set in HTTP header
+placementDefaultMajorVersion: "1"
+placementDefaultMinorVersion: "0"
+placementDefaultPatchVersion: "0"
+
osdfUserNameForSO: "" # The OSDF Manager username for MSO.
odfPasswordForSO: "" # The OSDF Manager password for MSO.
@@ -10,6 +22,8 @@ conductorUsername: "CONDUCTOR-USER"
conductorPassword: "CONDUCTOR-PASSWD"
conductorPingWaitTime: 60 # seconds to wait before calling the conductor retry URL
conductorMaxRetries: 30 # if we don't get something in 30 minutes, give up
+# versions to be set in HTTP header
+conductorMinorVersion: 0
# Policy Platform -- requires ClientAuth, Authorization, and Environment
policyPlatformUrl: https://POLICY-URL:8081/pdp/getConfig # Policy Dev platform URL
@@ -37,4 +51,4 @@ is_aaf_enabled: False
aaf_cache_expiry_hrs: 3
aaf_url: https://aaftest.simpledemo.onap.org:8095
aaf_user_roles:
- - /api/oof/v1/placement:org.onap.osdf.access|*|read ALL \ No newline at end of file
+ - /api/oof/v1/placement:org.onap.osdf.access|*|read ALL
diff --git a/test/functest/simulators/simulated-config/osdf_config.yaml b/test/functest/simulators/simulated-config/osdf_config.yaml
index dbdcc91..9602c46 100755
--- a/test/functest/simulators/simulated-config/osdf_config.yaml
+++ b/test/functest/simulators/simulated-config/osdf_config.yaml
@@ -1,3 +1,15 @@
+placementVersioningEnabled: False
+
+# Placement API latest version numbers to be set in HTTP header
+placementMajorVersion: "1"
+placementMinorVersion: "0"
+placementPatchVersion: "0"
+
+# Placement API default version numbers to be set in HTTP header
+placementDefaultMajorVersion: "1"
+placementDefaultMinorVersion: "0"
+placementDefaultPatchVersion: "0"
+
osdfUserNameForSO: "" # The OSDF Manager username for MSO.
odfPasswordForSO: "" # The OSDF Manager password for MSO.
@@ -10,6 +22,8 @@ conductorUsername: "CONDUCTOR-USER"
conductorPassword: "CONDUCTOR-PASSWD"
conductorPingWaitTime: 2 # seconds to wait before calling the conductor retry URL
conductorMaxRetries: 5 # if we don't get something in 30 minutes, give up
+# versions to be set in HTTP header
+conductorMinorVersion: 0
# Policy Platform -- requires ClientAuth, Authorization, and Environment
policyPlatformUrl: http://127.0.0.1:5001/simulated/policy/pdp-has-vcpe-good/pdp/getConfig # Policy Dev platform URL