diff options
Diffstat (limited to 'integration-tests')
10 files changed, 322 insertions, 6 deletions
diff --git a/integration-tests/openecomp-be-config/jetty-config/http.ini b/integration-tests/openecomp-be-config/jetty-config/http.ini new file mode 100644 index 0000000000..c5b62c1217 --- /dev/null +++ b/integration-tests/openecomp-be-config/jetty-config/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=8081 + +## 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/openecomp-be-config/jetty-config/https.ini b/integration-tests/openecomp-be-config/jetty-config/https.ini new file mode 100644 index 0000000000..9cc18dd319 --- /dev/null +++ b/integration-tests/openecomp-be-config/jetty-config/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=8445 + +## 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/openecomp-be-config/jetty-config/ssl.ini b/integration-tests/openecomp-be-config/jetty-config/ssl.ini new file mode 100644 index 0000000000..eaeccca4aa --- /dev/null +++ b/integration-tests/openecomp-be-config/jetty-config/ssl.ini @@ -0,0 +1,90 @@ +# --------------------------------------- +# 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=8445 + +## 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) +jetty.sslContext.keyStorePath=etc/org.onap.sdc.p12 + +## Truststore file path (relative to $jetty.base) +jetty.sslContext.trustStorePath=etc/org.onap.sdc.trust.jks + +## Keystore password +# jetty.sslContext.keyStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.sslContext.keyStorePassword=?(kP!Yur![*!Y5!E^f(ZKc31 + +## Keystore type and provider +# jetty.sslContext.keyStoreType=JKS +# jetty.sslContext.keyStoreProvider= + +## KeyManager password +# jetty.sslContext.keyManagerPassword=OBF:1u2u1wml1z7s1z7a1wnl1u2g +jetty.sslContext.keyManagerPassword=?(kP!Yur![*!Y5!E^f(ZKc31 + +## Truststore password +# jetty.sslContext.trustStorePassword=OBF:1vny1zlo1x8e1vnw1vn61x8g1zlu1vn4 +jetty.sslContext.trustStorePassword=z+KEj;t+,KN^iimSiS89e#p0 + +## 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/openecomp-be-config/onboard-backend-config/config-helmvalidator.yaml b/integration-tests/openecomp-be-config/onboard-backend-config/config-helmvalidator.yaml new file mode 100644 index 0000000000..de6dfa1172 --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/config-helmvalidator.yaml @@ -0,0 +1,7 @@ +hValidatorEnabled: true +hValidatorUrl: http://helm-validator:8080/validate +hValidatorVersion: v3 +hValidatorDeployable: true +hValidatorLintable: true +hValidatorStrictLintable: false + diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/config-vnfrepo.yaml b/integration-tests/openecomp-be-config/onboard-backend-config/config-vnfrepo.yaml new file mode 100644 index 0000000000..07694adf16 --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/config-vnfrepo.yaml @@ -0,0 +1,5 @@ +vnfRepoPort: 8702 +vnfRepoHost: 10.0.14.1 +getVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars +downloadVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/%s/files + diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/externaltesting-configuration.yaml b/integration-tests/openecomp-be-config/onboard-backend-config/externaltesting-configuration.yaml new file mode 100644 index 0000000000..9bea6fc50e --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/externaltesting-configuration.yaml @@ -0,0 +1,6 @@ +client: + enabled: true +endpoints: + - vtp,VTP,true,http://refrepo:8702/onapapi/vnfsdk-marketplace,onap.* + - repository,Repository,false,,.* + diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/features.properties b/integration-tests/openecomp-be-config/onboard-backend-config/features.properties new file mode 100644 index 0000000000..27390ed706 --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/features.properties @@ -0,0 +1,2 @@ +EXTERNAL_LICENSE=true + diff --git a/integration-tests/openecomp-be-config/onboard-backend-config/onboarding_configuration.yaml b/integration-tests/openecomp-be-config/onboard-backend-config/onboarding_configuration.yaml new file mode 100644 index 0000000000..88fa84cb64 --- /dev/null +++ b/integration-tests/openecomp-be-config/onboard-backend-config/onboarding_configuration.yaml @@ -0,0 +1,73 @@ +catalogNotificationsConfig: + # catalog backend protocol + catalogBeProtocol: http + catalogBeHttpPort: 8080 + catalogBeSslPort: 8443 + catalogBeFqdn: sdc-BE + # do not remove the "" from catalog_notification_url. it is escaping % characters coming from AUTO.json + catalogNotificationUrl: "%s://%s:%s/sdc2/rest/v1/catalog/notif/vsp/" + +notifications: + pollingIntervalMsec: 2000 + selectionSize: 100 + beHost: sdc-onboard-BE + beHttpPort: 8081 + +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 + truststorePath: /app/jetty/etc/truststore + truststorePassword: Aa123456 + +authCookie: + securityKey: MlB1WHFpSHNVTWdJZU1PcQ== + maxSessionTimeOut: 86400000 + sessionIdleTimeOut: 3600000 + cookieName: "AuthenticationCookie" + path: / + domain: "" + isHttpOnly: true + # redirect variable name from portal.properties file + redirectURL: "redirect_url" + excludedUrls: [ '/.*' ] + onboardingExcludedUrls: [ '/.*' ] + +basicAuth: + enabled: true + userName: testName + userPass: testPass + excludedUrls: "/v1.0/healthcheck" + +zipValidation: + ignoreManifest: false + +externalCsarStore: + storageType: NONE # NONE, MINIO + endpoint: + host: 127.0.0.1 + port: 9000 + secure: false + credentials: + accessKey: "login" + secretKey: "password" + foldersToStrip: + - Files/images + sizeLimit: 10000000 + thresholdEntries: 10000 + tempPath: "/home/onap/temp/" + uploadPartSize: 200000000 + +#Space separated list of permitted ancestors +permittedAncestors: + +# Comma separated list of excluded URLs by the DataValidatorFilter +dataValidatorFilterExcludedUrls: "/healthCheck,/followed,/authorize" + diff --git a/integration-tests/openecomp-be-config/ready-probe.sh b/integration-tests/openecomp-be-config/ready-probe.sh new file mode 100644 index 0000000000..ad97abf27b --- /dev/null +++ b/integration-tests/openecomp-be-config/ready-probe.sh @@ -0,0 +1,9 @@ +#!/bin/sh +health_check_http_code=$(curl -k --max-time 5 -o /dev/null -w '%{http_code}' -X GET --header "Accept: application/json" "http://127.0.0.1:8081/onboarding-api/v1.0/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/pom.xml b/integration-tests/pom.xml index 15c691ef69..9b6366363d 100644 --- a/integration-tests/pom.xml +++ b/integration-tests/pom.xml @@ -47,7 +47,10 @@ limitations under the License. <it.sdc.user>asdc_user</it.sdc.user> <it.sdc.password>Aa1234%^!</it.sdc.password> <it.chef.config>${project.build.directory}/chef-config</it.chef.config> - <it.catalog.resource>${project.build.directory}/catalog-be-resources</it.catalog.resource> + <it.catalog.resource>${project.build.directory}/catalog-be-resources</it.catalog.resource> + <it.sdc-onboard.probe>${project.build.directory}/openecomp-be-config</it.sdc-onboard.probe> + <it.sdc-onboard.config>${project.build.directory}/openecomp-be-config/onboard-backend-config</it.sdc-onboard.config> + <it.sdc-onboard.jetty>${project.build.directory}/openecomp-be-config/jetty-config</it.sdc-onboard.jetty> <it.sdc-be.plugins>${project.build.directory}/plugins/sdc-be</it.sdc-be.plugins> <it.shared.volume>/tmp/sdc-integration-tests</it.shared.volume> <it.docker.version>latest</it.docker.version> @@ -514,7 +517,63 @@ limitations under the License. </configuration> </execution> - + <execution> + <id>copy-onboard-backend-config</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.sdc-onboard.config}</outputDirectory> + <resources> + <resource> + <directory>openecomp-be-config/onboard-backend-config/</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-onboard-backend-http-config</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.sdc-onboard.jetty}</outputDirectory> + <resources> + <resource> + <directory>openecomp-be-config/jetty-config</directory> + <filtering>false</filtering> + <includes> + <include>**/*</include> + </includes> + </resource> + </resources> + </configuration> + </execution> + <execution> + <id>copy-onboard-backend-probe</id> + <phase>pre-integration-test</phase> + <goals> + <goal>copy-resources</goal> + </goals> + <configuration> + <outputDirectory>${it.sdc-onboard.probe}</outputDirectory> + <resources> + <resource> + <directory>openecomp-be-config</directory> + <filtering>false</filtering> + <includes> + <include>ready-probe.sh</include> + </includes> + </resource> + </resources> + </configuration> + </execution> <execution> <id>copy-sdc-be-plugins</id> @@ -898,7 +957,6 @@ limitations under the License. <SDC_CLUSTER_NAME>${it.sdc.cluster.name}</SDC_CLUSTER_NAME> <SDC_USER>${it.sdc.user}</SDC_USER> <SDC_PASSWORD>${it.sdc.password}</SDC_PASSWORD> - <ENVNAME>${it.env.name}</ENVNAME> <SDC_CERT_DIR>onap/cert</SDC_CERT_DIR> <JAVA_OPTIONS> -agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:4001 @@ -907,8 +965,16 @@ limitations under the License. </env> <hostname>sdc-onboard-BE</hostname> <volumes> - <bind> - <volume>${it.chef.config}:/app/jetty/chef-solo/environments</volume> + <bind> + <volume>${it.sdc-onboard.config}/config-vnfrepo.yaml:/app/jetty/config/onboarding-be/config-vnfrepo.yaml</volume> + <volume>${it.sdc-onboard.config}/onboarding_configuration.yaml:/app/jetty/config/onboarding-be/onboarding_configuration.yaml</volume> + <volume>${it.sdc-onboard.config}/config-helmvalidator.yaml:/app/jetty/config/onboarding-be/config-helmvalidator.yaml</volume> + <volume>${it.sdc-onboard.config}/externaltesting-configuration.yaml:/app/jetty/config/onboarding-be/externaltesting-configuration.yaml</volume> + <volume>${it.sdc-onboard.config}/features.properties:/app/jetty/config/onboarding-be/features.properties</volume> + <volume>${it.sdc-onboard.jetty}/http.ini:/app/jetty/start.d/http.ini</volume> + <volume>${it.sdc-onboard.jetty}/https.ini:/app/jetty/start.d/https.ini</volume> + <volume>${it.sdc-onboard.jetty}/ssl.ini:/app/jetty/start.d/ssl.ini</volume> + <volume>${it.sdc-onboard.probe}/ready-probe.sh:/app/jetty/ready.probe.sh</volume> <volume>${project.basedir}/src/test/resources/cert/onboarding-be:/app/jetty/onap/cert </volume> <volume>${it.shared.volume}:/app/jetty/logs</volume> @@ -1145,7 +1211,7 @@ limitations under the License. <run> <hostname>firefox-standalone</hostname> <wait> - <time>20000</time> + <time>30000</time> <tcp> <host>firefox-standalone</host> <mode>direct</mode> |