X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=catalog-be%2Fsrc%2Ftest%2Fresources%2Fconfig%2Fcatalog-be%2Fconfiguration.yaml;h=3ec3793d433efb87f3e5de71e3d7716538d6dd66;hb=5f3e9912406897ee18c424b940881ce08d59bb44;hp=ac5d0acc7262a59d7579e4acf67c9c8eac1d0770;hpb=615de28561aeb843e4fc18a1859b68a8164b17a4;p=sdc.git

diff --git a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
index ac5d0acc72..3ec3793d43 100644
--- a/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
+++ b/catalog-be/src/test/resources/config/catalog-be/configuration.yaml
@@ -59,6 +59,18 @@ defaultImports:
    - policies:
         file: policies.yml
 
+# Global CSAR Import Files
+globalCsarImports:
+  - annotations.yml
+  - artifacts.yml
+  - capabilities.yml
+  - data.yml
+  - groups.yml
+  - interfaces.yml
+  - nodes.yml
+  - policies.yml
+  - relationships.yml
+
 # Users
 users:
     tom: passwd
@@ -70,6 +82,12 @@ neo4j:
     user: neo4j
     password: "12345"
 
+basicAuth:
+  enabled: false
+  userName: test
+  userPass: test
+  excludedUrls: '/test1'
+
 cassandraConfig:
     cassandraHosts: ['localhost']
     cassandraPort: 9042
@@ -79,8 +97,6 @@ cassandraConfig:
     username: koko
     password: bobo
     ssl: false
-    truststorePath : /path/path
-    truststorePassword : 123123
     keySpaces:
         - { name: sdcaudit, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
         - { name: sdcartifact, replicationStrategy: SimpleStrategy, replicationInfo: ['1']}
@@ -98,9 +114,70 @@ resourceTypes: &allResourceTypes
   - CP
   - VL
   - VF
+  - CR
   - VFCMT
   - Abstract
   - CVFC
+  - Configuration
+  - ServiceProxy
+  - PNF
+
+componentAllowedInstanceTypes:
+  Resource:
+    VF:
+      - VFC
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
+    CVFC:
+      - VFC
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - ServiceProxy
+      - Abstract
+    PNF:
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
+    CR:
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
+    VL:
+      - VL
+  Service:
+    "*":
+      - VF
+      - CR
+      - CP
+      - PNF
+      - CVFC
+      - VL
+      - Configuration
+      - ServiceProxy
+      - Abstract
 
 # validForResourceTypes usage
 #     validForResourceTypes:
@@ -183,8 +260,8 @@ informationalServiceArtifacts:
   summaryOfImpactsToECOMPElements:
       displayName: Summary of impacts to ECOMP elements,OSSs, BSSs
       type: OTHER
-  controlLoopFunctions:
-      displayName: Control Loop Functions
+  automationCompositionFunctions:
+      displayName: Automation Composition Functions
       type: OTHER
   dimensioningInfo:
       displayName: Dimensioning Info
@@ -267,15 +344,8 @@ onboarding:
     protocol: http
     host: localhost
     port: 8080
-    downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
     healthCheckUri: "/onboarding-api/v1.0/healthcheck"
 
-dcae:
-    protocol: http
-    host: 127.0.0.1
-    port: 8080
-    healthCheckUri: "/dcae/healthCheck"
-
 ecompPortal:
     protocol: https
     host: ecomp-portal-web-tdevn2.mtn23a.ecomp.cci.att.com
@@ -345,6 +415,15 @@ genericAssetNodeTypes:
   PNF: org.openecomp.resource.abstract.nodes.PNF
   Service: org.openecomp.resource.abstract.nodes.service
 
+# Defines the base types for Services
+# <category name>:
+#   required: <boolean> //if the base type is mandatory or not
+#   baseTypes: <list of TOSCA types> //the base types. Required if the base type is required.
+#                                      If not provided, the category will have no base type.
+serviceBaseNodeTypes:
+  cat_name:
+    required: false
+
 workloadContext: Production
 
 environmentContext:
@@ -395,8 +474,6 @@ dmaapConsumerConfiguration:
         password: XyCUPhFx9u70aklYGo6OiA==
     aftDme2SslEnable: true
     aftDme2ClientIgnoreSslConfig: false
-    aftDme2ClientKeystore: /opt/app/jetty/base/be/config/.truststore
-    aftDme2ClientKeystorePassword: XyCUPhFx9u70aklYGo6OiA==
     aftDme2ClientSslCertAlias: certman
 
 dmaapProducerConfiguration:
@@ -457,30 +534,17 @@ healthStatusExclude:
    - ES
    - DMAAP
 
-aafNamespace: com.att.sdc
-
-aafAuthNeeded:            false
-
-cadiFilterParams:
-    AFT_LATITUDE:  "32.780140"
-    AFT_LONGITUDE: "-96.800451"
-    hostname:                 192.168.33.10
-    aaf_id:                   aaf@sdc.onap.org
-    aaf_env:                  TEST
-    aaf_url:                  https://aaftest.onap.org/locate/
-    csp_domain:               PROD
-    cadi_keyfile:             /opt/app/jetty/base/be/etc/keyfile
-    aaf_password:             enc:uI_J4jBL4YUcIZZa5uZKj3QMUC63hbS8TmDn5PSp5nO
-    cadi_loglevel:            DEBUG
-    AFT_ENVIRONMENT:          AFTUAT
-    cadiX509Issuers:          CN=intermediateCA_1, OU=OSAAF, O=ONAP, C=US
-    cadi_truststore:          /opt/app/jetty/base/be/etc/cadi_truststore.jks
-    cadi_truststore_password: changeit
-
 # This configuration entry lists all node type names prefix that shall be allowed on SDC.
 definedResourceNamespace:
   - org.openecomp.resource.
 
+# This configuration entry lists all Directives values that shall be allowed on SDC.
+directives:
+  - select
+  - selectable
+  - substitute
+  - substitutable
+
 artifacts:
   - type: CONTROLLER_BLUEPRINT_ARCHIVE
     categories:
@@ -493,6 +557,15 @@ artifacts:
       - PNF
     acceptedTypes:
       - zip
+  - type: HELM
+    categories:
+      - DEPLOYMENT
+    componentTypes:
+      - SERVICE
+      - RESOURCE
+    resourceTypes: *allResourceTypes
+    acceptedTypes:
+      - tgz
   - type: YANG_XML
     categories:
       - DEPLOYMENT
@@ -875,6 +948,17 @@ artifacts:
     acceptedTypes:
       - csar
       - zip
+  - type: ETSI_PACKAGE
+    categories:
+      - DEPLOYMENT
+    componentTypes:
+      - RESOURCE
+    resourceTypes:
+      - VF
+      - PNF
+    acceptedTypes:
+      - csar
+      - zip
   - type: HEAT_ENV
     categories:
       - DEPLOYMENT