update documentation

update general information
update swagger information
fix swagger erros

Change-Id: I0b8c385deb3204100ebe363177a8e0efd5b147f7
Issue-ID: SDC-1378
Signed-off-by: Michael Lando <ml636r@att.com>

1 files changed, 401 insertions, 206 deletions

diff --git a/docs/configuration.rst b/docs/configuration.rst
index 281f07d1a0..b275f5fbde 100644
--- a/docs/configuration.rst
+++ b/docs/configuration.rst
@@ -32,18 +32,22 @@ environment.json
         "chef_type": "environment",
         
         "default_attributes": {
-        
+            "disableHttp": false,
             # IPs used for docker configuration
             "CS_VIP": "yyy",
             "BE_VIP": "yyy",
+            "ONBOARDING_BE_VIP": "yyy",
             "FE_VIP": "yyy",
             "ES_VIP": "yyy",
+            "KB_VIP": "yyy",
+            "DCAE_BE_VIP": "yyy",
+            "DCAE_FE_VIP": "yyy",
             "interfaces": {
                 "application": "eth0",
                 "private": "eth1"
             },
-            
-            # Configuration parameters used in portal properties 
+
+            # Configuration parameters used in portal properties
             "ECompP": {
                 "ecomp_rest_url": "http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi",
                 "ueb_url_list": "10.0.11.1,10.0.11.1",
@@ -54,24 +58,40 @@ environment.json
                 "app_topic_name": "ECOMP-PORTAL-OUTBOX-SDC1",
                 "decryption_key": "AGLDdG4D04BKm2IxIWEr8o=="
             },
-            
+
             # Configuration parameters used by SDC to work with Dmaap
             "UEB": {
                 "PublicKey": "iPIxkpAMI8qTcQj8",
                 "SecretKey": "Ehq3WyT4bkif4zwgEbvshGal",
                 "fqdn": ["10.0.11.1", "10.0.11.1"]
             },
-            
+
             # IPs used for docker configuration
             "Nodes": {
-                "CS": "yyy",
+                "CS": ["yyy"],
                 "BE": "yyy",
+                "ONBOARDING_BE": "yyy",
                 "FE": "yyy",
-                "ES": "yyy"
+                "ES": ["yyy"],
+                "KB":  "yyy"
+            },
+            "Plugins": {
+               "DCAE": {
+                  "dcae_discovery_url": "yyy",
+                  "dcae_source_url": "yyy"
+               },
+               "WORKFLOW": {
+                  "workflow_discovery_url": "yyy",
+                  "workflow_source_url": "yyy"
+               }
+            },
+            "VnfRepo": {
+                "vnfRepoPort": "8702",
+                "vnfRepoHost": "10.0.14.1"
             }
         },
         "override_attributes": {
-             
+
             # FE and BE listening ports
             "FE": {
                 "http_port": "8181",
@@ -81,7 +101,11 @@ environment.json
                 "http_port": "8080",
                 "https_port": "8443"
             },
-            
+            "ONBOARDING_BE": {
+               "http_port": "8081",
+               "https_port": "8445"
+            },
+
             # Elasticsearch configuration
             "elasticsearch": {
                 "cluster_name": "SDC-ES-",
@@ -90,7 +114,7 @@ environment.json
                 "num_of_replicas": "0",
                 "num_of_shards": "1"
             },
-            
+
             # Cassandra configuration
             "cassandra": {
                 "concurrent_reads": "32",
@@ -105,16 +129,26 @@ environment.json
                 "cache_dir": "/var/lib/cassandra/saved_caches",
                 "log_file": "/var/lib/cassandra/log/system.log",
                 "phi_convict_threshold": "8",
-                "commitlog_dir": "/var/lib/cassandra/commitlog"
+                "commitlog_dir": "/var/lib/cassandra/commitlog",
+                "socket_read_timeout": "20000",
+                "socket_connect_timeout": "20000",
+                "titan_connection_timeout": "10000"
             }
         }
     }
 
+
+
 Backend Configurations
 ======================
 
+Catalog Configurations
+----------------------
+
 BE-configuration.yaml
----------------------
+**********************
+
+
 
 ::
 
@@ -125,63 +159,63 @@ BE-configuration.yaml
     - HTTP_CSP_LASTNAME
     - HTTP_IV_REMOTE_ADDRESS
     - HTTP_CSP_WSTYPE
-    
+
     # Catalog backend hostname
-    beFqdn: <%= @host_ip %>
-    
+    beFqdn: <%= @catalog_ip %>
+
     # Catalog backend http port
     beHttpPort: <%= @catalog_port %>
-    
+
     # Catalog backend http context
     beContext: /sdc/rest/config/get
-    
+
     # Catalog backend protocol
     beProtocol: http
-    
+
     # Catalog backend ssl port
     beSslPort: <%= @ssl_port %>
-    
+
     # Catalog backend configuration vesrion
-    version: 1.0
-    
+    version: 1.1.0
+
     # Catalog backend configuration release date
     released: 2012-11-30
-    
+
     # Catalog tosca current conformance version
-    toscaConformanceLevel: 4.0
-    
+    toscaConformanceLevel: 5.0
+
     # Catalog minimum tosca conformance version
     minToscaConformanceLevel: 3.0
-    
+
     # Titan configuration file location
     titanCfgFile: /var/lib/jetty/config/catalog-be/titan.properties
-    
+
     # Does titan holds the persistency data in memory
     titanInMemoryGraph: false
-    
+
     # The timeout for titan to lock on an object in a transaction
     titanLockTimeout: 1800
-    
+
     # The interval to try and reconnect to titan DB when it is down during SDC startup
     titanReconnectIntervalInSeconds: 3
-    
+
     # The read timeout towards Titan DB when health check is invoked
     titanHealthCheckReadTimeout: 1
-    
+
     # The interval to try and reconnect to Elasticsearch when it is down during SDC startup
     esReconnectIntervalInSeconds: 3
-    
+
     # The interval to try and reconnect to UEB health check when it is down during SDC startup
     uebHealthCheckReconnectIntervalInSeconds: 15
-    
+
     # The read timeout towards UEB when helath check is invoked
     uebHealthCheckReadTimeout: 4
-    
+
     # Protocols being used in SDC
     protocols:
         - http
         - https
-    
+
     # Default imports
     # Under each import there is the file the data will be imported from
     defaultImports:
@@ -197,41 +231,45 @@ BE-configuration.yaml
             file: groups.yml
         - policies:
             file: policies.yml
-    
+
     # Users
     # Deprecated. Will be removed in future releases
     users:
         tom: passwd
         bob: passwd
-    
+
     cassandraConfig:
         # Cassandra hostname
         cassandraHosts: <%= @cassandra_ip %>
-        
+
         # Cassandra local data center name
         localDataCenter: <%= @DC_NAME %>
-        
+
         # The read timeout towards Cassandra when health check is invoked
         reconnectTimeout : 30000
-        
+        # The amount of time the Cassandra client will wait for a socket
+        socketReadTimeout: <%= @socket_read_timeout %>
+        # The amount of time the Cassandra client will wait for a response
+        socketConnectTimeout: <%= @socket_connect_timeout %>
+
         # Should an authentication be used when accessing Cassandra
         authenticate: true
-        
+
         # Username for accessing Cassandra
         username: asdc_user
-        
+
         # Password for accessing Cassnadra
         password: {{cassandra_password}}
-        
+
         # Does an ssl should be used
         ssl: false
-        
+
         # Location of .truststore file
         truststorePath : /config/.truststore
-        
+
         # The .truststore file password
         truststorePassword : Aa123456
-        
+
         # Keyspaces configuration for Cassandra
         keySpaces:
             - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
@@ -239,10 +277,10 @@ BE-configuration.yaml
             - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
             - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
             - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']}
-    
+
     # Application-specific settings of ES
     elasticSearch:
-        
+
         # Mapping of index prefix to time-based frame. For example, if below is configured:
         #
         # - indexPrefix: auditingevents
@@ -262,7 +300,7 @@ BE-configuration.yaml
               creationPeriod: month
             - indexPrefix: monitoring_events
               creationPeriod: month
-    
+
     # Artifact types placeholder
     artifactTypes:
         - CHEF
@@ -287,13 +325,13 @@ BE-configuration.yaml
         - SNMP_TRAP
         - GUIDE
         - PLAN
-    
+
     # License types placeholder
     licenseTypes:
         - User
         - Installation
         - CPU
-    
+
     # Resource types placeholder
     resourceTypes: &allResourceTypes
         - VFC
@@ -303,13 +341,13 @@ BE-configuration.yaml
         - VFCMT
         - Abstract
         - CVFC
-    
+
     #Deployment resource artifacts placeHolder
     deploymentResourceArtifacts:
-    
+
     # Deployment resource instance artifacts placeholders
     # For each artifact the following properties exists:
-    # 
+    #
     # displayName - The display name of the artifact
     # type - The type of the artifact
     # description - The description of the artifact
@@ -325,11 +363,11 @@ BE-configuration.yaml
             type: HEAT_ENV
             description: "VF Auto-generated HEAT Environment deployment artifact"
             fileExtension: "env"
-    
+
     # Tosca artifacts placeholders
     # For each artifact there is a template and a scar.
     # For each one the following properties exists:
-    # 
+    #
     # artifactName - The suffix of the artifact file
     # displayName - The display name of the artifact
     # type - The type of the artifact
@@ -345,18 +383,18 @@ BE-configuration.yaml
             displayName: Tosca Model
             type: TOSCA_CSAR
             description: TOSCA definition package of the asset
-    
+
     # Resource category to exclude
     excludeResourceCategory:
         - Generic
-    
+
     # Resource type to exclude
     excludeResourceType:
         - PNF
-    
+
     # Informational resource artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # displayName - The display name of the artifact
     # type - The type of the artifact
     informationalResourceArtifacts:
@@ -381,13 +419,13 @@ BE-configuration.yaml
     resourceSecurityTemplate:
         displayName: Resource Security Template
         type: OTHER
-    
+
     # Service category to exclude
     excludeServiceCategory:
-    
+
     # Informational service artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # displayName - The display name of the artifact
     # type - The type of the artifact
     informationalServiceArtifacts:
@@ -430,10 +468,10 @@ BE-configuration.yaml
         serviceSecurityTemplate:
             displayName: Service Security Template
             type: OTHER
-    
+
     # Service api artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # displayName - The display name of the artifact
     # type - The type of the artifact
     serviceApiArtifacts:
@@ -455,27 +493,27 @@ BE-configuration.yaml
         testing:
             displayName: Testing
             type: OTHER
-    
+
     # The maximum number of keys permited for additional information on service
     additionalInformationMaxNumberOfKeys: 50
-    
+
     # Collect process statistics
     systemMonitoring:
-        
+
         # Should monitoring be enabled
         enabled: false
-        
+
         # In case of going through the FE server proxy the information to the BE
         isProxy: false
-        
+
         # What is the interval of the statistics collection
         probeIntervalInSeconds: 15
-    
+
     defaultHeatArtifactTimeoutMinutes: 60
-    
+
     # Service deployment artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # acceptedTypes - File types that can be uploaded as each artifact
     serviceDeploymentArtifacts:
         YANG_XML:
@@ -490,10 +528,7 @@ BE-configuration.yaml
         MODEL_QUERY_SPEC:
             acceptedTypes:
                 - xml
-        UCPE_LAYER_2_CONFIGURATION:
-            acceptedTypes:
-                - xml
-    
+
     #AAI Artifacts
         AAI_SERVICE_MODEL:
             acceptedTypes:
@@ -506,17 +541,17 @@ BE-configuration.yaml
                 - xml
         OTHER:
             acceptedTypes:
-    
+
     #PLAN
         PLAN:
             acceptedTypes:
                 - xml
-    
+
     # Resource deployment artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # acceptedTypes - File types that can be uploaded as each artifact
-    # validForRespurceTypes - Resource types that support each artifact. 
+    # validForRespurceTypes - Resource types that support each artifact.
     # If left empty it means all resource types are valid
     resourceDeploymentArtifacts:
         HEAT:
@@ -634,7 +669,7 @@ BE-configuration.yaml
         SNMP_TRAP:
             acceptedTypes:
             validForResourceTypes: *allResourceTypes
-    
+
     #PLAN
         PLAN:
             acceptedTypes:
@@ -642,12 +677,12 @@ BE-configuration.yaml
             validForResourceTypes:
                 - VF
                 - VFC
-    
+
     # Resource instance deployment artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # acceptedTypes - File types that can be uploaded as each artifact
-    # validForRespurceTypes - Resource types that support each artifact. 
+    # validForRespurceTypes - Resource types that support each artifact.
     # If left empty it means all resource types are valid
     resourceInstanceDeploymentArtifacts:
         HEAT_ENV:
@@ -685,17 +720,17 @@ BE-configuration.yaml
         SNMP_TRAP:
             acceptedTypes:
             validForResourceTypes: *allResourceTypes
-    
+
     #PLAN
         PLAN:
             acceptedTypes:
                 - xml
-    
+
     # Resource informational artifacts placeHolder
     # For each artifact the following properties exists:
-    # 
+    #
     # acceptedTypes - File types that can be uploaded as each artifact
-    # validForRespurceTypes - Resource types that support each artifact. 
+    # validForRespurceTypes - Resource types that support each artifact.
     # If left empty it means all resource types are valid
     resourceInformationalArtifacts:
         CHEF:
@@ -748,56 +783,65 @@ BE-configuration.yaml
                 - VF
                 - VFC
                 - CVFC
-    
+
     # Resource informational deployment artifact placeholder
     resourceInformationalDeployedArtifacts:
-    
+
     # Requirements needed to be fulfilled before certificattion
     requirementsToFulfillBeforeCert:
-    
+
     # Capabillities needed to be fulfilled before certificattion
     capabilitiesToConsumeBeforeCert:
-    
+
     # Urls that should not be logged
     unLoggedUrls:
        - /sdc2/rest/healthCheck
-    
+
     # When component is being set as deleted those are the clean configurations
     cleanComponentsConfiguration:
-        
+
         # The interval to check for deleted components to clean
         cleanIntervalInMinutes: 1440
-        
+
         # The components types to delete
         componentsToClean:
            - Resource
            - Service
-    
+
     # Deprecated. Will be removed in future releases
     artifactsIndex: resources
-    
+
     # Used to add header and footer to heatENV files generated by SDC
     heatEnvArtifactHeader: ""
     heatEnvArtifactFooter: ""
-    
+
     onboarding:
-        
+
         # Onboarding protocol
         protocol: http
-        
+
         # Onboarding backend hostname
         host: <%= @host_ip %>
-        
+
         # Onboarding backend http port
         port: <%= @catalog_port %>
-        
+
         # The url that being used when downloading CSARs
         downloadCsarUri: "/onboarding-api/v1.0/vendor-software-products/packages"
-        
+
         # Url for onboarding health check
         healthCheckUri: "/onboarding-api/v1.0/healthcheck"
-    
-    
+    dcae:
+        # The ip of the onboarding docker
+        host: <%= @dcae_be_vip %>
+        # The protocol to use
+        protocol: <https/http>
+        # The port the docker is listening on
+        port: <port>
+        # The url of the health check to use
+        healthCheckUri: "/dcae/healthCheck"
+
+
     #GSS IDNS
     # Switchover configuration is used for geo redundency to provide automatic failovers
     switchoverDetector:
@@ -816,14 +860,14 @@ BE-configuration.yaml
         groups:
           beSet: { changePriorityUrl: "", changePriorityBody: '{"name":"","uri":"","no_ad_redirection":false,"v4groups":{"failover_groups":["","","failover_policy":["FAILALL"]},"comment":"","intended_app_proto":"DNS"}'}
           feSet: { changePriorityUrl: "", changePriorityBody: '{"name":"","uri":"","no_ad_redirection":false,"v4groups":{"failover_groups":["",""],"failover_policy":["FAILALL"]},"comment":"","intended_app_proto":"DNS"}'}
-    
+
     # Cache for datatypes. Improving run times for data type search
     applicationL1Cache:
         datatypes:
             enabled: true
             firstRunDelay: 10
             pollIntervalInSec: 60
-    
+
     # Deprecated. Will be removed in future releases
     applicationL2Cache:
         enabled: false
@@ -836,14 +880,14 @@ BE-configuration.yaml
             syncIntervalInSecondes: 43200
             waitOnShutDownInMinutes: 10
             numberOfCacheWorkers: 4
-    
+
     # Validators for tosca properties
     toscaValidators:
         stringMaxLength: 2500
-    
+
     # Should audit be disabled
     disableAudit: false
-    
+
     # VF module validations properties
     vfModuleProperties:
         min_vf_module_instances:
@@ -858,7 +902,7 @@ BE-configuration.yaml
         vf_module_type:
             forBaseModule: Base
             forNonBaseModule: Expansion
-    
+
     # For each generic node type defining it's coresponding class
     genericAssetNodeTypes:
         VFC: org.openecomp.resource.abstract.nodes.VFC
@@ -866,10 +910,88 @@ BE-configuration.yaml
         VF : org.openecomp.resource.abstract.nodes.VF
         PNF: org.openecomp.resource.abstract.nodes.PNF
         Service: org.openecomp.resource.abstract.nodes.service
+    # tenant isolation configuration
+    workloadContext: Production
+    # tenant isolation configuration
+    environmentContext:
+        defaultValue: General_Revenue-Bearing
+        validValues:
+           - Critical_Revenue-Bearing
+           - Vital_Revenue-Bearing
+           - Essential_Revenue-Bearing
+           - Important_Revenue-Bearing
+           - Needed_Revenue-Bearing
+           - Useful_Revenue-Bearing
+           - General_Revenue-Bearing
+           - Critical_Non-Revenue
+           - Vital_Non-Revenue
+           - Essential_Non-Revenue
+           - Important_Non-Revenue
+           - Needed_Non-Revenue
+           - Useful_Non-Revenue
+           - General_Non-Revenue
+    # tenant isolation configuration
+    dmaapConsumerConfiguration:
+        hosts: localhost:3905
+        consumerGroup: sdc
+        consumerId: mama
+        timeoutMs: 15000
+        limit: 1
+        pollingInterval: 2
+        topic: topic
+        latitude: 32.109333
+        longitude: 34.855499
+        version: 1.0
+        serviceName: localhost/events
+        environment: TEST
+        partner: BOT_R
+        routeOffer: MR1
+        protocol: https
+        contenttype: application/json
+        dme2TraceOn: true
+        aftEnvironment: AFTUAT
+        aftDme2ConnectionTimeoutMs: 15000
+        aftDme2RoundtripTimeoutMs: 240000
+        aftDme2ReadTimeoutMs: 50000
+        dme2preferredRouterFilePath: DME2preferredRouter.txt
+        timeLimitForNotificationHandleMs: 120000
+        credential:
+            username: user
+            password:
+    # tenant isolation configuration
+    dmeConfiguration:
+        dme2Search: DME2SEARCH
+        dme2Resolve: DME2RESOLVE
+    # definition for policys types that cannot by created by api
+    excludedPolicyTypesMapping:
+       # VF:
+        #  - a.b.c
+        #  - c.d.e
+        #CR:
+        #  - x.y.z
+    # defanition for group types that cannot by created by api
+    excludedGroupTypesMapping:
+        CR:
+           - org.openecomp.groups.VfModule
+           - org.openecomp.groups.heat.HeatStack
+           - tosca.groups.Root
+        VF:
+           - org.openecomp.groups.VfModule
+           - org.openecomp.groups.heat.HeatStack
+           - tosca.groups.Root
+        Service:
+           - org.openecomp.groups.VfModule
+           - org.openecomp.groups.heat.HeatStack
+           - tosca.groups.Root
+
+    healthStatusExclude:
+       - DE
+       - DMAPP
+       - DCAE
 
 
 BE-distribution-engine-configuration.yaml
------------------------------------------
+*****************************************
 
 ::
 
@@ -878,221 +1000,290 @@ BE-distribution-engine-configuration.yaml
         <% node['UEB']['fqdn'].each do |conn| -%>
             - <%= conn %>
         <% end -%>
-    
+
     # UEB public key
     uebPublicKey: <%= node['UEB']['PublicKey'] %>
-    
+
     # UEB secret key
     uebSecretKey: <%= node['UEB']['SecretKey'] %>
-    
+
     # Topic name for receiving distribution notification
     distributionNotifTopicName:  SDC-DISTR-NOTIF-TOPIC
-    
+
     # Topic name for distribution status
     distributionStatusTopicName: SDC-DISTR-STATUS-TOPIC
-    
+
     # Distibution initializtion retry interval time
     initRetryIntervalSec: 5
-    
+
     # Distribution initializtion maximum interval time
     initMaxIntervalSec: 60
-    
+
     # Deprecated. Will be removed in future releases
     distribNotifServiceArtifactTypes:
         info:
             - MURANO-PKG
-    
+
     # Deprecated. Will be removed in future releases
     distribNotifResourceArtifactTypes:
         lifecycle:
             - HEAT
             - DG-XML
-    
+
     # Distribution environments
     environments:
         - <%= node.chef_environment %>
-    
+
     distributionStatusTopic:
-        
+
         # Distribution status polling interval
         pollingIntervalSec: 60
-        
+
         # Distribution status fetch time
         fetchTimeSec: 15
-        
+
         # Distribution status consumer group
         consumerGroup: sdc-<%= node.chef_environment %>
-        
+
         # Distribution status consumer id
         consumerId: sdc-<%= node.chef_environment %>1
-    
+
     distributionNotificationTopic:
-        
+
         # Minimum pool size for distribution notifications
         minThreadPoolSize: 0
-        
+
         # Maximum pool size for distribution notifications
         maxThreadPoolSize: 10
-        
+
         # Maximum waiting time after sending a notification
         maxWaitingAfterSendingSeconds: 5
-    
+
     # Deprecated. Will be removed in future releases
     createTopic:
         partitionCount: 1
         replicationCount: 1
-    
+
     # STarting the distribution engine
     startDistributionEngine: true
-    
+
     #This is false by default, since ONAP Dmaap currently doesn't support https
     # Does https should be used with Dmaap
     useHttpsWithDmaap: false
+    opEnvRecoveryIntervalSec: 180
+    allowedTimeBeforeStaleSec: 300
+    # aai configuration for tenant isolation
+    aaiConfig:
+       httpRequestConfig:
+          serverRootUrl: https://aai-uint3.test.att.com:8443
+          resourceNamespaces:
+             operationalEnvironments: /aai/v12/cloud-infrastructure/operational-environments
 
+       httpClientConfig:
+          timeouts:
+             readTimeoutMs: 5000
+             connectTimeoutMs: 1000
+          clientCertificate:
+             keyStore: /opt/app/jetty/base/be/etc/non-prod.jks
+             keyStorePassword: hmXYcznAljMSisdy8zgcag==
+          headers:
+             X-FromAppId: asdc
+          numOfRetries: 3
+    # mso configuration for tenant isolation
+    msoConfig:
+       httpRequestConfig:
+          serverRootUrl: http://127.0.0.1:8080/onap/mso/infra/modelDistributions/v1
+          resourceNamespaces:
+             distributions: /distributions
 
-BE-onboarding-configuration.yaml
---------------------------------
-
-::
-
-    notifications:
-        
-        # Backend onboarding notifications polling interval in milliseconds
-        pollingIntervalMsec: 2000
-        
-        # Backend onboarding notifications selection size
-        selectionSize: 100
-        
-        # Backend onboarding norifications backend hostname
-        beHost: <%= @catalog_ip %>
-        
-        # Backend onboarding notifications backend http port
-        beHttpPort: <%= @catalog_port %>
+       httpClientConfig:
+           timeouts:
+              readTimeoutMs: 2000
+              connectTimeoutMs: 500
+           basicAuthorization:
+              userName: asdc
+              password: OTLEp5lfVhYdyw5EAtTUBQ==
+           numOfRetries: 3
 
+    currentArtifactInstallationTimeout: 120
 
 BE-titan.properties
--------------------
+*******************
 
 ::
 
     # Titan storage backend
     storage.backend=cassandra
-    
+
     # Titan storage hostname
     storage.hostname=<%= @CASSANDRA_IP %>
-    
+
     # Titan storage port]
     storage.port=9160
-    
+
     # Titan storage username
     storage.username=<%= @CASSANDRA_USR %>
-    
+
     # Titan storage password
     storage.password=<%= @CASSANDRA_PWD %>
-    
+
     # Titan storage connection timeout
     storage.connection-timeout=10000
-    
+
     # Titan cassandra keyspace name
     storage.cassandra.keyspace=sdctitan
-    
+
     # Is Titan cassandra ssl is enabled
     storage.cassandra.ssl.enabled=false
-    
+
     # Titan cassandra ssl truststore file location
     storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore
-    
+
     # Titan cassandra ssl truststore file password
     storage.cassandra.ssl.truststore.password=Aa123456
-    
+
     # Does titan should use cache
     cache.db-cache = false
-    
+
     # How long in milliseconds should the cache keep entries before flushing them
     cache.db-cache-clean-wait = 20
-    
+
     # Default experation time in milliseconds for entries in the cache
     cache.db-cache-time = 180000
-    
+
     # Size of titan database cache
     cache.db-cache-size = 0.5
-    
+
     # Titan cassandra read consistency level
     storage.cassandra.read-consistency-level=LOCAL_QUORUM
-    
+
     # Titan cassandra write consistency level
     storage.cassandra.write-consistency-level=LOCAL_QUORUM
-    
+
     # Titan cassandra replication strategy class name
     storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy
-    
+
     # Titan cassandra replication startegy options
     storage.cassandra.replication-strategy-options=<%= @DC_NAME %>,<%= @rep_factor %>
-    
+
     # Titan cassandra local data center name
     storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %>
-    
+
     # Number of times the system attempts to acquire a lock before giving up and throwing an exception
     storage.lock.retries=5
-    
+
     # Number of milliseconds the system waits for a lock application to be acknowledged by the storage backend
     storage.lock.wait-time=500
 
 
+Onboarding configuration
+------------------------
+
+BE-onboarding-configuration.yaml
+********************************
+
+::
+
+    notifications:
+
+        # Backend onboarding notifications polling interval in milliseconds
+        pollingIntervalMsec: 2000
+
+        # Backend onboarding notifications selection size
+        selectionSize: 100
+
+        # Backend onboarding norifications backend hostname
+        beHost: <%= @catalog_ip %>
+
+        # Backend onboarding notifications backend http port
+        beHttpPort: <%= @catalog_port %>
+    # Casandra configuration
+    cassandraConfig:
+        cassandraHosts: [<%= @cassandra_ip %>]
+        localDataCenter: <%= @DC_NAME %>
+        reconnectTimeout : 30000
+        socketReadTimeout: <%= @socket_read_timeout %>
+        socketConnectTimeout: <%= @socket_connect_timeout %>
+        authenticate: true
+        username: <%= @cassandra_usr %>
+        password: <%= @cassandra_pwd %>
+        ssl: <%= @cassandra_ssl_enabled %>
+        truststorePath: /config/truststore
+        truststorePassword: <%= @cassandra_truststore_password %>
+
+
+vnfrepo-configuration.yaml
+**************************
+
+::
+
+    # The port on which the vnfsdk is lisening on
+    vnfRepoPort: <port>
+    # The ip where vnfdk is deployed
+    vnfRepoHost: <ip>
+    # The url used for querying the vnf sdk for available CSARS
+    getVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars
+    # The url used for downloading the the CSAR from vnf sdk
+    downloadVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/%s/files
+
+
+
 Frontend Configuration
 ======================
+Catalog configuration
+---------------------
 
 FE-configuration.yaml
----------------------
+*********************
 
 ::
 
     # Catalog frontend hostname
     feFqdn: <%= @fe_host_ip %>
-    
+
     # Catalog backend hostname
     beHost: <%= @be_host_ip %>
-    
+
     # Catalog backend http port
     beHttpPort: <%= @catalog_port %>
-    
+
     # Catalog backend http context
     beContext: /sdc2/rest/v1/catalog/upload/resources
-    
+
     # Catalog backend protocol
     beProtocol: http
-    
+
     # Catalog backend ssl port
     beSslPort: <%= @ssl_port %>
-    
+
     # Threadpool size for handling requests
     threadpoolSize: 50
-    
+
     # Request processing timeout (seconds)
     requestTimeout: 10
-    
+
     # Health check timeout in milliseconds
     healthCheckSocketTimeoutInMs: 5000
-    
+
     # Health check inteval in seconds
     healthCheckIntervalInSeconds: 5
-    
+
     onboarding:
-        
+
         # Onboarding protocol
         protocol: http
-        
+
         # Onboarding frontend hostname
         host: <%= @fe_host_ip %>
-        
+
         # Onboarding frontend port
         port: 8181
-        
+
         # Onboarding frontend health check url
         healthCheckUri: "/onboarding/v1.0/healthcheck"
-    
+
     # Request headers for identification of the user that made the request
-    identificationHeaderFields: 
+    identificationHeaderFields:
         -
             - &HTTP_IV_USER HTTP_IV_USER
             - &iv-user iv-user
@@ -1105,7 +1296,7 @@ FE-configuration.yaml
         -
             - &HTTP_CSP_WSTYPE HTTP_CSP_WSTYPE
             - &csp-wstype csp-wstype
-    
+
     # Optional request headers
     optionalHeaderFields:
         -
@@ -1120,60 +1311,64 @@ FE-configuration.yaml
         -
             - &HTTP_CSP_EMAIL HTTP_CSP_EMAIL
             - &csp-email csp-email
-    
+
     # Frontend configuration version
     version: 1.0
-    
+
     # Frontend configuration release date
     released: 2012-11-30
-    
+
     # Connection parameters
     connection:
         url: jdbc:mysql://localhost:3306/db
         poolSize: 17
-    
+
     # Protocols being used in SDC
     protocols:
         - http
         - https
-    
+
     # Collect process statistics
     systemMonitoring:
-        
+
         # Should monitoring be enabled
         enabled: false
-        
+
         # In case of going through the FE server proxy the information to the BE
         isProxy: true
-        
+
         # What is the interval of the statistics collection
         probeIntervalInSeconds: 15
-    
+
     # Kibana hostname
     kibanaHost: localhost
-    
+
     # Kibana http port
     kibanaPort: 5601
-    
+
     # Kibana usage protocol
     kibanaProtocol: http
 
+Onboarding configuration
+------------------------
 
 FE-onboarding-configuration.yaml
---------------------------------
+********************************
 
 ::
 
     notifications:
-        
+
         # Frontend onboarding notifications polling interval in milliseconds
         pollingIntervalMsec: 2000
-        
+
         # Frontend onboarding notifications selection size
         selectionSize: 100
-        
+
         # Frontend onboarding norifications backend hostname
         beHost: <%= @catalog_ip %>
-        
+
         # Frontend onboarding notifications backend http port
         beHttpPort: <%= @catalog_port %>
+
+