aboutsummaryrefslogtreecommitdiffstats
path: root/cmso-sonar/docker/integration
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-04-25 16:46:35 -0400
committerJerry Flood <jflood@att.com>2019-04-25 16:46:46 -0400
commit131273f73ec21a5632de9069f8b04f75631ce790 (patch)
tree1beca0f4aceb0a255eff938291a7bd7a1f0f634a /cmso-sonar/docker/integration
parentd4014abb85d839c14c9a2572098571e7a8523104 (diff)
Remove dead code. Add robot tests
Move interface mocking test code from cmso to robot. Issue-ID: OPTFRA-474 Change-Id: Ib98f0b16d783e01f888279266dfdee858e30b787 Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-sonar/docker/integration')
-rw-r--r--cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties2
-rw-r--r--cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties4
-rw-r--r--cmso-sonar/docker/integration/docker-compose.yml2
3 files changed, 5 insertions, 3 deletions
diff --git a/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties
index 9ff8213..c03e161 100644
--- a/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties
+++ b/cmso-sonar/docker/integration/cmso-optimizer/etc/config/optimizer.properties
@@ -31,7 +31,7 @@ spring.datasource.tomcat.initialSize=5
spring.datasource.tomcat.max-active=25
spring.datasource.tomcat.test-on-borrow=true
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
spring.jpa.hibernate.ddl-auto=none
spring.jpa.hibernate.naming.strategy=org.hibernate.cfg.EJB3NamingStrategy
spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
diff --git a/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties
index ff3dab5..af0fd37 100644
--- a/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties
+++ b/cmso-sonar/docker/integration/cmso-service/etc/config/cmso.properties
@@ -44,7 +44,7 @@ spring.datasource.tomcat.initialSize=5
spring.datasource.tomcat.max-active=25
spring.datasource.tomcat.test-on-borrow=true
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
spring.jpa.hibernate.ddl-auto=none
spring.jpa.hibernate.naming.strategy=org.hibernate.cfg.EJB3NamingStrategy
spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
@@ -94,7 +94,7 @@ so.polling.interval.ms=10000
#mso.pass=enc:bfodXf8qRfCqMvlxVBYNWQ==
## loopback settings
-so.url=http://localhost:8080/cmso/v1/loopbacktest/onap/so/infra/orchestrationRequests/v7
+so.url=http://cmso-robot:5000/onap/so/infra/orchestrationRequests/v7
so.user=cmso@onap.org
so.pass=enc:bfodXf8qRfCqMvlxVBYNWQ==
diff --git a/cmso-sonar/docker/integration/docker-compose.yml b/cmso-sonar/docker/integration/docker-compose.yml
index ce5a826..448d970 100644
--- a/cmso-sonar/docker/integration/docker-compose.yml
+++ b/cmso-sonar/docker/integration/docker-compose.yml
@@ -100,6 +100,8 @@ services:
environment:
- GLOBAL_SCHEDULER_URL=http://cmso-service:8080
- GLOBAL_OPTIMIZER_URL=http://cmso-optimizer:7997
+ - GLOBAL_TICKET_MGT_URL=http://cmso-ticketmgt:7999
+ - GLOBAL_TOPOLOGY_URL=http://cmso-topology:7998
- CMSO_STARTUP_WAIT_TIME=20m
- TAGS=-i ete -i opt_validation
- OUTPUT=-d /share