aboutsummaryrefslogtreecommitdiffstats
path: root/cmso-robot
diff options
context:
space:
mode:
authorJerry Flood <jflood@att.com>2019-04-17 14:54:16 -0400
committerJerry Flood <jflood@att.com>2019-04-17 14:54:27 -0400
commitf51670bdc0a71789176ef7b29c8fb72d0c3e43d5 (patch)
tree981b74f53f647410871fae8bba94275d1eee2224 /cmso-robot
parent52383d23af47d2c27121486d38d5728b90263e18 (diff)
Add cmso-sonar to generate jacoco files
Issue-ID: OPTFRA-474 Change-Id: I0a1cd03708fda09255ada655df727acfa7498d09 Signed-off-by: Jerry Flood <jflood@att.com>
Diffstat (limited to 'cmso-robot')
-rw-r--r--cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/cadi.properties21
-rw-r--r--cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/liquibase.properties43
-rw-r--r--cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/optimizer.properties54
-rwxr-xr-xcmso-robot/docker/cmso-service/cmso-optimizer/etc/startDbinitService.sh17
-rw-r--r--cmso-robot/docker/cmso-service/cmso-optimizer/etc/startJacocoService.sh14
-rw-r--r--cmso-robot/docker/cmso-service/cmso-service/etc/config/cadi.properties21
-rw-r--r--cmso-robot/docker/cmso-service/cmso-service/etc/config/cmso.properties104
-rw-r--r--cmso-robot/docker/cmso-service/cmso-service/etc/config/liquibase.properties54
-rw-r--r--cmso-robot/docker/cmso-service/cmso-service/etc/config/optimizer.properties34
-rw-r--r--cmso-robot/docker/cmso-service/cmso-service/etc/config/ticketmgt.properties38
-rwxr-xr-xcmso-robot/docker/cmso-service/cmso-service/etc/startDbinitService.sh17
-rw-r--r--cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh14
-rw-r--r--cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/cadi.properties21
-rw-r--r--cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/ticketmgt.properties30
-rw-r--r--cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/startJacocoService.sh14
-rw-r--r--cmso-robot/docker/cmso-service/cmso-topology/etc/config/cadi.properties4
-rw-r--r--cmso-robot/docker/cmso-service/cmso-topology/etc/config/topology.properties30
-rw-r--r--cmso-robot/docker/cmso-service/cmso-topology/etc/startJacocoService.sh14
-rw-r--r--cmso-robot/docker/cmso-service/docker-compose.yml104
-rwxr-xr-xcmso-robot/docker/cmso-service/ete_test.sh34
-rw-r--r--cmso-robot/pom.xml26
-rw-r--r--cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java131
-rw-r--r--cmso-robot/src/test/resources/integration.properties5
23 files changed, 0 insertions, 844 deletions
diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/cadi.properties b/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/cadi.properties
deleted file mode 100644
index 9a6b91c..0000000
--- a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/cadi.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==============================================
-# Copyright (c) 2019 AT&T Intellectual Property.
-# =======================================================================
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file 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.
-# ============LICENSE_END=================================================
-#
-#-------------------------------------------------------------------------------
-cadi_loglevel=DEBUG
-cadi_prop_files=src/main/resources/aaf/org.onap.oof.props
-
diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/liquibase.properties b/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/liquibase.properties
deleted file mode 100644
index fcda8bd..0000000
--- a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/liquibase.properties
+++ /dev/null
@@ -1,43 +0,0 @@
-###
-# Copyright (c) 2017-2019 AT&T Intellectual Property.
-# Modifications Copyright &#194;© 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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 &#195;¢&#226;?&#172;&#197;"License&#195;¢&#226;?&#172;&#157;);
-# 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.
-###
-spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:3306/optimizer?createDatabaseIfNotExist=true
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=beer
-
-spring.datasource.initialize=false
-spring.datasource.tomcat.max-wait=10000
-spring.datasource.tomcat.initialSize=5
-spring.datasource.tomcat.max-active=25
-spring.datasource.tomcat.test-on-borrow=true
-
-
-changeLogFile=optimizer-liquibase-changeLog.xml
diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/optimizer.properties b/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/optimizer.properties
deleted file mode 100644
index babc736..0000000
--- a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/config/optimizer.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==============================================
-# Copyright (c) 2019 AT&T Intellectual Property.
-# =======================================================================
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file 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.
-# ============LICENSE_END=================================================
-#
-#-------------------------------------------------------------------------------
-###
-
-### MySQL DB.
-spring.datasource.url=jdbc:mariadb://${DB_HOST}:3306/optimizer
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=beer
-cmso.database.password=beer
-
-spring.datasource.initialize=false
-spring.datasource.tomcat.max-wait=10000
-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.hibernate.ddl-auto=none
-spring.jpa.hibernate.naming.strategy=org.hibernate.cfg.EJB3NamingStrategy
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-spring.jpa.hibernate.id.new_generator_mappings=false
-hibernate.id.new_generator_mappings=false
-
-logging.level.org.hibernate.SQL=WARN
-
-logging.level.org.hibernate=WARN
-
-
-cmso.topology.create.request.url=http://${TOPOLOGY_HOST}:7998/topology/v1/current
-cmso.ticket.create.request.url=http://${TICKETMGT_HOST}:7999/ticketmgt/v1/activetickets
-cmso.local.policy.folder=data/policies
-
-cmso.minizinc.command.exe=/mz-dist/bin/minizinc
-cmso.minizinc.command.solver=OSICBC
-cmso.minizinc.command.timelimit=60000
-cmso.minizinc.command.mzn=scripts/minizinc/generic_attributes.mzn
diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startDbinitService.sh b/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startDbinitService.sh
deleted file mode 100755
index a7cd3ff..0000000
--- a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startDbinitService.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-apt update
-apt install netcat --assume-yes
-COUNTER=30
-while [ $COUNTER -gt 0 ]; do
- nc -z ${DB_HOST} 3306
- if [ $? -eq 0 ]; then
- let COUNTER=0
- else
- let COUNTER=COUNTER-1
- sleep 10
- fi
-done
-
-echo "VM_ARGS="${VM_ARGS}
-
-java -Djava.security.egd=file:/dev/./urandom ${VM_ARGS} -Xms256m -Xmx1024m -jar ./app.jar --spring.config.location=/share/etc/config/liquibase.properties
diff --git a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startJacocoService.sh b/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startJacocoService.sh
deleted file mode 100644
index 0db6f1f..0000000
--- a/cmso-robot/docker/cmso-service/cmso-optimizer/etc/startJacocoService.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-apt update
-apt install wget
-apt install unzip --assume-yes
-wget http://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
-ls -l
-
-VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.optf.cmso.*"
-
-echo "VM_ARGS=${VM_ARGS}"
-
-java -Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx1024m ${VM_ARGS} -jar ./app.jar
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/cadi.properties b/cmso-robot/docker/cmso-service/cmso-service/etc/config/cadi.properties
deleted file mode 100644
index 9a6b91c..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/config/cadi.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==============================================
-# Copyright (c) 2019 AT&T Intellectual Property.
-# =======================================================================
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file 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.
-# ============LICENSE_END=================================================
-#
-#-------------------------------------------------------------------------------
-cadi_loglevel=DEBUG
-cadi_prop_files=src/main/resources/aaf/org.onap.oof.props
-
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/cmso.properties b/cmso-robot/docker/cmso-service/cmso-service/etc/config/cmso.properties
deleted file mode 100644
index 3602577..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/config/cmso.properties
+++ /dev/null
@@ -1,104 +0,0 @@
-
-#-------------------------------------------------------------------------------
-# Copyright © 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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.
-#-------------------------------------------------------------------------------
-###
-
-### MySQL DB.
-spring.datasource.url=jdbc:mariadb://${DB_HOST}:3306/cmso
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=beer
-cmso.database.password=beer
-
-spring.datasource.initialize=false
-spring.datasource.tomcat.max-wait=10000
-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.hibernate.ddl-auto=none
-spring.jpa.hibernate.naming.strategy=org.hibernate.cfg.EJB3NamingStrategy
-spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect
-spring.jpa.hibernate.naming.physical-strategy=org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl
-spring.jpa.hibernate.id.new_generator_mappings=false
-hibernate.id.new_generator_mappings=false
-
-logging.level.org.hibernate.SQL=WARN
-
-logging.level.org.hibernate=WARN
-
-#
-cmso.aaf.enabled=false
-
-# Enable swagger - Enable in development and test only
-cmso.swagger.enabled=true
-
-# Enable schedule immediate to be dispatched without ticket approvals
-# Has no effect when in vTM loopback mode as always approved.
-cmso.cm.dispatch.immediate.enabled = true
-
-# NUmber of seconds between sniro dispatch jobs
-cmso.optimizer.job.interval.ms=10000
-
-# NUmber of seconds between change management cmso polling jobs
-# Controls frequenct of polling to the ChangeManagementScheduler table...
-cmso.cm.polling.job.interval.ms=10000
-# How many management cmso polling intervals to look ahead to dispatch
-# (To account for possible latency of the polling job)
-cmso.cm.polling.job.lookahead.intervals=5
-# Lead time before event time to enable dispatcher to
-# test that it is safe to dispatch (i.e. meeting reminder lead time)
-cmso.cm.dispatcher.lead.time.ms=5000
-# Lead time to prepare and call VID to dispatch work to MSO
-# Includes latency from VID call to the start of the workflow
-cmso.cm.dispatch.lead.time.ms=1000
-
-# Interval between polling to check status of schedules in Notifications Initiated status
-cmso.status.job.interval.ms=60000
-
-org.quartz.jobStore.class=org.quartz.simpl.RAMJobStore
-
-loopback.mso.requestId=dummy123
-
-so.polling.interval.ms=10000
-#mso.user=cmso@onap.org
-#mso.pass=enc:bfodXf8qRfCqMvlxVBYNWQ==
-
-## loopback settings
-so.url=http://localhost:8080/cmso/v1/loopbacktest/onap/so/infra/orchestrationRequests/v7
-so.user=cmso@onap.org
-so.pass=enc:bfodXf8qRfCqMvlxVBYNWQ==
-
-mechid.user=cmso@onap.org
-mechid.pass=enc:bfodXf8qRfCqMvlxVBYNWQ==
-
-cmso.dispatch.url=http://localhost:8089
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/liquibase.properties b/cmso-robot/docker/cmso-service/cmso-service/etc/config/liquibase.properties
deleted file mode 100644
index b8c850e..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/config/liquibase.properties
+++ /dev/null
@@ -1,54 +0,0 @@
-###
-# Copyright &#194;© 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright &#194;© 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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 &#195;¢&#226;?&#172;&#197;"License&#195;¢&#226;?&#172;&#157;);
-# 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.
-###
-spring.datasource.jdbcUrl=jdbc:mariadb://${DB_HOST}:3306/cmso?createDatabaseIfNotExist=true
-spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-spring.datasource.username=root
-spring.datasource.password=beer
-
-spring.datasource.initialize=false
-spring.datasource.tomcat.max-wait=10000
-spring.datasource.tomcat.initialSize=5
-spring.datasource.tomcat.max-active=25
-spring.datasource.tomcat.test-on-borrow=true
-
-
-#changeLogFile=calendar-liquibase-changeLog.xml
-changeLogFile=cmso-liquibase-changeLog.xml
-
-
-#spring.main.web-environment=false
-#outputChangeLogFile=src/main/resources/cmso-output-changelog.xml
-#url=jdbc:mariadb://localhost:3306/calendar
-#url=jdbc:mysql://localhost:3306/cmso
-#username=root
-#password=root
-#driver=org.mariadb.jdbc.Driver
-#driver=com.mysql.jdbc.Driver
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/optimizer.properties b/cmso-robot/docker/cmso-service/cmso-service/etc/config/optimizer.properties
deleted file mode 100644
index f0d4651..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/config/optimizer.properties
+++ /dev/null
@@ -1,34 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright © 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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.
-#-------------------------------------------------------------------------------
-
-cmso.optimizer.request.url=${OPTIMIZER_URL}
-cmso.optimizer.status.url=${OPTIMIZER_URL}
-cmso.optimizer.health.url=${OPTIMIZER_HEALTH_URL}
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/config/ticketmgt.properties b/cmso-robot/docker/cmso-service/cmso-service/etc/config/ticketmgt.properties
deleted file mode 100644
index bfdaec6..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/config/ticketmgt.properties
+++ /dev/null
@@ -1,38 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright © 2017-2018 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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.
-#-------------------------------------------------------------------------------
-
-tm.vnfs.per.ticket=1
-tm.getPath=http://localhost:8080/cmso/v1/tm/getChangeRecord
-tm.createPath=http://localhost:8080/cmso/v1/tm/createChangeRecord
-tm.closePath=http://localhost:8080/cmso/v1/tm/closeCancelChangeRecord
-tm.updatePath=http://localhost:8080/cmso/v1/tm/updateChangeRecord
-tm.approvalStatus=Approved|Scheduled,Approved|Assigned
-tm.template.folder=data/templates/tm
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/startDbinitService.sh b/cmso-robot/docker/cmso-service/cmso-service/etc/startDbinitService.sh
deleted file mode 100755
index a7cd3ff..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/startDbinitService.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-apt update
-apt install netcat --assume-yes
-COUNTER=30
-while [ $COUNTER -gt 0 ]; do
- nc -z ${DB_HOST} 3306
- if [ $? -eq 0 ]; then
- let COUNTER=0
- else
- let COUNTER=COUNTER-1
- sleep 10
- fi
-done
-
-echo "VM_ARGS="${VM_ARGS}
-
-java -Djava.security.egd=file:/dev/./urandom ${VM_ARGS} -Xms256m -Xmx1024m -jar ./app.jar --spring.config.location=/share/etc/config/liquibase.properties
diff --git a/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh b/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh
deleted file mode 100644
index 5d65a7f..0000000
--- a/cmso-robot/docker/cmso-service/cmso-service/etc/startJacocoService.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-apt update
-apt install wget
-apt install unzip --assume-yes
-wget http://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
-ls -l
-
-VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/service.jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.*"
-
-echo "VM_ARGS=${VM_ARGS}"
-
-java -Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx1024m ${VM_ARGS} -jar ./app.jar
diff --git a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/cadi.properties b/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/cadi.properties
deleted file mode 100644
index 9a6b91c..0000000
--- a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/cadi.properties
+++ /dev/null
@@ -1,21 +0,0 @@
-#-------------------------------------------------------------------------------
-# ============LICENSE_START==============================================
-# Copyright (c) 2019 AT&T Intellectual Property.
-# =======================================================================
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file 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.
-# ============LICENSE_END=================================================
-#
-#-------------------------------------------------------------------------------
-cadi_loglevel=DEBUG
-cadi_prop_files=src/main/resources/aaf/org.onap.oof.props
-
diff --git a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/ticketmgt.properties b/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/ticketmgt.properties
deleted file mode 100644
index 5ca252f..0000000
--- a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/config/ticketmgt.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright © 2017-2019 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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.
-#-------------------------------------------------------------------------------
diff --git a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/startJacocoService.sh b/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/startJacocoService.sh
deleted file mode 100644
index 0db6f1f..0000000
--- a/cmso-robot/docker/cmso-service/cmso-ticketmgt/etc/startJacocoService.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-apt update
-apt install wget
-apt install unzip --assume-yes
-wget http://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
-ls -l
-
-VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.optf.cmso.*"
-
-echo "VM_ARGS=${VM_ARGS}"
-
-java -Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx1024m ${VM_ARGS} -jar ./app.jar
diff --git a/cmso-robot/docker/cmso-service/cmso-topology/etc/config/cadi.properties b/cmso-robot/docker/cmso-service/cmso-topology/etc/config/cadi.properties
deleted file mode 100644
index 5135d1d..0000000
--- a/cmso-robot/docker/cmso-service/cmso-topology/etc/config/cadi.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-
-cadi_loglevel=DEBUG
-cadi_prop_files=src/main/resources/aaf/org.onap.oof.props
-
diff --git a/cmso-robot/docker/cmso-service/cmso-topology/etc/config/topology.properties b/cmso-robot/docker/cmso-service/cmso-topology/etc/config/topology.properties
deleted file mode 100644
index 5ca252f..0000000
--- a/cmso-robot/docker/cmso-service/cmso-topology/etc/config/topology.properties
+++ /dev/null
@@ -1,30 +0,0 @@
-#-------------------------------------------------------------------------------
-# Copyright © 2017-2019 AT&T Intellectual Property.
-# Modifications Copyright © 2018 IBM.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file 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.
-#-------------------------------------------------------------------------------
diff --git a/cmso-robot/docker/cmso-service/cmso-topology/etc/startJacocoService.sh b/cmso-robot/docker/cmso-service/cmso-topology/etc/startJacocoService.sh
deleted file mode 100644
index 0db6f1f..0000000
--- a/cmso-robot/docker/cmso-service/cmso-topology/etc/startJacocoService.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-apt update
-apt install wget
-apt install unzip --assume-yes
-wget http://repo1.maven.org/maven2/org/jacoco/org.jacoco.agent/0.8.2/org.jacoco.agent-0.8.2.jar
-unzip org.jacoco.agent-0.8.2.jar
-cp org.jacoco.agent-0.8.2/jacocoagent.jar .
-ls -l
-
-VM_ARGS="${VM_ARGS} -javaagent:./jacocoagent.jar=destfile=/share/logs/jacoco.exec,dumponexit=true,jmx=true,append=true,output=file,includes=org.onap.optf.cmso.*"
-
-echo "VM_ARGS=${VM_ARGS}"
-
-java -Djava.security.egd=file:/dev/./urandom -Xms256m -Xmx1024m ${VM_ARGS} -jar ./app.jar
diff --git a/cmso-robot/docker/cmso-service/docker-compose.yml b/cmso-robot/docker/cmso-service/docker-compose.yml
deleted file mode 100644
index 5c2f173..0000000
--- a/cmso-robot/docker/cmso-service/docker-compose.yml
+++ /dev/null
@@ -1,104 +0,0 @@
-version: '3'
-
-services:
- mariadb:
- image: mariadb:10.1.11
- volumes:
- - "/var/lib/mysql"
- - "../mariadb/conf1:/etc/mysql/conf.d:ro"
- environment:
- - MYSQL_ROOT_PASSWORD=beer
- ports:
- - "8806:3306"
-
- db-init-svc:
- image: onap/optf-cmso-dbinit
- volumes:
- - "./cmso-service/etc:/share/etc:rw"
- - "./cmso-service/logs:/share/logs:rw"
- depends_on:
- - mariadb
- environment:
- - DB_HOST=mariadb
- entrypoint: "bash -x /share/etc/startDbinitService.sh"
-
- db-init-opt:
- image: onap/optf-cmso-dbinit
- volumes:
- - "./cmso-optimizer/etc:/share/etc:rw"
- - "./cmso-optimizer/logs:/share/logs:rw"
- depends_on:
- - mariadb
- environment:
- - DB_HOST=mariadb
- entrypoint: "bash -x /share/etc/startDbinitService.sh"
-
-
- cmso-service:
- image: onap/optf-cmso-service
- volumes:
- - "./cmso-service/etc:/share/etc:rw"
- - "./cmso-service/logs:/share/logs:rw"
- - "./cmso-service/debug-logs:/share/debug-logs:rw"
- depends_on:
- - db-init-svc
- entrypoint: "bash -x /share/etc/startJacocoService.sh"
- ports:
- - "8080:8080"
- environment:
- - DB_HOST=mariadb
- - OPTIMIZER_URL=http://cmso-optimizer:7997/optimizer/v1/optimize/schedule
- - OPTIMIZER_HEALTH_URL=http://cmso-optimizer:7997/optimizer/v1/health?checkInterfaces=true
-
- cmso-ticketmgt:
- image: onap/optf-cmso-ticketmgt
- volumes:
- - "./cmso-ticketmgt/etc:/share/etc:rw"
- - "./cmso-ticketmgt/logs:/share/logs:rw"
- - "./cmso-ticketmgt/debug-logs:/share/debug-logs:rw"
- entrypoint: "bash -x /share/etc/startJacocoService.sh"
- ports:
- - "7999:7999"
-
- cmso-topology:
- image: onap/optf-cmso-topology
- volumes:
- - "./cmso-topology/etc:/share/etc:rw"
- - "./cmso-topology/logs:/share/logs:rw"
- - "./cmso-topology/debug-logs:/share/debug-logs:rw"
- entrypoint: "bash -x /share/etc/startJacocoService.sh"
- ports:
- - "7998:7998"
-
- cmso-optimizer:
- image: onap/optf-cmso-optimizer
- volumes:
- - "./cmso-optimizer/etc:/share/etc:rw"
- - "./cmso-optimizer/logs:/share/logs:rw"
- - "./cmso-optimizer/debug-logs:/share/debug-logs:rw"
- depends_on:
- - db-init-opt
- entrypoint: "bash -x /share/etc/startJacocoService.sh"
- ports:
- - "7997:7997"
- environment:
- - DB_HOST=mariadb
- - TOPOLOGY_HOST=cmso-topology
- - TICKETMGT_HOST=cmso-ticketmgt
-
-
- cmso-robot:
- image: onap/optf-cmso-robot
- volumes:
- - "./cmso-robot/logs:/share:rw"
- depends_on:
- - cmso-service
- environment:
- - GLOBAL_SCHEDULER_URL=http://cmso-service:8080
- - GLOBAL_OPTIMIZER_URL=http://cmso-optimizer:7997
- - CMSO_STARTUP_WAIT_TIME=600s
- - TAGS=-i ete
- - OUTPUT=-d /share
- working_dir: /opt/cmso-robot
- entrypoint: "bash -x /opt/cmso-robot/ete.sh"
-
diff --git a/cmso-robot/docker/cmso-service/ete_test.sh b/cmso-robot/docker/cmso-service/ete_test.sh
deleted file mode 100755
index 0d86fef..0000000
--- a/cmso-robot/docker/cmso-service/ete_test.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-docker-compose up >up.txt 2>&1 &
-
-### Wait for robot to finish
-sleep 240
-docker exec cmso-service_cmso-robot_1 ls
-while [ $? -ne 1 ]; do
- sleep 60
- docker exec cmso-service_cmso-robot_1 ls
-done
-
-### Shut down java with to give time to write the jacoco_exec file
-docker exec cmso-service_cmso-service_1 pkill java
-docker exec cmso-service_cmso-optimizer_1 pkill java
-sleep 10
-
-### wait for cmso containers to exit and jacoco files written
-docker exec cmso-service_cmso-service_1 ls
-while [ $? -ne 1 ]; do
- sleep 60
- docker exec cmso-service_cmso-service_1 ls
-done
-
-docker exec cmso-service_cmso-optimizer_1 ls
-while [ $? -ne 1 ]; do
- sleep 60
- docker exec cmso-service_cmso-optimizer_1 ls
-done
-
-cat up.txt
-
-docker ps -a
-docker-compose down
-docker ps -a
diff --git a/cmso-robot/pom.xml b/cmso-robot/pom.xml
index 89c6019..8146afd 100644
--- a/cmso-robot/pom.xml
+++ b/cmso-robot/pom.xml
@@ -136,32 +136,6 @@
</execution>
</executions>
</plugin>
- <plugin>
- <groupId>org.jacoco</groupId>
- <artifactId>jacoco-maven-plugin</artifactId>
- <executions>
- <execution>
- <id>post-integration-test</id>
- <phase>post-integration-test</phase>
- <goals>
- <goal>report</goal>
- </goals>
- <configuration>
- <dataFile>${project.basedir}/target/code-coverage/service.jacoco.exec</dataFile>
- <outputDirectory>${project.basedir}/target/site/jacoco-it</outputDirectory>
- <includes>
- <include>service/**</include>
- </includes>
- <excludes>
- <exclude>**/gen/**</exclude>
- <exclude>**/generated-sources/**</exclude>
- <exclude>**/yang-gen/**</exclude>
- <exclude>**/pax/**</exclude>
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
<finalName>optf-cmso-robot</finalName>
</build>
diff --git a/cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java b/cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java
deleted file mode 100644
index 53aa8d6..0000000
--- a/cmso-robot/src/test/java/org/onap/optf/cmso/it/IT_FullIntegrationTest.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * ============LICENSE_START============================================== Copyright (c) 2019 AT&T
- * Intellectual Property. =======================================================================
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file 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. ============LICENSE_END=================================================
- */
-
-package org.onap.optf.cmso.it;
-
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.file.Files;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.nio.file.StandardCopyOption;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Properties;
-import org.apache.commons.io.IOUtils;
-import org.junit.Test;
-
-public class IT_FullIntegrationTest {
-
- private Properties env = new Properties();
-
- @Test
- public void runTest() throws IOException {
- InputStream is = new FileInputStream(new File("src/test/resources/integration.properties"));
- env.load(is);
- Process process = null;
- try {
- ProcessBuilder processBuilder = buildCommand();
- process = processBuilder.start();
- // debug.debug("engine command=" + commandString);
- String stdout = IOUtils.toString(process.getInputStream(), "UTF-8");
- String stderr = IOUtils.toString(process.getErrorStream(), "UTF-8");
- System.out.println("stdout=" + stdout);
- System.out.println("stderr=" + stderr);
- copyJacocoFiles();
- copyClassFiles();
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- if (process.isAlive()) {
- process.destroyForcibly();
- }
- }
- }
-
- private void copyClassFiles() throws IOException {
- File dest = new File(env.getProperty("jacoco.exec.classes"));
- dest.mkdirs();
- if (dest.isDirectory()) {
-
- String[] sourceFolders = env.getProperty("source.classes.folders").split(",");
- for (String source : sourceFolders) {
- String[] parts = source.split("\\|");
- if (parts.length == 2) {
- Path destPath = Paths.get(dest.getAbsolutePath(), parts[0]);
- destPath.toFile().mkdirs();
- File sourceFolder = new File(parts[1]);
- if (sourceFolder.exists() && sourceFolder.isDirectory()) {
- Path srcPath = Paths.get(sourceFolder.getAbsolutePath());
- copyFolder(srcPath, destPath);
- }
- }
- }
- }
- }
-
- private void copyJacocoFiles() throws IOException {
- File dest = new File(env.getProperty("jacoco.exec.dest"));
- dest.mkdirs();
- if (dest.isDirectory()) {
-
- String[] sourceFiles = env.getProperty("jacoco.exec.source.files").split(",");
- for (String source : sourceFiles) {
- File sourceFile = new File(source);
- if (sourceFile.exists()) {
- Path destPath = Paths.get(dest.getAbsolutePath(), sourceFile.getName());
- Path srcPath = Paths.get(sourceFile.getAbsolutePath());
- Files.copy(srcPath, destPath, StandardCopyOption.REPLACE_EXISTING);
- }
- }
- }
- }
-
- private static void copyFolder(Path src, Path dest) {
- try {
- Files.walk(src).forEach(s -> {
- try {
- Path d = dest.resolve(src.relativize(s));
- if (Files.isDirectory(s)) {
- if (!Files.exists(d))
- Files.createDirectory(d);
- return;
- }
- Files.copy(s, d);
- } catch (Exception e) {
- e.printStackTrace();
- }
- });
- } catch (Exception ex) {
- ex.printStackTrace();
- }
- }
-
- private ProcessBuilder buildCommand() {
- ProcessBuilder processBuilder = new ProcessBuilder();
- List<String> command = new ArrayList<>();
- String basepath = env.getProperty("base.path", "./");
- File workdir = new File(basepath + "docker/cmso-service");
- command.add("/bin/bash");
- command.add("-x");
- command.add(basepath + "ete_test.sh");
- Map<String, String> environment = processBuilder.environment();
- processBuilder.directory(workdir);
- processBuilder.command(command);
- return processBuilder;
- }
-}
diff --git a/cmso-robot/src/test/resources/integration.properties b/cmso-robot/src/test/resources/integration.properties
deleted file mode 100644
index 8fcc7b5..0000000
--- a/cmso-robot/src/test/resources/integration.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-base.path=./
-jacoco.exec.dest=target/code-coverage
-jacoco.exec.classes=target/classes
-source.classes.folders=service|../cmso-service/target/classes
-jacoco.exec.source.files=docker/cmso-service/cmso-service/logs/service.jacoco.exec \ No newline at end of file