From 7529a63846644ae84d33b8c0588f24fb258f27d5 Mon Sep 17 00:00:00 2001 From: "bhoopender.singh@t-systems.com" Date: Sun, 19 Jan 2025 21:56:17 +0100 Subject: Chef removal for catalog-be module. - Removal of Chef recipes in the module. - Introduction of shell scripts in the module to replace some recipes. - Generation of module configuration using Charts. - Introduction of config files in integration tests to simulate files generated by Charts in the module. Issue-ID: SDC-4697 Change-Id: Ib7e1e3432437d1857403dfb5d16dd95187934129 Signed-off-by: bhoopender.singh@t-systems.com --- .../catalog-be/configuration.yaml | 1255 ++++++++++++++++++++ .../distribution-engine-configuration.yaml | 83 ++ .../catalog-be/janusgraph.properties | 30 + .../init-script/check_backend.sh | 48 + .../init-script/create_consumer_and_user.sh | 60 + .../init-script/import_normatives.sh | 65 + .../catalog-be-resources/ready-probe.sh | 9 + .../catalog-be-resources/resource/key.properties | 41 + .../resource/portal.properties | 89 ++ .../catalog-be-resources/start.d/http.ini | 29 + .../catalog-be-resources/start.d/https.ini | 29 + .../catalog-be-resources/start.d/ssl.ini | 84 ++ integration-tests/pom.xml | 120 +- 13 files changed, 1931 insertions(+), 11 deletions(-) create mode 100644 integration-tests/catalog-be-resources/catalog-be/configuration.yaml create mode 100644 integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml create mode 100644 integration-tests/catalog-be-resources/catalog-be/janusgraph.properties create mode 100644 integration-tests/catalog-be-resources/init-script/check_backend.sh create mode 100644 integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh create mode 100644 integration-tests/catalog-be-resources/init-script/import_normatives.sh create mode 100644 integration-tests/catalog-be-resources/ready-probe.sh create mode 100644 integration-tests/catalog-be-resources/resource/key.properties create mode 100644 integration-tests/catalog-be-resources/resource/portal.properties create mode 100644 integration-tests/catalog-be-resources/start.d/http.ini create mode 100644 integration-tests/catalog-be-resources/start.d/https.ini create mode 100644 integration-tests/catalog-be-resources/start.d/ssl.ini (limited to 'integration-tests') diff --git a/integration-tests/catalog-be-resources/catalog-be/configuration.yaml b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml new file mode 100644 index 0000000000..3552acb8b6 --- /dev/null +++ b/integration-tests/catalog-be-resources/catalog-be/configuration.yaml @@ -0,0 +1,1255 @@ +identificationHeaderFields: + - HTTP_IV_USER + - HTTP_CSP_FIRSTNAME + - HTTP_CSP_LASTNAME + - HTTP_IV_REMOTE_ADDRESS + - HTTP_CSP_WSTYPE + +# catalog backend hostname +beFqdn: sdc-BE + +# catalog backend http port +beHttpPort: 8080 + +# catalog backend http context +beContext: /sdc/rest/config/get + +# catalog backend protocol +beProtocol: http + +tlsCert: +tlsKey: +caCert: + +# catalog backend ssl port +beSslPort: 8443 +version: 1.1.0 +released: 2012-11-30 +toscaConformanceLevel: 11.0 +minToscaConformanceLevel: 3.0 + +janusGraphCfgFile: /app/jetty/config/catalog-be/janusgraph.properties +janusGraphInMemoryGraph: false +janusGraphLockTimeout: 1800 +# The interval to try and reconnect to JanusGraph DB when it is down during ASDC startup: +janusGraphReconnectIntervalInSeconds: 3 + +# The read timeout towards JanusGraph DB when health check is invoked: +janusGraphHealthCheckReadTimeout: 1 + +# The interval to try and reconnect to Elasticsearch when it is down during ASDC startup: + +uebHealthCheckReconnectIntervalInSeconds: 15 +uebHealthCheckReadTimeout: 4 + +# Protocols +protocols: + - http + - https + +# Default imports +defaultImports: + - nodes: + file: nodes.yml + - datatypes: + file: data.yml + - capabilities: + file: capabilities.yml + - relationships: + file: relationships.yml + - groups: + file: groups.yml + - policies: + file: policies.yml + - annotations: + file: annotations.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 + bob: passwd + +basicAuth: + enabled: false + userName: testName + userPass: testPass + excludedUrls: "/sdc2/rest/healthCheck" + +cassandraConfig: + cassandraHosts: [sdc-cs] + cassandraPort: 9042 + localDataCenter: SDC-CS-integration-test + reconnectTimeout : 30000 + socketReadTimeout: 40000 + socketConnectTimeout: 40000 + authenticate: true + username: asdc_user + password: Aa1234%^! + ssl: false + keystorePath: + keystorePassword: false + truststorePath: + truststorePassword: + keySpaces: + - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcartifact, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdccomponent, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + - { name: sdcrepository, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['SDC-CS-integration-test','1']} + +licenseTypes: + - User + - Installation + - CPU + +#Deployment artifacts placeHolder +resourceTypes: &allResourceTypes + - VFC + - 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 + - VFC + - CR + - CP + - PNF + - CVFC + - VL + - Configuration + - ServiceProxy + - Abstract + +artifacts: + - type: CONTROLLER_BLUEPRINT_ARCHIVE + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - zip + - type: HELM + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - tgz + - type: YANG_XML + categories: + - DEPLOYMENT + - INFORMATIONAL + componentTypes: + - SERVICE + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - xml + - type: VNF_CATALOG + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + - type: MODEL_INVENTORY_PROFILE + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + - type: MODEL_QUERY_SPEC + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + - type: UCPE_LAYER_2_CONFIGURATION + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + #AAI Artifacts + - type: AAI_SERVICE_MODEL + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + - type: AAI_VF_MODULE_MODEL + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + - type: AAI_VF_INSTANCE_MODEL + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: + acceptedTypes: + - xml + #Plan + - type: PLAN + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + - RESOURCE + - RESOURCE_INSTANCE + resourceTypes: + - VF + - VFC + acceptedTypes: + - xml + - type: WORKFLOW + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + - RESOURCE + resourceTypes: + - VFC + - CP + - VL + - VF + - CR + - VFCMT + - Abstract + - CVFC + - PNF + acceptedTypes: + - type: HEAT + categories: + - DEPLOYMENT + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - yaml + - yml + - type: HEAT_VOL + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - yaml + - yml + - type: HEAT_NET + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - yaml + - yml + - type: HEAT_NESTED + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - yaml + - yml + - type: HEAT_ARTIFACT + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - zip + - tgz + - csar + - type: VNF_CATALOG + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - xml + - type: VF_LICENSE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - xml + - type: VENDOR_LICENSE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - xml + - type: MODEL_INVENTORY_PROFILE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - xml + - type: MODEL_QUERY_SPEC + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - xml + - type: LIFECYCLE_OPERATIONS + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFC + acceptedTypes: + - yaml + - yml + - type: VES_EVENTS + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + - RESOURCE_INSTANCE + resourceTypes: + - VFC + - CP + - VL + - VF + - CR + - VFCMT + - Abstract + - CVFC + - PNF + acceptedTypes: + - yaml + - yml + - type: PERFORMANCE_COUNTER + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + - RESOURCE_INSTANCE + resourceTypes: *allResourceTypes + acceptedTypes: + - csv + - type: APPC_CONFIG + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + acceptedTypes: + - type: DCAE_TOSCA + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFCMT + acceptedTypes: + - yml + - yaml + - type: DCAE_JSON + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFCMT + acceptedTypes: + - json + - type: DCAE_POLICY + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFCMT + acceptedTypes: + - emf + - type: DCAE_DOC + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFCMT + acceptedTypes: + - type: DCAE_EVENT + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFCMT + acceptedTypes: + - type: AAI_VF_MODEL + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + acceptedTypes: + - xml + - type: AAI_VF_MODULE_MODEL + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + acceptedTypes: + - xml + - type: OTHER + categories: + - DEPLOYMENT + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: + - VFC + - CVFC + - CP + - VL + - VF + - VFCMT + - Abstract + - PNF + acceptedTypes: + - type: SNMP_POLL + categories: + - DEPLOYMENT + - INFORMATIONAL + componentTypes: + - RESOURCE + - RESOURCE_INSTANCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: SNMP_TRAP + categories: + - DEPLOYMENT + - INFORMATIONAL + componentTypes: + - RESOURCE + - RESOURCE_INSTANCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: PM_DICTIONARY + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - yaml + - yml + - type: YANG_MODULE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - yang + - type: ANSIBLE_PLAYBOOK + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - yaml + - yml + - type: ONBOARDED_PACKAGE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - csar + - zip + - type: ETSI_PACKAGE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - csar + - zip + - type: ASD_PACKAGE + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE + resourceTypes: + - VF + - PNF + acceptedTypes: + - csar + - zip + - type: HEAT_ENV + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - env + - type: VF_MODULES_METADATA + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - json + - type: DCAE_INVENTORY_TOSCA + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - yml + - yaml + - type: DCAE_INVENTORY_JSON + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - json + - type: DCAE_INVENTORY_POLICY + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - emf + - type: DCAE_INVENTORY_DOC + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - type: DCAE_INVENTORY_BLUEPRINT + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - type: DCAE_INVENTORY_EVENT + categories: + - DEPLOYMENT + componentTypes: + - RESOURCE_INSTANCE + resourceTypes: + acceptedTypes: + - type: CHEF + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: PUPPET + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: SHELL + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: YANG + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: BPEL + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: DG_XML + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: MURANO_PKG + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: PNF_SW_INFORMATION + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: + - PNF + acceptedTypes: + - yaml + - yml + - type: GUIDE + categories: + - INFORMATIONAL + componentTypes: + - RESOURCE + resourceTypes: + - VF + - VFC + - CVFC + - PNF + acceptedTypes: + - yaml + - yml + - type: FLOW + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + resourceTypes: *allResourceTypes + acceptedTypes: + - type: SHELL_SCRIPT + categories: + - DEPLOYMENT + componentTypes: + - SERVICE + - SERVICE_INSTANCE + - RESOURCE + - RESOURCE_INSTANCE + resourceTypes: *allResourceTypes + acceptedTypes: + - sh + - type: TOSCA_CSAR + categories: + - TOSCA + componentTypes: + resourceTypes: + acceptedTypes: + - csar + - type: TOSCA_TEMPLATE + categories: + - TOSCA + componentTypes: + resourceTypes: + acceptedTypes: + - yml + - yaml + - type: NETWORK_CALL_FLOW + categories: + componentTypes: + resourceTypes: + acceptedTypes: + - type: ICON + categories: + componentTypes: + resourceTypes: + acceptedTypes: + +deploymentResourceArtifacts: + +deploymentResourceInstanceArtifacts: + heatEnv: + displayName: "HEAT ENV" + type: HEAT_ENV + description: "Auto-generated HEAT Environment deployment artifact" + fileExtension: "env" + VfHeatEnv: + displayName: "VF HEAT ENV" + type: HEAT_ENV + description: "VF Auto-generated HEAT Environment deployment artifact" + fileExtension: "env" + +#tosca artifacts placeholders +toscaArtifacts: + assetToscaTemplate: + artifactName: -template.yml + displayName: Tosca Template + type: TOSCA_TEMPLATE + description: TOSCA representation of the asset + assetToscaCsar: + artifactName: -csar.csar + displayName: Tosca Model + type: TOSCA_CSAR + description: TOSCA definition package of the asset + +#Informational artifacts placeHolder +excludeResourceCategory: + - Generic +excludeResourceType: + - PNF + - CR +informationalResourceArtifacts: + features: + displayName: Features + type: OTHER + capacity: + displayName: Capacity + type: OTHER + vendorTestResult: + displayName: Vendor Test Result + type: OTHER + testScripts: + displayName: Test Scripts + type: OTHER + CloudQuestionnaire: + displayName: Cloud Questionnaire (completed) + type: OTHER + HEATTemplateFromVendor: + displayName: HEAT Template from Vendor + type: HEAT + resourceSecurityTemplate: + displayName: Resource Security Template + type: OTHER + +excludeServiceCategory: + +informationalServiceArtifacts: + serviceArtifactPlan: + displayName: Service Artifact Plan + type: OTHER + summaryOfImpactsToECOMPElements: + displayName: Summary of impacts to ECOMP elements,OSSs, BSSs + type: OTHER + automationCompositionFunctions: + displayName: Automation Composition Functions + type: OTHER + dimensioningInfo: + displayName: Dimensioning Info + type: OTHER + affinityRules: + displayName: Affinity Rules + type: OTHER + operationalPolicies: + displayName: Operational Policies + type: OTHER + serviceSpecificPolicies: + displayName: Service-specific Policies + type: OTHER + engineeringRules: + displayName: Engineering Rules (ERD) + type: OTHER + distributionInstructions: + displayName: Distribution Instructions + type: OTHER + certificationTestResults: + displayName: TD Certification Test Results + type: OTHER + deploymentVotingRecord: + displayName: Deployment Voting Record + type: OTHER + serviceQuestionnaire: + displayName: Service Questionnaire + type: OTHER + serviceSecurityTemplate: + displayName: Service Security Template + type: OTHER + +serviceApiArtifacts: + configuration: + displayName: Configuration + type: OTHER + instantiation: + displayName: Instantiation + type: OTHER + monitoring: + displayName: Monitoring + type: OTHER + reporting: + displayName: Reporting + type: OTHER + logging: + displayName: Logging + type: OTHER + testing: + displayName: Testing + type: OTHER + +additionalInformationMaxNumberOfKeys: 50 + +systemMonitoring: + enabled: false + isProxy: false + probeIntervalInSeconds: 15 +heatArtifactDeploymentTimeout: + defaultMinutes: 30 + minMinutes: 1 + maxMinutes: 120 + +unLoggedUrls: + - /sdc2/rest/monitoring + - /sdc2/rest/healthCheck + +cleanComponentsConfiguration: + cleanIntervalInMinutes: 1440 + componentsToClean: + - Resource + - Service + +artifactsIndex: resources + +heatEnvArtifactHeader: "" +heatEnvArtifactFooter: "" + +onboarding: + host: sdc-onboard-BE + protocol: http + port: 8081 + getVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s?versionId=%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId?versionId=:vspVersionId + getLatestVspPackageUri: "/onboarding-api/v1.0/vendor-software-products/packages/%s" # /onboarding-api/v1.0/vendor-software-products/packages/:vspId + getVspUri: "/onboarding-api/v1.0/vendor-software-products/%s/versions/%s" # /onboarding-api/v1.0/vendor-software-products/:vspId/versions/:vspVersionId + getLatestVspUri: "/onboarding-api/v1.0/vendor-software-products/%s" # /onboarding-api/v1.0/vendor-software-products/:vspId + healthCheckUri: "/onboarding-api/v1.0/healthcheck" + +# #GSS IDNS +switchoverDetector: + gBeFqdn: + gFeFqdn: + beVip: 1.2.3.4 + feVip: 1.2.3.4 + beResolveAttempts: 3 + feResolveAttempts: 3 + enabled: false + interval: 60 + changePriorityUser: ecompasdc + changePriorityPassword: ecompasdc123 + publishNetworkUrl: + publishNetworkBody: '{"note":"comment"}' + 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"}'} + +applicationL1Cache: + datatypes: + enabled: true + firstRunDelay: 10 + pollIntervalInSec: 60 + +applicationL2Cache: + enabled: false + catalogL1Cache: + enabled: false + resourcesSizeInCache: 300 + servicesSizeInCache: 200 + productsSizeInCache: 100 + queue: + syncIntervalInSecondes: 43200 + waitOnShutDownInMinutes: 10 + numberOfCacheWorkers: 4 + +toscaValidators: + stringMaxLength: 2500 + +disableAudit: false + +vfModuleProperties: + min_vf_module_instances: + forBaseModule: 1 + forNonBaseModule: 0 + max_vf_module_instances: + forBaseModule: 1 + forNonBaseModule: + initial_count: + forBaseModule: 1 + forNonBaseModule: 0 + vf_module_type: + forBaseModule: Base + forNonBaseModule: Expansion + +genericAssetNodeTypes: + VFC: org.openecomp.resource.abstract.nodes.VFC + CVFC: org.openecomp.resource.abstract.nodes.VFC + VF : org.openecomp.resource.abstract.nodes.VF + CR : org.openecomp.resource.abstract.nodes.CR + PNF: org.openecomp.resource.abstract.nodes.PNF + Service: org.openecomp.resource.abstract.nodes.service + ETSI NFV Network Service: tosca.nodes.nfv.NS + +# Defines the base types for Services +# : +# required: //if the base type is mandatory or not +# baseTypes: //the base types. Required if the base type is required. +# If not provided, the category will have no base type. +serviceBaseNodeTypes: + ETSI NFV Network Service: + required: true + baseTypes: + - tosca.nodes.nfv.NS + AutomationComposition: + required: false + +workloadContext: Production + +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 + +gabConfig: + - artifactType: 'VES_EVENTS' + pathsAndNamesDefinitions: + - + friendlyName: "Action" + path: "event.action[2]" + searchable: true + - + friendlyName: "Comment" + path: "event.comment" + searchable: true + - + friendlyName: "Alarm Additional Information" + path: "event.structure.faultFields.structure.alarmAdditionalInformation.comment" + searchable: true + - artifactType: 'PM_DICTIONARY' + pathsAndNamesDefinitions: + - + friendlyName: "measType" + path: "pmMetaData.pmFields.measType" + searchable: true + - + friendlyName: "measDescription" + path: "pmMetaData.pmFields.measDescription" + searchable: true + - + friendlyName: "measCondition" + path: "pmMetaData.pmFields.measCondition" + searchable: false + - + friendlyName: "measResultUnits" + path: "pmMetaData.pmFields.measResultUnits" + searchable: false + - + friendlyName: "measResultRange" + path: "pmMetaData.pmFields.measResultRange" + searchable: false + - + friendlyName: "measObjClass" + path: "pmMetaData.pmFields.measObjClass" + searchable: true + - + friendlyName: "measCollectionMethod" + path: "pmMetaData.pmFields.measCollectionMethod" + searchable: false + - + friendlyName: "measInfoId" + path: "pmMetaData.pmFields.measInfoId" + searchable: true + - + friendlyName: "iMeasInfoId" + path: "pmMetaData.pmFields.iMeasInfoId" + searchable: false + +dmaapConsumerConfiguration: + active: false + 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: + aftDme2SslEnable: true + aftDme2ClientSslCertAlias: certman + +dmaapProducerConfiguration: + active: true + hosts: olsd004.com:3905 + consumerGroup: sdc-integration-test-1737011830 + consumerId: sdc-integration-test1-1737011830 + timeoutMs: 15000 + limit: 1 + pollingInterval: 2 + topic: SDC-FACADE-NOTIF-v1 + latitude: 32.109333 + longitude: 34.855499 + version: 1.0 + serviceName: dmaap.com:3905/events + environment: integration-test + partner: BOT_R + routeOffer: MR1 + protocol: + contenttype: application/json + dme2TraceOn: true + aftEnvironment: + aftDme2ConnectionTimeoutMs: 15000 + aftDme2RoundtripTimeoutMs: 240000 + aftDme2ReadTimeoutMs: 50000 + dme2preferredRouterFilePath: + timeLimitForNotificationHandleMs: 120000 + credential: + username: user1@sdc.com + password: password== + aftDme2SslEnable: true + aftDme2ClientSslCertAlias: certman + +# ToDo: AF - had to remove due to configuration laod class failure +#dmeConfiguration: +# lookupUriFormat: "http://DME2RESOLVE/service=%s/version=1.0.0/envContext=%s/routeOffer=DEFAULT" +# dme2Search: DME2SEARCH +# dme2Resolve: DME2RESOLVE + +excludedPolicyTypesMapping: + # VF: + # - a.b.c + # - c.d.e + #CR: + # - x.y.z + +excludedGroupTypesMapping: + CR: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - org.openecomp.groups.Group + - tosca.groups.Root + PNF: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - org.openecomp.groups.Group + - tosca.groups.Root + VF: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - org.openecomp.groups.Group + - tosca.groups.Root + Service: + - org.openecomp.groups.VfModule + - org.openecomp.groups.heat.HeatStack + - org.openecomp.groups.Group + - tosca.groups.Root + +healthStatusExclude: + - DE + - DMAAP + - DMAAP_PRODUCER + - ON_BOARDING + - DCAE + - PORTAL + - External API + +#Auto Healing +enableAutoHealing: false +appVersion: + +artifactGeneratorConfig: Artifact-Generator.properties +resourcesForUpgrade: + 8.0: + - org.openecomp.resource.cp.extCP + - tosca.nodes.network.Network + - tosca.nodes.network.Port + - org.openecomp.resource.cp.nodes.network.SubInterface +skipUpgradeFailedVfs: true +skipUpgradeVSPs: true +autoHealingOwner: jh0003 +supportAllottedResourcesAndProxy: true +deleteLockTimeoutInSeconds: 60 +maxDeleteComponents: 10 + +# This configuration entry lists all node type names prefix that shall be allowed on SDC. +definedResourceNamespace: + - org.openecomp.resource. + - org.onap.policy.clamp.acm. + - tosca.nodes. + +# This configuration entry lists all Directives values that shall be allowed on SDC. +directives: + - select + - selectable + - substitute + - substitutable + +externalCsarStore: + storageType: NONE # NONE, MINIO + endpoint: + host: 127.0.0.1 + port: 9000 + secure: false + credentials: + accessKey: "login" + secretKey: "password" + tempPath: "/home/onap/temp/" + uploadPartSize: 200000000 + +#This configuration specifies the delimiter used to differentiate instance name and count +componentInstanceCounterDelimiter: " " + +# Comma separated list of excluded URLs by the DataValidatorFilter +dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize" + +#Space separated list of permitted ancestors +permittedAncestors: + diff --git a/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml b/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml new file mode 100644 index 0000000000..4fec28925d --- /dev/null +++ b/integration-tests/catalog-be-resources/catalog-be/distribution-engine-configuration.yaml @@ -0,0 +1,83 @@ +uebServers: + - 10.0.11.1 + - 10.0.11.1 + +uebPublicKey: iPIxkpAMI8qTcQj8 +uebSecretKey: Ehq3WyT4bkif4zwgEbvshGal + +distributionNotifTopicName: SDC-DISTR-NOTIF-TOPIC-INT + +distributionStatusTopicName: SDC-DISTR-STATUS-TOPIC + +kafkaBootStrapServers: kafka-bootstrap-int:9092 + +initRetryIntervalSec: 5 +initMaxIntervalSec: 60 + +distribNotifServiceArtifactTypes: + info: + - MURANO-PKG + +distribNotifResourceArtifactTypes: + lifecycle: + - HEAT + - DG-XML + +environments: + - integration-test + +distributionStatusTopic: + pollingIntervalSec: 60 + fetchTimeSec: 15 + consumerGroup: sdc-integration-test + consumerId: sdc-integration-test1 + + +distributionNotificationTopic: + minThreadPoolSize: 0 + maxThreadPoolSize: 10 + maxWaitingAfterSendingSeconds: 5 + +createTopic: + partitionCount: 1 + replicationCount: 1 + +startDistributionEngine: true + +#This is false by default, since ONAP Dmaap currently doesn't support https +useHttpsWithDmaap: false +opEnvRecoveryIntervalSec: 180 +allowedTimeBeforeStaleSec: 300 + +aaiConfig: + httpRequestConfig: + serverRootUrl: https://localhost:8443 + resourceNamespaces: + operationalEnvironments: /aai/v12/cloud-infrastructure/operational-environments + + httpClientConfig: + timeouts: + readTimeoutMs: 5000 + connectTimeoutMs: 1000 + clientCertificate: + keyStore: /app/jetty/base/be/etc/non-prod.jks + keyStorePassword: hmXYcznAljMSisdy8zgcag== + headers: + X-FromAppId: asdc + numOfRetries: 3 + +msoConfig: + httpRequestConfig: + serverRootUrl: http://127.0.0.1:8080/onap/mso/infra/modelDistributions/v1 + resourceNamespaces: + distributions: /distributions + + httpClientConfig: + timeouts: + readTimeoutMs: 2000 + connectTimeoutMs: 500 + basicAuthorization: + userName: asdc + password: OTLEp5lfVhYdyw5EAtTUBQ== + numOfRetries: 3 + diff --git a/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties b/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties new file mode 100644 index 0000000000..7361a3ccc4 --- /dev/null +++ b/integration-tests/catalog-be-resources/catalog-be/janusgraph.properties @@ -0,0 +1,30 @@ +storage.backend=cql +storage.hostname=sdc-cs +storage.port=9042 +storage.username=asdc_user +storage.password=Aa1234%^! +storage.connection-timeout=20000 +storage.cql.keyspace=sdctitan + +storage.cql.ssl.enabled=false +storage.cql.ssl.keystore.location= +storage.cql.ssl.keystore.password= +storage.cql.ssl.truststore.location= +storage.cql.ssl.truststore.password= + +storage.cql.read-consistency-level=ONE +storage.cql.write-consistency-level=ALL +storage.cql.replication-strategy-class=NetworkTopologyStrategy +storage.cql.replication-strategy-options=SDC-CS-integration-test,1 +storage.cql.local-datacenter=SDC-CS-integration-test + + +cache.db-cache = true +cache.db-cache-clean-wait = 20 +cache.db-cache-time = 180000 +cache.db-cache-size = 0.5 + +cache.tx-cache-size = 1000000 + +storage.lock.retries=5 +graph.replace-instance-if-exists=true diff --git a/integration-tests/catalog-be-resources/init-script/check_backend.sh b/integration-tests/catalog-be-resources/init-script/check_backend.sh new file mode 100644 index 0000000000..cf7d6e4053 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/check_backend.sh @@ -0,0 +1,48 @@ +#!/bin/sh + + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +# Initialize optional flags as empty strings +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" +basic_auth_config="" + +# Set TLS configuration flags if using HTTPS +if [ "$protocol" = "https" ]; then + [ -n "$TLS_CERT" ] && tls_cert="--tls_cert $TLS_CERT" + [ -n "$TLS_KEY" ] && tls_key="--tls_key $TLS_KEY" + [ -n "$TLS_KEY_PW" ] && tls_key_pw="--tls_key_pw $TLS_KEY_PW" + [ -n "$CA_CERT" ] && ca_cert="--ca_cert $CA_CERT" +fi + + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdccheckbackend..." + +sdccheckbackend -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdccheckbackend." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh b/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh new file mode 100644 index 0000000000..3b7267c356 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/create_consumer_and_user.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +# Set protocol and port based on the HTTP setting +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + https_flag="--https" + be_port=$BE_HTTPS_PORT +else + protocol="http" + https_flag="" + be_port=$BE_HTTP_PORT +fi + +basic_auth_config="" + +# Check if both username and password are provided +if [ -n "$BASIC_AUTH_USER" ] && [ -n "$BASIC_AUTH_PASS" ]; then + # Create just the Base64-encoded value of "username:password" + basic_auth_config="--header $(echo -n "$BASIC_AUTH_USER:$BASIC_AUTH_PASS" | base64)" +fi + + +tls_cert="" +tls_key="" +tls_key_pw="" +ca_cert="" + +if [ "$protocol" = "https" ]; then + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +fi + +# Execute sdcuserinit command +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcuserinit..." + +sdcuserinit -i $BE_IP -p $be_port $basic_auth_config $user_conf_dir $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert +echo "sdcuserinit executed successfully." + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcconsumerinit..." +sdcconsumerinit -i $BE_IP -p $be_port $basic_auth_config $https_flag $tls_cert $tls_key $tls_key_pw $ca_cert + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Finished sdcuserinit and sdcconsumerinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" diff --git a/integration-tests/catalog-be-resources/init-script/import_normatives.sh b/integration-tests/catalog-be-resources/init-script/import_normatives.sh new file mode 100644 index 0000000000..e21e1b01b0 --- /dev/null +++ b/integration-tests/catalog-be-resources/init-script/import_normatives.sh @@ -0,0 +1,65 @@ +#!/bin/sh + + +# Set protocol and port based on DISABLE_HTTP +if [ "$DISABLE_HTTP" = "true" ]; then + protocol="https" + be_port=$BE_HTTPS_PORT + param="-i $BE_IP -p $be_port --https" + + # Set TLS flags if certificates are provided + if [ -n "$TLS_CERT" ]; then + tls_cert="--tls_cert $TLS_CERT" + fi + if [ -n "$TLS_KEY" ]; then + tls_key="--tls_key $TLS_KEY" + fi + if [ -n "$TLS_KEY_PW" ]; then + tls_key_pw="--tls_key_pw $TLS_KEY_PW" + fi + if [ -n "$CA_CERT" ]; then + ca_cert="--ca_cert $CA_CERT" + fi +else + protocol="http" + be_port="$BE_HTTP_PORT" + param="-i $BE_IP -p $be_port" +fi + +# Set basic authentication if enabled +if [ "$BASIC_AUTH_ENABLED" = "true" ]; then + basic_auth_user="${BASIC_AUTH_USER:-}" + basic_auth_pass="${BASIC_AUTH_PASS:-}" + + if [ -n "$basic_auth_user" ] && [ -n "$basic_auth_pass" ]; then + basic_auth_config="--header $(echo -n "$basic_auth_user:$basic_auth_pass" | base64)" + else + basic_auth_config="" + fi +else + basic_auth_config="" +fi + +# Extract normatives tarball and run the initialization command +echo "Extracting normatives.tar.gz and initializing SDC..." +cd /var/tmp/ || exit 1 +cp /home/onap/normatives.tar.gz /var/tmp/ +tar -xvf /var/tmp/normatives.tar.gz + +start_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$start_time] Starting sdcinit..." + +# Run sdcinit command with the constructed parameters +cd /var/tmp/normatives/import/tosca || exit 1 +sdcinit $param $basic_auth_config $tls_cert $tls_key $tls_key_pw $ca_cert > "/home/onap/logs/init.log" 2>&1 + +end_time=$(date +"%Y-%m-%d %H:%M:%S") +echo "[$end_time] Done sdcinit." + +start_ts=$(date -d "$start_time" +%s) +end_ts=$(date -d "$end_time" +%s) +elapsed=$((end_ts - start_ts)) +echo "Elapsed time: $elapsed seconds" + +echo "SDC initialization Done. Logs can be found at ${ONAP_LOG}/init.log" + diff --git a/integration-tests/catalog-be-resources/ready-probe.sh b/integration-tests/catalog-be-resources/ready-probe.sh new file mode 100644 index 0000000000..bb730ab272 --- /dev/null +++ b/integration-tests/catalog-be-resources/ready-probe.sh @@ -0,0 +1,9 @@ +#!/bin/sh +health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8080/sdc2/rest/healthCheck) + +if [ "$health_check_http_code" -eq 200 ]; then + exit 0 +else + echo "Health check http status: $health_check_http_code" + exit 1 +fi diff --git a/integration-tests/catalog-be-resources/resource/key.properties b/integration-tests/catalog-be-resources/resource/key.properties new file mode 100644 index 0000000000..b6bf4b7e91 --- /dev/null +++ b/integration-tests/catalog-be-resources/resource/key.properties @@ -0,0 +1,41 @@ +### +# ============LICENSE_START========================================== +# ONAP Portal SDK +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ============LICENSE_END============================================ +# +# +### + +# Properties read by the ECOMP Framework library (epsdk-fw) + +cipher.enc.key = AGLDdG4D04BKm2IxIWEr8o== diff --git a/integration-tests/catalog-be-resources/resource/portal.properties b/integration-tests/catalog-be-resources/resource/portal.properties new file mode 100644 index 0000000000..888ce76a68 --- /dev/null +++ b/integration-tests/catalog-be-resources/resource/portal.properties @@ -0,0 +1,89 @@ +### +# ============LICENSE_START========================================== +# ONAP Portal SDK +# =================================================================== +# Copyright © 2017 AT&T Intellectual Property. All rights reserved. +# =================================================================== +# +# Unless otherwise specified, all software contained herein is licensed +# under the Apache License, Version 2.0 (the “License”); +# you may not use this software except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# Unless otherwise specified, all documentation contained herein is licensed +# under the Creative Commons License, Attribution 4.0 Intl. (the “License”); +# you may not use this documentation except in compliance with the License. +# You may obtain a copy of the License at +# +# https://creativecommons.org/licenses/by/4.0/ +# +# Unless required by applicable law or agreed to in writing, documentation +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# ============LICENSE_END============================================ +# +# +### +# Properties read by ECOMP Framework library, ecompFW.jar + +########################################################################## +# The following properties should NOT be changed by partner applications. +########################################################################## + +portal.api.prefix = /api +max.idle.time = 5 +user.attribute.name = user_attribute + +#Use REST API instead of UEB to fetch the functional menu data +use_rest_for_functional_menu=true + + +########################################################################## +# The following properties MUST be changed by partner applications. +########################################################################## + +# Name of java class that implements the OnBoardingApiService interface. +portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestApiCentralServiceImpl +role_access_centralized = remote + +# Cookie set by CSP-SSO +#csp_cookie_name = onapCsp + +# CSP setting, most use PROD; DEV also recognized +csp_gate_keeper_prod_key = PROD + +# URL of the Portal where this app is onboarded +ecomp_redirect_url = http://portal.api.simpledemo.openecomp.org:8989/ECOMPPORTAL/login.htm + +# URL of the ECOMP Portal REST API +ecomp_rest_url = http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/auxapi + +# Connection and Read timeout values +ext_req_connection_timeout = 15000 +ext_req_read_timeout = 20000 + +# Name of java class that implements the OnBoardingApiService interface. +portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestApiCentralServiceImpl + +#Portal user & key +portal_app_name = Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA= +portal_pass = j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI= +portal_user = Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA= + + +# UEB key generated while on-boarding +ueb_app_key = "" + +# Applications do not need to run a UEB listener after 1607. +ueb_listeners_enable = false diff --git a/integration-tests/catalog-be-resources/start.d/http.ini b/integration-tests/catalog-be-resources/start.d/http.ini new file mode 100644 index 0000000000..555c1dd204 --- /dev/null +++ b/integration-tests/catalog-be-resources/start.d/http.ini @@ -0,0 +1,29 @@ +# --------------------------------------- +# Module: http +--module=http + +### HTTP Connector Configuration + +## Connector host/address to bind to +# jetty.http.host=0.0.0.0 + +## Connector port to listen on +jetty.http.port=8080 + +## Connector idle timeout in milliseconds +jetty.http.idleTimeout=30000 + +## Connector socket linger time in seconds (-1 to disable) +# jetty.http.soLingerTime=-1 + +## Number of acceptors (-1 picks default based on number of cores) +# jetty.http.acceptors=-1 + +## Number of selectors (-1 picks default based on number of cores) +# jetty.http.selectors=-1 + +## ServerSocketChannel backlog (0 picks platform default) +# jetty.http.acceptorQueueSize=0 + +## Thread priority delta to give to acceptor threads +# jetty.http.acceptorPriorityDelta=0 diff --git a/integration-tests/catalog-be-resources/start.d/https.ini b/integration-tests/catalog-be-resources/start.d/https.ini new file mode 100644 index 0000000000..bafdfddaa2 --- /dev/null +++ b/integration-tests/catalog-be-resources/start.d/https.ini @@ -0,0 +1,29 @@ +# --------------------------------------- +# Module: https +--module=https + +### HTTPS Connector Configuration + +## Connector host/address to bind to +# jetty.https.host=0.0.0.0 + +## Connector port to listen on +jetty.https.port=8443 + +## Connector idle timeout in milliseconds +jetty.https.idleTimeout=30000 + +## Connector socket linger time in seconds (-1 to disable) +# jetty.https.soLingerTime=-1 + +## Number of acceptors (-1 picks default based on number of cores) +# jetty.https.acceptors=-1 + +## Number of selectors (-1 picks default based on number of cores) +# jetty.https.selectors=-1 + +## ServerSocketChannel backlog (0 picks platform default) +# jetty.https.acceptorQueueSize=0 + +## Thread priority delta to give to acceptor threads +# jetty.https.acceptorPriorityDelta=0 diff --git a/integration-tests/catalog-be-resources/start.d/ssl.ini b/integration-tests/catalog-be-resources/start.d/ssl.ini new file mode 100644 index 0000000000..46eb7f15c9 --- /dev/null +++ b/integration-tests/catalog-be-resources/start.d/ssl.ini @@ -0,0 +1,84 @@ +# --------------------------------------- +# Module: ssl +--module=ssl + +### TLS(SSL) Connector Configuration + +## Connector host/address to bind to +# jetty.ssl.host=0.0.0.0 + +## Connector port to listen on +jetty.ssl.port=8443 + +## Connector idle timeout in milliseconds +# jetty.ssl.idleTimeout=30000 + +## Connector socket linger time in seconds (-1 to disable) +# jetty.ssl.soLingerTime=-1 + +## Number of acceptors (-1 picks default based on number of cores) +# jetty.ssl.acceptors=-1 + +## Number of selectors (-1 picks default based on number of cores) +# jetty.ssl.selectors=-1 + +## ServerSocketChannel backlog (0 picks platform default) +# jetty.ssl.acceptorQueueSize=0 + +## Thread priority delta to give to acceptor threads +# jetty.ssl.acceptorPriorityDelta=0 + +## Whether request host names are checked to match any SNI names +# jetty.ssl.sniHostCheck=true + +## max age in seconds for a Strict-Transport-Security response header (default -1) +# jetty.ssl.stsMaxAgeSeconds=31536000 + +## include subdomain property in any Strict-Transport-Security header (default false) +# jetty.ssl.stsIncludeSubdomains=true + +### SslContextFactory Configuration +## Note that OBF passwords are not secure, just protected from casual observation +## See http://www.eclipse.org/jetty/documentation/current/configuring-security-secure-passwords.html + +## Keystore file path (relative to $jetty.base) + +## Truststore file path (relative to $jetty.base) + +## Keystore password + +## Keystore type and provider +# jetty.sslContext.keyStoreType=JKS +# jetty.sslContext.keyStoreProvider= + +## KeyManager password + +## Truststore password +# tpend +# kpend + +## Truststore type and provider +# jetty.sslContext.trustStoreType=JKS +# jetty.sslContext.trustStoreProvider= + +## whether client certificate authentication is required +jetty.sslContext.needClientAuth=false + +## Whether client certificate authentication is desired +# jetty.sslContext.wantClientAuth=false + +## Whether cipher order is significant (since java 8 only) +# jetty.sslContext.useCipherSuitesOrder=true + +## To configure Includes / Excludes for Cipher Suites or Protocols see tweak-ssl.xml example at +## https://www.eclipse.org/jetty/documentation/current/configuring-ssl.html#configuring-sslcontextfactory-cipherSuites + +## Set the size of the SslSession cache +# jetty.sslContext.sslSessionCacheSize=-1 + +## Set the timeout (in seconds) of the SslSession cache timeout +# jetty.sslContext.sslSessionTimeout=-1 + +## Allow SSL renegotiation +# jetty.sslContext.renegotiationAllowed=true +# jetty.sslContext.renegotiationLimit=5 diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml index 62b3f620e7..15c691ef69 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -47,6 +47,7 @@ limitations under the License. asdc_user Aa1234%^! ${project.build.directory}/chef-config + ${project.build.directory}/catalog-be-resources ${project.build.directory}/plugins/sdc-be /tmp/sdc-integration-tests latest @@ -425,6 +426,63 @@ limitations under the License. + + + org.apache.maven.plugins + maven-resources-plugin + 3.3.1 + + + copy-resources + prepare-package + + copy-resources + + + ${it.catalog.resource} + + + catalog-be-resources + + **/* + + + + + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + 3.1.0 + + + set-executable-permissions + prepare-package + + + + + + + + + + + + + + + run + + + + + + maven-resources-plugin @@ -455,6 +513,9 @@ limitations under the License. + + + copy-sdc-be-plugins pre-integration-test @@ -545,6 +606,10 @@ limitations under the License. + + + + org.codehaus.mojo wagon-maven-plugin @@ -784,6 +849,7 @@ limitations under the License. + ${docker.namespace}/sdc-onboard-cassandra-init:${it.docker.version} sdc-cassandra-onboard-init @@ -818,6 +884,7 @@ limitations under the License. + ${docker.namespace}/sdc-onboard-backend:${it.docker.version} sdc-onboard-backend @@ -871,6 +938,7 @@ limitations under the License. + ${docker.namespace}/sdc-backend-all-plugins:${it.docker.version} sdc-backend @@ -892,14 +960,24 @@ limitations under the License. sdc-BE - - ${project.basedir}/integration-tests-init/BE-configuration.yaml.erb:/app/jetty/chef-solo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb - - ${it.chef.config}:/app/jetty/chef-solo/environments + + + + ${it.catalog.resource}/catalog-be/configuration.yaml:/app/jetty/config/catalog-be/configuration.yaml + ${it.catalog.resource}/catalog-be/distribution-engine-configuration.yaml:/app/jetty/config/catalog-be/distribution-engine-configuration.yaml + ${it.catalog.resource}/catalog-be/janusgraph.properties:/app/jetty/config/catalog-be/janusgraph.properties + ${it.catalog.resource}/resource/key.properties:/app/jetty/resources/key.properties + ${it.catalog.resource}/resource/portal.properties:/app/jetty/resources/portal.properties + ${it.catalog.resource}/start.d/http.ini:/app/jetty/start.d/http.ini + ${it.catalog.resource}/start.d/https.ini:/app/jetty/start.d/https.ini + ${it.catalog.resource}/start.d/ssl.ini:/app/jetty/start.d/ssl.ini + ${it.catalog.resource}/ready-probe.sh:/app/jetty/ready-probe.sh ${it.shared.volume}:/app/jetty/logs - + + ${project.basedir}/src/test/resources/cert/catalog-be:/app/jetty/onap/cert + @@ -926,28 +1004,44 @@ limitations under the License. + ${docker.namespace}/sdc-backend-init:${it.docker.version} sdc-backend-init + + ${project.basedir}/../catalog-be/sdc-backend-init + sdc-backend ${it.env.name} + false + 8080 + 8443 + sdc-BE + true + testName + testPass + "" + "" + "" + "" sdc-BE-init - - ${it.chef.config}:/home/onap/chef-solo/environments - ${it.shared.volume}:/home/onap/logs + /bin/sh -c "/home/onap/check_backend.sh" + /bin/sh -c "/home/onap/create_consumer_and_user.sh" + /bin/sh -c "/home/onap/import_normatives.sh" + - Chef Client finished + Done custom @@ -956,7 +1050,9 @@ limitations under the License. - + + + ${docker.namespace}/sdc-frontend:${it.docker.version} sdc-frontend @@ -979,7 +1075,7 @@ limitations under the License. - + sdc-FE direct @@ -1157,6 +1253,7 @@ limitations under the License. + @@ -1331,3 +1428,4 @@ limitations under the License. + -- cgit 1.2.3-korg