From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../main/resources/ci/conf/attsdc-packages.yaml | 2 - ui-ci-dev/src/main/resources/ci/conf/attsdc.yaml | 80 ---------------------- .../src/main/resources/ci/conf/log4j.properties | 34 --------- .../src/main/resources/ci/conf/titan.properties | 7 -- 4 files changed, 123 deletions(-) delete mode 100644 ui-ci-dev/src/main/resources/ci/conf/attsdc-packages.yaml delete mode 100644 ui-ci-dev/src/main/resources/ci/conf/attsdc.yaml delete mode 100644 ui-ci-dev/src/main/resources/ci/conf/log4j.properties delete mode 100644 ui-ci-dev/src/main/resources/ci/conf/titan.properties (limited to 'ui-ci-dev/src/main/resources/ci/conf') diff --git a/ui-ci-dev/src/main/resources/ci/conf/attsdc-packages.yaml b/ui-ci-dev/src/main/resources/ci/conf/attsdc-packages.yaml deleted file mode 100644 index dcb78eefc1..0000000000 --- a/ui-ci-dev/src/main/resources/ci/conf/attsdc-packages.yaml +++ /dev/null @@ -1,2 +0,0 @@ -packages: - - org.openecomp.sdc.ci.tests.execute.resourceui \ No newline at end of file diff --git a/ui-ci-dev/src/main/resources/ci/conf/attsdc.yaml b/ui-ci-dev/src/main/resources/ci/conf/attsdc.yaml deleted file mode 100644 index 8cd8068d08..0000000000 --- a/ui-ci-dev/src/main/resources/ci/conf/attsdc.yaml +++ /dev/null @@ -1,80 +0,0 @@ -outputFolder: target -reportName: index.html -catalogBeHost: behost -catalogFeHost: fehost -esHost: eshost -disributionClientHost: disClient -catalogFePort: 8181 -catalogBePort: 8080 -disributionClientPort: 8181 -esPort: 9200 -neoHost: neoHost -neoPort: 7474 -neoDBusername: neo4j -neoDBpassword: 123456 -url: http://localhost:8181/sdc1/proxy-designer1#/dashboard -webSealSimulatorUrl: http://localhost:8285/sdc1 -remoteTestingMachineIP: localhost -remoteTestingMachinePort: 5555 -remoteTesting: false - -resourceConfigDir: src/test/resources/CI/tests -componentsConfigDir: src/test/resources/CI/components -importResourceConfigDir: ../catalog-be/src/main/resources/import/tosca/capability-types -importResourceTestsConfigDir: src/test/resources/CI/importResourceTests -errorConfigurationFile: ../catalog-be/src/main/resources/config/error-configuration.yaml -configurationFile: ../catalog-be/src/main/resources/config/configuration.yaml -importTypesConfigDir: src/test/resources/CI/importTypesTest - - -titanPropertiesFile: src/main/resources/ci/conf/titan.properties -cassandraHost: 127.0.0.1 -cassandraAuthenticate: false -cassandraUsername: koko -cassandraPassword: bobo -cassandraSsl: false -cassandraTruststorePath : /path/path -cassandraTruststorePassword : 123123 -cassandraAuditKeySpace: sdcaudit -cassandraArtifactKeySpace: sdcartifact - -stopOnClassFailure: false - -#List of non-abstract resources to keep during titan cleanup between tests -#Only 1.0 version will be kept -resourcesNotToDelete: - - Compute - - Database - - ObjectStorage - - BlockStorage - - LoadBalancer - - Port - - Network - - Root - - ContainerApplication - - ContainerRuntime - - DBMS - - SoftwareComponent - - WebApplication - - WebServer - - CinderVolume - - ContrailVirtualNetwork - - NeutronNet - - NeutronPort - - NovaServer -#Resource categories to keep (including all their subcategories) -resourceCategoriesNotToDelete: - - Generic - - Network L2-3 - - Network L4+ - - Application L4+ - - Network Connectivity - - Template - - Allotted Resource - -#Service categories to keep -serviceCategoriesNotToDelete: - - Mobility - - Network L1-3 - - Network L4 - - VoIP Call Control \ No newline at end of file diff --git a/ui-ci-dev/src/main/resources/ci/conf/log4j.properties b/ui-ci-dev/src/main/resources/ci/conf/log4j.properties deleted file mode 100644 index 3e159ec8df..0000000000 --- a/ui-ci-dev/src/main/resources/ci/conf/log4j.properties +++ /dev/null @@ -1,34 +0,0 @@ -# Define the root logger with appender file -log4j.rootLogger = DEBUG, FILE, stdout - -# Define the file appender -log4j.appender.FILE=org.apache.log4j.RollingFileAppender -log4j.appender.FILE.File=${targetlog}logs/ci-log.out - -# Define the layout for file appender -log4j.appender.FILE.layout=org.apache.log4j.PatternLayout -log4j.appender.FILE.layout.conversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p [%10c] : %m%n - -# Set the maximum file size before rollover -log4j.appender.FILE.maxFileSize=5MB - -# Set the the backup index -log4j.appender.FILE.maxBackupIndex=10 - - -############################################################# - -# Direct log messages to stdout -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.Target=System.out -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -#log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %-5p %c{1}:%L - %m%n -log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n - -log4j.logger.org.apache.cassandra.service.StorageProxy=DEBUG -log4j.logger.com.thinkaurelius.titan.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout - -log4j.logger.org.openecomp.sdc.ci.tests.utils=TRACE, FILE, stdout -log4j.additivity.org.openecomp.sdc.ci.tests.utils=false - - diff --git a/ui-ci-dev/src/main/resources/ci/conf/titan.properties b/ui-ci-dev/src/main/resources/ci/conf/titan.properties deleted file mode 100644 index 94d12cfba0..0000000000 --- a/ui-ci-dev/src/main/resources/ci/conf/titan.properties +++ /dev/null @@ -1,7 +0,0 @@ -storage.backend=cassandra -storage.hostname=cassandrahost -storage.port=9160 - -cache.db-cache-clean-wait = 20 -cache.db-cache-time = 180000 -cache.db-cache-size = 0.5 \ No newline at end of file -- cgit 1.2.3-korg