X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=scripts%2Foptf-osdf%2Fosdf%2Fosdf-properties%2Fosdf_config.yaml;h=95856df8a53df48f91816efab2e1631d09c4ccd1;hb=ddd487752cf6eddd891d7b8fe5062316a932414d;hp=78399660340121e7d13fe0a7213954840facaa82;hpb=7f551a931f9d806b1cce6795837f2b936bd501e5;p=integration%2Fcsit.git

diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
index 78399660..95856df8 100755
--- a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
+++ b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml
@@ -1,64 +1,52 @@
-osdfUserNameForSO: ""   # The OSDF Manager username for MSO.
-odfPasswordForSO: ""   # The OSDF Manager password for MSO.
+placementVersioningEnabled: False
 
-# msoUrl: ""   # The SO url for call back. This will be part of the request, so no need
-soUsername: ""   # SO username for call back.
-soPassword: ""   # SO password for call back.
+# 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"
+
+# Config for Conductor
 conductorUrl: "http://127.0.0.1:5000/simulated/oof/has-api/flow1-success-simple/main.json"
-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:5000/simulated/policy/pdp-has-vcpe-good/getConfig # Policy Dev platform URL
+policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdpx/decision/v1 # Policy Dev platform URL
 policyPlatformEnv: TEST  # Environment for policy platform
-policyPlatformUsername: POLICY-USER   # Policy platform username.
-policyPlatformPassword: POLICY-PASSWD   # Policy platform password.
-policyClientUsername: POLICY-CLIENT-USER   # For use with ClientAuth
-policyClientPassword: POLICY-CLIENT-PASSWD   # For use with ClientAuth
 
+# Config for DMaaP
 messageReaderHosts: https://DMAAP-HOST1:3905,https://DMAAP-HOST2:3905,https://DMAAP-HOST3:3905
 messageReaderTopic: org.onap.oof.osdf.multicloud
-messageReaderAafUserId: DMAAP-OSDF-MC-USER
-messageReaderAafPassword: DMAAP-OSDF-MC-PASSWD
 
+# Config for SDC
 sdcUrl: https://SDC-HOST:8443/sdc/v1/catalog
-sdcUsername: SDC-OSDF-USER
-sdcPassword: SDC-OSDF-PASSWD
 sdcONAPInstanceID: ONAP-OSDF
 
 osdfPlacementUrl: "http://127.0.0.1:24699/osdf/api/v2/placement"
 
-# Credentials for the OOF placement service - Generic
-osdfPlacementUsername: test
-osdfPlacementPassword: testpwd
-
-# Credentials for the OOF placement service - SO
-osdfPlacementSOUsername: so_test
-osdfPlacementSOPassword: so_testpwd
-
-# Credentials for the OOF placement service - VFC
-osdfPlacementVFCUsername: vfc_test
-osdfPlacementVFCPassword: vfc_testpwd
+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
 
-# Credentials for the OOF CM scheduling service - Generic
-osdfCMSchedulerUsername: test1
-osdfCMSchedulerPassword: testpwd1
+# Secret Management Service from AAF
+aaf_sms_url: http://aaf-sms.onap:10443
+aaf_sms_timeout: 30
+secret_domain: osdf
+aaf_ca_certs: ssl_certs/aaf_root_ca.cer
 
 # config db api
 configDbUrl: http://127.0.0.1:5000/simulated/configdb
-configDbUserName: osdf
-configDbPassword: passwd
 configDbGetCellListUrl: 'getCellList'
 configDbGetNbrListUrl: 'getNbrList'
 
-# Credentials for PCIHandler
-pciHMSUsername: ""   # pcihandler username for call back.
-pciHMSPassword: ""   # pcihandler password for call back.
-
-#Credentials for the OOF PCI Opt Service
-osdfPCIOptUsername: pci_test
-osdfPCIOptPassword: pci_testpwd
-
+#key
+appkey: